diff options
Diffstat (limited to 'src/server/scripts/Northrend')
3 files changed, 33 insertions, 21 deletions
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); |