diff options
| -rw-r--r-- | sql/scripts/world_scripts_full.sql | 1 | ||||
| -rw-r--r-- | sql/updates/10806_world_scriptname.sql | 1 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/orgrimmar.cpp | 40 |
3 files changed, 2 insertions, 40 deletions
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index b53ff99631c..062d99f08c3 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -1060,7 +1060,6 @@ UPDATE `instance_template` SET `script`='instance_onyxias_lair' WHERE `map`=249; UPDATE `creature_template` SET `ScriptName`='boss_onyxia' WHERE `entry`=10184; /* ORGRIMMAR */ -UPDATE `creature_template` SET `ScriptName`='npc_neeru_fireblade' WHERE `entry`=3216; UPDATE `creature_template` SET `ScriptName`='npc_shenthul' WHERE `entry`=3401; UPDATE `creature_template` SET `ScriptName`='npc_thrall_warchief' WHERE `entry`=4949; diff --git a/sql/updates/10806_world_scriptname.sql b/sql/updates/10806_world_scriptname.sql new file mode 100644 index 00000000000..d2f02595e72 --- /dev/null +++ b/sql/updates/10806_world_scriptname.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=3216; -- Neeru Fireblade
\ No newline at end of file diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp index 832c18a15d0..533445bf6c3 100644 --- a/src/server/scripts/Kalimdor/orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/orgrimmar.cpp @@ -19,12 +19,11 @@ /* ScriptData SDName: Orgrimmar SD%Complete: 100 -SDComment: Quest support: 2460, 5727, 6566 +SDComment: Quest support: 2460, 6566 SDCategory: Orgrimmar EndScriptData */ /* ContentData -npc_neeru_fireblade npc_text + gossip options text missing npc_shenthul npc_thrall_warchief EndContentData */ @@ -39,42 +38,6 @@ EndContentData */ #define GOSSIP_HNF "You may speak frankly, Neeru..." #define GOSSIP_SNF "[PH] ..." -class npc_neeru_fireblade : public CreatureScript -{ -public: - npc_neeru_fireblade() : CreatureScript("npc_neeru_fireblade") { } - - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) - { - pPlayer->PlayerTalkClass->ClearMenus(); - switch (uiAction) - { - case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(4513, pCreature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(QUEST_5727); - break; - } - return true; - } - - bool OnGossipHello(Player* pPlayer, Creature* pCreature) - { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - if (pPlayer->GetQuestStatus(QUEST_5727) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - - pPlayer->SEND_GOSSIP_MENU(4513, pCreature->GetGUID()); - return true; - } - -}; - /*###### ## npc_shenthul @@ -293,7 +256,6 @@ public: void AddSC_orgrimmar() { - new npc_neeru_fireblade(); new npc_shenthul(); new npc_thrall_warchief(); } |