diff options
author | lee <leelf_00@126.com> | 2022-03-26 06:20:01 +0800 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-03-26 16:12:01 +0100 |
commit | ad30c22902a23996f805f74851aef58935c56a6e (patch) | |
tree | 92af96eeb5cab9f79d7e1dc0fa3ed48f22531660 /src | |
parent | 7c8a034d82b9eda30d1a3652c9802e101e0e8033 (diff) |
Scripts/Misc: Load some texts from DB (#27867)
(cherry picked from commit e7c02d6a9025826fc9aa47787a175e7a7b520b6d)
Diffstat (limited to 'src')
9 files changed, 128 insertions, 100 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index 4d1c9d3b31b..e72e7f0ce80 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -434,11 +434,12 @@ enum Lokhtos QUEST_A_BINDING_CONTRACT = 7604, ITEM_SULFURON_INGOT = 17203, ITEM_THRORIUM_BROTHERHOOD_CONTRACT = 18628, - SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND = 23059 + SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND = 23059, + GOSSIP_ITEM_SHOW_ACCESS_MID = 4781, // Show me what I have access to, Lokhtos. + GOSSIP_ITEM_SHOW_ACCESS_OID = 0, }; -#define GOSSIP_ITEM_SHOW_ACCESS "Show me what I have access to, Lothos." -#define GOSSIP_ITEM_GET_CONTRACT "Get Thorium Brotherhood Contract" +#define GOSSIP_ITEM_GET_CONTRACT "Get Thorium Brotherhood Contract" // miss in db,maybe wrong class npc_lokhtos_darkbargainer : public CreatureScript { @@ -471,7 +472,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript player->PrepareQuestMenu(me->GetGUID()); if (me->IsVendor() && player->GetReputationRank(59) >= REP_FRIENDLY) - AddGossipItemFor(player, GossipOptionIcon::Vendor, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + AddGossipItemFor(player, GOSSIP_ITEM_SHOW_ACCESS_MID, GOSSIP_ITEM_SHOW_ACCESS_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (!player->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) && !player->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) && diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 7150ac08c22..982777e07dd 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -65,16 +65,13 @@ enum Creatures # npc_barnesAI ######*/ -#define GOSSIP_READY "I'm not an actor." - -#define SAY_READY "Splendid, I'm going to get the audience ready. Break a leg!" -#define SAY_OZ_INTRO1 "Finally, everything is in place. Are you ready for your big stage debut?" -#define OZ_GOSSIP1 "I'm not an actor." -#define SAY_OZ_INTRO2 "Don't worry, you'll be fine. You look like a natural!" -#define OZ_GOSSIP2 "Ok, I'll give it a try, then." - -#define SAY_RAJ_INTRO1 "The romantic plays are really tough, but you'll do better this time. You have TALENT. Ready?" -#define RAJ_GOSSIP1 "I've never been more ready." +enum Misc +{ + OZ_GOSSIP1_MID = 7421, // I'm not an actor. + OZ_GOSSIP1_OID = 0, + OZ_GOSSIP2_MID = 7422, // Ok, I'll give it a try, then. + OZ_GOSSIP2_OID = 0, +}; #define OZ_GM_GOSSIP1 "[GM] Change event to EVENT_OZ" #define OZ_GM_GOSSIP2 "[GM] Change event to EVENT_HOOD" @@ -343,7 +340,7 @@ public: switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: - AddGossipItemFor(player, GossipOptionIcon::None, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + AddGossipItemFor(player, OZ_GOSSIP2_MID, OZ_GOSSIP2_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); SendGossipMenuFor(player, 8971, me->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -376,7 +373,7 @@ public: // Check for death of Moroes and if opera event is not done already if (instance->GetBossState(DATA_MOROES) == DONE && instance->GetBossState(DATA_OPERA_PERFORMANCE) != DONE) { - AddGossipItemFor(player, GossipOptionIcon::None, OZ_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, OZ_GOSSIP1_MID, OZ_GOSSIP1_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); if (player->IsGameMaster()) { @@ -408,15 +405,18 @@ public: # npc_image_of_medivh ####*/ -#define SAY_DIALOG_MEDIVH_1 "You've got my attention, dragon. You'll find I'm not as easily scared as the villagers below." -#define SAY_DIALOG_ARCANAGOS_2 "Your dabbling in the arcane has gone too far, Medivh. You've attracted the attention of powers beyond your understanding. You must leave Karazhan at once!" -#define SAY_DIALOG_MEDIVH_3 "You dare challenge me at my own dwelling? Your arrogance is astounding, even for a dragon!" -#define SAY_DIALOG_ARCANAGOS_4 "A dark power seeks to use you, Medivh! If you stay, dire days will follow. You must hurry, we don't have much time!" -#define SAY_DIALOG_MEDIVH_5 "I do not know what you speak of, dragon... but I will not be bullied by this display of insolence. I'll leave Karazhan when it suits me!" -#define SAY_DIALOG_ARCANAGOS_6 "You leave me no alternative. I will stop you by force if you won't listen to reason!" -#define EMOTE_DIALOG_MEDIVH_7 "begins to cast a spell of great power, weaving his own essence into the magic." -#define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" -#define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." +enum +{ + SAY_DIALOG_MEDIVH_1 = 0, + SAY_DIALOG_ARCANAGOS_2 = 0, + SAY_DIALOG_MEDIVH_3 = 1, + SAY_DIALOG_ARCANAGOS_4 = 1, + SAY_DIALOG_MEDIVH_5 = 2, + SAY_DIALOG_ARCANAGOS_6 = 2, + EMOTE_DIALOG_MEDIVH_7 = 3, + SAY_DIALOG_ARCANAGOS_8 = 3, + SAY_DIALOG_MEDIVH_9 = 4 +}; static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; @@ -511,25 +511,25 @@ public: { case 0: return 9999999; case 1: - me->Yell(SAY_DIALOG_MEDIVH_1, LANG_UNIVERSAL); + Talk(SAY_DIALOG_MEDIVH_1); return 10000; case 2: if (Creature* arca = ObjectAccessor::GetCreature(*me, ArcanagosGUID)) - arca->Yell(SAY_DIALOG_ARCANAGOS_2, LANG_UNIVERSAL); + arca->AI()->Talk(SAY_DIALOG_ARCANAGOS_2); return 20000; case 3: - me->Yell(SAY_DIALOG_MEDIVH_3, LANG_UNIVERSAL); + Talk(SAY_DIALOG_MEDIVH_3); return 10000; case 4: if (Creature* arca = ObjectAccessor::GetCreature(*me, ArcanagosGUID)) - arca->Yell(SAY_DIALOG_ARCANAGOS_4, LANG_UNIVERSAL); + arca->AI()->Talk(SAY_DIALOG_ARCANAGOS_4); return 20000; case 5: - me->Yell(SAY_DIALOG_MEDIVH_5, LANG_UNIVERSAL); + Talk(SAY_DIALOG_MEDIVH_5); return 20000; case 6: if (Creature* arca = ObjectAccessor::GetCreature(*me, ArcanagosGUID)) - arca->Yell(SAY_DIALOG_ARCANAGOS_6, LANG_UNIVERSAL); + arca->AI()->Talk(SAY_DIALOG_ARCANAGOS_6); return 10000; case 7: FireArcanagosTimer = 500; @@ -539,7 +539,7 @@ public: DoCast(me, SPELL_MANA_SHIELD); return 10000; case 9: - me->TextEmote(EMOTE_DIALOG_MEDIVH_7); + Talk(EMOTE_DIALOG_MEDIVH_7); return 10000; case 10: if (Creature* arca = ObjectAccessor::GetCreature(*me, ArcanagosGUID)) @@ -547,7 +547,7 @@ public: return 1000; case 11: if (Creature* arca = ObjectAccessor::GetCreature(*me, ArcanagosGUID)) - arca->Yell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL); + arca->AI()->Talk(SAY_DIALOG_ARCANAGOS_8); return 5000; case 12: if (Creature* arca = ObjectAccessor::GetCreature(*me, ArcanagosGUID)) @@ -560,7 +560,7 @@ public: } return 10000; case 13: - me->Yell(SAY_DIALOG_MEDIVH_9, LANG_UNIVERSAL); + Talk(SAY_DIALOG_MEDIVH_9); return 10000; case 14: { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 83c84517ad8..891db86be55 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -35,15 +35,24 @@ EndContentData */ #include "Player.h" #include "ScriptedGossip.h" -#define GOSSIP_ITEM_BEGIN_ALLY "My companions and I are with you, Lady Proudmoore." -#define GOSSIP_ITEM_ANETHERON "We are ready for whatever Archimonde might send our way, Lady Proudmoore." - -#define GOSSIP_ITEM_BEGIN_HORDE "I am with you, Thrall." -#define GOSSIP_ITEM_AZGALOR "We have nothing to fear." - -#define GOSSIP_ITEM_RETREAT "We can't keep this up. Let's retreat!" +enum GOSSIPS +{ + GOSSIP_ITEM_BEGIN_ALLY_MID = 7552, // My companions and I are with you, Lady Proudmoore. + GOSSIP_ITEM_BEGIN_ALLY_OID = 0, + GOSSIP_ITEM_ANETHERON_MID = 7552, // We are ready for whatever Archimonde might send our way, Lady Proudmoore. + GOSSIP_ITEM_ANETHERON_OID = 1, + GOSSIP_ITEM_ALLY_RETREAT_MID = 7552, // Until we meet again, Lady Proudmoore. + GOSSIP_ITEM_ALLY_RETREAT_OID = 2, + GOSSIP_ITEM_BEGIN_HORDE_MID = 7581, // I am with you, Thrall. + GOSSIP_ITEM_BEGIN_HORDE_OID = 0, + GOSSIP_ITEM_AZGALOR_MID = 7581, // We have nothing to fear. + GOSSIP_ITEM_AZGALOR_OID = 1, + GOSSIP_ITEM_HORDE_RETREAT_MID = 7581, //Until we meet again, Thrall. + GOSSIP_ITEM_HORDE_RETREAT_OID = 2, + GOSSIP_ITEM_TYRANDE_MID = 7706, // I would be grateful for any aid you can provide, Priestess. + GOSSIP_ITEM_TYRANDE_OID = 0 +}; -#define GOSSIP_ITEM_TYRANDE "Aid us in defending Nordrassil" #define ITEM_TEAR_OF_GODDESS 24494 #define GOSSIP_ITEM_GM1 "[GM] Toggle Debug Timers" @@ -103,11 +112,11 @@ class npc_jaina_proudmoore : public CreatureScript uint32 RageEncounter = GetInstanceData(DATA_RAGEWINTERCHILLEVENT); uint32 AnetheronEncounter = GetInstanceData(DATA_ANETHERONEVENT); if (RageEncounter == NOT_STARTED) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_ITEM_BEGIN_ALLY_MID, GOSSIP_ITEM_BEGIN_ALLY_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + AddGossipItemFor(player, GOSSIP_ITEM_ANETHERON_MID, GOSSIP_ITEM_ANETHERON_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); else if (RageEncounter == DONE && AnetheronEncounter == DONE) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + AddGossipItemFor(player, GOSSIP_ITEM_ALLY_RETREAT_MID, GOSSIP_ITEM_ALLY_RETREAT_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); if (player->IsGameMaster()) AddGossipItemFor(player, GossipOptionIcon::Trainer, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -179,11 +188,11 @@ class npc_thrall : public CreatureScript uint32 KazrogalEvent = GetInstanceData(DATA_KAZROGALEVENT); uint32 AzgalorEvent = GetInstanceData(DATA_AZGALOREVENT); if (KazrogalEvent == NOT_STARTED) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_ITEM_BEGIN_HORDE_MID, GOSSIP_ITEM_BEGIN_HORDE_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + AddGossipItemFor(player, GOSSIP_ITEM_AZGALOR_MID, GOSSIP_ITEM_AZGALOR_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); else if (AzgalorEvent == DONE) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + AddGossipItemFor(player, GOSSIP_ITEM_HORDE_RETREAT_MID, GOSSIP_ITEM_HORDE_RETREAT_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); } if (player->IsGameMaster()) @@ -234,7 +243,7 @@ class npc_tyrande_whisperwind : public CreatureScript // Only let them get item if Azgalor is dead. if (AzgalorEvent == DONE && !player->HasItemCount(ITEM_TEAR_OF_GODDESS)) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + AddGossipItemFor(player, GOSSIP_ITEM_TYRANDE_MID, GOSSIP_ITEM_TYRANDE_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); SendGossipMenuFor(player, 907, me->GetGUID()); return true; } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 8d225a3f713..69f7c093873 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -43,10 +43,11 @@ enum Erozion QUEST_ENTRY_DIVERSION = 10283, QUEST_ENTRY_ESCAPE = 10284, QUEST_ENTRY_RETURN = 10285, - ITEM_ENTRY_BOMBS = 25853 + ITEM_ENTRY_BOMBS = 25853, + GOSSIP_MENU_EROZION = 7769, + GOSSIP_OPTION_BOMB = 0 //I need a pack of Incendiary Bombs. }; -#define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." -#define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." +#define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." //not in DB,maybe incorrect? /*###### ## npc_erozion @@ -88,7 +89,7 @@ public: player->PrepareQuestMenu(me->GetGUID()); if (instance->GetData(TYPE_BARREL_DIVERSION) != DONE && !player->HasItemCount(ITEM_ENTRY_BOMBS)) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_MENU_EROZION, GOSSIP_OPTION_BOMB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); if (player->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_HELLO_EROZION2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -178,19 +179,18 @@ enum ThrallOldHillsbrad GOSSIP_ID_SKARLOC2 = 9579, //What do you mean by this? Is Taretha in danger? GOSSIP_ID_SKARLOC3 = 9580, GOSSIP_ID_TARREN = 9597, //tarren mill is beyond these trees - GOSSIP_ID_COMPLETE = 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her + GOSSIP_ID_COMPLETE = 9578, //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her + GOSSIP_ITEM_WALKING_MID = 7499, + GOSSIP_ITEM_DEFAULT_OP = 0, //We are ready to get you out of here, Thrall. Let's go! + GOSSIP_ITEM_TARREN_MID = 7840, //We're ready, Thrall. + GOSSIP_ITEM_SKARLOC1_MID = 7830, //Taretha cannot see you, Thrall. + GOSSIP_ITEM_SKARLOC2_MID = 7829 //The situation is rather complicated, Thrall. It would be best for you to head into the mountains now, before more of Blackmoore's men show up. We'll make sure Taretha is safe. }; #define SPEED_WALK (0.5f) #define SPEED_RUN (1.0f) #define SPEED_MOUNT (1.6f) -//gossip items -#define GOSSIP_ITEM_SKARLOC1 "Taretha cannot see you, Thrall." -#define GOSSIP_ITEM_SKARLOC2 "The situation is rather complicated, Thrall. It would be best for you to head into the mountains now, before more of Blackmoore's men show up. We'll make sure Taretha is safe." -#define GOSSIP_ITEM_TARREN "We're ready, Thrall." -#define GOSSIP_ITEM_WALKING "We are ready to get you out of here, Thrall. Let's go!" - class npc_thrall_old_hillsbrad : public CreatureScript { public: @@ -489,7 +489,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 2: - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20); + AddGossipItemFor(player, GOSSIP_ITEM_SKARLOC2_MID, GOSSIP_ITEM_DEFAULT_OP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20); SendGossipMenuFor(player, GOSSIP_ID_SKARLOC2, me->GetGUID()); break; @@ -522,19 +522,19 @@ public: if (instance->GetData(TYPE_BARREL_DIVERSION) == DONE && !instance->GetData(TYPE_THRALL_EVENT)) { - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_ITEM_WALKING_MID, GOSSIP_ITEM_DEFAULT_OP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, GOSSIP_ID_START, me->GetGUID()); } if (instance->GetData(TYPE_THRALL_PART1) == DONE && !instance->GetData(TYPE_THRALL_PART2)) { - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + AddGossipItemFor(player, GOSSIP_ITEM_SKARLOC1_MID, GOSSIP_ITEM_DEFAULT_OP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); SendGossipMenuFor(player, GOSSIP_ID_SKARLOC1, me->GetGUID()); } if (instance->GetData(TYPE_THRALL_PART2) == DONE && !instance->GetData(TYPE_THRALL_PART3)) { - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + AddGossipItemFor(player, GOSSIP_ITEM_TARREN_MID, GOSSIP_ITEM_DEFAULT_OP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); SendGossipMenuFor(player, GOSSIP_ID_TARREN, me->GetGUID()); } return true; @@ -553,12 +553,13 @@ public: enum Taretha { GOSSIP_ID_EPOCH1 = 9610, //Thank you for helping Thrall escape, friends. Now I only hope - GOSSIP_ID_EPOCH2 = 9613 //Yes, friends. This man was no wizard of + GOSSIP_ID_EPOCH2 = 9613, //Yes, friends. This man was no wizard of + GOSSIP_ITEM_EPOCH1_MID = 7849, + GOSSIP_ITEM_EPOCH1_OID = 0, //Strange wizard? + GOSSIP_ITEM_EPOCH2_MID = 7852, + GOSSIP_ITEM_EPOCH2_OID = 0 //We'll get you out, Taretha. Don't worry. I doubt the wizard would wander too far away. }; -#define GOSSIP_ITEM_EPOCH1 "Strange wizard?" -#define GOSSIP_ITEM_EPOCH2 "We'll get you out. Taretha. Don't worry. I doubt the wizard would wander too far away." - class npc_taretha : public CreatureScript { public: @@ -601,7 +602,7 @@ public: if (action == GOSSIP_ACTION_INFO_DEF + 1) { - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + AddGossipItemFor(player, GOSSIP_ITEM_EPOCH2_MID, GOSSIP_ITEM_EPOCH2_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); SendGossipMenuFor(player, GOSSIP_ID_EPOCH2, me->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF + 2) @@ -625,7 +626,7 @@ public: { if (instance->GetData(TYPE_THRALL_PART3) == DONE && instance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) { - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_ITEM_EPOCH1_MID, GOSSIP_ITEM_EPOCH1_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, GOSSIP_ID_EPOCH1, me->GetGUID()); } return true; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index ca60f60c607..96aedc468ac 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -51,10 +51,14 @@ enum blySays enum blySpells { SPELL_SHIELD_BASH = 11972, - SPELL_REVENGE = 12170 + SPELL_REVENGE = 12170, }; -#define GOSSIP_BLY "That's it! I'm tired of helping you out. It's time we settled things on the battlefield!" +enum blygossip +{ + GOSSIP_BLY_MID = 941, //That's it! I'm tired of helping you out. It's time we settled things on the battlefield! + GOSSIP_BLY_OID = 1 +}; class npc_sergeant_bly : public CreatureScript { @@ -177,7 +181,7 @@ public: { if (instance->GetData(EVENT_PYRAMID) == PYRAMID_KILLED_ALL_TROLLS) { - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_BLY_MID, GOSSIP_BLY_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, 1517, me->GetGUID()); } else @@ -260,7 +264,11 @@ enum weegliSays SAY_WEEGLI_OK_I_GO = 1 }; -#define GOSSIP_WEEGLI "Will you blow up that door now?" +enum weegligossip +{ + GOSSIP_WEEGLI_MID = 940, // Will you blow up that door now? + GOSSIP_WEEGLI_OID = 0 +}; class npc_weegli_blastfuse : public CreatureScript { @@ -369,7 +377,7 @@ public: switch (instance->GetData(EVENT_PYRAMID)) { case PYRAMID_KILLED_ALL_TROLLS: - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_WEEGLI_MID, GOSSIP_WEEGLI_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, 1514, me->GetGUID()); //if event can proceed to end break; case PYRAMID_NOT_STARTED: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 85015f3e38e..e7e76e911e1 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -51,8 +51,13 @@ enum Yells SAY_DEATH = 7 }; -#define GOSSIP_START_EVENT1 "I'm ready to start challenge." -#define GOSSIP_START_EVENT2 "I'm ready for the next challenge." +enum Gossip +{ + GOSSIP_START_EVENT1_MID = 10614, // I'm ready to start challenge. + GOSSIP_START_EVENT1_OID = 0, + GOSSIP_START_EVENT2_MID = 10614, // I'm ready for the next challenge. + GOSSIP_START_EVENT2_OID = 1 +}; #define ORIENTATION 4.714f @@ -462,9 +467,9 @@ public: instance->GetBossState(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && instance->GetBossState(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED && instance->GetBossState(BOSS_BLACK_KNIGHT) == NOT_STARTED) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_START_EVENT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_START_EVENT1_MID, GOSSIP_START_EVENT1_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); else - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_START_EVENT2_MID, GOSSIP_START_EVENT2_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, player->GetGossipTextId(me), me->GetGUID()); return true; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 0fc67ea3555..a4c856c58bd 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -122,8 +122,13 @@ enum Misc }; -#define GOSSIP_ITEM_START "Brann, it would be our honor!" -#define GOSSIP_ITEM_PROGRESS "Let's move Brann, enough of the history lessons!" +enum Gossip +{ + GOSSIP_ITEM_START_MID = 9669, //Brann, it would be our honor! + GOSSIP_ITEM_START_OID = 0, + GOSSIP_ITEM_PROGRESS_MID = 9670, //Let's move Brann, enough of the history lessons! + GOSSIP_ITEM_PROGRESS_OID = 0 +}; static Position SpawnLocations[]= { @@ -687,7 +692,7 @@ struct npc_brann_hos : public EscortAI if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_ITEM_START_MID, GOSSIP_ITEM_START_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, TEXT_ID_START, me->GetGUID()); return true; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 89bfab2858c..8e94bdef929 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -379,10 +379,11 @@ enum Thassarian SAY_LERYSSA_1 = 0, SAY_LERYSSA_2 = 1, SAY_LERYSSA_3 = 2, - SAY_LERYSSA_4 = 3 -}; + SAY_LERYSSA_4 = 3, -#define GOSSIP_ITEM_T "Let's do this, Thassarian. It's now or never." + GOSSIP_THASSARIAN_MENU = 9418, //Let's do this, Thassarian. It's now or never. + GOSSIP_THASSARIAN_OP = 0 +}; class npc_thassarian : public CreatureScript { @@ -665,7 +666,7 @@ public: player->PrepareQuestMenu(me->GetGUID()); if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE && me->GetAreaId() == 4128) - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_T, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, GOSSIP_THASSARIAN_MENU, GOSSIP_THASSARIAN_OP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); SendGossipMenuFor(player, player->GetGossipTextId(me), me->GetGUID()); return true; @@ -1413,12 +1414,13 @@ enum HiddenCultist SAY_HIDDEN_CULTIST_1 = 0, SAY_HIDDEN_CULTIST_2 = 1, SAY_HIDDEN_CULTIST_3 = 2, - SAY_HIDDEN_CULTIST_4 = 3 -}; + SAY_HIDDEN_CULTIST_4 = 3, -char const* GOSSIP_ITEM_TOM_HEGGER = "What do you know about the Cult of the Damned?"; -char const* GOSSIP_ITEM_GUARD_MITCHELLS = "How long have you worked for the Cult of the Damned?"; -char const* GOSSIP_ITEM_SALTY_JOHN_THORPE = "I have a reason to believe you're involved in the cultist activity"; + GOSSIP_ITEM_TOM_HEGGER_MENUID = 9217, //What do you know about the Cult of the Damned? + GOSSIP_ITEM_GUARD_MITCHELLS_MENUID = 9219, //How long have you worked for the Cult of the Damned? + GOSSIP_ITEM_SALTY_JOHN_THORPE_MENUID = 9218, //I have a reason to believe you're involved in the cultist activity + GOSSIP_ITEM_HIDDEN_CULTIST_OPTIONID = 0 +}; class npc_hidden_cultist : public CreatureScript { @@ -1546,28 +1548,28 @@ public: bool OnGossipHello(Player* player) override { uint32 uiGossipText = 0; - char const* charGossipItem; + uint32 charGossipItem = 0; switch (me->GetEntry()) { case NPC_TOM_HEGGER: uiGossipText = GOSSIP_TEXT_TOM_HEGGER; - charGossipItem = GOSSIP_ITEM_TOM_HEGGER; + charGossipItem = GOSSIP_ITEM_TOM_HEGGER_MENUID; break; case NPC_SALTY_JOHN_THORPE: uiGossipText = GOSSIP_TEXT_SALTY_JOHN_THORPE; - charGossipItem = GOSSIP_ITEM_SALTY_JOHN_THORPE; + charGossipItem = GOSSIP_ITEM_SALTY_JOHN_THORPE_MENUID; break; case NPC_GUARD_MITCHELLS: uiGossipText = GOSSIP_TEXT_GUARD_MITCHELSS; - charGossipItem = GOSSIP_ITEM_GUARD_MITCHELLS; + charGossipItem = GOSSIP_ITEM_GUARD_MITCHELLS_MENUID; break; default: return false; } if (player->HasAura(SPELL_RIGHTEOUS_VISION) && player->GetQuestStatus(QUEST_THE_HUNT_IS_ON) == QUEST_STATUS_INCOMPLETE) - AddGossipItemFor(player, GossipOptionIcon::None, charGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + AddGossipItemFor(player, charGossipItem, GOSSIP_ITEM_HIDDEN_CULTIST_OPTIONID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); if (me->IsVendor()) AddGossipItemFor(player, GossipOptionIcon::Vendor, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 10b08e07296..d70b9ecb6ed 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -75,7 +75,6 @@ enum FathomlordKarathress SPELL_CYCLONE_CYCLONE = 29538, //Yells and Quotes - SOUND_GAIN_BLESSING_OF_TIDES = 11278, SOUND_MISC = 11283, //Summoned Unit GUIDs @@ -94,7 +93,6 @@ enum FathomlordKarathress #define OLUM_Z -7.54773f #define OLUM_O 0.401581f -#define SAY_GAIN_BLESSING_OF_TIDES "Your overconfidence will be your undoing! Guards, lend me your strength!" #define SAY_MISC "Alana be'lendor!" //don't know what use this #define MAX_ADVISORS 3 @@ -291,8 +289,7 @@ public: if (continueTriggering) { DoCast(me, SPELL_BLESSING_OF_THE_TIDES); - me->Yell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL); - DoPlaySoundToSet(me, SOUND_GAIN_BLESSING_OF_TIDES); + Talk(SAY_GAIN_BLESSING); } } |