From 9f697c3d3c37749c3af69e82a69d6e8732a72d31 Mon Sep 17 00:00:00 2001 From: FireEmerald Date: Thu, 4 Jul 2013 21:30:22 +0100 Subject: DB/Quest: Fix: Standards and Practices (9910) & Hand of Iruxos (5381) Closes #10197 Closes #9701 Closes #9857 Signed-off-by: Nay --- sql/updates/world/2013_07_04_03_world_sai.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 sql/updates/world/2013_07_04_03_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_04_03_world_sai.sql b/sql/updates/world/2013_07_04_03_world_sai.sql new file mode 100644 index 00000000000..003919faefa --- /dev/null +++ b/sql/updates/world/2013_07_04_03_world_sai.sql @@ -0,0 +1,14 @@ +-- Quest: Standards and Practices (9910) / Ignore LOS for trigger spell +SET @SPELL := 32205; -- Place Mag'har Battle Standard + +DELETE FROM `disables` WHERE `sourceType` = 0 AND `entry` = @SPELL; +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES +(0, @SPELL, 64, '', '', 'Ignore LOS for Place Mag''har Battle Standard'); + +-- Quest: Hand of Iruxos (5381) / Attack Closest Player - Demon Spirit +SET @ENTRY := 11876; -- Demon Spirit + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = @ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0; +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, 0, 54, 0, 100, 1, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 'Demon Spirit - Just Summoned - Attack Closest Player'); -- cgit v1.2.3 From 8bcaf599c5176653c83fb456518a33ba90272415 Mon Sep 17 00:00:00 2001 From: dr-j Date: Fri, 5 Jul 2013 12:47:16 +0200 Subject: DB/SAI: Fix quest The Second Trial Closes #3675 --- sql/updates/world/2013_07_05_00_world_sai.sql | 123 ++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 sql/updates/world/2013_07_05_00_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_05_00_world_sai.sql b/sql/updates/world/2013_07_05_00_world_sai.sql new file mode 100644 index 00000000000..65cd2ca60c7 --- /dev/null +++ b/sql/updates/world/2013_07_05_00_world_sai.sql @@ -0,0 +1,123 @@ +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`IN (17811,17812,17809,17810,17807); +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI', `ScriptName`='' WHERE `entry`=182052; +UPDATE `gameobject` SET `spawntimesecs`=-60 WHERE `guid`=23106; + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (182052,17811,17812,17809,17810,17807,18205200,1780900); +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 +(182052,1,1 ,2,70,0,100,0,2,0,0,0,12,17811,8,0,0,0,0,8,0,0,0,10093.899414,-6633.959961,4.099670,1.090000, 'Harbinger of the Second Trial - Linked with Previous Event - Spawn Champion Swiftblade '), +(182052,1,2 ,3,61,0,100,0,0,0,0,0,12,17812,8,0,0,0,0,8,0,0,0,10087.699219,-6617.109863,4.099670,5.870000, 'Harbinger of the Second Trial - Linked with Previous Event - Spawn Champion Sunstriker '), +(182052,1,3 ,4,61,0,100,0,0,0,0,0,12,17809,8,0,0,0,0,8,0,0,0,10104.899414,-6610.909668,4.099670,4.200000, 'Harbinger of the Second Trial - Linked with Previous Event - Spawn Champion Bloodwrath '), +(182052,1,4 ,5,61,0,100,0,0,0,0,0,12,17810,8,0,0,0,0,8,0,0,0,10110.799805,-6628.279785,4.099670,2.700000, 'Harbinger of the Second Trial - Linked with Previous Event - Spawn Champion Lightrend '), +(182052,1,5 ,6,61,0,100,0,0,0,0,0,80,18205200,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Harbinger of the Second Trial - Linked with Previous Event - Set Data'), +(182052,1,6 ,0,61,0,100,0,0,0,0,0,99,3,0,0,0,0,0,14,23106,182052,0,0,0,0,0, 'Harbinger of the Second Trial - Linked with Previous Event - Set State on Harbinger of the Second Trial'), +(18205200,9,0 ,0,0,0,100,0,7000,7000,0,0,45,1,1,0,0,0,0,19,17809,200,0,0,0,0,0, 'Harbinger of the Second Trial - Linked with Previous Event - Set Data'), +(18205200,9,1 ,0,0,0,100,0,100,100,0,0,45,1,1,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Harbinger of the Second Trial - On Object State Changed - Linked with Previous Event- Set Data Master Kelerun Bloodmourn '); +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 +(17807,0,0 ,1,38,0,100,0,1,1,0,0,45,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Data set - Set Data'), +(17807,0,1 ,2,61,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set NPC Flags'), +(17807,0,2 ,3,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Say'), +(17807,0,3 ,0,61,0,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Say'), +(17807,0,5 ,6,38,0,100,0,1,2,0,0,45,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Data set - Set Data'), +(17807,0,6 ,23,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Say'), +(17807,0,7 ,8,38,0,100,0,1,3,0,0,45,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Data set - Set Data'), +(17807,0,8 ,24,61,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Say'), +(17807,0,9 ,10,38,0,100,0,1,4,0,0,45,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Data set - Set Data'), +(17807,0,10 ,25,61,0,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Say'), +(17807,0,11 ,12,38,0,100,0,1,5,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Data set - Set Data'), +(17807,0,12 ,15,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set Phase 2'), +(17807,0,13 ,14,1,2,100,0,300000,300000,300000,300000,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - OOC (Phase 2) - Set Npc Flags'), +(17807,0,14 ,0,61,2,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set Npc Flags'), +(17807,0,15 ,16,61,0,100,0,0,0,0,0,45,1,2,0,0,0,0,19,17809,200,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set Data'), +(17807,0,16 ,17,61,0,100,0,0,0,0,0,45,1,2,0,0,0,0,19,17810,200,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set Data'), +(17807,0,17 ,18,61,0,100,0,0,0,0,0,45,1,2,0,0,0,0,19,17811,200,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set Data'), +(17807,0,18 ,0,61,0,100,0,0,0,0,0,45,1,2,0,0,0,0,19,17812,200,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set Data'), +(17807,0,20 ,0,19,0,100,0,9686,0,0,0,70,60,0,0,0,0,0,14,23106,182052,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Quest Accept - Respawn State on Harbinger of the Second Trial'), +(17807,0,23 ,0,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,17810,200,0,0,0,0,0, 'Champion Bloodwrath - Linked with Previous Event - Set Data'), +(17807,0,24 ,0,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,17811,200,0,0,0,0,0, 'Champion Bloodwrath - Linked with Previous Event - Set Data'), +(17807,0,25 ,0,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,17812,200,0,0,0,0,0, 'Champion Bloodwrath - Linked with Previous Event - Set Data'), +(17807,0,26 ,27,38,0,100,0,1,6,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Data set - Set Data'), +(17807,0,27 ,28,61,0,100,0,0,0,0,0,26,9686,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Give Quest Credit'), +(17807,0,28 ,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Set Phase 2'), +(17807,0,29 ,30,38,0,100,0,1,6,0,0,45,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - On Data set - Set Data'), +(17807,0,30 ,0,61,0,100,0,0,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Master Kelerun Bloodmourn - Linked with Previous Event - Say'); +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 +(17809,0,1 ,0,6,0,100,0,0,0,0,0,45,1,2,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Bloodwrath - Linked with Previous Event - Set Data'), +(17809,0,2 ,3, 5,0,100,0,0,0,0,0,6,9686,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Player Death - Fail Quest'), +(17809,0,3 ,0,61,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Bloodwrath - Linked with Previous Event - Set Data'), +(17809,0,4 ,0,2,0,100,0,0,50,10000,15000,11,19939,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Less than 30% HP - Cast Flash of Light'), +(17809,0,6 ,0,21,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Bloodwrath - Linked with Previous Event - Set Data'), +(17809,0,7 ,0,38,0,100,0,1,2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Data Set - Despawn'), +(17809,0,8 ,10,11,0,100,0,0,0,0,0,18,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Spawn - Set Unit Flags'), +(17809,0,9 ,0,38,0,100,0,1,1,0,0,80,1780900,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Data Set - Remove Unit Flags'), +(17809,0,10 ,0,61,0,100,0,0,0,0,0,53,0,17809,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - Linked with Previous Event - Start Waypoints'), +(17809,0,11 ,0,40,0,100,0,5,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Reached WP5 - Set Kneel'), +(17810,0,0 ,11,11,0,100,0,0,0,0,0,18,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Lightrend - On Spawn - Set Unit Flags'), +(17810,0,1 ,0,38,0,100,0,1,1,0,0,80,1780900,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Lightrend - On Data Set - Remove Unit Flags'), +(17810,0,3 ,0,6,0,100,0,0,0,0,0,45,1,3,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Lightrend - Linked with Previous Event - Set Data'), +(17810,0,4 ,5, 5,0,100,0,0,0,0,0,6,9686,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Champion Lightrend - On Player Death - Fail Quest'), +(17810,0,5 ,0,61,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Lightrend - Linked with Previous Event - Set Data'), +(17810,0,6 ,0,4,0,100,0,0,0,0,0,11,20164,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Lightrend - On Agro - Cast Seal of Justice'), +(17810,0,7 ,0,0,0,100,0,0,6000,6000,8000,11,20271,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Champion Lightrend - IC - Cast Judgement of Light'), +(17810,0,9 ,0,21,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Lightrend - Linked with Previous Event - Set Data'), +(17810,0,10 ,0,38,0,100,0,1,2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Lightrend - On Data Set - Despawn'), +(17810,0,11 ,0,61,0,100,0,100,100,0,0,53,0,17810,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Lightrend - Linked with Previous Event - Start Waypoints'), +(17810,0,12 ,0,40,0,100,0,5,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Reached WP5 - Set Kneel'), +(17811,0,0 ,10,11,0,100,0,0,0,0,0,18,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Swiftblade - On Spawn - Set Unit Flags'), +(17811,0,1 ,0,38,0,100,0,1,1,0,0,80,1780900,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Swiftblade - On Data Set - Remove Unit Flags'), +(17811,0,3 ,0,6,0,100,0,0,0,0,0,45,1,4,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Swiftblade - Linked with Previous Event - Set Data'), +(17811,0,4 ,5, 5,0,100,0,0,0,0,0,6,9686,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Champion Swiftblade - On Player Death - Fail Quest'), +(17811,0,5 ,0,61,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Swiftblade - Linked with Previous Event - Set Data'), +(17811,0,6 ,0,2,0,100,0,0,50,10000,15000,11,19939,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Swiftblade - On Less than 30% HP - Cast Flash of Light'), +(17811,0,8 ,0,21,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Swiftblade - Linked with Previous Event - Set Data'), +(17811,0,9 ,0,38,0,100,0,1,2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Swiftblade - On Data Set - Despawn'), +(17811,0,10 ,0,61,0,100,0,0,0,0,0,53,0,17811,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Lightrend - Linked with Previous Event - Start Waypoints'), +(17811,0,11 ,0,40,0,100,0,5,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Reached WP5 - Set Kneel'), +(17812,0,0 ,13,11,0,100,0,0,0,0,0,18,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Sunstriker - On Spawn - Set Unit Flags'), +(17812,0,1 ,0,38,0,100,0,1,1,0,0,80,1780900,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Sunstriker - On Data Set - Remove Unit Flags'), +(17812,0,2 ,3, 6,0,100,0,0,0,0,0,26,9686,0,0,0,0,0,16,0,0,0,0,0,0,0, 'Champion Sunstriker - On Death - Give Quest Credit'), +(17812,0,3 ,12,61,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Sunstriker - Linked with Previous Event - Set Data'), +(17812,0,4 ,5, 5,0,100,0,0,0,0,0,6,9686,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Champion Sunstriker - On Player Death - Fail Quest'), +(17812,0,5 ,0,61,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Sunstriker - Linked with Previous Event - Set Data'), +(17812,0,6 ,0,4,0,100,0,0,0,0,0,11,20375,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Sunstriker - On Agro - Cast Seal of Command'), +(17812,0,7 ,0,2,0,100,0,0,50,8000,13000,11,19939,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Sunstriker - On Less than 30% HP - Cast Flash of Light'), +(17812,0,8 ,0,0,0,100,0,0,6000,6000,6000,11,20271,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Champion Sunstriker - IC - Cast Judgement of Light'), +(17812,0,10 ,0,21,0,100,0,0,0,0,0,45,1,5,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Sunstriker - Linked with Previous Event - Set Data'), +(17812,0,11 ,0,38,0,100,0,1,2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Sunstriker - On Data Set - Despawn'), +(17812,0,12 ,0,61,0,100,0,0,0,0,0,45,1,6,0,0,0,0,10,63509,17807,0,0,0,0,0, 'Champion Sunstriker - Linked with Previous Event - Set Data'), +(17812,0,13 ,0,61,0,100,0,0,0,0,0,53,0,17812,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Sunstriker - Linked with Previous Event - Start Waypoints'), +(17812,0,14 ,0,40,0,100,0,5,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - On Reached WP5 - Set Kneel'), +(1780900,9,1 ,0,0,0,100,0,100,100,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - Script - Move'), +(1780900,9,2 ,0,0,0,100,0,100,100,0,0,2,45,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Champion Bloodwrath - Script - Set Faction'), +(1780900,9,3 ,0,0,0,100,0,100,100,0,0,101,0,0,0,0,0,0,21,50,0,0,0,0,0,0, 'Champion Bloodwrath - Script - Set Home'), +(1780900,9,4 ,0,0,0,100,0,100,100,0,0,49,0,0,0,0,0,0,21,50,0,0,0,0,0,0, 'Champion Bloodwrath - Script - Attack'); + +DELETE FROM `creature_text` WHERE `entry` =17807; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(17807,0,0, 'Let the trial begin, Bloodwrath Attack!',14,0,100,0,7000,0, 'Master Kelerun Bloodmourn '), +(17807,1,0, 'Champion Lightrend, make me proud!',14,0,100,0,7000,0, 'Master Kelerun Bloodmourn '), +(17807,2,0, 'Show this upstart how a real Blood Knight fights, Swiftblade!', 14,0,100,0,7000,0, 'Master Kelerun Bloodmourn '), +(17807,3,0, 'Show $n the meaning of pain, Sunstriker!',14,0,100,0,7000,0, 'Master Kelerun Bloodmourn '), +(17807,4,0, 'Well Done $n! You have passed the second trial!',14,0,100,0,7000,0, 'Master Kelerun Bloodmourn '); + +DELETE FROM `waypoints` WHERE `entry`IN (17811,17812,17809,17810); +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(17809, 1, 10104.131836,-6612.683105,4.101346, 'Champion Bloodwrath'), +(17809, 2, 10102.344727,-6612.981445,4.053924, 'Champion Bloodwrath'), +(17809, 3, 10099.358398,-6612.392090,4.054283, 'Champion Bloodwrath'), +(17809, 4, 10095.998047,-6613.050293,4.146625, 'Champion Bloodwrath'), +(17809, 5, 10096.130859,-6613.828125,4.059120, 'Champion Bloodwrath'), +(17810, 1, 10109.248047,-6627.423340,4.102483, 'Champion Lightrend'), +(17810, 2, 10109.353516,-6625.280762,4.053146, 'Champion Lightrend'), +(17810, 3, 10109.612305,-6622.480957,4.054108, 'Champion Lightrend'), +(17810, 4, 10108.892578,-6619.477051,4.055830, 'Champion Lightrend'), +(17810, 5, 10108.208008,-6619.648926,4.059035, 'Champion Lightrend'), +(17811, 1, 10094.589844,-6632.596680,4.101971, 'Champion Swiftblade'), +(17811, 2, 10097.296875,-6632.817383,4.053012, 'Champion Swiftblade'), +(17811, 3, 10100.189453,-6633.041992,4.054625, 'Champion Swiftblade'), +(17811, 4, 10102.728516,-6632.252930,4.056830, 'Champion Swiftblade'), +(17811, 5, 10102.631836,-6631.925293,4.058280, 'Champion Swiftblade'), +(17812, 1, 10089.456055,-6618.075684,4.101974, 'Champion Sunstriker'), +(17812, 2, 10089.222656,-6620.535645,4.053116, 'Champion Sunstriker'), +(17812, 3, 10089.138672,-6623.319336,4.054400, 'Champion Sunstriker'), +(17812, 4, 10090.097656,-6626.027344,4.057493, 'Champion Sunstriker'), +(17812, 5, 10090.363281,-6625.857910,4.060020, 'Champion Sunstriker'); \ No newline at end of file -- cgit v1.2.3 From d6cb32e45c0080244fa1d23dba96a0564047cfa6 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 5 Jul 2013 13:08:53 +0200 Subject: Commit: add newline to endoffile --- sql/updates/world/2013_07_05_00_world_sai.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/updates/world/2013_07_05_00_world_sai.sql b/sql/updates/world/2013_07_05_00_world_sai.sql index 65cd2ca60c7..06781cc63a1 100644 --- a/sql/updates/world/2013_07_05_00_world_sai.sql +++ b/sql/updates/world/2013_07_05_00_world_sai.sql @@ -120,4 +120,4 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (17812, 2, 10089.222656,-6620.535645,4.053116, 'Champion Sunstriker'), (17812, 3, 10089.138672,-6623.319336,4.054400, 'Champion Sunstriker'), (17812, 4, 10090.097656,-6626.027344,4.057493, 'Champion Sunstriker'), -(17812, 5, 10090.363281,-6625.857910,4.060020, 'Champion Sunstriker'); \ No newline at end of file +(17812, 5, 10090.363281,-6625.857910,4.060020, 'Champion Sunstriker'); -- cgit v1.2.3 From ac8064a96ad1919d6f9efa14d7962dba3f938dc9 Mon Sep 17 00:00:00 2001 From: badmoon Date: Fri, 5 Jul 2013 15:05:18 +0200 Subject: DB/creatures: Update some creatures for AV Closes #4971 --- .../2013_07_05_01_world_creature_template.sql | 204 +++++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 sql/updates/world/2013_07_05_01_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_05_01_world_creature_template.sql b/sql/updates/world/2013_07_05_01_world_creature_template.sql new file mode 100644 index 00000000000..6a8500c852c --- /dev/null +++ b/sql/updates/world/2013_07_05_01_world_creature_template.sql @@ -0,0 +1,204 @@ +-- Alterac Valley NPC fix +UPDATE `creature_template` SET `difficulty_entry_3`=37234 WHERE `entry`=13086; +UPDATE `creature_template` SET `difficulty_entry_3`=37236 WHERE `entry`=13116; +UPDATE `creature_template` SET `difficulty_entry_3`=37237 WHERE `entry`=10990; +UPDATE `creature_template` SET `difficulty_entry_3`=37239 WHERE `entry`=13442; +UPDATE `creature_template` SET `difficulty_entry_3`=37240 WHERE `entry`=14187; +UPDATE `creature_template` SET `difficulty_entry_3`=37242 WHERE `entry`=4255; +UPDATE `creature_template` SET `difficulty_entry_3`=37243 WHERE `entry`=11949; +UPDATE `creature_template` SET `difficulty_entry_3`=37244 WHERE `entry`=11947; +UPDATE `creature_template` SET `difficulty_entry_3`=37250 WHERE `entry`=13422; +UPDATE `creature_template` SET `difficulty_entry_3`=37251 WHERE `entry`=13421; +UPDATE `creature_template` SET `difficulty_entry_3`=37264 WHERE `entry`=13096; +UPDATE `creature_template` SET `difficulty_entry_3`=37267 WHERE `entry`=13317; +UPDATE `creature_template` SET `difficulty_entry_3`=37268 WHERE `entry`=13316; +UPDATE `creature_template` SET `difficulty_entry_3`=37269 WHERE `entry`=13097; +UPDATE `creature_template` SET `difficulty_entry_3`=37278 WHERE `entry`=13447; +UPDATE `creature_template` SET `difficulty_entry_3`=37281 WHERE `entry`=14188; +UPDATE `creature_template` SET `difficulty_entry_3`=37282 WHERE `entry`=12121; +UPDATE `creature_template` SET `difficulty_entry_3`=37283 WHERE `entry`=11946; +UPDATE `creature_template` SET `difficulty_entry_3`=37284 WHERE `entry`=13443; +UPDATE `creature_template` SET `difficulty_entry_3`=37285 WHERE `entry`=14762; +UPDATE `creature_template` SET `difficulty_entry_3`=37287 WHERE `entry`=14763; +UPDATE `creature_template` SET `difficulty_entry_3`=37289 WHERE `entry`=12122; +UPDATE `creature_template` SET `difficulty_entry_3`=37291 WHERE `entry`=14772; +UPDATE `creature_template` SET `difficulty_entry_3`=37294 WHERE `entry`=10981; +UPDATE `creature_template` SET `difficulty_entry_3`=37296 WHERE `entry`=14282; +UPDATE `creature_template` SET `difficulty_entry_3`=37297 WHERE `entry`=13359; +UPDATE `creature_template` SET `difficulty_entry_3`=37300 WHERE `entry`=12053; +UPDATE `creature_template` SET `difficulty_entry_3`=37302 WHERE `entry`=12051; +UPDATE `creature_template` SET `difficulty_entry_3`=37305 WHERE `entry`=12097; +UPDATE `creature_template` SET `difficulty_entry_3`=37308 WHERE `entry`=13284; +UPDATE `creature_template` SET `difficulty_entry_3`=37310 WHERE `entry`=13616; +UPDATE `creature_template` SET `difficulty_entry_3`=37313 WHERE `entry`=13441; +UPDATE `creature_template` SET `difficulty_entry_3`=37315 WHERE `entry`=13216; +UPDATE `creature_template` SET `difficulty_entry_3`=37318 WHERE `entry`=3343; +UPDATE `creature_template` SET `difficulty_entry_3`=37320 WHERE `entry`=13218; +UPDATE `creature_template` SET `difficulty_entry_3`=37323 WHERE `entry`=13117; +UPDATE `creature_template` SET `difficulty_entry_3`=37326 WHERE `entry`=14773; +UPDATE `creature_template` SET `difficulty_entry_3`=37327 WHERE `entry`=14764; +UPDATE `creature_template` SET `difficulty_entry_3`=37331 WHERE `entry`=13099; +UPDATE `creature_template` SET `difficulty_entry_3`=37333 WHERE `entry`=13080; +UPDATE `creature_template` SET `difficulty_entry_3`=37334 WHERE `entry`=13396; +UPDATE `creature_template` SET `difficulty_entry_3`=37335 WHERE `entry`=13397; +UPDATE `creature_template` SET `difficulty_entry_3`=37337 WHERE `entry`=11600; +UPDATE `creature_template` SET `difficulty_entry_3`=37340 WHERE `entry`=10987; +UPDATE `creature_template` SET `difficulty_entry_3`=37344 WHERE `entry`=5134; +UPDATE `creature_template` SET `difficulty_entry_3`=37345 WHERE `entry`=13798; +UPDATE `creature_template` SET `difficulty_entry_3`=37346 WHERE `entry`=13079; +UPDATE `creature_template` SET `difficulty_entry_3`=37348 WHERE `entry`=5139; +UPDATE `creature_template` SET `difficulty_entry_3`=37349 WHERE `entry`=4257; +UPDATE `creature_template` SET `difficulty_entry_3`=37364 WHERE `entry`=13088; +UPDATE `creature_template` SET `difficulty_entry_3`=37366 WHERE `entry`=11657; +UPDATE `creature_template` SET `difficulty_entry_3`=37367 WHERE `entry`=13797; +UPDATE `creature_template` SET `difficulty_entry_3`=37369 WHERE `entry`=13257; +UPDATE `creature_template` SET `difficulty_entry_3`=37370 WHERE `entry`=14185; +UPDATE `creature_template` SET `difficulty_entry_3`=37371 WHERE `entry`=13236; +UPDATE `creature_template` SET `difficulty_entry_3`=37372 WHERE `entry`=13816; +UPDATE `creature_template` SET `difficulty_entry_3`=37373 WHERE `entry`=3625; +UPDATE `creature_template` SET `difficulty_entry_3`=37374 WHERE `entry`=14186; +UPDATE `creature_template` SET `difficulty_entry_3`=37383 WHERE `entry`=13326; +UPDATE `creature_template` SET `difficulty_entry_3`=37384 WHERE `entry`=13328; +UPDATE `creature_template` SET `difficulty_entry_3`=37398 WHERE `entry`=13448; +UPDATE `creature_template` SET `difficulty_entry_3`=37399 WHERE `entry`=10367; +UPDATE `creature_template` SET `difficulty_entry_3`=37401 WHERE `entry`=13176; +UPDATE `creature_template` SET `difficulty_entry_3`=37402 WHERE `entry`=11678; +UPDATE `creature_template` SET `difficulty_entry_3`=37403 WHERE `entry`=10986; +UPDATE `creature_template` SET `difficulty_entry_3`=37404 WHERE `entry`=11675; +UPDATE `creature_template` SET `difficulty_entry_3`=37407 WHERE `entry`=14765; +UPDATE `creature_template` SET `difficulty_entry_3`=37409 WHERE `entry`=14284; +UPDATE `creature_template` SET `difficulty_entry_3`=37410 WHERE `entry`=13358; +UPDATE `creature_template` SET `difficulty_entry_3`=37412 WHERE `entry`=12050; +UPDATE `creature_template` SET `difficulty_entry_3`=37415 WHERE `entry`=12127; +UPDATE `creature_template` SET `difficulty_entry_3`=37416 WHERE `entry`=11997; +UPDATE `creature_template` SET `difficulty_entry_3`=37419 WHERE `entry`=14283; +UPDATE `creature_template` SET `difficulty_entry_3`=37420 WHERE `entry`=12096; +UPDATE `creature_template` SET `difficulty_entry_3`=37422 WHERE `entry`=13577; +UPDATE `creature_template` SET `difficulty_entry_3`=37426 WHERE `entry`=13617; +UPDATE `creature_template` SET `difficulty_entry_3`=37427 WHERE `entry`=5135; +UPDATE `creature_template` SET `difficulty_entry_3`=37431 WHERE `entry`=11677; +UPDATE `creature_template` SET `difficulty_entry_3`=37435 WHERE `entry`=14776; +UPDATE `creature_template` SET `difficulty_entry_3`=37442 WHERE `entry`=13078; +UPDATE `creature_template` SET `difficulty_entry_3`=37444 WHERE `entry`=11948; +UPDATE `creature_template` SET `difficulty_entry_3`=37450 WHERE `entry`=13331; +UPDATE `creature_template` SET `difficulty_entry_3`=37451 WHERE `entry`=13332; +UPDATE `creature_template` SET `difficulty_entry_3`=37468 WHERE `entry`=14777; +UPDATE `creature_template` SET `difficulty_entry_3`=37469 WHERE `entry`=11603; +UPDATE `creature_template` SET `difficulty_entry_3`=37470 WHERE `entry`=11604; +UPDATE `creature_template` SET `difficulty_entry_3`=37473 WHERE `entry`=10982; +UPDATE `creature_template` SET `difficulty_entry_3`=37475 WHERE `entry`=11839; +UPDATE `creature_template` SET `difficulty_entry_3`=37479 WHERE `entry`=13179; +UPDATE `creature_template` SET `difficulty_entry_3`=37480 WHERE `entry`=13437; +UPDATE `creature_template` SET `difficulty_entry_3`=37481 WHERE `entry`=13180; +UPDATE `creature_template` SET `difficulty_entry_3`=37483 WHERE `entry`=13438; +UPDATE `creature_template` SET `difficulty_entry_3`=37484 WHERE `entry`=13439; +UPDATE `creature_template` SET `difficulty_entry_3`=37485 WHERE `entry`=10364; +UPDATE `creature_template` SET `difficulty_entry_3`=37486 WHERE `entry`=2225; + +UPDATE `creature_template` SET `KillCredit1`=13086, `modelid1`=13298, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1.75, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=15655, `spell3`=0, `spell4`=0, `mingold`=192, `maxgold`=192 WHERE `entry`=37234; +UPDATE `creature_template` SET `KillCredit1`=13116, `modelid1`=13336, `modelid2`=13337, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1802, `faction_H`=1802, `npcflag`=32768, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=405, `maxdmg`=609, `attackpower`=152, `dmg_multiplier`=49.1, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=2, `unit_flags`=4930, `minrangedmg`=324, `maxrangedmg`=487, `rangedattackpower`=122, `type`=7, `type_flags`=2, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37236; +UPDATE `creature_template` SET `KillCredit1`=10990, `modelid1`=13340, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1274, `faction_H`=1274, `npcflag`=0, `speed_walk`=1, `speed_run`=1.38571, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=0.9, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=1, `type_flags`=0, `spell1`=13443, `spell2`=22120, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37237; +UPDATE `creature_template` SET `KillCredit1`=13442, `modelid1`=13403, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5142, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=8.2, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=4096, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=15981, `spell2`=22127, `spell3`=22206, `spell4`=0, `mingold`=1861, `maxgold`=1861 WHERE `entry`=37239; +UPDATE `creature_template` SET `KillCredit1`=14187, `modelid1`=14215, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=79, `faction_H`=79, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.4, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=606, `maxgold`=606 WHERE `entry`=37240; +UPDATE `creature_template` SET `KillCredit1`=4255, `modelid1`=2284, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=0.6, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37242; +UPDATE `creature_template` SET `KillCredit1`=11949, `modelid1`=12823, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=83, `maxlevel`=83, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=3, `mindmg`=435, `maxdmg`=653, `attackpower`=163, `dmg_multiplier`=40.9, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=2, `unit_flags`=4096, `minrangedmg`=348, `maxrangedmg`=522, `rangedattackpower`=130, `type`=7, `type_flags`=4, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=1917, `maxgold`=1917 WHERE `entry`=37243; +UPDATE `creature_template` SET `KillCredit1`=11947, `modelid1`=11895, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=83, `maxlevel`=83, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=3, `mindmg`=468, `maxdmg`=702, `attackpower`=175, `dmg_multiplier`=38, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4160, `minrangedmg`=374, `maxrangedmg`=562, `rangedattackpower`=140, `type`=7, `type_flags`=4, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=1918, `maxgold`=1918 WHERE `entry`=37244; +UPDATE `creature_template` SET `KillCredit1`=13422, `modelid1`=13351, `modelid2`=13352, `modelid3`=13353, `modelid4`=13354, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1.27, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.4, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=570, `maxgold`=570 WHERE `entry`=37250; +UPDATE `creature_template` SET `KillCredit1`=13421, `modelid1`=13361, `modelid2`=13362, `modelid3`=13363, `modelid4`=13364, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1.27, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.4, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=207, `maxgold`=596 WHERE `entry`=37251; +UPDATE `creature_template` SET `KillCredit1`=13096, `modelid1`=13895, `modelid2`=13896, `modelid3`=13552, `modelid4`=13553, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=2.01, `speed_run`=1.14286, `rank`=0, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=0, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=12544, `spell2`=14145, `spell3`=15242, `spell4`=15244, `mingold`=105, `maxgold`=105 WHERE `entry`=37264; +UPDATE `creature_template` SET `KillCredit1`=13317, `modelid1`=556, `modelid2`=308, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1.76, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=0.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=15572, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37267; +UPDATE `creature_template` SET `KillCredit1`=13316, `modelid1`=13334, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=0.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=15572, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37268; +UPDATE `creature_template` SET `KillCredit1`=13097, `modelid1`=13330, `modelid2`=13331, `modelid3`=13540, `modelid4`=13537, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=0, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=15498, `spell2`=15586, `spell3`=15654, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37269; +UPDATE `creature_template` SET `KillCredit1`=13447, `modelid1`=13383, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5081, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=4.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=19130, `spell3`=0, `spell4`=0, `mingold`=1667, `maxgold`=1667 WHERE `entry`=37278; +UPDATE `creature_template` SET `KillCredit1`=14188, `modelid1`=14234, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=55, `faction_H`=55, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=607, `maxgold`=607 WHERE `entry`=37281; +UPDATE `creature_template` SET `KillCredit1`=12121, `modelid1`=10278, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.5, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=1, `type_flags`=0, `spell1`=8599, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37282; +UPDATE `creature_template` SET `KillCredit1`=11946, `modelid1`=11894, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=83, `maxlevel`=83, `faction_A`=1214, `faction_H`=1214, `npcflag`=1, `speed_walk`=1, `speed_run`=1.14286, `rank`=3, `mindmg`=468, `maxdmg`=702, `attackpower`=175, `dmg_multiplier`=63.4, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=374, `maxrangedmg`=562, `rangedattackpower`=140, `type`=7, `type_flags`=4, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37283; +UPDATE `creature_template` SET `KillCredit1`=13443, `modelid1`=13409, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5141, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=1, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=203, `maxdmg`=304, `attackpower`=76, `dmg_multiplier`=7.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=4096, `minrangedmg`=162, `maxrangedmg`=243, `rangedattackpower`=61, `type`=7, `type_flags`=0, `spell1`=21668, `spell2`=22127, `spell3`=22128, `spell4`=0, `mingold`=1656, `maxgold`=1656 WHERE `entry`=37284; +UPDATE `creature_template` SET `KillCredit1`=14762, `modelid1`=14793, `modelid2`=14795, `modelid3`=14794, `modelid4`=14796, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=13.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=32768, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=13736, `spell2`=15589, `spell3`=22911, `spell4`=23511, `mingold`=0, `maxgold`=0 WHERE `entry`=37285; +UPDATE `creature_template` SET `KillCredit1`=14763, `modelid1`=14793, `modelid2`=14795, `modelid3`=14794, `modelid4`=14796, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=13.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=32768, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=13736, `spell2`=15589, `spell3`=22911, `spell4`=23511, `mingold`=0, `maxgold`=0 WHERE `entry`=37287; +UPDATE `creature_template` SET `KillCredit1`=12122, `modelid1`=10278, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.5, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=1, `type_flags`=0, `spell1`=8599, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37289; +UPDATE `creature_template` SET `KillCredit1`=14772, `modelid1`=14797, `modelid2`=14799, `modelid3`=14798, `modelid4`=14800, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=436, `maxdmg`=654, `attackpower`=163, `dmg_multiplier`=51.4, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=349, `maxrangedmg`=523, `rangedattackpower`=130, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37291; +UPDATE `creature_template` SET `KillCredit1`=10981, `modelid1`=10278, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1275, `faction_H`=1275, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=0.9, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=1, `type_flags`=1, `spell1`=13443, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37294; +UPDATE `creature_template` SET `KillCredit1`=14282, `modelid1`=782, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1275, `faction_H`=1275, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=0.9, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=1, `type_flags`=0, `spell1`=3391, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37296; +UPDATE `creature_template` SET `KillCredit1`=13359, `modelid1`=13398, `modelid2`=13399, `modelid3`=13400, `modelid4`=13401, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=420, `maxdmg`=630, `attackpower`=157, `dmg_multiplier`=1, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4608, `minrangedmg`=336, `maxrangedmg`=504, `rangedattackpower`=126, `type`=7, `type_flags`=0, `spell1`=22121, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=576, `maxgold`=576 WHERE `entry`=37297; +UPDATE `creature_template` SET `KillCredit1`=12053, `modelid1`=12165, `modelid2`=12166, `modelid3`=12167, `modelid4`=12170, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=19130, `spell3`=0, `spell4`=0, `mingold`=543, `maxgold`=543 WHERE `entry`=37300; +UPDATE `creature_template` SET `KillCredit1`=12051, `modelid1`=12949, `modelid2`=12950, `modelid3`=12951, `modelid4`=12952, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=11977, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=524, `maxgold`=524 WHERE `entry`=37302; +UPDATE `creature_template` SET `KillCredit1`=12097, `modelid1`=13385, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=131, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37305; +UPDATE `creature_template` SET `KillCredit1`=13284, `modelid1`=13410, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=1, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=203, `maxdmg`=304, `attackpower`=76, `dmg_multiplier`=5.2, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=4096, `minrangedmg`=162, `maxrangedmg`=243, `rangedattackpower`=61, `type`=7, `type_flags`=0, `spell1`=12550, `spell2`=21401, `spell3`=0, `spell4`=0, `mingold`=1627, `maxgold`=1627 WHERE `entry`=37308; +UPDATE `creature_template` SET `KillCredit1`=13616, `modelid1`=13670, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=9821, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=4194307, `speed_walk`=1.78, `speed_run`=1.14286, `rank`=1, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=7.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37310; +UPDATE `creature_template` SET `KillCredit1`=13441, `modelid1`=13415, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=2, `speed_walk`=1.79, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.4, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=2855, `maxgold`=2855 WHERE `entry`=37313; +UPDATE `creature_template` SET `KillCredit1`=13216, `modelid1`=13476, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=4224, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=4.4, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=1662, `maxgold`=1662 WHERE `entry`=37315; +UPDATE `creature_template` SET `KillCredit1`=3343, `modelid1`=1359, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=4224, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37318; +UPDATE `creature_template` SET `KillCredit1`=13218, `modelid1`=13477, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=4224, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=4.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=1561, `maxgold`=1561 WHERE `entry`=37320; +UPDATE `creature_template` SET `KillCredit1`=13117, `modelid1`=13338, `modelid2`=13339, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1801, `faction_H`=1801, `npcflag`=32768, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=405, `maxdmg`=609, `attackpower`=152, `dmg_multiplier`=49.1, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=2, `unit_flags`=4930, `minrangedmg`=324, `maxrangedmg`=487, `rangedattackpower`=122, `type`=7, `type_flags`=2, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37323; +UPDATE `creature_template` SET `KillCredit1`=14773, `modelid1`=14797, `modelid2`=14799, `modelid3`=14798, `modelid4`=14800, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=436, `maxdmg`=654, `attackpower`=163, `dmg_multiplier`=51.4, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=349, `maxrangedmg`=523, `rangedattackpower`=130, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37326; +UPDATE `creature_template` SET `KillCredit1`=14764, `modelid1`=14793, `modelid2`=14795, `modelid3`=14794, `modelid4`=14796, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=13.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=13736, `spell2`=15589, `spell3`=22911, `spell4`=23511, `mingold`=0, `maxgold`=0 WHERE `entry`=37327; +UPDATE `creature_template` SET `KillCredit1`=13099, `modelid1`=13430, `modelid2`=13431, `modelid3`=13432, `modelid4`=13433, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1.74, `speed_run`=1.14286, `rank`=0, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=0, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=12544, `spell2`=14145, `spell3`=15242, `spell4`=15244, `mingold`=0, `maxgold`=0 WHERE `entry`=37331; +UPDATE `creature_template` SET `KillCredit1`=13080, `modelid1`=13311, `modelid2`=13313, `modelid3`=13312, `modelid4`=13314, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1.76, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=15284, `spell2`=16856, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37333; +UPDATE `creature_template` SET `KillCredit1`=13396, `modelid1`=556, `modelid2`=308, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1.76, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=0.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=15572, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37334; +UPDATE `creature_template` SET `KillCredit1`=13397, `modelid1`=13335, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1.76, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=0.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=15572, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=80, `maxgold`=80 WHERE `entry`=37335; +UPDATE `creature_template` SET `KillCredit1`=11600, `modelid1`=10285, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=0, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=12492, `spell2`=15786, `spell3`=15801, `spell4`=0, `mingold`=246, `maxgold`=246 WHERE `entry`=37337; +UPDATE `creature_template` SET `KillCredit1`=10987, `modelid1`=10285, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=0.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=14516, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=333, `maxgold`=333 WHERE `entry`=37340; +UPDATE `creature_template` SET `KillCredit1`=5134, `modelid1`=3061, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=8, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37344; +UPDATE `creature_template` SET `KillCredit1`=13798, `modelid1`=13808, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.7, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=15284, `spell2`=16856, `spell3`=0, `spell4`=0, `mingold`=598, `maxgold`=598 WHERE `entry`=37345; +UPDATE `creature_template` SET `KillCredit1`=13079, `modelid1`=13300, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1.76, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=14516, `spell2`=15496, `spell3`=15576, `spell4`=17207, `mingold`=175, `maxgold`=175 WHERE `entry`=37346; +UPDATE `creature_template` SET `KillCredit1`=5139, `modelid1`=3084, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=104, `maxgold`=104 WHERE `entry`=37348; +UPDATE `creature_template` SET `KillCredit1`=4257, `modelid1`=2286, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=4224, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=133, `maxgold`=133 WHERE `entry`=37349; +UPDATE `creature_template` SET `KillCredit1`=13088, `modelid1`=13305, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1.76, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=3391, `spell2`=6434, `spell3`=15667, `spell4`=0, `mingold`=278, `maxgold`=278 WHERE `entry`=37364; +UPDATE `creature_template` SET `KillCredit1`=11657, `modelid1`=5945, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=1.2, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=512, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=15537, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=111, `maxgold`=111 WHERE `entry`=37366; +UPDATE `creature_template` SET `KillCredit1`=13797, `modelid1`=13849, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=3.2, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=11976, `spell2`=22120, `spell3`=0, `spell4`=0, `mingold`=1828, `maxgold`=1828 WHERE `entry`=37367; +UPDATE `creature_template` SET `KillCredit1`=13257, `modelid1`=13151, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5021, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.5, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=21163, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=639, `maxgold`=639 WHERE `entry`=37369; +UPDATE `creature_template` SET `KillCredit1`=14185, `modelid1`=14232, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=126, `faction_H`=126, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=578, `maxgold`=578 WHERE `entry`=37370; +UPDATE `creature_template` SET `KillCredit1`=13236, `modelid1`=13478, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=3, `speed_walk`=1, `speed_run`=2, `rank`=1, `mindmg`=203, `maxdmg`=304, `attackpower`=76, `dmg_multiplier`=8.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=4096, `minrangedmg`=162, `maxrangedmg`=243, `rangedattackpower`=61, `type`=7, `type_flags`=0, `spell1`=15234, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=1854, `maxgold`=1854 WHERE `entry`=37371; +UPDATE `creature_template` SET `KillCredit1`=13816, `modelid1`=13794, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4608, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=175, `maxgold`=175 WHERE `entry`=37372; +UPDATE `creature_template` SET `KillCredit1`=3625, `modelid1`=4294, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=135, `maxgold`=135 WHERE `entry`=37373; +UPDATE `creature_template` SET `KillCredit1`=14186, `modelid1`=14233, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=105, `faction_H`=105, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=420, `maxdmg`=630, `attackpower`=157, `dmg_multiplier`=1.2, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=336, `maxrangedmg`=504, `rangedattackpower`=126, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=600, `maxgold`=600 WHERE `entry`=37374; +UPDATE `creature_template` SET `KillCredit1`=13326, `modelid1`=13262, `modelid2`=13263, `modelid3`=13264, `modelid4`=13265, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.3, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=19130, `spell3`=0, `spell4`=0, `mingold`=575, `maxgold`=575 WHERE `entry`=37383; +UPDATE `creature_template` SET `KillCredit1`=13328, `modelid1`=13278, `modelid2`=13279, `modelid3`=13280, `modelid4`=13281, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.3, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=19130, `spell3`=0, `spell4`=0, `mingold`=581, `maxgold`=581 WHERE `entry`=37384; +UPDATE `creature_template` SET `KillCredit1`=13448, `modelid1`=13402, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=11977, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=900, `maxgold`=900 WHERE `entry`=37398; +UPDATE `creature_template` SET `KillCredit1`=10367, `modelid1`=9765, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37399; +UPDATE `creature_template` SET `KillCredit1`=13176, `modelid1`=13152, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5124, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.5, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=21163, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=1910, `maxgold`=1910 WHERE `entry`=37401; +UPDATE `creature_template` SET `KillCredit1`=11678, `modelid1`=10282, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1.38889, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=0.9, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=7159, `spell2`=19472, `spell3`=0, `spell4`=0, `mingold`=411, `maxgold`=411 WHERE `entry`=37402; +UPDATE `creature_template` SET `KillCredit1`=10986, `modelid1`=10282, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=514, `faction_H`=514, `npcflag`=0, `speed_walk`=1.38889, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=0.9, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=3589, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=411, `maxgold`=411 WHERE `entry`=37403; +UPDATE `creature_template` SET `KillCredit1`=11675, `modelid1`=10282, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1.38889, `speed_run`=1.14286, `rank`=0, `mindmg`=293, `maxdmg`=439, `attackpower`=110, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=2, `unit_flags`=0, `minrangedmg`=234, `maxrangedmg`=351, `rangedattackpower`=88, `type`=7, `type_flags`=0, `spell1`=9532, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=426, `maxgold`=426 WHERE `entry`=37404; +UPDATE `creature_template` SET `KillCredit1`=14765, `modelid1`=14793, `modelid2`=14795, `modelid3`=14794, `modelid4`=14796, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=13.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=13736, `spell2`=15589, `spell3`=22911, `spell4`=23511, `mingold`=0, `maxgold`=0 WHERE `entry`=37407; +UPDATE `creature_template` SET `KillCredit1`=14284, `modelid1`=14322, `modelid2`=14324, `modelid3`=14326, `modelid4`=14327, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.2, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4608, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=1616, `maxgold`=1616 WHERE `entry`=37409; +UPDATE `creature_template` SET `KillCredit1`=13358, `modelid1`=13390, `modelid2`=13391, `modelid3`=13392, `modelid4`=13393, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=420, `maxdmg`=630, `attackpower`=157, `dmg_multiplier`=1, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4608, `minrangedmg`=336, `maxrangedmg`=504, `rangedattackpower`=126, `type`=7, `type_flags`=0, `spell1`=22121, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=580, `maxgold`=580 WHERE `entry`=37410; +UPDATE `creature_template` SET `KillCredit1`=12050, `modelid1`=13274, `modelid2`=13275, `modelid3`=13276, `modelid4`=13277, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=19130, `spell3`=0, `spell4`=0, `mingold`=547, `maxgold`=547 WHERE `entry`=37412; +UPDATE `creature_template` SET `KillCredit1`=12127, `modelid1`=13253, `modelid2`=12077, `modelid3`=12079, `modelid4`=12078, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=11976, `spell2`=22120, `spell3`=0, `spell4`=0, `mingold`=520, `maxgold`=520 WHERE `entry`=37415; +UPDATE `creature_template` SET `KillCredit1`=11997, `modelid1`=12075, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=1, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.4, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37416; +UPDATE `creature_template` SET `KillCredit1`=14283, `modelid1`=10828, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=0.9, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=1, `type_flags`=1, `spell1`=3391, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37419; +UPDATE `creature_template` SET `KillCredit1`=12096, `modelid1`=13384, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5241, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=131, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=150, `maxgold`=150 WHERE `entry`=37420; +UPDATE `creature_template` SET `KillCredit1`=13577, `modelid1`=13714, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5281, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=3, `speed_walk`=1, `speed_run`=1.38571, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=8.2, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=15284, `spell2`=16856, `spell3`=0, `spell4`=0, `mingold`=1713, `maxgold`=1713 WHERE `entry`=37422; +UPDATE `creature_template` SET `KillCredit1`=13617, `modelid1`=13669, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=9821, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=4194307, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=7.3, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=632, `maxgold`=632 WHERE `entry`=37426; +UPDATE `creature_template` SET `KillCredit1`=5135, `modelid1`=3083, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37427; +UPDATE `creature_template` SET `KillCredit1`=11677, `modelid1`=371, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1.76, `speed_run`=1.14286, `rank`=0, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=1.2, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=0, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=3391, `spell2`=14516, `spell3`=16170, `spell4`=0, `mingold`=254, `maxgold`=254 WHERE `entry`=37431; +UPDATE `creature_template` SET `KillCredit1`=14776, `modelid1`=14797, `modelid2`=14799, `modelid3`=14798, `modelid4`=14800, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=436, `maxdmg`=654, `attackpower`=163, `dmg_multiplier`=51.4, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=349, `maxrangedmg`=523, `rangedattackpower`=130, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=150, `maxgold`=150 WHERE `entry`=37435; +UPDATE `creature_template` SET `KillCredit1`=13078, `modelid1`=13299, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1.77, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=8147, `spell2`=12057, `spell3`=0, `spell4`=0, `mingold`=117, `maxgold`=117 WHERE `entry`=37442; +UPDATE `creature_template` SET `KillCredit1`=11948, `modelid1`=11896, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=83, `maxlevel`=83, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=3, `mindmg`=468, `maxdmg`=702, `attackpower`=175, `dmg_multiplier`=62, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=374, `maxrangedmg`=562, `rangedattackpower`=140, `type`=7, `type_flags`=4, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37444; +UPDATE `creature_template` SET `KillCredit1`=13331, `modelid1`=13258, `modelid2`=13259, `modelid3`=13260, `modelid4`=13261, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1216, `faction_H`=1216, `npcflag`=0, `speed_walk`=1.28, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.4, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=19130, `spell3`=0, `spell4`=0, `mingold`=662, `maxgold`=662 WHERE `entry`=37450; +UPDATE `creature_template` SET `KillCredit1`=13332, `modelid1`=13282, `modelid2`=13283, `modelid3`=13284, `modelid4`=13285, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1.28, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1.4, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=12169, `spell2`=19130, `spell3`=0, `spell4`=0, `mingold`=617, `maxgold`=617 WHERE `entry`=37451; +UPDATE `creature_template` SET `KillCredit1`=14777, `modelid1`=14797, `modelid2`=14799, `modelid3`=14798, `modelid4`=14800, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=436, `maxdmg`=654, `attackpower`=163, `dmg_multiplier`=51.4, `baseattacktime`=2000, `rangeattacktime`=2000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=349, `maxrangedmg`=523, `rangedattackpower`=130, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37468; +UPDATE `creature_template` SET `KillCredit1`=11603, `modelid1`=371, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=0.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=12057, `spell2`=15572, `spell3`=0, `spell4`=0, `mingold`=195, `maxgold`=195 WHERE `entry`=37469; +UPDATE `creature_template` SET `KillCredit1`=11604, `modelid1`=371, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=195, `maxdmg`=293, `attackpower`=73, `dmg_multiplier`=1.1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=2, `unit_flags`=0, `minrangedmg`=156, `maxrangedmg`=234, `rangedattackpower`=58, `type`=7, `type_flags`=0, `spell1`=15228, `spell2`=18968, `spell3`=0, `spell4`=0, `mingold`=271, `maxgold`=271 WHERE `entry`=37470; +UPDATE `creature_template` SET `KillCredit1`=10982, `modelid1`=371, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=210, `maxdmg`=315, `attackpower`=79, `dmg_multiplier`=1, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=0, `minrangedmg`=168, `maxrangedmg`=252, `rangedattackpower`=63, `type`=7, `type_flags`=0, `spell1`=17230, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=145, `maxgold`=145 WHERE `entry`=37473; +UPDATE `creature_template` SET `KillCredit1`=11839, `modelid1`=494, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=14, `faction_H`=14, `npcflag`=0, `speed_walk`=1, `speed_run`=1.19048, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=0, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=13737, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=498, `maxgold`=498 WHERE `entry`=37475; +UPDATE `creature_template` SET `KillCredit1`=13179, `modelid1`=13473, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=4.7, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4608, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=15572, `spell2`=15580, `spell3`=0, `spell4`=0, `mingold`=1714, `maxgold`=1714 WHERE `entry`=37479; +UPDATE `creature_template` SET `KillCredit1`=13437, `modelid1`=13470, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5146, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=6.9, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4928, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=15580, `spell2`=16509, `spell3`=0, `spell4`=0, `mingold`=1813, `maxgold`=1813 WHERE `entry`=37480; +UPDATE `creature_template` SET `KillCredit1`=13180, `modelid1`=13474, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=81, `maxlevel`=81, `faction_A`=1214, `faction_H`=1214, `npcflag`=2, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=4.4, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=15572, `spell2`=15580, `spell3`=0, `spell4`=0, `mingold`=1758, `maxgold`=1758 WHERE `entry`=37481; +UPDATE `creature_template` SET `KillCredit1`=13438, `modelid1`=13471, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5148, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=4.8, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=15580, `spell2`=16509, `spell3`=0, `spell4`=0, `mingold`=1586, `maxgold`=1586 WHERE `entry`=37483; +UPDATE `creature_template` SET `KillCredit1`=13439, `modelid1`=13472, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=5147, `minlevel`=81, `maxlevel`=81, `faction_A`=1216, `faction_H`=1216, `npcflag`=3, `speed_walk`=1, `speed_run`=1.14286, `rank`=1, `mindmg`=218, `maxdmg`=327, `attackpower`=82, `dmg_multiplier`=4.5, `baseattacktime`=1000, `rangeattacktime`=1000, `unit_class`=1, `unit_flags`=4608, `minrangedmg`=174, `maxrangedmg`=262, `rangedattackpower`=66, `type`=7, `type_flags`=0, `spell1`=15580, `spell2`=16509, `spell3`=0, `spell4`=0, `mingold`=1645, `maxgold`=1645 WHERE `entry`=37484; +UPDATE `creature_template` SET `KillCredit1`=10364, `modelid1`=9763, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37485; +UPDATE `creature_template` SET `KillCredit1`=2225, `modelid1`=14781, `modelid2`=0, `modelid3`=0, `modelid4`=0, `gossip_menu_id`=0, `minlevel`=80, `maxlevel`=80, `faction_A`=1214, `faction_H`=1214, `npcflag`=128, `speed_walk`=1, `speed_run`=1.14286, `rank`=0, `mindmg`=315, `maxdmg`=472, `attackpower`=118, `dmg_multiplier`=1, `baseattacktime`=1500, `rangeattacktime`=1500, `unit_class`=1, `unit_flags`=4096, `minrangedmg`=252, `maxrangedmg`=378, `rangedattackpower`=94, `type`=7, `type_flags`=0, `spell1`=0, `spell2`=0, `spell3`=0, `spell4`=0, `mingold`=0, `maxgold`=0 WHERE `entry`=37486; + +update `creature_template` set exp=2 where `entry` in (37234, +37236, 37237, 37239, 37240, 37242, 37243, 37244, 37250, 37251, 37264, +37267, 37268, 37269, 37278, 37281, 37282, 37283, 37284, 37285, 37287, +37289, 37291, 37294, 37296, 37297, 37300, 37302, 37305, 37308, 37310, +37313, 37315, 37318, 37320, 37323, 37326, 37327, 37331, 37333, 37334, +37335, 37337, 37340, 37344, 37345, 37346, 37348, 37349, 37364, 37366, +37367, 37369, 37370, 37371, 37372, 37373, 37374, 37383, 37384, 37398, +37399, 37401, 37402, 37403, 37404, 37407, 37409, 37410, 37412, 37415, +37416, 37419, 37420, 37422, 37426, 37427, 37431, 37435, 37442, 37444, +37450, 37451, 37468, 37469, 37470, 37473, 37475, 37479, 37480, 37481, +37483, 37484, 37485, 37486); \ No newline at end of file -- cgit v1.2.3 From 4da6b98b528c673fa357fe5cea57a5d34d488208 Mon Sep 17 00:00:00 2001 From: Kirkhammett Date: Fri, 5 Jul 2013 15:17:56 +0200 Subject: DB/SAI: Add support for the Sons of Hodir Questline. This update adds alot of the missing npcs, objects quest relations quests etc. Closes #10106 --- .../world/2013_07_05_02_world_QuestchainSOH.sql | 543 +++++++++++++++++++++ 1 file changed, 543 insertions(+) create mode 100644 sql/updates/world/2013_07_05_02_world_QuestchainSOH.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_05_02_world_QuestchainSOH.sql b/sql/updates/world/2013_07_05_02_world_QuestchainSOH.sql new file mode 100644 index 00000000000..14a3ea7c1a0 --- /dev/null +++ b/sql/updates/world/2013_07_05_02_world_QuestchainSOH.sql @@ -0,0 +1,543 @@ +-- A lot of missing npcs/gobs/quest relations/quests/phases etc.. +-- http://www.wowwiki.com/Storm_Peaks_quests +-- http://www.wowwiki.com/Sons_of_Hodir +-- http://www.wowhead.com/faction=1119#comments:id=905880 +SET @NJORMELD := 30099; -- At Fjorn's Anvil +SET @NJORMELD2 := 30127; -- At Dun Niffelem +SET @SNORRI_NPC := 30123; -- At Fjorn's Anvil +SET @SNORRI_MOUNT := 30124; -- Snorri spell_click +SET @NPC_BUNNY := 30122; -- Storm Peaks Anvil Bunny +SET @NPC_SR2 := 30120; -- Seething Revenant (phase 2) +SET @NPC_SR3 := 30387; -- Seething Revenant (phase 3) +SET @NPC_FGS := 30121; -- Frost Giant Stormherald +SET @NPC_BR := 30160; -- Brittle Revenant +SET @NPC_SOH2 := 30262; -- Son of Hodir (phase 2) +SET @NPC_BF := 30320; -- Battlescarred Frostworg (phase 2) +SET @SM := 30260; -- Stoic Mammoth (phase 2) +SET @RJ := 30422; -- Roaming Jormungar +SET @WARBEAR := 29918; -- Warbear Matriarch +SET @HYLDSMEET_WB := 30174; -- Hyldsmeet Warbear +SET @BUNNY_SPEAR := 30246; -- Dun Niffelem Spear Chain Bunny (Phase 2) +SET @F_WORG := 30219; -- Ethereal Frostwarg +SET @SF_INFIL := 30222; -- Stormforged Infiltrator + +SET @NPC_THORIM2 := 30390; -- at Thunderfall +SET @NPC_THORIM3 := 30295; -- at Terrace of the Makers +-- Will be used in Hot and Cold +SET @SPELL_RIDE := 55957; -- Ride Snorri +SET @SPELL_GATHER := 56750; -- Gather Snow +SET @SPELL_THROW := 56753; -- Throw Snowball +SET @SPELL_SLEEP := 32951; -- Sleeping Sleep +SET @SPELL_WAKE := 56752; -- Wake Snorri +SET @SPELL_KCtTM := 56755; -- KC toTarget Master +SET @SPELL_KC := 56754; -- Kill Credit, Seething Revenant +SET @F_REPUTATION := 57048; -- Force Reputation +SET @SUMMON_SFINF := 56325; -- Summon Stormforged Infiltrator + +SET @GO_SNOWDRIFT := 192075; -- Snowdrift +SET @GO_ANVIL1 := 192060; -- Fjorn's Anvil (at Fjorn's Anvil) +SET @GO_ANVIL2 := 192071; -- Fjorn's Anvil (at Dun Niffelem) +SET @GO_SPEAR := 192079; -- Hodir's Spear +SET @GO_ARNGRIM := 192524; -- Arngrim the Insatiable +SET @GO_HORN := 192078; -- Hodir's Horn +SET @GO_WARG := 300244; -- Corpse of the Fallen Worg (Spell focus) +SET @GO_GRANITE := 191815; -- Granite Boulder +SET @GO_GRANITE2 := 191814; -- Granite Boulder +SET @QUEST1 := 12967; -- Battling the Elements +SET @QUEST2 := 12981; -- Hot and Cold +SET @QUEST3 := 13003; -- Thrusting Hodir's Spear +SET @QUEST4 := 13046; -- Feeding Arngrim +SET @QUEST5 := 12977; -- Blowing Hodir's Horn + +SET @GUID_BUNNY1 := 63373; -- 4 required NPC +SET @GUID_BUNNY2 := 129993; -- 6 required NPC +SET @GUID_BUNNY := 116620; -- 23 required NPC +SET @GUID := 142335; -- 77 reqiured NPC +SET @OGUID := 20918; -- 17 requied GO +SET @GUID_GO := 21065; -- 20 required GO + + +DELETE FROM `gameobject` WHERE `id` IN (@GO_ANVIL1,@GO_ANVIL2,@GO_SNOWDRIFT,@GO_SPEAR,@GO_ARNGRIM,@GO_HORN,@GO_WARG,@GO_GRANITE,@GO_GRANITE2); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +-- Making anvil visible in phase 1 just to be sure it can be seen +(@GUID_GO+0,@GO_ANVIL1,571,1,1+2+4,7217.072,-3645.753,819.4065,1.797689,0,0,0.782608,0.6225148,300,255,1), +(@GUID_GO+1,@GO_ANVIL2,571,1,4,7213.591,-2648.741,810.5506,0.2268925,0,0,0.113203,0.9935719,300,255,1), +-- +(@GUID_GO+2,@GO_SNOWDRIFT,571,1,4,7218.64,-3529.71,828.539,-1.93732,0,0,-0.824127,0.566404,300,100,1), +(@GUID_GO+3,@GO_SNOWDRIFT,571,1,4,7201.17,-3556.13,828.03,2.18166,0,0,0.88701,0.461749,300,100,1), +(@GUID_GO+4,@GO_SNOWDRIFT,571,1,4,7230.44,-3555.63,841.772,1.85005,0,0,0.798636,0.601815,300,100,1), +(@GUID_GO+5,@GO_SNOWDRIFT,571,1,4,7169.6,-3615.71,830.249,-2.89724,0,0,-0.992546,0.121873,300,100,1), +(@GUID_GO+6,@GO_SNOWDRIFT,571,1,4,7121.83,-3542.56,835.008,-0.750491,0,0,-0.366501,0.930418,300,100,1), +(@GUID_GO+7,@GO_SNOWDRIFT,571,1,4,7131.5,-3584.22,840.195,-1.91986,0,0,-0.819151,0.573577,300,100,1), +(@GUID_GO+8,@GO_SNOWDRIFT,571,1,4,7162.55,-3582.66,830.36,1.11701,0,0,0.529919,0.848048,300,100,1), +(@GUID_GO+9,@GO_SNOWDRIFT,571,1,4,7176.21,-3511.2,833.381,1.93731,0,0,0.824125,0.566409,300,100,1), +(@GUID_GO+10,@GO_SNOWDRIFT,571,1,4,7148.73,-3559.17,830.36,-2.72271,0,0,-0.978147,0.207914,300,100,1), +(@GUID_GO+11,@GO_SNOWDRIFT,571,1,4,7165.47,-3639.53,832.157,0.890117,0,0,0.430511,0.902586,300,100,1), +(@GUID_GO+12,@GO_SPEAR,571,1,4,7309.3,-2782.45,869.824,-0.610864,0,0,-0.300705,0.953717,180,255,1), +(@GUID_GO+13,@GO_ARNGRIM,571,1,4,7355.87,-2962.37,912.502,1.74533,0,0,0.766045,0.642787,180,255,1), +(@GUID_GO+14,@GO_HORN,571,1,4,7142.23,-2723.25,787.769,-2.63544,0,0,-0.968147,0.250383,180,255,1), +(@GUID_GO+15,@GO_WARG, 571, 1, 4, 7161.11, -2228.79, 758.93, 5.72936, 0, 0, 0.273389, -0.961904, 300, 0, 1), +-- Additional GO's for Mending Fences +(@GUID_GO+16,@GO_GRANITE,571,1,1,7229.834,-3560.515,840.1581,4.97419,0,0,0,1,120,255,1), -- Granite Boulder (Area: Fjorn's Anvil) +(@GUID_GO+32,@GO_GRANITE,571,1,1,7170.086,-3644.12,830.1971,3.996807,0,0,0,1,120,255,1), -- Granite Boulder (Area: Fjorn's Anvil) +(@GUID_GO+33,@GO_GRANITE,571,1,1,7273.538,-3632.394,829.7211,0.4537851,0,0,0,1,120,255,1), -- Granite Boulder (Area: Fjorn's Anvil) +(@GUID_GO+34,@GO_GRANITE,571,1,1,7464.846,-3014.682,851.4673,5.253442,0,0,0,1,120,255,1); -- Granite Boulder (Area: Frostfield Lake + +DELETE FROM `creature` WHERE `id` IN (@NJORMELD,@SNORRI_NPC,@NPC_BUNNY,@NPC_SR2,@NPC_FGS,@NPC_BR,@NPC_SR3,@NPC_SOH2,@NPC_BF,@SM,@RJ,@BUNNY_SPEAR,@NPC_THORIM3); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES +(@GUID+0,@NJORMELD,571,1,4,24531,0,7183.295,-3519.859,827.4118,0.03490658,300,0,0,50400,0,0,0,0,0), +(@GUID+1,@SNORRI_NPC,571,1,4,26772,0,7167.375,-3543.059,827.746,6.056293,300,0,0,50400,0,0,0,0,0), +(@GUID+2,@NPC_BUNNY,571,1,4,19595,0,7219.52,-3645.4,824.558,2.61799,300,0,0,4979,0,0,0,0,0), +(@GUID+3,@NPC_SR2,571,1,4,25680,0,7268.63,-3640.36,825.267,2.37365,120,5,0,12600,0,1,0,0,0), +(@GUID+4,@NPC_SR2,571,1,4,25680,0,7192.8,-3665,824.727,6.05783,120,5,0,12600,0,1,0,0,0), +(@GUID+5,@NPC_SR2,571,1,4,25680,0,7250.05,-3636.57,825.872,-1.4385,120,5,0,12600,0,1,0,0,0), +(@GUID+6,@NPC_SR2,571,1,4,25680,0,7201.55,-3622.78,823.52,5.55015,120,5,0,12600,0,1,0,0,0), +(@GUID+7,@NPC_SR2,571,1,4,25680,0,7223.84,-3676.14,828.727,2.17625,120,5,0,12600,0,1,0,0,0), +(@GUID+8,@NPC_FGS,571,1,4,24531,0,7201.98,-3624.42,823.542,5.13733,120,0,0,48700,0,0,0,0,0), +(@GUID+9,@NPC_FGS,571,1,4,24531,0,7251.04,-3644,823.097,3.15905,120,0,0,48700,0,0,0,0,0), +(@GUID+10,@NPC_FGS,571,1,4,24531,0,7220.33,-3671.06,823.633,1.67552,120,0,0,50400,0,0,0,0,0), +(@GUID+11,@NPC_BR,571,1,4,26698,0,7419.28,-3141.33,837.577,1.34635,300,0,0,12600,0,0,0,0,0), +(@GUID+12,@NPC_BR,571,1,4,26698,0,7359.13,-3103.31,837.534,4.17214,300,0,0,12600,0,2,0,0,0), +(@GUID+13,@NPC_BR,571,1,4,26698,0,7376.07,-3153.04,837.577,1.80255,300,0,0,12600,0,0,0,0,0), +(@GUID+14,@NPC_BR,571,1,4,26698,0,7315.46,-3179.34,837.617,1.60589,300,0,0,12600,0,0,0,0,0), +(@GUID+15,@NPC_BR,571,1,4,26698,0,7255.27,-3083.26,837.577,-2.07948,300,0,0,12600,0,0,0,0,0), +(@GUID+16,@NPC_BR,571,1,4,26698,0,7405.8,-3082.12,837.57,-0.036917,300,0,0,12600,0,0,0,0,0), +(@GUID+17,@NPC_BR,571,1,4,26698,0,7300.77,-3084.76,837.577,3.23101,300,0,0,12600,0,0,0,0,0), +(@GUID+18,@NPC_SR3,571,1,8,0,0,7231.77,-3648.91,823.616,5.67933,600,0,0,12600,0,0,0,0,0), +(@GUID+19,@NPC_SR3,571,1,8,0,0,7181.85,-3561.65,827.102,1.34394,600,0,0,12600,0,0,0,0,0), +(@GUID+20,@NPC_SR3,571,1,8,0,0,7171.87,-3564.23,826.705,1.05727,600,0,0,12600,0,0,0,0,0), +(@GUID+21,@NPC_SR3,571,1,8,0,0,7235.26,-3480.56,850.328,4.32905,600,0,0,12600,0,0,0,0,0), +(@GUID+22,@NPC_SR3,571,1,8,0,0,7190.62,-3549.54,827.918,1.28897,600,0,0,12600,0,0,0,0,0), +(@GUID+23,@NPC_SR3,571,1,8,0,0,7146.46,-3553.65,830.519,0.613523,600,0,0,12600,0,0,0,0,0), +(@GUID+24,@NPC_SR3,571,1,8,0,0,7209.96,-3426.8,839.399,1.92906,600,0,0,12600,0,0,0,0,0), +(@GUID+25,@NPC_SR3,571,1,8,0,0,7191.38,-3364.16,846.246,1.41463,600,0,0,12600,0,0,0,0,0), +(@GUID+26,@NPC_SR3,571,1,8,25680,0,7224.41,-3496.64,840.3,3.8813,300,0,0,12600,0,0,0,0,0), +(@GUID+27,@NPC_SOH2,571,1,4,24531,0,7200.93,-2751.15,777.517,1.58738,300,0,0,73050,0,0,0,0,0), +(@GUID+28,@NPC_SOH2,571,1,4,24531,0,7305.37,-2755.09,775.266,1.22173,300,0,0,73050,0,0,0,0,0), +(@GUID+29,@NPC_SOH2,571,1,4,24531,0,7316.17,-2635.26,814.969,3.28639,300,0,0,75600,0,0,0,0,0), +(@GUID+30,@NPC_SOH2,571,1,4,24531,0,7125.52,-2690.9,786.766,0.244346,300,0,0,75600,0,0,0,0,0), +(@GUID+31,@NPC_SOH2,571,1,4,24531,0,7126.99,-2749.76,786.682,0.261799,300,0,0,73050,0,0,0,0,0), +(@GUID+32,@NPC_SOH2,571,1,4,24531,0,7450.26,-2713.95,809.15,4.57385,300,0,0,73050,0,0,0,0,0), +(@GUID+33,@NPC_SOH2,571,1,4,24531,0,7241.71,-2883.89,824.505,5.93024,300,0,0,73050,0,2,0,0,0), +(@GUID+34,@NPC_SOH2,571,1,4,24531,0,7206.07,-2828.19,824.699,1.46608,300,0,0,73050,0,0,0,0,0), +(@GUID+35,@NPC_SOH2,571,1,4,24531,0,7327.04,-2396.17,749.132,0.84682,300,0,0,75600,0,0,0,0,0), +(@GUID+36,@NPC_SOH2,571,1,4,24531,0,7303.96,-2519.59,750.318,2.88288,300,0,0,75600,0,2,0,0,0), +(@GUID+37,@NPC_SOH2,571,1,4,24531,0,7419.77,-2885.54,823.037,1.64061,300,0,0,75600,0,0,0,0,0), +(@GUID+38,@NPC_SOH2,571,1,4,24531,0,7288.75,-2579.84,750.516,1.13446,300,0,0,75600,0,0,0,0,0), +(@GUID+39,@NPC_SOH2,571,1,4,24531,0,7239.24,-2638.54,753.62,5.48033,300,0,0,75600,0,0,0,0,0), +(@GUID+40,@NPC_SOH2,571,1,4,24531,0,7431.13,-2429.4,753.04,4.09782,300,0,0,73050,0,0,0,0,0), +(@GUID+41,@NPC_SOH2,571,1,4,24531,0,7394.44,-2524.73,749.249,5.16889,300,0,0,73050,0,2,0,0,0), +(@GUID+42,@NPC_SOH2,571,1,4,24531,0,7407.6,-2934.94,847.905,1.95477,300,0,0,75600,0,0,0,0,0), +(@GUID+43,@NPC_BF,571,1,4,26331,0,7401.46,-2522.13,749.245,5.24142,300,0,0,60875,0,2,0,0,0), +(@GUID+44,@NPC_BF,571,1,4,26331,0,7311.83,-2530.07,749.488,2.87671,300,0,0,60875,0,2,0,0,0), +(@GUID+45,@SM,571,1,4,0,0,7143.71,-2251.43,760.439,1.29097,300,0,0,11379,0,0,0,0,0), +(@GUID+46,@SM,571,1,4,27281,0,7172.8,-2257.74,759.628,1.11662,300,0,0,11379,0,0,0,0,0), +(@GUID+47,@SM,571,1,4,27281,0,7218.29,-2214.53,759.112,3.43747,300,0,0,11379,0,0,0,0,0), +(@GUID+48,@SM,571,1,4,27281,0,7164.95,-2214.65,758.563,4.15611,300,0,0,11379,0,0,0,0,0), +(@GUID+49,@SM,571,1,4,0,0,7105.5,-2211.86,759.098,0.688573,300,0,0,11379,0,0,0,0,0), +(@GUID+50,@SM,571,1,4,27281,0,7110.67,-2133.14,758.775,5.04282,300,0,0,11379,0,0,0,0,0), +(@GUID+51,@SM,571,1,4,27281,0,7071.03,-2168.81,760.815,0.91791,300,0,0,11379,0,0,0,0,0), +(@GUID+52,@SM,571,1,4,27281,0,7028.51,-2077.67,753.23,5.25331,300,0,0,11379,0,0,0,0,0), +(@GUID+53,@SM,571,1,4,27281,0,7106.01,-1988.13,771.455,4.35011,300,0,0,11379,0,0,0,0,0), +(@GUID+54,@SM,571,1,4,0,0,7041.36,-1981.59,776.354,0.266033,300,0,0,11379,0,0,0,0,0), +(@GUID+55,@SM,571,1,4,0,0,7133.88,-2039.53,771.902,3.57334,300,0,0,11379,0,0,0,0,0), +(@GUID+56,@SM,571,1,4,27281,0,7077.88,-2078.98,759.218,1.99469,300,0,0,11379,0,0,0,0,0), +(@GUID+57,@RJ,571,1,4,26262,0,7188.82,-2320.21,757.813,-1.87154,300,0,0,12175,0,0,0,0,0), +(@GUID+58,@RJ,571,1,4,26262,0,7250.3,-2342.8,751.68,0.851782,300,0,0,12600,0,0,0,0,0), +(@GUID+59,@RJ,571,1,4,26262,0,7149.57,-2163.88,761.147,2.97457,300,0,0,12600,0,0,0,0,0), +(@GUID+60,@RJ,571,1,4,26262,0,7194.98,-2195.57,761.949,-0.387345,300,0,0,12600,0,0,0,0,0), +(@GUID+61,@RJ,571,1,4,26262,0,7157.35,-2262.32,761.623,0.494206,300,0,0,12600,0,0,0,0,0), +(@GUID+62,@RJ,571,1,4,26262,0,7252.51,-2230.52,760.183,3.20023,300,0,0,12175,0,0,0,0,0), +(@GUID+63,@RJ,571,1,4,26262,0,7082.68,-2112.98,758.537,3.60123,300,0,0,12175,0,0,0,0,0), +(@GUID+64,@RJ,571,1,4,26262,0,7138.08,-2036.25,771.858,2.03839,300,0,0,12600,0,0,0,0,0), +(@GUID+65,@RJ,571,1,4,26262,0,7065.27,-2070.9,759.016,0.790229,300,0,0,12600,0,0,0,0,0), +(@GUID+66,@RJ,571,1,4,26262,0,7142.27,-2214.55,758.268,5.21568,300,0,0,12600,0,0,0,0,0), +(@GUID+67,@RJ,571,1,4,26262,0,7093.6,-2159.45,758.662,5.46951,300,0,0,12175,0,0,0,0,0), +(@GUID+68,@RJ,571,1,4,26262,0,7050.49,-2148.12,755.994,5.28631,300,0,0,12175,0,0,0,0,0), +(@GUID+69,@RJ,571,1,4,26262,0,7117.06,-2117.56,760.043,4.86823,300,0,0,12175,0,0,0,0,0), +(@GUID+70,@RJ,571,1,4,26262,0,7134.93,-2112.19,761.723,0.788161,300,0,0,12600,0,0,0,0,0), +(@GUID+71,@RJ,571,1,4,26262,0,7123.43,-2085.57,764.362,5.11831,300,0,0,12175,0,0,0,0,0), +(@GUID+72,@BUNNY_SPEAR,571,1,4,0,0,7266.99,-2753.76,870.875,6.23082,180,0,0,9215,0,0,0,0,0), +(@GUID+73,@BUNNY_SPEAR,571,1,4,0,0,7347.33,-2809.35,868.826,0.122173,180,0,0,9215,0,0,0,0,0), +(@GUID+74,@BUNNY_SPEAR,571,1,4,0,0,7215.59,-2712.18,894.848,0.034907,180,0,0,9215,0,0,0,0,0), +(@GUID+75,@BUNNY_SPEAR,571,1,4,0,0,7393.33,-2841.03,888.614,6.14356,180,0,0,9215,0,0,0,0,0), +(@GUID+76,@NPC_THORIM3,571,1,1,0,0,7762.389,-2159.516,1233.409,1.53589,300,0,0,13481,0,0,0,0,0); + +UPDATE `creature_template` SET `npcflag`=`npcflag`|1|2,`faction_A`=2107,`faction_H`=2107 WHERE `entry`=@NJORMELD; +UPDATE `creature_template` SET `faction_A`=2107,`faction_H`=2107,`npcflag`=`npcflag`|16777216 WHERE `entry`=@SNORRI_NPC; +UPDATE `creature_template` SET `npcflag`=`npcflag`|33554688 WHERE `entry`=@NPC_BUNNY; +UPDATE `creature_template` SET `AIName`='SmartAI',`npcflag`=0,`spell1`=@SPELL_GATHER,`spell2`=@SPELL_THROW,`spell5`=@SPELL_WAKE WHERE `entry`=@SNORRI_MOUNT; +UPDATE `creature_template` SET `AIName`='SmartAI',`faction_A`=2124,`faction_H`=2124 WHERE `entry`=@NPC_SR2; +UPDATE `creature_template` SET `faction_A`=2107,`faction_H`=2107,`unit_flags`=`unit_flags`|131072 WHERE `entry`=@NPC_FGS; +UPDATE `creature_template` SET `gossip_menu_id`=10109 WHERE `entry`=@NPC_THORIM3; +UPDATE `creature_template` SET `spell1`=54459, `spell2`=54458, `spell3`=54460, `spell4`=0, `spell5`=0, `spell6`=0 WHERE `entry`=@WARBEAR; +UPDATE `gameobject_template` SET `flags`=0 WHERE `entry`=191814; +UPDATE `gameobject_template` SET `flags`=0 WHERE `entry`=191815; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=@SPELL_WAKE; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +(@SPELL_WAKE,-@SPELL_SLEEP,1,'Wake Snorri removes Sleeping Sleep'); + +DELETE FROM `creature_template_addon` WHERE `entry` IN (@NJORMELD,@NJORMELD2,@SNORRI_NPC,@NPC_FGS,@NPC_THORIM3,@F_WORG); +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@F_WORG,0,0x0,0x101,0,0, '31748'), -- Spirit Particles, big. +(@NJORMELD,0,0,0,0,0,'61208'), -- Fjorn's Anvil - Quest Invisibility 3 +(@NJORMELD2,0,0,0,0,0,'56768'), -- Quest Invisibility Tier 1 +(@SNORRI_NPC,0,0,0,0,0,'61208'), -- Fjorn's Anvil - Quest Invisibility 3 +(@NPC_FGS,0,0,0,0,0,'56568'), -- Cooling Breath +(@NPC_THORIM3,0,0,0,0,0,'54500'); -- Quest Invisibility 1 + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=@SNORRI_NPC; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup`=29375 AND `SourceEntry`=41556; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(18,@SNORRI_NPC,@SPELL_RIDE,0,0,9,0,12967,0,0,0,0,'','Required quest active for spellclick'), +(1,29375,41556,0,0,9,0,12915,0,0,0,0,'','Drop Slag Covered Metal on quest Mending Fences taken'), +-- These next 2 conditions are not blizzlike (adding them for idiots that turn in Mending Fences without taking this item) +(1,29375,41556,0,1,8,0,12915,0,0,0,0,'','Drop Slag Covered Metal on quest Mending Fences rewarded'), +(1,29375,41556,0,2,14,0,12922,0,0,0,0,'','Stop dropping Slag Covered Metal on quest The Refiner''s Fire'); + +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@SNORRI_NPC; +INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES +(@SNORRI_NPC,@SPELL_RIDE,3,0); + +DELETE FROM `creature_text` WHERE `entry`=@SNORRI_MOUNT; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@SNORRI_MOUNT,0,0,'Oh, hello, little $r.',12,0,100,15,0,0,"Snorri text"); + +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (@NPC_SR2,@NPC_FGS); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@SNORRI_MOUNT,@NPC_SR2); +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 +-- Snorri (mount) +(@SNORRI_MOUNT,0,0,0,54,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Snorri - Say text - On just spawned'), +(@SNORRI_MOUNT,0,1,0,60,0,100,0,30000,60000,30000,60000,11,@SPELL_SLEEP,0,0,0,0,0,1,0,0,0,0,0,0,0,'Snorri - On Update - Cast sleep self'), +(@SNORRI_MOUNT,0,2,0,8,0,100,0,@SPELL_KCtTM,0,0,0,11,@SPELL_KC,0,0,0,0,0,23,0,0,0,0,0,0,0,'Snorri - On spellhit - Cast spell on owner'), +-- Seething Revenant +(@NPC_SR2,0,0,0,0,0,100,0,3000,6000,7000,12000,11,56620,1,0,0,0,0,2,0,0,0,0,0,0,0,'Seething Revenant - In Combat - Cast Seething Flames'), +(@NPC_SR2,0,1,0,6,0,100,0,0,0,0,0,11,@SPELL_KCtTM,0,0,0,0,0,7,0,0,0,0,0,0,0,'Seething Revenant - Cast KC - Target Master'); + +-- Quest relations +DELETE FROM `gameobject_questrelation` WHERE `id` IN (@GO_ANVIL2,@GO_SPEAR,@GO_ARNGRIM,@GO_HORN); +INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES +(@GO_ANVIL2,@QUEST2), +(@GO_SPEAR,@QUEST3), +(@GO_ARNGRIM,@QUEST4), +(@GO_HORN,@QUEST5); + +DELETE FROM `gameobject_involvedrelation` WHERE `id`IN (@GO_ANVIL2,@GO_SPEAR,@GO_ARNGRIM,@GO_HORN); +INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES +(@GO_ANVIL2,@QUEST2), +(@GO_SPEAR,@QUEST3), +(@GO_ARNGRIM,@QUEST4), +(@GO_HORN,@QUEST5); + +-- Quest progression linking +UPDATE `quest_template` SET `PrevQuestId`=13063 WHERE `id`=12900; -- Making a Harness +UPDATE `quest_template` SET `PrevQuestId`=12900 WHERE `id`=12983; -- The Last of Her Kind +UPDATE `quest_template` SET `PrevQuestId`=12900 WHERE `id`=12989; -- The Slithering Darkness +UPDATE `quest_template` SET `PrevQuestId`=12956 WHERE `id`=12924; -- Forging an Alliance +UPDATE `quest_template` SET `PrevQuestId`=13047 WHERE `id`=13109; -- Diametrically Opposed +UPDATE `quest_template` SET `PrevQuestId`=12967 WHERE `id`=12981; -- Hot and Cold +UPDATE `quest_template` SET `PrevQuestId`=12987 WHERE `id`=13006; -- Polishing the Helm +UPDATE `quest_template` SET `PrevQuestId`=13001 WHERE `id`=13003; -- Thrusting Hodir's Spear + +-- Quest reputation conditions +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=21000 WHERE `id`=13046; -- Feeding Arngrim +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=9000 WHERE `id`=13003; -- Thrusting Hodir's Spear +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=9000 WHERE `id`=13001; -- Raising Hodir's Spear +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=9000 WHERE `id`=12994; -- Spy Hunter +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=13559; -- Hodir's Tribute +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=13421; -- Remember Everfrost! +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=13420; -- Everfrost +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=13006; -- Polishing the Helm +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=12987; -- Mounting Hodir's Helm +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=12985; -- Forging a Head +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=13011; -- Jormuttar is Soo Fat... +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=3000 WHERE `id`=12975; -- In Memoriam +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=0 WHERE `id`=12977; -- Blowing Hodir's Horn +UPDATE `quest_template` SET `RequiredMinRepFaction`=1119,`RequiredMinRepValue`=0 WHERE `id`=12981; -- Hot and Cold + +UPDATE `quest_template` SET `ExclusiveGroup`=-13035 WHERE `id`=13035; -- Loken's Lackeys +UPDATE `quest_template` SET `ExclusiveGroup`=-13035 WHERE `id`=13005; -- The Earthen Oath +UPDATE `quest_template` SET `PrevQuestId`=13035 WHERE `id`=13047; -- The Reckoning + +DELETE FROM `gossip_menu` WHERE `entry` IN (9900,9898,9899,10109); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9900,13747), -- King Jokkum gossip for quest Krolmir, Hammer of Storms +(9898,13748), -- King Jokkum gossip for quest Krolmir, Hammer of Storms +(9899,13749), -- King Jokkum gossip for quest Krolmir, Hammer of Storms +(10109,14034); -- Thorim at Terrace of the Makers + +-- Npc Texts +DELETE FROM `npc_text` WHERE `id` IN (13747,13748,13749); +INSERT INTO `npc_text` (`ID`,`text0_0`,`text0_1`,`lang0`,`prob0`,`em0_0`,`em0_1`,`em0_2`,`em0_3`,`em0_4`,`em0_5`,`text1_0`,`text1_1`,`lang1`,`prob1`,`em1_0`,`em1_1`,`em1_2`,`em1_3`,`em1_4`,`em1_5`,`text2_0`,`text2_1`,`lang2`,`prob2`,`em2_0`,`em2_1`,`em2_2`,`em2_3`,`em2_4`,`em2_5`,`text3_0`,`text3_1`,`lang3`,`prob3`,`em3_0`,`em3_1`,`em3_2`,`em3_3`,`em3_4`,`em3_5`,`text4_0`,`text4_1`,`lang4`,`prob4`,`em4_0`,`em4_1`,`em4_2`,`em4_3`,`em4_4`,`em4_5`,`text5_0`,`text5_1`,`lang5`,`prob5`,`em5_0`,`em5_1`,`em5_2`,`em5_3`,`em5_4`,`em5_5`,`text6_0`,`text6_1`,`lang6`,`prob6`,`em6_0`,`em6_1`,`em6_2`,`em6_3`,`em6_4`,`em6_5`,`text7_0`,`text7_1`,`lang7`,`prob7`,`em7_0`,`em7_1`,`em7_2`,`em7_3`,`em7_4`,`em7_5`,`WDBVerified`) VALUES +(13747,'You are permitted to visit our stronghold, little $r.$b$bDo not bring us dishonor!','',0,1,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,12340), +(13748,'I do not trust you enough to speak of such things.$b$bYou must respect the trials our people have endured, the burdens we have borne...$b$bPerhaps, if you were to bring great honor to Dun Niffelem, I would be inclined to share with you the knowledge of our people.','',0,1,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,12340), +(13749,'Very well, little $c.$b$bWhile there is much left for you to do to mend our relations with Thorim, I am compelled to share with you this one secret.$b$bSpeak to me again when you are ready to be shown that which you seek.','',0,1,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,12340); +-- Gossip menus +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9900,9899); +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES +(9900,0,0,'If it please you, King Jokkum, may I know what has become of Krolmir?',1,1,9898,0,0,0,NULL), +(9900,1,0,'If it please you, King Jokkum, may I know what has become of Krolmir?',1,1,9899,0,0,0,NULL), +(9899,0,0,'I am ready to be shown the fate of Krolmir,',1,1,0,0,0,0,NULL); +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9900; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15,9900,1,0,0,8,0,13011,0,0,0,0,'','Show gossip if player has quest completed'), +(15,9900,0,0,0,8,0,13011,0,0,1,0,'','Show gossip if player doesn''t have quest completed'); + +-- Hot and Cold (12981) + +SET @SPELL_ESSENCE := 56099; -- Throw Essence of Ice +SET @SPELL_SSM := 56073; -- Summon Smoldering Scrap +SET @SPELL_SFIS := 56101; -- Summon Frozen Iron Scrap +SET @AURA_SMOKE := 56118; -- Smolder Smoke +SET @NPC_BUNNY2 := 30169; -- Smoldering Scrap Bunny +SET @GO_SMOLDERING_SCRAP := 192124; -- Smoldering Scrap + + +DELETE FROM `creature` WHERE `id`=@NPC_BUNNY2; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES +(@GUID_BUNNY+0,@NPC_BUNNY2,571,1,8,1,0,7138.416,-3553.746,832.2787,4.694936,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+1,@NPC_BUNNY2,571,1,8,1,0,7191.637,-3490.598,833.993,0.2094395,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+2,@NPC_BUNNY2,571,1,8,1,0,7181.407,-3533.111,826.9557,3.211406,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+3,@NPC_BUNNY2,571,1,8,1,0,7178.466,-3558.917,827.0338,3.351032,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+4,@NPC_BUNNY2,571,1,8,1,0,7204.097,-3497.685,830.7673,2.635447,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+5,@NPC_BUNNY2,571,1,8,1,0,7232.065,-3474.279,850.7675,3.926991,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+6,@NPC_BUNNY2,571,1,8,1,0,7206.615,-3481.997,833.5632,3.281219,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+7,@NPC_BUNNY2,571,1,8,1,0,7192.001,-3386.612,846.4163,2.111848,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+8,@NPC_BUNNY2,571,1,8,1,0,7206.483,-3460.641,835.8506,3.909538,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+9,@NPC_BUNNY2,571,1,8,1,0,7227.852,-3415.956,840.174,1.553343,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+10,@NPC_BUNNY2,571,1,8,1,0,7222.42,-3441.838,837.1934,2.146755,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+11,@NPC_BUNNY2,571,1,8,1,0,7207.466,-3438.533,838.8736,2.897247,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+12,@NPC_BUNNY2,571,1,8,1,0,7217.787,-3378.616,846.7336,5.410521,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+13,@NPC_BUNNY2,571,1,8,1,0,7206.611,-3404.196,841.4804,4.223697,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+14,@NPC_BUNNY2,571,1,8,1,0,7248.638,-3625.245,826.9236,3.647738,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+15,@NPC_BUNNY2,571,1,8,1,0,7219.116,-3607.771,822.712,1.658063,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+16,@NPC_BUNNY2,571,1,8,1,0,7204.861,-3628.249,823.5885,4.223697,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+17,@NPC_BUNNY2,571,1,8,1,0,7196.265,-3652.629,823.5908,4.886922,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+18,@NPC_BUNNY2,571,1,8,1,0,7246.637,-3648.932,823.046,0.9948376,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+19,@NPC_BUNNY2,571,1,8,1,0,7236.381,-3678.733,822.8235,0.8726646,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+20,@NPC_BUNNY2,571,1,8,1,0,7192.001,-3386.612,846.4163,2.111848,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+21,@NPC_BUNNY2,571,1,8,1,0,7217.787,-3378.616,846.7336,5.410521,120,0,0,1,0,0,0,0,0), +(@GUID_BUNNY+22,@NPC_BUNNY2,571,1,8,1,0,7206.611,-3404.196,841.4804,4.223697,120,0,0,1,0,0,0,0,0); + +DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_BUNNY2; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@NPC_BUNNY2,0,0,0,1,0,@AURA_SMOKE); + +UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=`flags_extra`|128 WHERE `entry`=@NPC_BUNNY2; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@NPC_BUNNY2; +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 +(@NPC_BUNNY2,0,0,0,11,0,100,0,0,0,0,0,11,@SPELL_SSM,0,0,0,0,0,1,0,0,0,0,0,0,0,'Smoldering Scrap Bunny - On spawn - Cast Summon Smoldering Scrap'), +(@NPC_BUNNY2,0,1,2,8,0,100,1,@SPELL_ESSENCE,0,0,0,99,3,0,0,0,0,0,20,@GO_SMOLDERING_SCRAP,1,0,0,0,0,0,'Smoldering Scrap Bunny- On spellhit - Set Go state 3'), +(@NPC_BUNNY2,0,2,3,61,0,100,0,0,0,0,0,11,@SPELL_SFIS,0,0,0,0,0,1,0,0,0,0,0,0,0,'Smoldering Scrap Bunny - Link - Cast Summon Frozen Iron Scrap'), +(@NPC_BUNNY2,0,3,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Smoldering Scrap Bunny - Link - Despawn'); + +-- Spear Holder +-- Will be used with @SPELL_CHAIN +SET @BUNNY_SPEAR := 30246; -- Dun Niffelem Spear Chain Bunny (Phase 2) +SET @SPELL_CHAIN := 56379; -- Spear Chain Beam + +UPDATE `creature_template` SET `AIName`='SmartAI', `InhabitType`=4, `modelid1`=21342, `modelid2`=0 WHERE `entry`=30246; +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=@BUNNY_SPEAR; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-142408,-142407); +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 +(-142408,0,0,0,60,0,100,0,0,1,20000,20000,11,@SPELL_CHAIN,0,0,0,0,0,10,142410,@BUNNY_SPEAR,0,0,0,0,0,'Chain Bunny - OOC - Cast Chain on bunny'), +(-142407,0,0,0,60,0,100,0,0,1,20000,20000,11,@SPELL_CHAIN,0,0,0,0,0,10,142409,@BUNNY_SPEAR,0,0,0,0,0,'Chain Bunny- OOC - Cast Chain on bunny'); + +-- Into the Pit +SET @SPELL_SMASH := 54458; +SET @SPELL_DSHOUT := 54459; +SET @SPELL_CHARGE := 54460; + +UPDATE `creature_template` SET `AIName`='SmartAI', `faction_A`=1125, `faction_H`=1125 WHERE `entry`=@HYLDSMEET_WB; +DELETE FROM `smart_scripts` WHERE `entryorguid` =@HYLDSMEET_WB; +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 +(@HYLDSMEET_WB,0,0,0,0,0,100,0,3000,6000,7000,12000,11,@SPELL_SMASH,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Smash'), +(@HYLDSMEET_WB,0,1,0,0,0,100,0,1000,35000,70000,95000,11,@SPELL_DSHOUT,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Demoralizing Shout'), +(@HYLDSMEET_WB,0,2,0,0,0,100,0,5000,9000,11000,17000,11,@SPELL_CHARGE,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Charge'); + +-- Spy Hunter +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE entry= @F_WORG; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@F_WORG,@F_WORG*100,@F_WORG*100+1,@F_WORG*100+2) AND `source_type`IN(0,9); +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 +(@F_WORG,0,0,1,54,0,100,0,0,0,0,0,87,@F_WORG*100,@F_WORG*100+1,@F_WORG*100+2,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - Just summoned - Execute random Action Script'), +(@F_WORG,0,1,2,61,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Link - Set Run'), +(@F_WORG,0,2,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Link - Say 0'), +-- +(@F_WORG*100,9,1,0,0,0,100,0,5000,5000,5000,5000,69,0,0,0,0,0,0,8,0,0,0,7149.648,-2189.751,759.320,0,'Ethereal Frostwarg - On Script - Go to POS'), +(@F_WORG*100,9,2,0,0,0,100,0,1000,1000,1000,1000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Say 1'), +(@F_WORG*100,9,3,0,0,0,100,0,7000,7000,7000,7000,89,20,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Random Movement'), +(@F_WORG*100,9,4,0,0,0,100,0,1000,1000,1000,1000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Say 2'), +(@F_WORG*100,9,5,0,0,0,100,0,1000,1000,1000,1000,11,@SUMMON_SFINF,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Summon SFI'), +-- +(@F_WORG*100+1,9,1,0,0,0,100,0,5000,5000,5000,5000,69,0,0,0,0,0,0,8,0,0,0,7220.366,-2228.265,758.8727,0,'Ethereal Frostwarg - On Script - Go to POS'), +(@F_WORG*100+1,9,2,0,0,0,100,0,1000,1000,1000,1000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Say 1'), +(@F_WORG*100+1,9,3,0,0,0,100,0,7000,7000,7000,7000,89,20,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Random Movement'), +(@F_WORG*100+1,9,4,0,0,0,100,0,1000,1000,1000,1000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Say 2'), +(@F_WORG*100+1,9,5,0,0,0,100,0,1000,1000,1000,1000,11,@SUMMON_SFINF,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Summon SFI'), +-- +(@F_WORG*100+2,9,1,0,0,0,100,0,5000,5000,5000,5000,69,0,0,0,0,0,0,8,0,0,0,7181.581,-2264.689,758.043,0,'Ethereal Frostwarg - On Script - Summon SFI'), +(@F_WORG*100+2,9,2,0,0,0,100,0,1000,1000,1000,1000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Say 1'), +(@F_WORG*100+2,9,3,0,0,0,100,0,7000,7000,7000,7000,89,20,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Random Movement'), +(@F_WORG*100+2,9,4,0,0,0,100,0,1000,1000,1000,1000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Say 2'), +(@F_WORG*100+2,9,5,0,0,0,100,0,1000,1000,1000,1000,11,@SUMMON_SFINF,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ethereal Frostwarg - On Script - Summon SFI'); + +DELETE FROM `creature_text` WHERE entry = @F_WORG; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(@F_WORG, 0, 0, 'The worg sprints off in search of enemies.', 16, 0, 100, 0, 0, 1108, 'Ethereal Frostworg'), +(@F_WORG, 1, 0, 'The worg growls as it closes in on its prey.', 16, 0, 100, 0, 0, 0, 'Ethereal Frostworg'), +(@F_WORG, 2, 0, 'The frostworg howls, exposing its prey!', 16, 0, 100, 53, 0, 9036, 'Ethereal Frostworg'); + +/*SoH phasing progression +Since all npcs/gobs from @PHASE1 are using ingame phasemask 1, +won't use this spell to phase the area,because that would need all of them rephased +(as spell @PHASE1 is actually ingame phasemask 2) +*/ + +SET @PHASE1 := 55857; -- Phase Shift 1: Frost Giants +SET @PHASE2 := 55858; -- Phase Shift 2: Frost Giants +SET @PHASE3 := 55952; -- Phase Shift 3: Fjorn's Anvil +SET @SPIKE := 56305; -- See Quest Invisibility 1 (Ice Spike Bunny) +SET @QUEST_TIER1 := 56771; -- See Invisibility Tier 1 +SET @FA := 61209; -- Fjorn's Anvil - See Quest Invisibility 3 +SET @BARGAIN1 := 55012; -- Lok'lira's Bargain +SET @BARGAIN2 := 72914; -- Lok'lira's Bargain +SET @SEE_INV := 54502; -- See Quest Invisibility 1 + +SET @AREA0 := 4437; -- Valley of Ancient Winters +SET @AREA1 := 4438; -- Dun Niffelem +SET @AREA2 := 4439; -- Frostfield Lake +SET @AREA3 := 4495; -- Fjorn's Anvil +SET @AREA4 := 4440; -- Thunderfall +SET @AREA5 := 4446; -- Terrace of the Makers +SET @AREA6 := 4455; -- Hibernal Cavern + +-- P1 adds when taking Forging an Alliance (0,1,2,3,4)(0 ends disguise) +-- P2 starts with Forging an Alliance (0,1,2,3,4) +-- P3 starts after turning in Forging an Alliance (3) +-- @PHASE1 added just as a reference, it won't be used +DELETE FROM `spell_area` WHERE `area` IN (@AREA0,@AREA1,@AREA2,@AREA3,@AREA4,@AREA5,@AREA5,@AREA6); +INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES +(@BARGAIN2, @AREA0, 12972, 13063, 0, 0, 2, 1, 74, 11), +(@BARGAIN1, @AREA0, 12972, 13063, 0, 0, 2, 1, 74, 11), +(@PHASE2, @AREA0, 12924, 0, 0, 0, 2, 1, 74, 11), +(@PHASE2, @AREA1, 12924, 0, 0, 0, 2, 1, 74, 11), +(@SPIKE, @AREA1, 12987, 12987, 0, 0, 2, 1, 74, 11), +(@QUEST_TIER1, @AREA1, 12967, 0, 0, 0, 2, 1, 64, 11), +(@PHASE3, @AREA3, 12924, 0, 0, 0, 2, 1, 64, 11), +(@PHASE2,@AREA6, 12924, 0, 0, 0, 2, 1, 74, 11), +(@PHASE2, @AREA4, 12924, 0, 0, 0, 2, 1, 74, 11), +(@PHASE2, @AREA2, 12924, 0, 0, 0, 2, 1, 74, 11), +(@BARGAIN1, @AREA1, 12856, 12856, 0, 0, 2, 1, 74, 11), +(@FA, @AREA3, 12924, 12924, 0, 0, 2, 1, 74, 11), +(@BARGAIN2, @AREA1, 12856, 12856, 0, 0, 2, 1, 74, 11), +(@PHASE2, @AREA3, 12924, 12924, 0, 0, 2, 1, 74, 11), +(@SEE_INV, @AREA5, 13057, 0, 0, 0, 2, 1, 74, 11); + +-- Mending Fences +SET @SFIG := 29375; -- Stormforged Iron Giant +SET @S_EARTHEN := 55528; -- Summon Earthen Ironbane +SET @SHOCKWAVE := 57741; -- Shockwave + +DELETE FROM `creature_equip_template` WHERE entry = 29927; +INSERT INTO `creature_equip_template` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) VALUES +(29927, 1, 743, 0, 0); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 55818; +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`,`comment`) VALUES (55818, 55528, 0, 'Summon Earthen'); +DELETE FROM `spell_scripts` WHERE `id`= 55818; +INSERT INTO `spell_scripts` (`id`, `command`, `datalong`, `datalong2`) VALUES (55818, 15, 55528, 1); + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE entry = @SFIG; +UPDATE `creature_template` SET `faction_A`=2118,`faction_H`=2118,`unit_flags`=526336,`speed_run`=0.99206285714286 WHERE `entry`=29927; -- Earthen Ironbane +DELETE FROM `creature_ai_scripts` WHERE creature_id = @SFIG; +DELETE FROM `smart_scripts` WHERE entryorguid = 29375 AND `source_type` = 0; +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 +(@SFIG, 0, 0, 0, 0, 0, 100, 0, 6000, 12000, 20000, 26000, 11, @SHOCKWAVE, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Stormforged Iron Giant - In combat - Cast Shockwave'), +(@SFIG, 0, 1, 2, 8, 0, 100, 0, 55818, 0, 0, 0, 11, @S_EARTHEN, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Stormforged Iron Giant - On Spellhit - Summon Earthen Ironbane'), +(@SFIG, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 11, @S_EARTHEN, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Stormforged Iron Giant - On Spellhit - Summon Earthen Ironbane'), +(@SFIG, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, @S_EARTHEN, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Stormforged Iron Giant - On Spellhit - Summon Earthen Ironbane'); + +-- Forging a Head (12985) +SET @NPC := 29914; -- Dead Iron Giant +SET @SPELL := 29266; -- Permanent Feign Death +SET @SF_A := 30208; -- Stormforged Ambusher + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` =@NPC ; +DELETE FROM `smart_scripts` WHERE entryorguid IN (@NPC,@NPC*100,@NPC*100+1) AND `source_type` IN (0,9); +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 +(@NPC, 0, 0, 0, 8, 0, 100, 0, 56227, 0, 0, 0, 88, @NPC*100,@NPC*100+1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dead Iron Giant - Run Random Script on Salvage Corpse Spell Hit'), +(@NPC, 0, 1, 0, 25, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dead Iron Giant - Set Passive'), +(@NPC*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 56230, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Dead Iron Giant - Cast Create Fireforged Eyes'), +(@NPC*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dead Iron Giant - Despawn'), +(@NPC*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, @SF_A, 1, 60000, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dead Iron Giant - Summon Stormforged Ambusher'), +(@NPC*100+1, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dead Iron Giant - Despawn'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=56227; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 56227, 0, 0, 31, 0, 3, 29914, 0, 0, 0, 0, '', 'Salvage Corpse can hit Dead Iron Giant'); + + +DELETE FROM `creature_loot_template` WHERE entry = @SF_A; +INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(@SF_A, 42105, -33, 1, 0, 1, 1), +(@SF_A, 42423, -50, 1, 0, 1, 1); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=56562; +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +(56562, 56566, 0, 'Carve Bear Flank triggers create bear flank'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 17 AND `SourceEntry`= 56562; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 56562, 0, 0, 23, 0, 4455, 0, 0, 0, 0, 0, '', 'Carve Bear Flank only hits bear'); + +DELETE FROM `creature` WHERE `id`=@NPC AND `phaseMask`=4; +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES +(@GUID_BUNNY2,@NPC,571,1,4,0,0,7429.23,-3187.91,837.452,0.19249,120,0,0,50400,0,0,0,0,0), +(@GUID_BUNNY2+1,@NPC,571,1,4,0,0,7359.28,-3176.45,837.452,1.31954,120,0,0,50400,0,0,0,0,0), +(@GUID_BUNNY2+2,@NPC,571,1,4,0,0,7280.03,-3142.9,837.452,4.41243,120,0,0,50400,0,0,0,0,0), +(@GUID_BUNNY2+3,@NPC,571,1,4,0,0,7515.58,-3137.05,837.452,5.47429,120,0,0,50400,0,0,0,0,0), +(@GUID_BUNNY2+4,@NPC,571,1,4,0,0,7509.03,-3225.78,837.432,2.03661,120,0,0,50400,0,0,0,0,0), +(@GUID_BUNNY2+5,@NPC,571,1,4,0,0,7259.32,-3221.84,837.452,1.06349,120,0,0,50400,0,0,0,0,0); + +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+16; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@OGUID,192187,571,1,4,7306.37,-2060.06,760.918,-3.11488,0,0,-0.999911,0.0133559,180,255,1), +(@OGUID+1,192188,571,1,4,7313.11,-2054.22,760.599,2.81615,0,0,0.98679,0.162004,180,255,1), +(@OGUID+2,192189,571,1,4,7313.61,-2054.12,761.261,0.711686,0,0,0.348381,0.937353,180,255,1), +(@OGUID+3,192190,571,1,4,7309.42,-2060.01,761.261,0.504564,0,0,0.249614,0.968345,180,255,1), +(@OGUID+4,192191,571,1,4,7320.77,-2041.83,760.599,2.81615,0,0,0.98679,0.162004,180,255,1), +(@OGUID+5,192192,571,1,4,7314.04,-2044.86,759.983,1.09942,0,0,0.52244,0.852676,180,255,1), +(@OGUID+6,192193,571,1,4,7325.57,-2044.47,760.737,-0.80439,0,0,-0.391439,0.920204,180,255,1), +(@OGUID+7,192194,571,1,4,7320.69,-2053.65,761.339,-0.80439,0,0,-0.391439,0.920204,180,255,1), +(@OGUID+8,192195,571,1,4,7321,-2054.29,760.9,-1.40123,0,0,-0.644688,0.764446,180,255,1), +-- Granite Boulders for "Mending Fences" +(@OGUID+9,191814,571,1,1,7337.647,-3049.821,841.3665,1.221729,0,0,0,1,120,255,1), -- Granite Boulder (Area: Dun Niffelem) +(@OGUID+10,191814,571,1,1,7254.236,-3021.713,846.6954,0.4886912,0,0,0,1,120,255,1), -- Granite Boulder (Area: Frostfield Lake) +(@OGUID+11,191814,571,1,1,7329.995,-3292.084,859.1428,5.550147,0,0,0,1,120,255,1), -- Granite Boulder (Area: Frostfield Lake) +(@OGUID+12,191814,571,1,1,7241.131,-3344.769,852.5411,1.692969,0,0,0,1,120,255,1), -- Granite Boulder (Area: Frostfield Lake) +(@OGUID+13,191814,571,1,1,7158.728,-3356.495,860.1804,4.433136,0,0,0,1,120,255,1), -- Granite Boulder (Area: Frostfield Lake) +(@OGUID+14,191814,571,1,1,7239.152,-3403.615,849.8006,2.35619,0,0,0,1,120,255,1), -- Granite Boulder (Area: Frostfield Lake) +(@OGUID+15,191814,571,1,1,7160.917,-3487.592,857.127,1.623156,0,0,0,1,120,255,1), -- Granite Boulder (Area: Fjorn's Anvil) +(@OGUID+16,191814,571,1,1,7207.494,-3539.533,827.2614,2.408554,0,0,0,1,120,255,1); -- Granite Boulder (Area: Fjorn's Anvil) + +DELETE FROM `creature_loot_template` WHERE entry = @SM; +INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(@SM, 42104, -33, 1, 0, 1, 1), +(@SM, 42542, -29, 1, 0, 1, 1), +(@SM, 45912, 0.1, 1, 0, 1, 1); + + +UPDATE `spell_area` SET `quest_start`=12921 WHERE `spell` IN (55012,72914) AND `area`=4437; -- Valley of Ancient Winters +DELETE FROM `spell_area` WHERE `spell`=54784; -- Frost Reaction Frost Vrykul + +-- Already spawned by TDB and visible in all phases +UPDATE `creature` SET `phaseMask`=1|2|4 WHERE `guid` IN (116761,116762,116763); + +DELETE FROM `creature_addon` WHERE `guid` IN (116761,116762,116763); +DELETE FROM `creature_template_addon` WHERE `entry`=@NPC; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@NPC,0,0,0,0,0,@SPELL); + +UPDATE `creature` SET `phaseMask`=1 WHERE `guid`=152124; +UPDATE `gameobject` SET `phaseMask`=4 WHERE `id`=192081; -- Horn Fragment -- cgit v1.2.3 From f46f7a3414e0d48ef10ff8aee492e6e639fa319a Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Fri, 5 Jul 2013 17:19:29 +0200 Subject: Misc: - Fix missing newlines - Fix some startup errors --- sql/updates/world/2013_07_04_02_world_misc.sql | 1 - .../2013_07_05_01_world_creature_template.sql | 2 +- sql/updates/world/2013_07_05_02_world_misc.sql | 27 ++++ .../EasternKingdoms/zone_eversong_woods.cpp | 179 --------------------- 4 files changed, 28 insertions(+), 181 deletions(-) create mode 100644 sql/updates/world/2013_07_05_02_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_04_02_world_misc.sql b/sql/updates/world/2013_07_04_02_world_misc.sql index 3c6bcea5600..95d836122d8 100644 --- a/sql/updates/world/2013_07_04_02_world_misc.sql +++ b/sql/updates/world/2013_07_04_02_world_misc.sql @@ -1,4 +1,3 @@ UPDATE `creature_template` SET `ScriptName` = REPLACE(`ScriptName`, 'mob_', 'npc_') WHERE `ScriptName` LIKE 'mob\_%'; UPDATE `creature_template` SET `ScriptName` = REPLACE(`ScriptName`, 'mobs_', 'npc_') WHERE `ScriptName` LIKE 'mobs\_%'; UPDATE `spell_script_names` SET `ScriptName`='spell_trash_npc_glacial_strike' WHERE `ScriptName`='spell_trash_mob_glacial_strike'; - diff --git a/sql/updates/world/2013_07_05_01_world_creature_template.sql b/sql/updates/world/2013_07_05_01_world_creature_template.sql index 6a8500c852c..117df2273a9 100644 --- a/sql/updates/world/2013_07_05_01_world_creature_template.sql +++ b/sql/updates/world/2013_07_05_01_world_creature_template.sql @@ -201,4 +201,4 @@ update `creature_template` set exp=2 where `entry` in (37234, 37399, 37401, 37402, 37403, 37404, 37407, 37409, 37410, 37412, 37415, 37416, 37419, 37420, 37422, 37426, 37427, 37431, 37435, 37442, 37444, 37450, 37451, 37468, 37469, 37470, 37473, 37475, 37479, 37480, 37481, -37483, 37484, 37485, 37486); \ No newline at end of file +37483, 37484, 37485, 37486); diff --git a/sql/updates/world/2013_07_05_02_world_misc.sql b/sql/updates/world/2013_07_05_02_world_misc.sql new file mode 100644 index 00000000000..435a37613c3 --- /dev/null +++ b/sql/updates/world/2013_07_05_02_world_misc.sql @@ -0,0 +1,27 @@ +-- Into the Pit (thx to KirkHammett) +SET @ENTRY := 30174; +SET @SPELL_SMASH := 54458; +SET @SPELL_DSHOUT := 54459; +SET @SPELL_CHARGE := 54460; + +UPDATE `creature_template` SET `AIName`='SmartAI', `faction_A`=2128, `faction_H`=2128 WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `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,0,1,0,100,0,0,0,0,0,2,31,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hyldsmeet Warbear - OOC - Set Faction'), +(@ENTRY,0,1,0,0,0,100,0,3000,6000,7000,12000,11,@SPELL_SMASH,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Smash'), +(@ENTRY,0,2,0,0,0,100,0,1000,35000,70000,95000,11,@SPELL_DSHOUT,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Demoralizing Shout'), +(@ENTRY,0,3,0,0,0,100,0,5000,9000,11000,17000,11,@SPELL_CHARGE,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Charge'); + +-- Some errors startup errors +UPDATE `creature_equip_template` SET `itemEntry1`=12883 WHERE `entry`=29927 AND `id`=1; + +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=37416; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37346; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37364; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37269; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37369; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37268; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37335; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37483; +UPDATE `creature_template` SET `npcflag`=4194306 WHERE `entry`=37310; +UPDATE `creature_template` SET `npcflag`=4194306 WHERE `entry`=37426; diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index be0f4b47fed..14444e3bd87 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -254,182 +254,6 @@ public: }; }; -/*###### -## npc_second_trial_controller -######*/ - -class npc_second_trial_controller : public CreatureScript -{ -public: - npc_second_trial_controller() : CreatureScript("npc_second_trial_controller") { } - - bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) - { - // One Player exclusive quest, wait for user go activation - if (quest->GetQuestId() == QUEST_SECOND_TRIAL) - CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->questPhase = 1; - - return true; - } - - bool OnGossipHello(Player* player, Creature* creature) - { - // quest only available if not already started - // Quest_template flag is set to : QUEST_FLAGS_EVENT - // Escort quests or any other event-driven quests. If player in party, all players that can accept this quest will receive confirmation box to accept quest. - // !not sure if this really works! - - if (CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->questPhase == 0) - { - player->PrepareQuestMenu(creature->GetGUID()); - player->SendPreparedQuest(creature->GetGUID()); - } - - player->SEND_GOSSIP_MENU(creature->GetEntry(), creature->GetGUID()); - return true; - } - - CreatureAI* GetAI(Creature* creature) const - { - return new master_kelerun_bloodmournAI (creature); - } - - struct master_kelerun_bloodmournAI : public ScriptedAI - { - master_kelerun_bloodmournAI(Creature* creature) : ScriptedAI(creature) {} - - uint8 questPhase; - uint8 paladinPhase; - uint32 timer; - - uint64 paladinGuid[4]; - - void Reset() - { - questPhase = 0; - timer = 60000; - paladinPhase = 0; - for (uint8 i = 0; i < 4; ++i) - paladinGuid[i] = 0; - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(uint32 diff) - { - // Quest accepted but object not activated, object despawned (if in sync 1 minute!) - if (questPhase == 1) - { - if (timer <= diff) - Reset(); - else - timer -= diff; - } - // fight the 4 paladin mobs phase - else if (questPhase == 2) - { - if (timer <= diff) - { - if (Creature* paladinSpawn = Unit::GetCreature((*me), paladinGuid[paladinPhase])) - { - CAST_AI(npc_second_trial_paladin::npc_secondTrialAI, paladinSpawn->AI())->Activate(me->GetGUID()); - - switch (paladinPhase) - { - case 0: - Talk(TEXT_SECOND_TRIAL_1); - break; - case 1: - Talk(TEXT_SECOND_TRIAL_2); - break; - case 2: - Talk(TEXT_SECOND_TRIAL_3); - break; - case 3: - Talk(TEXT_SECOND_TRIAL_4); - break; - } - } - else - Reset(); - - questPhase = 4; - timer = OFFSET_NEXT_ATTACK; - } - else - timer -= diff; - } - - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - - void StartEvent() - { - if (questPhase == 1) - { // no player check, quest can be finished as group, so no complex PlayerGUID/group search code - for (uint8 i = 0; i < 4; ++i) - if (Creature* summoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000)) - paladinGuid[i] = summoned->GetGUID(); - - timer = OFFSET_NEXT_ATTACK; - questPhase = 2; - } - } - - void SecondTrialKill() - { - if (questPhase > 0) - { - ++paladinPhase; - - if (paladinPhase < 4) - questPhase = 2; - else - Reset(); // Quest Complete, QuestComplete handler is - } - } - - void SummonedCreatureDespawn(Creature* /*c*/) {} - }; -}; - -void npc_second_trial_paladin::npc_secondTrialAI::JustDied(Unit* Killer) -{ - if (Killer->GetTypeId() == TYPEID_PLAYER) - { - if (Creature* summoner = Unit::GetCreature((*me), summonerGuid)) - CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, summoner->AI())->SecondTrialKill(); - - // last kill quest complete for group - if (me->GetEntry() == CHAMPION_SUNSTRIKER) - { - if (Killer->GetTypeId() == TYPEID_PLAYER) - Killer->ToPlayer()->GroupEventHappens(QUEST_SECOND_TRIAL, Killer); - } - } -} - -/*###### -## go_second_trial -######*/ -class go_second_trial : public GameObjectScript -{ -public: - go_second_trial() : GameObjectScript("go_second_trial") { } - - bool OnGossipHello(Player* /*player*/, GameObject* go) - { - // find spawn :: master_kelerun_bloodmourn - if (Creature* creature = go->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) - CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->StartEvent(); - - return true; - } -}; - /*###### ## npc_apprentice_mirveda ######*/ @@ -629,9 +453,6 @@ public: void AddSC_eversong_woods() { - new npc_second_trial_controller(); - new npc_second_trial_paladin(); - new go_second_trial(); new npc_apprentice_mirveda(); new npc_infused_crystal(); } -- cgit v1.2.3 From 447ddceabad28a3a4ed1ed3bdece632d2d072246 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Fri, 5 Jul 2013 19:43:34 +0200 Subject: SQL: Rename in correct name --- sql/updates/world/2013_07_05_02_world_misc.sql | 27 -------------------------- sql/updates/world/2013_07_05_03_world_misc.sql | 27 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 sql/updates/world/2013_07_05_02_world_misc.sql create mode 100644 sql/updates/world/2013_07_05_03_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_05_02_world_misc.sql b/sql/updates/world/2013_07_05_02_world_misc.sql deleted file mode 100644 index 435a37613c3..00000000000 --- a/sql/updates/world/2013_07_05_02_world_misc.sql +++ /dev/null @@ -1,27 +0,0 @@ --- Into the Pit (thx to KirkHammett) -SET @ENTRY := 30174; -SET @SPELL_SMASH := 54458; -SET @SPELL_DSHOUT := 54459; -SET @SPELL_CHARGE := 54460; - -UPDATE `creature_template` SET `AIName`='SmartAI', `faction_A`=2128, `faction_H`=2128 WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `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,0,1,0,100,0,0,0,0,0,2,31,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hyldsmeet Warbear - OOC - Set Faction'), -(@ENTRY,0,1,0,0,0,100,0,3000,6000,7000,12000,11,@SPELL_SMASH,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Smash'), -(@ENTRY,0,2,0,0,0,100,0,1000,35000,70000,95000,11,@SPELL_DSHOUT,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Demoralizing Shout'), -(@ENTRY,0,3,0,0,0,100,0,5000,9000,11000,17000,11,@SPELL_CHARGE,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Charge'); - --- Some errors startup errors -UPDATE `creature_equip_template` SET `itemEntry1`=12883 WHERE `entry`=29927 AND `id`=1; - -UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=37416; -UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37346; -UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37364; -UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37269; -UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37369; -UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37268; -UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37335; -UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37483; -UPDATE `creature_template` SET `npcflag`=4194306 WHERE `entry`=37310; -UPDATE `creature_template` SET `npcflag`=4194306 WHERE `entry`=37426; diff --git a/sql/updates/world/2013_07_05_03_world_misc.sql b/sql/updates/world/2013_07_05_03_world_misc.sql new file mode 100644 index 00000000000..435a37613c3 --- /dev/null +++ b/sql/updates/world/2013_07_05_03_world_misc.sql @@ -0,0 +1,27 @@ +-- Into the Pit (thx to KirkHammett) +SET @ENTRY := 30174; +SET @SPELL_SMASH := 54458; +SET @SPELL_DSHOUT := 54459; +SET @SPELL_CHARGE := 54460; + +UPDATE `creature_template` SET `AIName`='SmartAI', `faction_A`=2128, `faction_H`=2128 WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `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,0,1,0,100,0,0,0,0,0,2,31,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hyldsmeet Warbear - OOC - Set Faction'), +(@ENTRY,0,1,0,0,0,100,0,3000,6000,7000,12000,11,@SPELL_SMASH,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Smash'), +(@ENTRY,0,2,0,0,0,100,0,1000,35000,70000,95000,11,@SPELL_DSHOUT,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Demoralizing Shout'), +(@ENTRY,0,3,0,0,0,100,0,5000,9000,11000,17000,11,@SPELL_CHARGE,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hyldsmeet Warbear - In Combat - Cast Charge'); + +-- Some errors startup errors +UPDATE `creature_equip_template` SET `itemEntry1`=12883 WHERE `entry`=29927 AND `id`=1; + +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=37416; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37346; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37364; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37269; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37369; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37268; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37335; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37483; +UPDATE `creature_template` SET `npcflag`=4194306 WHERE `entry`=37310; +UPDATE `creature_template` SET `npcflag`=4194306 WHERE `entry`=37426; -- cgit v1.2.3 From 6079f369afe2d527d2778eca6b5f6669bff597d4 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 6 Jul 2013 01:00:05 +0200 Subject: Scripted/Misc: Some cleanup --- .../2013_07_06_00_world_spelldifficulty_dbc.sql | 19 +++ src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 +- .../BlackrockDepths/blackrock_depths.cpp | 28 ++-- .../BlackrockDepths/blackrock_depths.h | 12 +- .../BlackrockDepths/boss_magmus.cpp | 2 +- .../BlackrockDepths/instance_blackrock_depths.cpp | 10 +- .../EasternKingdoms/Deadmines/boss_mr_smite.cpp | 2 +- .../EasternKingdoms/Gnomeregan/gnomeregan.h | 8 +- .../EasternKingdoms/Karazhan/boss_moroes.cpp | 75 +++++----- .../Karazhan/boss_terestian_illhoof.cpp | 22 +-- .../scripts/EasternKingdoms/Karazhan/karazhan.cpp | 45 +++--- .../scripts/EasternKingdoms/Karazhan/karazhan.h | 2 +- .../MagistersTerrace/boss_priestess_delrissa.cpp | 58 ++++---- .../MagistersTerrace/boss_vexallus.cpp | 29 ++-- .../MagistersTerrace/magisters_terrace.cpp | 14 +- .../ScarletMonastery/boss_arcanist_doan.cpp | 9 +- .../ScarletMonastery/boss_bloodmage_thalnos.cpp | 7 +- .../boss_high_inquisitor_fairbanks.cpp | 2 +- .../ScarletMonastery/boss_houndmaster_loksey.cpp | 6 +- .../ScarletMonastery/scarlet_monastery.h | 9 +- .../Scholomance/boss_jandice_barov.cpp | 11 +- .../Scholomance/boss_kirtonos_the_herald.cpp | 2 +- .../EasternKingdoms/Scholomance/boss_kormok.cpp | 7 +- .../EasternKingdoms/Scholomance/boss_vectus.cpp | 10 +- .../ShadowfangKeep/instance_shadowfang_keep.cpp | 21 ++- .../ShadowfangKeep/shadowfang_keep.cpp | 13 +- .../ShadowfangKeep/shadowfang_keep.h | 2 +- .../Stratholme/boss_baroness_anastari.cpp | 11 +- .../Stratholme/boss_cannon_master_willey.cpp | 11 +- .../Stratholme/boss_dathrohan_balnazzar.cpp | 7 +- .../Stratholme/boss_magistrate_barthilas.cpp | 18 ++- .../Stratholme/boss_maleki_the_pallid.cpp | 12 +- .../EasternKingdoms/Stratholme/stratholme.cpp | 26 ++-- .../EasternKingdoms/Uldaman/instance_uldaman.cpp | 2 +- .../scripts/EasternKingdoms/Uldaman/uldaman.cpp | 2 +- .../scripts/EasternKingdoms/Uldaman/uldaman.h | 20 +-- .../EasternKingdoms/ZulAman/boss_hexlord.cpp | 65 +++++---- .../EasternKingdoms/ZulAman/boss_janalai.cpp | 29 ++-- .../EasternKingdoms/ZulAman/boss_nalorakk.cpp | 33 +++-- .../scripts/EasternKingdoms/ZulAman/zulaman.cpp | 15 +- .../EasternKingdoms/zone_arathi_highlands.cpp | 6 +- .../scripts/EasternKingdoms/zone_blasted_lands.cpp | 9 +- .../scripts/EasternKingdoms/zone_duskwood.cpp | 9 +- .../EasternKingdoms/zone_eastern_plaguelands.cpp | 5 +- .../scripts/EasternKingdoms/zone_ghostlands.cpp | 10 +- .../scripts/EasternKingdoms/zone_hinterlands.cpp | 4 +- .../EasternKingdoms/zone_redridge_mountains.cpp | 2 +- .../EasternKingdoms/zone_silvermoon_city.cpp | 2 +- .../EasternKingdoms/zone_silverpine_forest.cpp | 2 +- .../EasternKingdoms/zone_stormwind_city.cpp | 8 +- .../EasternKingdoms/zone_tirisfal_glades.cpp | 2 +- .../scripts/EasternKingdoms/zone_undercity.cpp | 11 +- .../EasternKingdoms/zone_western_plaguelands.cpp | 6 +- .../scripts/EasternKingdoms/zone_westfall.cpp | 10 +- .../scripts/EasternKingdoms/zone_wetlands.cpp | 2 +- src/server/scripts/Examples/example_creature.cpp | 2 +- src/server/scripts/Examples/example_escort.cpp | 20 ++- .../scripts/Examples/example_gossip_codebox.cpp | 13 +- .../Kalimdor/BlackfathomDeeps/blackfathom_deeps.h | 11 +- .../EscapeFromDurnholdeKeep/old_hillsbrad.h | 30 ++-- .../RazorfenDowns/instance_razorfen_downs.cpp | 6 +- .../Kalimdor/RazorfenDowns/razorfen_downs.cpp | 10 +- .../Kalimdor/RazorfenDowns/razorfen_downs.h | 14 +- .../Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp | 19 +-- .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 2 +- .../Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp | 11 +- .../TempleOfAhnQiraj/mob_anubisath_sentinel.cpp | 31 +++-- .../Kalimdor/WailingCaverns/wailing_caverns.h | 2 +- .../Kalimdor/ZulFarrak/instance_zulfarrak.cpp | 10 +- .../Northrend/AzjolNerub/Ahnkahet/ahnkahet.h | 6 +- .../AzjolNerub/Ahnkahet/boss_amanitar.cpp | 2 +- .../Ahnkahet/boss_jedoga_shadowseeker.cpp | 7 +- .../AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 10 +- .../Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h | 1 + .../ObsidianSanctum/boss_sartharion.cpp | 5 +- .../ObsidianSanctum/obsidian_sanctum.h | 13 +- .../TrialOfTheChampion/boss_grand_champions.cpp | 4 +- .../TrialOfTheCrusader/boss_faction_champions.cpp | 2 +- .../TrialOfTheCrusader/trial_of_the_crusader.cpp | 4 +- .../TrialOfTheCrusader/trial_of_the_crusader.h | 12 +- .../scripts/Northrend/DraktharonKeep/boss_dred.cpp | 7 +- .../Northrend/DraktharonKeep/boss_trollgore.cpp | 7 +- .../ForgeOfSouls/boss_devourer_of_souls.cpp | 7 +- .../FrozenHalls/ForgeOfSouls/forge_of_souls.cpp | 2 +- .../HallsOfReflection/halls_of_reflection.cpp | 2 +- .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 4 +- .../scripts/Northrend/Gundrak/boss_gal_darah.cpp | 5 +- .../scripts/Northrend/Gundrak/boss_moorabi.cpp | 9 +- .../scripts/Northrend/Gundrak/boss_slad_ran.cpp | 9 +- .../IcecrownCitadel/boss_deathbringer_saurfang.cpp | 5 +- .../Northrend/IcecrownCitadel/boss_festergut.cpp | 5 +- .../IcecrownCitadel/boss_the_lich_king.cpp | 7 +- .../scripts/Northrend/Naxxramas/boss_faerlina.cpp | 5 +- .../scripts/Northrend/Naxxramas/boss_gluth.cpp | 23 +-- .../scripts/Northrend/Naxxramas/boss_heigan.cpp | 7 +- .../scripts/Northrend/Naxxramas/boss_razuvious.cpp | 11 +- .../Northrend/Nexus/Nexus/boss_anomalus.cpp | 5 +- .../Nexus/Nexus/boss_commander_kolurg.cpp | 14 +- .../Northrend/Nexus/Nexus/boss_magus_telestra.cpp | 7 +- src/server/scripts/Northrend/Nexus/Nexus/nexus.h | 2 +- .../scripts/Northrend/Nexus/Oculus/boss_urom.cpp | 2 +- .../Ulduar/HallsOfLightning/boss_bjarngrim.cpp | 24 +++- .../Ulduar/HallsOfLightning/boss_loken.cpp | 14 +- .../Ulduar/HallsOfLightning/halls_of_lightning.h | 10 +- .../Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp | 10 +- .../Ulduar/HallsOfStone/halls_of_stone.cpp | 47 ++++--- .../Northrend/Ulduar/HallsOfStone/halls_of_stone.h | 8 +- .../Northrend/Ulduar/Ulduar/boss_auriaya.cpp | 8 +- .../Ulduar/Ulduar/boss_flame_leviathan.cpp | 12 +- .../Northrend/Ulduar/Ulduar/boss_general_vezax.cpp | 7 +- .../scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp | 6 +- .../Northrend/Ulduar/Ulduar/boss_razorscale.cpp | 8 +- .../UtgardeKeep/boss_ingvar_the_plunderer.cpp | 32 ++--- .../UtgardeKeep/boss_skarvald_dalronn.cpp | 25 ++-- .../UtgardeKeep/UtgardeKeep/utgarde_keep.h | 23 +-- .../UtgardeKeep/UtgardePinnacle/boss_skadi.cpp | 53 ++++--- .../UtgardeKeep/UtgardePinnacle/boss_svala.cpp | 38 ++--- .../UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp | 37 ++--- .../UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h | 3 +- .../Northrend/VaultOfArchavon/boss_archavon.cpp | 35 +++-- .../Northrend/VaultOfArchavon/boss_emalon.cpp | 36 ++--- .../Northrend/VaultOfArchavon/boss_toravon.cpp | 8 +- .../VaultOfArchavon/instance_vault_of_archavon.cpp | 19 ++- .../Northrend/VaultOfArchavon/vault_of_archavon.h | 24 ++-- .../scripts/Northrend/VioletHold/boss_ichoron.cpp | 5 +- .../scripts/Northrend/VioletHold/boss_zuramat.cpp | 11 +- .../scripts/Northrend/VioletHold/violet_hold.cpp | 2 +- .../scripts/Northrend/VioletHold/violet_hold.h | 38 ++--- .../scripts/Northrend/zone_borean_tundra.cpp | 43 +++--- src/server/scripts/Northrend/zone_dalaran.cpp | 2 +- src/server/scripts/Northrend/zone_dragonblight.cpp | 5 +- .../scripts/Northrend/zone_howling_fjord.cpp | 6 +- src/server/scripts/Northrend/zone_icecrown.cpp | 10 +- .../scripts/Northrend/zone_sholazar_basin.cpp | 13 +- src/server/scripts/Northrend/zone_storm_peaks.cpp | 7 +- .../AuchenaiCrypts/boss_exarch_maladaar.cpp | 28 ++-- .../boss_shirrak_the_dead_watcher.cpp | 29 ++-- .../ManaTombs/boss_nexusprince_shaffar.cpp | 25 ++-- .../SethekkHalls/boss_darkweaver_syth.cpp | 12 +- .../SethekkHalls/instance_sethekk_halls.cpp | 12 +- .../Auchindoun/SethekkHalls/sethekk_halls.h | 2 +- .../ShadowLabyrinth/boss_ambassador_hellmaw.cpp | 7 +- .../scripts/Outland/BlackTemple/black_temple.h | 9 +- .../Outland/BlackTemple/boss_shade_of_akama.cpp | 59 ++++---- .../Outland/BlackTemple/boss_warlord_najentus.cpp | 24 +++- .../SerpentShrine/boss_lurker_below.cpp | 46 +++--- .../SerpentShrine/boss_morogrim_tidewalker.cpp | 19 ++- .../SerpentShrine/instance_serpent_shrine.cpp | 19 ++- .../SteamVault/boss_mekgineer_steamrigger.cpp | 30 ++-- .../CoilfangReservoir/SteamVault/steam_vault.h | 18 ++- .../CoilfangReservoir/underbog/boss_hungarfen.cpp | 10 +- .../scripts/Outland/GruulsLair/boss_gruul.cpp | 7 +- .../scripts/Outland/GruulsLair/gruuls_lair.h | 23 +-- .../HellfireCitadel/BloodFurnace/blood_furnace.h | 56 ++++---- .../HellfireCitadel/BloodFurnace/boss_broggok.cpp | 7 +- .../BloodFurnace/boss_kelidan_the_breaker.cpp | 4 +- .../BloodFurnace/boss_the_maker.cpp | 7 +- .../HellfireRamparts/boss_omor_the_unscarred.cpp | 4 +- .../HellfireRamparts/boss_vazruden_the_herald.cpp | 4 +- .../boss_watchkeeper_gargolmar.cpp | 4 +- .../HellfireRamparts/hellfire_ramparts.h | 2 +- .../MagtheridonsLair/boss_magtheridon.cpp | 8 +- .../instance_magtheridons_lair.cpp | 2 +- .../MagtheridonsLair/magtheridons_lair.h | 14 +- .../ShatteredHalls/boss_nethekurse.cpp | 4 +- .../ShatteredHalls/boss_warbringer_omrogg.cpp | 8 +- .../boss_warchief_kargath_bladefist.cpp | 6 +- .../ShatteredHalls/shattered_halls.h | 12 +- .../scripts/Outland/TempestKeep/Eye/boss_alar.cpp | 2 +- .../Outland/TempestKeep/Eye/boss_astromancer.cpp | 29 ++-- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 43 +++--- .../Outland/TempestKeep/Eye/boss_void_reaver.cpp | 7 +- .../scripts/Outland/TempestKeep/Eye/the_eye.cpp | 2 +- .../scripts/Outland/TempestKeep/Eye/the_eye.h | 27 ++-- .../Mechanar/boss_nethermancer_sepethrea.cpp | 2 +- .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 10 +- .../Outland/TempestKeep/arcatraz/arcatraz.h | 33 +++-- .../arcatraz/boss_harbinger_skyriss.cpp | 26 ++-- .../TempestKeep/arcatraz/instance_arcatraz.cpp | 2 +- .../botanica/boss_high_botanist_freywinn.cpp | 11 +- .../Outland/TempestKeep/botanica/boss_laj.cpp | 4 +- .../TempestKeep/botanica/boss_warp_splinter.cpp | 6 +- .../scripts/Outland/zone_blades_edge_mountains.cpp | 6 +- .../scripts/Outland/zone_hellfire_peninsula.cpp | 14 +- src/server/scripts/Outland/zone_nagrand.cpp | 2 +- src/server/scripts/Outland/zone_netherstorm.cpp | 10 +- .../scripts/Outland/zone_shadowmoon_valley.cpp | 154 +++++++++++---------- src/server/scripts/Outland/zone_shattrath_city.cpp | 18 ++- .../scripts/Outland/zone_terokkar_forest.cpp | 16 ++- src/server/scripts/Outland/zone_zangarmarsh.cpp | 6 +- src/server/scripts/Spells/spell_quest.cpp | 6 +- src/server/scripts/World/areatrigger_scripts.cpp | 12 +- src/server/scripts/World/go_scripts.cpp | 11 +- src/server/scripts/World/item_scripts.cpp | 10 +- src/server/scripts/World/npc_innkeeper.cpp | 14 +- src/server/scripts/World/npc_professions.cpp | 2 +- src/server/scripts/World/npcs_special.cpp | 88 +++++++----- 199 files changed, 1734 insertions(+), 1151 deletions(-) create mode 100644 sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql b/sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql new file mode 100644 index 00000000000..026fdd57f8f --- /dev/null +++ b/sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql @@ -0,0 +1,19 @@ +DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (64213,64216,28371,28374,58960,58663,58666,60919,60897,60902,33526,33527,33528,33529,29107,36383,32302); +INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`,`spellid2`,`spellid3`) VALUES +(64213,64213,64215,0,0), +(64216,64216,65279,0,0), +(28371,28371,54427,0,0), +(28374,28374,54426,0,0), +(58960,58960,60894,0,0), +(58663,58663,60880,0,0), +(58666,58666,60882,0,0), +(60919,60919,60923,0,0), +(60897,60897,60899,0,0), +(60902,60902,60916,0,0), +(33526,33526,38141,0,0), +(33527,33527,38138,0,0), +(33528,33528,38142,0,0), +(33529,33529,38143,0,0), +(29107,29107,55543,0,0), +(36383,36383,39382,0,0), +(32302,32302,38382,0,0); \ No newline at end of file diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 9feb30ce3c6..f5d6932db00 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -387,7 +387,7 @@ void ScriptedAI::SetCombatMovement(bool allowMovement) _isCombatMovementAllowed = allowMovement; } -enum eNPCs +enum NPCs { NPC_BROODLORD = 12017, NPC_VOID_REAVER = 19516, diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 4fb7232711c..ef15ef27ec4 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -14,7 +14,7 @@ EndScriptData */ #include "Group.h" #include "Player.h" -enum ePoints +enum Points { POINT_LAST_POINT = 0xFFFFFF, POINT_HOME = 0xFFFFFE diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 1c76399aa5c..8f46896f6e8 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -16,7 +16,7 @@ EndScriptData */ const float MAX_PLAYER_DISTANCE = 100.0f; -enum ePoints +enum Points { POINT_COMBAT_START = 0xFFFFFF }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 8fe2778451b..867253f5b05 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -48,7 +48,7 @@ public: }; // npc_grimstone -enum eGrimstone +enum Grimstone { NPC_GRIMSTONE = 10096, NPC_THELDREN = 16059, @@ -680,7 +680,11 @@ public: #define SAY_WINDSOR_4_3 "Good work! We're almost there, $N. This way." #define SAY_WINDSOR_6 "This is it, $N. My stuff should be in that room. Cover me, I'm going in!" #define SAY_WINDSOR_9 "Ah, there it is!" -#define NPC_REGINALD_WINDSOR 9682 + +enum MarshalWindsor +{ + NPC_REGINALD_WINDSOR = 9682 +}; /* Player* playerStart; @@ -859,8 +863,12 @@ public: #define SAY_REGINALD_WINDSOR_14_2 "Excellent work, $N. Let's find the exit. I think I know the way. Follow me!" #define SAY_REGINALD_WINDSOR_20_1 "We made it!" #define SAY_REGINALD_WINDSOR_20_2 "Meet me at Maxwell's encampment. We'll go over the next stages of the plan there and figure out a way to decode my tablets without the decryption ring." -#define NPC_SHILL_DINGER 9678 -#define NPC_CREST_KILLER 9680 + +enum MarshalReginaldWindor +{ + NPC_SHILL_DINGER = 9678, + NPC_CREST_KILLER = 9680 +}; /* int wp = 0; @@ -1026,10 +1034,10 @@ public: { if (!instance->GetData(DATA_GATE_J) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED) { - instance->SetData(DATA_CREATURE_JAZ, 1); + instance->SetData(DATA_NPC_JAZ, 1); instance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS); } - if (instance->GetData(DATA_CREATURE_JAZ) && instance->GetData(DATA_CREATURE_OGRABISI) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_NPC_JAZ) && instance->GetData(DATA_NPC_OGRABISI) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); instance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED); @@ -1039,10 +1047,10 @@ public: { if (!instance->GetData(DATA_GATE_S) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED) { - instance->SetData(DATA_CREATURE_SHILL, 1); + instance->SetData(DATA_NPC_SHILL, 1); instance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS); } - if (instance->GetData(DATA_CREATURE_SHILL) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_NPC_SHILL) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) { instance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); SetEscortPaused(false); @@ -1052,11 +1060,11 @@ public: { if (!instance->GetData(DATA_GATE_C) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED) { - instance->SetData(DATA_CREATURE_CREST, 1); + instance->SetData(DATA_NPC_CREST, 1); me->Say(SAY_REGINALD_WINDSOR_13_2, LANG_UNIVERSAL, PlayerGUID); instance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS); } - if (instance->GetData(DATA_CREATURE_CREST) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_NPC_CREST) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); instance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h index dcce7d0c374..b279012bbf7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h @@ -19,11 +19,14 @@ #ifndef DEF_BRD_H #define DEF_BRD_H -#define FACTION_NEUTRAL 734 -#define FACTION_HOSTILE 754 -#define FACTION_FRIEND 35 +enum FactionIds +{ + FACTION_NEUTRAL = 734, + FACTION_HOSTILE = 754, + FACTION_FRIEND = 35 +}; -enum eTypes +enum DataTypes { TYPE_RING_OF_LAW = 1, TYPE_VAULT = 2, @@ -57,4 +60,5 @@ enum eTypes DATA_SF_BRAZIER_S = 26, DATA_MOIRA = 27, }; + #endif diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index edcb1b5ca42..c5461484aec 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -25,7 +25,7 @@ enum Spells SPELL_WARSTOMP = 24375 }; -enum eEnums +enum Misc { DATA_THRONE_DOOR = 24 // not id or guid of doors but number of enum in blackrock_depths.h }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 2718797aa34..0bb57545230 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -22,11 +22,10 @@ #include "blackrock_depths.h" #define TIMER_TOMBOFTHESEVEN 15000 +#define MAX_ENCOUNTER 6 -enum eEnums +enum Creatures { - MAX_ENCOUNTER = 6, - NPC_EMPEROR = 9019, NPC_PHALANX = 9502, NPC_ANGERREL = 9035, @@ -37,8 +36,11 @@ enum eEnums NPC_GLOOMREL = 9037, NPC_DOOMREL = 9039, NPC_MAGMUS = 9938, - NPC_MOIRA = 8929, + NPC_MOIRA = 8929 +}; +enum GameObjects +{ GO_ARENA1 = 161525, GO_ARENA2 = 161522, GO_ARENA3 = 161524, diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 04ae634eb55..c4b84996f7c 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -25,7 +25,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "deadmines.h" -enum eSpels +enum Spels { SPELL_TRASH = 3391, SPELL_SMITE_STOMP = 6432, diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h index 328f22656f6..c0d4f1d57cf 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h @@ -18,14 +18,14 @@ #ifndef DEF_GNOMEREGAN_H #define DEF_GNOMEREGAN_H -enum eGameObjects +enum GameObjectIds { GO_CAVE_IN_LEFT = 146085, GO_CAVE_IN_RIGHT = 146086, GO_RED_ROCKET = 103820 }; -enum eCreatures +enum CreatureIds { NPC_BLASTMASTER_EMI_SHORTFUSE = 7998, NPC_CAVERNDEEP_AMBUSHER = 6207, @@ -33,12 +33,12 @@ enum eCreatures NPC_CHOMPER = 6215 }; -enum eData +enum Data { TYPE_EVENT = 1 }; -enum eData64 +enum Data64 { DATA_GO_CAVE_IN_LEFT, DATA_GO_CAVE_IN_RIGHT, diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 69631ca90b9..0cd7b6d6744 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -27,20 +27,51 @@ EndScriptData */ #include "ScriptedCreature.h" #include "karazhan.h" -enum Moroes +enum Yells { SAY_AGGRO = 0, SAY_SPECIAL = 1, SAY_KILL = 2, - SAY_DEATH = 3, - - SPELL_VANISH = 29448, - SPELL_GARROTE = 37066, - SPELL_BLIND = 34694, - SPELL_GOUGE = 29425, - SPELL_FRENZY = 37023, + SAY_DEATH = 3 }; +enum Spells +{ + SPELL_VANISH = 29448, + SPELL_GARROTE = 37066, + SPELL_BLIND = 34694, + SPELL_GOUGE = 29425, + SPELL_FRENZY = 37023, + + // Adds + SPELL_MANABURN = 29405, + SPELL_MINDFLY = 29570, + SPELL_SWPAIN = 34441, + SPELL_SHADOWFORM = 29406, + + SPELL_HAMMEROFJUSTICE = 13005, + SPELL_JUDGEMENTOFCOMMAND = 29386, + SPELL_SEALOFCOMMAND = 29385, + + SPELL_DISPELMAGIC = 15090, + SPELL_GREATERHEAL = 29564, + SPELL_HOLYFIRE = 29563, + SPELL_PWSHIELD = 29408, + + SPELL_CLEANSE = 29380, + SPELL_GREATERBLESSOFMIGHT = 29381, + SPELL_HOLYLIGHT = 29562, + SPELL_DIVINESHIELD = 41367, + + SPELL_HAMSTRING = 9080, + SPELL_MORTALSTRIKE = 29572, + SPELL_WHIRLWIND = 29573, + + SPELL_DISARM = 8379, + SPELL_HEROICSTRIKE = 29567, + SPELL_SHIELDBASH = 11972, + SPELL_SHIELDWALL = 29390 +}; #define POS_Z 81.73f @@ -363,34 +394,6 @@ struct boss_moroes_guestAI : public ScriptedAI } }; -#define SPELL_MANABURN 29405 -#define SPELL_MINDFLY 29570 -#define SPELL_SWPAIN 34441 -#define SPELL_SHADOWFORM 29406 - -#define SPELL_HAMMEROFJUSTICE 13005 -#define SPELL_JUDGEMENTOFCOMMAND 29386 -#define SPELL_SEALOFCOMMAND 29385 - -#define SPELL_DISPELMAGIC 15090 //Self or other guest+Moroes -#define SPELL_GREATERHEAL 29564 //Self or other guest+Moroes -#define SPELL_HOLYFIRE 29563 -#define SPELL_PWSHIELD 29408 - -#define SPELL_CLEANSE 29380 //Self or other guest+Moroes -#define SPELL_GREATERBLESSOFMIGHT 29381 //Self or other guest+Moroes -#define SPELL_HOLYLIGHT 29562 //Self or other guest+Moroes -#define SPELL_DIVINESHIELD 41367 - -#define SPELL_HAMSTRING 9080 -#define SPELL_MORTALSTRIKE 29572 -#define SPELL_WHIRLWIND 29573 - -#define SPELL_DISARM 8379 -#define SPELL_HEROICSTRIKE 29567 -#define SPELL_SHIELDBASH 11972 -#define SPELL_SHIELDWALL 29390 - class boss_baroness_dorothea_millstipe : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index df291c161b2..b7f51d68ae5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -34,8 +34,11 @@ enum TerestianIllhoof SAY_DEATH = 2, SAY_AGGRO = 3, SAY_SACRIFICE = 4, - SAY_SUMMON = 5, + SAY_SUMMON = 5 +}; +enum Spells +{ SPELL_SUMMON_DEMONCHAINS = 30120, // Summons demonic chains that maintain the ritual of sacrifice. SPELL_DEMON_CHAINS = 30206, // Instant - Visual Effect SPELL_ENRAGE = 23537, // Increases the caster's attack speed by 50% and the Physical damage it deals by 219 to 281 for 10 min. @@ -51,11 +54,14 @@ enum TerestianIllhoof SPELL_FIREBOLT = 30050, // Blasts a target for 150 Fire damage. SPELL_BROKEN_PACT = 30065, // All damage taken increased by 25%. SPELL_AMPLIFY_FLAMES = 30053, // Increases the Fire damage taken by an enemy by 500 for 25 sec. +}; - CREATURE_DEMONCHAINS = 17248, - CREATURE_FIENDISHIMP = 17267, - CREATURE_PORTAL = 17265, - CREATURE_KILREK = 17229, +enum Creatures +{ + NPC_DEMONCHAINS = 17248, + NPC_FIENDISHIMP = 17267, + NPC_PORTAL = 17265, + NPC_KILREK = 17229 }; @@ -201,8 +207,6 @@ public: }; }; -#define SPELL_FIREBOLT 30050 // Blasts a target for 181-209 Fire damage. - class npc_fiendish_imp : public CreatureScript { public: @@ -325,7 +329,7 @@ public: void JustSummoned(Creature* summoned) { - if (summoned->GetEntry() == CREATURE_PORTAL) + if (summoned->GetEntry() == NPC_PORTAL) { PortalGUID[PortalsCount] = summoned->GetGUID(); ++PortalsCount; @@ -375,7 +379,7 @@ public: DoCast(target, SPELL_SACRIFICE, true); DoCast(target, SPELL_SUMMON_DEMONCHAINS, true); - if (Creature* Chains = me->FindNearestCreature(CREATURE_DEMONCHAINS, 5000)) + if (Creature* Chains = me->FindNearestCreature(NPC_DEMONCHAINS, 5000)) { CAST_AI(npc_demon_chain::npc_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID(); Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 3c78c2daa7c..14cb7e69d83 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -36,6 +36,28 @@ EndContentData */ #include "ScriptedEscortAI.h" #include "Player.h" +enum Spells +{ + // Barnes + SPELL_SPOTLIGHT = 25824, + SPELL_TUXEDO = 32616, + + // Berthold + SPELL_TELEPORT = 39567, + + // Image of Medivh + SPELL_FIRE_BALL = 30967, + SPELL_UBER_FIREBALL = 30971, + SPELL_CONFLAGRATION_BLAST = 30977, + SPELL_MANA_SHIELD = 31635 +}; + +enum Creatures +{ + NPC_ARCANAGOS = 17652, + NPC_SPOTLIGHT = 19525 +}; + /*###### # npc_barnesAI ######*/ @@ -96,11 +118,6 @@ float Spawns[6][2]= {17534, -10900}, // Julianne }; -#define CREATURE_SPOTLIGHT 19525 - -#define SPELL_SPOTLIGHT 25824 -#define SPELL_TUXEDO 32616 - #define SPAWN_Z 90.5f #define SPAWN_Y -1758 #define SPAWN_O 4.738f @@ -176,13 +193,13 @@ public: TalkCount = 0; SetEscortPaused(true); - if (Creature* pSpotlight = me->SummonCreature(CREATURE_SPOTLIGHT, + if (Creature* spotlight = me->SummonCreature(NPC_SPOTLIGHT, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) { - pSpotlight->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pSpotlight->CastSpell(pSpotlight, SPELL_SPOTLIGHT, false); - m_uiSpotlightGUID = pSpotlight->GetGUID(); + spotlight->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + spotlight->CastSpell(spotlight, SPELL_SPOTLIGHT, false); + m_uiSpotlightGUID = spotlight->GetGUID(); } break; case 8: @@ -403,11 +420,6 @@ public: # npc_berthold ####*/ -enum eBerthold -{ - SPELL_TELEPORT = 39567 -}; - #define GOSSIP_ITEM_TELEPORT "Teleport me to the Guardian's Library" class npc_berthold : public CreatureScript @@ -453,11 +465,6 @@ public: #define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" #define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." -#define NPC_ARCANAGOS 17652 -#define SPELL_FIRE_BALL 30967 -#define SPELL_UBER_FIREBALL 30971 -#define SPELL_CONFLAGRATION_BLAST 30977 -#define SPELL_MANA_SHIELD 31635 static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h index 208971f85dd..d50aac36bca 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h @@ -19,7 +19,7 @@ #ifndef DEF_KARAZHAN_H #define DEF_KARAZHAN_H -enum eEnums +enum DataTypes { TYPE_ATTUMEN = 1, TYPE_MOROES = 2, diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 687cc9d393c..7c5d36d662b 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -49,19 +49,34 @@ static Speech PlayerDeath[]= {9}, }; -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_DEATH = 10, +}; - SPELL_DISPEL_MAGIC = 27609, - SPELL_FLASH_HEAL = 17843, - SPELL_SW_PAIN_NORMAL = 14032, - SPELL_SW_PAIN_HEROIC = 15654, - SPELL_SHIELD = 44291, - SPELL_RENEW_NORMAL = 44174, - SPELL_RENEW_HEROIC = 46192, +enum Spells +{ + SPELL_DISPEL_MAGIC = 27609, + SPELL_FLASH_HEAL = 17843, + SPELL_SW_PAIN_NORMAL = 14032, + SPELL_SW_PAIN_HEROIC = 15654, + SPELL_SHIELD = 44291, + SPELL_RENEW_NORMAL = 44174, + SPELL_RENEW_HEROIC = 46192, + + // Apoko + SPELL_WINDFURY_TOTEM = 27621, + SPELL_WAR_STOMP = 46026, + SPELL_PURGE = 27626, + SPELL_LESSER_HEALING_WAVE = 44256, + SPELL_FROST_SHOCK = 21401, + SPELL_FIRE_NOVA_TOTEM = 44257, + SPELL_EARTHBIND_TOTEM = 15786 +}; +enum Misc +{ MAX_ACTIVE_LACKEY = 4 }; @@ -333,7 +348,7 @@ public: }; }; -enum eHealingPotion +enum HealingPotion { SPELL_HEALING_POTION = 15503 }; @@ -472,7 +487,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } }; -enum eRogueSpells +enum RogueSpells { SPELL_KIDNEY_SHOT = 27615, SPELL_GOUGE = 12540, @@ -575,7 +590,7 @@ public: }; }; -enum eWarlockSpells +enum WarlockSpells { SPELL_IMMOLATE = 44267, SPELL_SHADOW_BOLT = 12471, @@ -671,7 +686,7 @@ public: }; }; -enum eKickDown +enum KickDown { SPELL_KNOCKDOWN = 11428, SPELL_SNAP_KICK = 46182 @@ -727,7 +742,7 @@ public: }; }; -enum eMageSpells +enum MageSpells { SPELL_POLYMORPH = 13323, SPELL_ICE_BLOCK = 27619, @@ -857,7 +872,7 @@ public: }; }; -enum eWarriorSpells +enum WarriorSpells { SPELL_INTERCEPT_STUN = 27577, SPELL_DISARM = 27581, @@ -976,7 +991,7 @@ public: }; }; -enum eHunterSpells +enum HunterSpells { SPELL_AIMED_SHOT = 44271, SPELL_SHOOT = 15620, @@ -1099,17 +1114,6 @@ public: }; }; -enum Spells -{ - SPELL_WINDFURY_TOTEM = 27621, - SPELL_WAR_STOMP = 46026, - SPELL_PURGE = 27626, - SPELL_LESSER_HEALING_WAVE = 44256, - SPELL_FROST_SHOCK = 21401, - SPELL_FIRE_NOVA_TOTEM = 44257, - SPELL_EARTHBIND_TOTEM = 15786 -}; - class boss_apoko : public CreatureScript { public: @@ -1198,7 +1202,7 @@ public: }; }; -enum eEngineerSpells +enum EngineerSpells { SPELL_GOBLIN_DRAGON_GUN = 44272, SPELL_ROCKET_LAUNCH = 44137, diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index d9de112992b..22d127f3d22 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -27,35 +27,44 @@ EndScriptData */ #include "ScriptedCreature.h" #include "magisters_terrace.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_ENERGY = 1, SAY_OVERLOAD = 2, SAY_KILL = 3, - EMOTE_DISCHARGE_ENERGY = 4, + EMOTE_DISCHARGE_ENERGY = 4 //is this text for real? //#define SAY_DEATH "What...happen...ed." +}; - //Pure energy spell info +enum Spells +{ + // Pure energy spell info SPELL_ENERGY_BOLT = 46156, SPELL_ENERGY_FEEDBACK = 44335, - //Vexallus spell info + // Vexallus spell info SPELL_CHAIN_LIGHTNING = 44318, - SPELL_H_CHAIN_LIGHTNING = 46380, //heroic spell + SPELL_H_CHAIN_LIGHTNING = 46380, // heroic spell SPELL_OVERLOAD = 44353, SPELL_ARCANE_SHOCK = 44319, - SPELL_H_ARCANE_SHOCK = 46381, //heroic spell + SPELL_H_ARCANE_SHOCK = 46381, // heroic spell - SPELL_SUMMON_PURE_ENERGY = 44322, //mod scale -10 - H_SPELL_SUMMON_PURE_ENERGY1 = 46154, //mod scale -5 - H_SPELL_SUMMON_PURE_ENERGY2 = 46159, //mod scale -5 + SPELL_SUMMON_PURE_ENERGY = 44322, // mod scale -10 + H_SPELL_SUMMON_PURE_ENERGY1 = 46154, // mod scale -5 + H_SPELL_SUMMON_PURE_ENERGY2 = 46159 // mod scale -5 + +}; - //Creatures +enum Creatures +{ NPC_PURE_ENERGY = 24745, +}; +enum Misc +{ INTERVAL_MODIFIER = 15, INTERVAL_SWITCH = 6 }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 2eb9bc83178..ca06c29c4c8 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -37,11 +37,19 @@ EndContentData */ ## npc_kalecgos ######*/ -enum eEnums +enum Spells { SPELL_TRANSFORM_TO_KAEL = 44670, - SPELL_ORB_KILL_CREDIT = 46307, - NPC_KAEL = 24848, //human form entry + SPELL_ORB_KILL_CREDIT = 46307 +}; + +enum Creatures +{ + NPC_KAEL = 24848 //human form entry +}; + +enum Misc +{ POINT_ID_LAND = 1 }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 1e7ae1d16b7..91fa6b7df94 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -26,16 +26,19 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, - SAY_SPECIALAE = 1, + SAY_SPECIALAE = 1 +}; +enum Spells +{ SPELL_POLYMORPH = 13323, SPELL_AOESILENCE = 8988, SPELL_ARCANEEXPLOSION = 9433, SPELL_FIREAOE = 9435, - SPELL_ARCANEBUBBLE = 9438, + SPELL_ARCANEBUBBLE = 9438 }; class boss_arcanist_doan : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index cdd67645213..4b1633a80b6 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -26,12 +26,15 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_HEALTH = 1, - SAY_KILL = 2, + SAY_KILL = 2 +}; +enum Spells +{ SPELL_FLAMESHOCK = 8053, SPELL_SHADOWBOLT = 1106, SPELL_FLAMESPIKE = 8814, diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 8db98127f65..e27e78383f7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eSpells +enum Spells { SPELL_CURSEOFBLOOD = 8282, SPELL_DISPELMAGIC = 15090, diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 6bdf1a16b03..f0f5c3611ab 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -26,9 +26,13 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, +}; + +enum Spells +{ SPELL_SUMMONSCARLETHOUND = 17164, SPELL_BLOODLUST = 6742 }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h index 52710cd348e..fbbca46738c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h @@ -16,10 +16,10 @@ * with this program. If not, see . */ -#ifndef DEF_SCARLET_M -#define DEF_SCARLET_M +#ifndef SCARLET_M_ +#define SCARLET_M_ -enum eEnums +enum DataTypes { TYPE_MOGRAINE_AND_WHITE_EVENT = 1, @@ -32,4 +32,5 @@ enum eEnums DATA_VORREL = 7 }; -#endif + +#endif // SCARLET_M_ diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index d233b09bed2..d28b21992b5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -26,11 +26,14 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_CURSEOFBLOOD 24673 -//#define SPELL_ILLUSION 17773 +enum Spells +{ + SPELL_CURSEOFBLOOD = 24673, + //SPELL_ILLUSION = 17773, -//Spells of Illusion of Jandice Barov -#define SPELL_CLEAVE 15584 + // Spells of Illusion of Jandice Barov + SPELL_CLEAVE = 15584 +}; class boss_jandice_barov : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 3585debb1c2..5fc5c48e049 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -57,7 +57,7 @@ enum Events EVENT_KIRTONOS_TRANSFORM = 14 }; -enum eMisc +enum Misc { WEAPON_KIRTONOS_STAFF = 11365, POINT_KIRTONOS_LAND = 13, diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index b7556334691..cfc1376b3ae 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -26,8 +26,11 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_SHADOWBOLTVOLLEY 20741 -#define SPELL_BONESHIELD 27688 +enum Spells +{ + SPELL_SHADOWBOLTVOLLEY = 20741, + SPELL_BONESHIELD = 27688 +}; class boss_kormok : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index e606ff2229f..2551400ccc3 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -26,13 +26,17 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Emotes +{ + EMOTE_FRENZY_KILL = 0 +}; + +enum Spells { - EMOTE_FRENZY_KILL = 0, SPELL_FLAMESTRIKE = 18399, SPELL_BLAST_WAVE = 16046, SPELL_FIRESHIELD = 19626, - SPELL_FRENZY = 8269 //28371, + SPELL_FRENZY = 8269 // 28371 }; class boss_vectus : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 4afefa5a688..9e351360f3c 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -31,21 +31,30 @@ EndScriptData */ #define MAX_ENCOUNTER 4 -enum eEnums +enum Yells { SAY_BOSS_DIE_AD = 4, SAY_BOSS_DIE_AS = 3, - SAY_ARCHMAGE = 0, + SAY_ARCHMAGE = 0 +}; +enum Creatures +{ NPC_ASH = 3850, NPC_ADA = 3849, NPC_ARCHMAGE_ARUGAL = 4275, - NPC_ARUGAL_VOIDWALKER = 4627, + NPC_ARUGAL_VOIDWALKER = 4627 +}; - GO_COURTYARD_DOOR = 18895, //door to open when talking to NPC's - GO_SORCERER_DOOR = 18972, //door to open when Fenrus the Devourer - GO_ARUGAL_DOOR = 18971, //door to open when Wolf Master Nandos +enum GameObjects +{ + GO_COURTYARD_DOOR = 18895, //door to open when talking to NPC's + GO_SORCERER_DOOR = 18972, //door to open when Fenrus the Devourer + GO_ARUGAL_DOOR = 18971 //door to open when Wolf Master Nandos +}; +enum Spells +{ SPELL_ASHCROMBE_TELEPORT = 15742 }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 156d31c804f..0b0556fb3a8 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -40,7 +40,7 @@ EndContentData */ ## npc_shadowfang_prisoner ######*/ -enum eEnums +enum Yells { SAY_FREE_AS = 0, SAY_OPEN_DOOR_AS = 1, @@ -48,14 +48,21 @@ enum eEnums SAY_FREE_AD = 0, SAY_OPEN_DOOR_AD = 1, SAY_POST1_DOOR_AD = 2, - SAY_POST2_DOOR_AD = 3, + SAY_POST2_DOOR_AD = 3 +}; +enum Spells +{ SPELL_UNLOCK = 6421, - NPC_ASH = 3850, SPELL_DARK_OFFERING = 7154 }; +enum Creatures +{ + NPC_ASH = 3850 +}; + #define GOSSIP_ITEM_DOOR "Thanks, I'll follow you to the door." class npc_shadowfang_prisoner : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index cee4e5ffc1e..1823d24ab2e 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -19,7 +19,7 @@ #ifndef DEF_SHADOWFANG_H #define DEF_SHADOWFANG_H -enum eData +enum DataTypes { TYPE_FREE_NPC = 1, TYPE_RETHILGORE = 2, diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 258bef64612..9d239af33c7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -27,10 +27,13 @@ EndScriptData */ #include "ScriptedCreature.h" #include "stratholme.h" -#define SPELL_BANSHEEWAIL 16565 -#define SPELL_BANSHEECURSE 16867 -#define SPELL_SILENCE 18327 -//#define SPELL_POSSESS 17244 +enum Spells +{ + SPELL_BANSHEEWAIL = 16565, + SPELL_BANSHEECURSE = 16867, + SPELL_SILENCE = 18327 + //SPELL_POSSESS = 17244 +}; class boss_baroness_anastari : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 345f42d21c8..cdf76bba3ed 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -72,10 +72,13 @@ EndScriptData */ #define ADD_9Z 125.001015f #define ADD_9O 0.592007f -#define SPELL_KNOCKAWAY 10101 -#define SPELL_PUMMEL 15615 -#define SPELL_SHOOT 16496 -//#define SPELL_SUMMONCRIMSONRIFLEMAN 17279 +enum Spells +{ + SPELL_KNOCKAWAY = 10101, + SPELL_PUMMEL = 15615, + SPELL_SHOOT = 16496 + //SPELL_SUMMONCRIMSONRIFLEMAN = 17279 +}; class boss_cannon_master_willey : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 593b2fd53b1..783579f37a9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Spells { //Dathrohan spells SPELL_CRUSADERSHAMMER = 17286, //AOE stun @@ -41,8 +41,11 @@ enum eEnums SPELL_MINDBLAST = 17287, SPELL_PSYCHICSCREAM = 13704, SPELL_SLEEP = 12098, - SPELL_MINDCONTROL = 15690, + SPELL_MINDCONTROL = 15690 +}; +enum Creatures +{ NPC_DATHROHAN = 10812, NPC_BALNAZZAR = 10813, NPC_ZOMBIE = 10698 //probably incorrect diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index db5509662ef..525c7f48f1c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -27,13 +27,19 @@ EndScriptData */ #include "ScriptedCreature.h" #include "stratholme.h" -#define SPELL_DRAININGBLOW 16793 -#define SPELL_CROWDPUMMEL 10887 -#define SPELL_MIGHTYBLOW 14099 -#define SPELL_FURIOUS_ANGER 16791 +enum Spells +{ + SPELL_DRAININGBLOW = 16793, + SPELL_CROWDPUMMEL = 10887, + SPELL_MIGHTYBLOW = 14099, + SPELL_FURIOUS_ANGER = 16791 +}; -#define MODEL_NORMAL 10433 -#define MODEL_HUMAN 3637 +enum Models +{ + MODEL_NORMAL = 10433, + MODEL_HUMAN = 3637 +}; class boss_magistrate_barthilas : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 83fbcac20fd..82135d0cae9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -27,10 +27,14 @@ EndScriptData */ #include "ScriptedCreature.h" #include "stratholme.h" -#define SPELL_FROSTBOLT 17503 -#define SPELL_DRAINLIFE 20743 -#define SPELL_DRAIN_MANA 17243 -#define SPELL_ICETOMB 16869 +enum Spells +{ + SPELL_FROSTBOLT = 17503, + SPELL_DRAINLIFE = 20743, + SPELL_DRAIN_MANA = 17243, + SPELL_ICETOMB = 16869 + +}; class boss_maleki_the_pallid : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index a8b981dc44f..9b6ef8fb214 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -116,11 +116,19 @@ public: ## npc_restless_soul ######*/ -#define SPELL_EGAN_BLASTER 17368 -#define SPELL_SOUL_FREED 17370 -#define QUEST_RESTLESS_SOUL 5282 -#define ENTRY_RESTLESS 11122 -#define ENTRY_FREED 11136 +enum RestlessSoul +{ + // Spells + SPELL_EGAN_BLASTER = 17368, + SPELL_SOUL_FREED = 17370, + + // Quest + QUEST_RESTLESS_SOUL = 5282, + + // Creatures + NPC_RESTLESS = 11122, + NPC_FREED = 11136 +}; class npc_restless_soul : public CreatureScript { @@ -170,7 +178,7 @@ public: void JustDied(Unit* /*killer*/) { if (Tagged) - me->SummonCreature(ENTRY_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000); + me->SummonCreature(NPC_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000); } void UpdateAI(uint32 diff) @@ -182,7 +190,7 @@ public: if (Unit* temp = Unit::GetUnit(*me, Tagger)) { if (Player* player = temp->ToPlayer()) - player->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID()); + player->KilledMonsterCredit(NPC_RESTLESS, me->GetGUID()); me->Kill(me); } } @@ -198,7 +206,7 @@ public: ## npc_spectral_ghostly_citizen ######*/ -enum eGhostlyCitizenSpells +enum GhostlyCitizenSpells { SPELL_HAUNTING_PHANTOM = 16336, SPELL_SLAP = 6754 @@ -243,7 +251,7 @@ public: { //100%, 50%, 33%, 25% chance to spawn if (urand(1, i) == 1) - DoSummon(ENTRY_RESTLESS, me, 20.0f, 600000); + DoSummon(NPC_RESTLESS, me, 20.0f, 600000); } } } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 016b0aad62d..b16893df157 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "InstanceScript.h" #include "uldaman.h" -enum eSpells +enum Spells { SPELL_ARCHAEDAS_AWAKEN = 10347, SPELL_AWAKEN_VAULT_WALKER = 10258, diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 5f9577e12fa..a58a292373f 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -38,7 +38,7 @@ EndContentData */ ## npc_jadespine_basilisk ######*/ -enum eSpells +enum Spells { SPELL_CRYSTALLINE_SLUMBER = 3636, }; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h index 86f3d3b6d1e..15583312f5a 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h @@ -19,16 +19,9 @@ #ifndef DEF_ULDAMAN_H #define DEF_ULDAMAN_H -enum eObjects -{ - GO_ARCHAEDAS_TEMPLE_DOOR = 141869, - GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR = 124367, - GO_ANCIENT_VAULT_DOOR = 124369, - GO_IRONAYA_SEAL_DOOR = 124372, - GO_KEYSTONE = 124371, -}; +#define MAX_ENCOUNTER 3 -enum eData +enum DataTypes { DATA_ALTAR_DOORS = 1, DATA_ANCIENT_DOOR = 2, @@ -38,6 +31,13 @@ enum eData DATA_IRONAYA_SEAL = 6, }; -#define MAX_ENCOUNTER 3 +enum GameObjectIds +{ + GO_ARCHAEDAS_TEMPLE_DOOR = 141869, + GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR = 124367, + GO_ANCIENT_VAULT_DOOR = 124369, + GO_IRONAYA_SEAL_DOOR = 124372, + GO_KEYSTONE = 124371, +}; #endif diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 5965cadf814..6851a39cdb6 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -42,16 +42,18 @@ EndScriptData */ #define YELL_DEATH "Dis not... da end of me..." #define SOUND_YELL_DEATH 12051 -#define SPELL_SPIRIT_BOLTS 43383 -#define SPELL_DRAIN_POWER 44131 -#define SPELL_SIPHON_SOUL 43501 -#define NPC_TEMP_TRIGGER 23920 - -//Defines for various powers he uses after using soul drain +enum Creatures +{ + NPC_TEMP_TRIGGER = 23920 +}; enum Spells { + SPELL_SPIRIT_BOLTS = 43383, + SPELL_DRAIN_POWER = 44131, + SPELL_SIPHON_SOUL = 43501, + // Druid SPELL_DR_THORNS = 43420, SPELL_DR_LIFEBLOOM = 43421, @@ -100,7 +102,36 @@ enum Spells // Warrior SPELL_WR_MORTAL_STRIKE = 43441, SPELL_WR_WHIRLWIND = 43442, - SPELL_WR_SPELL_REFLECT = 43443 + SPELL_WR_SPELL_REFLECT = 43443, + + // Thurg + SPELL_BLOODLUST = 43578, + SPELL_CLEAVE = 15496, + + // Gazakroth + SPELL_FIREBOLT = 43584, + + // Alyson Antille + SPELL_FLASH_HEAL = 43575, + SPELL_DISPEL_MAGIC = 43577, + + // Lord Raadan + SPELL_FLAME_BREATH = 43582, + SPELL_THUNDERCLAP = 43583, + + // Darkheart + SPELL_PSYCHIC_WAIL = 43590, + + // Slither + SPELL_VENOM_SPIT = 43579, + + // Fenstalker + SPELL_VOLATILE_INFECTION = 43586, + + // Koragg + SPELL_COLD_STARE = 43593, + SPELL_MIGHTY_BLOW = 43592 + }; #define ORIENT 1.5696f @@ -483,9 +514,6 @@ class boss_hexlord_malacrass : public CreatureScript } }; -#define SPELL_BLOODLUST 43578 -#define SPELL_CLEAVE 15496 - class boss_thurg : public CreatureScript { public: @@ -543,9 +571,6 @@ class boss_thurg : public CreatureScript } }; -#define SPELL_FLASH_HEAL 43575 -#define SPELL_DISPEL_MAGIC 43577 - class boss_alyson_antille : public CreatureScript { public: @@ -643,8 +668,6 @@ class boss_alyson_antille : public CreatureScript } }; -#define SPELL_FIREBOLT 43584 - struct boss_gazakrothAI : public boss_hexlord_addAI { boss_gazakrothAI(Creature* creature) : boss_hexlord_addAI(creature) {} @@ -687,9 +710,6 @@ struct boss_gazakrothAI : public boss_hexlord_addAI } }; -#define SPELL_FLAME_BREATH 43582 -#define SPELL_THUNDERCLAP 43583 - class boss_lord_raadan : public CreatureScript { public: @@ -741,8 +761,6 @@ class boss_lord_raadan : public CreatureScript } }; -#define SPELL_PSYCHIC_WAIL 43590 - class boss_darkheart : public CreatureScript { public: @@ -784,7 +802,6 @@ class boss_darkheart : public CreatureScript } }; -#define SPELL_VENOM_SPIT 43579 class boss_slither : public CreatureScript { @@ -844,8 +861,6 @@ class boss_slither : public CreatureScript } }; -//Fenstalker -#define SPELL_VOLATILE_INFECTION 43586 class boss_fenstalker : public CreatureScript { public: @@ -889,10 +904,6 @@ class boss_fenstalker : public CreatureScript } }; -//Koragg -#define SPELL_COLD_STARE 43593 -#define SPELL_MIGHTY_BLOW 43592 - class boss_koragg : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 3b8e3d5fdb2..c69f0885164 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -29,7 +29,7 @@ EndScriptData */ #include "GridNotifiers.h" #include "CellImpl.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_FIRE_BOMBS = 1, @@ -39,9 +39,12 @@ enum eEnums SAY_SLAY = 5, SAY_DEATH = 6, SAY_EVENT_STRANGERS = 7, - SAY_EVENT_FRIENDS = 8, + SAY_EVENT_FRIENDS = 8 +}; -// Jan'alai +enum Spells +{ + // Jan'alai SPELL_FLAME_BREATH = 43140, SPELL_FIRE_WALL = 43113, SPELL_ENRAGE = 44779, @@ -50,26 +53,28 @@ enum eEnums SPELL_HATCH_ALL = 43144, SPELL_BERSERK = 45078, -// -- Fire Bob Spells + // Fire Bob Spells SPELL_FIRE_BOMB_CHANNEL = 42621, // last forever SPELL_FIRE_BOMB_THROW = 42628, // throw visual SPELL_FIRE_BOMB_DUMMY = 42629, // bomb visual SPELL_FIRE_BOMB_DAMAGE = 42630, -// --Summons - NPC_AMANI_HATCHER = 23818, - NPC_HATCHLING = 23598, // 42493 - NPC_EGG = 23817, - NPC_FIRE_BOMB = 23920, - -// -- Hatcher Spells + // Hatcher Spells SPELL_HATCH_EGG = 42471, // 43734 SPELL_SUMMON_HATCHLING = 42493, -// -- Hatchling Spells + // Hatchling Spells SPELL_FLAMEBUFFET = 43299 }; +enum Creatures +{ + NPC_AMANI_HATCHER = 23818, + NPC_HATCHLING = 23598, // 42493 + NPC_EGG = 23817, + NPC_FIRE_BOMB = 23920 +}; + const int area_dx = 44; const int area_dy = 51; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index d73612a7935..f8c04acac4f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -30,7 +30,24 @@ EndScriptData */ #include "GridNotifiersImpl.h" #include "CellImpl.h" -//Trash Waves +enum Spells +{ + SPELL_BERSERK = 45078, + + // Troll form + SPELL_BRUTALSWIPE = 42384, + SPELL_MANGLE = 42389, + SPELL_MANGLEEFFECT = 44955, + SPELL_SURGE = 42402, + SPELL_BEARFORM = 42377, + + // Bear form + SPELL_LACERATINGSLASH = 42395, + SPELL_RENDFLESH = 42397, + SPELL_DEAFENINGROAR = 42398 +}; + +// Trash Waves float NalorakkWay[8][3] = { { 18.569f, 1414.512f, 11.42f}, // waypoint 1 @@ -69,26 +86,12 @@ float NalorakkWay[8][3] = #define SOUND_YELL_DEATH 12077 #define YELL_BERSERK "You had your chance, now it be too late!" //Never seen this being used, so just guessing from what I hear. #define SOUND_YELL_BERSERK 12074 - -#define SPELL_BERSERK 45078 - -//Defines for Troll form -#define SPELL_BRUTALSWIPE 42384 -#define SPELL_MANGLE 42389 -#define SPELL_MANGLEEFFECT 44955 -#define SPELL_SURGE 42402 -#define SPELL_BEARFORM 42377 - #define YELL_SURGE "I bring da pain!" #define SOUND_YELL_SURGE 12071 #define YELL_SHIFTEDTOTROLL "Make way for Nalorakk!" #define SOUND_YELL_TOTROLL 12073 -//Defines for Bear form -#define SPELL_LACERATINGSLASH 42395 -#define SPELL_RENDFLESH 42397 -#define SPELL_DEAFENINGROAR 42398 #define YELL_SHIFTEDTOBEAR "You call on da beast, you gonna get more dan you bargain for!" #define SOUND_YELL_TOBEAR 12072 diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 0c2c9597cfe..f466773af13 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -39,9 +39,16 @@ EndContentData */ ## npc_forest_frog ######*/ -#define SPELL_REMOVE_AMANI_CURSE 43732 -#define SPELL_PUSH_MOJO 43923 -#define ENTRY_FOREST_FROG 24396 +enum ForestFrog +{ + // Spells + SPELL_REMOVE_AMANI_CURSE = 43732, + SPELL_PUSH_MOJO = 43923, + + // Creatures + NPC_FOREST_FROG = 24396 + +}; class npc_forest_frog : public CreatureScript { @@ -98,7 +105,7 @@ class npc_forest_frog : public CreatureScript void SpellHit(Unit* caster, const SpellInfo* spell) { - if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == ENTRY_FOREST_FROG) + if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == NPC_FOREST_FROG) { //increase or decrease chance of mojo? if (rand()%99 == 50) DoCast(caster, SPELL_PUSH_MOJO, true); diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 872ea60ddf0..3db48f747c7 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -36,8 +36,9 @@ EndContentData */ ## npc_professor_phizzlethorpe ######*/ -enum eEnums +enum ProfessorPhizzlethorpe { + // Yells SAY_PROGRESS_1 = 0, SAY_PROGRESS_2 = 1, SAY_PROGRESS_3 = 2, @@ -49,7 +50,10 @@ enum eEnums EMOTE_PROGRESS_8 = 8, SAY_PROGRESS_9 = 9, + // Quests QUEST_SUNKEN_TREASURE = 665, + + // Creatures NPC_VENGEFUL_SURGE = 2776 }; diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 4f76edf4406..9151c1c3a24 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -38,9 +38,12 @@ EndContentData */ #define GOSSIP_ITEM_USHER "I wish to to visit the Rise of the Defiler." -#define SPELL_TELEPORT_SINGLE 12885 -#define SPELL_TELEPORT_SINGLE_IN_GROUP 13142 -#define SPELL_TELEPORT_GROUP 27686 +enum DeathlyUsher +{ + SPELL_TELEPORT_SINGLE = 12885, + SPELL_TELEPORT_SINGLE_IN_GROUP = 13142, + SPELL_TELEPORT_GROUP = 27686 +}; class npc_deathly_usher : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index df9265e5621..97b3ea89cbb 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -68,9 +68,12 @@ public: # boss_twilight_corrupter ######*/ -#define SPELL_SOUL_CORRUPTION 25805 -#define SPELL_CREATURE_OF_NIGHTMARE 25806 -#define SPELL_LEVEL_UP 24312 +enum TwilightCorrupter +{ + SPELL_SOUL_CORRUPTION = 25805, + SPELL_CREATURE_OF_NIGHTMARE = 25806, + SPELL_LEVEL_UP = 24312 +}; class boss_twilight_corrupter : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 0a68ade7e6b..ce89b91ed5f 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -96,7 +96,10 @@ public: ## npc_darrowshire_spirit ######*/ -#define SPELL_SPIRIT_SPAWNIN 17321 +enum DarrowshireSpirit +{ + SPELL_SPIRIT_SPAWNIN = 17321 +}; class npc_darrowshire_spirit : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 09bf6feaccd..d9496d53756 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -109,8 +109,9 @@ public: ## npc_ranger_lilatha ######*/ -enum eEnums +enum RangerLilatha { + // Yells SAY_START = 0, SAY_PROGRESS1 = 1, SAY_PROGRESS2 = 2, @@ -119,9 +120,16 @@ enum eEnums SAY_END2 = 5, SAY_CAPTAIN_ANSWER = 0, + // Quests QUEST_ESCAPE_FROM_THE_CATACOMBS = 9212, + + // Gameobjects GO_CAGE = 181152, + + // Creature NPC_CAPTAIN_HELIOS = 16220, + + // Factions FACTION_SMOON_E = 1603 }; diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index ffd31937677..653c9daec32 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -37,7 +37,7 @@ EndContentData */ ## npc_00x09hl ######*/ -enum eOOX +enum OOX { SAY_OOX_START = 0, SAY_OOX_AGGRO = 1, @@ -151,7 +151,7 @@ public: ## npc_rinji ######*/ -enum eRinji +enum Rinji { SAY_RIN_BY_OUTRUNNER = 0, diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index 55e1294d9e7..3cf25d90077 100644 --- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp @@ -26,7 +26,7 @@ Script Data End */ #include "ScriptedEscortAI.h" #include "Player.h" -enum eCorporalKeeshan +enum CorporalKeeshan { QUEST_MISSING_IN_ACTION = 219, diff --git a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp index 0e7472fc63b..edb147d7a7e 100644 --- a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp @@ -35,7 +35,7 @@ EndContentData */ /*####### # npc_blood_knight_stillblade #######*/ -enum eStillbladeData +enum StillbladeData { SAY_HEAL = 0, diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index c7b35df41fd..d9f773b83a7 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -37,7 +37,7 @@ EndContentData */ ## npc_deathstalker_erland ######*/ -enum eErland +enum Erland { SAY_QUESTACCEPT = 0, SAY_START = 1, diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index a7074eea114..e3a9465ffd3 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -80,7 +80,7 @@ public: ## npc_bartleby ######*/ -enum eBartleby +enum Bartleby { FACTION_ENEMY = 168, QUEST_BEAT = 1640 @@ -204,7 +204,7 @@ public: ## npc_lord_gregor_lescovar ######*/ -enum eLordGregorLescovar +enum LordGregorLescovar { SAY_GUARD_2 = 0, SAY_LESCOVAR_2 = 0, @@ -462,7 +462,7 @@ public: ## npc_tyrion_spybot ######*/ -enum eTyrionSpybot +enum TyrionSpybot { SAY_QUEST_ACCEPT_ATTACK = 0, SAY_SPYBOT_1 = 1, @@ -610,7 +610,7 @@ public: ## npc_tyrion ######*/ -enum eTyrion +enum Tyrion { NPC_TYRION_SPYBOT = 8856 }; diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 347dea98966..86507624a38 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -159,7 +159,7 @@ public: ## go_mausoleum_trigger ######*/ -enum eMausoleum +enum Mausoleum { QUEST_ULAG = 1819, NPC_ULAG = 6390, diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 892402251dc..a1dc0cb653f 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -276,11 +276,14 @@ public: ## npc_parqual_fintallas ######*/ -#define SPELL_MARK_OF_SHAME 6767 +enum ParqualFintallas +{ + SPELL_MARK_OF_SHAME = 6767 +}; -#define GOSSIP_HPF1 "Gul'dan" -#define GOSSIP_HPF2 "Kel'Thuzad" -#define GOSSIP_HPF3 "Ner'zhul" +#define GOSSIP_HPF1 "Gul'dan" +#define GOSSIP_HPF2 "Kel'Thuzad" +#define GOSSIP_HPF3 "Ner'zhul" class npc_parqual_fintallas : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 1e099a07844..f37a54cdbeb 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -112,7 +112,7 @@ public: ## npc_myranda_the_hag ######*/ -enum eMyranda +enum Myranda { QUEST_SUBTERFUGE = 5862, QUEST_IN_DREAMS = 5944, @@ -240,7 +240,7 @@ public: ## npcs_andorhal_tower ######*/ -enum eAndorhalTower +enum AndorhalTower { GO_BEACON_TORCH = 176093 }; @@ -278,7 +278,7 @@ public: ## npc_anchorite_truuen ######*/ -enum eTruuen +enum Truuen { NPC_GHOST_UTHER = 17233, NPC_THEL_DANIS = 1854, diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index a0c1c01d3a2..76712d6c53e 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -37,17 +37,25 @@ EndContentData */ ## npc_daphne_stilwell ######*/ -enum eEnums +enum DaphneStilwell { + // Yells SAY_DS_START = 0, SAY_DS_DOWN_1 = 1, SAY_DS_DOWN_2 = 2, SAY_DS_DOWN_3 = 3, SAY_DS_PROLOGUE = 4, + // Spells SPELL_SHOOT = 6660, + + // Quests QUEST_TOME_VALOR = 1651, + + // Creatures NPC_DEFIAS_RAIDER = 6180, + + // Equips EQUIP_ID_RIFLE = 2511 }; diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index faaeeaea8bd..86acfcd9794 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -37,7 +37,7 @@ EndContentData */ ## npc_tapoke_slim_jahn ######*/ -enum eTapokeSlim +enum TapokeSlim { QUEST_MISSING_DIPLO_PT11 = 1249, FACTION_ENEMY = 168, diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 78c66750c5c..ae4980c2d75 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -72,7 +72,7 @@ enum Spells SPELL_BERSERK = 32965, }; -enum eEnums +enum Factions { // any other constants FACTION_WORGEN = 24 diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index f4cb5c24e18..5d0f2321402 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -30,14 +30,8 @@ EndScriptData */ #include "Player.h" #include "CreatureTextMgr.h" -enum eEnums +enum Yells { - NPC_FELBOAR = 21878, - - SPELL_DEATH_COIL = 33130, - SPELL_ELIXIR_OF_FORTITUDE = 3593, - SPELL_BLUE_FIREWORK = 11540, - SAY_AGGRO1 = 0, SAY_AGGRO2 = 1, SAY_WP_1 = 2, @@ -52,6 +46,18 @@ enum eEnums SAY_RAND_2 = 11 }; +enum Spells +{ + SPELL_DEATH_COIL = 33130, + SPELL_ELIXIR_OF_FORTITUDE = 3593, + SPELL_BLUE_FIREWORK = 11540 +}; + +enum Creatures +{ + NPC_FELBOAR = 21878 +}; + #define GOSSIP_ITEM_1 "Click to Test Escort(Attack, Run)" #define GOSSIP_ITEM_2 "Click to Test Escort(NoAttack, Walk)" #define GOSSIP_ITEM_3 "Click to Test Escort(NoAttack, Run)" diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp index 1cfc1ef23ae..432e7e74c35 100644 --- a/src/server/scripts/Examples/example_gossip_codebox.cpp +++ b/src/server/scripts/Examples/example_gossip_codebox.cpp @@ -29,17 +29,20 @@ EndScriptData */ #include "Player.h" #include -enum eEnums +enum Yells { - SPELL_POLYMORPH = 12826, - SPELL_MARK_OF_THE_WILD = 26990, - - //These texts must be added to the creature texts of the npc for which the script is assigned. + // These texts must be added to the creature texts of the npc for which the script is assigned. SAY_NOT_INTERESTED = 0, // "Normal select, guess you're not interested." SAY_WRONG = 1, // "Wrong!" SAY_CORRECT = 2 // "You're right, you are allowed to see my inner secrets." }; +enum Spells +{ + SPELL_POLYMORPH = 12826, + SPELL_MARK_OF_THE_WILD = 26990 +}; + #define GOSSIP_ITEM_1 "A quiz: what's your name?" #define GOSSIP_ITEM_2 "I'm not interested" diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index 0d926de79d8..46deda8e4c8 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -16,8 +16,8 @@ * with this program. If not, see . */ -#ifndef DEF_BFD_H -#define DEF_BFD_H +#ifndef BFD_H_ +#define BFD_H_ enum Data64 { @@ -41,7 +41,7 @@ enum Data DATA_EVENT }; -enum Creatures +enum CreatureIds { NPC_TWILIGHT_LORD_KELRIS = 4832, NPC_LORGUS_JETT = 12902, @@ -54,7 +54,7 @@ enum Creatures NPC_MORRIDUNE = 6729 }; -enum GameObjects +enum GameObjectIds { GO_SHRINE_OF_GELIHAST = 103015, GO_FIRE_OF_AKU_MAI_1 = 21118, @@ -64,4 +64,5 @@ enum GameObjects GO_AKU_MAI_DOOR = 21117, GO_ALTAR_OF_THE_DEEPS = 103016 }; -#endif + +#endif // BFD_H_ diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index 056187d202e..7d8b06f1b02 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -19,15 +19,25 @@ #ifndef DEF_OLD_HILLSBRAD_H #define DEF_OLD_HILLSBRAD_H -#define TYPE_BARREL_DIVERSION 1 -#define TYPE_THRALL_EVENT 2 -#define TYPE_THRALL_PART1 3 -#define TYPE_THRALL_PART2 4 -#define TYPE_THRALL_PART3 5 -#define TYPE_THRALL_PART4 6 -#define DATA_THRALL 7 -#define DATA_TARETHA 8 -#define DATA_EPOCH 9 -#define WORLD_STATE_OH 2436 +enum DataTypes +{ + TYPE_BARREL_DIVERSION = 1, + TYPE_THRALL_EVENT = 2, + TYPE_THRALL_PART1 = 3, + TYPE_THRALL_PART2 = 4, + TYPE_THRALL_PART3 = 5, + TYPE_THRALL_PART4 = 6, + + DATA_THRALL = 7, + DATA_TARETHA = 8, + DATA_EPOCH = 9 + +}; + +enum WorldStateIds +{ + WORLD_STATE_OH = 2436 +}; + #endif diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index b7419d53db2..58c9731814d 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -145,15 +145,15 @@ public: switch (uiGongWaves) { case 1: - uiCreature = CREATURE_TOMB_FIEND; + uiCreature = NPC_TOMB_FIEND; uiSummonTimes = 7; break; case 10: - uiCreature = CREATURE_TOMB_REAVER; + uiCreature = NPC_TOMB_REAVER; uiSummonTimes = 3; break; case 16: - uiCreature = CREATURE_TUTEN_KASH; + uiCreature = NPC_TUTEN_KASH; break; default: break; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 6b63c98e7d8..7d7e050f010 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -37,12 +37,16 @@ EndContentData */ # npc_henry_stern ####*/ -enum eEnums +enum Spells { SPELL_GOLDTHORN_TEA = 13028, SPELL_TEACHING_GOLDTHORN_TEA = 13029, SPELL_MIGHT_TROLLS_BLOOD_POTION = 3451, SPELL_TEACHING_MIGHTY_TROLLS_BLOOD_POTION = 13030, +}; + +enum Gossips +{ GOSSIP_TEXT_TEA_ANSWER = 2114, GOSSIP_TEXT_POTION_ANSWER = 2115, }; @@ -111,7 +115,7 @@ public: }; -enum eTombCreature +enum TombCreature { SPELL_WEB = 745 }; @@ -148,7 +152,7 @@ public: return; //from acid - if (me->GetEntry() == CREATURE_TOMB_REAVER) + if (me->GetEntry() == NPC_TOMB_REAVER) { if (uiWebTimer <= uiDiff) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h index 3b132561deb..c0f63474f23 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -18,27 +18,27 @@ #ifndef DEF_RAZORFEN_DOWNS_H #define DEF_RAZORFEN_DOWNS_H -enum eData +enum Data { BOSS_TUTEN_KASH, DATA_GONG_WAVES }; -enum eData64 +enum Data64 { DATA_GONG }; -enum eGameObject +enum GameObjectIds { GO_GONG = 148917 }; -enum eCreature +enum CreatureId { - CREATURE_TOMB_FIEND = 7349, - CREATURE_TOMB_REAVER = 7351, - CREATURE_TUTEN_KASH = 7355 + NPC_TOMB_FIEND = 7349, + NPC_TOMB_REAVER = 7351, + NPC_TUTEN_KASH = 7355 }; #endif diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 9935248c39e..413214e4366 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -27,16 +27,19 @@ EndScriptData */ #include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" -#define SPELL_CLEAVE 26350 -#define SPELL_TOXIC_VOLLEY 25812 -#define SPELL_POISON_CLOUD 38718 //Only Spell with right dmg. -#define SPELL_ENRAGE 34624 //Changed cause 25790 is casted on gamers too. Same prob with old explosion of twin emperors. +enum Spells +{ + SPELL_CLEAVE = 26350, + SPELL_TOXIC_VOLLEY = 25812, + SPELL_POISON_CLOUD = 38718, //Only Spell with right dmg. + SPELL_ENRAGE = 34624, //Changed cause 25790 is casted on gamers too. Same prob with old explosion of twin emperors. -#define SPELL_CHARGE 26561 -#define SPELL_KNOCKBACK 26027 + SPELL_CHARGE = 26561, + SPELL_KNOCKBACK = 26027, -#define SPELL_HEAL 25807 -#define SPELL_FEAR 19408 + SPELL_HEAL = 25807, + SPELL_FEAR = 19408 +}; class boss_kri : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 7456d00ae90..eaea49327f1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -92,7 +92,7 @@ enum Spells // ***** Main Phase 2 ****** //Body spells - //#define SPELL_CARAPACE_CTHUN 26156 //Was removed from client dbcs + //SPELL_CARAPACE_CTHUN = 26156 //Was removed from client dbcs SPELL_TRANSFORM = 26232, SPELL_PURPLE_COLORATION = 22581, //Probably not the right spell but looks similar diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 4b442604881..c267dd1a8e0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -32,11 +32,14 @@ EndScriptData */ #define SOUND_TRESPASS 8591 #define SOUND_WILL_BE 8592 -#define SPELL_MORTAL_WOUND 28467 -#define SPELL_ROOT 28858 +enum Spells +{ + SPELL_MORTAL_WOUND = 28467, + SPELL_ROOT = 28858, -// Enrage for his spawns -#define SPELL_ENRAGE 28798 + // Enrage for his spawns + SPELL_ENRAGE = 28798 +}; class boss_fankriss : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index f2e901458cd..6161f8bf552 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -36,25 +36,28 @@ EndScriptData */ #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#define SPELL_MENDING_BUFF 2147 +enum Spells +{ + SPELL_MENDING_BUFF = 2147, -#define SPELL_KNOCK_BUFF 21737 -#define SPELL_KNOCK 25778 -#define SPELL_MANAB_BUFF 812 -#define SPELL_MANAB 25779 + SPELL_KNOCK_BUFF = 21737, + SPELL_KNOCK = 25778, + SPELL_MANAB_BUFF = 812, + SPELL_MANAB = 25779, -#define SPELL_REFLECTAF_BUFF 13022 -#define SPELL_REFLECTSFr_BUFF 19595 -#define SPELL_THORNS_BUFF 25777 + SPELL_REFLECTAF_BUFF = 13022, + SPELL_REFLECTSFr_BUFF = 19595, + SPELL_THORNS_BUFF = 25777, -#define SPELL_THUNDER_BUFF 2834 -#define SPELL_THUNDER 8732 + SPELL_THUNDER_BUFF = 2834, + SPELL_THUNDER = 8732, -#define SPELL_MSTRIKE_BUFF 9347 -#define SPELL_MSTRIKE 24573 + SPELL_MSTRIKE_BUFF = 9347, + SPELL_MSTRIKE = 24573, -#define SPELL_STORM_BUFF 2148 -#define SPELL_STORM 26546 + SPELL_STORM_BUFF = 2148, + SPELL_STORM = 26546 +}; class npc_anubisath_sentinel : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index c8a1d4b3159..0a1848acbf9 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -19,7 +19,7 @@ #ifndef DEF_WAILING_CAVERNS_H #define DEF_WAILING_CAVERNS_H -enum eTypes +enum DataTypes { TYPE_LORD_COBRAHN = 1, TYPE_LORD_PYTHAS = 2, diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 7d6d6bd003a..83a6cf4a17a 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -21,8 +21,14 @@ #include "Player.h" #include "TemporarySummon.h" -#define NPC_GAHZRILLA 7273 -#define PATH_ADDS 81553 +enum Misc +{ + // Creatures + NPC_GAHZRILLA = 7273, + + // Paths + PATH_ADDS = 81553 +}; int const pyramidSpawnTotal = 54; /* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h index 3a97117f520..8473ee1d39d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef DEF_AHNKAHET_H -#define DEF_AHNKAHET_H +#ifndef AHNKAHET_H_ +#define AHNKAHET_H_ enum Data64 { @@ -47,4 +47,4 @@ enum Data DATA_ALL_INITIAND_DEAD }; -#endif +#endif // AHNKAHET_H_ diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 725dd88f137..c4613bf4005 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -40,7 +40,7 @@ enum Creatures NPC_TRIGGER = 19656 }; -enum event +enum Events { EVENT_SPAWN = 1, EVENT_MINI, diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index d6d079eac17..9b80ef9cfe4 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -57,8 +57,11 @@ const Position JedogaPosition[2] = {372.330994f, -705.278015f, -16.179716f, 5.427970f} }; -#define ACTION_INITIAND_KILLED 1 -#define DATA_VOLUNTEER_WORK 2 +enum Misc +{ + ACTION_INITIAND_KILLED = 1, + DATA_VOLUNTEER_WORK = 2 +}; class boss_jedoga_shadowseeker : public CreatureScript { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 72bae8c17d4..6ec2a416287 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -21,7 +21,7 @@ enum Spells { - SPELL_BLOODTHIRST = 55968, //Trigger Spell + add aura + SPELL_BLOODTHIRST = 55968, // Trigger Spell + add aura SPELL_CONJURE_FLAME_SPHERE = 55931, SPELL_FLAME_SPHERE_SUMMON_1 = 55895, // 1x 30106 H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511, // 1x 31686 @@ -40,14 +40,16 @@ enum Spells H_CREATURE_FLAME_SPHERE_2 = 31687, SPELL_HOVER_FALL = 60425 }; + enum Misc { DATA_EMBRACE_DMG = 20000, H_DATA_EMBRACE_DMG = 40000, - DATA_SPHERE_DISTANCE = 15 + DATA_SPHERE_DISTANCE = 15 }; -#define DATA_SPHERE_ANGLE_OFFSET 0.7f -#define DATA_GROUND_POSITION_Z 11.30809f + +#define DATA_SPHERE_ANGLE_OFFSET 0.7f +#define DATA_GROUND_POSITION_Z 11.30809f enum Yells { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 344b0dfe03a..5970a85cc38 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -27,6 +27,7 @@ enum Data64 DATA_WATCHER_SILTHIK, DATA_WATCHER_NARJIL }; + enum Data { DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 84fad199958..8de5baad0b8 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -124,7 +124,10 @@ enum Enums POINT_ID_LAND = 200, }; -#define DATA_CAN_LOOT 0 +enum Misc +{ + DATA_CAN_LOOT = 0 +}; struct Waypoint { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index 7318e73dea1..7d2403be469 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -18,7 +18,7 @@ #ifndef DEF_OBSIDIAN_SANCTUM_H #define DEF_OBSIDIAN_SANCTUM_H -enum eTypes +enum DataTypes { TYPE_SARTHARION_EVENT = 1, TYPE_TENEBRON_PREKILLED = 2, @@ -28,12 +28,19 @@ enum eTypes DATA_SARTHARION = 10, DATA_TENEBRON = 11, DATA_SHADRON = 12, - DATA_VESPERON = 13, + DATA_VESPERON = 13 +}; +enum CreaturesIds +{ NPC_SARTHARION = 28860, NPC_TENEBRON = 30452, NPC_SHADRON = 30451, - NPC_VESPERON = 30449, + NPC_VESPERON = 30449 +}; + +enum GameObjectIds +{ GO_TWILIGHT_PORTAL = 193988 }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 38d417ff075..742333d07c4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -30,7 +30,7 @@ EndScriptData */ #include "trial_of_the_champion.h" #include "Player.h" -enum eSpells +enum Spells { //Vehicle SPELL_CHARGE = 63010, @@ -75,7 +75,7 @@ enum eSpells SPELL_POISON_BOTTLE = 67701 }; -enum eSeat +enum Seats { SEAT_ID_0 = 0 }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index bf1d354deb6..e0415b2652b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -37,7 +37,7 @@ enum AIs AI_PET = 3 }; -enum eSpells +enum Spells { // generic SPELL_ANTI_AOE = 68595, diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 179f248d316..c6f6e881b8f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -25,7 +25,7 @@ #include "trial_of_the_crusader.h" #include "Player.h" -enum eYells +enum Yells { // Highlord Tirion Fordring - 34996 SAY_STAGE_0_01 = 0, @@ -83,7 +83,7 @@ enum eYells struct _Messages { - eAnnouncerMessages msgnum; + AnnouncerMessages msgnum; uint32 id; bool state; uint32 encounter; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index f42c985d3e5..0d64655db77 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -140,13 +140,13 @@ const Position EndSpawnLoc[]= {644.6250f, 149.2743f, 140.6015f, 0} // 2 - Portal to Dalaran }; -enum euiWorldStates +enum WorldStateIds { UPDATE_STATE_UI_SHOW = 4390, UPDATE_STATE_UI_COUNT = 4389 }; -enum eNorthrendBeasts +enum NorthrendBeasts { GORMOK_IN_PROGRESS = 1000, GORMOK_DONE = 1001, @@ -159,7 +159,7 @@ enum eNorthrendBeasts ICEHOWL_DONE = 3001 }; -enum eAnnouncerMessages +enum AnnouncerMessages { MSG_BEASTS = 724001, MSG_JARAXXUS = 724002, @@ -169,7 +169,7 @@ enum eAnnouncerMessages MSG_ANUBARAK = 724006 }; -enum eCreature +enum CreatureIds { NPC_BARRENT = 34816, NPC_TIRION = 34996, @@ -234,7 +234,7 @@ enum eCreature NPC_ANUBARAK = 34564 }; -enum eGameObject +enum GameObjectIds { GO_CRUSADERS_CACHE_10 = 195631, GO_CRUSADERS_CACHE_25 = 195632, @@ -260,7 +260,7 @@ enum eGameObject GO_PORTAL_TO_DALARAN = 195682 }; -enum eAchievementData +enum AchievementData { // Northrend Beasts UPPER_BACK_PAIN_10_PLAYER = 11779, diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 923f8a23d6f..690750bf586 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -42,8 +42,11 @@ enum Creatures NPC_RAPTOR_2 = 26628 }; -#define ACTION_RAPTOR_KILLED 1 -#define DATA_KING_DRED 2 +enum Misc +{ + ACTION_RAPTOR_KILLED = 1, + DATA_KING_DRED = 2 +}; class boss_dred : public CreatureScript { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 48bf4c72d43..0a06c8a7d23 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -31,7 +31,7 @@ enum Spells SPELL_CORPSE_EXPLODE = 49555, SPELL_CONSUME = 49380, SPELL_CONSUME_AURA = 49381, - //Heroic spells + // Heroic spells H_SPELL_CORPSE_EXPLODE = 59807, H_SPELL_CONSUME = 59803, H_SPELL_CONSUME_AURA = 59805, @@ -52,7 +52,10 @@ enum Creatures NPC_DRAKKARI_INVADER_2 = 27709 }; -#define DATA_CONSUMPTION_JUNCTION 1 +enum Misc +{ + DATA_CONSUMPTION_JUNCTION = 1 +}; Position AddSpawnPoint = { -260.493011f, -622.968018f, 26.605301f, 3.036870f }; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 599e2b834a9..faaa0da3968 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -70,7 +70,7 @@ enum Events EVENT_FACE_ANGER = 7, }; -enum eEnum +enum Models { DISPLAY_ANGER = 30148, DISPLAY_SORROW = 30149, @@ -111,7 +111,10 @@ struct outroPosition Position const CrucibleSummonPos = {5672.294f, 2520.686f, 713.4386f, 0.9599311f}; -#define DATA_THREE_FACED 1 +enum Misc +{ + DATA_THREE_FACED = 1 +}; class boss_devourer_of_souls : public CreatureScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 1073c29b667..cdbf445cb10 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -59,7 +59,7 @@ enum Yells SAY_SYLVANAS_INTRO_6 = 5, }; -enum eSylvanas +enum Misc { GOSSIP_SPEECHINTRO = 13525, ACTION_INTRO, diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 60209f04c30..4648b967764 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -136,7 +136,7 @@ enum Events EVENT_CLOSE_FROSTWORN_DOOR, }; -enum eEnum +enum Misc { ACTION_START_INTRO, ACTION_SKIP_INTRO, diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 48498b4dbeb..0f56150326e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -22,7 +22,7 @@ #include "pit_of_saron.h" #include "Vehicle.h" -enum eSpells +enum Spells { SPELL_FIREBALL = 69583, //Ymirjar Flamebearer SPELL_HELLFIRE = 69586, @@ -31,7 +31,7 @@ enum eSpells SPELL_LEAPING_FACE_MAUL = 69504, // Geist Ambusher }; -enum eEvents +enum Events { // Ymirjar Flamebearer EVENT_FIREBALL = 1, diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 1d2398dbfb4..3e7b46c06d0 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -58,7 +58,10 @@ enum CombatPhase RHINO }; -#define DATA_SHARE_THE_LOVE 1 +enum Misc +{ + DATA_SHARE_THE_LOVE = 1 +}; class boss_gal_darah : public CreatureScript { diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index bfc1b9cfcb6..8577f0f2851 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -19,7 +19,7 @@ #include "ScriptedCreature.h" #include "gundrak.h" -enum eSpells +enum Spells { SPELL_DETERMINED_STAB = 55104, SPELL_GROUND_TREMOR = 55142, @@ -32,7 +32,7 @@ enum eSpells SPELL_TRANSFORMATION = 55098, //Periodic, The caster transforms into a powerful mammoth, increasing Physical damage done by 25% and granting immunity to Stun effects. }; -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SLAY = 1, @@ -42,7 +42,10 @@ enum eSays EMOTE_TRANSFORM = 5 }; -#define DATA_LESS_RABI 1 +enum Misc +{ + DATA_LESS_RABI = 1 +}; class boss_moorabi : public CreatureScript { diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 71c4c1b4f41..bd355514315 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -21,7 +21,6 @@ #include "gundrak.h" #include "Player.h" -//Spells enum Spells { SPELL_POISON_NOVA = 55081, @@ -32,7 +31,6 @@ enum Spells H_SPELL_VENOM_BOLT = 59839 }; -//Yell enum Yells { SAY_AGGRO = 0, @@ -43,14 +41,12 @@ enum Yells EMOTE_NOVA = 5 }; -//Creatures enum Creatures { CREATURE_SNAKE = 29680, CREATURE_CONSTRICTORS = 29713 }; -//Creatures' spells enum ConstrictorSpells { SPELL_GRIP_OF_SLAD_RAN = 55093, @@ -68,7 +64,10 @@ static Position SpawnLoc[]= {1716.76f, 635.159f, 129.282f, 0.191986f} }; -#define DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES 1 +enum Misc +{ + DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES = 1 +}; class boss_slad_ran : public CreatureScript { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 08a14c3d700..4c07f7a4ce7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -199,7 +199,10 @@ enum Actions ACTION_MARK_OF_THE_FALLEN_CHAMPION = -72293, }; -#define DATA_MADE_A_MESS 45374613 // 4537, 4613 are achievement IDs +enum Misc +{ + DATA_MADE_A_MESS = 45374613 // 4537, 4613 are achievement IDs +}; enum MovePoints { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 998e87ce015..92855d35fbd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -71,7 +71,10 @@ enum Events EVENT_MORTAL_WOUND = 7, }; -#define DATA_INOCULATED_STACK 69291 +enum Misc +{ + DATA_INOCULATED_STACK = 69291 +}; class boss_festergut : public CreatureScript { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 192ba06426d..a90767bbb77 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -348,8 +348,11 @@ enum MiscData MOVIE_FALL_OF_THE_LICH_KING = 16, }; -#define DATA_PLAGUE_STACK 70337 -#define DATA_VILE 45814622 +enum Misc +{ + DATA_PLAGUE_STACK = 70337, + DATA_VILE = 45814622 +}; class NecroticPlagueTargetCheck : public std::unary_function { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 3283d2b32b2..3cb93f7ac14 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -49,7 +49,10 @@ enum Events EVENT_FRENZY = 3 }; -#define DATA_FRENZY_DISPELS 1 +enum Misc +{ + DATA_FRENZY_DISPELS = 1 +}; class boss_faerlina : public CreatureScript { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index bc489eff438..02b6d54f33d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -19,15 +19,21 @@ #include "ScriptedCreature.h" #include "naxxramas.h" -#define SPELL_MORTAL_WOUND 25646 -#define SPELL_ENRAGE RAID_MODE(28371, 54427) -#define SPELL_DECIMATE RAID_MODE(28374, 54426) -#define SPELL_BERSERK 26662 -#define SPELL_INFECTED_WOUND 29306 +enum Spells +{ + SPELL_MORTAL_WOUND = 25646, + SPELL_ENRAGE = 28371, + SPELL_DECIMATE = 28374, + SPELL_BERSERK = 26662, + SPELL_INFECTED_WOUND = 29306 +}; -#define NPC_ZOMBIE 16360 +enum Creatures +{ + NPC_ZOMBIE = 16360 +}; -const Position PosSummon[3] = +Position const PosSummon[3] = { {3267.9f, -3172.1f, 297.42f, 0.94f}, {3253.2f, -3132.3f, 297.42f, 0}, @@ -36,8 +42,7 @@ const Position PosSummon[3] = enum Events { - EVENT_NONE, - EVENT_WOUND, + EVENT_WOUND = 1, EVENT_ENRAGE, EVENT_DECIMATE, EVENT_BERSERK, diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 7515321a3f6..ac3755b1468 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -48,8 +48,11 @@ enum Phases PHASE_DANCE, }; -#define ACTION_SAFETY_DANCE_FAIL 1 -#define DATA_SAFETY_DANCE 19962139 +enum Misc +{ + ACTION_SAFETY_DANCE_FAIL = 1, + DATA_SAFETY_DANCE = 19962139 +}; class boss_heigan : public CreatureScript { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index abd3fb35a51..5f86c1beb40 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -39,10 +39,13 @@ #define SOUND_DEATH 8860 #define SOUND_AGGROMIX 8847 -#define SPELL_UNBALANCING_STRIKE 26613 -#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107, 55543) -#define SPELL_JAGGED_KNIFE 55550 -#define SPELL_HOPELESS 29125 +enum Spells +{ + SPELL_UNBALANCING_STRIKE = 26613, + SPELL_DISRUPTING_SHOUT = 29107, + SPELL_JAGGED_KNIFE = 55550, + SPELL_HOPELESS = 29125 +}; enum Events { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 2f79f138f42..0ad0dbc45db 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -61,7 +61,10 @@ Position const RiftLocation[6] = { 651.72f, -297.44f, -9.37f, 0.0f } }; -#define DATA_CHAOS_THEORY 1 +enum Misc +{ + DATA_CHAOS_THEORY = 1 +}; class boss_anomalus : public CreatureScript { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp index 7f32b2bc4a5..bbe50ee908b 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp @@ -26,11 +26,15 @@ Script Data End */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_BATTLE_SHOUT 31403 -#define SPELL_CHARGE 60067 -#define SPELL_FRIGHTENING_SHOUT 19134 -#define SPELL_WHIRLWIND_1 38619 -#define SPELL_WHIRLWIND_2 38618 +enum Spells +{ + SPELL_BATTLE_SHOUT = 31403, + SPELL_CHARGE = 60067, + SPELL_FRIGHTENING_SHOUT = 19134, + SPELL_WHIRLWIND_1 = 38619, + SPELL_WHIRLWIND_2 = 38618 + +}; //not used //Yell diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 248a039b228..947d17e446f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -50,8 +50,11 @@ enum Yells SAY_SPLIT = 4 }; -#define ACTION_MAGUS_DEAD 1 -#define DATA_SPLIT_PERSONALITY 2 +enum Misc +{ + ACTION_MAGUS_DEAD = 1, + DATA_SPLIT_PERSONALITY = 2 +}; const Position CenterOfRoom = {504.80f, 89.07f, -16.12f, 6.27f}; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index 7f3c96bcb33..58abfb3b63e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -18,7 +18,7 @@ #ifndef DEF_NEXUS_H #define DEF_NEXUS_H -enum eTypes +enum DataTypes { DATA_MAGUS_TELESTRA_EVENT, DATA_ANOMALUS_EVENT, diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 1f1954cb00c..f1df85853ca 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -55,7 +55,7 @@ enum Yells SAY_PLAYER_KILL = 7 }; -enum eCreature +enum Creatures { NPC_PHANTASMAL_CLOUDSCRAPER = 27645, NPC_PHANTASMAL_MAMMOTH = 27642, diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 08072e7f7a3..a6f03866ae1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -27,9 +27,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "halls_of_lightning.h" -enum eEnums +enum Yells { - //Yell SAY_AGGRO = 0, SAY_DEFENSIVE_STANCE = 1, SAY_BATTLE_STANCE = 2, @@ -38,8 +37,11 @@ enum eEnums SAY_DEATH = 5, EMOTE_DEFENSIVE_STANCE = 6, EMOTE_BATTLE_STANCE = 7, - EMOTE_BERSEKER_STANCE = 8, + EMOTE_BERSEKER_STANCE = 8 +}; +enum Spells +{ SPELL_DEFENSIVE_STANCE = 53790, //SPELL_DEFENSIVE_AURA = 41105, SPELL_SPELL_REFLECTION = 36096, @@ -62,15 +64,25 @@ enum eEnums //SPELL_CHARGE_UP = 52098, // only used when starting walk from one platform to the other SPELL_TEMPORARY_ELECTRICAL_CHARGE = 52092, // triggered part of above - NPC_STORMFORGED_LIEUTENANT = 29240, SPELL_ARC_WELD = 59085, SPELL_RENEW_STEEL_N = 52774, - SPELL_RENEW_STEEL_H = 59160, + SPELL_RENEW_STEEL_H = 59160 +}; +enum Creatures +{ + NPC_STORMFORGED_LIEUTENANT = 29240 +}; + +enum Equips +{ EQUIP_SWORD = 37871, EQUIP_SHIELD = 35642, - EQUIP_MACE = 43623, + EQUIP_MACE = 43623 +}; +enum Stanges +{ STANCE_DEFENSIVE = 0, STANCE_BERSERKER = 1, STANCE_BATTLE = 2 diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index fe6c1c27155..a6fe9d35d94 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -28,10 +28,8 @@ EndScriptData */ #include "SpellScript.h" #include "halls_of_lightning.h" -enum eEnums +enum Yells { - ACHIEV_TIMELY_DEATH_START_EVENT = 20384, - SAY_INTRO_1 = 0, SAY_INTRO_2 = 1, SAY_AGGRO = 2, @@ -41,8 +39,11 @@ enum eEnums SAY_50HEALTH = 6, SAY_25HEALTH = 7, SAY_DEATH = 8, - EMOTE_NOVA = 9, + EMOTE_NOVA = 9 +}; +enum Spells +{ SPELL_ARC_LIGHTNING = 52921, SPELL_LIGHTNING_NOVA_N = 52960, SPELL_LIGHTNING_NOVA_H = 59835, @@ -52,6 +53,11 @@ enum eEnums SPELL_PULSING_SHOCKWAVE_AURA = 59414 }; +enum Misc +{ + ACHIEV_TIMELY_DEATH_START_EVENT = 20384 +}; + /*###### ## Boss Loken ######*/ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h index 9968a27da93..c45feab1e8a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -19,7 +19,7 @@ #ifndef DEF_HALLS_OF_LIGHTNING_H #define DEF_HALLS_OF_LIGHTNING_H -enum eTypes +enum Types { MAX_ENCOUNTER = 4, @@ -32,12 +32,18 @@ enum eTypes TYPE_IONAR = 11, TYPE_LOKEN = 12, TYPE_VOLKHAN = 13, +}; +enum CreaturesIds +{ NPC_BJARNGRIM = 28586, NPC_VOLKHAN = 28587, NPC_IONAR = 28546, - NPC_LOKEN = 28923, + NPC_LOKEN = 28923 +}; +enum GameObjectIds +{ GO_BJARNGRIM_DOOR = 191416, //_doors10 GO_VOLKHAN_DOOR = 191325, //_doors07 GO_IONAR_DOOR = 191326, //_doors05 diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 377a9363fad..ad8710fefcc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -59,7 +59,12 @@ enum SjonnirCreatures CREATURE_IRON_SLUDGE = 28165 }; -#define DATA_TIME_BEFORE_OOZE 150000 //2min 30 secs +enum Misc +{ + DATA_TIME_BEFORE_OOZE = 150000, // 2min 30 secs + ACTION_OOZE_DEAD = 1, + DATA_ABUSE_THE_OOZE = 2 +}; struct Locations { @@ -72,9 +77,6 @@ static Locations PipeLocations[] = {1297.7f, 595.6f, 199.9f} //right }; -#define ACTION_OOZE_DEAD 1 -#define DATA_ABUSE_THE_OOZE 2 - static Locations CenterPoint = {1295.21f, 667.157f, 189.691f}; class boss_sjonnir : public CreatureScript diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index ebc72f91938..6c5138da826 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -85,41 +85,46 @@ enum Texts TEXT_ID_PROGRESS = 13101 }; -enum BrannCreatures +enum Creatures { - CREATURE_TRIBUNAL_OF_THE_AGES = 28234, - CREATURE_BRANN_BRONZEBEARD = 28070, - CREATURE_DARK_MATTER_TARGET = 28237, - CREATURE_SEARING_GAZE_TARGET = 28265, - CREATURE_DARK_RUNE_PROTECTOR = 27983, - CREATURE_DARK_RUNE_STORMCALLER = 27984, - CREATURE_IRON_GOLEM_CUSTODIAN = 27985, + NPC_TRIBUNAL_OF_THE_AGES = 28234, + NPC_BRANN_BRONZEBEARD = 28070, + NPC_DARK_MATTER_TARGET = 28237, + NPC_SEARING_GAZE_TARGET = 28265, + NPC_DARK_RUNE_PROTECTOR = 27983, + NPC_DARK_RUNE_STORMCALLER = 27984, + NPC_IRON_GOLEM_CUSTODIAN = 27985, }; enum Spells { SPELL_STEALTH = 58506, - //Kadrak + + // Kadrak SPELL_GLARE_OF_THE_TRIBUNAL = 50988, H_SPELL_GLARE_OF_THE_TRIBUNAL = 59868, - //Marnak + + // Marnak SPELL_DARK_MATTER = 51012, H_SPELL_DARK_MATTER = 59868, - //Abedneum + + // Abedneum SPELL_SEARING_GAZE = 51136, H_SPELL_SEARING_GAZE = 59867, SPELL_REWARD_ACHIEVEMENT = 59046, }; -enum Quests +enum Misc { - QUEST_HALLS_OF_STONE = 13207 + QUEST_HALLS_OF_STONE = 13207, + + DATA_BRANN_SPARKLIN_NEWS = 1 + }; #define GOSSIP_ITEM_START "Brann, it would be our honor!" #define GOSSIP_ITEM_PROGRESS "Let's move Brann, enough of the history lessons!" -#define DATA_BRANN_SPARKLIN_NEWS 1 static Position SpawnLocations[]= { @@ -229,7 +234,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* summon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(NPC_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { summon->SetDisplayId(11686); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -245,7 +250,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* summon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(NPC_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { summon->SetDisplayId(11686); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -348,7 +353,7 @@ public: switch (waypointId) { case 7: - if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) + if (Creature* creature = GetClosestCreatureWithEntry(me, NPC_TRIBUNAL_OF_THE_AGES, 100.0f)) { if (!creature->IsAlive()) creature->Respawn(); @@ -383,16 +388,16 @@ public: { uint32 uiSpawnNumber = DUNGEON_MODE(2, 3); for (uint8 i = 0; i < uiSpawnNumber; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; } case 2: for (uint8 i = 0; i < 2; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; case 3: - me->SummonCreature(CREATURE_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h index d7c0b37b14e..d00649e409b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h @@ -24,6 +24,7 @@ enum Data DATA_SJONNIR_EVENT, DATA_BRANN_EVENT }; + enum Data64 { DATA_KRYSTALLUS, @@ -40,7 +41,8 @@ enum Data64 DATA_SJONNIR_DOOR, DATA_MAIDEN_DOOR }; -enum Creatures + +enum CreaturesIds { CREATURE_MAIDEN = 27975, CREATURE_KRYSTALLUS = 27977, @@ -50,7 +52,8 @@ enum Creatures CREATURE_ABEDNEUM = 30899, CREATURE_BRANN = 28070 }; -enum GameObjects + +enum GameObjectIds { GO_ABEDNEUM = 191669, GO_MARNAK = 192170, @@ -62,4 +65,5 @@ enum GameObjects GO_TRIBUNAL_CHEST = 190586, GO_TRIBUNAL_CHEST_HERO = 193996 }; + #endif diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index b2d6dbca7b1..a8c51534683 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -91,8 +91,12 @@ enum AuriayaActions }; #define SENTRY_NUMBER RAID_MODE(2, 4) -#define DATA_NINE_LIVES 30763077 -#define DATA_CRAZY_CAT_LADY 30063007 + +enum Mis +{ + DATA_NINE_LIVES = 30763077, + DATA_CRAZY_CAT_LADY = 30063007 +}; class boss_auriaya : public CreatureScript { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index a0ce73a9a55..b57925cf2a8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -141,10 +141,14 @@ enum Vehicles VEHICLE_DEMOLISHER = 33109, }; -#define DATA_SHUTOUT 29112912 // 2911, 2912 are achievement IDs -#define DATA_ORBIT_ACHIEVEMENTS 1 -#define VEHICLE_SPAWNS 5 -#define FREYA_SPAWNS 4 +enum Misc +{ + DATA_SHUTOUT = 29112912, // 2911, 2912 are achievement IDs + DATA_ORBIT_ACHIEVEMENTS = 1, + VEHICLE_SPAWNS = 5, + FREYA_SPAWNS = 4 + +}; enum Yells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 5ee55febba3..36cdcbf9889 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -90,8 +90,11 @@ enum VezaxEvents EVENT_RANDOM_MOVE = 8, }; -#define DATA_SMELL_SARONITE 31813188 -#define DATA_SHADOWDODGER 29962997 +enum Misc +{ + DATA_SMELL_SARONITE = 31813188, + DATA_SHADOWDODGER = 29962997 +}; class boss_general_vezax : public CreatureScript { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 19c80fd7d0e..5954206c956 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -142,7 +142,11 @@ enum HodirActions #define ACHIEVEMENT_THIS_CACHE_WAS_RARE RAID_MODE(3182, 3184) #define ACHIEVEMENT_COOLEST_FRIENDS RAID_MODE(2963, 2965) #define FRIENDS_COUNT RAID_MODE(4, 8) -#define DATA_GETTING_COLD_IN_HERE 29672968 // 2967, 2968 are achievement IDs + +enum Misc +{ + DATA_GETTING_COLD_IN_HERE = 29672968 // 2967, 2968 are achievement IDs +}; Position const SummonPositions[8] = { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 8f8f05a4018..3685e18f31c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -137,8 +137,12 @@ enum Events #define GROUND_Z 391.517f #define GOSSIP_ITEM_1 "Activate Harpoons!" -#define DATA_QUICK_SHAVE 29192921 // 2919, 2921 are achievement IDs -#define DATA_IRON_DWARF_MEDIUM_RARE 29232924 + +enum Misc +{ + DATA_QUICK_SHAVE = 29192921, // 2919, 2921 are achievement IDs + DATA_IRON_DWARF_MEDIUM_RARE = 29232924 +}; const Position PosEngRepair[4] = { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 6dcd915e4ee..cb363684dc1 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -28,7 +28,6 @@ EndScriptData */ enum Yells { - //Yells Ingvar YELL_AGGRO_1 = 0, YELL_KILL_1 = 1, YELL_DEAD_1 = 2, @@ -43,6 +42,7 @@ enum Creatures NPC_INGVAR_HUMAN = 23954, NPC_ANNHYLDE_THE_CALLER = 24068, NPC_INGVAR_UNDEAD = 23980, + NPC_THROW_TARGET = 23996, }; enum Events @@ -69,7 +69,7 @@ enum Phases enum Spells { - //Ingvar Spells human form + // Ingvar Spells human form SPELL_CLEAVE = 42724, SPELL_SMASH = 42669, SPELL_STAGGERING_ROAR = 42708, @@ -79,13 +79,18 @@ enum Spells SPELL_SUMMON_BANSHEE = 42912, SPELL_SCOURG_RESURRECTION = 42863, // Spawn resurrect effect around Ingvar - //Ingvar Spells undead form + // Ingvar Spells undead form SPELL_DARK_SMASH = 42723, SPELL_DREADFUL_ROAR = 42729, SPELL_WOE_STRIKE = 42730, - ENTRY_THROW_TARGET = 23996, - SPELL_SHADOW_AXE_SUMMON = 42748 + SPELL_SHADOW_AXE_SUMMON = 42748, + + // Spells for Annhylde + SPELL_SCOURG_RESURRECTION_HEAL = 42704, // Heal Max + DummyAura + SPELL_SCOURG_RESURRECTION_BEAM = 42857, // Channeling Beam of Annhylde + SPELL_SCOURG_RESURRECTION_DUMMY = 42862, // Some Emote Dummy? + SPELL_INGVAR_TRANSFORM = 42796 }; class boss_ingvar_the_plunderer : public CreatureScript @@ -274,17 +279,6 @@ public: }; -enum eSpells -{ -//we don't have that text in db so comment it until we get this text -// YELL_RESSURECT = -1574025, - -//Spells for Annhylde - SPELL_SCOURG_RESURRECTION_HEAL = 42704, //Heal Max + DummyAura - SPELL_SCOURG_RESURRECTION_BEAM = 42857, //Channeling Beam of Annhylde - SPELL_SCOURG_RESURRECTION_DUMMY = 42862, //Some Emote Dummy? - SPELL_INGVAR_TRANSFORM = 42796 -}; class npc_annhylde_the_caller : public CreatureScript { @@ -391,7 +385,7 @@ public: }; }; -enum eShadowAxe +enum ShadowAxe { SPELL_SHADOW_AXE_DAMAGE = 42750, H_SPELL_SHADOW_AXE_DAMAGE = 59719, @@ -416,7 +410,7 @@ public: void Reset() { - if (Creature* target = me->FindNearestCreature(ENTRY_THROW_TARGET, 50.0f)) + if (Creature* target = me->FindNearestCreature(NPC_THROW_TARGET, 50.0f)) { float x, y, z; target->GetPosition(x, y, z); @@ -424,9 +418,7 @@ public: target->DisappearAndDie(); } else - { me->DisappearAndDie(); - } } void MovementInform(uint32 type, uint32 id) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 77935949957..20d69ebf80d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -26,36 +26,43 @@ EndScriptData */ #include "ScriptedCreature.h" #include "utgarde_keep.h" -enum eEnums +enum Yells { - //signed for 24200, but used by 24200, 27390 + // signed for 24200, but used by 24200, 27390 YELL_SKARVALD_AGGRO = 0, YELL_SKARVALD_DAL_DIED = 1, YELL_SKARVALD_SKA_DIEDFIRST = 2, YELL_SKARVALD_KILL = 3, YELL_SKARVALD_DAL_DIEDFIRST = 4, - //signed for 24201, but used by 24201, 27389 + // signed for 24201, but used by 24201, 27389 YELL_DALRONN_AGGRO = 0, YELL_DALRONN_SKA_DIED = 1, YELL_DALRONN_DAL_DIEDFIRST = 2, YELL_DALRONN_KILL = 3, - YELL_DALRONN_SKA_DIEDFIRST = 4, + YELL_DALRONN_SKA_DIEDFIRST = 4 +}; -//Spells of Skarvald and his Ghost - NPC_SKARVALD_THE_CONSTRUCTOR = 24200, +enum Spells +{ + // Spells of Skarvald and his Ghost SPELL_CHARGE = 43651, SPELL_STONE_STRIKE = 48583, SPELL_SUMMON_SKARVALD_GHOST = 48613, SPELL_ENRAGE = 48193, - NPC_SKARVALD_GHOST = 27390, -//Spells of Dalronn and his Ghost - NPC_DALRONN_THE_CONTROLLER = 24201, + // Spells of Dalronn and his Ghost SPELL_SHADOW_BOLT = 43649, H_SPELL_SHADOW_BOLT = 59575, H_SPELL_SUMMON_SKELETONS = 52611, SPELL_DEBILITATE = 43650, SPELL_SUMMON_DALRONN_GHOST = 48612, +}; + +enum Creatures +{ + NPC_SKARVALD_THE_CONSTRUCTOR = 24200, + NPC_SKARVALD_GHOST = 27390, + NPC_DALRONN_THE_CONTROLLER = 24201, NPC_DALRONN_GHOST = 27389 }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 73ff0075aba..b0d9d702db5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -18,17 +18,20 @@ #ifndef DEF_UTGARDE_KEEP_H #define DEF_UTGARDE_KEEP_H -#define DATA_PRINCEKELESETH 1 -#define DATA_SKARVALD 3 -#define DATA_DALRONN 4 -#define DATA_INGVAR 6 +enum DataTypes +{ + DATA_PRINCEKELESETH = 1, + DATA_SKARVALD = 3, + DATA_DALRONN = 4, + DATA_INGVAR = 6, -#define DATA_PRINCEKELESETH_EVENT 2 -#define DATA_SKARVALD_DALRONN_EVENT 5 -#define DATA_INGVAR_EVENT 7 + DATA_PRINCEKELESETH_EVENT = 2, + DATA_SKARVALD_DALRONN_EVENT = 5, + DATA_INGVAR_EVENT = 7, -#define EVENT_FORGE_1 8 -#define EVENT_FORGE_2 9 -#define EVENT_FORGE_3 10 + EVENT_FORGE_1 = 8, + EVENT_FORGE_2 = 9, + EVENT_FORGE_3 = 10 +}; #endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 3a74eebd947..bc385a67971 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -31,8 +31,7 @@ Script Data End */ #include "Player.h" #include "SpellInfo.h" -//Yell -enum eYells +enum Yells { SAY_AGGRO = 0, SAY_KILL = 1, @@ -124,15 +123,15 @@ static Position Location[]= {413.9327f, -540.9407f, 138.2614f, 0}, //71 }; -enum eCombatPhase +enum CombatPhase { FLYING, SKADI }; -enum eSpells +enum Spells { - //Skadi Spells + // Skadi Spells SPELL_CRUSH = 50234, SPELL_POISONED_SPEAR = 50225, //isn't being casted =/ SPELL_WHIRLWIND = 50228, //random target, but not the tank approx. every 20s @@ -141,17 +140,17 @@ enum eSpells SPELL_FREEZING_CLOUD = 47579, }; -enum eCreature +enum Creatures { - CREATURE_YMIRJAR_WARRIOR = 26690, - CREATURE_YMIRJAR_WITCH_DOCTOR = 26691, - CREATURE_YMIRJAR_HARPOONER = 26692, - CREATURE_GRAUF = 26893, - CREATURE_TRIGGER = 28351, + NPC_YMIRJAR_WARRIOR = 26690, + NPC_YMIRJAR_WITCH_DOCTOR = 26691, + NPC_YMIRJAR_HARPOONER = 26692, + NPC_GRAUF = 26893, + NPC_TRIGGER = 28351, DATA_MOUNT = 27043, }; -enum eAchievments +enum Achievments { ACHIEV_TIMED_START_EVENT = 17726, }; @@ -189,7 +188,7 @@ public: uint8 m_uiSpellHitCount; bool m_bSaidEmote; - eCombatPhase Phase; + CombatPhase Phase; void Reset() { @@ -208,7 +207,7 @@ public: Summons.DespawnAll(); me->SetSpeed(MOVE_FLIGHT, 3.0f); if ((Unit::GetCreature(*me, m_uiGraufGUID) == NULL) && !me->IsMounted()) - me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); + me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); if (instance) { instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); @@ -222,7 +221,7 @@ public: me->Dismount(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); if (!Unit::GetCreature(*me, m_uiGraufGUID)) - me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); + me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); } void EnterCombat(Unit* /*who*/) @@ -243,7 +242,7 @@ public: me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f); me->SetWalk(false); m_uiMountTimer = 1000; - Summons.DespawnEntry(CREATURE_GRAUF); + Summons.DespawnEntry(NPC_GRAUF); } } @@ -251,18 +250,18 @@ public: { switch (summoned->GetEntry()) { - case CREATURE_GRAUF: + case NPC_GRAUF: m_uiGraufGUID = summoned->GetGUID(); break; - case CREATURE_YMIRJAR_WARRIOR: - case CREATURE_YMIRJAR_WITCH_DOCTOR: - case CREATURE_YMIRJAR_HARPOONER: + case NPC_YMIRJAR_WARRIOR: + case NPC_YMIRJAR_WITCH_DOCTOR: + case NPC_YMIRJAR_HARPOONER: summoned->setActive(true); summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); break; - case CREATURE_TRIGGER: + case NPC_TRIGGER: summoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); summoned->DespawnOrUnsummon(10*IN_MILLISECONDS); break; @@ -272,7 +271,7 @@ public: void SummonedCreatureDespawn(Creature* summoned) { - if (summoned->GetEntry() == CREATURE_GRAUF) + if (summoned->GetEntry() == NPC_GRAUF) m_uiGraufGUID = 0; Summons.Despawn(summoned); } @@ -287,7 +286,7 @@ public: Phase = SKADI; me->SetCanFly(false); me->Dismount(); - if (Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) + if (Creature* pGrauf = me->SummonCreature(NPC_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) { pGrauf->GetMotionMaster()->MoveFall(); pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); @@ -428,15 +427,15 @@ public: switch (urand(0, 2)) { case 0: - me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: - me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 2: - me->SummonCreature(CREATURE_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; } } @@ -459,7 +458,7 @@ public: break; } for (uint32 i = iStart; i < iEnd; ++i) - me->SummonCreature(CREATURE_TRIGGER, Location[i]); + me->SummonCreature(NPC_TRIGGER, Location[i]); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index bd08a27d49d..1d45a032d90 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -73,19 +73,18 @@ enum Yells enum Creatures { - CREATURE_ARTHAS = 29280, // Image of Arthas - CREATURE_SVALA_SORROWGRAVE = 26668, // Svala after transformation - CREATURE_SVALA = 29281, // Svala before transformation - CREATURE_RITUAL_CHANNELER = 27281, - CREATURE_SPECTATOR = 26667, - CREATURE_RITUAL_TARGET = 27327, - CREATURE_FLAME_BRAZIER = 27273, - CREATURE_SCOURGE_HULK = 26555 + NPC_ARTHAS = 29280, // Image of Arthas + NPC_SVALA_SORROWGRAVE = 26668, // Svala after transformation + NPC_RITUAL_CHANNELER = 27281, + NPC_SPECTATOR = 26667, + NPC_RITUAL_TARGET = 27327, + NPC_FLAME_BRAZIER = 27273, + NPC_SCOURGE_HULK = 26555 }; -enum Objects +enum GameObjects { - OBJECT_UTGARDE_MIRROR = 191745 + GO_UTGARDE_MIRROR = 191745 }; enum SvalaPhase @@ -97,7 +96,10 @@ enum SvalaPhase SVALADEAD }; -#define DATA_INCREDIBLE_HULK 2043 +enum Misc +{ + DATA_INCREDIBLE_HULK = 2043 +}; static const float spectatorWP[2][3] = { @@ -185,7 +187,7 @@ public: void JustSummoned(Creature* summon) { - if (summon->GetEntry() == CREATURE_RITUAL_CHANNELER) + if (summon->GetEntry() == NPC_RITUAL_CHANNELER) summon->CastSpell(summon, SPELL_SUMMONED_VIS, true); summons.Summon(summon); @@ -206,10 +208,10 @@ public: Phase = INTRO; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (GameObject* mirror = GetClosestGameObjectWithEntry(me, OBJECT_UTGARDE_MIRROR, 100.0f)) + if (GameObject* mirror = GetClosestGameObjectWithEntry(me, GO_UTGARDE_MIRROR, 100.0f)) mirror->SetGoState(GO_STATE_READY); - if (Creature* arthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* arthas = me->SummonCreature(NPC_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) { arthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); arthasGUID = arthas->GetGUID(); @@ -284,7 +286,7 @@ public: if (instance) { std::list lspectatorList; - GetCreatureListWithEntryInGrid(lspectatorList, me, CREATURE_SPECTATOR, 100.0f); + GetCreatureListWithEntryInGrid(lspectatorList, me, NPC_SPECTATOR, 100.0f); for (std::list::iterator itr = lspectatorList.begin(); itr != lspectatorList.end(); ++itr) { if ((*itr)->IsAlive()) @@ -307,7 +309,7 @@ public: me->CastSpell(me, SPELL_SVALA_TRANSFORMING2, false); arthas->InterruptNonMeleeSpells(true); me->RemoveAllAuras(); - me->UpdateEntry(CREATURE_SVALA_SORROWGRAVE); + me->UpdateEntry(NPC_SVALA_SORROWGRAVE); me->SetFacingToObject(arthas); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ++introPhase; @@ -342,7 +344,7 @@ public: introTimer = 3000; break; case 9: - if (GameObject* mirror = GetClosestGameObjectWithEntry(me, OBJECT_UTGARDE_MIRROR, 100.0f)) + if (GameObject* mirror = GetClosestGameObjectWithEntry(me, GO_UTGARDE_MIRROR, 100.0f)) mirror->SetGoState(GO_STATE_ACTIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); arthas->DespawnOrUnsummon(); @@ -596,7 +598,7 @@ class npc_scourge_hulk : public CreatureScript void DamageTaken(Unit* attacker, uint32 &damage) { - if (damage >= me->GetHealth() && attacker->GetEntry() == CREATURE_SVALA_SORROWGRAVE) + if (damage >= me->GetHealth() && attacker->GetEntry() == NPC_SVALA_SORROWGRAVE) killedByRitualStrike = true; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 6097e1ab84b..e1dcbb30c91 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -66,16 +66,16 @@ enum Yells enum Creatures { - CREATURE_BJORN = 27303, - CREATURE_BJORN_VISUAL = 27304, - CREATURE_HALDOR = 27307, - CREATURE_HALDOR_VISUAL = 27310, - CREATURE_RANULF = 27308, - CREATURE_RANULF_VISUAL = 27311, - CREATURE_TORGYN = 27309, - CREATURE_TORGYN_VISUAL = 27312, - CREATURE_SPIRIT_FOUNT = 27339, - CREATURE_AVENGING_SPIRIT = 27386 + NPC_BJORN = 27303, + NPC_BJORN_VISUAL = 27304, + NPC_HALDOR = 27307, + NPC_HALDOR_VISUAL = 27310, + NPC_RANULF = 27308, + NPC_RANULF_VISUAL = 27311, + NPC_TORGYN = 27309, + NPC_TORGYN_VISUAL = 27312, + NPC_SPIRIT_FOUNT = 27339, + NPC_AVENGING_SPIRIT = 27386 }; struct ActiveBoatStruct @@ -87,13 +87,16 @@ struct ActiveBoatStruct static ActiveBoatStruct ActiveBoat[4] = { - {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, - {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, - {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, - {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} + {NPC_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, + {NPC_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, + {NPC_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, + {NPC_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} }; -#define DATA_KINGS_BANE 2157 +enum Misc +{ + DATA_KINGS_BANE = 2157 +}; class boss_ymiron : public CreatureScript { @@ -286,7 +289,7 @@ public: if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) { //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control - if (Creature* temp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) + if (Creature* temp = me->SummonCreature(NPC_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) { temp->SetSpeed(MOVE_RUN, 0.4f); temp->CastSpell(temp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); @@ -318,7 +321,7 @@ public: for (uint8 i = 0; i < 4; ++i) { //DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control - if (Creature* temp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) + if (Creature* temp = me->SummonCreature(NPC_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 4331b4378be..6166b7c4891 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -25,6 +25,7 @@ enum Data DATA_SKADI_THE_RUTHLESS_EVENT, DATA_KING_YMIRON_EVENT }; + enum Data64 { DATA_SVALA, @@ -42,7 +43,7 @@ enum Data64 DATA_SACRIFICED_PLAYER }; -enum eCreatures +enum CreatureID { BOSS_SVALA_SORROWGRAVE = 26668, BOSS_GORTOK_PALEHOOF = 26687, diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 417b0bdd7fc..57ea9b980cb 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -19,25 +19,32 @@ #include "ScriptedCreature.h" #include "vault_of_archavon.h" -enum +enum Emotes { EMOTE_BERSERK = 0, EMOTE_LEAP = 1 // Not in use }; -//Spells Archavon -#define SPELL_ROCK_SHARDS 58678 -#define SPELL_CRUSHING_LEAP RAID_MODE(58960, 60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. -#define SPELL_STOMP RAID_MODE(58663, 60880) -#define SPELL_IMPALE RAID_MODE(58666, 60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. -#define SPELL_BERSERK 47008 -//Spells Archavon Warders -#define SPELL_ROCK_SHOWER RAID_MODE(60919, 60923) -#define SPELL_SHIELD_CRUSH RAID_MODE(60897, 60899) -#define SPELL_WHIRL RAID_MODE(60902, 60916) - -//4 Warders spawned -#define ARCHAVON_WARDER 32353 //npc 32353 +enum Spells +{ + + // Spells Archavon + SPELL_ROCK_SHARDS = 58678, + SPELL_CRUSHING_LEAP = 58960, + SPELL_STOMP = 58663, + SPELL_IMPALE = 58666, + SPELL_BERSERK = 47008, + + // Archavon Warders + SPELL_ROCK_SHOWER = 60919, + SPELL_SHIELD_CRUSH = 60897, + SPELL_WHIRL = 60902 +}; + +enum Creatures +{ + NPC_ARCHAVON_WARDER = 32353 +}; enum Events { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index ad8d4d6edf2..37eb335153c 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -20,7 +20,6 @@ #include "SpellAuras.h" #include "vault_of_archavon.h" -//Emalon spells enum Spells { SPELL_OVERCHARGE = 64218, // Cast every 45 sec on a random Tempest Minion @@ -29,32 +28,35 @@ enum Spells SPELL_SHOCK = 64363, SPELL_OVERCHARGED = 64217, SPELL_OVERCHARGED_BLAST = 64219, // Cast when Overcharged reaches 10 stacks. Mob dies after that + SPELL_CHAIN_LIGHTNING = 64213, + SPELL_LIGHTNING_NOVA = 64216 }; -// cannot let SpellDifficulty handle it, no entries for these -#define SPELL_CHAIN_LIGHTNING RAID_MODE(64213, 64215) -#define SPELL_LIGHTNING_NOVA RAID_MODE(64216, 65279) - -enum BossEmotes +enum Emotes { - EMOTE_OVERCHARGE = 0, - EMOTE_MINION_RESPAWN = 1, - EMOTE_BERSERK = 2 + EMOTE_OVERCHARGE = 0, + EMOTE_MINION_RESPAWN = 1, + EMOTE_BERSERK = 2 }; enum Events { - EVENT_CHAIN_LIGHTNING = 1, - EVENT_LIGHTNING_NOVA = 2, - EVENT_OVERCHARGE = 3, - EVENT_BERSERK = 4, - EVENT_SHOCK = 5, + EVENT_CHAIN_LIGHTNING = 1, + EVENT_LIGHTNING_NOVA = 2, + EVENT_OVERCHARGE = 3, + EVENT_BERSERK = 4, + EVENT_SHOCK = 5, }; -//Creatures -#define NPC_TEMPEST_MINION 33998 +enum Npcs +{ + NPC_TEMPEST_MINION = 33998 +}; -#define MAX_TEMPEST_MINIONS 4 +enum Misc +{ + MAX_TEMPEST_MINIONS = 4 +}; struct Position TempestMinions[MAX_TEMPEST_MINIONS] = { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 4309f188b10..feed6b05ee7 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -39,7 +39,6 @@ enum Spells SPELL_FROZEN_ORB_SUMMON = 72093, // summon orb }; -// Events boss enum Events { EVENT_FREEZING_GROUND = 1, @@ -49,8 +48,11 @@ enum Events EVENT_FROST_BLAST = 4, }; -// Mob Frozen Orb -#define NPC_FROZEN_ORB 38456 // 1 in 10 mode and 3 in 25 mode +enum Creatures +{ + NPC_FROZEN_ORB = 38456 // 1 in 10 mode and 3 in 25 mode + +}; class boss_toravon : public CreatureScript { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 3534330e6f4..f89cf9a4466 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -35,26 +35,23 @@ class instance_archavon : public InstanceMapScript { instance_archavon_InstanceMapScript(Map* map) : InstanceScript(map) { - SetBossNumber(MAX_ENCOUNTER); - } + SetBossNumber(EncounterCount); - void Initialize() - { - EmalonGUID = 0; - ToravonGUID = 0; - ArchavonDeath = 0; - EmalonDeath = 0; - KoralonDeath = 0; + EmalonGUID = 0; + ToravonGUID = 0; + ArchavonDeath = 0; + EmalonDeath = 0; + KoralonDeath = 0; } void OnCreatureCreate(Creature* creature) { switch (creature->GetEntry()) { - case CREATURE_EMALON: + case NPC_EMALON: EmalonGUID = creature->GetGUID(); break; - case CREATURE_TORAVON: + case NPC_TORAVON: ToravonGUID = creature->GetGUID(); break; default: diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index 03776525174..7b5258fc3fc 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -18,23 +18,23 @@ #ifndef DEF_ARCHAVON_H #define DEF_ARCHAVON_H -enum Creatures -{ - CREATURE_ARCHAVON = 31125, - CREATURE_EMALON = 33993, - CREATURE_KORALON = 35013, - CREATURE_TORAVON = 38433, -}; +uint32 const EncounterCount = 4; enum Data { - DATA_ARCHAVON = 0, - DATA_EMALON = 1, - DATA_KORALON = 2, - DATA_TORAVON = 3, + DATA_ARCHAVON = 0, + DATA_EMALON = 1, + DATA_KORALON = 2, + DATA_TORAVON = 3, }; -#define MAX_ENCOUNTER 4 +enum CreatureIds +{ + NPC_ARCHAVON = 31125, + NPC_EMALON = 33993, + NPC_KORALON = 35013, + NPC_TORAVON = 38433 +}; enum AchievementCriteriaIds { diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 8fc5dfcadc8..daf022c6da4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -66,7 +66,10 @@ static Position SpawnLoc[MAX_SPAWN_LOC]= {1935.50f, 796.224f, 52.492f, 4.224f}, }; -#define DATA_DEHYDRATION 1 +enum Misc +{ + DATA_DEHYDRATION = 1 +}; class boss_ichoron : public CreatureScript { diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 7b8641b1b32..59f9a1d0e35 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -31,9 +31,9 @@ enum Spells H_SPELL_ZURAMAT_ADD_2 = 59747 }; -enum ZuramatCreatures +enum Creatures { - CREATURE_VOID_SENTRY = 29364 + NPC_VOID_SENTRY = 29364 }; enum Yells @@ -46,7 +46,10 @@ enum Yells SAY_WHISPER = 5 }; -#define DATA_VOID_DANCE 2153 +enum Misc +{ + DATA_VOID_DANCE = 2153 +}; class boss_zuramat : public CreatureScript { @@ -152,7 +155,7 @@ public: void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) { - if (summoned->GetEntry() == CREATURE_VOID_SENTRY) + if (summoned->GetEntry() == NPC_VOID_SENTRY) voidDance = false; } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index de0aee10bfe..0bd6a6ee670 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -123,7 +123,7 @@ enum Spells SPELL_CRYSTALL_ACTIVATION = 57804 }; -enum eSinclari +enum Sinclari { SAY_SINCLARI_1 = 0 }; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index e6a7553e81b..014d3edff77 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -18,24 +18,6 @@ #ifndef DEF_VIOLET_HOLD_H #define DEF_VIOLET_HOLD_H -enum Creatures -{ - CREATURE_TELEPORTATION_PORTAL = 31011, - CREATURE_PORTAL_GUARDIAN = 30660, - CREATURE_PORTAL_KEEPER = 30695, - CREATURE_XEVOZZ = 29266, - CREATURE_LAVANTHOR = 29312, - CREATURE_ICHORON = 29313, - CREATURE_ZURAMAT = 29314, - CREATURE_EREKEM = 29315, - CREATURE_EREKEM_GUARD = 29395, - CREATURE_MORAGG = 29316, - CREATURE_CYANIGOSA = 31134, - CREATURE_SINCLARI = 30658, - CREATURE_SABOTEOUR = 31079, - NPC_VIOLET_HOLD_GUARD = 30659 -}; - enum Data { DATA_1ST_BOSS_EVENT, @@ -95,7 +77,25 @@ enum Bosses BOSS_CYANIGOSA }; -enum VHWorldStates +enum CreaturesIds +{ + CREATURE_TELEPORTATION_PORTAL = 31011, + CREATURE_PORTAL_GUARDIAN = 30660, + CREATURE_PORTAL_KEEPER = 30695, + CREATURE_XEVOZZ = 29266, + CREATURE_LAVANTHOR = 29312, + CREATURE_ICHORON = 29313, + CREATURE_ZURAMAT = 29314, + CREATURE_EREKEM = 29315, + CREATURE_EREKEM_GUARD = 29395, + CREATURE_MORAGG = 29316, + CREATURE_CYANIGOSA = 31134, + CREATURE_SINCLARI = 30658, + CREATURE_SABOTEOUR = 31079, + NPC_VIOLET_HOLD_GUARD = 30659 +}; + +enum WorldStateIds { WORLD_STATE_VH = 3816, WORLD_STATE_VH_PRISON_STATE = 3815, diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index acd241c8eaf..4430d8f5a8c 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -49,7 +49,7 @@ EndContentData */ ## npc_sinkhole_kill_credit ######*/ -enum eSinkhole +enum Sinkhole { SPELL_SET_CART = 46797, SPELL_EXPLODE_CART = 46799, @@ -207,7 +207,7 @@ public: ## npc_keristrasza ######*/ -enum eKeristrasza +enum Keristrasza { SPELL_TELEPORT_TO_SARAGOSA = 46772 }; @@ -251,7 +251,7 @@ public: #define GOSSIP_ITEM_C_1 "I... I think so..." -enum eCorastrasza +enum Corastrasza { SPELL_SUMMON_WYRMREST_SKYTALON = 61240, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC = 61244, @@ -299,7 +299,7 @@ public: #define GOSSIP_ITEM_I "" -enum eIruk +enum Iruk { QUEST_SPIRITS_WATCH_OVER_US = 11961, SPELL_CREATURE_TOTEM_OF_ISSLIRUK = 46816, @@ -389,7 +389,7 @@ public: ## npc_jenny ######*/ -enum eJenny +enum Jenny { QUEST_LOADER_UP = 11881, @@ -501,7 +501,7 @@ public: ## npc_nesingwary_trapper ######*/ -enum eNesingwaryTrapper +enum NesingwaryTrapper { GO_HIGH_QUALITY_FUR = 187983, @@ -645,7 +645,7 @@ public: ## npc_lurgglbr ######*/ -enum eLurgglbr +enum Lurgglbr { QUEST_ESCAPE_WINTERFIN_CAVERNS = 11570, @@ -792,7 +792,7 @@ public: ## npc_nexus_drake_hatchling ######*/ -enum eNexusDrakeHatchling +enum NexusDrakeHatchling { SPELL_DRAKE_HARPOON = 46607, SPELL_RED_DRAGONBLOOD = 46620, @@ -904,7 +904,7 @@ public: ## npc_thassarian ######*/ -enum eThassarian +enum Thassarian { QUEST_LAST_RITES = 12019, @@ -1317,7 +1317,7 @@ public: ## npc_counselor_talbot ######*/ -enum eCounselorTalbot +enum CounselorTalbot { SPELL_DEFLECTION = 51009, SPELL_SOUL_BLAST = 50992, @@ -1564,7 +1564,7 @@ public: ## npc_beryl_sorcerer ######*/ -enum eBerylSorcerer +enum BerylSorcerer { NPC_CAPTURED_BERLY_SORCERER = 25474, NPC_LIBRARIAN_DONATHAN = 25262, @@ -1643,7 +1643,7 @@ public: /*###### ## npc_imprisoned_beryl_sorcerer ######*/ -enum eImprisionedBerylSorcerer +enum ImprisionedBerylSorcerer { SPELL_NEURAL_NEEDLE = 45634, @@ -1927,7 +1927,7 @@ public: ## Help Those That Cannot Help Themselves, Quest 11876 ######*/ -enum eHelpThemselves +enum HelpThemselves { QUEST_CANNOT_HELP_THEMSELVES = 11876, GO_MAMMOTH_TRAP_1 = 188022, @@ -2044,7 +2044,7 @@ public: ## Quest 11653: Hah... You're Not So Big Now! ######*/ -enum eNotSoBig +enum NotSoBig { QUEST_YOU_RE_NOT_SO_BIG_NOW = 11653, SPELL_AURA_NOTSOBIG_1 = 45672, @@ -2089,8 +2089,15 @@ public: ## Quest 11608: Bury Those Cockroaches! ######*/ -#define QUEST_BURY_THOSE_COCKROACHES 11608 -#define SPELL_SEAFORIUM_DEPTH_CHARGE_EXPLOSION 45502 +enum BuryThoseCockroaches +{ + // Quest + QUEST_BURY_THOSE_COCKROACHES = 11608, + + // Spells + SPELL_SEAFORIUM_DEPTH_CHARGE_EXPLOSION = 45502 + +}; class npc_seaforium_depth_charge : public CreatureScript { @@ -2141,7 +2148,7 @@ public: ## Help Those That Cannot Help Themselves, Quest 11876 ######*/ -enum eValiancekeepcannons +enum Valiancekeepcannons { GO_VALIANCE_KEEP_CANNON_1 = 187560, GO_VALIANCE_KEEP_CANNON_2 = 188692 @@ -2297,7 +2304,7 @@ public: ## npc_hidden_cultist ######*/ -enum eHiddenCultist +enum HiddenCultist { SPELL_SHROUD_OF_THE_DEATH_CULTIST = 46077, //not working SPELL_RIGHTEOUS_VISION = 46078, //player aura diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index d5181d68680..4670f1b6054 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -130,7 +130,7 @@ public: ## npc_hira_snowdawn ######*/ -enum eHiraSnowdawn +enum HiraSnowdawn { SPELL_COLD_WEATHER_FLYING = 54197 }; diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 44bb405cf59..a17abeba726 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -37,10 +37,13 @@ EndContentData */ #include "CombatAI.h" #include "Player.h" -enum eEnums +enum AlexstraszaWrGate { + // Quest QUEST_RETURN_TO_AG_A = 12499, QUEST_RETURN_TO_AG_H = 12500, + + // Movie MOVIE_ID_GATES = 14 }; diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 4cb52f6360f..c43074ff838 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -160,7 +160,7 @@ public: ## npc_plaguehound_tracker ######*/ -enum ePlaguehound +enum Plaguehound { QUEST_SNIFF_OUT_ENEMY = 11253 }; @@ -212,7 +212,7 @@ public: #define GOSSIP_RAZAEL_REPORT "High Executor Anselm wants a report on the situation." #define GOSSIP_LYANA_REPORT "High Executor Anselm requests your report." -enum eRazael +enum Razael { QUEST_REPORTS_FROM_THE_FIELD = 11221, NPC_RAZAEL = 23998, @@ -279,7 +279,7 @@ public: ## npc_daegarn ######*/ -enum eDaegarnn +enum Daegarnn { QUEST_DEFEAT_AT_RING = 11300, diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index f5f832bcb86..287dedc7970 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -47,7 +47,7 @@ EndContentData */ #define GOSSIP_ARETE_ITEM6 "Let's finish this!" #define GOSSIP_ARETE_ITEM7 "That's quite a tale, Lord-Commander." -enum eArete +enum Arete { GOSSIP_TEXTID_ARETE1 = 13525, GOSSIP_TEXTID_ARETE2 = 13526, @@ -124,7 +124,7 @@ public: ## npc_squire_david ######*/ -enum eSquireDavid +enum SquireDavid { QUEST_THE_ASPIRANT_S_CHALLENGE_H = 13680, QUEST_THE_ASPIRANT_S_CHALLENGE_A = 13679, @@ -171,7 +171,7 @@ public: ## npc_argent_valiant ######*/ -enum eArgentValiant +enum ArgentValiant { SPELL_CHARGE = 63010, SPELL_SHIELD_BREAKER = 65147, @@ -252,7 +252,7 @@ public: ## npc_guardian_pavilion ######*/ -enum eGuardianPavilion +enum GuardianPavilion { SPELL_TRESPASSER_H = 63987, AREA_SUNREAVER_PAVILION = 4676, @@ -302,7 +302,7 @@ public: ## npc_vereth_the_cunning ######*/ -enum eVerethTheCunning +enum VerethTheCunning { NPC_GEIST_RETURN_BUNNY_KC = 31049, NPC_LITHE_STALKER = 30894, diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 2c0a98ab0ad..5c3cd880e55 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -45,7 +45,7 @@ EndContentData */ #define GOSSIP_ITEM1 "I am ready to travel to your village now." -enum eRainspeaker +enum Rainspeaker { SAY_START_IRO = 0, SAY_QUEST_ACCEPT_IRO = 1, @@ -181,7 +181,7 @@ public: #define GOSSIP_VEKJIK_ITEM1 "Shaman Vekjik, I have spoken with the big-tongues and they desire peace. I have brought this offering on their behalf." #define GOSSIP_VEKJIK_ITEM2 "No no... I had no intentions of betraying your people. I was only defending myself. it was all a misunderstanding." -enum eVekjik +enum Vekjik { GOSSIP_TEXTID_VEKJIK1 = 13137, GOSSIP_TEXTID_VEKJIK2 = 13138, @@ -243,7 +243,7 @@ public: #define GOSSIP_ITEM_AOF2 "You can trust me. I am no friend of the Lich King." #define GOSSIP_ITEM_AOF3 "I will not fail." -enum eFreya +enum Freya { QUEST_FREYA_PACT = 12621, @@ -339,11 +339,13 @@ public: ## npc_engineer_helice ######*/ -enum eEnums +enum EngineerHelice { + // Spells SPELL_EXPLODE_CRYSTAL = 62487, SPELL_FLAMES = 64561, + // Yells SAY_WP_1 = 0, SAY_WP_2 = 1, SAY_WP_3 = 2, @@ -352,6 +354,7 @@ enum eEnums SAY_WP_6 = 5, SAY_WP_7 = 6, + // Quests QUEST_DISASTER = 12688 }; @@ -701,7 +704,7 @@ public: #define GOSSIP_OPTION_BANANAS "Have a spare bunch of bananas?" #define GOSSIP_OPTION_PAPAYA "I could really use a papaya." -enum eAdventurousDwarf +enum AdventurousDwarf { QUEST_12634 = 12634, diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index bf8a454f9e5..ef95ba2e5b1 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -113,8 +113,11 @@ public: ## npc_roxi_ramrocket ######*/ -#define SPELL_MECHANO_HOG 60866 -#define SPELL_MEKGINEERS_CHOPPER 60867 +enum RoxiRamrocket +{ + SPELL_MECHANO_HOG = 60866, + SPELL_MEKGINEERS_CHOPPER = 60867 +}; class npc_roxi_ramrocket : public CreatureScript { diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index ea7f4c668ab..8e6741ab9af 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -32,15 +32,22 @@ EndContentData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_MOONFIRE 37328 -#define SPELL_FIREBALL 37329 -#define SPELL_MIND_FLAY 37330 -#define SPELL_HEMORRHAGE 37331 -#define SPELL_FROSTSHOCK 37332 -#define SPELL_CURSE_OF_AGONY 37334 -#define SPELL_MORTAL_STRIKE 37335 -#define SPELL_FREEZING_TRAP 37368 -#define SPELL_HAMMER_OF_JUSTICE 37369 +enum Spells +{ + SPELL_MOONFIRE = 37328, + SPELL_FIREBALL = 37329, + SPELL_MIND_FLAY = 37330, + SPELL_HEMORRHAGE = 37331, + SPELL_FROSTSHOCK = 37332, + SPELL_CURSE_OF_AGONY = 37334, + SPELL_MORTAL_STRIKE = 37335, + SPELL_FREEZING_TRAP = 37368, + SPELL_HAMMER_OF_JUSTICE = 37369, + + // Avatar of Martyred + SPELL_AV_MORTAL_STRIKE = 16856, + SPELL_AV_SUNDER_ARMOR = 16145 +}; class npc_stolen_soul : public CreatureScript { @@ -294,9 +301,6 @@ public: }; -#define SPELL_AV_MORTAL_STRIKE 16856 -#define SPELL_AV_SUNDER_ARMOR 16145 - class npc_avatar_of_martyred : public CreatureScript { public: diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index a599bdf74cb..daa8d68a292 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -27,22 +27,25 @@ EndScriptData */ #include "ScriptedCreature.h" #include "Player.h" -#define SPELL_INHIBITMAGIC 32264 -#define SPELL_ATTRACTMAGIC 32265 -#define N_SPELL_CARNIVOROUSBITE 36383 -#define H_SPELL_CARNIVOROUSBITE 39382 -#define SPELL_CARNIVOROUSBITE DUNGEON_MODE(N_SPELL_CARNIVOROUSBITE, H_SPELL_CARNIVOROUSBITE) +enum Spells +{ + SPELL_INHIBITMAGIC = 32264, + SPELL_ATTRACTMAGIC = 32265, + SPELL_CARNIVOROUSBITE = 36383, -#define ENTRY_FOCUS_FIRE 18374 + SPELL_FIERY_BLAST = 32302, -#define N_SPELL_FIERY_BLAST 32302 -#define H_SPELL_FIERY_BLAST 38382 -#define SPELL_FIERY_BLAST DUNGEON_MODE(N_SPELL_FIERY_BLAST, H_SPELL_FIERY_BLAST) -#define SPELL_FOCUS_FIRE_VISUAL 42075 //need to find better visual + SPELL_FOCUS_FIRE_VISUAL = 42075 //need to find better visual +}; enum Say { - EMOTE_FOCUSED = 0 + EMOTE_FOCUSED = 0 +}; + +enum Creatures +{ + NPC_FOCUS_FIRE = 18374 }; class boss_shirrak_the_dead_watcher : public CreatureScript @@ -82,7 +85,7 @@ public: void JustSummoned(Creature* summoned) { - if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE) + if (summoned && summoned->GetEntry() == NPC_FOCUS_FIRE) { summoned->CastSpell(summoned, SPELL_FOCUS_FIRE_VISUAL, false); summoned->setFaction(me->getFaction()); @@ -145,7 +148,7 @@ public: if (target && target->GetTypeId() == TYPEID_PLAYER && target->IsAlive()) { FocusedTargetGUID = target->GetGUID(); - me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); + me->SummonCreature(NPC_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); Talk(EMOTE_FOCUSED, FocusedTargetGUID); } FocusFire_Timer = 15000+(rand()%5000); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 41a94c84888..5b603984ea4 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -31,14 +31,17 @@ EndContentData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum ePrince +enum Yells { SAY_INTRO = 0, SAY_AGGRO = 1, SAY_SLAY = 2, SAY_SUMMON = 3, SAY_DEAD = 4, +}; +enum Spells +{ SPELL_BLINK = 34605, SPELL_FROSTBOLT = 32364, SPELL_FIREBALL = 32363, @@ -47,9 +50,19 @@ enum ePrince SPELL_ETHEREAL_BEACON = 32371, // Summons NPC_BEACON SPELL_ETHEREAL_BEACON_VISUAL = 32368, + // Ethereal Beacon + SPELL_ARCANE_BOLT = 15254, + SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 +}; + +enum Creatures +{ NPC_BEACON = 18431, - NPC_SHAFFAR = 18344, + NPC_SHAFFAR = 18344 +}; +enum Misc +{ NR_INITIAL_BEACONS = 3 }; @@ -213,12 +226,6 @@ public: }; -enum eEnums -{ - SPELL_ARCANE_BOLT = 15254, - SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 -}; - class npc_ethereal_beacon : public CreatureScript { public: @@ -305,7 +312,7 @@ public: }; -enum eEthereal +enum Ethereal { SPELL_ETHEREAL_APPRENTICE_FIREBOLT = 32369, SPELL_ETHEREAL_APPRENTICE_FROSTBOLT = 32370 diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 22dcc7d996c..a70c3a1e7f4 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -43,13 +43,13 @@ enum DarkweaverSyth SPELL_SUMMON_SYTH_FIRE = 33537, // Spawns 19203 SPELL_SUMMON_SYTH_ARCANE = 33538, // Spawns 19205 SPELL_SUMMON_SYTH_FROST = 33539, // Spawns 19204 - SPELL_SUMMON_SYTH_SHADOW = 33540 // Spawns 19206 -}; + SPELL_SUMMON_SYTH_SHADOW = 33540, // Spawns 19206 -#define SPELL_FLAME_BUFFET DUNGEON_MODE(33526, 38141) -#define SPELL_ARCANE_BUFFET DUNGEON_MODE(33527, 38138) -#define SPELL_FROST_BUFFET DUNGEON_MODE(33528, 38142) -#define SPELL_SHADOW_BUFFET DUNGEON_MODE(33529, 38143) + SPELL_FLAME_BUFFET = 33526, + SPELL_ARCANE_BUFFET = 33527, + SPELL_FROST_BUFFET = 33528, + SPELL_SHADOW_BUFFET = 33529 +}; class boss_darkweaver_syth : public CreatureScript { diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 785ec185941..a9091075075 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -27,10 +27,14 @@ EndScriptData */ #include "InstanceScript.h" #include "sethekk_halls.h" -enum eEnums +enum Creatures { - NPC_ANZU = 23035, - IKISS_DOOR = 177203, + NPC_ANZU = 23035 +}; + +enum GameObjects +{ + GO_IKISS_DOOR = 177203 }; class instance_sethekk_halls : public InstanceMapScript @@ -69,7 +73,7 @@ public: void OnGameObjectCreate(GameObject* go) { - if (go->GetEntry() == IKISS_DOOR) + if (go->GetEntry() == GO_IKISS_DOOR) m_uiIkissDoorGUID = go->GetGUID(); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h index 58e6cc685ce..15ffda4ada9 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -19,7 +19,7 @@ #ifndef DEF_SETHEKK_HALLS_H #define DEF_SETHEKK_HALLS_H -enum eTypes +enum DataTypes { DATA_IKISSDOOREVENT = 1, TYPE_ANZU_ENCOUNTER = 2, diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index f16a629dd0c..c7477171710 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -28,14 +28,17 @@ EndScriptData */ #include "ScriptedEscortAI.h" #include "shadow_labyrinth.h" -enum eEnums +enum Yells { SAY_INTRO = 0, SAY_AGGRO = 1, SAY_HELP = 2, SAY_SLAY = 3, - SAY_DEATH = 4, + SAY_DEATH = 4 +}; +enum Spells +{ SPELL_BANISH = 30231, SPELL_CORROSIVE_ACID = 33551, SPELL_FEAR = 33547, diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h index 433624a7d55..2d26fe745c2 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.h +++ b/src/server/scripts/Outland/BlackTemple/black_temple.h @@ -16,10 +16,10 @@ * with this program. If not, see . */ -#ifndef DEF_BLACK_TEMPLE_H -#define DEF_BLACK_TEMPLE_H +#ifndef BLACK_TEMPLE_H_ +#define BLACK_TEMPLE_H_ -enum eTypes +enum DataTypes { DATA_AKAMA = 1, DATA_AKAMA_SHADE = 2, @@ -49,5 +49,4 @@ enum eTypes DATA_BLOOD_ELF_COUNCIL_VOICE = 26 }; -#endif - +#endif // BLACK_TEMPLE_H_ diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 0c1994d0c2e..a4779204571 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -97,21 +97,26 @@ static Location BrokenWP[]= #define AKAMA_Y 400.601013f #define AKAMA_Z 112.783997f -// Spells -#define SPELL_VERTEX_SHADE_BLACK 39833 -#define SPELL_SHADE_SOUL_CHANNEL 40401 -#define SPELL_DESTRUCTIVE_POISON 40874 -#define SPELL_LIGHTNING_BOLT 42024 -#define SPELL_AKAMA_SOUL_CHANNEL 40447 -#define SPELL_AKAMA_SOUL_RETRIEVE 40902 -#define AKAMA_SOUL_EXPEL 40855 -#define SPELL_SHADE_SOUL_CHANNEL_2 40520 - -// Channeler entry -#define CREATURE_CHANNELER 23421 -#define CREATURE_SORCERER 23215 -#define CREATURE_DEFENDER 23216 -#define CREATURE_BROKEN 23319 + +enum Spells +{ + SPELL_VERTEX_SHADE_BLACK = 39833, + SPELL_SHADE_SOUL_CHANNEL = 40401, + SPELL_DESTRUCTIVE_POISON = 40874, + SPELL_LIGHTNING_BOLT = 42024, + SPELL_AKAMA_SOUL_CHANNEL = 40447, + SPELL_AKAMA_SOUL_RETRIEVE = 40902, + SPELL_AKAMA_SOUL_EXPEL = 40855, + SPELL_SHADE_SOUL_CHANNEL_2 = 40520 +}; + +enum Creatures +{ + NPC_CHANNELER = 23421, + NPC_SORCERER = 23215, + NPC_DEFENDER = 23216, + NPC_BROKEN = 23319 +}; const uint32 spawnEntries[4]= { 23523, 23318, 23524 }; @@ -286,18 +291,21 @@ public: reseting = false; } + void JustDied(Unit* /*killer*/) { summons.DespawnAll(); } + void JustSummoned(Creature* summon) { - if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) + if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Summon(summon); } + void SummonedCreatureDespawn(Creature* summon) { - if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) + if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Despawn(summon); } @@ -326,7 +334,9 @@ public: GridSearcherSucceeded = true; } } - } else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly"); + } + else + TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly"); } } @@ -363,7 +373,7 @@ public: // max of 6 sorcerers can be summoned if ((rand()%3 == 0) && (DeathCount > 0) && (SorcererCount < 7)) { - Creature* Sorcerer = me->SummonCreature(CREATURE_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0); + Creature* Sorcerer = me->SummonCreature(NPC_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0); if (Sorcerer) { CAST_AI(npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID(); @@ -394,7 +404,7 @@ public: void FindChannelers() { std::list ChannelerList; - me->GetCreatureListWithEntryInGrid(ChannelerList, CREATURE_CHANNELER, 50.0f); + me->GetCreatureListWithEntryInGrid(ChannelerList, NPC_CHANNELER, 50.0f); if (!ChannelerList.empty()) { @@ -440,7 +450,7 @@ public: if (DefenderTimer <= diff) { uint32 ran = rand()%2; - Creature* Defender = me->SummonCreature(CREATURE_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000); + Creature* Defender = me->SummonCreature(NPC_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000); if (Defender) { Defender->SetWalk(false); @@ -643,12 +653,13 @@ public: void JustSummoned(Creature* summon) { - if (summon->GetEntry() == CREATURE_BROKEN) + if (summon->GetEntry() == NPC_BROKEN) summons.Summon(summon); } + void SummonedCreatureDespawn(Creature* summon) { - if (summon->GetEntry() == CREATURE_BROKEN) + if (summon->GetEntry() == NPC_BROKEN) summons.Despawn(summon); } @@ -799,7 +810,7 @@ public: float y = BrokenCoords[BrokenSummonIndex].y + (1*5); float z = BrokenCoords[BrokenSummonIndex].z; float o = BrokenCoords[BrokenSummonIndex].o; - Creature* Broken = me->SummonCreature(CREATURE_BROKEN, x, y, z, o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000); + Creature* Broken = me->SummonCreature(NPC_BROKEN, x, y, z, o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000); if (Broken) { float wx = BrokenWP[BrokenSummonIndex].x + (i*5); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index dbd7aa50899..2782892db5d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -29,32 +29,44 @@ EndScriptData */ #include "Player.h" #include "SpellInfo.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_NEEDLE = 1, SAY_SLAY = 2, SAY_SPECIAL = 3, SAY_ENRAGE = 4, - SAY_DEATH = 5, + SAY_DEATH = 5 +}; - //Spells +enum Spells +{ SPELL_NEEDLE_SPINE = 39992, SPELL_TIDAL_BURST = 39878, SPELL_TIDAL_SHIELD = 39872, SPELL_IMPALING_SPINE = 39837, SPELL_CREATE_NAJENTUS_SPINE = 39956, SPELL_HURL_SPINE = 39948, - SPELL_BERSERK = 26662, + SPELL_BERSERK = 26662 - GOBJECT_SPINE = 185584, +}; +enum GameObjects +{ + GOBJECT_SPINE = 185584 +}; + +enum Events +{ EVENT_BERSERK = 1, EVENT_YELL = 2, EVENT_NEEDLE = 3, EVENT_SPINE = 4, - EVENT_SHIELD = 5, + EVENT_SHIELD = 5 +}; +enum Misc +{ GCD_CAST = 1, GCD_YELL = 2 }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index da8e75e8f31..2cc306c5df1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -29,31 +29,37 @@ EndScriptData */ #include "Spell.h" #include "Player.h" -#define SPELL_SPOUT 37433 -#define SPELL_SPOUT_ANIM 42835 -#define SPELL_SPOUT_BREATH 37431 -#define SPELL_KNOCKBACK 19813 -#define SPELL_GEYSER 37478 -#define SPELL_WHIRL 37660 -#define SPELL_WATERBOLT 37138 -#define SPELL_SUBMERGE 37550 -#define SPELL_EMERGE 20568 +enum Spells +{ + SPELL_SPOUT = 37433, + SPELL_SPOUT_ANIM = 42835, + SPELL_SPOUT_BREATH = 37431, + SPELL_KNOCKBACK = 19813, + SPELL_GEYSER = 37478, + SPELL_WHIRL = 37660, + SPELL_WATERBOLT = 37138, + SPELL_SUBMERGE = 37550, + SPELL_EMERGE = 20568, + + + // Ambusher spells + SPELL_SPREAD_SHOT = 37790, + SPELL_SHOOT = 37770, + // Guardian spells + SPELL_ARCINGSMASH = 38761, // Wrong SpellId. Can't find the right one. + SPELL_HAMSTRING = 26211 +}; + +enum Creatures +{ + NPC_COILFANG_GUARDIAN = 21873, + NPC_COILFANG_AMBUSHER = 21865 +}; #define EMOTE_SPOUT "The Lurker Below takes a deep breath." #define SPOUT_DIST 100 -#define NPC_COILFANG_GUARDIAN 21873 -#define NPC_COILFANG_AMBUSHER 21865 - -//Ambusher spells -#define SPELL_SPREAD_SHOT 37790 -#define SPELL_SHOOT 37770 - -//Guardian spells -#define SPELL_ARCINGSMASH 38761 // Wrong SpellId. Can't find the right one. -#define SPELL_HAMSTRING 26211 - float AddPos[9][3] = { // MOVE_AMBUSHER_1 X, Y, Z diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index ec949345928..448492dd134 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "serpent_shrine.h" -enum eEnums +enum Yells { // Yell SAY_AGGRO = 0, @@ -38,8 +38,11 @@ enum eEnums // Emotes EMOTE_WATERY_GRAVE = 5, EMOTE_EARTHQUAKE = 6, - EMOTE_WATERY_GLOBULES = 7, - // Spells + EMOTE_WATERY_GLOBULES = 7 +}; + +enum Spells +{ SPELL_TIDAL_WAVE = 37730, SPELL_WATERY_GRAVE = 38049, SPELL_EARTHQUAKE = 37764, @@ -54,6 +57,13 @@ enum eEnums SPELL_SUMMON_WATER_GLOBULE_2 = 37858, SPELL_SUMMON_WATER_GLOBULE_3 = 37860, SPELL_SUMMON_WATER_GLOBULE_4 = 37861, + + // Water Globule + SPELL_GLOBULE_EXPLOSION = 37871 +}; + +enum Creatures +{ // Creatures NPC_WATER_GLOBULE = 21913, NPC_TIDEWALKER_LURKER = 21920 @@ -277,9 +287,6 @@ public: }; -//Water Globule AI -#define SPELL_GLOBULE_EXPLOSION 37871 - class npc_water_globule : public CreatureScript { public: diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index de12e35ec19..b45029eb2bd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -30,12 +30,21 @@ EndScriptData */ #include "TemporarySummon.h" #define MAX_ENCOUNTER 6 -#define SPELL_SCALDINGWATER 37284 -#define NPC_COILFANG_FRENZY 21508 -#define TRASHNPC_COILFANG_PRIESTESS 21220 //6*2 -#define TRASHNPC_COILFANG_SHATTERER 21301 //6*3 -#define MIN_KILLS 30 +enum Misc +{ + // Spells + SPELL_SCALDINGWATER = 37284, + + // Creatures + NPC_COILFANG_FRENZY = 21508, + NPC_COILFANG_PRIESTESS = 21220, + NPC_COILFANG_SHATTERER = 21301, + + // Misc + MIN_KILLS = 30 +}; + //NOTE: there are 6 platforms //there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work! diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 31af3e5a8d8..feeac7d4a54 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -32,18 +32,28 @@ EndContentData */ #include "ScriptedCreature.h" #include "steam_vault.h" -enum MekgineerSteamrigger +enum Yells { SAY_MECHANICS = 0, SAY_AGGRO = 1, SAY_SLAY = 2, - SAY_DEATH = 3, + SAY_DEATH = 3 +}; +enum Spells +{ SPELL_SUPER_SHRINK_RAY = 31485, SPELL_SAW_BLADE = 31486, SPELL_ELECTRIFIED_NET = 35107, - ENTRY_STREAMRIGGER_MECHANIC = 17951 + SPELL_DISPEL_MAGIC = 17201, + SPELL_REPAIR = 31532, + H_SPELL_REPAIR = 37936 +}; + +enum Creatures +{ + NPC_STREAMRIGGER_MECHANIC = 17951 }; class boss_mekgineer_steamrigger : public CreatureScript @@ -112,14 +122,14 @@ public: { Talk(SAY_MECHANICS); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } void UpdateAI(uint32 diff) @@ -183,10 +193,6 @@ public: }; -#define SPELL_DISPEL_MAGIC 17201 -#define SPELL_REPAIR 31532 -#define H_SPELL_REPAIR 37936 - #define MAX_REPAIR_RANGE (13.0f) //we should be at least at this range for repair #define MIN_REPAIR_RANGE (7.0f) //we can stop movement at this range to repair but not required diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index ea89ac3c611..275a21f5757 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -19,13 +19,17 @@ #ifndef DEF_STEAM_VAULT_H #define DEF_STEAM_VAULT_H -#define TYPE_HYDROMANCER_THESPIA 1 -#define TYPE_MEKGINEER_STEAMRIGGER 2 -#define TYPE_WARLORD_KALITHRESH 3 -#define TYPE_DISTILLER 4 +enum DataTypes +{ + TYPE_HYDROMANCER_THESPIA = 1, + TYPE_MEKGINEER_STEAMRIGGER = 2, + TYPE_WARLORD_KALITHRESH = 3, + TYPE_DISTILLER = 4, + + DATA_MEKGINEERSTEAMRIGGER = 5, + DATA_KALITRESH = 6, + DATA_THESPIA = 7 +}; -#define DATA_MEKGINEERSTEAMRIGGER 5 -#define DATA_KALITRESH 6 -#define DATA_THESPIA 7 #endif diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index f1bb841fa85..1beffd1d45d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -29,7 +29,11 @@ EndScriptData */ enum Spells { SPELL_FOUL_SPORES = 31673, - SPELL_ACID_GEYSER = 38739 + SPELL_ACID_GEYSER = 38739, + + SPELL_SPORE_CLOUD = 34168, + SPELL_PUTRID_MUSHROOM = 31690, + SPELL_GROW = 31698 }; class boss_hungarfen : public CreatureScript @@ -100,10 +104,6 @@ public: }; -#define SPELL_SPORE_CLOUD 34168 -#define SPELL_PUTRID_MUSHROOM 31690 -#define SPELL_GROW 31698 - class npc_underbog_mushroom : public CreatureScript { public: diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 473630cc9af..22ddd76e9e8 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "SpellScript.h" #include "gruuls_lair.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_SLAM = 1, @@ -36,8 +36,11 @@ enum eEnums SAY_SLAY = 3, SAY_DEATH = 4, - EMOTE_GROW = 5, + EMOTE_GROW = 5 +}; +enum Spells +{ SPELL_GROWTH = 36300, SPELL_CAVE_IN = 36240, SPELL_GROUND_SLAM = 33525, //AoE Ground Slam applying Ground Slam to everyone with a script effect (most likely the knock back, we can code it to a set knockback) diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h index 2e9715a7ffe..69ddba8c274 100644 --- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h +++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h @@ -19,16 +19,19 @@ #ifndef DEF_GRUULS_LAIR_H #define DEF_GRUULS_LAIR_H -#define DATA_BLINDEYETHESEER 1 -#define DATA_GRUULEVENT 2 -#define DATA_KIGGLERTHECRAZED 3 -#define DATA_KROSHFIREHAND 4 -#define DATA_MAULGAREVENT 5 -#define DATA_MAULGAREVENT_TANK 6 -#define DATA_OLMTHESUMMONER 7 -#define DATA_MAULGARDOOR 8 -#define DATA_GRUULDOOR 9 -#define DATA_MAULGAR 10 +enum DataTypes +{ + DATA_BLINDEYETHESEER = 1, + DATA_GRUULEVENT = 2, + DATA_KIGGLERTHECRAZED = 3, + DATA_KROSHFIREHAND = 4, + DATA_MAULGAREVENT = 5, + DATA_MAULGAREVENT_TANK = 6, + DATA_OLMTHESUMMONER = 7, + DATA_MAULGARDOOR = 8, + DATA_GRUULDOOR = 9, + DATA_MAULGAR = 10 +}; #define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Gruul's Lair instance (map 565). Encounters will be buggy." #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index 01f7a2bca98..1303a80488e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -19,29 +19,37 @@ #ifndef DEF_BLOOD_FURNACE_H #define DEF_BLOOD_FURNACE_H -#define DATA_THE_MAKER 1 -#define DATA_BROGGOK 2 -#define DATA_KELIDAN_THE_MAKER 3 -#define TYPE_THE_MAKER_EVENT 4 -#define TYPE_BROGGOK_EVENT 5 -#define TYPE_KELIDAN_THE_BREAKER_EVENT 6 -#define DATA_DOOR1 7 -#define DATA_DOOR2 8 -#define DATA_DOOR3 9 -#define DATA_DOOR4 10 -#define DATA_DOOR5 11 -#define DATA_DOOR6 12 -#define DATA_PRISON_CELL1 13 -#define DATA_PRISON_CELL2 14 -#define DATA_PRISON_CELL3 15 -#define DATA_PRISON_CELL4 16 -#define DATA_PRISON_CELL5 17 -#define DATA_PRISON_CELL6 18 -#define DATA_PRISON_CELL7 19 -#define DATA_PRISON_CELL8 20 -#define DATA_BROGGOK_LEVER 21 -#define ACTION_ACTIVATE_BROGGOK 22 -#define ACTION_RESET_BROGGOK 23 -#define ACTION_PREPARE_BROGGOK 24 +enum DataTypes +{ + DATA_THE_MAKER = 1, + DATA_BROGGOK = 2, + DATA_KELIDAN_THE_MAKER = 3, + TYPE_THE_MAKER_EVENT = 4, + TYPE_BROGGOK_EVENT = 5, + TYPE_KELIDAN_THE_BREAKER_EVENT = 6, + DATA_DOOR1 = 7, + DATA_DOOR2 = 8, + DATA_DOOR3 = 9, + DATA_DOOR4 = 10, + DATA_DOOR5 = 11, + DATA_DOOR6 = 12, + DATA_PRISON_CELL1 = 13, + DATA_PRISON_CELL2 = 14, + DATA_PRISON_CELL3 = 15, + DATA_PRISON_CELL4 = 16, + DATA_PRISON_CELL5 = 17, + DATA_PRISON_CELL6 = 18, + DATA_PRISON_CELL7 = 19, + DATA_PRISON_CELL8 = 20, + DATA_BROGGOK_LEVER = 21 +}; + +enum ActionIds +{ + ACTION_ACTIVATE_BROGGOK = 1, + ACTION_RESET_BROGGOK = 2, + ACTION_PREPARE_BROGGOK = 3 +}; + #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index fdbd0b9dcc6..39da979dd68 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -27,10 +27,13 @@ EndScriptData */ #include "ScriptedCreature.h" #include "blood_furnace.h" -enum eEnums +enum Yells { - SAY_AGGRO = 0, + SAY_AGGRO = 0 +}; +enum Spells +{ SPELL_SLIME_SPRAY = 30913, SPELL_POISON_CLOUD = 30916, SPELL_POISON_BOLT = 30917, diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 31e66c380d2..931f83bf884 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -33,7 +33,7 @@ EndContentData */ #include "SpellAuras.h" #include "blood_furnace.h" -enum eKelidan +enum Kelidan { SAY_WAKE = 0, SAY_ADD_AGGRO = 1, @@ -283,7 +283,7 @@ class boss_kelidan_the_breaker : public CreatureScript ## npc_shadowmoon_channeler ######*/ -enum eShadowmoon +enum Shadowmoon { SPELL_SHADOW_BOLT = 12739, H_SPELL_SHADOW_BOLT = 15472, diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 134284acab5..f200d533ceb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -27,12 +27,15 @@ EndScriptData */ #include "ScriptedCreature.h" #include "blood_furnace.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_KILL = 1, - SAY_DIE = 2, + SAY_DIE = 2 +}; +enum Spells +{ SPELL_ACID_SPRAY = 38153, SPELL_EXPLODING_BREAKER = 30925, SPELL_KNOCKDOWN = 20276, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 872b05d8ed1..50b74cbc0c1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "Player.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SUMMON = 1, @@ -37,7 +37,7 @@ enum eSays SAY_WIPE = 5 }; -enum eSpells +enum Spells { SPELL_ORBITAL_STRIKE = 30637, SPELL_SHADOW_WHIP = 30638, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index cee8a2e840e..b3d89d0cf03 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "SpellInfo.h" -enum eSpells +enum Spells { SPELL_FIREBALL = 34653, SPELL_FIREBALL_H = 36920, @@ -42,7 +42,7 @@ enum eSpells SPELL_FIRE_NOVA_VISUAL = 19823 }; -enum eUnits +enum Units { ENTRY_HELLFIRE_SENTRY = 17517, ENTRY_VAZRUDEN_HERALD = 17307, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index afde225407d..044c22f7ac0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eSays +enum Says { SAY_TAUNT = 0, SAY_HEAL = 1, @@ -36,7 +36,7 @@ enum eSays SAY_DIE = 5 }; -enum eSpells +enum Spells { SPELL_MORTAL_WOUND = 30641, H_SPELL_MORTAL_WOUND = 36814, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index b67041e93f2..6009f6ca8e2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -21,7 +21,7 @@ #define MAX_ENCOUNTER 2 -enum eTypes +enum DataTypes { TYPE_VAZRUDEN = 1, TYPE_NAZAN = 2 diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 8ad34033e5c..d6d346e6603 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -29,7 +29,7 @@ EndScriptData */ #include "Player.h" #include "SpellInfo.h" -enum eSays +enum Yells { SAY_TAUNT = 0, SAY_FREED = 1, @@ -40,14 +40,14 @@ enum eSays SAY_DEATH = 6 }; -enum eEmotes +enum Emotes { EMOTE_BERSERK = 7, EMOTE_BLASTNOVA = 8, EMOTE_BEGIN = 9 }; -enum eCreatures +enum Creatures { NPC_MAGTHERIDON = 17257, NPC_ROOM = 17516, @@ -55,7 +55,7 @@ enum eCreatures NPC_ABYSSAL = 17454, }; -enum eSpells +enum Spells { SPELL_BLASTNOVA = 30616, SPELL_CLEAVE = 30619, diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 6d65e8ebc43..75030ebc381 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "InstanceScript.h" #include "magtheridons_lair.h" -enum eSpells +enum Spells { SPELL_SOUL_TRANSFER = 30531, // core bug, does not support target 7 SPELL_BLAZE_TARGET = 30541, // core bug, does not support target 7 diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index 9a4e4613d59..f67b8ff3256 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -19,10 +19,14 @@ #ifndef DEF_MAGTHERIDONS_LAIR_H #define DEF_MAGTHERIDONS_LAIR_H -#define DATA_MAGTHERIDON_EVENT 1 -#define DATA_MAGTHERIDON 3 -#define DATA_CHANNELER_EVENT 2 -#define DATA_COLLAPSE 6 -#define DATA_CHANNELER 9 +enum DataTypes +{ + DATA_MAGTHERIDON_EVENT = 1, + DATA_MAGTHERIDON = 3, + DATA_CHANNELER_EVENT = 2, + DATA_COLLAPSE = 6, + DATA_CHANNELER = 9 +}; + #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index b3408ed6c49..44632b36647 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -33,7 +33,7 @@ EndContentData */ #include "ScriptedCreature.h" #include "shattered_halls.h" -enum eSays +enum Says { SAY_INTRO = 0, SAY_PEON_ATTACKED = 1, @@ -44,7 +44,7 @@ enum eSays SAY_DIE = 6 }; -enum eSpells +enum Spells { SPELL_DEATH_COIL = 30500, SPELL_DARK_SPIN = 30502, // core bug spell attack caster :D diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 82ee361b657..1caf30dd831 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -32,19 +32,25 @@ EndContentData */ #include "ScriptedCreature.h" #include "shattered_halls.h" -enum eEnums +enum Yells { YELL_DIE_L = 0, YELL_DIE_R = 1, EMOTE_ENRAGE = 2, +}; +enum Spells +{ SPELL_BLAST_WAVE = 30600, SPELL_FEAR = 30584, SPELL_THUNDERCLAP = 30633, SPELL_BURNING_MAUL = 30598, H_SPELL_BURNING_MAUL = 36056, +}; +enum Creatures +{ NPC_LEFT_HEAD = 19523, NPC_RIGHT_HEAD = 19524 }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 882cc3a0d3f..9e6eaf0b3d6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -30,20 +30,20 @@ EndContentData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SLAY = 1, SAY_DEATH = 2 }; -enum eSpells +enum Spells { SPELL_BLADE_DANCE = 30739, H_SPELL_CHARGE = 25821, }; -enum eCreatures +enum Creatures { NPC_SHATTERED_ASSASSIN = 17695, NPC_HEARTHEN_GUARD = 17621, diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index f56f844a49a..9d9fbf6aec0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -19,10 +19,12 @@ #ifndef DEF_SHATTERED_H #define DEF_SHATTERED_H -#define TYPE_NETHEKURSE 1 -#define DATA_NETHEKURSE 2 -#define DATA_NETHEKURSE_DOOR 3 +enum DataTypes +{ + TYPE_NETHEKURSE = 1, + DATA_NETHEKURSE = 2, + DATA_NETHEKURSE_DOOR = 3, -#define TYPE_OMROGG 4 + TYPE_OMROGG = 4 +}; #endif - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 7de32c4bfbd..556b02606f7 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "the_eye.h" #include "SpellInfo.h" -enum eSpells +enum Spells { SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1, 5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions SPELL_FLAME_QUILLS = 34229, // Randomly after changing position in phase after watching tons of movies, set probability 20% diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index a7f19aad871..18f72698beb 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -30,7 +30,7 @@ EndScriptData */ #include "the_eye.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_SUMMON1 = 1, @@ -38,8 +38,11 @@ enum eEnums SAY_KILL = 3, SAY_DEATH = 4, SAY_VOIDA = 5, - SAY_VOIDB = 6, + SAY_VOIDB = 6 +}; +enum Spells +{ SPELL_ARCANE_MISSILES = 33031, SPELL_WRATH_OF_THE_ASTROMANCER = 42783, SPELL_WRATH_OF_THE_ASTROMANCER_DOT = 42784, @@ -48,18 +51,28 @@ enum eEnums SPELL_VOID_BOLT = 39329, SPELL_SPOTLIGHT = 25824, + + SPELL_SOLARIUM_GREAT_HEAL = 33387, + SPELL_SOLARIUM_HOLY_SMITE = 25054, + SPELL_SOLARIUM_ARCANE_TORRENT = 33390 +}; + +enum Creatures +{ NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT = 18928, NPC_SOLARIUM_AGENT = 18925, - NPC_SOLARIUM_PRIEST = 18806, + NPC_SOLARIUM_PRIEST = 18806 +}; +enum Models +{ MODEL_HUMAN = 18239, - MODEL_VOIDWALKER = 18988, - - SPELL_SOLARIUM_GREAT_HEAL = 33387, - SPELL_SOLARIUM_HOLY_SMITE = 25054, - SPELL_SOLARIUM_ARCANE_TORRENT = 33390, + MODEL_VOIDWALKER = 18988 +}; +enum Misc +{ WV_ARMOR = 31000 }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index a5923d86ff8..d0d580c824b 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -29,9 +29,9 @@ EndScriptData */ #include "WorldPacket.h" #include "Opcodes.h" -enum eEnums +enum Yells { - //kael'thas Speech + // Kael'thas Speech SAY_INTRO = 0, SAY_INTRO_CAPERNIAN = 1, SAY_INTRO_TELONICUS = 2, @@ -47,7 +47,7 @@ enum eEnums SAY_SUMMON_PHOENIX = 12, SAY_DEATH = 13, - //Thaladred the Darkener speech + // Thaladred the Darkener speech SAY_THALADRED_AGGRO = 0, SAY_THALADRED_DEATH = 1, EMOTE_THALADRED_GAZE = 2, @@ -56,15 +56,18 @@ enum eEnums SAY_SANGUINAR_AGGRO = 0, SAY_SANGUINAR_DEATH = 1, - //Grand Astromancer Capernian speech + // Grand Astromancer Capernian speech SAY_CAPERNIAN_AGGRO = 0, SAY_CAPERNIAN_DEATH = 1, - //Master Engineer Telonicus speech + // Master Engineer Telonicus speech SAY_TELONICUS_AGGRO = 0, - SAY_TELONICUS_DEATH = 1, + SAY_TELONICUS_DEATH = 1 +}; - //Phase 2 spells +enum Spells +{ + // Phase 2 spells SPELL_SUMMON_WEAPONS = 36976, SPELL_SUMMON_WEAPONA = 36958, SPELL_SUMMON_WEAPONB = 36959, @@ -75,7 +78,7 @@ enum eEnums SPELL_SUMMON_WEAPONG = 36964, SPELL_RES_VISUAL = 24171, - //Phase 4 spells + // Phase 4 spells SPELL_FIREBALL = 22088, //wrong but works with CastCustomSpell SPELL_PYROBLAST = 36819, SPELL_FLAME_STRIKE = 36735, @@ -86,7 +89,7 @@ enum eEnums SPELL_PHOENIX_ANIMATION = 36723, SPELL_MIND_CONTROL = 32830, - //Phase 5 spells + // Phase 5 spells SPELL_EXPLODE = 36092, SPELL_FULLPOWER = 36187, SPELL_KNOCKBACK = 11027, @@ -94,12 +97,12 @@ enum eEnums SPELL_GRAVITY_LAPSE_AURA = 39432, SPELL_NETHER_BEAM = 35873, - //Thaladred the Darkener spells + // Thaladred the Darkener spells SPELL_PSYCHIC_BLOW = 10689, SPELL_SILENCE = 30225, - //Lord Sanguinar spells + // Lord Sanguinar spells SPELL_BELLOWING_ROAR = 40636, - //Grand Astromancer Capernian spells + // Grand Astromancer Capernian spells SPELL_CAPERNIAN_FIREBALL = 36971, SPELL_CONFLAGRATION = 37018, @@ -112,16 +115,24 @@ enum eEnums //Phoenix spell SPELL_BURN = 36720, SPELL_EMBER_BLAST = 34341, - SPELL_REBIRTH = 41587, + SPELL_REBIRTH = 41587 +}; - //Creature IDs +enum Creatures +{ NPC_PHOENIX = 21362, - NPC_PHOENIX_EGG = 21364, + NPC_PHOENIX_EGG = 21364 +}; +enum Models +{ //Phoenix egg and phoenix model MODEL_ID_PHOENIX = 19682, - MODEL_ID_PHOENIX_EGG = 20245, + MODEL_ID_PHOENIX_EGG = 20245 +}; +enum Misc +{ MAX_ADVISORS = 4 }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 26668a77742..63e3d8b42ea 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -27,13 +27,16 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_eye.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_SLAY = 1, SAY_DEATH = 2, - SAY_POUNDING = 3, + SAY_POUNDING = 3 +}; +enum Spells +{ SPELL_POUNDING = 34162, SPELL_ARCANE_ORB = 34172, SPELL_KNOCK_AWAY = 25778, diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 3fb42ced19f..8ba7a4722bb 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -31,7 +31,7 @@ EndContentData */ #include "ScriptedCreature.h" #include "the_eye.h" -enum eSpells +enum Spells { SPELL_COUNTERCHARGE = 35035, SPELL_KNOCKAWAY = 22893, diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h index 20b920a95d2..b9e44aff0a9 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -19,16 +19,19 @@ #ifndef DEF_THE_EYE_H #define DEF_THE_EYE_H -#define DATA_ALAREVENT 1 -#define DATA_ASTROMANCER 2 -#define DATA_GRANDASTROMANCERCAPERNIAN 3 -#define DATA_HIGHASTROMANCERSOLARIANEVENT 4 -#define DATA_KAELTHAS 5 -#define DATA_KAELTHASEVENT 6 -#define DATA_LORDSANGUINAR 7 -#define DATA_MASTERENGINEERTELONICUS 8 -#define DATA_THALADREDTHEDARKENER 10 -#define DATA_VOIDREAVEREVENT 11 -#define DATA_ALAR 12 -#endif +enum DataTypes +{ + DATA_ALAREVENT = 1, + DATA_ASTROMANCER = 2, + DATA_GRANDASTROMANCERCAPERNIAN = 3, + DATA_HIGHASTROMANCERSOLARIANEVENT = 4, + DATA_KAELTHAS = 5, + DATA_KAELTHASEVENT = 6, + DATA_LORDSANGUINAR = 7, + DATA_MASTERENGINEERTELONICUS = 8, + DATA_THALADREDTHEDARKENER = 10, + DATA_VOIDREAVEREVENT = 11, + DATA_ALAR = 12 +}; +#endif diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index fbafe03fddb..f77c54c25e6 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "mechanar.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SUMMON = 1, diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 43af42b1e72..96dc4d06588 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -37,7 +37,7 @@ EndContentData */ # npc_millhouse_manastorm #####*/ -enum eMillhouseSays +enum MillhouseSays { SAY_INTRO_1 = 0, SAY_INTRO_2 = 1, @@ -53,7 +53,7 @@ enum eMillhouseSays SAY_COMPLETE = 11, }; -enum eMillhouseSpells +enum MillhouseSpells { SPELL_CONJURE_WATER = 36879, SPELL_ARCANE_INTELLECT = 36880, @@ -230,7 +230,7 @@ class npc_millhouse_manastorm : public CreatureScript # npc_warden_mellichar #####*/ -enum eWardenSays +enum WardenSays { YELL_INTRO1 = 0, YELL_INTRO2 = 1, @@ -242,7 +242,7 @@ enum eWardenSays YELL_WELCOME = 7, }; -enum eWardenUnits +enum WardenUnits { //phase 2(acid mobs) ENTRY_TRICKSTER = 20905, @@ -259,7 +259,7 @@ enum eWardenUnits ENTRY_SKYRISS = 20912, }; -enum eWardenSpells +enum WardenSpells { //TARGET_SCRIPT SPELL_TARGET_ALPHA = 36856, diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index 9c852196616..37839d4794d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -16,20 +16,23 @@ * with this program. If not, see . */ -#ifndef DEF_ARCATRAZ_H -#define DEF_ARCATRAZ_H +#ifndef ARCATRAZ_H_ +#define ARCATRAZ_H_ -#define TYPE_ZEREKETH 1 -#define TYPE_DALLIAH 2 -#define TYPE_SOCCOTHRATES 3 -#define TYPE_HARBINGERSKYRISS 4 -#define TYPE_WARDEN_1 5 -#define TYPE_WARDEN_2 6 -#define TYPE_WARDEN_3 7 -#define TYPE_WARDEN_4 8 -#define TYPE_WARDEN_5 9 -#define DATA_MELLICHAR 10 -#define TYPE_SHIELD_OPEN 11 -#define DATA_SPHERE_SHIELD 12 -#endif +enum DataTypes +{ + TYPE_ZEREKETH = 1, + TYPE_DALLIAH = 2, + TYPE_SOCCOTHRATES = 3, + TYPE_HARBINGERSKYRISS = 4, + TYPE_WARDEN_1 = 5, + TYPE_WARDEN_2 = 6, + TYPE_WARDEN_3 = 7, + TYPE_WARDEN_4 = 8, + TYPE_WARDEN_5 = 9, + DATA_MELLICHAR = 10, + TYPE_SHIELD_OPEN = 11, + DATA_SPHERE_SHIELD = 12 +}; +#endif // ARCATRAZ_H_ diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 3cf9f01a601..c5261b48b78 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -32,7 +32,7 @@ EndContentData */ #include "ScriptedCreature.h" #include "arcatraz.h" -enum eSays +enum Says { SAY_INTRO = 0, SAY_AGGRO = 1, @@ -43,16 +43,19 @@ enum eSays SAY_DEATH = 6 }; -enum eSpells +enum Spells { - SPELL_FEAR = 39415, - SPELL_MIND_REND = 36924, - H_SPELL_MIND_REND = 39017, - SPELL_DOMINATION = 37162, - H_SPELL_DOMINATION = 39019, - H_SPELL_MANA_BURN = 39020, - SPELL_66_ILLUSION = 36931, //entry 21466 - SPELL_33_ILLUSION = 36932, //entry 21467 + SPELL_FEAR = 39415, + SPELL_MIND_REND = 36924, + H_SPELL_MIND_REND = 39017, + SPELL_DOMINATION = 37162, + H_SPELL_DOMINATION = 39019, + H_SPELL_MANA_BURN = 39020, + SPELL_66_ILLUSION = 36931, //entry 21466 + SPELL_33_ILLUSION = 36932, //entry 21467 + + SPELL_MIND_REND_IMAGE = 36929, + H_SPELL_MIND_REND_IMAGE = 39021 }; class boss_harbinger_skyriss : public CreatureScript @@ -275,9 +278,6 @@ class boss_harbinger_skyriss : public CreatureScript } }; -#define SPELL_MIND_REND_IMAGE 36929 -#define H_SPELL_MIND_REND_IMAGE 39021 - class boss_harbinger_skyriss_illusion : public CreatureScript { public: diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index a70b6fb35b4..c6fdda02d71 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define MAX_ENCOUNTER 9 -enum eUnits +enum Units { CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318, //door opened when Wrath-Scryer Soccothrates dies CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319, //door opened when Dalliah the Doomsayer dies diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index f883918db75..e17e2b460c5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_KILL = 1, @@ -37,7 +37,7 @@ enum eSays SAY_OOC_RANDOM = 5 }; -enum eSpells +enum Spells { SPELL_TRANQUILITY = 34550, SPELL_TREE_FORM = 34551, @@ -48,7 +48,10 @@ enum eSpells SPELL_PLANT_RED = 34763 }; -#define ENTRY_FRAYER 19953 +enum Creatures +{ + NPC_FRAYER = 19953 +}; class boss_high_botanist_freywinn : public CreatureScript { @@ -89,7 +92,7 @@ class boss_high_botanist_freywinn : public CreatureScript void JustSummoned(Creature* summoned) { - if (summoned->GetEntry() == ENTRY_FRAYER) + if (summoned->GetEntry() == NPC_FRAYER) Adds_List.push_back(summoned->GetGUID()); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 91bf42351b4..14126f539ff 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" -enum eSpells +enum Spells { SPELL_ALLERGIC_REACTION = 34697, SPELL_TELEPORT_SELF = 34673, @@ -41,7 +41,7 @@ enum eSpells SPELL_SUMMON_LASHER_4 = 34688, SPELL_SUMMON_FLAYER_3 = 34690 }; -enum eOthers +enum Misc { EMOTE_SUMMON = 0, MODEL_DEFAULT = 13109, diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 09ca90570b0..5bb91b384a1 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SLAY = 1, @@ -35,7 +35,7 @@ enum eSays SAY_DEATH = 3 }; -enum eSpells +enum Spells { WAR_STOMP = 34716, SUMMON_TREANTS = 34727, // DBC: 34727, 34731, 34733, 34734, 34736, 34739, 34741 (with Ancestral Life spell 34742) // won't work (guardian summon) @@ -44,7 +44,7 @@ enum eSpells SPELL_HEAL_FATHER = 6262 }; -enum eOthers +enum Misc { CREATURE_TREANT = 19949, TREANT_SPAWN_DIST = 50 //50 yards from Warp Splinter's spawn point diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 8ecf26b028a..c10f119f00f 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -85,7 +85,7 @@ public: ## npc_nether_drake ######*/ -enum eNetherdrake +enum Netherdrake { //Used by 20021, 21817, 21820, 21821, 21823 but not existing in database SAY_NIHIL_1 = 0, @@ -265,7 +265,7 @@ public: ## npc_daranelle ######*/ -enum eDaranelle +enum Daranelle { SAY_SPELL_INFLUENCE = 0, SPELL_LASHHAN_CHANNEL = 36904 @@ -431,7 +431,7 @@ public: ## npc_bloodmaul_brutebane ######*/ -enum eBloodmaul +enum Bloodmaul { NPC_OGRE_BRUTE = 19995, NPC_QUEST_CREDIT = 21241, diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index ea1fde3139f..7cbc48966ae 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -44,7 +44,7 @@ EndContentData */ ## npc_aeranas ######*/ -enum eAeranas +enum Aeranas { SAY_SUMMON = 0, SAY_FREE = 1, @@ -132,7 +132,7 @@ public: ## npc_ancestral_wolf ######*/ -enum eAncestralWolf +enum AncestralWolf { EMOTE_WOLF_LIFT_HEAD = 0, EMOTE_WOLF_HOWL = 1, @@ -208,7 +208,7 @@ public: #define GOSSIP_NALADU_ITEM1 "Why don't you escape?" -enum eNaladu +enum Naladu { GOSSIP_TEXTID_NALADU1 = 9788 }; @@ -246,7 +246,7 @@ public: #define GOSSIP_TRACY_PROUDWELL_ITEM1 "I heard that your dog Fei Fei took Klatu's prayer beads..." #define GOSSIP_TRACY_PROUDWELL_ITEM2 "" -enum eTracy +enum Tracy { GOSSIP_TEXTID_TRACY_PROUDWELL1 = 10689, QUEST_DIGGING_FOR_PRAYER_BEADS = 10916 @@ -301,7 +301,7 @@ public: #define GOSSIP_TROLLBANE_ITEM2 "" #define GOSSIP_TROLLBANE_ITEM3 "Tell me of your homeland." -enum eTrollbane +enum Trollbane { GOSSIP_TEXTID_TROLLBANE1 = 9932, GOSSIP_TEXTID_TROLLBANE2 = 9933, @@ -349,7 +349,7 @@ public: ## npc_wounded_blood_elf ######*/ -enum eWoundedBloodElf +enum WoundedBloodElf { SAY_ELF_START = 0, SAY_ELF_SUMMON1 = 1, @@ -442,7 +442,7 @@ public: ## npc_fel_guard_hound ######*/ -enum eFelGuard +enum FelGuard { SPELL_SUMMON_POO = 37688, diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 2bb688026d1..c4b651c22ce 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -147,7 +147,7 @@ public: ## npc_maghar_captive #####*/ -enum eMagharCaptive +enum MagharCaptive { SAY_MAG_START = 0, SAY_MAG_NO_ESCAPE = 0, diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index f8be2a43bf8..a3f959c58b6 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -43,7 +43,7 @@ EndContentData */ ######*/ //used by 20209, 20417, 20418, 20440, signed for 20209 -enum eManaforgeConsoleData +enum ManaforgeConsoleData { EMOTE_START = 0, EMOTE_60 = 1, @@ -360,7 +360,7 @@ public: ######*/ // The Speech of Dawnforge, Ardonis & Pathaleon -enum eCommanderDawnforgeData +enum CommanderDawnforgeData { SAY_COMMANDER_DAWNFORGE_1 = 0, SAY_COMMANDER_DAWNFORGE_2 = 1, @@ -666,7 +666,7 @@ public: /*###### ## npc_professor_dabiri ######*/ -enum eProfessorDabiriData +enum ProfessorDabiriData { SPELL_PHASE_DISTRUPTOR = 35780, @@ -717,7 +717,7 @@ public: ## npc_phase_hunter ######*/ -enum ePhaseHunterData +enum PhaseHunterData { QUEST_RECHARGING_THE_BATTERIES = 10190, @@ -850,7 +850,7 @@ public: /*###### ## npc_bessy ######*/ -enum eBessyData +enum BessyData { Q_ALMABTRIEB = 10337, N_THADELL = 20464, diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index a51940a9143..a8fdf3b9034 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -53,7 +53,7 @@ EndContentData */ # npc_mature_netherwing_drake #####*/ -enum eMatureNetherwing +enum MatureNetherwing { SAY_JUST_EATEN = 0, @@ -190,14 +190,21 @@ public: # npc_enslaved_netherwing_drake ####*/ -#define FACTION_DEFAULT 62 -#define FACTION_FRIENDLY 1840 // Not sure if this is correct, it was taken off of Mordenai. +enum EnshlavedNetherwingDrake +{ + // Factions + FACTION_DEFAULT = 62, + FACTION_FRIENDLY = 1840, // Not sure if this is correct, it was taken off of Mordenai. + + // Spells + SPELL_HIT_FORCE_OF_NELTHARAKU = 38762, + SPELL_FORCE_OF_NELTHARAKU = 38775, -#define SPELL_HIT_FORCE_OF_NELTHARAKU 38762 -#define SPELL_FORCE_OF_NELTHARAKU 38775 + // Creatures + NPC_DRAGONMAW_SUBJUGATOR = 21718, + NPC_ESCAPE_DUMMY = 22317 -#define CREATURE_DRAGONMAW_SUBJUGATOR 21718 -#define CREATURE_ESCAPE_DUMMY 22317 +}; class npc_enslaved_netherwing_drake : public CreatureScript { @@ -245,7 +252,7 @@ public: me->setFaction(FACTION_FRIENDLY); DoCast(caster, SPELL_FORCE_OF_NELTHARAKU, true); - Unit* Dragonmaw = me->FindNearestCreature(CREATURE_DRAGONMAW_SUBJUGATOR, 50); + Unit* Dragonmaw = me->FindNearestCreature(NPC_DRAGONMAW_SUBJUGATOR, 50); if (Dragonmaw) { me->AddThreat(Dragonmaw, 100000.0f); @@ -304,7 +311,7 @@ public: dz += 20; // so it's in the air, not ground*/ Position pos; - if (Unit* EscapeDummy = me->FindNearestCreature(CREATURE_ESCAPE_DUMMY, 30)) + if (Unit* EscapeDummy = me->FindNearestCreature(NPC_ESCAPE_DUMMY, 30)) EscapeDummy->GetPosition(&pos); else { @@ -663,7 +670,7 @@ class npc_karynaku : public CreatureScript # npc_overlord_morghor # this whole script is wrong and needs a rewrite.even the illidan npc used is the wrong one.npc id 23467 may be the correct one ####*/ -enum eOverlordData +enum OverlordData { QUEST_LORD_ILLIDAN_STORMRAGE = 11108, @@ -980,7 +987,7 @@ public: # npc_earthmender_wilda ####*/ -enum eEarthmender +enum Earthmender { SAY_WIL_START = 0, SAY_WIL_AGGRO = 1, @@ -1758,45 +1765,48 @@ public: # npc_enraged_spirits ####*/ -/* QUESTS */ -#define QUEST_ENRAGED_SPIRITS_FIRE_EARTH 10458 -#define QUEST_ENRAGED_SPIRITS_AIR 10481 -#define QUEST_ENRAGED_SPIRITS_WATER 10480 - -/* Totem */ -#define ENTRY_TOTEM_OF_SPIRITS 21071 -#define RADIUS_TOTEM_OF_SPIRITS 15 - -/* SPIRITS */ -#define ENTRY_ENRAGED_EARTH_SPIRIT 21050 -#define ENTRY_ENRAGED_FIRE_SPIRIT 21061 -#define ENTRY_ENRAGED_AIR_SPIRIT 21060 -#define ENTRY_ENRAGED_WATER_SPIRIT 21059 - -/* SOULS */ -#define ENTRY_EARTHEN_SOUL 21073 -#define ENTRY_FIERY_SOUL 21097 -#define ENTRY_ENRAGED_AIRY_SOUL 21116 -#define ENTRY_ENRAGED_WATERY_SOUL 21109 // wrong model - -/* SPELL KILLCREDIT - not working!?! - using KilledMonsterCredit */ -#define SPELL_EARTHEN_SOUL_CAPTURED_CREDIT 36108 -#define SPELL_FIERY_SOUL_CAPTURED_CREDIT 36117 -#define SPELL_AIRY_SOUL_CAPTURED_CREDIT 36182 -#define SPELL_WATERY_SOUL_CAPTURED_CREDIT 36171 - -/* KilledMonsterCredit Workaround */ -#define CREDIT_FIRE 21094 -#define CREDIT_WATER 21095 -#define CREDIT_AIR 21096 -#define CREDIT_EARTH 21092 - -/* Captured Spell/Buff */ -#define SPELL_SOUL_CAPTURED 36115 - -/* Factions */ -#define ENRAGED_SOUL_FRIENDLY 35 -#define ENRAGED_SOUL_HOSTILE 14 +enum Enraged_Dpirits +{ +// QUESTS + QUEST_ENRAGED_SPIRITS_FIRE_EARTH = 10458, + QUEST_ENRAGED_SPIRITS_AIR = 10481, + QUEST_ENRAGED_SPIRITS_WATER = 10480, + + // Totem + ENTRY_TOTEM_OF_SPIRITS = 21071, + RADIUS_TOTEM_OF_SPIRITS = 15, + + // SPIRITS + NPC_ENRAGED_EARTH_SPIRIT = 21050, + NPC_ENRAGED_FIRE_SPIRIT = 21061, + NPC_ENRAGED_AIR_SPIRIT = 21060, + NPC_ENRAGED_WATER_SPIRIT = 21059, + + // SOULS + NPC_EARTHEN_SOUL = 21073, + NPC_FIERY_SOUL = 21097, + NPC_ENRAGED_AIRY_SOUL = 21116, + NPC_ENRAGED_WATERY_SOUL = 21109, // wrong model + + // SPELL KILLCREDIT - not working!?! - using KilledMonsterCredit + SPELL_EARTHEN_SOUL_CAPTURED_CREDIT = 36108, + SPELL_FIERY_SOUL_CAPTURED_CREDIT = 36117, + SPELL_AIRY_SOUL_CAPTURED_CREDIT = 36182, + SPELL_WATERY_SOUL_CAPTURED_CREDIT = 36171, + + // KilledMonsterCredit Workaround + NPC_CREDIT_FIRE = 21094, + NPC_CREDIT_WATER = 21095, + NPC_CREDIT_AIR = 21096, + NPC_CREDIT_EARTH = 21092, + + // Captured Spell / Buff + SPELL_SOUL_CAPTURED = 36115, + + // Factions + FACTION_ENRAGED_SOUL_FRIENDLY = 35, + FACTION_ENRAGED_SOUL_HOSTILE = 14 +}; class npc_enraged_spirit : public CreatureScript { @@ -1826,26 +1836,28 @@ public: switch (me->GetEntry()) { - case ENTRY_ENRAGED_FIRE_SPIRIT: - entry = ENTRY_FIERY_SOUL; - //credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT; - credit = CREDIT_FIRE; - break; - case ENTRY_ENRAGED_EARTH_SPIRIT: - entry = ENTRY_EARTHEN_SOUL; - //credit = SPELL_EARTHEN_SOUL_CAPTURED_CREDIT; - credit = CREDIT_EARTH; - break; - case ENTRY_ENRAGED_AIR_SPIRIT: - entry = ENTRY_ENRAGED_AIRY_SOUL; - //credit = SPELL_AIRY_SOUL_CAPTURED_CREDIT; - credit = CREDIT_AIR; - break; - case ENTRY_ENRAGED_WATER_SPIRIT: - entry = ENTRY_ENRAGED_WATERY_SOUL; - //credit = SPELL_WATERY_SOUL_CAPTURED_CREDIT; - credit = CREDIT_WATER; - break; + case NPC_ENRAGED_FIRE_SPIRIT: + entry = NPC_FIERY_SOUL; + //credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_FIRE; + break; + case NPC_ENRAGED_EARTH_SPIRIT: + entry = NPC_EARTHEN_SOUL; + //credit = SPELL_EARTHEN_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_EARTH; + break; + case NPC_ENRAGED_AIR_SPIRIT: + entry = NPC_ENRAGED_AIRY_SOUL; + //credit = SPELL_AIRY_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_AIR; + break; + case NPC_ENRAGED_WATER_SPIRIT: + entry = NPC_ENRAGED_WATERY_SOUL; + //credit = SPELL_WATERY_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_WATER; + break; + default: + break; } // Spawn Soul on Kill ALWAYS! @@ -1861,7 +1873,7 @@ public: totemOspirits = me->FindNearestCreature(ENTRY_TOTEM_OF_SPIRITS, RADIUS_TOTEM_OF_SPIRITS); if (totemOspirits) { - Summoned->setFaction(ENRAGED_SOUL_FRIENDLY); + Summoned->setFaction(FACTION_ENRAGED_SOUL_FRIENDLY); Summoned->GetMotionMaster()->MovePoint(0, totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ()); if (Unit* owner = totemOspirits->GetOwner()) diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 06b34a8f0e2..0241a5cb4ed 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -46,7 +46,7 @@ EndContentData */ #define GOSSIP_RALIQ "You owe Sim'salabim money. Hand them over or die!" -enum eRaliq +enum Raliq { SPELL_UPPERCUT = 10966, QUEST_CRACK_SKULLS = 10009, @@ -120,11 +120,19 @@ public: # npc_salsalabim ######*/ -#define FACTION_HOSTILE_SA 90 -#define FACTION_FRIENDLY_SA 35 -#define QUEST_10004 10004 +enum Salsalabim +{ + // Factions + FACTION_HOSTILE_SA = 90, + FACTION_FRIENDLY_SA = 35, + + // Quests + QUEST_10004 = 10004, -#define SPELL_MAGNETIC_PULL 31705 + // Spells + SPELL_MAGNETIC_PULL = 31705 + +}; class npc_salsalabim : public CreatureScript { diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index fc43dac2c5d..45ff3477307 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -281,13 +281,17 @@ public: ## npc_netherweb_victim ######*/ -#define QUEST_TARGET 22459 -//#define SPELL_FREE_WEBBED 38950 +enum NetherwebVictim +{ + QUEST_TARGET = 22459 + //SPELL_FREE_WEBBED = 38950 +}; const uint32 netherwebVictims[6] = { 18470, 16805, 21242, 18452, 22482, 21285 }; + class npc_netherweb_victim : public CreatureScript { public: @@ -338,7 +342,7 @@ public: #define GOSSIP_FLOON1 "You owe Sim'salabim money. Hand them over or die!" #define GOSSIP_FLOON2 "Hand over the money or die...again!" -enum eFloon +enum Floon { SAY_FLOON_ATTACK = 0, @@ -441,7 +445,7 @@ public: /*###### ## npc_isla_starmane ######*/ -enum eIslaStarmaneData +enum IslaStarmaneData { SAY_PROGRESS_1 = 0, SAY_PROGRESS_2 = 1, @@ -596,7 +600,7 @@ public: ## npc_slim ######*/ -enum eSlim +enum Slim { FACTION_CONSORTIUM = 933 }; @@ -633,7 +637,7 @@ public: ####npc_akuno #####*/ -enum eAkuno +enum Akuno { QUEST_ESCAPING_THE_TOMB = 10887, NPC_CABAL_SKRIMISHER = 21661 diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 1f98d4aa337..9a70896f44b 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -161,7 +161,7 @@ public: #define GOSSIP_COOSH "You owe Sim'salabim money. Hand them over or die!" -enum eCooshhooosh +enum Cooshhooosh { SPELL_LIGHTNING_BOLT = 9532, QUEST_CRACK_SKULLS = 10009, @@ -323,7 +323,7 @@ public: ## npc_kayra_longmane ######*/ -enum eKayra +enum Kayra { SAY_START = 0, SAY_AMBUSH1 = 1, @@ -404,7 +404,7 @@ public: #define GOSSIP_TIMOTHY_DANIELS_ITEM1 "Specialist, eh? Just what kind of specialist are you, anyway?" #define GOSSIP_TEXT_BROWSE_POISONS "Let me browse your reagents and poison supplies." -enum eTimothy +enum Timothy { GOSSIP_TEXTID_TIMOTHY_DANIELS1 = 9239 }; diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 5b55b532566..b75c4995e65 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -1117,7 +1117,11 @@ class spell_q9452_cast_net: public SpellScriptLoader #define SAY_1 "Sons of Hodir! I humbly present to you..." #define SAY_2 "The Helm of Hodir!" -#define NPC_KILLCREDIT 30210 // Hodir's Helm KC Bunny + +enum HodirsHelm +{ + NPC_KILLCREDIT = 30210 // Hodir's Helm KC Bunny +}; class spell_q12987_read_pronouncement : public SpellScriptLoader { diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 391c7b75c89..388a4fbfcf2 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -43,7 +43,7 @@ EndContentData */ ## at_coilfang_waterfall ######*/ -enum eCoilfangGOs +enum CoilfangGOs { GO_COILFANG_WATERFALL = 184212 }; @@ -71,7 +71,7 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript ## at_legion_teleporter #####*/ -enum eLegionTeleporter +enum LegionTeleporter { SPELL_TELE_A_TO = 37387, QUEST_GAINING_ACCESS_A = 10589, @@ -115,7 +115,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript ## at_stormwright_shelf ######*/ -enum eStormwrightShelf +enum StormwrightShelf { QUEST_STRENGTH_OF_THE_TEMPEST = 12741, @@ -144,7 +144,7 @@ class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript ## at_scent_larkorwi ######*/ -enum eScentLarkorwi +enum ScentLarkorwi { QUEST_SCENT_OF_LARKORWI = 4291, NPC_LARKORWI_MATE = 9683 @@ -175,7 +175,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript ## at_last_rites #####*/ -enum eAtLastRites +enum AtLastRites { QUEST_LAST_RITES = 12019, QUEST_BREAKING_THROUGH = 11898, @@ -226,7 +226,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript ## at_sholazar_waygate ######*/ -enum eWaygate +enum Waygate { SPELL_SHOLAZAR_TO_UNGORO_TELEPORT = 52056, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT = 52057, diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 393244c9ac5..57846aba9ff 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -396,7 +396,10 @@ public: ## go_sacred_fire_of_life ######*/ -#define NPC_ARIKARA 10882 +enum SacredFireOfLife +{ + NPC_ARIKARA = 10882 +}; class go_sacred_fire_of_life : public GameObjectScript { @@ -773,7 +776,11 @@ public: ## go_blood_filled_orb ######*/ -#define NPC_ZELEMAR 17830 +enum BloodFilledOrb +{ + NPC_ZELEMAR = 17830 + +}; class go_blood_filled_orb : public GameObjectScript { diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 67cf3b8d582..b4bc9720e74 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -39,7 +39,7 @@ EndContentData */ # item_only_for_flight #####*/ -enum eOnlyForFlight +enum OnlyForFlight { SPELL_ARCANE_CHARGES = 45072 }; @@ -189,7 +189,7 @@ public: # item_pile_fake_furs #####*/ -enum ePileFakeFur +enum PileFakeFur { GO_CARIBOU_TRAP_1 = 187982, GO_CARIBOU_TRAP_2 = 187995, @@ -256,7 +256,7 @@ public: # item_petrov_cluster_bombs #####*/ -enum ePetrovClusterBombs +enum PetrovClusterBombs { SPELL_PETROV_BOMB = 42406, AREA_ID_SHATTERED_STRAITS = 4064, @@ -291,7 +291,7 @@ public: # item_dehta_trap_smasher # For quest 11876, Help Those That Cannot Help Themselves ######*/ -enum eHelpThemselves +enum HelpThemselves { QUEST_CANNOT_HELP_THEMSELVES = 11876, NPC_TRAPPED_MAMMOTH_CALF = 25850, @@ -386,7 +386,7 @@ public: } }; -enum eCapturedFrog +enum CapturedFrog { QUEST_THE_PERFECT_SPIES = 25444, NPC_VANIRAS_SENTRY_TOTEM = 40187 diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 4d181880c99..358bf997508 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -30,9 +30,11 @@ EndScriptData */ #include "Player.h" #include "WorldSession.h" -#define HALLOWEEN_EVENTID 12 -#define SPELL_TRICK_OR_TREATED 24755 -#define SPELL_TREAT 24715 +enum Spells +{ + SPELL_TRICK_OR_TREATED = 24755, + SPELL_TREAT = 24715 +}; #define LOCALE_TRICK_OR_TREAT_0 "Trick or Treat!" #define LOCALE_TRICK_OR_TREAT_2 "Des bonbons ou des blagues!" @@ -49,7 +51,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED)) + if (IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { const char* localizedEntry; switch (player->GetSession()->GetSessionDbcLocale()) @@ -59,7 +61,7 @@ public: case LOCALE_esES: localizedEntry = LOCALE_TRICK_OR_TREAT_6; break; case LOCALE_enUS: default: localizedEntry = LOCALE_TRICK_OR_TREAT_0; } - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); } if (creature->IsQuestGiver()) @@ -87,7 +89,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED)) + if (action == GOSSIP_ACTION_INFO_DEF + 1 && IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { player->CastSpell(player, SPELL_TRICK_OR_TREATED, true); diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index ff37c88adae..4180005ff3d 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -767,7 +767,7 @@ public: # engineering trinkets ###*/ -enum eEngineeringTrinkets +enum EngineeringTrinkets { NPC_ZAP = 14742, NPC_JHORDY = 14743, diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 5301f8fa2c4..bf3f0fe3a8c 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -77,7 +77,7 @@ struct SpawnAssociation SpawnType spawnType; }; -enum eEnums +enum AirFoceBots { SPELL_GUARDS_MARK = 38067, AURA_DURATION_TIME_LEFT = 5000 @@ -412,9 +412,12 @@ public: ## npc_dancing_flames ######*/ -#define SPELL_BRAZIER 45423 -#define SPELL_SEDUCTION 47057 -#define SPELL_FIERY_AURA 45427 +enum DancingFlames +{ + SPELL_BRAZIER = 45423, + SPELL_SEDUCTION = 47057, + SPELL_FIERY_AURA = 45427 +}; class npc_dancing_flames : public CreatureScript { @@ -1109,7 +1112,10 @@ public: ## npc_guardian ######*/ -#define SPELL_DEATHTOUCH 5 +enum GuardianSpells +{ + SPELL_DEATHTOUCH = 5 +}; class npc_guardian : public CreatureScript { @@ -1327,17 +1333,20 @@ public: ## npc_sayge ######*/ -#define SPELL_DMG 23768 //dmg -#define SPELL_RES 23769 //res -#define SPELL_ARM 23767 //arm -#define SPELL_SPI 23738 //spi -#define SPELL_INT 23766 //int -#define SPELL_STM 23737 //stm -#define SPELL_STR 23735 //str -#define SPELL_AGI 23736 //agi -#define SPELL_FORTUNE 23765 //faire fortune - -#define GOSSIP_HELLO_SAYGE "Yes" +enum Sayge +{ + SPELL_DMG = 23768, // dmg + SPELL_RES = 23769, // res + SPELL_ARM = 23767, // arm + SPELL_SPI = 23738, // spi + SPELL_INT = 23766, // int + SPELL_STM = 23737, // stm + SPELL_STR = 23735, // str + SPELL_AGI = 23736, // agi + SPELL_FORTUNE = 23765 // faire fortune +}; + +#define GOSSIP_HELLO_SAYGE "Yes" #define GOSSIP_SENDACTION_SAYGE1 "Slay the Man" #define GOSSIP_SENDACTION_SAYGE2 "Turn him over to liege" #define GOSSIP_SENDACTION_SAYGE3 "Confiscate the corn" @@ -1516,7 +1525,10 @@ public: } }; -#define SPELL_TONK_MINE_DETONATE 25099 +enum TonkMine +{ + SPELL_TONK_MINE_DETONATE = 25099 +}; class npc_tonk_mine : public CreatureScript { @@ -1592,14 +1604,14 @@ public: ## npc_snake_trap_serpents ####*/ -#define SPELL_MIND_NUMBING_POISON 25810 //Viper -#define SPELL_DEADLY_POISON 34655 //Venomous Snake -#define SPELL_CRIPPLING_POISON 30981 //Viper - -#define VENOMOUS_SNAKE_TIMER 1500 -#define VIPER_TIMER 3000 +enum SnakeTrapSerpents +{ + SPELL_MIND_NUMBING_POISON = 25810, // Viper + SPELL_DEADLY_POISON = 34655, // Venomous Snake + SPELL_CRIPPLING_POISON = 30981, // Viper -#define C_VIPER 19921 + NPC_VIPER = 19921 +}; class npc_snake_trap : public CreatureScript { @@ -1621,7 +1633,7 @@ public: CreatureTemplate const* Info = me->GetCreatureTemplate(); - IsViper = Info->Entry == C_VIPER ? true : false; + IsViper = Info->Entry == NPC_VIPER ? true : false; me->SetMaxHealth(uint32(107 * (me->getLevel() - 40) * 0.025f)); //Add delta to make them not all hit the same time @@ -1683,13 +1695,13 @@ public: DoCastVictim(spell); } - SpellTimer = VIPER_TIMER; + SpellTimer = 3000; } else //Venomous Snake { if (urand(0, 2) == 0) //33% chance to cast DoCastVictim(SPELL_DEADLY_POISON); - SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() % 5) * 100; + SpellTimer = 1500 + (rand() % 5) * 100; } } else @@ -1972,7 +1984,7 @@ class npc_lightwell : public CreatureScript } }; -enum eTrainingDummy +enum TrainingDummy { NPC_ADVANCED_TARGET_DUMMY = 2674, NPC_TARGET_DUMMY = 2673 @@ -2087,9 +2099,13 @@ class npc_shadowfiend : public CreatureScript /*###### # npc_fire_elemental ######*/ -#define SPELL_FIRENOVA 12470 -#define SPELL_FIRESHIELD 13376 -#define SPELL_FIREBLAST 57984 + +enum FireElemental +{ + SPELL_FIRENOVA = 12470, + SPELL_FIRESHIELD = 13376, + SPELL_FIREBLAST = 57984 +}; class npc_fire_elemental : public CreatureScript { @@ -2157,7 +2173,11 @@ public: /*###### # npc_earth_elemental ######*/ -#define SPELL_ANGEREDEARTH 36213 + +enum EarthElemental +{ + SPELL_ANGEREDEARTH = 36213 +}; class npc_earth_elemental : public CreatureScript { @@ -2314,7 +2334,7 @@ class npc_wormhole : public CreatureScript ## npc_pet_trainer ######*/ -enum ePetTrainer +enum PetTrainer { TEXT_ISHUNTER = 5838, TEXT_NOTHUNTER = 5839, @@ -2378,7 +2398,7 @@ public: ## npc_locksmith ######*/ -enum eLockSmith +enum LockSmith { QUEST_HOW_TO_BRAKE_IN_TO_THE_ARCATRAZ = 10704, QUEST_DARK_IRON_LEGACY = 3802, -- cgit v1.2.3 From 3afd29e3e4bd3bcf8e0f4100474b88321339510a Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 6 Jul 2013 01:03:43 +0200 Subject: SQL: Fix missing newlines --- sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql b/sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql index 026fdd57f8f..07be40f8565 100644 --- a/sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql +++ b/sql/updates/world/2013_07_06_00_world_spelldifficulty_dbc.sql @@ -16,4 +16,4 @@ INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`,`spellid2`,`spelli (33529,33529,38143,0,0), (29107,29107,55543,0,0), (36383,36383,39382,0,0), -(32302,32302,38382,0,0); \ No newline at end of file +(32302,32302,38382,0,0); -- cgit v1.2.3 From b49beae2f4fc90ef7865f7418e0b9d1337a2fa1d Mon Sep 17 00:00:00 2001 From: untaught Date: Sat, 6 Jul 2013 15:24:55 +0200 Subject: DB/SAI: fix some issues with Quest: Song of Reflection Closes #7662 --- sql/updates/world/2013_07_05_04_world_sai.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sql/updates/world/2013_07_05_04_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_05_04_world_sai.sql b/sql/updates/world/2013_07_05_04_world_sai.sql new file mode 100644 index 00000000000..dc493837814 --- /dev/null +++ b/sql/updates/world/2013_07_05_04_world_sai.sql @@ -0,0 +1,12 @@ +DELETE FROM `disables` WHERE `sourcetype`=0 AND `entry`=53038 AND `flags`=64; +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES +(0,53038,64, '', '', 'Disable Vmaps for Didgeridoo of Contemplation'); + +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (29056,29057,29069,29058); +UPDATE `creature_template` SET `ainame`='SmartAI',`scriptname`='' WHERE `entry` IN (29056,29057,29069,29058); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (29056,29057,29069,29058) AND `source_type`=0; +INSERT INTO `smart_scripts` VALUES +(29056,0,0,0,8,0,100,0,53038,0,0,0,33,29056,0,0,0,0,0,7,0,0,0,0,0,0,0,'Glimmering Pillar Credit - On Spell Hit - Give Quest Credit'), +(29057,0,0,0,8,0,100,0,53038,0,0,0,33,29057,0,0,0,0,0,7,0,0,0,0,0,0,0,'Mosslight Pillar Credit - On Spell Hit - Give Quest Credit'), +(29069,0,0,0,8,0,100,0,53038,0,0,0,33,29069,0,0,0,0,0,7,0,0,0,0,0,0,0,'Skyreach Pillar Credit - On Spell Hit - Give Quest Credit'), +(29058,0,0,0,8,0,100,0,53038,0,0,0,33,29058,0,0,0,0,0,7,0,0,0,0,0,0,0,'Suntouched Pillar Credit - On Spell Hit - Give Quest Credit'); -- cgit v1.2.3 From 144026fad377e65ac4d90e8990917ebc54b156db Mon Sep 17 00:00:00 2001 From: dr-j Date: Sat, 6 Jul 2013 16:59:58 +0200 Subject: DB/Conditions: Correct quest requirements for To Bor'gorok Outpost, Quickly! (Again) Closes #9847 --- sql/updates/world/2013_07_06_01_world_conditions.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2013_07_06_01_world_conditions.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_06_01_world_conditions.sql b/sql/updates/world/2013_07_06_01_world_conditions.sql new file mode 100644 index 00000000000..fd26b9a3409 --- /dev/null +++ b/sql/updates/world/2013_07_06_01_world_conditions.sql @@ -0,0 +1,17 @@ +UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `Id`=12486; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) and `SourceEntry`IN(11595,11596,11597,12486); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(20,0,12486,0,0,8,0,11595,0,0,0,0,0, '', 'To Bor gorok Outpost,Quickly! once The Defense of Warsong Hold Has been completed'), +(19,0,12486,0,0,8,0,11595,0,0,0,0,0, '', 'To Bor gorok Outpost,Quickly! once The Defense of Warsong Hold Has been completed'), +(20,0,12486,0,1,8,0,11596,0,0,0,0,0, '', 'To Bor gorok Outpost,Quickly! once The Defense of Warsong Hold Has been completed'), +(19,0,12486,0,1,8,0,11596,0,0,0,0,0, '', 'To Bor gorok Outpost,Quickly! once The Defense of Warsong Hold Has been completed'), +(20,0,12486,0,2,8,0,11597,0,0,0,0,0, '', 'To Bor gorok Outpost,Quickly! once The Defense of Warsong Hold Has been completed'), +(19,0,12486,0,2,8,0,11597,0,0,0,0,0, '', 'To Bor gorok Outpost,Quickly! once The Defense of Warsong Hold Has been completed'), +(20,0,11595,0,0,8,0,7784,0,0,0,0,0, '', 'Defense of Warsong Hold (11595) Only if player has completed The Lord of Blackrock'), +(19,0,11595,0,0,8,0,7784,0,0,0,0,0, '', 'Defense of Warsong Hold (11595) Only if player has completed The Lord of Blackrock'), +(20,0,11596,0,0,8,0,7784,0,0,1,0,0, '', 'Defense of Warsong Hold (11596) Only if player has not completed The Lord of Blackrock'), +(19,0,11596,0,0,8,0,7784,0,0,1,0,0, '', 'Defense of Warsong Hold (11596) Only if player has not completed The Lord of Blackrock'), +(20,0,11596,0,0,8,0,8743,0,0,1,0,0, '', 'Defense of Warsong Hold (11596) Only if player has not completed Bang a Gong'), +(19,0,11596,0,0,8,0,8743,0,0,1,0,0, '', 'Defense of Warsong Hold (11596) Only if player has not completed Bang a Gong'), +(20,0,11597,0,0,8,0,8743,0,0,0,0,0, '', 'Defense of Warsong Hold (11597) Only if player has completed Bang a Gong'), +(19,0,11597,0,0,8,0,8743,0,0,0,0,0, '', 'Defense of Warsong Hold (11597) Only if player has completed Bang a Gong'); -- cgit v1.2.3 From f636510b6179f2bbbd7210a820d61929ebb2f1c0 Mon Sep 17 00:00:00 2001 From: baric Date: Sat, 6 Jul 2013 17:02:33 +0200 Subject: DB/Loot: correct serpentbloom looting Closes #9940 --- sql/updates/world/2013_07_06_02_world_gobj_loot_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2013_07_06_02_world_gobj_loot_template.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_06_02_world_gobj_loot_template.sql b/sql/updates/world/2013_07_06_02_world_gobj_loot_template.sql new file mode 100644 index 00000000000..8b06691321a --- /dev/null +++ b/sql/updates/world/2013_07_06_02_world_gobj_loot_template.sql @@ -0,0 +1,3 @@ +DELETE FROM `gameobject_loot_template` WHERE `entry`=2772; +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) +VALUES (2772,5339,-100,1,0,1,1); -- cgit v1.2.3 From f5fe0c28cc69a58533a7c47663091abc46cd13a8 Mon Sep 17 00:00:00 2001 From: dr-j Date: Sat, 6 Jul 2013 17:04:13 +0200 Subject: DB/Creature: update flags for Norgannon's Shell Closes #10206 --- sql/updates/world/2013_07_06_03_world_creature_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2013_07_06_03_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_06_03_world_creature_template.sql b/sql/updates/world/2013_07_06_03_world_creature_template.sql new file mode 100644 index 00000000000..04d8f545d45 --- /dev/null +++ b/sql/updates/world/2013_07_06_03_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256 &~512 WHERE `entry`=29775; -- cgit v1.2.3 From 0c911af24c263c4e931c7264242c9755074d270d Mon Sep 17 00:00:00 2001 From: Hobbilis Date: Sat, 6 Jul 2013 17:07:50 +0200 Subject: DB/SAI: Converting Axtroz EventAI to SmartAI Closes #9610 --- sql/updates/world/2013_07_06_04_world_sai.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2013_07_06_04_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_06_04_world_sai.sql b/sql/updates/world/2013_07_06_04_world_sai.sql new file mode 100644 index 00000000000..77bd130d8b6 --- /dev/null +++ b/sql/updates/world/2013_07_06_04_world_sai.sql @@ -0,0 +1,9 @@ +SET @AXTROZ := 12899; +DELETE FROM `creature_ai_scripts` WHERE `creature_id` = @AXTROZ; +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = @AXTROZ; +-- SAI for Axtroz +DELETE FROM `smart_scripts` WHERE `entryorguid`=@AXTROZ AND `source_type`=0; +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 +(@AXTROZ,0,0,0,0,0,100,0,6100,7100,16200,16200,11,20712,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Axtroz - In Combat - Cast Flame Breath'), +(@AXTROZ,0,1,0,0,0,100,0,8300,13300,7700,11400,11,16095,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Axtroz - In Combat - Cast Vicious Rend'), +(@AXTROZ,0,2,0,0,0,90,0,4600,5200,6400,11800,11,20714,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Axtroz - In Combat - Cast Fireball'); -- cgit v1.2.3 From dc5936a296456e74d0589cd6a935eb9f94ee989c Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 7 Jul 2013 20:14:52 +0200 Subject: DB/Misc: Fix some runtime errors Also spawns 2 missing doors on Old Hyjal, this doors needs to be scripted. --- sql/updates/world/2013_07_07_00_world_misc.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2013_07_07_00_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_07_00_world_misc.sql b/sql/updates/world/2013_07_07_00_world_misc.sql new file mode 100644 index 00000000000..3ad7dc08da1 --- /dev/null +++ b/sql/updates/world/2013_07_07_00_world_misc.sql @@ -0,0 +1,8 @@ +-- Fix some runtime errors +UPDATE `creature` SET `MovementType`=0 WHERE `guid`=142347,142368,142371,142376,142378,142379; +UPDATE `creature` SET `modelid`=0 WHERE `id` = 30169; +-- Add missing doors on old Hyjal +DELETE FROM `gameobject` WHERE `guid` IN (4658,4695); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(4658, 182060, 534, 1, 1, 4270.964, -4143.027, 870.7232, 6.020715, 0, 0, 0.8829476, -0.4694716, 7200, 255, 1), +(4695, 182061, 534, 1, 1, 4204.479, -4112.277, 877.9128, 4.985382, 0, 0, 0.8829476, -0.4694716, 7200, 255, 1); -- cgit v1.2.3 From 7202e40618c392487888423f45face284ef703c4 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 7 Jul 2013 20:16:48 +0200 Subject: DB/Misc: Fix typo --- sql/updates/world/2013_07_07_00_world_misc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/updates/world/2013_07_07_00_world_misc.sql b/sql/updates/world/2013_07_07_00_world_misc.sql index 3ad7dc08da1..65fe90423e8 100644 --- a/sql/updates/world/2013_07_07_00_world_misc.sql +++ b/sql/updates/world/2013_07_07_00_world_misc.sql @@ -1,5 +1,5 @@ -- Fix some runtime errors -UPDATE `creature` SET `MovementType`=0 WHERE `guid`=142347,142368,142371,142376,142378,142379; +UPDATE `creature` SET `MovementType`=0 WHERE `guid` IN (142347,142368,142371,142376,142378,142379); UPDATE `creature` SET `modelid`=0 WHERE `id` = 30169; -- Add missing doors on old Hyjal DELETE FROM `gameobject` WHERE `guid` IN (4658,4695); -- cgit v1.2.3 From 5a6eacfa3361c87c776915204caef9be2851486e Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 7 Jul 2013 20:34:26 +0200 Subject: DB/Spawns: Add missing Gameobjects into The Shattered Halls Note: some doors needs to be scripted after this. --- sql/updates/world/2013_07_07_01_world_misc.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 sql/updates/world/2013_07_07_01_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_07_01_world_misc.sql b/sql/updates/world/2013_07_07_01_world_misc.sql new file mode 100644 index 00000000000..e6e9e07e04e --- /dev/null +++ b/sql/updates/world/2013_07_07_01_world_misc.sql @@ -0,0 +1,19 @@ +-- Add missing Gameobjects into The Shattered Halls +DELETE FROM `gameobject` WHERE `guid` IN (4700,4712,4713,4719,4720,4752,4756,4779,4796,4806,4842,4853,4857,4932,4940,4944); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(4700, 182539, 540, 1, 1, 141.5157, 266.3664, -11.56821, 3.141593, 0, 0, 1, 0, 7200, 255, 1), +(4712, 182540, 540, 1, 1, 214.4881, 266.1671, -11.51811, 0, 0, 0, 1, 0, 7200, 255, 1), +(4713, 181915, 540, 1, 1, 464.7611, 315.0286, 1.929426, 4.204196, 0, 0, 0, 1, 7200, 255, 1), +(4719, 181915, 540, 1, 1, 403.0749, 322.5745, 1.894548, 2.034194, 0, 0, 0, 1, 7200, 255, 1), +(4720, 181915, 540, 1, 1, 469.9535, 313.0817, 1.918688, 5.924535, 0, 0, 0, 1, 7200, 255, 1), +(4752, 181915, 540, 1, 1, 445.6028, 316.2987, 1.912614, 3.658597, 0, 0, 0, 1, 7200, 255, 1), +(4756, 181671, 540, 1, 1, 330.7506, 74.20586, 1.079237, 3.159062, 0, 0, 0, 1, 7200, 255, 1), +(4779, 181671, 540, 1, 1, 330.7946, 41.02605, 1.070399, 0.01745246, 0, 0, 0, 1, 7200, 255, 1), +(4796, 181439, 540, 1, 1, 260.3188, -79.31659, -6.418934, 5.846854, 0, 0, 1, 0, 7200, 255, 1), +(4806, 181438, 540, 1, 1, 257.0056, -102.1912, -5.668888, 4.450591, 0, 0, 1, 0, 7200, 255, 1), +(4842, 181435, 540, 1, 1, 242.159, -75.06284, -9.304095, 4.886921, 0, 0, 1, 0, 7200, 255, 1), +(4853, 181436, 540, 1, 1, 232.8329, -98.32433, -11.76173, 0.6981294, 0, 0, 1, 0, 7200, 255, 1), +(4857, 181441, 540, 1, 1, 220.3093, -54.90799, -6.456299, 2.007125, 0, 0, 1, 0, 7200, 255, 1), +(4932, 181437, 540, 1, 1, 222.6859, -78.63619, -11.1251, 3.752462, 0, 0, 1, 0, 7200, 255, 1), +(4940, 181440, 540, 1, 1, 215.4215, -112.6428, -6.456299, 2.007125, 0, 0, 1, 0, 7200, 255, 1), +(4944, 181442, 540, 1, 1, 197.2586, -84.19016, -7.345709, 2.007125, 0, 0, 1, 0, 7200, 255, 1); -- cgit v1.2.3 From bebae5d3fadfaffc3ab9292511df6406b7abe767 Mon Sep 17 00:00:00 2001 From: blub Date: Mon, 8 Jul 2013 16:38:48 +0200 Subject: Create 2013_07_08_00_world_gameobject.sql SQL: Fix fail in 5a6eacfa3361c87c776915204caef9be2851486e --- sql/updates/world/2013_07_08_00_world_gameobject.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2013_07_08_00_world_gameobject.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_08_00_world_gameobject.sql b/sql/updates/world/2013_07_08_00_world_gameobject.sql new file mode 100644 index 00000000000..bd628379002 --- /dev/null +++ b/sql/updates/world/2013_07_08_00_world_gameobject.sql @@ -0,0 +1 @@ +UPDATE `gameobject` SET `spawnMask`=3 WHERE `guid` IN (4700,4712,4713,4719,4720,4752,4756,4779,4796,4806,4842,4853,4857,4932,4940,4944); -- cgit v1.2.3 From 92eec6831a5f0bc32b641f85515ce4c9d243e24d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 8 Jul 2013 12:39:32 -0230 Subject: Core: Scripting: Shade of Akama WIP --- sql/updates/world/2013_07_08_01_world_misc.sql | 77 + .../scripts/Outland/BlackTemple/black_temple.h | 4 +- .../Outland/BlackTemple/boss_shade_of_akama.cpp | 1485 +++++++++++--------- .../Outland/BlackTemple/instance_black_temple.cpp | 54 +- 4 files changed, 907 insertions(+), 713 deletions(-) create mode 100644 sql/updates/world/2013_07_08_01_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_08_01_world_misc.sql b/sql/updates/world/2013_07_08_01_world_misc.sql new file mode 100644 index 00000000000..ae116a3059d --- /dev/null +++ b/sql/updates/world/2013_07_08_01_world_misc.sql @@ -0,0 +1,77 @@ +-- Pathing for Akama Entry: 23191 +SET @PATH := 847160; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,517.4877,400.7993,112.7837,0,0,0,0,100,0), +(@PATH,2,517.4877,400.7993,112.7837,3.118662,0,0,0,100,0); + +SET @GOSSIP := 21335; +SET @TEXTID := 10866; +UPDATE `creature_template` SET `gossip_menu_id`=@GOSSIP WHERE `entry`=23191; +UPDATE `creature_template` SET `gossip_menu_id`=0 WHERE `entry`=22990; +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTID; +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (@GOSSIP, @TEXTID); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id`=0; +INSERT INTO `gossip_menu_option` (`menu_id`, `id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`box_text`) VALUES +(@GOSSIP, 0, 0, 'I am ready to fight alongside you, Akama.', 1, 1, ''); + +UPDATE `creature` SET `id`=23191,`position_x`=547.1864,`position_y`=400.5344,`position_z`=112.8671,`orientation`=3.124139 WHERE `guid`=84716; +UPDATE `creature_template` SET `speed_walk`=1.6, `ScriptName` = 'npc_akama_shade' WHERE `entry`=23191; +UPDATE `creature_template` SET `ScriptName` = 'npc_creature_generator_akama' WHERE `entry`=23210; +UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry`=22990; + +UPDATE `creature_template` SET `speed_run`=1.7143, `AIName`= '', `flags_extra`=0, `ScriptName` = 'npc_ashtongue_defender' WHERE `entry`=23216; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23216; +DELETE FROM `creature_equip_template` WHERE `entry`=23216 AND `id`=1; +INSERT INTO `creature_equip_template` (`entry`,`id`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(23216,1,18983,31468,0); + +UPDATE `creature_template` SET `speed_run`=1.7143, `ScriptName` = 'npc_ashtongue_sorcerer' WHERE `entry`=23215; +DELETE FROM `creature_equip_template` WHERE `entry`=23215 AND `id`=1; +INSERT INTO `creature_equip_template` (`entry`,`id`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(23215,1,29685,0,0); + +UPDATE `creature_template` SET `speed_run`=1.7143, `baseattacktime`=1600, `AIName`= '', `ScriptName` = 'npc_ashtongue_rogue' WHERE `entry`=23318; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23318; + +DELETE FROM `creature_equip_template` WHERE `entry`=23318 AND `id`=1; +INSERT INTO `creature_equip_template` (`entry`,`id`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(23318,1,10612,10612,0); + +UPDATE `creature_template` SET `speed_run`=0.99206, `faction_A`=1813, `faction_H`=1813 WHERE `entry`=22847; +DELETE FROM `creature_equip_template` WHERE `entry`=22847 AND `id`=1; +INSERT INTO `creature_equip_template` (`entry`,`id`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(22847,1,29651,13924,0); + +UPDATE `creature_template` SET `speed_run`=0.99206, `faction_A`=1813, `faction_H`=1813 WHERE `entry`=22845; +DELETE FROM `creature_equip_template` WHERE `entry`=22845 AND `id`=1; +INSERT INTO `creature_equip_template` (`entry`,`id`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(22845,1,29685,0,0); + +UPDATE `creature_template` SET `speed_walk`=2, `faction_A`=1813, `faction_H`=1813 WHERE `entry`=22849; + +UPDATE `creature_template` SET `speed_run`=0.99206, `faction_A`=1813, `faction_H`=1813 WHERE `entry`=22846; + +DELETE FROM `creature_text` WHERE `entry`=23191; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(23191, 0, 0, 'Broken of the Ashtongue tribe, your leader speaks!', 14, 0, 100, 0, 0, 0, 'Akama SAY_BROKEN_FREE_0'), +(23191, 1, 0, 'The Betrayer no longer holds sway over us. His dark magic over the Ashtongue soul has been destroyed!', 14, 0, 100, 0, 0, 0, 'Akama SAY_BROKEN_FREE_1'), +(23191, 2, 0, 'Come out from the shadows! I''ve returned to lead you against our true enemy! Shed your chains and raise your weapons against your Illidari masters!', 14, 0, 100, 0, 0, 0, 'Akama SAY_BROKEN_FREE_2'); + +DELETE FROM `creature` WHERE `guid` BETWEEN 53919 AND 53929; +UPDATE `creature` SET `modelid`=0 WHERE `id`=23033; +UPDATE `creature_template` SET `AIName`='', `flags_extra`=128 WHERE `entry`=23033; + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=40607; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,40607,0,0,31,0,3,22841,0,0,'','Spell Fixate targets Shade of Akama'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=41602; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,41602,0,0,31,0,3,23191,0,0,'','Spell Threat targets Akama'); + +DELETE FROM `creature_addon` WHERE `guid`=12777; +DELETE FROM `creature_template_addon` WHERE `entry`=22841; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (22841, 1, '40973'); +UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=22841; +UPDATE `creature_template` SET `speed_walk`=1, `unit_flags`=33587200, `unit_flags2`=0 WHERE `entry`=23421; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h index 2d26fe745c2..971cc36d7ba 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.h +++ b/src/server/scripts/Outland/BlackTemple/black_temple.h @@ -19,6 +19,8 @@ #ifndef BLACK_TEMPLE_H_ #define BLACK_TEMPLE_H_ +uint32 const EncounterCount = 9; + enum DataTypes { DATA_AKAMA = 1, @@ -49,4 +51,4 @@ enum DataTypes DATA_BLOOD_ELF_COUNCIL_VOICE = 26 }; -#endif // BLACK_TEMPLE_H_ +#endif diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 04e08a517e7..1f8e57498a5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2008-2013 TrinityCore - * Copyright (C) 2006-2009 ScriptDev2 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -16,904 +15,1022 @@ * with this program. If not, see . */ -/* ScriptData -SDName: Boss_Shade_of_Akama -SD%Complete: 90 -SDComment: Seems to be complete. -SDCategory: Black Temple -EndScriptData */ +/* +Name: Boss_Shade_of_Akama +%Complete: 80 +Comment: WIP A few more adds to script, ending script, and bugs. +Category: Black Temple +*/ +#include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "GridNotifiers.h" #include "black_temple.h" -#include "Player.h" -enum ShadeOfAkama +enum Says { - SAY_DEATH = 0, - SAY_LOW_HEALTH = 1, - // Ending cinematic text - SAY_FREE = 2, - SAY_BROKEN_FREE_01 = 0, - SAY_BROKEN_FREE_02 = 1 + // Akama Ending cinematic text + SAY_BROKEN_FREE_0 = 0, + SAY_BROKEN_FREE_1 = 1, + SAY_BROKEN_FREE_2 = 2 }; -#define GOSSIP_ITEM "We are ready to fight alongside you, Akama" - -struct Location +enum Spells { - float x, y, o, z; + // Akama + SPELL_STEALTH = 34189, // On Spawn + SPELL_AKAMA_SOUL_CHANNEL = 40447, // Cast on self hits Shade + SPELL_FIXATE = 40607, // Cast on self hits Shade + SPELL_CHAIN_LIGHTNING = 39945, // Combat + SPELL_DESTRUCTIVE_POISON = 40874, // Combat + // Shade + SPELL_THREAT = 41602, // self cast hits Akama + SPELL_SHADE_OF_AKAMA_TRIGGER = 40955, // Cast on death + SPELL_AKAMA_SOUL_EXPEL_CHANNEL = 40927, // must hit shade + SPELL_AKAMA_SOUL_EXPEL = 40902, // the one he cast + // Ashtongue Channeler + SPELL_SHADE_SOUL_CHANNEL = 40401, + SPELL_SHADE_SOUL_CHANNEL_2 = 40520, + SPELL_SHADOWFORM = 40973, // Cast on Shade + // Creature Spawner + SPELL_ASHTONGUE_WAVE_B = 42035, + SPELL_SUMMON_ASHTONGUE_SORCERER = 40476, + SPELL_SUMMON_ASHTONGUE_DEFENDER = 40474, + // Ashtongue Defender + SPELL_DEBILITATING_STRIKE = 41178, + SPELL_HEROIC_STRIKE = 41975, + SPELL_SHIELD_BASH = 41180, + SPELL_WINDFURY = 38229, + // Ashtongue Rogue + SPELL_DEBILITATING_POISON = 41978, + SPELL_EVISCERATE = 41177, }; -/* Not used -static Location ChannelerLocations[]= +enum Creatures { - {463.161285f, 401.219757f, 3.141592f, 0.0f}, - {457.377625f, 391.227661f, 2.106461f, 0.0f}, - {446.012421f, 391.227661f, 1.071904f, 0.0f}, - {439.533783f, 401.219757f, 0.000000f, 0.0f}, - {446.012421f, 411.211853f, 5.210546f, 0.0f}, - {457.377625f, 411.211853f, 4.177494f, 0.0f} + NPC_ASHTONGUE_CHANNELER = 23421, + NPC_ASHTONGUE_SORCERER = 23215, + NPC_ASHTONGUE_DEFENDER = 23216, + NPC_ASHTONGUE_ELEMENTALIST = 23523, + NPC_ASHTONGUE_ROGUE = 23318, + NPC_ASHTONGUE_SPIRITBINDER = 23524, + NPC_ASHTONGUE_BROKEN = 23319, + NPC_CREATURE_SPAWNER_AKAMA = 23210 }; -*/ -static Location SpawnLocations[]= +enum Factions { - {498.652740f, 461.728119f, 0.0f, 0.0f}, - {498.505003f, 339.619324f, 0.0f, 0.0f} + FACTION_FRIENDLY = 1820, + FACTION_COMBAT = 1868 }; -static Location AkamaWP[]= +enum SetData { - {482.352448f, 401.162720f, 0.0f, 112.783928f}, - {469.597443f, 402.264404f, 0.0f, 118.537910f} + SETDATA_DATA = 1, + SETDATA_RESET = 1, + SETDATA_CHANNELER_DIED = 2, + SETDATA_START_SPAWNING = 3, + SETDATA_STOP_SPAWNING = 4, + SETDATA_DESPAWN_ALL_SPAWNS = 5, + SETDATA_START_ATTACK_AKAMA = 6 }; -static Location BrokenCoords[]= +enum Events { - {541.375916f, 401.439575f, M_PI, 112.783997f}, // The place where Akama channels - {534.130005f, 352.394531f, 2.164150f, 112.783737f}, // Behind a 'pillar' which is behind the east alcove - {499.621185f, 341.534729f, 1.652856f, 112.783730f}, // East Alcove - {499.151093f, 461.036438f, 4.770888f, 112.78370f}, // West Alcove + // Akama + EVENT_SHADE_START = 1, + EVENT_SHADE_CHANNEL = 2, + EVENT_FIXATE = 3, + EVENT_CHAIN_LIGHTNING = 4, + EVENT_DESTRUCTIVE_POISON = 5, + // Shade + EVENT_RESET_ENCOUNTER = 6, + EVENT_FIND_CHANNELERS_SPAWNERS = 7, + EVENT_SET_CHANNELERS_SPAWNERS = 8, + EVENT_START_ATTACK_AKAMA = 9, + EVENT_ADD_THREAT = 10, + // Creature spawner + EVENT_SPAWN_WAVE_B = 11, + EVENT_SUMMON_ASHTONGUE_SORCERER = 12, + EVENT_SUMMON_ASHTONGUE_DEFENDER = 13, + // Channeler + EVENT_GET_SHADE_GUID = 14, + EVENT_CHANNEL = 15, + // Ashtongue Sorcerer + EVENT_SORCERER_CHANNEL = 16, + // Ashtongue Defender + EVENT_DEBILITATING_STRIKE = 17, + EVENT_HEROIC_STRIKE = 18, + EVENT_SHIELD_BASH = 19, + EVENT_WINDFURY = 20, + // Ashtongue Rogue + EVENT_DEBILITATING_POISON = 21, + EVENT_EVISCERATE = 22, }; -static Location BrokenWP[]= +struct Location { - {492.491638f, 400.744690f, 3.122336f, 112.783737f}, - {494.335724f, 382.221771f, 2.676230f, 112.783737f}, - {489.555939f, 373.507202f, 2.416263f, 112.783737f}, - {491.136353f, 427.868774f, 3.519748f, 112.783737f}, + float x, y, z; }; -// Locations -#define Z1 118.543144f -#define Z2 120.783768f -#define Z_SPAWN 113.537949f -#define AGGRO_X 482.793182f -#define AGGRO_Y 401.270172f -#define AGGRO_Z 112.783928f -#define AKAMA_X 514.583984f -#define AKAMA_Y 400.601013f -#define AKAMA_Z 112.783997f - - -enum Spells -{ - SPELL_VERTEX_SHADE_BLACK = 39833, - SPELL_SHADE_SOUL_CHANNEL = 40401, - SPELL_DESTRUCTIVE_POISON = 40874, - SPELL_LIGHTNING_BOLT = 42024, - SPELL_AKAMA_SOUL_CHANNEL = 40447, - SPELL_AKAMA_SOUL_RETRIEVE = 40902, - SPELL_AKAMA_SOUL_EXPEL = 40855, - SPELL_SHADE_SOUL_CHANNEL_2 = 40520 -}; +static Location ShadeWP= { 512.4877f, 400.7993f, 112.7837f }; -enum Creatures +static Location AkamaWP[]= { - NPC_CHANNELER = 23421, - NPC_SORCERER = 23215, - NPC_DEFENDER = 23216, - NPC_BROKEN = 23319 + { 517.4877f, 400.7993f, 112.7837f }, + { 468.4435f, 401.1062f, 118.5379f } }; -const uint32 spawnEntries[4]= { 23523, 23318, 23524 }; +// ######################################################## +// Shade of Akama +// ######################################################## -class npc_ashtongue_channeler : public CreatureScript +class boss_shade_of_akama : public CreatureScript { public: - npc_ashtongue_channeler() : CreatureScript("npc_ashtongue_channeler") { } - - CreatureAI* GetAI(Creature* creature) const OVERRIDE - { - return new npc_ashtongue_channelerAI (creature); - } + boss_shade_of_akama() : CreatureScript("boss_shade_of_akama") { } - struct npc_ashtongue_channelerAI : public ScriptedAI + struct boss_shade_of_akamaAI : public ScriptedAI { - npc_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) + boss_shade_of_akamaAI(Creature* creature) : ScriptedAI(creature) { - ShadeGUID = 0; + instance = creature->GetInstanceScript(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - uint64 ShadeGUID; + void Reset() + { + if (!HasKilledAkamaAndReseting) + { + for (std::list::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) + if (Creature* Channeler = (Unit::GetCreature(*me, *itr))) + Channeler->DespawnOrUnsummon(); - void Reset() OVERRIDE {} - void JustDied(Unit* /*killer*/) OVERRIDE; - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + for (std::list::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr) + if (Creature* Spawner = (Unit::GetCreature(*me, *itr))) + Spawner->AI()->SetData(SETDATA_DATA, SETDATA_DESPAWN_ALL_SPAWNS); - void UpdateAI(uint32 /*diff*/) OVERRIDE {} - }; + events.ScheduleEvent(EVENT_FIND_CHANNELERS_SPAWNERS, 3000); + events.ScheduleEvent(EVENT_RESET_ENCOUNTER, 5000); + } -}; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); -class npc_ashtongue_sorcerer : public CreatureScript -{ -public: - npc_ashtongue_sorcerer() : CreatureScript("npc_ashtongue_sorcerer") { } + me->SetWalk(true); + combatStarted = false; + akamaReached = false; + HasKilledAkama = false; + HasKilledAkamaAndReseting = false; + } - CreatureAI* GetAI(Creature* creature) const OVERRIDE - { - return new npc_ashtongue_sorcererAI (creature); - } + void JustDied(Unit* /*killer*/) + { + if (instance) + instance->SetData(DATA_SHADEOFAKAMAEVENT, DONE); + } - struct npc_ashtongue_sorcererAI : public ScriptedAI - { - npc_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature) + void EnterCombat(Unit* /*who*/) {} + + void AttackStart(Unit* who) { - ShadeGUID = 0; + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) + { + if (Creature* Akama = Unit::GetCreature((*me), akamaGUID)) + if (Akama->IsAlive()) + ScriptedAI::AttackStart(Akama); + } + else + ScriptedAI::AttackStart(who); } - uint64 ShadeGUID; - uint32 CheckTimer; - bool StartBanishing; + void SetData(uint32 data, uint32 value) + { + if (data == SETDATA_DATA && value == SETDATA_CHANNELER_DIED) + me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2); + + UpdateSpeed(); + } - void Reset() OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) { - StartBanishing = false; - CheckTimer = 5000; + if (spell->Id == SPELL_AKAMA_SOUL_CHANNEL) + { + combatStarted = true; + events.ScheduleEvent(EVENT_START_ATTACK_AKAMA, 500); + events.ScheduleEvent(EVENT_SET_CHANNELERS_SPAWNERS, 1000); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); + if (Creature* Akama = Unit::GetCreature((*me), akamaGUID)) + me->AddThreat(Akama, 10000000.0f); + } + else if (spell->Id == SPELL_SHADE_SOUL_CHANNEL_2) + UpdateSpeed(); } - void JustDied(Unit* /*killer*/) OVERRIDE; - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void UpdateSpeed() + { + float moveSpeed = 0.2f; - void UpdateAI(uint32 diff) OVERRIDE + if (me->GetAuraCount(SPELL_SHADE_SOUL_CHANNEL_2) <= 3) + { + moveSpeed = (2.0 - (0.6 * me->GetAuraCount(SPELL_SHADE_SOUL_CHANNEL_2))); + me->SetSpeed(MOVE_WALK, moveSpeed / 2.5); + me->SetSpeed(MOVE_RUN, (moveSpeed * 2) / 7); + me->ClearUnitState(UNIT_STATE_ROOT); + } + else + me->AddUnitState(UNIT_STATE_ROOT); + } + + void UpdateAI(uint32 diff) { - if (StartBanishing) + if (HasKilledAkamaAndReseting) return; - if (CheckTimer <= diff) + events.Update(diff); + + if (!combatStarted) { - Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && Shade->IsAlive() && me->IsAlive()) + while (uint32 eventId = events.ExecuteEvent()) { - if (me->IsWithinDist(Shade, 20, false)) + switch (eventId) { - me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveIdle(); - DoCast(Shade, SPELL_SHADE_SOUL_CHANNEL, true); - DoCast(Shade, SPELL_SHADE_SOUL_CHANNEL_2, true); + case EVENT_RESET_ENCOUNTER: + if (Creature* Akama = Unit::GetCreature((*me), akamaGUID)) + if (!Akama->IsAlive()) + Akama->Respawn(); + break; + case EVENT_FIND_CHANNELERS_SPAWNERS: + { + std::list ChannelerList; + me->GetCreatureListWithEntryInGrid(ChannelerList, NPC_ASHTONGUE_CHANNELER, 15.0f); + + if (!ChannelerList.empty()) + for (std::list::const_iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr) + { + Channelers.push_back((*itr)->GetGUID()); + if ((*itr)->isDead()) + (*itr)->Respawn(); + } + + std::list SpawnerList; + me->GetCreatureListWithEntryInGrid(SpawnerList, NPC_CREATURE_SPAWNER_AKAMA, 90.0f); + + if (!SpawnerList.empty()) + for (std::list::const_iterator itr = SpawnerList.begin(); itr != SpawnerList.end(); ++itr) + Spawners.push_back((*itr)->GetGUID()); + + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN); + akamaGUID = instance->GetData64(DATA_AKAMA_SHADE); + break; + } + default: + break; + } + } + } + else + { + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SET_CHANNELERS_SPAWNERS: + { + for (std::list::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) + { + if (Creature* Channeler = (Unit::GetCreature(*me, *itr))) + Channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + } + + for (std::list::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr) + { + if (Creature* Spawner = (Unit::GetCreature(*me, *itr))) + Spawner->AI()->SetData(SETDATA_DATA, SETDATA_START_SPAWNING); + } + + break; + } + case EVENT_START_ATTACK_AKAMA: + me->GetMotionMaster()->MovePoint(0, ShadeWP.x, ShadeWP.y, ShadeWP.z ,false); + events.ScheduleEvent(EVENT_START_ATTACK_AKAMA, 1000); + break; + case EVENT_ADD_THREAT: + DoCast(SPELL_THREAT); + events.ScheduleEvent(EVENT_ADD_THREAT, 3500); + break; + default: + break; + } + } + + if (HasKilledAkama) + { + if (!HasKilledAkamaAndReseting) + { + HasKilledAkamaAndReseting = true; + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + instance->SetData(DATA_SHADEOFAKAMAEVENT, NOT_STARTED); + me->RemoveAllAurasExceptType(SPELL_AURA_DUMMY); + me->DeleteThreatList(); + me->CombatStop(); + me->GetMotionMaster()->MoveTargetedHome(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); + combatStarted = false; + + if (Creature* Akama = Unit::GetCreature((*me), akamaGUID)) + Akama->DespawnOrUnsummon(); + + for (std::list::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) + if (Creature* Channeler = (Unit::GetCreature(*me, *itr))) + Channeler->DespawnOrUnsummon(); + + for (std::list::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr) + if (Creature* Spawner = (Unit::GetCreature(*me, *itr))) + Spawner->AI()->SetData(SETDATA_DATA, SETDATA_DESPAWN_ALL_SPAWNS); + + events.ScheduleEvent(EVENT_FIND_CHANNELERS_SPAWNERS, 10000); + events.ScheduleEvent(EVENT_RESET_ENCOUNTER, 20000); + } + } + + if (!akamaReached) + { + if (Creature* Akama = Unit::GetCreature((*me), akamaGUID)) + { + if (me->IsWithinDist(Akama, 2.0f, false)) + { + akamaReached = true; + me->GetMotionMaster()->Clear(true); + me->GetMotionMaster()->MoveIdle(); + me->SetWalk(false); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + + events.CancelEvent(EVENT_START_ATTACK_AKAMA); + events.ScheduleEvent(EVENT_ADD_THREAT, 100); - StartBanishing = true; + for (std::list::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr) + if (Creature* Spawner = (Unit::GetCreature(*me, *itr))) + Spawner->AI()->SetData(SETDATA_DATA, SETDATA_STOP_SPAWNING); + } } } - CheckTimer = 2000; - } else CheckTimer -= diff; + else + DoMeleeAttackIfReady(); + } } + + public: + bool HasKilledAkama; + private: + InstanceScript* instance; + EventMap events; + std::list Channelers; + std::list Spawners; + uint64 akamaGUID; + uint64 ShadeGUID; + bool akamaReached; + bool combatStarted; + bool HasKilledAkamaAndReseting; }; + CreatureAI* GetAI(Creature* creature) const + { + return new boss_shade_of_akamaAI (creature); + } }; -class boss_shade_of_akama : public CreatureScript +// ######################################################## +// Akama +// ######################################################## + +class npc_akama_shade : public CreatureScript { public: - boss_shade_of_akama() : CreatureScript("boss_shade_of_akama") { } - - CreatureAI* GetAI(Creature* creature) const OVERRIDE - { - return new boss_shade_of_akamaAI (creature); - } + npc_akama_shade() : CreatureScript("npc_akama_shade") { } - struct boss_shade_of_akamaAI : public ScriptedAI + struct npc_akamaAI : public ScriptedAI { - boss_shade_of_akamaAI(Creature* creature) : ScriptedAI(creature), summons(me) + npc_akamaAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); - AkamaGUID = instance ? instance->GetData64(DATA_AKAMA_SHADE) : 0; - me->setActive(true);//if view distance is too low - me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); - } - InstanceScript* instance; + } - std::list Channelers; - std::list Sorcerers; - uint64 AkamaGUID; + void Reset() + { + me->setFaction(FACTION_FRIENDLY); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + DoCast(me, SPELL_STEALTH); + StartChannel = false; + StartCombat = false; + HasYelledOnce = false; + ShadeHasDied = false; + } - uint32 SorcererCount; - uint32 DeathCount; + void JustDied(Unit* /*killer*/) + { + if (Creature* Shade = Unit::GetCreature((*me), ShadeGUID)) + if (Shade->IsAlive()) + CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->HasKilledAkama = true; + me->GetMotionMaster()->Clear(true); + me->GetMotionMaster()->MoveIdle(); + } - uint32 ReduceHealthTimer; - uint32 SummonTimer; - uint32 ResetTimer; - uint32 DefenderTimer; // They are on a flat 15 second timer, independant of the other summon Creature timer. + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (!StartCombat) + { + if (spell->Id == SPELL_THREAT) + { + me->ClearUnitState(UNIT_STATE_ROOT); + me->RemoveAura(SPELL_AKAMA_SOUL_CHANNEL); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); + if (Creature* Shade = Unit::GetCreature((*me), ShadeGUID)) + Shade->RemoveAura(SPELL_AKAMA_SOUL_CHANNEL); + StartCombat = true; + } + } + } - bool IsBanished; - bool HasKilledAkama; - bool reseting; - bool GridSearcherSucceeded; - bool HasKilledAkamaAndReseting; - SummonList summons; + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2000); + events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, 5000); + } - void Reset() OVERRIDE + void UpdateAI(uint32 diff) { - reseting = true; - HasKilledAkamaAndReseting = false; + if (StartChannel) + { + events.Update(diff); - GridSearcherSucceeded = false; + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SHADE_START: + if (instance) + { + ShadeGUID = instance->GetData64(DATA_SHADEOFAKAMA); + instance->SetData(DATA_SHADEOFAKAMAEVENT, IN_PROGRESS); + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + me->RemoveAura(SPELL_STEALTH); + me->SetWalk(true); + me->GetMotionMaster()->MovePoint(0, AkamaWP[0].x, AkamaWP[0].y, AkamaWP[0].z, false); + events.ScheduleEvent(EVENT_SHADE_CHANNEL, 10000); + break; + } + case EVENT_SHADE_CHANNEL: + me->AddUnitState(UNIT_STATE_ROOT); + me->SetFacingTo(3.118662f); + DoCast(me, SPELL_AKAMA_SOUL_CHANNEL); + me->setFaction(FACTION_COMBAT); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); + events.ScheduleEvent(EVENT_FIXATE, 5000); + break; + case EVENT_FIXATE: + DoCast(SPELL_FIXATE); + StartChannel = false; + break; + default: + break; + } + } + } - Sorcerers.clear(); - summons.DespawnAll();//despawn all adds + if (!UpdateVictim()) + return; + + events.Update(diff); - if (Creature* Akama = Unit::GetCreature(*me, AkamaGUID)) + while (uint32 eventId = events.ExecuteEvent()) { - Akama->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);//turn gossip on so players can restart the event - if (Akama->isDead()) + switch (eventId) { - Akama->Respawn();//respawn akama if dead - Akama->AI()->EnterEvadeMode(); + case EVENT_CHAIN_LIGHTNING: + DoCastVictim(SPELL_CHAIN_LIGHTNING); + events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(10000, 15000)); + break; + case EVENT_DESTRUCTIVE_POISON: + DoCast(me, SPELL_DESTRUCTIVE_POISON); + events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, urand(4000, 5000)); + break; + default: + break; } } - SorcererCount = 0; - DeathCount = 0; + DoMeleeAttackIfReady(); + } - SummonTimer = 10000; - ReduceHealthTimer = 0; - ResetTimer = 60000; - DefenderTimer = 15000; + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) + { + if (action == 0) + { + player->CLOSE_GOSSIP_MENU(); + StartChannel = true; + events.ScheduleEvent(EVENT_SHADE_START, 500); + } + } - IsBanished = true; - HasKilledAkama = false; + private: + InstanceScript* instance; + EventMap events; + uint64 ShadeGUID; + bool StartChannel; + bool ShadeHasDied; + bool StartCombat; + bool HasYelledOnce; - me->SetVisible(true); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - //me->GetMotionMaster()->Clear(); - //me->GetMotionMaster()->MoveIdle(); - me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN); + }; - if (instance) - instance->SetData(DATA_SHADEOFAKAMAEVENT, NOT_STARTED); + CreatureAI* GetAI(Creature* creature) const + { + return new npc_akamaAI (creature); + } +}; - reseting = false; - } +// ######################################################## +// Ashtongue Channeler +// ######################################################## - void JustDied(Unit* /*killer*/) OVERRIDE +class mob_ashtongue_channeler : public CreatureScript +{ +public: + mob_ashtongue_channeler() : CreatureScript("mob_ashtongue_channeler") { } + + struct mob_ashtongue_channelerAI : public ScriptedAI + { + mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) { - summons.DespawnAll(); + instance = creature->GetInstanceScript(); } - void JustSummoned(Creature* summon) OVERRIDE + void Reset() { - if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) - summons.Summon(summon); + me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); + + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + events.ScheduleEvent(EVENT_CHANNEL, 2000); + events.ScheduleEvent(EVENT_GET_SHADE_GUID, 1000); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void JustDied(Unit* /*killer*/) { - if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) - summons.Despawn(summon); + if (Creature* Shade = (Unit::GetCreature((*me), ShadeGUID))) + Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void UpdateAI(uint32 diff) { - if (!GridSearcherSucceeded) - { - FindChannelers(); + events.Update(diff); - if (!Channelers.empty()) + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) { - for (std::list::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) - { - Creature* Channeler = (Unit::GetCreature(*me, *itr)); - if (Channeler) + case EVENT_CHANNEL: + if (Creature* Shade = (Unit::GetCreature((*me), ShadeGUID))) { - if (Channeler->isDead()) + if (Shade->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) + DoCast(me, SPELL_SHADE_SOUL_CHANNEL); + else { - Channeler->RemoveCorpse(); - Channeler->Respawn(); + me->InterruptSpell(CURRENT_CHANNELED_SPELL); + Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); } - - Channeler->CastSpell(me, SPELL_SHADE_SOUL_CHANNEL, true); - Channeler->CastSpell(me, SPELL_SHADE_SOUL_CHANNEL_2, true); - Channeler->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - GridSearcherSucceeded = true; } - } + events.ScheduleEvent(EVENT_CHANNEL, 2000); + break; + case EVENT_GET_SHADE_GUID: + if (instance) + ShadeGUID = instance->GetData64(DATA_SHADEOFAKAMA); + break; + default: + break; } - else - TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly"); } } - void AttackStart(Unit* who) OVERRIDE - { - if (!who || IsBanished) - return; + private: + InstanceScript* instance; + EventMap events; + uint64 ShadeGUID; + }; - if (who->isTargetableForAttack() && who != me) - DoStartMovement(who); + CreatureAI* GetAI(Creature* creature) const + { + return new mob_ashtongue_channelerAI(creature); + } +}; + +// ######################################################## +// Creature Generator Akama +// ######################################################## + +class npc_creature_generator_akama : public CreatureScript +{ +public: + npc_creature_generator_akama() : CreatureScript("npc_creature_generator_akama") { } + + struct npc_creature_generator_akamaAI : public ScriptedAI + { + npc_creature_generator_akamaAI(Creature* creature) : ScriptedAI(creature), Summons(me) + { + instance = creature->GetInstanceScript(); } - void IncrementDeathCount(uint64 guid = 0) // If guid is set, will remove it from list of sorcerer + void Reset() { - if (reseting) - return; + Summons.DespawnAll(); - TC_LOG_DEBUG(LOG_FILTER_TSCR, "Increasing Death Count for Shade of Akama encounter"); - ++DeathCount; - me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2); - if (guid) - { - if (Sorcerers.empty()) - TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Shade of Akama - attempt to remove guid " UI64FMTD " from Sorcerers list but list is already empty", guid); - else Sorcerers.remove(guid); - } + doSpawning = false; + leftSide = false; + + if (me->GetPositionY() < 400.0f) + leftSide = true; } - void SummonCreature() + void JustSummoned(Creature* summon) { - uint32 random = rand()%2; - float X = SpawnLocations[random].x; - float Y = SpawnLocations[random].y; - // max of 6 sorcerers can be summoned - if ((rand()%3 == 0) && (DeathCount > 0) && (SorcererCount < 7)) + Summons.Summon(summon); + } + + void SetData(uint32 data, uint32 value) + { + if (data == SETDATA_DATA) { - Creature* Sorcerer = me->SummonCreature(NPC_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0); - if (Sorcerer) + doSpawning = true; + + switch (value) { - CAST_AI(npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID(); - Sorcerer->SetWalk(false); - Sorcerer->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); - Sorcerer->SetTarget(me->GetGUID()); - Sorcerers.push_back(Sorcerer->GetGUID()); - --DeathCount; - ++SorcererCount; + case SETDATA_START_SPAWNING: + if (leftSide) + { + events.ScheduleEvent(EVENT_SPAWN_WAVE_B, 100); + events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_SORCERER, urand(2000, 5000)); + } + else + { + events.ScheduleEvent(EVENT_SPAWN_WAVE_B, 10000); + events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_DEFENDER, urand(2000, 5000)); + } + break; + case SETDATA_STOP_SPAWNING: + doSpawning = false; + break; + case SETDATA_DESPAWN_ALL_SPAWNS: + doSpawning = false; + Summons.DespawnAll(); + break; + default: + break; } } - else + } + + void UpdateAI(uint32 diff) + { + if (doSpawning) { - for (uint8 i = 0; i < 3; ++i) + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) { - Creature* Spawn = me->SummonCreature(spawnEntries[i], X, Y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000); - if (Spawn) + switch (eventId) { - Spawn->SetWalk(false); - Spawn->GetMotionMaster()->MovePoint(0, AGGRO_X, AGGRO_Y, AGGRO_Z); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); - Spawn->AI()->AttackStart(target); + case EVENT_SPAWN_WAVE_B: + DoCast(me, SPELL_ASHTONGUE_WAVE_B); + events.ScheduleEvent(EVENT_SPAWN_WAVE_B, urand(45000, 50000)); + break; + case EVENT_SUMMON_ASHTONGUE_SORCERER: // left + DoCast(me, SPELL_SUMMON_ASHTONGUE_SORCERER); + events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_SORCERER, urand(30000, 35000)); + break; + case EVENT_SUMMON_ASHTONGUE_DEFENDER: // right + DoCast(me, SPELL_SUMMON_ASHTONGUE_DEFENDER); + events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_DEFENDER, urand(30000, 35000)); + break; + default: + break; } } } } - void FindChannelers() - { - std::list ChannelerList; - me->GetCreatureListWithEntryInGrid(ChannelerList, NPC_CHANNELER, 50.0f); + private: + InstanceScript* instance; + EventMap events; + SummonList Summons; + bool leftSide; + bool doSpawning; + }; - if (!ChannelerList.empty()) + CreatureAI* GetAI(Creature* creature) const + { + return new npc_creature_generator_akamaAI(creature); + } +}; + +// ######################################################## +// Ashtongue Sorcerer +// ######################################################## + +class npc_ashtongue_sorcerer : public CreatureScript +{ +public: + npc_ashtongue_sorcerer() : CreatureScript("npc_ashtongue_sorcerer") { } + + struct npc_ashtongue_sorcererAI : public ScriptedAI + { + npc_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature) + { + instance = creature->GetInstanceScript(); + if (instance) { - for (std::list::const_iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr) - { - CAST_AI(npc_ashtongue_channeler::npc_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID(); - Channelers.push_back((*itr)->GetGUID()); - TC_LOG_DEBUG(LOG_FILTER_TSCR, "Shade of Akama Grid Search found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID()); - } + akamaGUID = instance->GetData64(DATA_AKAMA_SHADE); + shadeGUID = instance->GetData64(DATA_SHADEOFAKAMA); } - else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy"); } - void SetSelectableChannelers() + void Reset() { - if (Channelers.empty()) - { - TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy"); - return; - } + if(!startedBanishing) + if (Creature* Shade = (Unit::GetCreature((*me), shadeGUID))) + if (Shade->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) + me->GetMotionMaster()->MovePoint(0, Shade->GetPositionX(), Shade->GetPositionY(), Shade->GetPositionZ(), false); + else + if (Unit* target = me->GetCreature(*me, akamaGUID)) + AttackStart(target); - for (std::list::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) - if (Creature* Channeler = (Unit::GetCreature(*me, *itr))) - Channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + startedBanishing = false; + switchToCombat = false; } - void SetAkamaGUID(uint64 guid) { AkamaGUID = guid; } + void JustDied(Unit* /*killer*/) + { + if (Creature* Shade = (Unit::GetCreature((*me), shadeGUID))) + Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); + me->DespawnOrUnsummon(5000); + } - void UpdateAI(uint32 diff) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) { - if (!me->IsInCombat()) - return; + if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) + CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); + } - if (IsBanished) - { - // Akama is set in the threatlist so when we reset, we make sure that he is not included in our check - if (me->getThreatManager().getThreatList().size() < 2) - { - EnterEvadeMode(); - return; - } + void EnterCombat(Unit* /*who*/) {} - if (DefenderTimer <= diff) - { - uint32 ran = rand()%2; - Creature* Defender = me->SummonCreature(NPC_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000); - if (Defender) - { - Defender->SetWalk(false); - bool move = true; - if (AkamaGUID) - { - if (Creature* Akama = Unit::GetCreature(*me, AkamaGUID)) - { - float x, y, z; - Akama->GetPosition(x, y, z); - // They move towards AKama - Defender->GetMotionMaster()->MovePoint(0, x, y, z); - Defender->AI()->AttackStart(Akama); - } else move = false; - } else move = false; - if (!move) - Defender->GetMotionMaster()->MovePoint(0, AKAMA_X, AKAMA_Y, AKAMA_Z); - } - DefenderTimer = 15000; - } else DefenderTimer -= diff; + void AttackStart(Unit* who) + { + if (!switchToCombat) + return; + ScriptedAI::AttackStart(who); + } - if (SummonTimer <= diff) - { - SummonCreature(); - SummonTimer = 35000; - } else SummonTimer -= diff; + void UpdateAI(uint32 diff) + { + events.Update(diff); - if (DeathCount >= 6) + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) { - if (AkamaGUID) - { - Creature* Akama = Unit::GetCreature((*me), AkamaGUID); - if (Akama && Akama->IsAlive()) + case EVENT_SORCERER_CHANNEL: + if (Creature* Shade = (Unit::GetCreature((*me), shadeGUID))) { - IsBanished = false; - me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveChase(Akama); - Akama->GetMotionMaster()->Clear(); - // Shade should move to Akama, not the other way around - Akama->GetMotionMaster()->MoveIdle(); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - // Crazy amount of threat - me->AddThreat(Akama, 10000000.0f); - Akama->AddThreat(me, 10000000.0f); - me->Attack(Akama, true); - Akama->Attack(me, true); + if (Shade->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) + { + me->SetFacingToObject(Shade); + DoCast(me, SPELL_SHADE_SOUL_CHANNEL); + events.ScheduleEvent(EVENT_SORCERER_CHANNEL, 2000); + } + else + { + me->InterruptSpell(CURRENT_CHANNELED_SPELL); + Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); + switchToCombat = true; + if (Unit* target = me->GetCreature(*me, akamaGUID)) + AttackStart(target); + } } - } + break; + default: + break; } } - else // No longer banished, let's fight Akama now - { - if (ReduceHealthTimer <= diff) - { - if (AkamaGUID) - { - Creature* Akama = Unit::GetCreature((*me), AkamaGUID); - if (Akama && Akama->IsAlive()) - { - //10 % less health every few seconds. - me->DealDamage(Akama, Akama->GetMaxHealth()/10, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - ReduceHealthTimer = 12000; - } - } - } else ReduceHealthTimer -= diff; - if (HasKilledAkama) + if (!startedBanishing) + { + Creature* Shade = Unit::GetCreature((*me), shadeGUID); + if (me->IsWithinDist(Shade, 20.0f, false)) { - if (!HasKilledAkamaAndReseting)//do not let players kill Shade if Akama is dead and Shade is waiting for ResetTimer!! event would bug - { - HasKilledAkamaAndReseting = true; - me->RemoveAllAuras(); - me->DeleteThreatList(); - me->CombatStop(); - //me->SetFullHealth(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->GetMotionMaster()->MoveTargetedHome(); - } - if (ResetTimer <= diff) - { - EnterEvadeMode();// Reset a little while after killing Akama, evade and respawn Akama - return; - } else ResetTimer -= diff; + me->StopMoving(); + me->GetMotionMaster()->Clear(false); + me->GetMotionMaster()->MovePoint(1, me->GetPositionX() + frand (-8.0f, 8.0f), me->GetPositionY() + frand (-8.0f, 8.0f), me->GetPositionZ(), false); + events.ScheduleEvent(EVENT_SORCERER_CHANNEL, 1500); + startedBanishing = true; } - - DoMeleeAttackIfReady(); } + + DoMeleeAttackIfReady(); } + + private: + InstanceScript* instance; + EventMap events; + uint64 akamaGUID; + uint64 shadeGUID; + uint64 summonerGuid; + float distanceToShade; + bool startedBanishing; + bool switchToCombat; }; + CreatureAI* GetAI(Creature* creature) const + { + return new npc_ashtongue_sorcererAI (creature); + } }; -void npc_ashtongue_channeler::npc_ashtongue_channelerAI::JustDied(Unit* /*killer*/) -{ - Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); - if (Shade && Shade->IsAlive()) - CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(); - else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama."); -} +// ######################################################## +// Ashtongue Defender +// ######################################################## -void npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI::JustDied(Unit* /*killer*/) -{ - Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); - if (Shade && Shade->IsAlive()) - CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(me->GetGUID()); - else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama."); -} - -class npc_akama_shade : public CreatureScript +class npc_ashtongue_defender : public CreatureScript { public: - npc_akama_shade() : CreatureScript("npc_akama_shade") { } + npc_ashtongue_defender() : CreatureScript("npc_ashtongue_defender") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + struct npc_ashtongue_defenderAI : public ScriptedAI { - player->PlayerTalkClass->ClearMenus(); - if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time + npc_ashtongue_defenderAI(Creature* creature) : ScriptedAI(creature) { - player->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_akama_shade::npc_akamaAI, creature->AI())->BeginEvent(player); + instance = creature->GetInstanceScript(); + if (instance) + akamaGUID = instance->GetData64(DATA_AKAMA_SHADE); } - return true; - } - - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE - { - if (player->IsAlive()) + void Reset() { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - player->SEND_GOSSIP_MENU(907, creature->GetGUID()); + if (Unit* target = me->GetCreature(*me, akamaGUID)) + AttackStart(target); } - return true; - } - - CreatureAI* GetAI(Creature* creature) const OVERRIDE - { - return new npc_akamaAI (creature); - } - - struct npc_akamaAI : public ScriptedAI - { - npc_akamaAI(Creature* creature) : ScriptedAI(creature), summons(me) + void JustDied(Unit* /*killer*/) { - ShadeHasDied = false; - StartCombat = false; - instance = creature->GetInstanceScript(); - if (instance) - ShadeGUID = instance->GetData64(DATA_SHADEOFAKAMA); - else - ShadeGUID = NOT_STARTED; - me->setActive(true); - EventBegun = false; - CastSoulRetrieveTimer = 0; - SoulRetrieveTimer = 0; - SummonBrokenTimer = 0; - EndingTalkCount = 0; - WayPointId = 0; - BrokenSummonIndex = 0; - BrokenList.clear(); - HasYelledOnce = false; + me->DespawnOrUnsummon(5000); } - InstanceScript* instance; - - uint64 ShadeGUID; - - uint32 DestructivePoisonTimer; - uint32 LightningBoltTimer; - uint32 CheckTimer; - uint32 CastSoulRetrieveTimer; - uint32 SoulRetrieveTimer; - uint32 SummonBrokenTimer; - uint32 EndingTalkCount; - uint32 WayPointId; - uint32 BrokenSummonIndex; - - std::list BrokenList; + void IsSummonedBy(Unit* /*summoner*/) + { + if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) + CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); + } - bool EventBegun; - bool ShadeHasDied; - bool StartCombat; - bool HasYelledOnce; - SummonList summons; + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_HEROIC_STRIKE, 5000); + events.ScheduleEvent(EVENT_SHIELD_BASH, urand (10000, 16000)); + events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, urand (10000, 16000)); + events.ScheduleEvent(EVENT_WINDFURY, urand (8000, 12000)); + } - void Reset() OVERRIDE + void UpdateAI(uint32 diff) { - DestructivePoisonTimer = 15000; - LightningBoltTimer = 10000; - CheckTimer = 2000; + events.Update(diff); - if (!EventBegun) + while (uint32 eventId = events.ExecuteEvent()) { - me->SetUInt32Value(UNIT_NPC_FLAGS, 0); // Database sometimes has very very strange values - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + switch (eventId) + { + case EVENT_DEBILITATING_STRIKE: + DoCastVictim(SPELL_DEBILITATING_STRIKE); + events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, urand (8000, 16000)); + break; + case EVENT_HEROIC_STRIKE: + DoCast(me, SPELL_HEROIC_STRIKE); + events.ScheduleEvent(EVENT_HEROIC_STRIKE, urand(50000, 60000)); + break; + case EVENT_SHIELD_BASH: + DoCastVictim(SPELL_SHIELD_BASH); + events.ScheduleEvent(EVENT_SHIELD_BASH, urand (8000, 16000)); + break; + case EVENT_WINDFURY: + DoCastVictim(SPELL_WINDFURY); + events.ScheduleEvent(EVENT_WINDFURY, urand (6000 , 8000)); + break; + default: + break; + } } - summons.DespawnAll(); + DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) OVERRIDE + private: + InstanceScript* instance; + EventMap events; + uint64 akamaGUID; + uint64 summonerGuid; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_ashtongue_defenderAI (creature); + } +}; + +// ######################################################## +// Ashtongue Rogue +// ######################################################## + +class npc_ashtongue_rogue : public CreatureScript +{ +public: + npc_ashtongue_rogue() : CreatureScript("npc_ashtongue_rogue") { } + + struct npc_ashtongue_rogueAI : public ScriptedAI + { + npc_ashtongue_rogueAI(Creature* creature) : ScriptedAI(creature) { - if (summon->GetEntry() == NPC_BROKEN) - summons.Summon(summon); + instance = creature->GetInstanceScript(); + if (instance) + akamaGUID = instance->GetData64(DATA_AKAMA_SHADE); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void Reset() { - if (summon->GetEntry() == NPC_BROKEN) - summons.Despawn(summon); + if (Unit* target = me->GetCreature(*me, akamaGUID)) + AttackStart(target); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - - void BeginEvent(Player* player) + void JustDied(Unit* /*killer*/) { - if (!instance) - return; - - ShadeGUID = instance->GetData64(DATA_SHADEOFAKAMA); - if (!ShadeGUID) - return; - - Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); - if (Shade) - { - instance->SetData(DATA_SHADEOFAKAMAEVENT, IN_PROGRESS); - // Prevent players from trying to restart event - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->SetAkamaGUID(me->GetGUID()); - CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->SetSelectableChannelers(); - Shade->AddThreat(me, 1000000.0f); - me->CombatStart(Shade); - Shade->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); - Shade->SetTarget(me->GetGUID()); - if (player) - Shade->AddThreat(player, 1.0f); - DoZoneInCombat(Shade); - EventBegun = true; - } + me->DespawnOrUnsummon(5000); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) { - if (type != POINT_MOTION_TYPE) - return; - - switch (id) - { - case 0: - ++WayPointId; - break; - - case 1: - if (Creature* Shade = Unit::GetCreature(*me, ShadeGUID)) - { - me->SetTarget(ShadeGUID); - DoCast(Shade, SPELL_AKAMA_SOUL_RETRIEVE); - EndingTalkCount = 0; - SoulRetrieveTimer = 16000; - } - break; - } + if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) + CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void EnterCombat(Unit* /*who*/) { - Talk(SAY_DEATH); - EventBegun = false; - ShadeHasDied = false; - StartCombat = false; - CastSoulRetrieveTimer = 0; - SoulRetrieveTimer = 0; - SummonBrokenTimer = 0; - EndingTalkCount = 0; - WayPointId = 0; - BrokenSummonIndex = 0; - BrokenList.clear(); - HasYelledOnce = false; - Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && Shade->IsAlive()) - CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->HasKilledAkama = true; - summons.DespawnAll(); + events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand (500, 2000)); + events.ScheduleEvent(SPELL_EVISCERATE, urand (2000, 5000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) { - if (!EventBegun) - return; - - if (HealthBelowPct(15) && !HasYelledOnce) - { - Talk(SAY_LOW_HEALTH); - HasYelledOnce = true; - } + events.Update(diff); - if (ShadeGUID && !StartCombat) + while (uint32 eventId = events.ExecuteEvent()) { - Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); - if (Shade && Shade->IsAlive()) + switch (eventId) { - if (CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IsBanished) - { - if (CastSoulRetrieveTimer <= diff) - { - DoCast(Shade, SPELL_AKAMA_SOUL_CHANNEL); - CastSoulRetrieveTimer = 500; - } else CastSoulRetrieveTimer -= diff; - } - else - { - me->InterruptNonMeleeSpells(false); - StartCombat = true; - } - } - } - - if (ShadeHasDied && (WayPointId == 1)) - { - if (instance) - instance->SetData(DATA_SHADEOFAKAMAEVENT, DONE); - me->GetMotionMaster()->MovePoint(WayPointId, AkamaWP[1].x, AkamaWP[1].y, AkamaWP[1].z); - ++WayPointId; - } - - if (!ShadeHasDied && StartCombat) - { - if (CheckTimer <= diff) - { - if (ShadeGUID) - { - Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && !Shade->IsAlive()) - { - ShadeHasDied = true; - WayPointId = 0; - me->SetWalk(true); - me->GetMotionMaster()->MovePoint(WayPointId, AkamaWP[0].x, AkamaWP[0].y, AkamaWP[0].z); - } - if (Shade && Shade->IsAlive()) - { - if (Shade->getThreatManager().getThreatList().size() < 2) - Shade->AI()->EnterEvadeMode(); - } - } - CheckTimer = 5000; - } else CheckTimer -= diff; - } - - if (SummonBrokenTimer && BrokenSummonIndex < 4) - { - if (SummonBrokenTimer <= diff) - { - for (uint8 i = 0; i < 4; ++i) - { - float x = BrokenCoords[BrokenSummonIndex].x + (i*5); - float y = BrokenCoords[BrokenSummonIndex].y + (1*5); - float z = BrokenCoords[BrokenSummonIndex].z; - float o = BrokenCoords[BrokenSummonIndex].o; - Creature* Broken = me->SummonCreature(NPC_BROKEN, x, y, z, o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000); - if (Broken) - { - float wx = BrokenWP[BrokenSummonIndex].x + (i*5); - float wy = BrokenWP[BrokenSummonIndex].y + (i*5); - float wz = BrokenWP[BrokenSummonIndex].z; - Broken->GetMotionMaster()->MovePoint(0, wx, wy, wz); - Broken->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - BrokenList.push_back(Broken->GetGUID()); - } - } - ++BrokenSummonIndex; - SummonBrokenTimer = 1000; - } else SummonBrokenTimer -= diff; - } - - if (SoulRetrieveTimer) - { - if (SoulRetrieveTimer <= diff) - { - switch (EndingTalkCount) - { - case 0: - me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); - ++EndingTalkCount; - SoulRetrieveTimer = 2000; - SummonBrokenTimer = 1; + case EVENT_DEBILITATING_POISON: + DoCastVictim(SPELL_DEBILITATING_POISON); + events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand (14000, 18000)); break; - case 1: - Talk(SAY_FREE); - ++EndingTalkCount; - SoulRetrieveTimer = 25000; + case EVENT_EVISCERATE: + DoCastVictim(SPELL_EVISCERATE); + events.ScheduleEvent(EVENT_EVISCERATE, urand(12000, 16000)); break; - case 2: - if (!BrokenList.empty()) - { - bool Yelled = false; - for (std::list::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* unit = Unit::GetCreature(*me, *itr)) - { - if (!Yelled) - { - unit->AI()->Talk(SAY_BROKEN_FREE_01); - Yelled = true; - } - unit->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); - } - } - ++EndingTalkCount; - SoulRetrieveTimer = 1500; - break; - case 3: - if (!BrokenList.empty()) - { - for (std::list::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* unit = Unit::GetCreature(*me, *itr)) - // This is the incorrect spell, but can't seem to find the right one. - unit->CastSpell(unit, 39656, true); - } - ++EndingTalkCount; - SoulRetrieveTimer = 5000; + default: break; - case 4: - if (!BrokenList.empty()) - { - for (std::list::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* unit = Unit::GetCreature((*me), *itr)) - unit->AI()->Talk(SAY_BROKEN_FREE_02); - } - SoulRetrieveTimer = 0; - break; - } - } else SoulRetrieveTimer -= diff; + } } - - if (!UpdateVictim()) - return; - - if (DestructivePoisonTimer <= diff) - { - Creature* Shade = Unit::GetCreature((*me), ShadeGUID); - if (Shade && Shade->IsAlive()) - DoCast(Shade, SPELL_DESTRUCTIVE_POISON); - DestructivePoisonTimer = 15000; - } else DestructivePoisonTimer -= diff; - - if (LightningBoltTimer <= diff) - { - DoCastVictim(SPELL_LIGHTNING_BOLT); - LightningBoltTimer = 10000; - } else LightningBoltTimer -= diff; - DoMeleeAttackIfReady(); } + + private: + InstanceScript* instance; + EventMap events; + uint64 akamaGUID; + uint64 summonerGuid; }; + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_ashtongue_rogueAI (creature); + } }; void AddSC_boss_shade_of_akama() { new boss_shade_of_akama(); - new npc_ashtongue_channeler(); - new npc_ashtongue_sorcerer(); new npc_akama_shade(); + new mob_ashtongue_channeler(); + new npc_creature_generator_akama(); + new npc_ashtongue_sorcerer(); + new npc_ashtongue_defender(); + new npc_ashtongue_rogue(); } diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 60092689cc0..2a82810a3c1 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -28,8 +28,6 @@ EndScriptData */ #include "black_temple.h" #include "Player.h" -#define MAX_ENCOUNTER 9 - /* Black Temple encounters: 0 - High Warlord Naj'entus event 1 - Supremus Event @@ -56,7 +54,7 @@ public: { instance_black_temple_InstanceMapScript(Map* map) : InstanceScript(map) {} - uint32 m_auiEncounter[MAX_ENCOUNTER]; + uint32 m_auiEncounter[EncounterCount]; std::string str_data; uint64 Najentus; @@ -89,37 +87,37 @@ public: { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - Najentus = 0; - Akama = 0; - Akama_Shade = 0; - ShadeOfAkama = 0; - Supremus = 0; - LadyMalande = 0; - GathiosTheShatterer = 0; + Najentus = 0; + Akama = 0; + Akama_Shade = 0; + ShadeOfAkama = 0; + Supremus = 0; + LadyMalande = 0; + GathiosTheShatterer = 0; HighNethermancerZerevor = 0; - VerasDarkshadow = 0; - IllidariCouncil = 0; - BloodElfCouncilVoice = 0; - IllidanStormrage = 0; - - NajentusGate = 0; - MainTempleDoors = 0; - ShadeOfAkamaDoor= 0; - CommonDoor = 0;//teron + VerasDarkshadow = 0; + IllidariCouncil = 0; + BloodElfCouncilVoice = 0; + IllidanStormrage = 0; + + NajentusGate = 0; + MainTempleDoors = 0; + ShadeOfAkamaDoor = 0; + CommonDoor = 0; // teron TeronDoor = 0; GuurtogDoor = 0; MotherDoor = 0; TempleDoor = 0; - SimpleDoor = 0;//Bycouncil + SimpleDoor = 0; // Bycouncil CouncilDoor = 0; - IllidanGate = 0; - IllidanDoor[0] = 0; - IllidanDoor[1] = 0; + IllidanGate = 0; + IllidanDoor[0] = 0; + IllidanDoor[1] = 0; } bool IsEncounterInProgress() const { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) return true; @@ -149,7 +147,7 @@ public: { case 22887: Najentus = creature->GetGUID(); break; case 23089: Akama = creature->GetGUID(); break; - case 22990: Akama_Shade = creature->GetGUID(); break; + case 23191: Akama_Shade = creature->GetGUID(); break; case 22841: ShadeOfAkama = creature->GetGUID(); break; case 22898: Supremus = creature->GetGUID(); break; case 22917: IllidanStormrage = creature->GetGUID(); break; @@ -167,13 +165,13 @@ public: switch (go->GetEntry()) { case 185483: - NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) + NajentusGate = go->GetGUID(); // Gate past Naj'entus (at the entrance to Supermoose's courtyards) if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; case 185882: - MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus) + MainTempleDoors = go->GetGUID(); // Main Temple Doors - right past Supermoose (Supremus) if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; @@ -386,7 +384,7 @@ public: >> m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7] >> m_auiEncounter[8]; - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; -- cgit v1.2.3 From d8b39e9bae8c1e4a4a6e021cf9cd1cc00bb74fc4 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 8 Jul 2013 16:31:29 -0230 Subject: Core/Scripting: Fix some errors in Shade of Akama script. --- sql/updates/world/2013_07_08_02_world_misc.sql | 2 ++ .../scripts/Outland/BlackTemple/boss_shade_of_akama.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 sql/updates/world/2013_07_08_02_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_08_02_world_misc.sql b/sql/updates/world/2013_07_08_02_world_misc.sql new file mode 100644 index 00000000000..782d4620e56 --- /dev/null +++ b/sql/updates/world/2013_07_08_02_world_misc.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `ScriptName` = 'npc_ashtongue_channeler' WHERE `entry`=23421; +DELETE FROM `waypoint_data` WHERE `id`=847160; diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index e3d7ff110b0..cb95f4e12e0 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -555,14 +555,14 @@ public: // Ashtongue Channeler // ######################################################## -class mob_ashtongue_channeler : public CreatureScript +class npc_ashtongue_channeler : public CreatureScript { public: - mob_ashtongue_channeler() : CreatureScript("mob_ashtongue_channeler") { } + npc_ashtongue_channeler() : CreatureScript("npc_ashtongue_channeler") { } - struct mob_ashtongue_channelerAI : public ScriptedAI + struct npc_ashtongue_channelerAI : public ScriptedAI { - mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) + npc_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); } @@ -625,7 +625,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - return new mob_ashtongue_channelerAI(creature); + return new npc_ashtongue_channelerAI(creature); } }; @@ -1033,7 +1033,7 @@ void AddSC_boss_shade_of_akama() { new boss_shade_of_akama(); new npc_akama_shade(); - new mob_ashtongue_channeler(); + new npc_ashtongue_channeler(); new npc_creature_generator_akama(); new npc_ashtongue_sorcerer(); new npc_ashtongue_defender(); -- cgit v1.2.3 From 8b7ae2cde863f17df1a1462f8e01ebe0a340ae62 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 10 Jul 2013 11:48:15 +0200 Subject: DB/Misc: Spawn some missing gameobjects Data by KirkHammett --- sql/updates/world/2013_07_10_00_world_gameobject.sql | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sql/updates/world/2013_07_10_00_world_gameobject.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_10_00_world_gameobject.sql b/sql/updates/world/2013_07_10_00_world_gameobject.sql new file mode 100644 index 00000000000..0b7b1211826 --- /dev/null +++ b/sql/updates/world/2013_07_10_00_world_gameobject.sql @@ -0,0 +1,20 @@ +-- Spawn some missing gameobjects +DELETE FROM `gameobject` WHERE `id`= 192081; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(4946, 192081, 571, 1, 4, 7766.29, -3291.49, 867.549, 3.4413, 0, 0, 0.988793, -0.149295, 300, 0, 1), +(4953, 192081, 571, 1, 4, 7777.38, -3315.96, 870.557, 3.64289, 0, 0, 0.968752, -0.248033, 300, 0, 1), +(4972, 192081, 571, 1, 4, 7793.63, -3335.38, 874.607, 5.71525, 0, 0, 0.280166, -0.959952, 300, 0, 1), +(4980, 192081, 571, 1, 4, 7847.24, -3328.97, 860.566, 3.49149, 0, 0, 0.984736, -0.174056, 300, 0, 1), +(5025, 192081, 571, 1, 4, 7848.67, -3297.97, 858.592, 2.65853, 0, 0, 0.970973, 0.239191, 300, 0, 1), +(5030, 192081, 571, 1, 4, 7833.79, -3273.39, 858.925, 2.02126, 0, 0, 0.847168, 0.531325, 300, 0, 1), +(5042, 192081, 571, 1, 4, 7834.22, -3234.66, 854.051, 2.17682, 0, 0, 0.88589, 0.463896, 300, 0, 1), +(5052, 192081, 571, 1, 4, 7861.13, -3221.38, 851.222, 0.199794, 0, 0, 0.099731, 0.995014, 300, 0, 1), +(5064, 192081, 571, 1, 4, 7891.3, -3204.92, 856.156, 1.95869, 0, 0, 0.830133, 0.557565, 300, 0, 1), +(5076, 192081, 571, 1, 4, 7912.37, -3223.15, 854.569, 5.38674, 0, 0, 0.433365, -0.901218, 300, 0, 1), +(5081, 192081, 571, 1, 4, 7931.66, -3258.14, 858.264, 4.92008, 0, 0, 0.629999, -0.776596, 300, 0, 1), +(5113, 192081, 571, 1, 4, 7916.21, -3301.92, 858.29, 3.82118, 0, 0, 0.942824, -0.333292, 300, 0, 1), +(5130, 192081, 571, 1, 4, 7896.12, -3340.67, 857.777, 5.03497, 0, 0, 0.584373, -0.811485, 300, 0, 1), +(5170, 192081, 571, 1, 4, 7900.34, -3376.97, 861.646, 4.64358, 0, 0, 0.731011, -0.682366, 300, 0, 1), +(5185, 192081, 571, 1, 4, 7892.06, -3408.05, 864.871, 4.50853, 0, 0, 0.775386, -0.631488, 300, 0, 1), +(5194, 192081, 571, 1, 4, 7863.29, -3388.16, 863.473, 2.74226, 0, 0, 0.980133, 0.198341, 300, 0, 1), +(5198, 192081, 571, 1, 4, 7827.1, -3354.03, 865.865, 2.67201, 0, 0, 0.972563, 0.232639, 300, 0, 1); -- cgit v1.2.3 From b7cf456f5313b1513f8ea8599e97bfb275d90346 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 10 Jul 2013 18:29:32 -0230 Subject: Core/Scripting: Additions to Shade of Akama Script. Just ending sequence left to do. Please supply feedback if anything is not like offi so I can fix. --- sql/updates/world/2013_07_10_01_world_misc.sql | 5 + .../Outland/BlackTemple/boss_shade_of_akama.cpp | 205 ++++++++++++++++++++- 2 files changed, 207 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/2013_07_10_01_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_10_01_world_misc.sql b/sql/updates/world/2013_07_10_01_world_misc.sql new file mode 100644 index 00000000000..8a2430215df --- /dev/null +++ b/sql/updates/world/2013_07_10_01_world_misc.sql @@ -0,0 +1,5 @@ +UPDATE `creature_template` SET `AIName`= '', `ScriptName` = 'npc_ashtongue_elementalist' WHERE `entry`=23523; +DELETE FROM smart_scripts WHERE entryorguid=23523; + +UPDATE `creature_template` SET `AIName`= '', `ScriptName` = 'npc_ashtongue_spiritbinder' WHERE `entry`=23524; +DELETE FROM smart_scripts WHERE entryorguid=23524; diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 1b15a3596c3..54abbff6365 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -65,7 +65,14 @@ enum Spells SPELL_WINDFURY = 38229, // Ashtongue Rogue SPELL_DEBILITATING_POISON = 41978, - SPELL_EVISCERATE = 41177 + SPELL_EVISCERATE = 41177, + // Ashtongue Elementalist + SPELL_RAIN_OF_FIRE = 42023, + SPELL_LIGHTNING_BOLT = 42024, + // Ashtongue Spiritbinder + SPELL_SPIRIT_MEND = 42025, + SPELL_CHAIN_HEAL = 42027, + SPELL_SPIRIT_HEAL = 42317 }; enum Creatures @@ -127,7 +134,12 @@ enum Events EVENT_WINDFURY = 20, // Ashtongue Rogue EVENT_DEBILITATING_POISON = 21, - EVENT_EVISCERATE = 22 + EVENT_EVISCERATE = 22, + // Ashtongue Elementalist + EVENT_RAIN_OF_FIRE = 23, + EVENT_LIGHTNING_BOLT = 24, + // Ashtongue Spiritbinder + EVENT_SPIRIT_HEAL = 25, }; struct Location @@ -911,6 +923,9 @@ public: void UpdateAI(uint32 diff) OVERRIDE { + if (!UpdateVictim()) + return; + events.Update(diff); while (uint32 eventId = events.ExecuteEvent()) @@ -991,11 +1006,14 @@ public: void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand(500, 2000)); - events.ScheduleEvent(SPELL_EVISCERATE, urand(2000, 5000)); + events.ScheduleEvent(EVENT_EVISCERATE, urand(2000, 5000)); } void UpdateAI(uint32 diff) OVERRIDE { + if (!UpdateVictim()) + return; + events.Update(diff); while (uint32 eventId = events.ExecuteEvent()) @@ -1030,6 +1048,185 @@ public: } }; +// ######################################################## +// Ashtongue Elementalist +// ######################################################## + +class npc_ashtongue_elementalist : public CreatureScript +{ +public: + npc_ashtongue_elementalist() : CreatureScript("npc_ashtongue_elementalist") { } + + struct npc_ashtongue_elementalistAI : public ScriptedAI + { + npc_ashtongue_elementalistAI(Creature* creature) : ScriptedAI(creature) + { + instance = creature->GetInstanceScript(); + if (instance) + akamaGUID = instance->GetData64(DATA_AKAMA_SHADE); + } + + void Reset() OVERRIDE + { + if (Unit* target = me->GetCreature(*me, akamaGUID)) + AttackStart(target); + } + + void JustDied(Unit* /*killer*/) OVERRIDE + { + me->DespawnOrUnsummon(5000); + } + + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + { + if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) + CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); + } + + void EnterCombat(Unit* /*who*/) OVERRIDE + { + events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 18000); + events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 6000); + } + + void UpdateAI(uint32 diff) OVERRIDE + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_RAIN_OF_FIRE: + DoCastVictim(SPELL_RAIN_OF_FIRE); + events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 20000); + break; + case EVENT_LIGHTNING_BOLT: + DoCastVictim(SPELL_LIGHTNING_BOLT); + events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 15000); + break; + default: + break; + } + } + DoMeleeAttackIfReady(); + } + + private: + InstanceScript* instance; + EventMap events; + uint64 akamaGUID; + uint64 summonerGuid; + }; + + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new npc_ashtongue_elementalistAI(creature); + } +}; + +// ######################################################## +// Ashtongue Spiritbinder +// ######################################################## + +class npc_ashtongue_spiritbinder : public CreatureScript +{ +public: + npc_ashtongue_spiritbinder() : CreatureScript("npc_ashtongue_spiritbinder") { } + + struct npc_ashtongue_spiritbinderAI : public ScriptedAI + { + npc_ashtongue_spiritbinderAI(Creature* creature) : ScriptedAI(creature) + { + instance = creature->GetInstanceScript(); + if (instance) + akamaGUID = instance->GetData64(DATA_AKAMA_SHADE); + } + + void Reset() OVERRIDE + { + spiritMend = false; + chainHeal = false; + + if (Unit* target = me->GetCreature(*me, akamaGUID)) + AttackStart(target); + } + + void JustDied(Unit* /*killer*/) OVERRIDE + { + me->DespawnOrUnsummon(5000); + } + + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + { + if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) + CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); + } + + void EnterCombat(Unit* /*who*/) OVERRIDE + { + events.ScheduleEvent(EVENT_SPIRIT_HEAL, urand (5000, 6000)); + } + + void UpdateAI(uint32 diff) OVERRIDE + { + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SPIRIT_HEAL: + DoCast(me, SPELL_SPIRIT_HEAL); + events.ScheduleEvent(EVENT_SPIRIT_HEAL, urand (13000, 16000)); + break; + default: + break; + } + } + + if (!UpdateVictim()) + return; + + if (!spiritMend) + { + if (HealthBelowPct(25)) + { + DoCast(me, SPELL_SPIRIT_MEND); + spiritMend = true; + } + } + + if (!chainHeal) + { + if (HealthBelowPct(40)) + { + DoCast(me, SPELL_CHAIN_HEAL); + chainHeal = true; + } + } + + DoMeleeAttackIfReady(); + } + + private: + InstanceScript* instance; + EventMap events; + uint64 akamaGUID; + uint64 summonerGuid; + bool spiritMend; + bool chainHeal; + }; + + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new npc_ashtongue_spiritbinderAI(creature); + } +}; + void AddSC_boss_shade_of_akama() { new boss_shade_of_akama(); @@ -1039,4 +1236,6 @@ void AddSC_boss_shade_of_akama() new npc_ashtongue_sorcerer(); new npc_ashtongue_defender(); new npc_ashtongue_rogue(); + new npc_ashtongue_elementalist(); + new npc_ashtongue_spiritbinder(); } -- cgit v1.2.3 From f5cd494acb4b0b0db0a7acf5031af4927ed6575b Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 11 Jul 2013 14:51:35 +0200 Subject: DB/Misc: Fix some spam Fix by KirkHammett --- sql/updates/world/2013_07_11_00_world_sai.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2013_07_11_00_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_11_00_world_sai.sql b/sql/updates/world/2013_07_11_00_world_sai.sql new file mode 100644 index 00000000000..aaf95553f18 --- /dev/null +++ b/sql/updates/world/2013_07_11_00_world_sai.sql @@ -0,0 +1,3 @@ +-- Sandfury Shadowhunter spam fix +UPDATE `smart_scripts` SET `event_flags`=3 WHERE `entryorguid`=7246 AND `source_type`=0 AND `id`=15 AND `link`=16; +UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=7246 AND `source_type`=0 AND `id`=16 AND `link`=0; -- cgit v1.2.3 From 3c73e9baff581392a37b00bf03c669ad83017b35 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 11 Jul 2013 22:12:40 -0230 Subject: DB/Waypoints: Add some waypoints to black Temple Instance. --- .../world/2013_07_11_01_world_waypoints.sql | 444 +++++++++++++++++++++ 1 file changed, 444 insertions(+) create mode 100644 sql/updates/world/2013_07_11_01_world_waypoints.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_11_01_world_waypoints.sql b/sql/updates/world/2013_07_11_01_world_waypoints.sql new file mode 100644 index 00000000000..504dfad5631 --- /dev/null +++ b/sql/updates/world/2013_07_11_01_world_waypoints.sql @@ -0,0 +1,444 @@ +-- Pathing for Illidari Fearbringer Entry: 22954 +SET @NPC := 52768; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=612.1008,`position_y`=715.0594,`position_z`=77.48019 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,612.1008,715.0594,77.48019,0,0,0,0,100,0), +(@PATH,2,626.8418,715.1508,75.81075,0,0,0,0,100,0), +(@PATH,3,643.162,716.2298,70.8769,0,0,0,0,100,0), +(@PATH,4,663.4116,720.2251,70.52241,0,0,0,0,100,0), +(@PATH,5,682.2949,737.6859,68.97373,0,0,0,0,100,0), +(@PATH,6,692.6406,756.8541,66.75413,0,0,0,0,100,0), +(@PATH,7,682.2949,737.6859,68.97373,0,0,0,0,100,0), +(@PATH,8,663.4116,720.2251,70.52241,0,0,0,0,100,0), +(@PATH,9,643.162,716.2298,70.8769,0,0,0,0,100,0), +(@PATH,10,626.8418,715.1508,75.81075,0,0,0,0,100,0); + +-- Pathing for Illidari Fearbringer Entry: 22954 +SET @NPC := 52773; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=680.5127,`position_y`=736.589,`position_z`=68.98032 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,680.5127,736.589,68.98032,0,0,0,0,100,0), +(@PATH,2,689.7178,752.5954,67.10484,0,0,0,0,100,0), +(@PATH,3,690.7227,773.5752,65.17497,0,0,0,0,100,0), +(@PATH,4,682.0201,797.8951,63.36504,0,0,0,0,100,0), +(@PATH,5,679.8043,821.2305,61.06209,0,0,0,0,100,0), +(@PATH,6,680.7047,848.535,58.56005,0,0,0,0,100,0), +(@PATH,7,679.8043,821.2305,61.06209,0,0,0,0,100,0), +(@PATH,8,682.0201,797.8951,63.36504,0,0,0,0,100,0), +(@PATH,9,690.7438,773.907,65.11858,0,0,0,0,100,0), +(@PATH,10,689.7178,752.5954,67.10484,0,0,0,0,100,0); + +-- Pathing for Illidari Fearbringer Entry: 22954 +SET @NPC := 52769; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=713.0262,`position_y`=704.147,`position_z`=70.84101 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,713.0262,704.147,70.84101,0,0,0,0,100,0), +(@PATH,2,733.0706,690.4993,71.98522,0,0,0,0,100,0), +(@PATH,3,769.0543,692.4883,71.78658,0,0,0,0,100,0), +(@PATH,4,790.8868,701.6238,73.08874,0,0,0,0,100,0), +(@PATH,5,801.6542,721.7141,70.07971,0,0,0,0,100,0), +(@PATH,6,790.8868,701.6238,73.08874,0,0,0,0,100,0), +(@PATH,7,769.0543,692.4883,71.78658,0,0,0,0,100,0), +(@PATH,8,733.0706,690.4993,71.98522,0,0,0,0,100,0); + +-- Pathing for Illidari Fearbringer Entry: 22954 +SET @NPC := 52772; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=721.4406,`position_y`=728.4247,`position_z`=68.65119 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,721.4406,728.4247,68.65119,0,0,0,0,100,0), +(@PATH,2,721.3423,745.3929,67.11169,0,0,0,0,100,0), +(@PATH,3,716.5741,774.6444,64.54839,0,0,0,0,100,0), +(@PATH,4,724.2047,803.066,62.11536,0,0,0,0,100,0), +(@PATH,5,735.2154,833.7368,58.94956,0,0,0,0,100,0), +(@PATH,6,734.4446,863.5928,56.50595,0,0,0,0,100,0), +(@PATH,7,735.2154,833.7368,58.94956,0,0,0,0,100,0), +(@PATH,8,724.2047,803.066,62.11536,0,0,0,0,100,0), +(@PATH,9,716.5741,774.6444,64.54839,0,0,0,0,100,0), +(@PATH,10,721.3423,745.3929,67.11169,0,0,0,0,100,0); + +-- Pathing for Aqueous Lord Entry: 22878 +SET @NPC := 12866; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=312.8537,`position_y`=813.1077,`position_z`=-17.58058 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,312.8537,813.1077,-17.58058,0,0,0,0,100,0), +(@PATH,2,341.3598,812.8531,-6.117754,0,0,0,0,100,0), +(@PATH,3,381.8092,812.6519,9.062115,0,0,0,0,100,0), +(@PATH,4,341.4501,812.8524,-6.08468,0,0,0,0,100,0); + +-- Pathing for Aqueous Lord Entry: 22878 +SET @NPC := 12869; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=252.3342,`position_y`=893.9015,`position_z`=-30.78079 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,252.3342,893.9015,-30.78079,0,0,0,0,100,0), +(@PATH,2,252.6844,922.2958,-44.67338,0,0,0,0,100,0), +(@PATH,3,252.5329,943.3651,-55.76704,0,0,0,0,100,0), +(@PATH,4,252.6844,922.2958,-44.67338,0,0,0,0,100,0); + +-- Pathing for Priestess of Dementia Entry: 22957 +SET @NPC := 52857; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=946.3522,`position_y`=337.5683,`position_z`=191.208 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,946.3522,337.5683,191.208,0,0,0,0,100,0), +(@PATH,2,946.4788,358.0963,191.208,0,0,0,0,100,0), +(@PATH,3,946.3522,337.5683,191.208,0,0,0,0,100,0), +(@PATH,4,946.2967,310.864,191.208,0,0,0,0,100,0), +(@PATH,5,946.0381,284.1759,191.208,0,0,0,0,100,0), +(@PATH,6,945.9597,259.7708,191.208,0,0,0,0,100,0), +(@PATH,7,945.9167,242.3769,191.208,0,0,0,0,100,0), +(@PATH,8,945.6511,224.3957,191.208,0,0,0,0,100,0), +(@PATH,9,945.9167,242.3769,191.208,0,0,0,0,100,0), +(@PATH,10,945.9597,259.7708,191.208,0,0,0,0,100,0), +(@PATH,11,946.0381,284.1759,191.208,0,0,0,0,100,0), +(@PATH,12,946.2967,310.864,191.208,0,0,0,0,100,0), +(@PATH,13,946.3522,337.5683,191.208,0,0,0,0,100,0), +(@PATH,14,946.4788,358.0963,191.208,0,0,0,0,100,0); + +-- Pathing for Promenade Sentinel Entry: 23394 +SET @NPC := 12884; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=761.1854,`position_y`=161.5995,`position_z`=218.4323 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,4097,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,761.1854,161.5995,218.4323,0,0,0,0,100,0), +(@PATH,2,762.2211,175.3375,218.453,0,0,0,0,100,0), +(@PATH,3,788.6677,173.3627,212.4686,0,0,0,0,100,0), +(@PATH,4,813.4553,170.9617,204.7675,0,0,0,0,100,0), +(@PATH,5,812.7894,149.1826,204.7681,0,0,0,0,100,0), +(@PATH,6,812.5944,127.2771,204.7675,0,0,0,0,100,0), +(@PATH,7,788.8348,125.6381,212.1583,0,0,0,0,100,0), +(@PATH,8,760.3759,122.2594,218.5355,0,0,0,0,100,0), +(@PATH,9,760.9326,144.1558,218.4856,0,0,0,0,100,0); + +-- Pathing for Promenade Sentinel Entry: 23394 +SET @NPC := 12886; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=624.8207,`position_y`=173.8407,`position_z`=253.2433 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,4097,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,624.8207,173.8407,253.2433,0,0,0,0,100,0), +(@PATH,2,640.5691,173.9213,245.0594,0,0,0,0,100,0), +(@PATH,3,642.4141,149.8184,245.0508,0,0,0,0,100,0), +(@PATH,4,639.9938,127.3701,245.0583,0,0,0,0,100,0), +(@PATH,5,626.2823,127.0409,251.9054,0,0,0,0,100,0), +(@PATH,6,611.546,126.5545,258.8932,0,0,0,0,100,0), +(@PATH,7,606.4694,138.4668,258.7596,0,0,0,0,100,0), +(@PATH,8,607.1602,162.4693,258.7508,0,0,0,0,100,0), +(@PATH,9,613.0195,175.0303,258.9398,0,0,0,0,100,0), +(@PATH,10,624.8207,173.8407,253.2433,0,0,0,0,100,0); + +-- Pathing for Promenade Sentinel Entry: 23394 +SET @NPC := 12888; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=548.1619,`position_y`=222.5298,`position_z`=271.9026 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,4097,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,548.1619,222.5298,271.9026,4.712389,33000,0,0,100,0), +(@PATH,2,548.1752,204.6016,265.1634,0,0,0,0,100,0), +(@PATH,3,548.1595,190.8972,258.734,0,0,0,0,100,0), +(@PATH,4,548.0938,205.5043,265.7878,0,0,0,0,100,0); + +-- Pathing for Promenade Sentinel Entry: 23394 +SET @NPC := 12889; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=696.7759,`position_y`=173.015,`position_z`=232.0304 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,4097,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,696.7759,173.015,232.0304,0,0,0,0,100,0), +(@PATH,2,711.6221,149.6127,231.9982,0,0,0,0,100,0), +(@PATH,3,696.7689,127.0203,232.0802,0,0,0,0,100,0), +(@PATH,4,679.1018,126.4796,239.9357,0,0,0,0,100,0), +(@PATH,5,664.3721,125.8799,245.6465,0,0,0,0,100,0), +(@PATH,6,656.2635,131.5955,245.4032,0,0,0,0,100,0), +(@PATH,7,656.2786,146.7755,245.3991,0,0,0,0,100,0), +(@PATH,8,656.2986,153.3558,245.3982,0,0,0,0,100,0), +(@PATH,9,656.5179,169.0384,245.4051,0,0,0,0,100,0), +(@PATH,10,663.8251,173.6144,245.7881,0,0,0,0,100,0), +(@PATH,11,678.0536,173.7249,240.8454,0,0,0,0,100,0); + +-- Pathing for Bonechewer Behemoth Entry: 23196 +SET @NPC := 52739; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=909.464,`position_y`=245.1965,`position_z`=85.64125 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,909.464,245.1965,85.64125,0,0,0,0,100,0), +(@PATH,2,936.0223,259.309,85.6412,0,0,0,0,100,0), +(@PATH,3,941.6469,283.9179,85.64117,0,0,0,0,100,0), +(@PATH,4,924.2444,298.756,86.15284,0,0,0,0,100,0), +(@PATH,5,941.6469,283.9179,85.64117,0,0,0,0,100,0), +(@PATH,6,936.0223,259.309,85.6412,0,0,0,0,100,0), +(@PATH,7,909.464,245.1965,85.64125,0,0,0,0,100,0), +(@PATH,8,881.7233,244.0528,84.85726,0,0,0,0,100,0); + +-- Pathing for Bonechewer Behemoth Entry: 23196 +SET @NPC := 52740; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=899.0332,`position_y`=197.8294,`position_z`=86.16103 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,899.0332,197.8294,86.16103,0,0,0,0,100,0), +(@PATH,2,897.7601,186.8322,86.16117,0,0,0,0,100,0), +(@PATH,3,899.0332,197.8294,86.16103,0,0,0,0,100,0), +(@PATH,4,897.392,207.5867,86.1609,0,0,0,0,100,0), +(@PATH,5,921.5169,224.1364,85.64123,0,0,0,0,100,0), +(@PATH,6,930.8919,235.1188,85.64124,0,0,0,0,100,0), +(@PATH,7,940.9707,239.6061,85.64124,0,0,0,0,100,0), +(@PATH,8,950.1663,237.9947,86.16045,0,0,0,0,100,0), +(@PATH,9,956.6059,230.0929,86.16039,0,0,0,0,100,0), +(@PATH,10,956.8278,213.7176,86.16056,0,0,0,0,100,0), +(@PATH,11,957.555,199.413,86.1607,0,0,0,0,100,0), +(@PATH,12,956.8278,213.7176,86.16056,0,0,0,0,100,0), +(@PATH,13,956.6059,230.0929,86.16039,0,0,0,0,100,0), +(@PATH,14,950.1663,237.9947,86.16045,0,0,0,0,100,0), +(@PATH,15,940.9707,239.6061,85.64124,0,0,0,0,100,0), +(@PATH,16,930.8919,235.1188,85.64124,0,0,0,0,100,0), +(@PATH,17,921.5169,224.1364,85.64123,0,0,0,0,100,0), +(@PATH,18,897.392,207.5867,86.1609,0,0,0,0,100,0), +(@PATH,19,899.0332,197.8294,86.16103,0,0,0,0,100,0), +(@PATH,20,897.7601,186.8322,86.16117,0,0,0,0,100,0); + +-- Pathing for Bonechewer Behemoth Entry: 23196 +SET @NPC := 52542; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=872.4788,`position_y`=65.84342,`position_z`=112.7412 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,872.4788,65.84342,112.7412,0,0,0,0,100,0), +(@PATH,2,935.6211,65.98904,112.7535,0,0,0,0,100,0), +(@PATH,3,899.9241,69.37424,112.7376,0,0,0,0,100,0), +(@PATH,4,869.3976,68.47385,112.7417,0,0,0,0,100,0), +(@PATH,5,826.9479,67.30523,112.7454,0,0,0,0,100,0), +(@PATH,6,869.2424,69.2244,112.7418,0,0,0,0,100,0), +(@PATH,7,863.1619,63.82265,112.7426,0,0,0,0,100,0), +(@PATH,8,868.8893,72.09175,112.7419,0,0,0,0,100,0), +(@PATH,9,861.7059,67.34996,112.7429,0,0,0,0,100,0), +(@PATH,10,867.9327,69.0042,112.742,0,0,0,0,100,0), +(@PATH,11,825.1594,65.52496,112.7448,0,0,0,0,100,0), +(@PATH,12,874.6883,67.74924,112.7409,0,0,0,0,100,0), +(@PATH,13,899.5973,69.61382,112.7372,0,0,0,0,100,0), +(@PATH,14,927.8147,64.82682,112.7534,0,0,0,0,100,0), +(@PATH,15,870.0113,69.63828,112.7417,0,0,0,0,100,0), +(@PATH,16,870.6498,66.78909,112.7415,0,0,0,0,100,0); + +-- Pathing for Bonechewer Behemoth Entry: 23196 +SET @NPC := 52743; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=763.4602,`position_y`=121.2597,`position_z`=112.5469 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,763.4602,121.2597,112.5469,0,0,0,0,100,0), +(@PATH,2,765.515,120.5528,112.4407,0,0,0,0,100,0), +(@PATH,3,761.6171,120.877,112.6373,0,0,0,0,100,0), +(@PATH,4,763.0114,122.1931,112.5738,0,0,0,0,100,0), +(@PATH,5,762.4429,119.6596,112.5902,0,0,0,0,100,0), +(@PATH,6,762.847,118.4683,112.5643,0,0,0,0,100,0), +(@PATH,7,764.7086,116.9735,112.464,0,0,0,0,100,0), +(@PATH,8,762.533,120.0672,112.5876,0,0,0,0,100,0), +(@PATH,9,760.8773,120.2691,112.6714,0,0,0,0,100,0), +(@PATH,10,761.802,117.5317,112.6121,0,0,0,0,100,0), +(@PATH,11,765.24,118.7345,112.4458,0,0,0,0,100,0), +(@PATH,12,762.7466,119.8271,112.5758,0,0,0,0,100,0), +(@PATH,13,759.4903,118.7799,112.7338,0,0,0,0,100,0), +(@PATH,14,760.2434,121.535,112.7092,0,0,0,0,100,0), +(@PATH,15,767.4446,120.2948,112.3428,0,0,0,0,100,0), +(@PATH,16,752.21,117.786,112.7387,0,0,0,0,100,0), +(@PATH,17,735.6179,101.9004,112.7494,0,0,0,0,100,0), +(@PATH,18,724.5951,75.40408,113.4761,0,0,0,0,100,0), +(@PATH,19,756.7452,71.75539,112.7374,0,0,0,0,100,0), +(@PATH,20,756.4152,69.2236,112.7374,0,0,0,0,100,0), +(@PATH,21,730.9688,65.39399,113.2859,0,0,0,0,100,0), +(@PATH,22,775.8292,75.42676,112.7374,0,0,0,0,100,0), +(@PATH,23,772.0274,107.9498,112.6996,0,0,0,0,100,0); + +-- Pathing for Bonechewer Taskmaster Entry: 23028 +SET @NPC := 53816; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=775.0792,`position_y`=766.9516,`position_z`=66.16946 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,775.0792,766.9516,66.16946,0,0,0,0,100,0), +(@PATH,2,776.4752,758.1284,68.59184,0,0,0,0,100,0), +(@PATH,3,776.7239,748.5446,70.04276,0,0,0,0,100,0), +(@PATH,4,771.1584,744.486,69.7692,0,0,0,0,100,0), +(@PATH,5,776.7239,748.5446,70.04276,0,0,0,0,100,0), +(@PATH,6,776.4752,758.1284,68.59184,0,0,0,0,100,0), +(@PATH,7,775.0792,766.9516,66.16946,0,0,0,0,100,0), +(@PATH,8,776.6424,775.2938,65.64797,0,0,0,0,100,0), +(@PATH,9,779.1,781.9779,65.93484,0,0,0,0,100,0), +(@PATH,10,776.9979,791.3973,65.63259,0,0,0,0,100,0), +(@PATH,11,779.1,781.9779,65.93484,0,0,0,0,100,0), +(@PATH,12,776.6424,775.2938,65.64797,0,0,0,0,100,0); + +-- Pathing for Suffering Soul Fragment Entry: 23399 +SET @NPC := 40526; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=496.5382,`position_y`=84.75467,`position_z`=108.4162 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,496.5382,84.75467,108.4162,0,0,0,0,100,0), +(@PATH,2,521.0706,76.54764,112.8559,0,0,0,0,100,0), +(@PATH,3,496.5382,84.75467,108.4162,0,0,0,0,100,0), +(@PATH,4,474.7787,75.08279,111.861,0,0,0,0,100,0); + +-- Pathing for Suffering Soul Fragment Entry: 23399 +SET @NPC := 52411; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=557.008,`position_y`=29.39996,`position_z`=112.4988 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,557.008,29.39996,112.4988,0,0,0,0,100,0), +(@PATH,2,519.227,48.72656,113.3207,0,0,0,0,100,0), +(@PATH,3,477.2372,27.49957,112.5984,0,0,0,0,100,0), +(@PATH,4,519.227,48.72656,113.3207,0,0,0,0,100,0); + +-- Pathing for Suffering Soul Fragment Entry: 23399 +SET @NPC := 46817; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=609.3162,`position_y`=98.43359,`position_z`=112.342 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,609.3162,98.43359,112.342,0,0,0,0,100,0), +(@PATH,2,580.6458,90.18815,111.1614,0,0,0,0,100,0), +(@PATH,3,609.3162,98.43359,112.342,0,0,0,0,100,0), +(@PATH,4,629.5143,77.47526,112.7921,0,0,0,0,100,0); + +-- Pathing for Suffering Soul Fragment Entry: 23399 +SET @NPC := 40446; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=535.6982,`position_y`=75.88596,`position_z`=112.9535 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,535.6982,75.88596,112.9535,0,0,0,0,100,0), +(@PATH,2,560.1788,80.13477,113.2281,0,0,0,0,100,0), +(@PATH,3,574.8022,104.9709,113.0734,0,0,0,0,100,0), +(@PATH,4,560.1788,80.13477,113.2281,0,0,0,0,100,0); + +-- Pathing for Suffering Soul Fragment Entry: 23399 +SET @NPC := 42920; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=629.0891,`position_y`=47.3309,`position_z`=112.7773 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,629.0891,47.3309,112.7773,0,0,0,0,100,0), +(@PATH,2,601.5073,37.56067,112.7347,0,0,0,0,100,0), +(@PATH,3,575.1098,56.30285,111.0313,0,0,0,0,100,0), +(@PATH,4,601.2772,37.47917,112.7411,0,0,0,0,100,0); + +-- Pathing for Hungering Soul Fragment Entry: 23401 +SET @NPC := 52420; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=620.9159,`position_y`=30.22016,`position_z`=112.7356 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '41248'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,620.9159,30.22016,112.7356,0,0,0,0,100,0), +(@PATH,2,607.7153,64.61448,111.7263,0,0,0,0,100,0), +(@PATH,3,589.4402,39.24023,112.765,0,0,0,0,100,0), +(@PATH,4,607.5776,64.42328,111.7202,0,0,0,0,100,0); + +-- Pathing for Hungering Soul Fragment Entry: 23401 +SET @NPC := 52424; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=518.9474,`position_y`=74.61002,`position_z`=112.9129 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '41248'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,518.9474,74.61002,112.9129,0,0,0,0,100,0), +(@PATH,2,473.2182,73.22733,111.8457,0,0,0,0,100,0); + +-- Pathing for Hungering Soul Fragment Entry: 23401 +SET @NPC := 52418; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=617.4402,`position_y`=102.7646,`position_z`=112.7506 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '41248'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,617.4402,102.7646,112.7506,0,0,0,0,100,0), +(@PATH,2,601.6309,74.0624,111.239,0,0,0,0,100,0), +(@PATH,3,578.1609,98.96626,113.0465,0,0,0,0,100,0), +(@PATH,4,601.5496,73.97516,111.2432,0,0,0,0,100,0); + +-- Pathing for Hungering Soul Fragment Entry: 23401 +SET @NPC := 52427; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=552.3234,`position_y`=97.95421,`position_z`=112.4811 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '41248'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,552.3234,97.95421,112.4811,0,0,0,0,100,0), +(@PATH,2,536.0945,78.04199,113.071,0,0,0,0,100,0), +(@PATH,3,552.3234,97.95421,112.4811,0,0,0,0,100,0), +(@PATH,4,573.4583,103.4899,113.1861,0,0,0,0,100,0); + +-- Pathing for Hungering Soul Fragment Entry: 23401 +SET @NPC := 52423; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=512.1553,`position_y`=30.04926,`position_z`=113.648 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '41248'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,512.1553,30.04926,113.648,0,0,0,0,100,0), +(@PATH,2,487.4863,43.71723,112.3249,0,0,0,0,100,0), +(@PATH,3,512.1553,30.04926,113.648,0,0,0,0,100,0), +(@PATH,4,550.6255,48.4656,112.5677,0,0,0,0,100,0); -- cgit v1.2.3 From f8c3be1f7904477f3efab0ea6b4567196bb6b40b Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 11 Jul 2013 22:25:57 -0230 Subject: DB/Waypoints: Add waypoints to Black Temple instance. --- sql/updates/world/2013_07_11_02_world_waypoints | 351 ++++++++++++++++++++++++ 1 file changed, 351 insertions(+) create mode 100644 sql/updates/world/2013_07_11_02_world_waypoints (limited to 'sql') diff --git a/sql/updates/world/2013_07_11_02_world_waypoints b/sql/updates/world/2013_07_11_02_world_waypoints new file mode 100644 index 00000000000..0fcce3f25cf --- /dev/null +++ b/sql/updates/world/2013_07_11_02_world_waypoints @@ -0,0 +1,351 @@ +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52847; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=927.6238,`position_y`=341.3523,`position_z`=192.8381 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,927.6238,341.3523,192.8381,0,0,0,0,100,0), +(@PATH,2,933.1646,349.9787,192.8489,0,0,0,0,100,0), +(@PATH,3,946.3496,351.5887,191.208,0,0,0,0,100,0), +(@PATH,4,957.402,349.1798,192.8489,0,0,0,0,100,0), +(@PATH,5,959.1028,340.2523,192.8339,0,0,0,0,100,0), +(@PATH,6,958.7474,315.7549,192.85,0,0,0,0,100,0), +(@PATH,7,958.1597,284.2602,192.8316,0,0,0,0,100,0), +(@PATH,8,957.9045,261.2944,192.8105,0,0,0,0,100,0), +(@PATH,9,934.2908,249.2501,192.8218,0,0,0,0,100,0), +(@PATH,10,924.9614,242.9601,192.8321,0,0,0,0,100,0), +(@PATH,11,923.0469,232.589,192.8392,0,0,0,0,100,0), +(@PATH,12,936.2947,223.5277,192.8423,0,0,0,0,100,0), +(@PATH,13,956.1213,223.5726,192.8414,0,0,0,0,100,0), +(@PATH,14,957.9364,265.2702,192.8146,0,0,0,0,100,0), +(@PATH,15,958.333,291.847,192.8519,0,0,0,0,100,0), +(@PATH,16,958.7474,315.7549,192.85,0,0,0,0,100,0), +(@PATH,17,926.8249,319.8605,192.8298,0,0,0,0,100,0); +-- 0xF13059AC00000970 .go 927.6238 341.3523 192.8381 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53055; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=925.0996,`position_y`=342.9736,`position_z`=192.8381 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,925.0996,342.9736,192.8381,0,0,0,0,100,0), +(@PATH,2,932.8010,352.9566,192.8489,0,0,0,0,100,0), +(@PATH,3,946.9885,354.5199,191.2080,0,0,0,0,100,0), +(@PATH,4,960.3490,349.7412,192.8489,0,0,0,0,100,0), +(@PATH,5,962.1025,340.2088,192.8339,0,0,0,0,100,0), +(@PATH,6,961.7469,315.6989,192.8500,0,0,0,0,100,0), +(@PATH,7,961.1595,284.2269,192.8316,0,0,0,0,100,0), +(@PATH,8,959.2676,258.6220,192.8105,0,0,0,0,100,0), +(@PATH,9,935.9679,246.7626,192.8218,0,0,0,0,100,0), +(@PATH,10,927.9116,242.4155,192.8321,0,0,0,0,100,0), +(@PATH,11,924.7406,235.0652,192.8392,0,0,0,0,100,0), +(@PATH,12,936.2879,226.5277,192.8423,0,0,0,0,100,0), +(@PATH,13,953.1241,223.7031,192.8414,0,0,0,0,100,0), +(@PATH,14,954.9367,265.3150,192.8146,0,0,0,0,100,0), +(@PATH,15,955.3335,291.8990,192.8519,0,0,0,0,100,0), +(@PATH,16,958.3647,312.7794,192.8500,0,0,0,0,100,0), +(@PATH,17,923.8270,319.9719,192.8298,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52847; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52847,52847,0,0,2), +(52847,53055,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52848; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=939.6501,`position_y`=392.5455,`position_z`=192.2012 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,939.6501,392.5455,192.2012,0,0,0,0,100,0), +(@PATH,2,955.7531,392.462,192.8371,0,0,0,0,100,0), +(@PATH,3,962.5223,393.8847,192.8374,0,0,0,0,100,0), +(@PATH,4,969.5388,399.207,192.8365,0,0,0,0,100,0), +(@PATH,5,970.2259,412.7339,192.8371,0,0,0,0,100,0), +(@PATH,6,971.1399,429.8507,192.8395,0,0,0,0,100,0), +(@PATH,7,971.1545,441.883,192.8399,0,0,0,0,100,0), +(@PATH,8,963.2639,447.4974,192.8385,0,0,0,0,100,0), +(@PATH,9,950.0648,453.577,192.8389,0,0,0,0,100,0), +(@PATH,10,938.3679,452.2439,192.8379,0,0,0,0,100,0), +(@PATH,11,927.6536,446.5119,192.8374,0,0,0,0,100,0), +(@PATH,12,920.3358,436.4881,192.841,0,0,0,0,100,0), +(@PATH,13,920.5208,411.5176,192.8447,0,0,0,0,100,0), +(@PATH,14,922.6708,402.1874,192.8461,0,0,0,0,100,0), +(@PATH,15,931.1328,395.2974,192.8446,0,0,0,0,100,0); +-- 0xF13059AC00000972 .go 939.6501 392.5455 192.2012 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53056; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=939.6657,`position_y`=395.5455,`position_z`=192.2012 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,939.6657,395.5455,192.2012,0,0,0,0,100,0), +(@PATH,2,955.1361,395.3979,192.8371,0,0,0,0,100,0), +(@PATH,3,960.7093,396.2749,192.8374,0,0,0,0,100,0), +(@PATH,4,966.5427,399.3592,192.8365,0,0,0,0,100,0), +(@PATH,5,967.2302,412.8939,192.8371,0,0,0,0,100,0), +(@PATH,6,968.1399,429.8543,192.8395,0,0,0,0,100,0), +(@PATH,7,969.4152,439.4386,192.8399,0,0,0,0,100,0), +(@PATH,8,962.0088,444.7726,192.8385,0,0,0,0,100,0), +(@PATH,9,950.4045,450.5963,192.8389,0,0,0,0,100,0), +(@PATH,10,939.7831,449.5987,192.8379,0,0,0,0,100,0), +(@PATH,11,930.0766,444.7430,192.8374,0,0,0,0,100,0), +(@PATH,12,923.3357,436.5103,192.8410,0,0,0,0,100,0), +(@PATH,13,923.4442,412.1912,192.8447,0,0,0,0,100,0), +(@PATH,14,924.5650,404.5138,192.8461,0,0,0,0,100,0), +(@PATH,15,932.0551,398.1521,192.8446,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52848; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52848,52848,0,0,2), +(52848,53056,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52855; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=946.1318,`position_y`=109.8686,`position_z`=192.8489 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,946.1318,109.8686,192.8489,0,0,0,0,100,0), +(@PATH,2,927.7674,117.2716,192.8514,0,0,0,0,100,0), +(@PATH,3,918.4934,131.3158,192.8362,0,0,0,0,100,0), +(@PATH,4,919.8276,156.7103,192.8208,0,0,0,0,100,0), +(@PATH,5,924.041,177.5718,192.8279,0,0,0,0,100,0), +(@PATH,6,935.0341,190.2466,192.8337,0,0,0,0,100,0), +(@PATH,7,946.1438,190.5046,192.0657,0,0,0,0,100,0), +(@PATH,8,957.5206,190.2688,192.8344,0,0,0,0,100,0), +(@PATH,9,967.0856,176.6067,192.8276,0,0,0,0,100,0), +(@PATH,10,970.228,156.7281,192.829,0,0,0,0,100,0), +(@PATH,11,971.1368,131.5664,192.8254,0,0,0,0,100,0), +(@PATH,12,963.462,116.8087,192.829,0,0,0,0,100,0); +-- 0xF13059AC00000975 .go 946.1318 109.8686 192.8489 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53059; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=945.0102,`position_y`=107.0862,`position_z`=192.8489 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,945.0102,107.0862,192.8489,0,0,0,0,100,0), +(@PATH,2,925.2640,115.6185,192.8514,0,0,0,0,100,0), +(@PATH,3,915.4975,131.4732,192.8362,0,0,0,0,100,0), +(@PATH,4,916.8870,157.3042,192.8208,0,0,0,0,100,0), +(@PATH,5,921.7747,179.5374,192.8279,0,0,0,0,100,0), +(@PATH,6,934.9644,193.2458,192.8337,0,0,0,0,100,0), +(@PATH,7,946.2060,193.5040,192.0657,0,0,0,0,100,0), +(@PATH,8,959.9782,191.9894,192.8344,0,0,0,0,100,0), +(@PATH,9,970.0488,177.0751,192.8276,0,0,0,0,100,0), +(@PATH,10,973.2260,156.8364,192.8290,0,0,0,0,100,0), +(@PATH,11,973.7984,130.1822,192.8254,0,0,0,0,100,0), +(@PATH,12,964.5773,114.0237,192.8290,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52855; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52855,52855,0,0,2), +(52855,53059,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52846; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=832.2903,`position_y`=526.5916,`position_z`=165.7311 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,832.2903,526.5916,165.7311,0,0,0,0,100,0), +(@PATH,2,818.8309,520.7764,165.9885,0,0,0,0,100,0), +(@PATH,3,812.696,514.7813,166.1044,0,0,0,0,100,0), +(@PATH,4,812.6564,506.3056,170.2904,0,0,0,0,100,0), +(@PATH,5,812.5226,493.5983,180.3996,0,0,0,0,100,0), +(@PATH,6,812.2745,477.484,192.7058,0,0,0,0,100,0), +(@PATH,7,812.5706,466.9394,192.7913,0,0,0,0,100,0), +(@PATH,8,812.2745,477.484,192.7058,0,0,0,0,100,0), +(@PATH,9,812.5226,493.5983,180.3996,0,0,0,0,100,0), +(@PATH,10,812.6564,506.3056,170.2904,0,0,0,0,100,0), +(@PATH,11,812.696,514.7813,166.1044,0,0,0,0,100,0), +(@PATH,12,818.8309,520.7764,165.9885,0,0,0,0,100,0), +(@PATH,13,832.2903,526.5916,165.7311,0,0,0,0,100,0), +(@PATH,14,837.6116,532.7322,165.7527,0,0,0,0,100,0), +(@PATH,15,840.6443,543.301,165.6792,0,0,0,0,100,0), +(@PATH,16,849.1154,543.5079,165.8225,0,0,0,0,100,0), +(@PATH,17,862.1961,543.5349,156.2316,0,0,0,0,100,0), +(@PATH,18,874.82,543.4052,146.1888,0,0,0,0,100,0), +(@PATH,19,890.8995,543.0212,139.3036,0,0,0,0,100,0), +(@PATH,20,874.82,543.4052,146.1888,0,0,0,0,100,0), +(@PATH,21,862.1961,543.5349,156.2316,0,0,0,0,100,0), +(@PATH,22,849.1154,543.5079,165.8225,0,0,0,0,100,0), +(@PATH,23,840.6443,543.301,165.6792,0,0,0,0,100,0), +(@PATH,24,837.6116,532.7322,165.7527,0,0,0,0,100,0); +-- 0xF13059AC000009CB .go 832.2903 526.5916 165.7311 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53054; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=833.4802,`position_y`=523.8377,`position_z`=165.7311 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,833.4802,523.8377,165.7311,0,0,0,0,100,0), +(@PATH,2,820.9276,518.6308,165.9885,0,0,0,0,100,0), +(@PATH,3,815.6960,514.7673,166.1044,0,0,0,0,100,0), +(@PATH,4,815.6562,506.2740,170.2904,0,0,0,0,100,0), +(@PATH,5,815.5222,493.5521,180.3996,0,0,0,0,100,0), +(@PATH,6,815.2733,477.5682,192.7058,0,0,0,0,100,0), +(@PATH,7,815.5694,467.0236,192.7913,0,0,0,0,100,0), +(@PATH,8,815.2741,477.4378,192.7058,0,0,0,0,100,0), +(@PATH,9,815.5224,493.5667,180.3996,0,0,0,0,100,0), +(@PATH,10,815.6564,506.2916,170.2904,0,0,0,0,100,0), +(@PATH,11,814.7927,512.6357,166.1044,0,0,0,0,100,0), +(@PATH,12,820.0208,518.0225,165.9885,0,0,0,0,100,0), +(@PATH,13,834.5575,524.6269,165.7311,0,0,0,0,100,0), +(@PATH,14,840.4952,531.9047,165.7527,0,0,0,0,100,0), +(@PATH,15,840.7176,540.3019,165.6792,0,0,0,0,100,0), +(@PATH,16,849.1216,540.5079,165.8225,0,0,0,0,100,0), +(@PATH,17,862.1653,540.5351,156.2316,0,0,0,0,100,0), +(@PATH,18,874.7484,540.4061,146.1888,0,0,0,0,100,0), +(@PATH,19,890.8279,540.0221,139.3036,0,0,0,0,100,0), +(@PATH,20,874.7892,540.4054,146.1888,0,0,0,0,100,0), +(@PATH,21,862.2023,540.5349,156.2316,0,0,0,0,100,0), +(@PATH,22,849.1887,540.5088,165.8225,0,0,0,0,100,0), +(@PATH,23,843.5279,542.4735,165.6792,0,0,0,0,100,0), +(@PATH,24,839.8788,530.7675,165.7527,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52846; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52846,52846,0,0,2), +(52846,53054,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52854; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=897.643,`position_y`=368.6811,`position_z`=112.7681 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,897.643,368.6811,112.7682,0,0,0,0,100,0), +(@PATH,2,891.4086,375.0052,112.7682,0,0,0,0,100,0), +(@PATH,3,886.6258,392.1916,112.7681,0,0,0,0,100,0), +(@PATH,4,889.0926,406.6414,112.7681,0,0,0,0,100,0), +(@PATH,5,895.0201,414.2144,112.7681,0,0,0,0,100,0), +(@PATH,6,907.2474,422.6099,112.7681,0,0,0,0,100,0), +(@PATH,7,917.291,427.4965,112.7681,0,0,0,0,100,0), +(@PATH,8,917.538,443.7802,112.7681,0,0,0,0,100,0), +(@PATH,9,918.18,480.8549,121.0903,0,0,0,0,100,0), +(@PATH,10,918.1483,469.0587,112.768,0,0,0,0,100,0), +(@PATH,11,917.9372,449.7168,112.7681,0,0,0,0,100,0), +(@PATH,12,917.7559,427.5167,112.7681,0,0,0,0,100,0), +(@PATH,13,928.2393,423.6823,112.768,0,0,0,0,100,0), +(@PATH,14,942.3116,412.3955,112.768,0,0,0,0,100,0), +(@PATH,15,947.6193,400.7702,112.768,0,0,0,0,100,0), +(@PATH,16,947.3901,388.0476,112.768,0,0,0,0,100,0), +(@PATH,17,944.3997,375.4843,112.768,0,0,0,0,100,0), +(@PATH,18,934.3572,366.3027,112.7681,0,0,0,0,100,0), +(@PATH,19,922.269,361.623,112.7681,0,0,0,0,100,0), +(@PATH,20,907.52,362.9464,112.7682,0,0,0,0,100,0); +-- 0xF13059AC000009CE .go 917.291 427.4965 112.7681 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53058; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=895.5066,`position_y`=366.5750,`position_z`=112.7681 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,895.5066,366.5750,112.7682,0,0,0,0,100,0), +(@PATH,2,888.5184,374.2009,112.7682,0,0,0,0,100,0), +(@PATH,3,883.6686,392.6964,112.7681,0,0,0,0,100,0), +(@PATH,4,886.7302,408.4905,112.7681,0,0,0,0,100,0), +(@PATH,5,893.3220,416.6875,112.7681,0,0,0,0,100,0), +(@PATH,6,905.9349,425.3075,112.7681,0,0,0,0,100,0), +(@PATH,7,914.2913,427.5420,112.7681,0,0,0,0,100,0), +(@PATH,8,914.5384,443.8321,112.7681,0,0,0,0,100,0), +(@PATH,9,915.1800,480.8630,121.0903,0,0,0,0,100,0), +(@PATH,10,915.1485,469.0914,112.7680,0,0,0,0,100,0), +(@PATH,11,914.9373,449.7413,112.7681,0,0,0,0,100,0), +(@PATH,12,916.7254,424.6992,112.7681,0,0,0,0,100,0), +(@PATH,13,930.1163,426.0226,112.7680,0,0,0,0,100,0), +(@PATH,14,945.0406,413.6415,112.7680,0,0,0,0,100,0), +(@PATH,15,950.6188,400.7162,112.7680,0,0,0,0,100,0), +(@PATH,16,950.3086,387.3529,112.7680,0,0,0,0,100,0), +(@PATH,17,946.4240,373.2702,112.7680,0,0,0,0,100,0), +(@PATH,18,935.4403,363.5050,112.7681,0,0,0,0,100,0), +(@PATH,19,922.0009,358.6350,112.7681,0,0,0,0,100,0), +(@PATH,20,906.0137,360.3520,112.7682,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52854; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52854,52854,0,0,2), +(52854,53058,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52850; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=863.5932,`position_y`=404.4617,`position_z`=192.8021 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,863.5932,404.4617,192.8021,0,0,0,0,100,0), +(@PATH,2,857.1285,400.2212,192.8021,0,0,0,0,100,0), +(@PATH,3,841.5421,399.2611,192.8021,0,0,0,0,100,0), +(@PATH,4,824.6133,403.406,192.8021,0,0,0,0,100,0), +(@PATH,5,809.0944,408.0469,192.8021,0,0,0,0,100,0), +(@PATH,6,803.2555,409.021,192.8021,0,0,0,0,100,0), +(@PATH,7,798.0318,415.624,192.8021,0,0,0,0,100,0), +(@PATH,8,797.907,434.2558,192.8021,0,0,0,0,100,0), +(@PATH,9,803.9134,446.4958,192.8102,0,0,0,0,100,0), +(@PATH,10,822.2453,446.5771,192.8121,0,0,0,0,100,0), +(@PATH,11,832.8823,444.5272,192.8021,0,0,0,0,100,0), +(@PATH,12,841.865,440.6642,192.8021,0,0,0,0,100,0), +(@PATH,13,857.7858,440.4023,192.8021,0,0,0,0,100,0), +(@PATH,14,868.998,422.5621,192.8202,0,0,0,0,100,0), +(@PATH,15,892.9637,421.5781,192.8236,0,0,0,0,100,0), +(@PATH,16,869.101,417.053,192.80818,0,0,0,0,100,0); +-- 0xF13059AC00000B10 .go 863.5932 404.4617 192.8021 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53057; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=865.2386,`position_y`=401.9532,`position_z`=192.8021 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,865.2386,401.9532,192.8021,0,0,0,0,100,0), +(@PATH,2,857.3129,397.2269,192.8021,0,0,0,0,100,0), +(@PATH,3,840.8286,396.3472,192.8021,0,0,0,0,100,0), +(@PATH,4,823.7538,400.5318,192.8021,0,0,0,0,100,0), +(@PATH,5,808.6007,405.0878,192.8021,0,0,0,0,100,0), +(@PATH,6,800.9027,407.1597,192.8021,0,0,0,0,100,0), +(@PATH,7,795.0319,415.6039,192.8021,0,0,0,0,100,0), +(@PATH,8,795.2138,435.5774,192.8021,0,0,0,0,100,0), +(@PATH,9,803.9001,449.4958,192.8102,0,0,0,0,100,0), +(@PATH,10,822.8130,449.5229,192.8121,0,0,0,0,100,0), +(@PATH,11,834.0675,447.2832,192.8021,0,0,0,0,100,0), +(@PATH,12,841.9143,443.6638,192.8021,0,0,0,0,100,0), +(@PATH,13,860.3258,441.9986,192.8021,0,0,0,0,100,0), +(@PATH,14,869.1211,425.5596,192.8202,0,0,0,0,100,0), +(@PATH,15,893.0868,424.5756,192.8236,0,0,0,0,100,0), +(@PATH,16,868.987,420.166,192.80742,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52850; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52850,52850,0,0,2), +(52850,53057,3,270,2); -- cgit v1.2.3 From b91fd1c2d455216459e63c8f20794f4dcadf0183 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 11 Jul 2013 22:46:27 -0230 Subject: DB/Waypoints: Add missing .sql to file --- sql/updates/world/2013_07_11_02_world_waypoints | 351 --------------------- .../world/2013_07_11_02_world_waypoints.sql | 351 +++++++++++++++++++++ 2 files changed, 351 insertions(+), 351 deletions(-) delete mode 100644 sql/updates/world/2013_07_11_02_world_waypoints create mode 100644 sql/updates/world/2013_07_11_02_world_waypoints.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_11_02_world_waypoints b/sql/updates/world/2013_07_11_02_world_waypoints deleted file mode 100644 index 0fcce3f25cf..00000000000 --- a/sql/updates/world/2013_07_11_02_world_waypoints +++ /dev/null @@ -1,351 +0,0 @@ --- Pathing for Sister of Pain Entry: 22956 -SET @NPC := 52847; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=927.6238,`position_y`=341.3523,`position_z`=192.8381 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,927.6238,341.3523,192.8381,0,0,0,0,100,0), -(@PATH,2,933.1646,349.9787,192.8489,0,0,0,0,100,0), -(@PATH,3,946.3496,351.5887,191.208,0,0,0,0,100,0), -(@PATH,4,957.402,349.1798,192.8489,0,0,0,0,100,0), -(@PATH,5,959.1028,340.2523,192.8339,0,0,0,0,100,0), -(@PATH,6,958.7474,315.7549,192.85,0,0,0,0,100,0), -(@PATH,7,958.1597,284.2602,192.8316,0,0,0,0,100,0), -(@PATH,8,957.9045,261.2944,192.8105,0,0,0,0,100,0), -(@PATH,9,934.2908,249.2501,192.8218,0,0,0,0,100,0), -(@PATH,10,924.9614,242.9601,192.8321,0,0,0,0,100,0), -(@PATH,11,923.0469,232.589,192.8392,0,0,0,0,100,0), -(@PATH,12,936.2947,223.5277,192.8423,0,0,0,0,100,0), -(@PATH,13,956.1213,223.5726,192.8414,0,0,0,0,100,0), -(@PATH,14,957.9364,265.2702,192.8146,0,0,0,0,100,0), -(@PATH,15,958.333,291.847,192.8519,0,0,0,0,100,0), -(@PATH,16,958.7474,315.7549,192.85,0,0,0,0,100,0), -(@PATH,17,926.8249,319.8605,192.8298,0,0,0,0,100,0); --- 0xF13059AC00000970 .go 927.6238 341.3523 192.8381 - --- Pathing for Sister of Pleasure Entry: 22964 -SET @NPC := 53055; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=925.0996,`position_y`=342.9736,`position_z`=192.8381 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,925.0996,342.9736,192.8381,0,0,0,0,100,0), -(@PATH,2,932.8010,352.9566,192.8489,0,0,0,0,100,0), -(@PATH,3,946.9885,354.5199,191.2080,0,0,0,0,100,0), -(@PATH,4,960.3490,349.7412,192.8489,0,0,0,0,100,0), -(@PATH,5,962.1025,340.2088,192.8339,0,0,0,0,100,0), -(@PATH,6,961.7469,315.6989,192.8500,0,0,0,0,100,0), -(@PATH,7,961.1595,284.2269,192.8316,0,0,0,0,100,0), -(@PATH,8,959.2676,258.6220,192.8105,0,0,0,0,100,0), -(@PATH,9,935.9679,246.7626,192.8218,0,0,0,0,100,0), -(@PATH,10,927.9116,242.4155,192.8321,0,0,0,0,100,0), -(@PATH,11,924.7406,235.0652,192.8392,0,0,0,0,100,0), -(@PATH,12,936.2879,226.5277,192.8423,0,0,0,0,100,0), -(@PATH,13,953.1241,223.7031,192.8414,0,0,0,0,100,0), -(@PATH,14,954.9367,265.3150,192.8146,0,0,0,0,100,0), -(@PATH,15,955.3335,291.8990,192.8519,0,0,0,0,100,0), -(@PATH,16,958.3647,312.7794,192.8500,0,0,0,0,100,0), -(@PATH,17,923.8270,319.9719,192.8298,0,0,0,0,100,0); - -DELETE FROM `creature_formations` WHERE `leaderGUID`=52847; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(52847,52847,0,0,2), -(52847,53055,3,270,2); - --- Pathing for Sister of Pain Entry: 22956 -SET @NPC := 52848; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=939.6501,`position_y`=392.5455,`position_z`=192.2012 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,939.6501,392.5455,192.2012,0,0,0,0,100,0), -(@PATH,2,955.7531,392.462,192.8371,0,0,0,0,100,0), -(@PATH,3,962.5223,393.8847,192.8374,0,0,0,0,100,0), -(@PATH,4,969.5388,399.207,192.8365,0,0,0,0,100,0), -(@PATH,5,970.2259,412.7339,192.8371,0,0,0,0,100,0), -(@PATH,6,971.1399,429.8507,192.8395,0,0,0,0,100,0), -(@PATH,7,971.1545,441.883,192.8399,0,0,0,0,100,0), -(@PATH,8,963.2639,447.4974,192.8385,0,0,0,0,100,0), -(@PATH,9,950.0648,453.577,192.8389,0,0,0,0,100,0), -(@PATH,10,938.3679,452.2439,192.8379,0,0,0,0,100,0), -(@PATH,11,927.6536,446.5119,192.8374,0,0,0,0,100,0), -(@PATH,12,920.3358,436.4881,192.841,0,0,0,0,100,0), -(@PATH,13,920.5208,411.5176,192.8447,0,0,0,0,100,0), -(@PATH,14,922.6708,402.1874,192.8461,0,0,0,0,100,0), -(@PATH,15,931.1328,395.2974,192.8446,0,0,0,0,100,0); --- 0xF13059AC00000972 .go 939.6501 392.5455 192.2012 - --- Pathing for Sister of Pleasure Entry: 22964 -SET @NPC := 53056; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=939.6657,`position_y`=395.5455,`position_z`=192.2012 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,939.6657,395.5455,192.2012,0,0,0,0,100,0), -(@PATH,2,955.1361,395.3979,192.8371,0,0,0,0,100,0), -(@PATH,3,960.7093,396.2749,192.8374,0,0,0,0,100,0), -(@PATH,4,966.5427,399.3592,192.8365,0,0,0,0,100,0), -(@PATH,5,967.2302,412.8939,192.8371,0,0,0,0,100,0), -(@PATH,6,968.1399,429.8543,192.8395,0,0,0,0,100,0), -(@PATH,7,969.4152,439.4386,192.8399,0,0,0,0,100,0), -(@PATH,8,962.0088,444.7726,192.8385,0,0,0,0,100,0), -(@PATH,9,950.4045,450.5963,192.8389,0,0,0,0,100,0), -(@PATH,10,939.7831,449.5987,192.8379,0,0,0,0,100,0), -(@PATH,11,930.0766,444.7430,192.8374,0,0,0,0,100,0), -(@PATH,12,923.3357,436.5103,192.8410,0,0,0,0,100,0), -(@PATH,13,923.4442,412.1912,192.8447,0,0,0,0,100,0), -(@PATH,14,924.5650,404.5138,192.8461,0,0,0,0,100,0), -(@PATH,15,932.0551,398.1521,192.8446,0,0,0,0,100,0); - -DELETE FROM `creature_formations` WHERE `leaderGUID`=52848; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(52848,52848,0,0,2), -(52848,53056,3,270,2); - --- Pathing for Sister of Pain Entry: 22956 -SET @NPC := 52855; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=946.1318,`position_y`=109.8686,`position_z`=192.8489 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,946.1318,109.8686,192.8489,0,0,0,0,100,0), -(@PATH,2,927.7674,117.2716,192.8514,0,0,0,0,100,0), -(@PATH,3,918.4934,131.3158,192.8362,0,0,0,0,100,0), -(@PATH,4,919.8276,156.7103,192.8208,0,0,0,0,100,0), -(@PATH,5,924.041,177.5718,192.8279,0,0,0,0,100,0), -(@PATH,6,935.0341,190.2466,192.8337,0,0,0,0,100,0), -(@PATH,7,946.1438,190.5046,192.0657,0,0,0,0,100,0), -(@PATH,8,957.5206,190.2688,192.8344,0,0,0,0,100,0), -(@PATH,9,967.0856,176.6067,192.8276,0,0,0,0,100,0), -(@PATH,10,970.228,156.7281,192.829,0,0,0,0,100,0), -(@PATH,11,971.1368,131.5664,192.8254,0,0,0,0,100,0), -(@PATH,12,963.462,116.8087,192.829,0,0,0,0,100,0); --- 0xF13059AC00000975 .go 946.1318 109.8686 192.8489 - --- Pathing for Sister of Pleasure Entry: 22964 -SET @NPC := 53059; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=945.0102,`position_y`=107.0862,`position_z`=192.8489 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,945.0102,107.0862,192.8489,0,0,0,0,100,0), -(@PATH,2,925.2640,115.6185,192.8514,0,0,0,0,100,0), -(@PATH,3,915.4975,131.4732,192.8362,0,0,0,0,100,0), -(@PATH,4,916.8870,157.3042,192.8208,0,0,0,0,100,0), -(@PATH,5,921.7747,179.5374,192.8279,0,0,0,0,100,0), -(@PATH,6,934.9644,193.2458,192.8337,0,0,0,0,100,0), -(@PATH,7,946.2060,193.5040,192.0657,0,0,0,0,100,0), -(@PATH,8,959.9782,191.9894,192.8344,0,0,0,0,100,0), -(@PATH,9,970.0488,177.0751,192.8276,0,0,0,0,100,0), -(@PATH,10,973.2260,156.8364,192.8290,0,0,0,0,100,0), -(@PATH,11,973.7984,130.1822,192.8254,0,0,0,0,100,0), -(@PATH,12,964.5773,114.0237,192.8290,0,0,0,0,100,0); - -DELETE FROM `creature_formations` WHERE `leaderGUID`=52855; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(52855,52855,0,0,2), -(52855,53059,3,270,2); - --- Pathing for Sister of Pain Entry: 22956 -SET @NPC := 52846; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=832.2903,`position_y`=526.5916,`position_z`=165.7311 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,832.2903,526.5916,165.7311,0,0,0,0,100,0), -(@PATH,2,818.8309,520.7764,165.9885,0,0,0,0,100,0), -(@PATH,3,812.696,514.7813,166.1044,0,0,0,0,100,0), -(@PATH,4,812.6564,506.3056,170.2904,0,0,0,0,100,0), -(@PATH,5,812.5226,493.5983,180.3996,0,0,0,0,100,0), -(@PATH,6,812.2745,477.484,192.7058,0,0,0,0,100,0), -(@PATH,7,812.5706,466.9394,192.7913,0,0,0,0,100,0), -(@PATH,8,812.2745,477.484,192.7058,0,0,0,0,100,0), -(@PATH,9,812.5226,493.5983,180.3996,0,0,0,0,100,0), -(@PATH,10,812.6564,506.3056,170.2904,0,0,0,0,100,0), -(@PATH,11,812.696,514.7813,166.1044,0,0,0,0,100,0), -(@PATH,12,818.8309,520.7764,165.9885,0,0,0,0,100,0), -(@PATH,13,832.2903,526.5916,165.7311,0,0,0,0,100,0), -(@PATH,14,837.6116,532.7322,165.7527,0,0,0,0,100,0), -(@PATH,15,840.6443,543.301,165.6792,0,0,0,0,100,0), -(@PATH,16,849.1154,543.5079,165.8225,0,0,0,0,100,0), -(@PATH,17,862.1961,543.5349,156.2316,0,0,0,0,100,0), -(@PATH,18,874.82,543.4052,146.1888,0,0,0,0,100,0), -(@PATH,19,890.8995,543.0212,139.3036,0,0,0,0,100,0), -(@PATH,20,874.82,543.4052,146.1888,0,0,0,0,100,0), -(@PATH,21,862.1961,543.5349,156.2316,0,0,0,0,100,0), -(@PATH,22,849.1154,543.5079,165.8225,0,0,0,0,100,0), -(@PATH,23,840.6443,543.301,165.6792,0,0,0,0,100,0), -(@PATH,24,837.6116,532.7322,165.7527,0,0,0,0,100,0); --- 0xF13059AC000009CB .go 832.2903 526.5916 165.7311 - --- Pathing for Sister of Pleasure Entry: 22964 -SET @NPC := 53054; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=833.4802,`position_y`=523.8377,`position_z`=165.7311 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,833.4802,523.8377,165.7311,0,0,0,0,100,0), -(@PATH,2,820.9276,518.6308,165.9885,0,0,0,0,100,0), -(@PATH,3,815.6960,514.7673,166.1044,0,0,0,0,100,0), -(@PATH,4,815.6562,506.2740,170.2904,0,0,0,0,100,0), -(@PATH,5,815.5222,493.5521,180.3996,0,0,0,0,100,0), -(@PATH,6,815.2733,477.5682,192.7058,0,0,0,0,100,0), -(@PATH,7,815.5694,467.0236,192.7913,0,0,0,0,100,0), -(@PATH,8,815.2741,477.4378,192.7058,0,0,0,0,100,0), -(@PATH,9,815.5224,493.5667,180.3996,0,0,0,0,100,0), -(@PATH,10,815.6564,506.2916,170.2904,0,0,0,0,100,0), -(@PATH,11,814.7927,512.6357,166.1044,0,0,0,0,100,0), -(@PATH,12,820.0208,518.0225,165.9885,0,0,0,0,100,0), -(@PATH,13,834.5575,524.6269,165.7311,0,0,0,0,100,0), -(@PATH,14,840.4952,531.9047,165.7527,0,0,0,0,100,0), -(@PATH,15,840.7176,540.3019,165.6792,0,0,0,0,100,0), -(@PATH,16,849.1216,540.5079,165.8225,0,0,0,0,100,0), -(@PATH,17,862.1653,540.5351,156.2316,0,0,0,0,100,0), -(@PATH,18,874.7484,540.4061,146.1888,0,0,0,0,100,0), -(@PATH,19,890.8279,540.0221,139.3036,0,0,0,0,100,0), -(@PATH,20,874.7892,540.4054,146.1888,0,0,0,0,100,0), -(@PATH,21,862.2023,540.5349,156.2316,0,0,0,0,100,0), -(@PATH,22,849.1887,540.5088,165.8225,0,0,0,0,100,0), -(@PATH,23,843.5279,542.4735,165.6792,0,0,0,0,100,0), -(@PATH,24,839.8788,530.7675,165.7527,0,0,0,0,100,0); - -DELETE FROM `creature_formations` WHERE `leaderGUID`=52846; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(52846,52846,0,0,2), -(52846,53054,3,270,2); - --- Pathing for Sister of Pain Entry: 22956 -SET @NPC := 52854; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=897.643,`position_y`=368.6811,`position_z`=112.7681 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,897.643,368.6811,112.7682,0,0,0,0,100,0), -(@PATH,2,891.4086,375.0052,112.7682,0,0,0,0,100,0), -(@PATH,3,886.6258,392.1916,112.7681,0,0,0,0,100,0), -(@PATH,4,889.0926,406.6414,112.7681,0,0,0,0,100,0), -(@PATH,5,895.0201,414.2144,112.7681,0,0,0,0,100,0), -(@PATH,6,907.2474,422.6099,112.7681,0,0,0,0,100,0), -(@PATH,7,917.291,427.4965,112.7681,0,0,0,0,100,0), -(@PATH,8,917.538,443.7802,112.7681,0,0,0,0,100,0), -(@PATH,9,918.18,480.8549,121.0903,0,0,0,0,100,0), -(@PATH,10,918.1483,469.0587,112.768,0,0,0,0,100,0), -(@PATH,11,917.9372,449.7168,112.7681,0,0,0,0,100,0), -(@PATH,12,917.7559,427.5167,112.7681,0,0,0,0,100,0), -(@PATH,13,928.2393,423.6823,112.768,0,0,0,0,100,0), -(@PATH,14,942.3116,412.3955,112.768,0,0,0,0,100,0), -(@PATH,15,947.6193,400.7702,112.768,0,0,0,0,100,0), -(@PATH,16,947.3901,388.0476,112.768,0,0,0,0,100,0), -(@PATH,17,944.3997,375.4843,112.768,0,0,0,0,100,0), -(@PATH,18,934.3572,366.3027,112.7681,0,0,0,0,100,0), -(@PATH,19,922.269,361.623,112.7681,0,0,0,0,100,0), -(@PATH,20,907.52,362.9464,112.7682,0,0,0,0,100,0); --- 0xF13059AC000009CE .go 917.291 427.4965 112.7681 - --- Pathing for Sister of Pleasure Entry: 22964 -SET @NPC := 53058; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=895.5066,`position_y`=366.5750,`position_z`=112.7681 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,895.5066,366.5750,112.7682,0,0,0,0,100,0), -(@PATH,2,888.5184,374.2009,112.7682,0,0,0,0,100,0), -(@PATH,3,883.6686,392.6964,112.7681,0,0,0,0,100,0), -(@PATH,4,886.7302,408.4905,112.7681,0,0,0,0,100,0), -(@PATH,5,893.3220,416.6875,112.7681,0,0,0,0,100,0), -(@PATH,6,905.9349,425.3075,112.7681,0,0,0,0,100,0), -(@PATH,7,914.2913,427.5420,112.7681,0,0,0,0,100,0), -(@PATH,8,914.5384,443.8321,112.7681,0,0,0,0,100,0), -(@PATH,9,915.1800,480.8630,121.0903,0,0,0,0,100,0), -(@PATH,10,915.1485,469.0914,112.7680,0,0,0,0,100,0), -(@PATH,11,914.9373,449.7413,112.7681,0,0,0,0,100,0), -(@PATH,12,916.7254,424.6992,112.7681,0,0,0,0,100,0), -(@PATH,13,930.1163,426.0226,112.7680,0,0,0,0,100,0), -(@PATH,14,945.0406,413.6415,112.7680,0,0,0,0,100,0), -(@PATH,15,950.6188,400.7162,112.7680,0,0,0,0,100,0), -(@PATH,16,950.3086,387.3529,112.7680,0,0,0,0,100,0), -(@PATH,17,946.4240,373.2702,112.7680,0,0,0,0,100,0), -(@PATH,18,935.4403,363.5050,112.7681,0,0,0,0,100,0), -(@PATH,19,922.0009,358.6350,112.7681,0,0,0,0,100,0), -(@PATH,20,906.0137,360.3520,112.7682,0,0,0,0,100,0); - -DELETE FROM `creature_formations` WHERE `leaderGUID`=52854; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(52854,52854,0,0,2), -(52854,53058,3,270,2); - --- Pathing for Sister of Pain Entry: 22956 -SET @NPC := 52850; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=863.5932,`position_y`=404.4617,`position_z`=192.8021 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,863.5932,404.4617,192.8021,0,0,0,0,100,0), -(@PATH,2,857.1285,400.2212,192.8021,0,0,0,0,100,0), -(@PATH,3,841.5421,399.2611,192.8021,0,0,0,0,100,0), -(@PATH,4,824.6133,403.406,192.8021,0,0,0,0,100,0), -(@PATH,5,809.0944,408.0469,192.8021,0,0,0,0,100,0), -(@PATH,6,803.2555,409.021,192.8021,0,0,0,0,100,0), -(@PATH,7,798.0318,415.624,192.8021,0,0,0,0,100,0), -(@PATH,8,797.907,434.2558,192.8021,0,0,0,0,100,0), -(@PATH,9,803.9134,446.4958,192.8102,0,0,0,0,100,0), -(@PATH,10,822.2453,446.5771,192.8121,0,0,0,0,100,0), -(@PATH,11,832.8823,444.5272,192.8021,0,0,0,0,100,0), -(@PATH,12,841.865,440.6642,192.8021,0,0,0,0,100,0), -(@PATH,13,857.7858,440.4023,192.8021,0,0,0,0,100,0), -(@PATH,14,868.998,422.5621,192.8202,0,0,0,0,100,0), -(@PATH,15,892.9637,421.5781,192.8236,0,0,0,0,100,0), -(@PATH,16,869.101,417.053,192.80818,0,0,0,0,100,0); --- 0xF13059AC00000B10 .go 863.5932 404.4617 192.8021 - --- Pathing for Sister of Pleasure Entry: 22964 -SET @NPC := 53057; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=865.2386,`position_y`=401.9532,`position_z`=192.8021 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,865.2386,401.9532,192.8021,0,0,0,0,100,0), -(@PATH,2,857.3129,397.2269,192.8021,0,0,0,0,100,0), -(@PATH,3,840.8286,396.3472,192.8021,0,0,0,0,100,0), -(@PATH,4,823.7538,400.5318,192.8021,0,0,0,0,100,0), -(@PATH,5,808.6007,405.0878,192.8021,0,0,0,0,100,0), -(@PATH,6,800.9027,407.1597,192.8021,0,0,0,0,100,0), -(@PATH,7,795.0319,415.6039,192.8021,0,0,0,0,100,0), -(@PATH,8,795.2138,435.5774,192.8021,0,0,0,0,100,0), -(@PATH,9,803.9001,449.4958,192.8102,0,0,0,0,100,0), -(@PATH,10,822.8130,449.5229,192.8121,0,0,0,0,100,0), -(@PATH,11,834.0675,447.2832,192.8021,0,0,0,0,100,0), -(@PATH,12,841.9143,443.6638,192.8021,0,0,0,0,100,0), -(@PATH,13,860.3258,441.9986,192.8021,0,0,0,0,100,0), -(@PATH,14,869.1211,425.5596,192.8202,0,0,0,0,100,0), -(@PATH,15,893.0868,424.5756,192.8236,0,0,0,0,100,0), -(@PATH,16,868.987,420.166,192.80742,0,0,0,0,100,0); - -DELETE FROM `creature_formations` WHERE `leaderGUID`=52850; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(52850,52850,0,0,2), -(52850,53057,3,270,2); diff --git a/sql/updates/world/2013_07_11_02_world_waypoints.sql b/sql/updates/world/2013_07_11_02_world_waypoints.sql new file mode 100644 index 00000000000..0fcce3f25cf --- /dev/null +++ b/sql/updates/world/2013_07_11_02_world_waypoints.sql @@ -0,0 +1,351 @@ +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52847; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=927.6238,`position_y`=341.3523,`position_z`=192.8381 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,927.6238,341.3523,192.8381,0,0,0,0,100,0), +(@PATH,2,933.1646,349.9787,192.8489,0,0,0,0,100,0), +(@PATH,3,946.3496,351.5887,191.208,0,0,0,0,100,0), +(@PATH,4,957.402,349.1798,192.8489,0,0,0,0,100,0), +(@PATH,5,959.1028,340.2523,192.8339,0,0,0,0,100,0), +(@PATH,6,958.7474,315.7549,192.85,0,0,0,0,100,0), +(@PATH,7,958.1597,284.2602,192.8316,0,0,0,0,100,0), +(@PATH,8,957.9045,261.2944,192.8105,0,0,0,0,100,0), +(@PATH,9,934.2908,249.2501,192.8218,0,0,0,0,100,0), +(@PATH,10,924.9614,242.9601,192.8321,0,0,0,0,100,0), +(@PATH,11,923.0469,232.589,192.8392,0,0,0,0,100,0), +(@PATH,12,936.2947,223.5277,192.8423,0,0,0,0,100,0), +(@PATH,13,956.1213,223.5726,192.8414,0,0,0,0,100,0), +(@PATH,14,957.9364,265.2702,192.8146,0,0,0,0,100,0), +(@PATH,15,958.333,291.847,192.8519,0,0,0,0,100,0), +(@PATH,16,958.7474,315.7549,192.85,0,0,0,0,100,0), +(@PATH,17,926.8249,319.8605,192.8298,0,0,0,0,100,0); +-- 0xF13059AC00000970 .go 927.6238 341.3523 192.8381 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53055; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=925.0996,`position_y`=342.9736,`position_z`=192.8381 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,925.0996,342.9736,192.8381,0,0,0,0,100,0), +(@PATH,2,932.8010,352.9566,192.8489,0,0,0,0,100,0), +(@PATH,3,946.9885,354.5199,191.2080,0,0,0,0,100,0), +(@PATH,4,960.3490,349.7412,192.8489,0,0,0,0,100,0), +(@PATH,5,962.1025,340.2088,192.8339,0,0,0,0,100,0), +(@PATH,6,961.7469,315.6989,192.8500,0,0,0,0,100,0), +(@PATH,7,961.1595,284.2269,192.8316,0,0,0,0,100,0), +(@PATH,8,959.2676,258.6220,192.8105,0,0,0,0,100,0), +(@PATH,9,935.9679,246.7626,192.8218,0,0,0,0,100,0), +(@PATH,10,927.9116,242.4155,192.8321,0,0,0,0,100,0), +(@PATH,11,924.7406,235.0652,192.8392,0,0,0,0,100,0), +(@PATH,12,936.2879,226.5277,192.8423,0,0,0,0,100,0), +(@PATH,13,953.1241,223.7031,192.8414,0,0,0,0,100,0), +(@PATH,14,954.9367,265.3150,192.8146,0,0,0,0,100,0), +(@PATH,15,955.3335,291.8990,192.8519,0,0,0,0,100,0), +(@PATH,16,958.3647,312.7794,192.8500,0,0,0,0,100,0), +(@PATH,17,923.8270,319.9719,192.8298,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52847; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52847,52847,0,0,2), +(52847,53055,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52848; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=939.6501,`position_y`=392.5455,`position_z`=192.2012 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,939.6501,392.5455,192.2012,0,0,0,0,100,0), +(@PATH,2,955.7531,392.462,192.8371,0,0,0,0,100,0), +(@PATH,3,962.5223,393.8847,192.8374,0,0,0,0,100,0), +(@PATH,4,969.5388,399.207,192.8365,0,0,0,0,100,0), +(@PATH,5,970.2259,412.7339,192.8371,0,0,0,0,100,0), +(@PATH,6,971.1399,429.8507,192.8395,0,0,0,0,100,0), +(@PATH,7,971.1545,441.883,192.8399,0,0,0,0,100,0), +(@PATH,8,963.2639,447.4974,192.8385,0,0,0,0,100,0), +(@PATH,9,950.0648,453.577,192.8389,0,0,0,0,100,0), +(@PATH,10,938.3679,452.2439,192.8379,0,0,0,0,100,0), +(@PATH,11,927.6536,446.5119,192.8374,0,0,0,0,100,0), +(@PATH,12,920.3358,436.4881,192.841,0,0,0,0,100,0), +(@PATH,13,920.5208,411.5176,192.8447,0,0,0,0,100,0), +(@PATH,14,922.6708,402.1874,192.8461,0,0,0,0,100,0), +(@PATH,15,931.1328,395.2974,192.8446,0,0,0,0,100,0); +-- 0xF13059AC00000972 .go 939.6501 392.5455 192.2012 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53056; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=939.6657,`position_y`=395.5455,`position_z`=192.2012 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,939.6657,395.5455,192.2012,0,0,0,0,100,0), +(@PATH,2,955.1361,395.3979,192.8371,0,0,0,0,100,0), +(@PATH,3,960.7093,396.2749,192.8374,0,0,0,0,100,0), +(@PATH,4,966.5427,399.3592,192.8365,0,0,0,0,100,0), +(@PATH,5,967.2302,412.8939,192.8371,0,0,0,0,100,0), +(@PATH,6,968.1399,429.8543,192.8395,0,0,0,0,100,0), +(@PATH,7,969.4152,439.4386,192.8399,0,0,0,0,100,0), +(@PATH,8,962.0088,444.7726,192.8385,0,0,0,0,100,0), +(@PATH,9,950.4045,450.5963,192.8389,0,0,0,0,100,0), +(@PATH,10,939.7831,449.5987,192.8379,0,0,0,0,100,0), +(@PATH,11,930.0766,444.7430,192.8374,0,0,0,0,100,0), +(@PATH,12,923.3357,436.5103,192.8410,0,0,0,0,100,0), +(@PATH,13,923.4442,412.1912,192.8447,0,0,0,0,100,0), +(@PATH,14,924.5650,404.5138,192.8461,0,0,0,0,100,0), +(@PATH,15,932.0551,398.1521,192.8446,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52848; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52848,52848,0,0,2), +(52848,53056,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52855; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=946.1318,`position_y`=109.8686,`position_z`=192.8489 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,946.1318,109.8686,192.8489,0,0,0,0,100,0), +(@PATH,2,927.7674,117.2716,192.8514,0,0,0,0,100,0), +(@PATH,3,918.4934,131.3158,192.8362,0,0,0,0,100,0), +(@PATH,4,919.8276,156.7103,192.8208,0,0,0,0,100,0), +(@PATH,5,924.041,177.5718,192.8279,0,0,0,0,100,0), +(@PATH,6,935.0341,190.2466,192.8337,0,0,0,0,100,0), +(@PATH,7,946.1438,190.5046,192.0657,0,0,0,0,100,0), +(@PATH,8,957.5206,190.2688,192.8344,0,0,0,0,100,0), +(@PATH,9,967.0856,176.6067,192.8276,0,0,0,0,100,0), +(@PATH,10,970.228,156.7281,192.829,0,0,0,0,100,0), +(@PATH,11,971.1368,131.5664,192.8254,0,0,0,0,100,0), +(@PATH,12,963.462,116.8087,192.829,0,0,0,0,100,0); +-- 0xF13059AC00000975 .go 946.1318 109.8686 192.8489 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53059; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=945.0102,`position_y`=107.0862,`position_z`=192.8489 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,945.0102,107.0862,192.8489,0,0,0,0,100,0), +(@PATH,2,925.2640,115.6185,192.8514,0,0,0,0,100,0), +(@PATH,3,915.4975,131.4732,192.8362,0,0,0,0,100,0), +(@PATH,4,916.8870,157.3042,192.8208,0,0,0,0,100,0), +(@PATH,5,921.7747,179.5374,192.8279,0,0,0,0,100,0), +(@PATH,6,934.9644,193.2458,192.8337,0,0,0,0,100,0), +(@PATH,7,946.2060,193.5040,192.0657,0,0,0,0,100,0), +(@PATH,8,959.9782,191.9894,192.8344,0,0,0,0,100,0), +(@PATH,9,970.0488,177.0751,192.8276,0,0,0,0,100,0), +(@PATH,10,973.2260,156.8364,192.8290,0,0,0,0,100,0), +(@PATH,11,973.7984,130.1822,192.8254,0,0,0,0,100,0), +(@PATH,12,964.5773,114.0237,192.8290,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52855; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52855,52855,0,0,2), +(52855,53059,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52846; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=832.2903,`position_y`=526.5916,`position_z`=165.7311 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,832.2903,526.5916,165.7311,0,0,0,0,100,0), +(@PATH,2,818.8309,520.7764,165.9885,0,0,0,0,100,0), +(@PATH,3,812.696,514.7813,166.1044,0,0,0,0,100,0), +(@PATH,4,812.6564,506.3056,170.2904,0,0,0,0,100,0), +(@PATH,5,812.5226,493.5983,180.3996,0,0,0,0,100,0), +(@PATH,6,812.2745,477.484,192.7058,0,0,0,0,100,0), +(@PATH,7,812.5706,466.9394,192.7913,0,0,0,0,100,0), +(@PATH,8,812.2745,477.484,192.7058,0,0,0,0,100,0), +(@PATH,9,812.5226,493.5983,180.3996,0,0,0,0,100,0), +(@PATH,10,812.6564,506.3056,170.2904,0,0,0,0,100,0), +(@PATH,11,812.696,514.7813,166.1044,0,0,0,0,100,0), +(@PATH,12,818.8309,520.7764,165.9885,0,0,0,0,100,0), +(@PATH,13,832.2903,526.5916,165.7311,0,0,0,0,100,0), +(@PATH,14,837.6116,532.7322,165.7527,0,0,0,0,100,0), +(@PATH,15,840.6443,543.301,165.6792,0,0,0,0,100,0), +(@PATH,16,849.1154,543.5079,165.8225,0,0,0,0,100,0), +(@PATH,17,862.1961,543.5349,156.2316,0,0,0,0,100,0), +(@PATH,18,874.82,543.4052,146.1888,0,0,0,0,100,0), +(@PATH,19,890.8995,543.0212,139.3036,0,0,0,0,100,0), +(@PATH,20,874.82,543.4052,146.1888,0,0,0,0,100,0), +(@PATH,21,862.1961,543.5349,156.2316,0,0,0,0,100,0), +(@PATH,22,849.1154,543.5079,165.8225,0,0,0,0,100,0), +(@PATH,23,840.6443,543.301,165.6792,0,0,0,0,100,0), +(@PATH,24,837.6116,532.7322,165.7527,0,0,0,0,100,0); +-- 0xF13059AC000009CB .go 832.2903 526.5916 165.7311 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53054; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=833.4802,`position_y`=523.8377,`position_z`=165.7311 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,833.4802,523.8377,165.7311,0,0,0,0,100,0), +(@PATH,2,820.9276,518.6308,165.9885,0,0,0,0,100,0), +(@PATH,3,815.6960,514.7673,166.1044,0,0,0,0,100,0), +(@PATH,4,815.6562,506.2740,170.2904,0,0,0,0,100,0), +(@PATH,5,815.5222,493.5521,180.3996,0,0,0,0,100,0), +(@PATH,6,815.2733,477.5682,192.7058,0,0,0,0,100,0), +(@PATH,7,815.5694,467.0236,192.7913,0,0,0,0,100,0), +(@PATH,8,815.2741,477.4378,192.7058,0,0,0,0,100,0), +(@PATH,9,815.5224,493.5667,180.3996,0,0,0,0,100,0), +(@PATH,10,815.6564,506.2916,170.2904,0,0,0,0,100,0), +(@PATH,11,814.7927,512.6357,166.1044,0,0,0,0,100,0), +(@PATH,12,820.0208,518.0225,165.9885,0,0,0,0,100,0), +(@PATH,13,834.5575,524.6269,165.7311,0,0,0,0,100,0), +(@PATH,14,840.4952,531.9047,165.7527,0,0,0,0,100,0), +(@PATH,15,840.7176,540.3019,165.6792,0,0,0,0,100,0), +(@PATH,16,849.1216,540.5079,165.8225,0,0,0,0,100,0), +(@PATH,17,862.1653,540.5351,156.2316,0,0,0,0,100,0), +(@PATH,18,874.7484,540.4061,146.1888,0,0,0,0,100,0), +(@PATH,19,890.8279,540.0221,139.3036,0,0,0,0,100,0), +(@PATH,20,874.7892,540.4054,146.1888,0,0,0,0,100,0), +(@PATH,21,862.2023,540.5349,156.2316,0,0,0,0,100,0), +(@PATH,22,849.1887,540.5088,165.8225,0,0,0,0,100,0), +(@PATH,23,843.5279,542.4735,165.6792,0,0,0,0,100,0), +(@PATH,24,839.8788,530.7675,165.7527,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52846; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52846,52846,0,0,2), +(52846,53054,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52854; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=897.643,`position_y`=368.6811,`position_z`=112.7681 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,897.643,368.6811,112.7682,0,0,0,0,100,0), +(@PATH,2,891.4086,375.0052,112.7682,0,0,0,0,100,0), +(@PATH,3,886.6258,392.1916,112.7681,0,0,0,0,100,0), +(@PATH,4,889.0926,406.6414,112.7681,0,0,0,0,100,0), +(@PATH,5,895.0201,414.2144,112.7681,0,0,0,0,100,0), +(@PATH,6,907.2474,422.6099,112.7681,0,0,0,0,100,0), +(@PATH,7,917.291,427.4965,112.7681,0,0,0,0,100,0), +(@PATH,8,917.538,443.7802,112.7681,0,0,0,0,100,0), +(@PATH,9,918.18,480.8549,121.0903,0,0,0,0,100,0), +(@PATH,10,918.1483,469.0587,112.768,0,0,0,0,100,0), +(@PATH,11,917.9372,449.7168,112.7681,0,0,0,0,100,0), +(@PATH,12,917.7559,427.5167,112.7681,0,0,0,0,100,0), +(@PATH,13,928.2393,423.6823,112.768,0,0,0,0,100,0), +(@PATH,14,942.3116,412.3955,112.768,0,0,0,0,100,0), +(@PATH,15,947.6193,400.7702,112.768,0,0,0,0,100,0), +(@PATH,16,947.3901,388.0476,112.768,0,0,0,0,100,0), +(@PATH,17,944.3997,375.4843,112.768,0,0,0,0,100,0), +(@PATH,18,934.3572,366.3027,112.7681,0,0,0,0,100,0), +(@PATH,19,922.269,361.623,112.7681,0,0,0,0,100,0), +(@PATH,20,907.52,362.9464,112.7682,0,0,0,0,100,0); +-- 0xF13059AC000009CE .go 917.291 427.4965 112.7681 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53058; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=895.5066,`position_y`=366.5750,`position_z`=112.7681 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,895.5066,366.5750,112.7682,0,0,0,0,100,0), +(@PATH,2,888.5184,374.2009,112.7682,0,0,0,0,100,0), +(@PATH,3,883.6686,392.6964,112.7681,0,0,0,0,100,0), +(@PATH,4,886.7302,408.4905,112.7681,0,0,0,0,100,0), +(@PATH,5,893.3220,416.6875,112.7681,0,0,0,0,100,0), +(@PATH,6,905.9349,425.3075,112.7681,0,0,0,0,100,0), +(@PATH,7,914.2913,427.5420,112.7681,0,0,0,0,100,0), +(@PATH,8,914.5384,443.8321,112.7681,0,0,0,0,100,0), +(@PATH,9,915.1800,480.8630,121.0903,0,0,0,0,100,0), +(@PATH,10,915.1485,469.0914,112.7680,0,0,0,0,100,0), +(@PATH,11,914.9373,449.7413,112.7681,0,0,0,0,100,0), +(@PATH,12,916.7254,424.6992,112.7681,0,0,0,0,100,0), +(@PATH,13,930.1163,426.0226,112.7680,0,0,0,0,100,0), +(@PATH,14,945.0406,413.6415,112.7680,0,0,0,0,100,0), +(@PATH,15,950.6188,400.7162,112.7680,0,0,0,0,100,0), +(@PATH,16,950.3086,387.3529,112.7680,0,0,0,0,100,0), +(@PATH,17,946.4240,373.2702,112.7680,0,0,0,0,100,0), +(@PATH,18,935.4403,363.5050,112.7681,0,0,0,0,100,0), +(@PATH,19,922.0009,358.6350,112.7681,0,0,0,0,100,0), +(@PATH,20,906.0137,360.3520,112.7682,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52854; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52854,52854,0,0,2), +(52854,53058,3,270,2); + +-- Pathing for Sister of Pain Entry: 22956 +SET @NPC := 52850; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=863.5932,`position_y`=404.4617,`position_z`=192.8021 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,863.5932,404.4617,192.8021,0,0,0,0,100,0), +(@PATH,2,857.1285,400.2212,192.8021,0,0,0,0,100,0), +(@PATH,3,841.5421,399.2611,192.8021,0,0,0,0,100,0), +(@PATH,4,824.6133,403.406,192.8021,0,0,0,0,100,0), +(@PATH,5,809.0944,408.0469,192.8021,0,0,0,0,100,0), +(@PATH,6,803.2555,409.021,192.8021,0,0,0,0,100,0), +(@PATH,7,798.0318,415.624,192.8021,0,0,0,0,100,0), +(@PATH,8,797.907,434.2558,192.8021,0,0,0,0,100,0), +(@PATH,9,803.9134,446.4958,192.8102,0,0,0,0,100,0), +(@PATH,10,822.2453,446.5771,192.8121,0,0,0,0,100,0), +(@PATH,11,832.8823,444.5272,192.8021,0,0,0,0,100,0), +(@PATH,12,841.865,440.6642,192.8021,0,0,0,0,100,0), +(@PATH,13,857.7858,440.4023,192.8021,0,0,0,0,100,0), +(@PATH,14,868.998,422.5621,192.8202,0,0,0,0,100,0), +(@PATH,15,892.9637,421.5781,192.8236,0,0,0,0,100,0), +(@PATH,16,869.101,417.053,192.80818,0,0,0,0,100,0); +-- 0xF13059AC00000B10 .go 863.5932 404.4617 192.8021 + +-- Pathing for Sister of Pleasure Entry: 22964 +SET @NPC := 53057; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=865.2386,`position_y`=401.9532,`position_z`=192.8021 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,865.2386,401.9532,192.8021,0,0,0,0,100,0), +(@PATH,2,857.3129,397.2269,192.8021,0,0,0,0,100,0), +(@PATH,3,840.8286,396.3472,192.8021,0,0,0,0,100,0), +(@PATH,4,823.7538,400.5318,192.8021,0,0,0,0,100,0), +(@PATH,5,808.6007,405.0878,192.8021,0,0,0,0,100,0), +(@PATH,6,800.9027,407.1597,192.8021,0,0,0,0,100,0), +(@PATH,7,795.0319,415.6039,192.8021,0,0,0,0,100,0), +(@PATH,8,795.2138,435.5774,192.8021,0,0,0,0,100,0), +(@PATH,9,803.9001,449.4958,192.8102,0,0,0,0,100,0), +(@PATH,10,822.8130,449.5229,192.8121,0,0,0,0,100,0), +(@PATH,11,834.0675,447.2832,192.8021,0,0,0,0,100,0), +(@PATH,12,841.9143,443.6638,192.8021,0,0,0,0,100,0), +(@PATH,13,860.3258,441.9986,192.8021,0,0,0,0,100,0), +(@PATH,14,869.1211,425.5596,192.8202,0,0,0,0,100,0), +(@PATH,15,893.0868,424.5756,192.8236,0,0,0,0,100,0), +(@PATH,16,868.987,420.166,192.80742,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=52850; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(52850,52850,0,0,2), +(52850,53057,3,270,2); -- cgit v1.2.3 From 984fa01b61d814e3864cf920f45eef6fdbd75d4e Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 12 Jul 2013 13:20:54 +0200 Subject: DB/Misc: Fix Blowing Hodir's Horn Fix by KirkHammett closes #10270 --- sql/updates/world/2013_07_12_00_world_sai.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2013_07_12_00_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_12_00_world_sai.sql b/sql/updates/world/2013_07_12_00_world_sai.sql new file mode 100644 index 00000000000..cf2c80f580f --- /dev/null +++ b/sql/updates/world/2013_07_12_00_world_sai.sql @@ -0,0 +1,7 @@ +-- Fixes Blowing Hodir's Horn (12977) +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=29974; +DELETE FROM `smart_scripts` WHERE `entryorguid`=29974 AND `source_type`=0; +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 +(29974, 0, 0, 0, 0, 0, 100, 0, 1000, 5000, 8000, 13000, 11, 57454, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Niffelem Forefather - IC - Cast Ice Spike'), +(29974, 0, 1, 2, 8, 0, 100, 0, 55983, 0, 0, 0, 33, 30138, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Niffelem Forefather - On Spellhit - Give Kill Credit'), +(29974, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Niffelem Forefather - Linked with Previous Event Despawn'); -- cgit v1.2.3 From 4ecc68d3a5d28afad37ca0b5cea5d88e6c80f488 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 12 Jul 2013 14:40:54 +0100 Subject: DB/EAI: Remove forgotten EAI scripts 984fa01b61d814e3864 --- sql/updates/world/2013_07_12_01_world_eai.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2013_07_12_01_world_eai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_12_01_world_eai.sql b/sql/updates/world/2013_07_12_01_world_eai.sql new file mode 100644 index 00000000000..c36b6d0f3c6 --- /dev/null +++ b/sql/updates/world/2013_07_12_01_world_eai.sql @@ -0,0 +1 @@ +DELETE FROM `creature_ai_scripts` WHERE `creature_id` = 29974; -- cgit v1.2.3 From 4aad735af95e9304b0fd0a394abf32198afb28a7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 13 Jul 2013 09:27:27 -0230 Subject: Core/Scripting: Add Wrathbone Flayer script to show channelling visual and correct combat AI. --- sql/updates/world/2013_07_13_00_world_misc.sql | 5 + .../scripts/Outland/BlackTemple/black_temple.cpp | 164 +++++++++++++++++++-- 2 files changed, 160 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2013_07_13_00_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_13_00_world_misc.sql b/sql/updates/world/2013_07_13_00_world_misc.sql new file mode 100644 index 00000000000..b34e96a0811 --- /dev/null +++ b/sql/updates/world/2013_07_13_00_world_misc.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=40094; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,40094,0,0,31,0,3,22953,0,0,'','Spell summom channel targets Wrathbone Flayer'); +UPDATE `creature_template` SET `AIName`= '', `ScriptName` = 'npc_wrathbone_flayer' WHERE `entry`=22953; +DELETE FROM smart_scripts WHERE entryorguid=22953; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 3d4e7290238..a44c5f58dc4 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -21,25 +21,41 @@ Complete: 100% Comment: Spirit of Olum: Player Teleporter to Seer Kanai Teleport after defeating Naj'entus and Supremus. */ -/* Content -npc_spirit_of_olum -*/ - #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "black_temple.h" #include "Player.h" -/*### -# npc_spirit_of_olum -####*/ - enum Spells { - SPELL_TELEPORT = 41566 + // Spirit of Olum + SPELL_TELEPORT = 41566, + // Wrathbone Flayer + SPELL_CLEAVE = 15496, + SPELL_IGNORED = 39544, + SPELL_SUMMON_CHANNEL = 40094 }; +enum Creatures +{ + NPC_BLOOD_MAGE = 22945, + NPC_DEATHSHAPER = 22882 +}; + +enum Events +{ + // Wrathbone Flayer + EVENT_GET_CHANNELERS = 1, + EVENT_SET_CHANNELERS = 2, + EVENT_CLEAVE = 3, + EVENT_IGNORED = 4, +}; + +// ######################################################## +// Spirit of Olum +// ######################################################## + class npc_spirit_of_olum : public CreatureScript { public: @@ -66,7 +82,137 @@ public: } }; +// ######################################################## +// Wrathbone Flayer +// ######################################################## + +class npc_wrathbone_flayer : public CreatureScript +{ +public: + npc_wrathbone_flayer() : CreatureScript("npc_wrathbone_flayer") { } + + struct npc_wrathbone_flayerAI : public ScriptedAI + { + npc_wrathbone_flayerAI(Creature* creature) : ScriptedAI(creature) + { + instance = creature->GetInstanceScript(); + } + + void Reset() OVERRIDE + { + events.ScheduleEvent(EVENT_GET_CHANNELERS, 3000); + enteredCombat = false; + } + + void JustDied(Unit* /*killer*/) OVERRIDE { } + + void EnterCombat(Unit* /*who*/) OVERRIDE + { + events.ScheduleEvent(EVENT_CLEAVE, 5000); + events.ScheduleEvent(EVENT_IGNORED, 7000); + enteredCombat = true; + } + + void UpdateAI(uint32 diff) OVERRIDE + { + + if (!enteredCombat) + { + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_GET_CHANNELERS: + { + std::list BloodMageList; + me->GetCreatureListWithEntryInGrid(BloodMageList, NPC_BLOOD_MAGE, 15.0f); + + if (!BloodMageList.empty()) + for (std::list::const_iterator itr = BloodMageList.begin(); itr != BloodMageList.end(); ++itr) + { + bloodmage.push_back((*itr)->GetGUID()); + if ((*itr)->isDead()) + (*itr)->Respawn(); + } + + std::list DeathShaperList; + me->GetCreatureListWithEntryInGrid(DeathShaperList, NPC_DEATHSHAPER, 15.0f); + + if (!DeathShaperList.empty()) + for (std::list::const_iterator itr = DeathShaperList.begin(); itr != DeathShaperList.end(); ++itr) + { + deathshaper.push_back((*itr)->GetGUID()); + if ((*itr)->isDead()) + (*itr)->Respawn(); + } + + events.ScheduleEvent(EVENT_SET_CHANNELERS, 3000); + + break; + } + case EVENT_SET_CHANNELERS: + { + for (std::list::const_iterator itr = bloodmage.begin(); itr != bloodmage.end(); ++itr) + if (Creature* bloodmage = (Unit::GetCreature(*me, *itr))) + bloodmage->AI()->DoCast(SPELL_SUMMON_CHANNEL); + + for (std::list::const_iterator itr = deathshaper.begin(); itr != deathshaper.end(); ++itr) + if (Creature* deathshaper = (Unit::GetCreature(*me, *itr))) + deathshaper->AI()->DoCast(SPELL_SUMMON_CHANNEL); + + events.ScheduleEvent(EVENT_SET_CHANNELERS, 12000); + + break; + } + default: + break; + } + } + } + + if (!UpdateVictim()) + return; + + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_CLEAVE: + DoCastVictim(SPELL_CLEAVE); + events.ScheduleEvent(EVENT_CLEAVE, urand (1000, 2000)); + break; + case EVENT_IGNORED: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_IGNORED); + events.ScheduleEvent(EVENT_IGNORED, 10000); + break; + default: + break; + } + } + DoMeleeAttackIfReady(); + } + + private: + InstanceScript* instance; + EventMap events; + std::list bloodmage; + std::list deathshaper; + bool enteredCombat; + }; + + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new npc_wrathbone_flayerAI(creature); + } +}; + void AddSC_black_temple() { new npc_spirit_of_olum(); + new npc_wrathbone_flayer(); } -- cgit v1.2.3 From bedb2e56e2ca35ad6790c2ef2c736a88b8f1fb16 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 14 Jul 2013 14:46:03 +0100 Subject: DB/Errors: Fix a db startup error --- sql/updates/world/2013_07_14_00_world_errors.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2013_07_14_00_world_errors.sql (limited to 'sql') diff --git a/sql/updates/world/2013_07_14_00_world_errors.sql b/sql/updates/world/2013_07_14_00_world_errors.sql new file mode 100644 index 00000000000..f6ce6c2c0aa --- /dev/null +++ b/sql/updates/world/2013_07_14_00_world_errors.sql @@ -0,0 +1,4 @@ +-- Fix "There is no waypoint which links to the waypoint script 332" + +DELETE FROM `waypoint_scripts` WHERE `id`=332; +DELETE FROM `db_script_string` WHERE `entry`=2000005146; -- cgit v1.2.3