diff options
| -rw-r--r-- | sql/updates/world/2013_07_15_02_world_gossip.sql | 8 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp | 36 |
2 files changed, 18 insertions, 26 deletions
diff --git a/sql/updates/world/2013_07_15_02_world_gossip.sql b/sql/updates/world/2013_07_15_02_world_gossip.sql new file mode 100644 index 00000000000..9e54b17899a --- /dev/null +++ b/sql/updates/world/2013_07_15_02_world_gossip.sql @@ -0,0 +1,8 @@ +-- Gossip fixup for Morridune +UPDATE `creature_template` SET `gossip_menu_id`=321 WHERE `entry`=6729; +DELETE FROM `gossip_menu` WHERE `entry` IN (321); +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (321,818); +-- Gossip Options +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (321); +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`) VALUES +(321,0,0, 'Please port me to Darnassus.',1,1,0); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index b64c7c199f2..dbdd8197f72 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -201,32 +201,6 @@ class npc_morridune : public CreatureScript public: npc_morridune() : CreatureScript("npc_morridune") { } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE - { - player->PlayerTalkClass->ClearMenus(); - switch (action) - { - case GOSSIP_ACTION_INFO_DEF + 1: - player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); - player->CLOSE_GOSSIP_MENU(); - break; - } - return true; - } - - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE - { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MORRIDUNE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - - player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); - return true; - } - - CreatureAI* GetAI(Creature* creature) const OVERRIDE - { - return new npc_morriduneAI(creature); - } - struct npc_morriduneAI : public npc_escortAI { npc_morriduneAI(Creature* creature) : npc_escortAI(creature) @@ -248,7 +222,17 @@ public: break; } } + + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + { + player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); + } }; + + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new npc_morriduneAI(creature); + } }; void AddSC_blackfathom_deeps() |