diff options
| -rw-r--r-- | sql/scripts/world_scripts_full.sql | 1 | ||||
| -rw-r--r-- | sql/updates/world/2011_02_23_7_world_misc.sql | 76 | ||||
| -rw-r--r-- | sql/updates/world/2011_02_23_7_world_scriptname.sql | 1 | ||||
| -rw-r--r-- | src/server/scripts/Outland/shadowmoon_valley.cpp | 58 |
4 files changed, 78 insertions, 58 deletions
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index 58a90f99a36..2f9db2e0654 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -1172,7 +1172,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_drake_dealer_hurlunk' WHERE `en UPDATE `creature_template` SET `ScriptName`='npc_invis_legion_teleporter' WHERE `entry`=21807; UPDATE `creature_template` SET `ScriptName`='npcs_flanis_swiftwing_and_kagrosh' WHERE `entry` IN (21725,21727); UPDATE `creature_template` SET `ScriptName`='npc_murkblood_overseer' WHERE `entry`=23309; -UPDATE `creature_template` SET `ScriptName`='npc_neltharaku' WHERE `entry`=21657; UPDATE `creature_template` SET `ScriptName`='npc_oronok_tornheart' WHERE `entry`=21183; UPDATE `creature_template` SET `ScriptName`='mob_mature_netherwing_drake' WHERE `entry`=21648; UPDATE `creature_template` SET `ScriptName`='mob_enslaved_netherwing_drake' WHERE `entry`=21722; diff --git a/sql/updates/world/2011_02_23_7_world_misc.sql b/sql/updates/world/2011_02_23_7_world_misc.sql new file mode 100644 index 00000000000..a2ca5207b33 --- /dev/null +++ b/sql/updates/world/2011_02_23_7_world_misc.sql @@ -0,0 +1,76 @@ +-- SAI for Neltharaku +SET @ENTRY := 21657; +UPDATE `creature_template` SET `speed_run`=2.5,`ScriptName`='',`AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,62,0,100,0,8396,0,0,0,26,10814,0,1,0,0,0,7,0,0,0,0,0,0,0,'Neltharaku - On Gossip option - Quest credit'), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Neltharaku - On Gossip option - Close gossip'); +-- Waypoints for Neltharaku from sniff +SET @NPC := 75654; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4147.188,`position_y`=852.9213,`position_z`=112.449 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`bytes2`) VALUES (@ENTRY,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-4149.083,816.8467,102.0771,0,0,0,100,0), +(@PATH,2,-4148.741,817.7864,102.0771,0,0,0,100,0), +(@PATH,3,-4150.894,819.7193,112.4489,0,0,0,100,0), +(@PATH,4,-4147.188,852.9213,112.449,0,0,0,100,0), +(@PATH,5,-4126.215,897.6987,112.449,0,0,0,100,0), +(@PATH,6,-4113.534,926.0124,112.449,0,0,0,100,0), +(@PATH,7,-4098.13,963.6712,112.449,0,0,0,100,0), +(@PATH,8,-4063.067,1046.515,112.449,0,0,0,100,0), +(@PATH,9,-4008.534,1081.363,112.449,0,0,0,100,0), +(@PATH,10,-3926.171,1057.316,112.449,0,0,0,100,0), +(@PATH,11,-3914.31,958.3683,114.7823,0,0,0,100,0), +(@PATH,12,-3930.769,894.2169,114.2545,0,0,0,100,0), +(@PATH,13,-3991.642,763.9112,112.449,0,0,0,100,0), +(@PATH,14,-4060.605,579.9987,112.449,0,0,0,100,0), +(@PATH,15,-4085.638,468.8222,173.4489,0,0,0,100,0), +(@PATH,16,-4097.893,416.0321,177.8378,0,0,0,100,0), +(@PATH,17,-4110.39,374.4871,174.2545,0,0,0,100,0), +(@PATH,18,-4135.225,331.1968,174.7545,0,0,0,100,0), +(@PATH,19,-4203.078,269.2113,172.4767,0,0,0,100,0), +(@PATH,20,-4239.532,280.7727,169.0878,0,0,0,100,0), +(@PATH,21,-4278.137,304.6405,169.1989,0,0,0,100,0), +(@PATH,22,-4295.682,340.7838,173.9212,0,0,0,100,0), +(@PATH,23,-4297.044,383.0331,169.0878,0,0,0,100,0), +(@PATH,24,-4267.532,404.9037,169.0878,0,0,0,100,0), +(@PATH,25,-4225.749,416.8825,169.0878,0,0,0,100,0), +(@PATH,26,-4193.994,418.2155,169.0878,0,0,0,100,0), +(@PATH,27,-4176.15,444.5788,158.2545,0,0,0,100,0), +(@PATH,28,-4163.389,480.9925,149.6712,0,0,0,100,0), +(@PATH,29,-4157.379,548.4786,145.2823,0,0,0,100,0), +(@PATH,30,-4178.163,628.6951,101.0601,0,0,0,100,0), +(@PATH,31,-4182.795,656.5566,97.31005,0,0,0,100,0), +(@PATH,32,-4184.389,678.5916,98.50452,0,0,0,100,0), +(@PATH,33,-4182.358,726.181,102.5323,0,0,0,100,0), +(@PATH,34,-4175.015,753.1885,103.2545,0,0,0,100,0), +(@PATH,35,-4160.292,781.7564,107.8656,0,0,0,100,0), +(@PATH,36,-4150.894,819.7193,112.4489,0,0,0,100,0), +(@PATH,37,-4147.188,852.9213,112.449,0,0,0,100,0); + +-- Gossip Menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10614; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8394,10614); +DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10615; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8395,10615); +DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10616; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8396,10616); +-- Creature Gossip_menu_id Update from sniff +UPDATE `creature_template` SET `gossip_menu_id`=6944 WHERE `entry`=19352; +UPDATE `creature_template` SET `gossip_menu_id`=9563 WHERE `entry`=27575; +-- Creature Gossip_menu_option Update from sniff +DELETE FROM `gossip_menu_option` WHERE `id`=0 AND `menu_id` IN (8013,8397,8394,8395,8396); +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES +(8013,0,0, 'I see.',1,1,8014,0,0,0,0, ''), +(8397,0,0, 'I am listening, dragon.',1,1,8394,0,0,0,0, ''), +(8394,0,0, 'But you are dragons! How could orcs do this to you?',1,1,8395,0,0,0,0, ''), +(8395,0,0, 'Your mate?',1,1,8396,0,0,0,0, ''), +(8396,0,0, 'I have battled many beasts, dragon. I will help you.',1,1,0,0,0,0,0, ''); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8397; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,8397,0,0,9,10814,0,0,0,'','Show gossip option 0 if player has quest 10814'); diff --git a/sql/updates/world/2011_02_23_7_world_scriptname.sql b/sql/updates/world/2011_02_23_7_world_scriptname.sql new file mode 100644 index 00000000000..87b90aaf5dd --- /dev/null +++ b/sql/updates/world/2011_02_23_7_world_scriptname.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=21657; -- Neltharaku diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 5301dd91381..19c72718b5e 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Shadowmoon_Valley SD%Complete: 100 -SDComment: Quest support: 10519, 10583, 10601, 10814, 10804, 10854, 10458, 10481, 10480, 11082, 10781, 10451. Vendor Drake Dealer Hurlunk. +SDComment: Quest support: 10519, 10583, 10601, 10804, 10854, 10458, 10481, 10480, 11082, 10781, 10451. Vendor Drake Dealer Hurlunk. SDCategory: Shadowmoon Valley EndScriptData */ @@ -29,7 +29,6 @@ mob_enslaved_netherwing_drake npc_drake_dealer_hurlunk npcs_flanis_swiftwing_and_kagrosh npc_murkblood_overseer -npc_neltharaku npc_karynaku npc_oronok_tornheart npc_overlord_morghor @@ -562,60 +561,6 @@ public: }; -/*###### -## npc_neltharaku -######*/ - -#define GOSSIP_HN "I am listening, dragon" -#define GOSSIP_SN1 "But you are dragons! How could orcs do this to you?" -#define GOSSIP_SN2 "Your mate?" -#define GOSSIP_SN3 "I have battled many beasts, dragon. I will help you." - -class npc_neltharaku : public CreatureScript -{ -public: - npc_neltharaku() : CreatureScript("npc_neltharaku") { } - - 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(0, GOSSIP_SN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(10614, pCreature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(10615, pCreature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(10616, pCreature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(10814); - break; - } - return true; - } - - bool OnGossipHello(Player* pPlayer, Creature* pCreature) - { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - if (pPlayer->GetQuestStatus(10814) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - - pPlayer->SEND_GOSSIP_MENU(10613, pCreature->GetGUID()); - - return true; - } - -}; - /*###### ## npc_oronok @@ -1882,7 +1827,6 @@ void AddSC_shadowmoon_valley() new npc_drake_dealer_hurlunk(); new npcs_flanis_swiftwing_and_kagrosh(); new npc_murkblood_overseer(); - new npc_neltharaku(); new npc_karynaku(); new npc_oronok_tornheart(); new npc_overlord_morghor(); |