josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Defines: Update enum TextEmotes, values and names from client. (These emotes comes in CMSG_TEXT_EMOTE).

Browse Source
This commit is contained in:
kaelima
2011-05-30 22:57:37 +02:00
parent 5256b5abfe
commit ae0d349a3c
8 changed files with 277 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/World/guards.cpp
+6 -6
View File
@@ -196,12 +196,12 @@ public:
{
switch(emote)
{
case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break;
case TEXTEMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
case TEXTEMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break;
case TEXTEMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break;
case TEXTEMOTE_RUDE:
case TEXTEMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break;
case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break;
case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
case TEXT_EMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break;
case TEXT_EMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break;
case TEXT_EMOTE_RUDE:
case TEXT_EMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break;
}
}
src/server/scripts/World/npcs_special.cpp
+10 -10
View File
@@ -352,7 +352,7 @@ public:
{
switch(emote)
{
case TEXTEMOTE_CHICKEN:
case TEXT_EMOTE_CHICKEN:
if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1)
{
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
@@ -360,7 +360,7 @@ public:
DoScriptText(EMOTE_HELLO, me);
}
break;
case TEXTEMOTE_CHEER:
case TEXT_EMOTE_CHEER:
if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
{
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
@@ -457,11 +457,11 @@ public:
me->SendMessageToSet(&data, true);
switch(emote)
{
case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break;
case TEXTEMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
case TEXTEMOTE_BOW: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break;
case TEXTEMOTE_JOKE: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break;
case TEXTEMOTE_DANCE:
case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break;
case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
case TEXT_EMOTE_BOW: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break;
case TEXT_EMOTE_JOKE: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break;
case TEXT_EMOTE_DANCE:
{
if (!pPlayer->HasAura(SPELL_SEDUCTION))
DoCast(pPlayer, SPELL_SEDUCTION, true);
@@ -1590,7 +1590,7 @@ public:
if (!IsHolidayActive(HOLIDAY_BREWFEST))
return;
if (emote == TEXTEMOTE_DANCE)
if (emote == TEXT_EMOTE_DANCE)
me->CastSpell(pPlayer, 41586, false);
}
};
@@ -1621,7 +1621,7 @@ public:
if (pPlayer->HasAura(26218))
return;
if (emote == TEXTEMOTE_KISS)
if (emote == TEXT_EMOTE_KISS)
{
me->CastSpell(me, 26218, false);
pPlayer->CastSpell(pPlayer, 26218, false);
@@ -1799,7 +1799,7 @@ public:
Unit* own = me->GetOwner();
if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != pPlayer->GetTeam())
return;
if (emote == TEXTEMOTE_KISS)
if (emote == TEXT_EMOTE_KISS)
{
std::string whisp = "";
switch (rand()%8)