diff --git a/sql/scriptdev2/scriptdev2.sql b/sql/scriptdev2/scriptdev2.sql index b2778ad1a3c..c38706b503f 100644 --- a/sql/scriptdev2/scriptdev2.sql +++ b/sql/scriptdev2/scriptdev2.sql @@ -413,7 +413,6 @@ UPDATE creature_template SET ScriptName='npc_rizzle_sprysprocket' WHERE entry=23 UPDATE creature_template SET ScriptName='npc_depth_charge' WHERE entry=23025; UPDATE gameobject_template SET ScriptName='go_southfury_moonstone' WHERE entry=185566; UPDATE creature_template SET ScriptName='mobs_spitelashes' WHERE entry IN (6190,6193,6194,6195,6196); -UPDATE creature_template SET ScriptName='npc_loramus_thalipedes' WHERE entry=7783; UPDATE creature_template SET ScriptName='npc_felhound_tracker' WHERE entry=8668; UPDATE creature_template SET ScriptName='boss_maws' WHERE entry=15571; UPDATE gameobject_template SET ScriptName='go_lightning' WHERE entry=183356; diff --git a/src/game/AI/ScriptDevAI/scripts/kalimdor/azshara.cpp b/src/game/AI/ScriptDevAI/scripts/kalimdor/azshara.cpp index dd6eb98b725..bba09411b5f 100644 --- a/src/game/AI/ScriptDevAI/scripts/kalimdor/azshara.cpp +++ b/src/game/AI/ScriptDevAI/scripts/kalimdor/azshara.cpp @@ -26,7 +26,6 @@ npc_rizzle_sprysprocket npc_depth_charge go_southfury_moonstone mobs_spitelashes -npc_loramus_thalipedes npc_felhound_tracker event_arcanite_buoy go_lightning @@ -404,63 +403,6 @@ UnitAI* GetAI_mobs_spitelashes(Creature* pCreature) return new mobs_spitelashesAI(pCreature); } -/*###### -## npc_loramus_thalipedes -######*/ - -bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid()); - - if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - - if (pPlayer->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid()); - - return true; -} - -bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - switch (uiAction) - { - case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(2744); - break; - - case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); - pPlayer->SEND_GOSSIP_MENU(1813, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+21: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); - pPlayer->SEND_GOSSIP_MENU(1814, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+22: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); - pPlayer->SEND_GOSSIP_MENU(1815, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+23: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); - pPlayer->SEND_GOSSIP_MENU(1816, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+24: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); - pPlayer->SEND_GOSSIP_MENU(1817, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+25: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(3141); - break; - } - return true; -} - /*###### ## npc_felhound_tracker ######*/ @@ -790,12 +732,6 @@ void AddSC_azshara() pNewScript->GetAI = &GetAI_mobs_spitelashes; pNewScript->RegisterSelf(); - pNewScript = new Script; - pNewScript->Name = "npc_loramus_thalipedes"; - pNewScript->pGossipHello = &GossipHello_npc_loramus_thalipedes; - pNewScript->pGossipSelect = &GossipSelect_npc_loramus_thalipedes; - pNewScript->RegisterSelf(); - pNewScript = new Script; pNewScript->Name = "npc_felhound_tracker"; pNewScript->GetAI = &GetAI_npc_felhound_tracker;