* correct worldside NPC texts - patch by terrorbringer (more cleanup needed?)

--HG--
branch : trunk
This commit is contained in:
2010-04-10 09:41:25 +02:00
parent 1f11f02221
commit 8bb3b39495
15 changed files with 115 additions and 115 deletions
@@ -34,16 +34,16 @@ EndContentData */
enum eEnums enum eEnums
{ {
SAY_PROGRESS_1 = -1000235, SAY_PROGRESS_1 = -1000264,
SAY_PROGRESS_2 = -1000236, SAY_PROGRESS_2 = -1000265,
SAY_PROGRESS_3 = -1000237, SAY_PROGRESS_3 = -1000266,
EMOTE_PROGRESS_4 = -1000238, EMOTE_PROGRESS_4 = -1000267,
SAY_AGGRO = -1000239, SAY_AGGRO = -1000268,
SAY_PROGRESS_5 = -1000240, SAY_PROGRESS_5 = -1000269,
SAY_PROGRESS_6 = -1000241, SAY_PROGRESS_6 = -1000270,
SAY_PROGRESS_7 = -1000242, SAY_PROGRESS_7 = -1000271,
EMOTE_PROGRESS_8 = -1000243, EMOTE_PROGRESS_8 = -1000272,
SAY_PROGRESS_9 = -1000244, SAY_PROGRESS_9 = -1000273,
QUEST_SUNKEN_TREASURE = 665, QUEST_SUNKEN_TREASURE = 665,
MOB_VENGEFUL_SURGE = 2776 MOB_VENGEFUL_SURGE = 2776
@@ -95,20 +95,20 @@ bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature* pCreature, uint32
enum eErland enum eErland
{ {
SAY_QUESTACCEPT = -1000335, SAY_QUESTACCEPT = -1000306,
SAY_START = -1000336, SAY_START = -1000307,
SAY_AGGRO_1 = -1000337, SAY_AGGRO_1 = -1000308,
SAY_AGGRO_2 = -1000338, SAY_AGGRO_2 = -1000309,
SAY_LAST = -1000339, SAY_LAST = -1000310,
SAY_THANKS = -1000340, SAY_THANKS = -1000311,
SAY_RANE = -1000341, SAY_RANE = -1000312,
SAY_ANSWER = -1000342, SAY_ANSWER = -1000313,
SAY_MOVE_QUINN = -1000343, SAY_MOVE_QUINN = -1000314,
SAY_GREETINGS = -1000344, SAY_GREETINGS = -1000315,
SAY_QUINN = -1000345, SAY_QUINN = -1000316,
SAY_ON_BYE = -1000346, SAY_ON_BYE = -1000317,
QUEST_ESCORTING = 435, QUEST_ESCORTING = 435,
NPC_RANE = 1950, NPC_RANE = 1950,
+5 -5
View File
@@ -35,11 +35,11 @@ EndContentData */
enum eEnums enum eEnums
{ {
SAY_DS_START = -1000402, SAY_DS_START = -1000293,
SAY_DS_DOWN_1 = -1000403, SAY_DS_DOWN_1 = -1000294,
SAY_DS_DOWN_2 = -1000404, SAY_DS_DOWN_2 = -1000295,
SAY_DS_DOWN_3 = -1000405, SAY_DS_DOWN_3 = -1000296,
SAY_DS_PROLOGUE = -1000406, SAY_DS_PROLOGUE = -1000297,
SPELL_SHOOT = 6660, SPELL_SHOOT = 6660,
QUEST_TOME_VALOR = 1651, QUEST_TOME_VALOR = 1651,
+11 -11
View File
@@ -42,15 +42,15 @@ EndContentData */
enum eEnums enum eEnums
{ {
SAY_HEAL1 = -1000248, SAY_HEAL1 = -1000176,
SAY_HEAL2 = -1000249, SAY_HEAL2 = -1000177,
SAY_HEAL3 = -1000250, SAY_HEAL3 = -1000178,
SAY_HEAL4 = -1000251, SAY_HEAL4 = -1000179,
SAY_HELP1 = -1000252, SAY_HELP1 = -1000180,
SAY_HELP2 = -1000253, SAY_HELP2 = -1000181,
SAY_HELP3 = -1000254, SAY_HELP3 = -1000182,
SAY_HELP4 = -1000255, SAY_HELP4 = -1000183,
SPELL_IRRIDATION = 35046, SPELL_IRRIDATION = 35046,
SPELL_STUNNED = 28630 SPELL_STUNNED = 28630
@@ -168,9 +168,9 @@ CreatureAI* GetAI_npc_draenei_survivor(Creature* pCreature)
enum eOvergrind enum eOvergrind
{ {
SAY_TEXT = -1000256, SAY_TEXT = -1000184,
SAY_EMOTE = -1000257, SAY_EMOTE = -1000185,
ATTACK_YELL = -1000258, ATTACK_YELL = -1000186,
AREA_COVE = 3579, AREA_COVE = 3579,
AREA_ISLE = 3639, AREA_ISLE = 3639,
+13 -13
View File
@@ -174,19 +174,19 @@ bool QuestAccept_npc_kerlonian(Player* pPlayer, Creature* pCreature, const Quest
enum eRemtravel enum eRemtravel
{ {
SAY_REM_START = -1000415, // signed for 4966 SAY_REM_START = -1000327,
SAY_REM_AGGRO = -1000427, // signed for 9999 SAY_REM_AGGRO = -1000328,
SAY_REM_RAMP1_1 = -1000416, // signed for 9999 SAY_REM_RAMP1_1 = -1000329,
SAY_REM_RAMP1_2 = -1000417, // signed for 9999 SAY_REM_RAMP1_2 = -1000330,
SAY_REM_BOOK = -1000418, // signed for 9999 SAY_REM_BOOK = -1000331,
SAY_REM_TENT1_1 = -1000419, // signed for 9999 SAY_REM_TENT1_1 = -1000332,
SAY_REM_TENT1_2 = -1000420, // signed for 9999 SAY_REM_TENT1_2 = -1000333,
SAY_REM_MOSS = -1000421, // signed for 9999 SAY_REM_MOSS = -1000334,
EMOTE_REM_MOSS = -1000422, // signed for 9999 EMOTE_REM_MOSS = -1000335,
SAY_REM_MOSS_PROGRESS = -1000423, // signed for 9999 SAY_REM_MOSS_PROGRESS = -1000336,
SAY_REM_PROGRESS = -1000424, // signed for 9999 SAY_REM_PROGRESS = -1000337,
SAY_REM_REMEMBER = -1000425, // signed for 9999 SAY_REM_REMEMBER = -1000338,
EMOTE_REM_END = -1000426, // signed for 9999 EMOTE_REM_END = -1000339,
FACTION_ESCORTEE = 10, FACTION_ESCORTEE = 10,
QUEST_ABSENT_MINDED_PT2 = 731, QUEST_ABSENT_MINDED_PT2 = 731,
+3 -3
View File
@@ -30,9 +30,9 @@ EndContentData */
enum eDyingKodo enum eDyingKodo
{ {
// signed for 9999 // signed for 9999
SAY_SMEED_HOME_1 = -1000428, SAY_SMEED_HOME_1 = -1000348,
SAY_SMEED_HOME_2 = -1000429, SAY_SMEED_HOME_2 = -1000349,
SAY_SMEED_HOME_3 = -1000430, SAY_SMEED_HOME_3 = -1000350,
QUEST_KODO = 5561, QUEST_KODO = 5561,
+3 -3
View File
@@ -64,9 +64,9 @@ bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature, uin
enum eKyleFrenzied enum eKyleFrenzied
{ {
//emote signed for 7780 but propably thats wrong id. //emote signed for 7780 but propably thats wrong id.
EMOTE_SEE_LUNCH = -1000407, EMOTE_SEE_LUNCH = -1000340,
EMOTE_EAT_LUNCH = -1000408, EMOTE_EAT_LUNCH = -1000341,
EMOTE_DANCE = -1000409, EMOTE_DANCE = -1000342,
SPELL_LUNCH = 42222, SPELL_LUNCH = 42222,
NPC_KYLE_FRENZIED = 23616, NPC_KYLE_FRENZIED = 23616,
@@ -88,9 +88,9 @@ enum eKaya
NPC_GRIMTOTEM_BRUTE = 11912, NPC_GRIMTOTEM_BRUTE = 11912,
NPC_GRIMTOTEM_SORCERER = 11913, NPC_GRIMTOTEM_SORCERER = 11913,
SAY_START = -1000347, SAY_START = -1000357,
SAY_AMBUSH = -1000348, SAY_AMBUSH = -1000358,
SAY_END = -1000349, SAY_END = -1000359,
QUEST_PROTECT_KAYA = 6523 QUEST_PROTECT_KAYA = 6523
}; };
+2 -2
View File
@@ -34,8 +34,8 @@ EndContentData */
enum eMist enum eMist
{ {
SAY_AT_HOME = -1000411, SAY_AT_HOME = -1000323,
EMOTE_AT_HOME = -1000412, EMOTE_AT_HOME = -1000324,
QUEST_MIST = 938, QUEST_MIST = 938,
NPC_ARYNIA = 3519, NPC_ARYNIA = 3519,
FACTION_DARNASSUS = 79 FACTION_DARNASSUS = 79
+8 -8
View File
@@ -505,14 +505,14 @@ CreatureAI* GetAI_npc_twiggy_flathead(Creature* pCreature)
enum eEnums_Wizzlecrank enum eEnums_Wizzlecrank
{ {
SAY_START = -1000272, SAY_START = -1000298,
SAY_STARTUP1 = -1000273, SAY_STARTUP1 = -1000299,
SAY_STARTUP2 = -1000274, SAY_STARTUP2 = -1000300,
SAY_MERCENARY = -1000275, SAY_MERCENARY = -1000301,
SAY_PROGRESS_1 = -1000276, SAY_PROGRESS_1 = -1000302,
SAY_PROGRESS_2 = -1000277, SAY_PROGRESS_2 = -1000303,
SAY_PROGRESS_3 = -1000278, SAY_PROGRESS_3 = -1000304,
SAY_END = -1000279, SAY_END = -1000305,
QUEST_ESCAPE = 863, QUEST_ESCAPE = 863,
FACTION_RATCHET = 637, FACTION_RATCHET = 637,
+3 -3
View File
@@ -190,9 +190,9 @@ bool QuestAccept_npc_lakota_windsong(Player* pPlayer, Creature* pCreature, const
enum ePacka enum ePacka
{ {
SAY_START = -1000147, SAY_START = -1000362,
SAY_WYVERN = -1000148, SAY_WYVERN = -1000363,
SAY_COMPLETE = -1000149, SAY_COMPLETE = -1000364,
QUEST_HOMEWARD = 4770, QUEST_HOMEWARD = 4770,
NPC_WYVERN = 4107, NPC_WYVERN = 4107,
+6 -6
View File
@@ -36,12 +36,12 @@ EndContentData */
######*/ ######*/
//used by 20209,20417,20418,20440, signed for 20209 //used by 20209,20417,20418,20440, signed for 20209
#define EMOTE_START -1000296 #define EMOTE_START -1000211
#define EMOTE_60 -1000297 #define EMOTE_60 -1000212
#define EMOTE_30 -1000298 #define EMOTE_30 -1000213
#define EMOTE_10 -1000299 #define EMOTE_10 -1000214
#define EMOTE_COMPLETE -1000300 #define EMOTE_COMPLETE -1000215
#define EMOTE_ABORT -1000301 #define EMOTE_ABORT -1000216
#define ENTRY_BNAAR_C_CONSOLE 20209 #define ENTRY_BNAAR_C_CONSOLE 20209
#define ENTRY_CORUU_C_CONSOLE 20417 #define ENTRY_CORUU_C_CONSOLE 20417
+28 -28
View File
@@ -252,28 +252,28 @@ bool GossipSelect_npc_zephyr(Player* pPlayer, Creature* pCreature, uint32 uiSend
# npc_kservant # npc_kservant
######*/ ######*/
#define SAY1 -1000306 #define SAY1 -1000234
#define WHISP1 -1000307 #define WHISP1 -1000235
#define WHISP2 -1000308 #define WHISP2 -1000236
#define WHISP3 -1000309 #define WHISP3 -1000237
#define WHISP4 -1000310 #define WHISP4 -1000238
#define WHISP5 -1000311 #define WHISP5 -1000239
#define WHISP6 -1000312 #define WHISP6 -1000240
#define WHISP7 -1000313 #define WHISP7 -1000241
#define WHISP8 -1000314 #define WHISP8 -1000242
#define WHISP9 -1000315 #define WHISP9 -1000243
#define WHISP10 -1000316 #define WHISP10 -1000244
#define WHISP11 -1000317 #define WHISP11 -1000245
#define WHISP12 -1000318 #define WHISP12 -1000246
#define WHISP13 -1000319 #define WHISP13 -1000247
#define WHISP14 -1000320 #define WHISP14 -1000248
#define WHISP15 -1000321 #define WHISP15 -1000249
#define WHISP16 -1000322 #define WHISP16 -1000250
#define WHISP17 -1000323 #define WHISP17 -1000251
#define WHISP18 -1000324 #define WHISP18 -1000252
#define WHISP19 -1000325 #define WHISP19 -1000253
#define WHISP20 -1000326 #define WHISP20 -1000254
#define WHISP21 -1000327 #define WHISP21 -1000255
struct npc_kservantAI : public npc_escortAI struct npc_kservantAI : public npc_escortAI
{ {
@@ -348,12 +348,12 @@ CreatureAI* GetAI_npc_kservantAI(Creature* pCreature)
#define GOSSIP_BOOK "Ezekiel said that you might have a certain book..." #define GOSSIP_BOOK "Ezekiel said that you might have a certain book..."
#define SAY_1 -1000328 #define SAY_1 -1000274
#define SAY_2 -1000329 #define SAY_2 -1000275
#define SAY_3 -1000330 #define SAY_3 -1000276
#define SAY_4 -1000331 #define SAY_4 -1000277
#define SAY_5 -1000332 #define SAY_5 -1000278
#define SAY_GIVEUP -1000333 #define SAY_GIVEUP -1000279
#define QUEST_WBI 10231 #define QUEST_WBI 10231
#define NPC_CREEPJACK 19726 #define NPC_CREEPJACK 19726
+2 -2
View File
@@ -38,7 +38,7 @@ EndContentData */
## mob_unkor_the_ruthless ## mob_unkor_the_ruthless
######*/ ######*/
#define SAY_SUBMIT -1000351 #define SAY_SUBMIT -1000194
#define FACTION_HOSTILE 45 #define FACTION_HOSTILE 45
#define FACTION_FRIENDLY 35 #define FACTION_FRIENDLY 35
@@ -302,7 +302,7 @@ CreatureAI* GetAI_mob_netherweb_victim(Creature* pCreature)
enum eFloon enum eFloon
{ {
SAY_FLOON_ATTACK = -1000352, SAY_FLOON_ATTACK = -1000195,
SPELL_SILENCE = 6726, SPELL_SILENCE = 6726,
SPELL_FROSTBOLT = 9672, SPELL_FROSTBOLT = 9672,
+6 -6
View File
@@ -267,12 +267,12 @@ bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature, uin
enum eKayra enum eKayra
{ {
SAY_START = -1000360, SAY_START = -1000343,
SAY_AMBUSH1 = -1000361, SAY_AMBUSH1 = -1000344,
SAY_PROGRESS = -1000362, SAY_PROGRESS = -1000345,
SAY_AMBUSH2 = -1000363, SAY_AMBUSH2 = -1000346,
SAY_NEAR_END = -1000364, SAY_NEAR_END = -1000347,
SAY_END = -1000365, //this is signed for 10646 SAY_END = -1000348, //this is signed for 10646
QUEST_ESCAPE_FROM = 9752, QUEST_ESCAPE_FROM = 9752,
NPC_SLAVEBINDER = 18042 NPC_SLAVEBINDER = 18042