diff options
| -rw-r--r-- | src/bindings/scripts/scripts/world/npcs_special.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp index 3fad7034238..de62242e175 100644 --- a/src/bindings/scripts/scripts/world/npcs_special.cpp +++ b/src/bindings/scripts/scripts/world/npcs_special.cpp @@ -1494,22 +1494,22 @@ CreatureAI* GetAI_npc_tonk_mine(Creature* pCreature) ## npc_brewfest_reveler ####*/ -struct TRINITY_DLL_DECL npc_brewfest_revelerAI : public ScriptedAI
-{
- npc_brewfest_revelerAI(Creature* c) : ScriptedAI(c) {}
- void ReceiveEmote(Player* pPlayer, uint32 emote)
- {
- if (!IsHolidayActive(HOLIDAY_BREWFEST))
- return;
-
- if (emote == TEXTEMOTE_DANCE)
- m_creature->CastSpell(pPlayer, 41586, false);
- }
-};
-
-CreatureAI* GetAI_npc_brewfest_reveler(Creature* pCreature)
-{
- return new npc_brewfest_revelerAI(pCreature);
+struct TRINITY_DLL_DECL npc_brewfest_revelerAI : public ScriptedAI +{ + npc_brewfest_revelerAI(Creature* c) : ScriptedAI(c) {} + void ReceiveEmote(Player* pPlayer, uint32 emote) + { + if (!IsHolidayActive(HOLIDAY_BREWFEST)) + return; + + if (emote == TEXTEMOTE_DANCE) + m_creature->CastSpell(pPlayer, 41586, false); + } +}; + +CreatureAI* GetAI_npc_brewfest_reveler(Creature* pCreature) +{ + return new npc_brewfest_revelerAI(pCreature); } /*#### @@ -1519,31 +1519,31 @@ CreatureAI* GetAI_npc_brewfest_reveler(Creature* pCreature) struct TRINITY_DLL_DECL npc_winter_revelerAI : public ScriptedAI { npc_winter_revelerAI(Creature* c) : ScriptedAI(c) {} - void ReceiveEmote(Player* pPlayer, uint32 emote)
- {
- if (!IsHolidayActive(HOLIDAY_FEAST_OF_WINTER_VEIL))
+ void ReceiveEmote(Player* pPlayer, uint32 emote) + { + if (!IsHolidayActive(HOLIDAY_FEAST_OF_WINTER_VEIL)) + return; + //TODO: check auralist. + if (pPlayer->HasAura(26218)) return; - //TODO: check auralist.
- if (pPlayer->HasAura(26218))
- return;
-
+ if (emote == TEXTEMOTE_KISS) { - m_creature->CastSpell(m_creature, 26218, false);
- pPlayer->CastSpell(pPlayer, 26218, false);
- switch (urand(0,2))
- {
- case 0: m_creature->CastSpell(pPlayer, 26207, false); break;
- case 1: m_creature->CastSpell(pPlayer, 26206, false); break;
- case 2: m_creature->CastSpell(pPlayer, 45036, false); break;
+ m_creature->CastSpell(m_creature, 26218, false); + pPlayer->CastSpell(pPlayer, 26218, false); + switch (urand(0,2)) + { + case 0: m_creature->CastSpell(pPlayer, 26207, false); break; + case 1: m_creature->CastSpell(pPlayer, 26206, false); break; + case 2: m_creature->CastSpell(pPlayer, 45036, false); break; } } } }; -CreatureAI* GetAI_npc_winter_reveler(Creature* pCreature)
-{
- return new npc_winter_revelerAI(pCreature);
+CreatureAI* GetAI_npc_winter_reveler(Creature* pCreature) +{ + return new npc_winter_revelerAI(pCreature); } |