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/game/Miscellaneous/SharedDefines.h
+250 -172
View File
@@ -1496,178 +1496,256 @@ enum GameObjectDynamicLowFlags
enum TextEmotes enum TextEmotes
{ {
TEXTEMOTE_AGREE = 1, TEXT_EMOTE_AGREE = 1,
TEXTEMOTE_AMAZE = 2, TEXT_EMOTE_AMAZE = 2,
TEXTEMOTE_ANGRY = 3, TEXT_EMOTE_ANGRY = 3,
TEXTEMOTE_APOLOGIZE = 4, TEXT_EMOTE_APOLOGIZE = 4,
TEXTEMOTE_APPLAUD = 5, TEXT_EMOTE_APPLAUD = 5,
TEXTEMOTE_BASHFUL = 6, TEXT_EMOTE_BASHFUL = 6,
TEXTEMOTE_BECKON = 7, TEXT_EMOTE_BECKON = 7,
TEXTEMOTE_BEG = 8, TEXT_EMOTE_BEG = 8,
TEXTEMOTE_BITE = 9, TEXT_EMOTE_BITE = 9,
TEXTEMOTE_BLEED = 10, TEXT_EMOTE_BLEED = 10,
TEXTEMOTE_BLINK = 11, TEXT_EMOTE_BLINK = 11,
TEXTEMOTE_BLUSH = 12, TEXT_EMOTE_BLUSH = 12,
TEXTEMOTE_BONK = 13, TEXT_EMOTE_BONK = 13,
TEXTEMOTE_BORED = 14, TEXT_EMOTE_BORED = 14,
TEXTEMOTE_BOUNCE = 15, TEXT_EMOTE_BOUNCE = 15,
TEXTEMOTE_BRB = 16, TEXT_EMOTE_BRB = 16,
TEXTEMOTE_BOW = 17, TEXT_EMOTE_BOW = 17,
TEXTEMOTE_BURP = 18, TEXT_EMOTE_BURP = 18,
TEXTEMOTE_BYE = 19, TEXT_EMOTE_BYE = 19,
TEXTEMOTE_CACKLE = 20, TEXT_EMOTE_CACKLE = 20,
TEXTEMOTE_CHEER = 21, TEXT_EMOTE_CHEER = 21,
TEXTEMOTE_CHICKEN = 22, TEXT_EMOTE_CHICKEN = 22,
TEXTEMOTE_CHUCKLE = 23, TEXT_EMOTE_CHUCKLE = 23,
TEXTEMOTE_CLAP = 24, TEXT_EMOTE_CLAP = 24,
TEXTEMOTE_CONFUSED = 25, TEXT_EMOTE_CONFUSED = 25,
TEXTEMOTE_CONGRATULATE = 26, TEXT_EMOTE_CONGRATULATE = 26,
TEXTEMOTE_COUGH = 27, TEXT_EMOTE_UNUSED = 27,
TEXTEMOTE_COWER = 28, TEXT_EMOTE_COUGH = 28,
TEXTEMOTE_CRACK = 29, TEXT_EMOTE_COWER = 29,
TEXTEMOTE_CRINGE = 30, TEXT_EMOTE_CRACK = 30,
TEXTEMOTE_CRY = 31, TEXT_EMOTE_CRINGE = 31,
TEXTEMOTE_CURIOUS = 32, TEXT_EMOTE_CRY = 32,
TEXTEMOTE_CURTSEY = 33, TEXT_EMOTE_CURIOUS = 33,
TEXTEMOTE_DANCE = 34, TEXT_EMOTE_CURTSEY = 34,
TEXTEMOTE_DRINK = 35, TEXT_EMOTE_DANCE = 35,
TEXTEMOTE_DROOL = 36, TEXT_EMOTE_DRINK = 36,
TEXTEMOTE_EAT = 37, TEXT_EMOTE_DROOL = 37,
TEXTEMOTE_EYE = 38, TEXT_EMOTE_EAT = 38,
TEXTEMOTE_FART = 39, TEXT_EMOTE_EYE = 39,
TEXTEMOTE_FIDGET = 40, TEXT_EMOTE_FART = 40,
TEXTEMOTE_FLEX = 41, TEXT_EMOTE_FIDGET = 41,
TEXTEMOTE_FROWN = 42, TEXT_EMOTE_FLEX = 42,
TEXTEMOTE_GASP = 43, TEXT_EMOTE_FROWN = 43,
TEXTEMOTE_GAZE = 44, TEXT_EMOTE_GASP = 44,
TEXTEMOTE_GIGGLE = 45, TEXT_EMOTE_GAZE = 45,
TEXTEMOTE_GLARE = 46, TEXT_EMOTE_GIGGLE = 46,
TEXTEMOTE_GLOAT = 47, TEXT_EMOTE_GLARE = 47,
TEXTEMOTE_GREET = 48, TEXT_EMOTE_GLOAT = 48,
TEXTEMOTE_GRIN = 49, TEXT_EMOTE_GREET = 49,
TEXTEMOTE_GROAN = 50, TEXT_EMOTE_GRIN = 50,
TEXTEMOTE_GROVEL = 51, TEXT_EMOTE_GROAN = 51,
TEXTEMOTE_GUFFAW = 52, TEXT_EMOTE_GROVEL = 52,
TEXTEMOTE_HAIL = 53, TEXT_EMOTE_GUFFAW = 53,
TEXTEMOTE_HAPPY = 54, TEXT_EMOTE_HAIL = 54,
TEXTEMOTE_HELLO = 55, TEXT_EMOTE_HAPPY = 55,
TEXTEMOTE_HUG = 56, TEXT_EMOTE_HELLO = 56,
TEXTEMOTE_HUNGRY = 57, TEXT_EMOTE_HUG = 57,
TEXTEMOTE_KISS = 58, TEXT_EMOTE_HUNGRY = 58,
TEXTEMOTE_KNEEL = 59, TEXT_EMOTE_KISS = 59,
TEXTEMOTE_LAUGH = 60, TEXT_EMOTE_KNEEL = 60,
TEXTEMOTE_LAYDOWN = 61, TEXT_EMOTE_LAUGH = 61,
TEXTEMOTE_MESSAGE = 62, TEXT_EMOTE_LAYDOWN = 62,
TEXTEMOTE_MOAN = 63, TEXT_EMOTE_MASSAGE = 63,
TEXTEMOTE_MOON = 64, TEXT_EMOTE_MOAN = 64,
TEXTEMOTE_MOURN = 65, TEXT_EMOTE_MOON = 65,
TEXTEMOTE_NO = 66, TEXT_EMOTE_MOURN = 66,
TEXTEMOTE_NOD = 67, TEXT_EMOTE_NO = 67,
TEXTEMOTE_NOSEPICK = 68, TEXT_EMOTE_NOD = 68,
TEXTEMOTE_PANIC = 69, TEXT_EMOTE_NOSEPICK = 69,
TEXTEMOTE_PEER = 70, TEXT_EMOTE_PANIC = 70,
TEXTEMOTE_PLEAD = 71, TEXT_EMOTE_PEER = 71,
TEXTEMOTE_POINT = 72, TEXT_EMOTE_PLEAD = 72,
TEXTEMOTE_POKE = 73, TEXT_EMOTE_POINT = 73,
TEXTEMOTE_PRAY = 74, TEXT_EMOTE_POKE = 74,
TEXTEMOTE_ROAR = 75, TEXT_EMOTE_PRAY = 75,
TEXTEMOTE_ROFL = 76, TEXT_EMOTE_ROAR = 76,
TEXTEMOTE_RUDE = 77, TEXT_EMOTE_ROFL = 77,
TEXTEMOTE_SALUTE = 78, TEXT_EMOTE_RUDE = 78,
TEXTEMOTE_SCRATCH = 79, TEXT_EMOTE_SALUTE = 79,
TEXTEMOTE_SEXY = 80, TEXT_EMOTE_SCRATCH = 80,
TEXTEMOTE_SHAKE = 81, TEXT_EMOTE_SEXY = 81,
TEXTEMOTE_SHOUT = 82, TEXT_EMOTE_SHAKE = 82,
TEXTEMOTE_SHRUG = 83, TEXT_EMOTE_SHOUT = 83,
TEXTEMOTE_SHY = 84, TEXT_EMOTE_SHRUG = 84,
TEXTEMOTE_SIGH = 85, TEXT_EMOTE_SHY = 85,
TEXTEMOTE_SIT = 86, TEXT_EMOTE_SIGH = 86,
TEXTEMOTE_SLEEP = 87, TEXT_EMOTE_SIT = 87,
TEXTEMOTE_SNARL = 88, TEXT_EMOTE_SLEEP = 88,
TEXTEMOTE_SPIT = 89, TEXT_EMOTE_SNARL = 89,
TEXTEMOTE_STARE = 90, TEXT_EMOTE_SPIT = 90,
TEXTEMOTE_SURPRISED = 91, TEXT_EMOTE_STARE = 91,
TEXTEMOTE_SURRENDER = 92, TEXT_EMOTE_SURPRISED = 92,
TEXTEMOTE_TALK = 93, TEXT_EMOTE_SURRENDER = 93,
TEXTEMOTE_TALKEX = 94, TEXT_EMOTE_TALK = 94,
TEXTEMOTE_TALKQ = 95, TEXT_EMOTE_TALKEX = 95,
TEXTEMOTE_TAP = 96, TEXT_EMOTE_TALKQ = 96,
TEXTEMOTE_THANK = 97, TEXT_EMOTE_TAP = 97,
TEXTEMOTE_THREATEN = 98, TEXT_EMOTE_THANK = 98,
TEXTEMOTE_TIRED = 99, TEXT_EMOTE_THREATEN = 99,
TEXTEMOTE_VICTORY = 100, TEXT_EMOTE_TIRED = 100,
TEXTEMOTE_WAVE = 101, TEXT_EMOTE_VICTORY = 101,
TEXTEMOTE_WELCOME = 102, TEXT_EMOTE_WAVE = 102,
TEXTEMOTE_WHINE = 103, TEXT_EMOTE_WELCOME = 103,
TEXTEMOTE_WHISTLE = 104, TEXT_EMOTE_WHINE = 104,
TEXTEMOTE_WORK = 105, TEXT_EMOTE_WHISTLE = 105,
TEXTEMOTE_YAWN = 106, TEXT_EMOTE_WORK = 106,
TEXTEMOTE_BOGGLE = 107, TEXT_EMOTE_YAWN = 107,
TEXTEMOTE_CALM = 108, TEXT_EMOTE_BOGGLE = 108,
TEXTEMOTE_COLD = 109, TEXT_EMOTE_CALM = 109,
TEXTEMOTE_COMFORT = 110, TEXT_EMOTE_COLD = 110,
TEXTEMOTE_CUDDLE = 111, TEXT_EMOTE_COMFORT = 111,
TEXTEMOTE_DUCK = 112, TEXT_EMOTE_CUDDLE = 112,
TEXTEMOTE_INSULT = 113, TEXT_EMOTE_DUCK = 113,
TEXTEMOTE_INTRODUCE = 114, TEXT_EMOTE_INSULT = 114,
TEXTEMOTE_JK = 115, TEXT_EMOTE_INTRODUCE = 115,
TEXTEMOTE_LICK = 116, TEXT_EMOTE_JK = 116,
TEXTEMOTE_LISTEN = 117, TEXT_EMOTE_LICK = 117,
TEXTEMOTE_LOST = 118, TEXT_EMOTE_LISTEN = 118,
TEXTEMOTE_MOCK = 119, TEXT_EMOTE_LOST = 119,
TEXTEMOTE_PONDER = 120, TEXT_EMOTE_MOCK = 120,
TEXTEMOTE_POUNCE = 121, TEXT_EMOTE_PONDER = 121,
TEXTEMOTE_PRAISE = 122, TEXT_EMOTE_POUNCE = 122,
TEXTEMOTE_PURR = 123, TEXT_EMOTE_PRAISE = 123,
TEXTEMOTE_PUZZLE = 124, TEXT_EMOTE_PURR = 124,
TEXTEMOTE_RAISE = 125, TEXT_EMOTE_PUZZLE = 125,
TEXTEMOTE_READY = 126, TEXT_EMOTE_RAISE = 126,
TEXTEMOTE_SHIMMY = 127, TEXT_EMOTE_READY = 127,
TEXTEMOTE_SHIVER = 128, TEXT_EMOTE_SHIMMY = 128,
TEXTEMOTE_SHOO = 129, TEXT_EMOTE_SHIVER = 129,
TEXTEMOTE_SLAP = 130, TEXT_EMOTE_SHOO = 130,
TEXTEMOTE_SMIRK = 131, TEXT_EMOTE_SLAP = 131,
TEXTEMOTE_SNIFF = 132, TEXT_EMOTE_SMIRK = 132,
TEXTEMOTE_SNUB = 133, TEXT_EMOTE_SNIFF = 133,
TEXTEMOTE_SOOTHE = 134, TEXT_EMOTE_SNUB = 134,
TEXTEMOTE_STINK = 135, TEXT_EMOTE_SOOTHE = 135,
TEXTEMOTE_TAUNT = 136, TEXT_EMOTE_STINK = 136,
TEXTEMOTE_TEASE = 137, TEXT_EMOTE_TAUNT = 137,
TEXTEMOTE_THIRSTY = 138, TEXT_EMOTE_TEASE = 138,
TEXTEMOTE_VETO = 139, TEXT_EMOTE_THIRSTY = 139,
TEXTEMOTE_SNICKER = 140, TEXT_EMOTE_VETO = 140,
TEXTEMOTE_STAND = 141, TEXT_EMOTE_SNICKER = 141,
TEXTEMOTE_TICKLE = 142, TEXT_EMOTE_TICKLE = 142,
TEXTEMOTE_VIOLIN = 143, TEXT_EMOTE_STAND = 143,
TEXTEMOTE_SMILE = 163, TEXT_EMOTE_VIOLIN = 144,
TEXTEMOTE_RASP = 183, TEXT_EMOTE_SMILE = 145,
TEXTEMOTE_PITY = 203, TEXT_EMOTE_RASP = 146,
TEXTEMOTE_GROWL = 204, TEXT_EMOTE_GROWL = 147,
TEXTEMOTE_BARK = 205, TEXT_EMOTE_BARK = 148,
TEXTEMOTE_SCARED = 223, TEXT_EMOTE_PITY = 149,
TEXTEMOTE_FLOP = 224, TEXT_EMOTE_SCARED = 150,
TEXTEMOTE_LOVE = 225, TEXT_EMOTE_FLOP = 151,
TEXTEMOTE_MOO = 226, TEXT_EMOTE_LOVE = 152,
TEXTEMOTE_OPENFIRE = 327, TEXT_EMOTE_MOO = 153,
TEXTEMOTE_FLIRT = 328, TEXT_EMOTE_COMMEND = 154,
TEXTEMOTE_JOKE = 329, TEXT_EMOTE_TRAIN = 155,
TEXTEMOTE_COMMEND = 243, TEXT_EMOTE_HELPME = 156,
TEXTEMOTE_WINK = 363, TEXT_EMOTE_INCOMING = 157,
TEXTEMOTE_PAT = 364, TEXT_EMOTE_OPENFIRE = 158,
TEXTEMOTE_SERIOUS = 365, TEXT_EMOTE_CHARGE = 159,
TEXTEMOTE_MOUNTSPECIAL = 366, TEXT_EMOTE_FLEE = 160,
TEXTEMOTE_GOODLUCK = 367, TEXT_EMOTE_ATTACKMYTARGET = 161,
TEXTEMOTE_BLAME = 368, TEXT_EMOTE_OOM = 162,
TEXTEMOTE_BLANK = 369, TEXT_EMOTE_FOLLOW = 163,
TEXTEMOTE_BRANDISH = 370, TEXT_EMOTE_WAIT = 164,
TEXTEMOTE_BREATH = 371, TEXT_EMOTE_FLIRT = 165,
TEXTEMOTE_DISAGREE = 372, TEXT_EMOTE_HEALME = 166,
TEXTEMOTE_DOUBT = 373, TEXT_EMOTE_JOKE = 167,
TEXTEMOTE_EMBARRASS = 374, TEXT_EMOTE_WINK = 168,
TEXTEMOTE_ENCOURAGE = 375, TEXT_EMOTE_PAT = 169,
TEXTEMOTE_ENEMY = 376, TEXT_EMOTE_GOLFCLAP = 170,
TEXTEMOTE_EYEBROW = 377, TEXT_EMOTE_MOUNTSPECIAL = 171,
TEXTEMOTE_TOAST = 378 TEXT_EMOTE_INCOMING_2 = 304,
TEXT_EMOTE_FLEE_2 = 306,
TEXT_EMOTE_BLAME = 368,
TEXT_EMOTE_BLANK = 369,
TEXT_EMOTE_BRANDISH = 370,
TEXT_EMOTE_BREATH = 371,
TEXT_EMOTE_DISAGREE = 372,
TEXT_EMOTE_DOUBT = 373,
TEXT_EMOTE_EMBARRASS = 374,
TEXT_EMOTE_ENCOURAGE = 375,
TEXT_EMOTE_ENEMY = 376,
TEXT_EMOTE_EYEBROW = 377,
TEXT_EMOTE_HIGHFIVE = 380,
TEXT_EMOTE_ABSENT = 381,
TEXT_EMOTE_ARM = 382,
TEXT_EMOTE_AWE = 383,
TEXT_EMOTE_BACKPACK = 384,
TEXT_EMOTE_BADFEELING = 385,
TEXT_EMOTE_CHALLENGE = 386,
TEXT_EMOTE_CHUG = 387,
TEXT_EMOTE_DING = 389,
TEXT_EMOTE_FACEPALM = 390,
TEXT_EMOTE_FAINT = 391,
TEXT_EMOTE_GO = 392,
TEXT_EMOTE_GOING = 393,
TEXT_EMOTE_GLOWER = 394,
TEXT_EMOTE_HEADACHE = 395,
TEXT_EMOTE_HICCUP = 396,
TEXT_EMOTE_HISS = 398,
TEXT_EMOTE_HOLDHAND = 399,
TEXT_EMOTE_HURRY = 401,
TEXT_EMOTE_IDEA = 402,
TEXT_EMOTE_JEALOUS = 403,
TEXT_EMOTE_LUCK = 404,
TEXT_EMOTE_MAP = 405,
TEXT_EMOTE_MERCY = 406,
TEXT_EMOTE_MUTTER = 407,
TEXT_EMOTE_NERVOUS = 408,
TEXT_EMOTE_OFFER = 409,
TEXT_EMOTE_PET = 410,
TEXT_EMOTE_PINCH = 411,
TEXT_EMOTE_PROUD = 413,
TEXT_EMOTE_PROMISE = 414,
TEXT_EMOTE_PULSE = 415,
TEXT_EMOTE_PUNCH = 416,
TEXT_EMOTE_POUT = 417,
TEXT_EMOTE_REGRET = 418,
TEXT_EMOTE_REVENGE = 420,
TEXT_EMOTE_ROLLEYES = 421,
TEXT_EMOTE_RUFFLE = 422,
TEXT_EMOTE_SAD = 423,
TEXT_EMOTE_SCOFF = 424,
TEXT_EMOTE_SCOLD = 425,
TEXT_EMOTE_SCOWL = 426,
TEXT_EMOTE_SEARCH = 427,
TEXT_EMOTE_SHAKEFIST = 428,
TEXT_EMOTE_SHIFTY = 429,
TEXT_EMOTE_SHUDDER = 430,
TEXT_EMOTE_SIGNAL = 431,
TEXT_EMOTE_SILENCE = 432,
TEXT_EMOTE_SING = 433,
TEXT_EMOTE_SMACK = 434,
TEXT_EMOTE_SNEAK = 435,
TEXT_EMOTE_SNEEZE = 436,
TEXT_EMOTE_SNORT = 437,
TEXT_EMOTE_SQUEAL = 438,
TEXT_EMOTE_SUSPICIOUS = 440,
TEXT_EMOTE_THINK = 441,
TEXT_EMOTE_TRUCE = 442,
TEXT_EMOTE_TWIDDLE = 443,
TEXT_EMOTE_WARN = 444,
TEXT_EMOTE_SNAP = 445,
TEXT_EMOTE_CHARM = 446,
TEXT_EMOTE_COVEREARS = 447,
TEXT_EMOTE_CROSSARMS = 448,
TEXT_EMOTE_LOOK = 449,
TEXT_EMOTE_OBJECT = 450,
TEXT_EMOTE_SWEAT = 451,
TEXT_EMOTE_YW = 452,
}; };
enum Emote enum Emote
src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+5 -5
View File
@@ -262,22 +262,22 @@ public:
{ {
switch(emote) switch(emote)
{ {
case TEXTEMOTE_DANCE: case TEXT_EMOTE_DANCE:
EnterEvadeMode(); EnterEvadeMode();
break; break;
case TEXTEMOTE_RUDE: case TEXT_EMOTE_RUDE:
if (me->IsWithinDistInMap(pPlayer, 5)) if (me->IsWithinDistInMap(pPlayer, 5))
DoCast(pPlayer, SPELL_SLAP, false); DoCast(pPlayer, SPELL_SLAP, false);
else else
me->HandleEmoteCommand(EMOTE_ONESHOT_RUDE); me->HandleEmoteCommand(EMOTE_ONESHOT_RUDE);
break; break;
case TEXTEMOTE_WAVE: case TEXT_EMOTE_WAVE:
me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);
break; break;
case TEXTEMOTE_BOW: case TEXT_EMOTE_BOW:
me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); me->HandleEmoteCommand(EMOTE_ONESHOT_BOW);
break; break;
case TEXTEMOTE_KISS: case TEXT_EMOTE_KISS:
me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX);
break; break;
} }
src/server/scripts/Examples/example_creature.cpp
+2 -2
View File
@@ -150,10 +150,10 @@ class example_creature : public CreatureScript
switch(uiTextEmote) switch(uiTextEmote)
{ {
case TEXTEMOTE_DANCE: case TEXT_EMOTE_DANCE:
DoScriptText(SAY_DANCE, me); DoScriptText(SAY_DANCE, me);
break; break;
case TEXTEMOTE_SALUTE: case TEXT_EMOTE_SALUTE:
DoScriptText(SAY_SALUTE, me); DoScriptText(SAY_SALUTE, me);
break; break;
} }
src/server/scripts/Kalimdor/orgrimmar.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ public:
void ReceiveEmote(Player* pPlayer, uint32 emote) void ReceiveEmote(Player* pPlayer, uint32 emote)
{ {
if (emote == TEXTEMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) if (emote == TEXT_EMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
{ {
if (CanEmote) if (CanEmote)
{ {
src/server/scripts/Kalimdor/the_barrens.cpp
+1 -1
View File
@@ -297,7 +297,7 @@ public:
void ReceiveEmote(Player* /*pPlayer*/, uint32 emote) void ReceiveEmote(Player* /*pPlayer*/, uint32 emote)
{ {
if (emote == TEXTEMOTE_SALUTE) if (emote == TEXT_EMOTE_SALUTE)
{ {
if (FlareCount >= 2) if (FlareCount >= 2)
{ {
src/server/scripts/Kalimdor/thousand_needles.cpp
+2 -2
View File
@@ -350,7 +350,7 @@ public:
{ {
if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
{ {
if (uiTextEmote == TEXTEMOTE_BECKON) if (uiTextEmote == TEXT_EMOTE_BECKON)
{ {
me->setFaction(FACTION_FRIENDLY); me->setFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -358,7 +358,7 @@ public:
} }
} }
if (uiTextEmote == TEXTEMOTE_CHICKEN) if (uiTextEmote == TEXT_EMOTE_CHICKEN)
{ {
if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
return; return;
src/server/scripts/World/guards.cpp
+6 -6
View File
@@ -196,12 +196,12 @@ public:
{ {
switch(emote) switch(emote)
{ {
case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break;
case TEXTEMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
case TEXTEMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break; case TEXT_EMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break;
case TEXTEMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break; case TEXT_EMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break;
case TEXTEMOTE_RUDE: case TEXT_EMOTE_RUDE:
case TEXTEMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break; 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) switch(emote)
{ {
case TEXTEMOTE_CHICKEN: case TEXT_EMOTE_CHICKEN:
if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1) if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1)
{ {
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
@@ -360,7 +360,7 @@ public:
DoScriptText(EMOTE_HELLO, me); DoScriptText(EMOTE_HELLO, me);
} }
break; break;
case TEXTEMOTE_CHEER: case TEXT_EMOTE_CHEER:
if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE) if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
{ {
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
@@ -457,11 +457,11 @@ public:
me->SendMessageToSet(&data, true); me->SendMessageToSet(&data, true);
switch(emote) switch(emote)
{ {
case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break; case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break;
case TEXTEMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
case TEXTEMOTE_BOW: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; case TEXT_EMOTE_BOW: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break;
case TEXTEMOTE_JOKE: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case TEXT_EMOTE_JOKE: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break;
case TEXTEMOTE_DANCE: case TEXT_EMOTE_DANCE:
{ {
if (!pPlayer->HasAura(SPELL_SEDUCTION)) if (!pPlayer->HasAura(SPELL_SEDUCTION))
DoCast(pPlayer, SPELL_SEDUCTION, true); DoCast(pPlayer, SPELL_SEDUCTION, true);
@@ -1590,7 +1590,7 @@ public:
if (!IsHolidayActive(HOLIDAY_BREWFEST)) if (!IsHolidayActive(HOLIDAY_BREWFEST))
return; return;
if (emote == TEXTEMOTE_DANCE) if (emote == TEXT_EMOTE_DANCE)
me->CastSpell(pPlayer, 41586, false); me->CastSpell(pPlayer, 41586, false);
} }
}; };
@@ -1621,7 +1621,7 @@ public:
if (pPlayer->HasAura(26218)) if (pPlayer->HasAura(26218))
return; return;
if (emote == TEXTEMOTE_KISS) if (emote == TEXT_EMOTE_KISS)
{ {
me->CastSpell(me, 26218, false); me->CastSpell(me, 26218, false);
pPlayer->CastSpell(pPlayer, 26218, false); pPlayer->CastSpell(pPlayer, 26218, false);
@@ -1799,7 +1799,7 @@ public:
Unit* own = me->GetOwner(); Unit* own = me->GetOwner();
if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != pPlayer->GetTeam()) if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != pPlayer->GetTeam())
return; return;
if (emote == TEXTEMOTE_KISS) if (emote == TEXT_EMOTE_KISS)
{ {
std::string whisp = ""; std::string whisp = "";
switch (rand()%8) switch (rand()%8)