diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-01-12 19:18:13 +0100 |
|---|---|---|
| committer | treeston <treeston.mmoc@gmail.com> | 2016-01-12 19:18:13 +0100 |
| commit | 3ea6324507ff77c6d911d9e84eafce8631dbfd59 (patch) | |
| tree | a14d9ef6f84f3420accb796907776672f5640dad | |
| parent | 90914518184061d06c7bfba0aebc4ac03b23104f (diff) | |
| parent | 76d5dbad4b7007fdff892e2fcaff6c000a713ed7 (diff) | |
Merge remote-tracking branch 'tkrokli/npc_myranda_the_hag' into 3.3.5-base
| -rw-r--r-- | sql/updates/world/2016_01_12_02_world335.sql | 4 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sql/updates/world/2016_01_12_02_world335.sql b/sql/updates/world/2016_01_12_02_world335.sql new file mode 100644 index 00000000000..354d0bc129d --- /dev/null +++ b/sql/updates/world/2016_01_12_02_world335.sql @@ -0,0 +1,4 @@ +-- Insert missing gossip_menu_option 3801 for Myranda the Hag: +DELETE FROM `gossip_menu_option` WHERE `menu_id`= 3801 AND `OptionBroadcastTextID`= 7306; +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES +(3801,0,0,'I am ready for the illusion, Myranda.',7306,2,3,0,0,0,0,'',0); diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 4ab9d872887..6cf86c3069f 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -114,13 +114,12 @@ public: enum Myranda { + ILLUSION_GOSSIP = 4773, QUEST_SUBTERFUGE = 5862, QUEST_IN_DREAMS = 5944, SPELL_SCARLET_ILLUSION = 17961 }; -#define GOSSIP_ITEM_ILLUSION "I am ready for the illusion, Myranda." - class npc_myranda_the_hag : public CreatureScript { public: @@ -146,8 +145,8 @@ public: player->GetQuestStatus(QUEST_IN_DREAMS) != QUEST_STATUS_COMPLETE && !player->HasAura(SPELL_SCARLET_ILLUSION)) { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ILLUSION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - player->SEND_GOSSIP_MENU(4773, creature->GetGUID()); + player->ADD_GOSSIP_ITEM_DB(Player::GetDefaultGossipMenuForSource(creature), 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(ILLUSION_GOSSIP, creature->GetGUID()); return true; } else |