From c27a0333ceaeeb9c499f54670cbc40d4ce8cd9c5 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 23 Feb 2012 12:06:43 -0500 Subject: Core/Scripts: script despawn for dummy effect of muisek vessels --- sql/updates/world/2012_02_23_00_world_spell_script_names.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_02_23_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_23_00_world_spell_script_names.sql b/sql/updates/world/2012_02_23_00_world_spell_script_names.sql new file mode 100644 index 00000000000..6ea96033091 --- /dev/null +++ b/sql/updates/world/2012_02_23_00_world_spell_script_names.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` in (11885,11886,11887,11888,11889); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(11885,'spell_item_muisek_vessel'), +(11886,'spell_item_muisek_vessel'), +(11887,'spell_item_muisek_vessel'), +(11888,'spell_item_muisek_vessel'), +(11889,'spell_item_muisek_vessel'); -- cgit v1.2.3 From a3755f8355e64c9efc3033977e39af3b157368f6 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 24 Feb 2012 11:22:13 +0100 Subject: DB/Loot: Add Primordial Saronite to Deathbringer and Dreamwalker Closes #5381 --- .../world/2012_02_24_00_world_gameobject_loot_template.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql b/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..daecfc02dfc --- /dev/null +++ b/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql @@ -0,0 +1,10 @@ +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Deathbringer's Cache +(28058,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28074,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28088,49908,20,1,0,1,1), -- Primordial Saronite 25H +-- Cache of the Dreamwalker +(28064,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28082,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28096,49908,20,1,0,1,1); -- Primordial Saronite 25H -- cgit v1.2.3 From 7a4d388e0467c8303137de543861b29d231e8a4f Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 24 Feb 2012 19:28:14 -0330 Subject: DB/SAI: Fix for quest "You've Really Done It This Time, Kul" 14096 Alliance / 14142 Horde --- sql/updates/world/2012_02_24_01_world_sai.sql | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 sql/updates/world/2012_02_24_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_24_01_world_sai.sql b/sql/updates/world/2012_02_24_01_world_sai.sql new file mode 100644 index 00000000000..e7488fd8220 --- /dev/null +++ b/sql/updates/world/2012_02_24_01_world_sai.sql @@ -0,0 +1,44 @@ +-- Fix for quest "You've Really Done It This Time, Kul" 14096 Alliance / 14142 Horde +-- SAI for Black Cage +SET @ENTRY=195310; +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=1); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Black Cage - On activate - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,6000,6000,6000,6000,32,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Black Cage - Script - set go state'); +-- SAI for Captive Aspirant +SET @ENTRY=34716; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,8,0,100,0,66531,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - On spellhit - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - Say random text'), +(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Captive Aspirant - Script - Kill credit'), +(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - move 10 yards'), +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,72,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - despawn'); +-- SAI for Kul the Reckless +SET @ENTRY=34956; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,8,0,100,0,66531,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - On spellhit - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - Say random text'), +(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kul the Reckless - Script - Kill credit'), +(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - move 10 yards'), +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,72,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - despawn'); +-- Captive Aspirant & Kul the Reckless text from sniff +DELETE FROM `creature_text` WHERE `entry` IN (34716,34956); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(34716,0,0, 'Thank you, $c.',12,0,100,5,0,0, 'Captive Aspirant'), +(34716,0,1, 'They''re killing the prisoners! Hurry, help the others.',12,0,100,5,0,0, 'Captive Aspirant'), +(34716,0,2, 'I knew I shouldn''t have come to the tournament!',12,0,100,5,0,0, 'Captive Aspirant'), +(34716,0,3, 'I thought I was going to die in there!',12,0,100,5,0,0, 'Captive Aspirant'), +(34956,0,0, 'They were seconds from strapping me to one of those altars and sucking my soul out. Let''s get out of here!',12,0,100,5,0,0, 'Kul the Reckless'); +-- Target conditions for spell 66531 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=66531; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,2,66531,0,0,31,3,34716,0,0,0,'','Spell 66531 targets npc 34716 or npc 34956'), +(13,2,66531,0,1,31,3,34956,0,0,0,'','Spell 66531 targets npc 34716 or npc 34956'); -- cgit v1.2.3 From ac70e09bc8b715250738aa9e627cea6dca6037f2 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 24 Feb 2012 21:15:05 -0330 Subject: DB/Updates: Fix some update sql's to proper naming. --- .../world/2012_02_19_05_world_creature_text.sql | 7 ++++ sql/updates/world/2012_02_19_05_world_say_text.sql | 7 ---- .../world/2012_02_19_06_world_creature_text.sql | 20 +++++++++++ sql/updates/world/2012_02_19_06_world_say_text.sql | 20 ----------- sql/updates/world/2012_02_20_01_world_gossip.sql | 8 +++++ sql/updates/world/2012_02_20_01_world_misc_db.sql | 8 ----- .../world/2012_02_21_05_world_Gossip_SAI.sql | 39 ---------------------- sql/updates/world/2012_02_21_05_world_gossip.sql | 39 ++++++++++++++++++++++ .../world/2012_02_22_01_world_creature_text.sql | 34 +++++++++++++++++++ sql/updates/world/2012_02_22_01_world_say_text.sql | 34 ------------------- 10 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 sql/updates/world/2012_02_19_05_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_19_05_world_say_text.sql create mode 100644 sql/updates/world/2012_02_19_06_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_19_06_world_say_text.sql create mode 100644 sql/updates/world/2012_02_20_01_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_20_01_world_misc_db.sql delete mode 100644 sql/updates/world/2012_02_21_05_world_Gossip_SAI.sql create mode 100644 sql/updates/world/2012_02_21_05_world_gossip.sql create mode 100644 sql/updates/world/2012_02_22_01_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_22_01_world_say_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_19_05_world_creature_text.sql b/sql/updates/world/2012_02_19_05_world_creature_text.sql new file mode 100644 index 00000000000..b70385660a1 --- /dev/null +++ b/sql/updates/world/2012_02_19_05_world_creature_text.sql @@ -0,0 +1,7 @@ +-- NPC talk text from sniff +DELETE FROM `creature_text` WHERE `entry`=7604; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(7604,0,0, 'What? How dare you say that to me?!?',12,0,100,6,0,0, 'Sergeant Bly'), +(7604,1,0, 'After all we''ve been through? Well, I didn''t like you anyway!!',12,0,100,5,0,0, 'Sergeant Bly'); +-- Remove old text +DELETE FROM `script_texts` WHERE `entry` IN (-1209002,-1209003); diff --git a/sql/updates/world/2012_02_19_05_world_say_text.sql b/sql/updates/world/2012_02_19_05_world_say_text.sql deleted file mode 100644 index b70385660a1..00000000000 --- a/sql/updates/world/2012_02_19_05_world_say_text.sql +++ /dev/null @@ -1,7 +0,0 @@ --- NPC talk text from sniff -DELETE FROM `creature_text` WHERE `entry`=7604; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(7604,0,0, 'What? How dare you say that to me?!?',12,0,100,6,0,0, 'Sergeant Bly'), -(7604,1,0, 'After all we''ve been through? Well, I didn''t like you anyway!!',12,0,100,5,0,0, 'Sergeant Bly'); --- Remove old text -DELETE FROM `script_texts` WHERE `entry` IN (-1209002,-1209003); diff --git a/sql/updates/world/2012_02_19_06_world_creature_text.sql b/sql/updates/world/2012_02_19_06_world_creature_text.sql new file mode 100644 index 00000000000..f69c4cb86a9 --- /dev/null +++ b/sql/updates/world/2012_02_19_06_world_creature_text.sql @@ -0,0 +1,20 @@ +-- SAI for Erich Lohan +SET @ENTRY=3627; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,0,100,0,10000,15000,10000,15000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Erich Lohan - OOC - Say random text'); +-- Talk text from sniff +DELETE FROM `creature_text` WHERE `entry`=3627; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(3627,0,0, 'Magical studies stressing your brain? Relax at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,1, 'Best drinks in Stormwind!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,2, 'Come for the beer, stay for the atmosphere!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,3, 'The only place in Stormwind where magic and spirits mix, come to the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,4, 'Free drinks at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,5, 'Feeling blue? Come on down to the Blue Recluse for a good time!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,6, 'Head on over to the Blue Recluse. Where everybody knows your name!',12,7,100,0,0,0, 'Erich Lohan'); +-- Remove old waypoint text +UPDATE `waypoint_data` SET `action`=0 WHERE `id`=904450; +DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 432 AND 446; +DELETE FROM `db_script_string` WHERE `entry` BETWEEN 2000005185 AND 2000005199; diff --git a/sql/updates/world/2012_02_19_06_world_say_text.sql b/sql/updates/world/2012_02_19_06_world_say_text.sql deleted file mode 100644 index f69c4cb86a9..00000000000 --- a/sql/updates/world/2012_02_19_06_world_say_text.sql +++ /dev/null @@ -1,20 +0,0 @@ --- SAI for Erich Lohan -SET @ENTRY=3627; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,0,100,0,10000,15000,10000,15000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Erich Lohan - OOC - Say random text'); --- Talk text from sniff -DELETE FROM `creature_text` WHERE `entry`=3627; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(3627,0,0, 'Magical studies stressing your brain? Relax at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,1, 'Best drinks in Stormwind!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,2, 'Come for the beer, stay for the atmosphere!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,3, 'The only place in Stormwind where magic and spirits mix, come to the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,4, 'Free drinks at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,5, 'Feeling blue? Come on down to the Blue Recluse for a good time!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,6, 'Head on over to the Blue Recluse. Where everybody knows your name!',12,7,100,0,0,0, 'Erich Lohan'); --- Remove old waypoint text -UPDATE `waypoint_data` SET `action`=0 WHERE `id`=904450; -DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 432 AND 446; -DELETE FROM `db_script_string` WHERE `entry` BETWEEN 2000005185 AND 2000005199; diff --git a/sql/updates/world/2012_02_20_01_world_gossip.sql b/sql/updates/world/2012_02_20_01_world_gossip.sql new file mode 100644 index 00000000000..f3943ded29a --- /dev/null +++ b/sql/updates/world/2012_02_20_01_world_gossip.sql @@ -0,0 +1,8 @@ +-- Fix error in Scourge Deathspeaker SAI +UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=27615 AND `id`=14; +-- Fix up Keeper Remulos SAI +UPDATE `smart_scripts` SET `id`=3 WHERE `entryorguid`=11832 AND `id`=4; +-- Spiritcaller Dohgar +UPDATE `creature_template` SET `gossip_menu_id`=8513 WHERE `entry`=22312; +DELETE FROM `gossip_menu` WHERE `entry`=8513 AND `text_id`=10647; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8513,10647); diff --git a/sql/updates/world/2012_02_20_01_world_misc_db.sql b/sql/updates/world/2012_02_20_01_world_misc_db.sql deleted file mode 100644 index f3943ded29a..00000000000 --- a/sql/updates/world/2012_02_20_01_world_misc_db.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Fix error in Scourge Deathspeaker SAI -UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=27615 AND `id`=14; --- Fix up Keeper Remulos SAI -UPDATE `smart_scripts` SET `id`=3 WHERE `entryorguid`=11832 AND `id`=4; --- Spiritcaller Dohgar -UPDATE `creature_template` SET `gossip_menu_id`=8513 WHERE `entry`=22312; -DELETE FROM `gossip_menu` WHERE `entry`=8513 AND `text_id`=10647; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8513,10647); diff --git a/sql/updates/world/2012_02_21_05_world_Gossip_SAI.sql b/sql/updates/world/2012_02_21_05_world_Gossip_SAI.sql deleted file mode 100644 index 1bdccae5c39..00000000000 --- a/sql/updates/world/2012_02_21_05_world_Gossip_SAI.sql +++ /dev/null @@ -1,39 +0,0 @@ --- SAI for Lothos Riftwaker -SET @ENTRY=14387; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lothos Riftwaker - On Gossip Option select - close gossip'), -(@ENTRY,0,1,0,61,0,100,0,5750,0,0,0,62,409,0,0,0,0,0,7,0,0,0,1096,-467,-104.6,3.64,'Lothos Riftwaker - On Gossip Option select - teleport player'); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (5750); -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 -(5750,0,0,'Teleport me to the Molten Core, Lothos.',1,1,0,0,0,0,''); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (5750); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,5750,0,0,0,8,7848,0,0,0,0,'','Show gossip option if player has quest 7848 completed'); - --- SAI for Zamael Lunthistle -SET @ENTRY=8436; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,1285,0,0,0,26,3377,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - quest credit'), -(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - close gossip'); - -DELETE FROM `gossip_menu` WHERE `entry`=1285 AND `text_id`=1920; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1285,1920); -DELETE FROM `gossip_menu` WHERE `entry`=1286 AND `text_id`=1922; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1286,1922); -DELETE FROM `gossip_menu` WHERE `entry`=1287 AND `text_id`=1921; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1287,1921); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1285,1286,1287); -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 -(1285,0,0,'I wish to hear your tale.',1,1,1287,0,0,0,''), -(1286,0,0,'Let me think about it, Zamael.',1,1,1285,0,0,0,''), -(1287,0,0,'Please continue, Zamael.',1,1,1286,0,0,0,''); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (1285); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,1285,0,0,0,9,3377,0,0,0,0,'','Show gossip option if player has quest 3377 but not complete'); diff --git a/sql/updates/world/2012_02_21_05_world_gossip.sql b/sql/updates/world/2012_02_21_05_world_gossip.sql new file mode 100644 index 00000000000..1bdccae5c39 --- /dev/null +++ b/sql/updates/world/2012_02_21_05_world_gossip.sql @@ -0,0 +1,39 @@ +-- SAI for Lothos Riftwaker +SET @ENTRY=14387; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lothos Riftwaker - On Gossip Option select - close gossip'), +(@ENTRY,0,1,0,61,0,100,0,5750,0,0,0,62,409,0,0,0,0,0,7,0,0,0,1096,-467,-104.6,3.64,'Lothos Riftwaker - On Gossip Option select - teleport player'); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (5750); +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 +(5750,0,0,'Teleport me to the Molten Core, Lothos.',1,1,0,0,0,0,''); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (5750); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,5750,0,0,0,8,7848,0,0,0,0,'','Show gossip option if player has quest 7848 completed'); + +-- SAI for Zamael Lunthistle +SET @ENTRY=8436; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,1285,0,0,0,26,3377,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - quest credit'), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - close gossip'); + +DELETE FROM `gossip_menu` WHERE `entry`=1285 AND `text_id`=1920; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1285,1920); +DELETE FROM `gossip_menu` WHERE `entry`=1286 AND `text_id`=1922; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1286,1922); +DELETE FROM `gossip_menu` WHERE `entry`=1287 AND `text_id`=1921; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1287,1921); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1285,1286,1287); +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 +(1285,0,0,'I wish to hear your tale.',1,1,1287,0,0,0,''), +(1286,0,0,'Let me think about it, Zamael.',1,1,1285,0,0,0,''), +(1287,0,0,'Please continue, Zamael.',1,1,1286,0,0,0,''); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (1285); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,1285,0,0,0,9,3377,0,0,0,0,'','Show gossip option if player has quest 3377 but not complete'); diff --git a/sql/updates/world/2012_02_22_01_world_creature_text.sql b/sql/updates/world/2012_02_22_01_world_creature_text.sql new file mode 100644 index 00000000000..035962e11c3 --- /dev/null +++ b/sql/updates/world/2012_02_22_01_world_creature_text.sql @@ -0,0 +1,34 @@ +-- Invisible Stalker text for Wintergrasp from sniff +DELETE FROM `creature_text` WHERE `entry`=15214; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(15214,0,0, 'Let the battle begin!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,1,0, 'The Broken Temple siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,2,0, 'The Broken Temple siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,3,0, 'The Broken Temple siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,4,0, 'The Broken Temple siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,5,0, 'The Sunken Ring siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,6,0, 'The Sunken Ring siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,7,0, 'The Sunken Ring siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,8,0, 'The Sunken Ring siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,9,0, 'The Eastspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,10,0, 'The Eastspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,11,0, 'The Eastspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,12,0, 'The Eastspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,13,0, 'The Westspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,14,0, 'The Westspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,15,0, 'The Westspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,16,0, 'The Westspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,17,0, 'The north-western keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,18,0, 'The north-western keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,19,0, 'The south-eastern keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,20,0, 'The south-eastern keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,21,0, 'The western tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,22,0, 'The western tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,23,0, 'The southern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,24,0, 'The southern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,25,0, 'The eastern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,26,0, 'The eastern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,27,0, 'The Horde has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,28,0, 'The Horde has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,29,0, 'The Alliance has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'); \ No newline at end of file diff --git a/sql/updates/world/2012_02_22_01_world_say_text.sql b/sql/updates/world/2012_02_22_01_world_say_text.sql deleted file mode 100644 index 035962e11c3..00000000000 --- a/sql/updates/world/2012_02_22_01_world_say_text.sql +++ /dev/null @@ -1,34 +0,0 @@ --- Invisible Stalker text for Wintergrasp from sniff -DELETE FROM `creature_text` WHERE `entry`=15214; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(15214,0,0, 'Let the battle begin!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,1,0, 'The Broken Temple siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,2,0, 'The Broken Temple siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,3,0, 'The Broken Temple siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,4,0, 'The Broken Temple siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,5,0, 'The Sunken Ring siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,6,0, 'The Sunken Ring siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,7,0, 'The Sunken Ring siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,8,0, 'The Sunken Ring siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,9,0, 'The Eastspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,10,0, 'The Eastspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,11,0, 'The Eastspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,12,0, 'The Eastspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,13,0, 'The Westspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,14,0, 'The Westspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,15,0, 'The Westspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,16,0, 'The Westspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,17,0, 'The north-western keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,18,0, 'The north-western keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,19,0, 'The south-eastern keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,20,0, 'The south-eastern keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,21,0, 'The western tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,22,0, 'The western tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,23,0, 'The southern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,24,0, 'The southern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,25,0, 'The eastern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,26,0, 'The eastern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,27,0, 'The Horde has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,28,0, 'The Horde has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,29,0, 'The Alliance has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'); \ No newline at end of file -- cgit v1.2.3 From d505e8ccc9190d4a9c4c7f13c2a45f484bd31234 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 24 Feb 2012 21:18:35 -0330 Subject: DB/SAI: Fix error in SAI. --- sql/updates/world/2012_02_24_01_world_sai.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_24_01_world_sai.sql b/sql/updates/world/2012_02_24_01_world_sai.sql index e7488fd8220..19e4e8fb772 100644 --- a/sql/updates/world/2012_02_24_01_world_sai.sql +++ b/sql/updates/world/2012_02_24_01_world_sai.sql @@ -17,7 +17,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type (@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - Say random text'), (@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Captive Aspirant - Script - Kill credit'), (@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - move 10 yards'), -(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,72,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - despawn'); +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - despawn'); -- SAI for Kul the Reckless SET @ENTRY=34956; UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; @@ -28,7 +28,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type (@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - Say random text'), (@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kul the Reckless - Script - Kill credit'), (@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - move 10 yards'), -(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,72,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - despawn'); +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - despawn'); -- Captive Aspirant & Kul the Reckless text from sniff DELETE FROM `creature_text` WHERE `entry` IN (34716,34956); INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -- cgit v1.2.3 From 1f373c0f3749e2c62ccdc3d19f2a753773e147c3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 25 Feb 2012 11:42:00 +0100 Subject: Scripts/Icecrown Citadel: Removed obsolete workaround for Ice Tomb LoS --- .../2012_02_25_00_world_spell_script_names.sql | 1 + src/server/game/Handlers/CalendarHandler.cpp | 2 +- .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 58 ---------------------- 3 files changed, 2 insertions(+), 59 deletions(-) create mode 100644 sql/updates/world/2012_02_25_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_25_00_world_spell_script_names.sql b/sql/updates/world/2012_02_25_00_world_spell_script_names.sql new file mode 100644 index 00000000000..9619121e982 --- /dev/null +++ b/sql/updates/world/2012_02_25_00_world_spell_script_names.sql @@ -0,0 +1 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_collision_filter'; diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index bbf8433ad22..12c0b571b38 100755 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -892,4 +892,4 @@ void WorldSession::SendCalendarRaidLockout(InstanceSave* save, bool add) data << uint32(save->GetResetTime() - currTime); data << uint64(save->GetInstanceId()); SendPacket(&data); -} \ No newline at end of file +} diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index a544f2f4710..01879240e3a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1198,63 +1198,6 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader } }; -class FrostBombTargetSelector -{ - public: - FrostBombTargetSelector(Unit* caster, std::list const& collisionList) : _caster(caster), _collisionList(collisionList) { } - - bool operator()(Unit* unit) - { - if (unit->HasAura(SPELL_ICE_TOMB_DAMAGE)) - return true; - - for (std::list::const_iterator itr = _collisionList.begin(); itr != _collisionList.end(); ++itr) - if ((*itr)->IsInBetween(_caster, unit)) - return true; - - return false; - } - - private: - Unit* _caster; - std::list const& _collisionList; -}; - -class spell_sindragosa_collision_filter : public SpellScriptLoader -{ - public: - spell_sindragosa_collision_filter() : SpellScriptLoader("spell_sindragosa_collision_filter") { } - - class spell_sindragosa_collision_filter_SpellScript : public SpellScript - { - PrepareSpellScript(spell_sindragosa_collision_filter_SpellScript); - - bool Validate(SpellInfo const* /*spell*/) - { - if (!sSpellMgr->GetSpellInfo(SPELL_ICE_TOMB_DAMAGE)) - return false; - return true; - } - - void FilterTargets(std::list& unitList) - { - std::list tombs; - GetCreatureListWithEntryInGrid(tombs, GetCaster(), NPC_ICE_TOMB, 200.0f); - unitList.remove_if (FrostBombTargetSelector(GetCaster(), tombs)); - } - - void Register() - { - OnUnitTargetSelect += SpellUnitTargetFn(spell_sindragosa_collision_filter_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - } - }; - - SpellScript* GetSpellScript() const - { - return new spell_sindragosa_collision_filter_SpellScript(); - } -}; - class spell_sindragosa_icy_grip : public SpellScriptLoader { public: @@ -1513,7 +1456,6 @@ void AddSC_boss_sindragosa() new spell_sindragosa_instability(); new spell_sindragosa_frost_beacon(); new spell_sindragosa_ice_tomb(); - new spell_sindragosa_collision_filter(); new spell_sindragosa_icy_grip(); new spell_rimefang_icy_blast(); new spell_frostwarden_handler_order_whelp(); -- cgit v1.2.3 From 5c00e93602e7afc0ad54713d16f2eb012751cc8d Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 25 Feb 2012 16:56:25 +0100 Subject: Core/Commands: Added lost group commands --- sql/updates/world/2012_02_25_01_world_command.sql | 6 ++++++ src/server/game/Chat/Chat.cpp | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 sql/updates/world/2012_02_25_01_world_command.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_25_01_world_command.sql b/sql/updates/world/2012_02_25_01_world_command.sql new file mode 100644 index 00000000000..de708b7a9cc --- /dev/null +++ b/sql/updates/world/2012_02_25_01_world_command.sql @@ -0,0 +1,6 @@ +DELETE FROM `command` WHERE `name` IN ('group','group leader','group disband','group remove'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES +('group', 3, 'Syntax: .group $subcommand\nType .group to see the list of possible subcommands or .help group $subcommand to see info on subcommands'), +('group leader', 3, 'Syntax: .group leader [$characterName]\n\nSets the given character as his group''s leader.'), +('group disband', 3, 'Syntax: .group disband [$characterName]\n\nDisbands the given character''s group.'), +('group remove', 3, 'Syntax: .group remove [$characterName]\n\nRemoves the given character from his group.'); diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 035fbaf5b78..a6596de25d6 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -140,10 +140,10 @@ ChatCommand* ChatHandler::getCommandTable() static ChatCommand groupCommandTable[] = { - { "leader", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGroupLeaderCommand>, "", NULL }, - { "disband", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGroupDisbandCommand>, "", NULL }, - { "remove", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGroupRemoveCommand>, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "leader", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGroupLeaderCommand>, "", NULL }, + { "disband", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGroupDisbandCommand>, "", NULL }, + { "remove", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGroupRemoveCommand>, "", NULL }, + { NULL, 0, false, NULL, "", NULL } }; static ChatCommand guildCommandTable[] = @@ -281,7 +281,7 @@ ChatCommand* ChatHandler::getCommandTable() { "corpses", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleServerCorpsesCommand>, "", NULL }, { "exit", SEC_CONSOLE, true, OldHandler<&ChatHandler::HandleServerExitCommand>, "", NULL }, { "idlerestart", SEC_ADMINISTRATOR, true, NULL, "", serverIdleRestartCommandTable }, - { "idleshutdown", SEC_ADMINISTRATOR, true, NULL, "", serverShutdownCommandTable }, + { "idleshutdown", SEC_ADMINISTRATOR, true, NULL, "", serverIdleShutdownCommandTable }, { "info", SEC_PLAYER, true, OldHandler<&ChatHandler::HandleServerInfoCommand>, "", NULL }, { "motd", SEC_PLAYER, true, OldHandler<&ChatHandler::HandleServerMotdCommand>, "", NULL }, { "plimit", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerPLimitCommand>, "", NULL }, @@ -336,6 +336,7 @@ ChatCommand* ChatHandler::getCommandTable() { "lookup", SEC_ADMINISTRATOR, true, NULL, "", lookupCommandTable }, { "pdump", SEC_ADMINISTRATOR, true, NULL, "", pdumpCommandTable }, { "guild", SEC_ADMINISTRATOR, true, NULL, "", guildCommandTable }, + { "group", SEC_ADMINISTRATOR, false, NULL, "", groupCommandTable }, { "cast", SEC_ADMINISTRATOR, false, NULL, "", castCommandTable }, { "reset", SEC_ADMINISTRATOR, true, NULL, "", resetCommandTable }, { "instance", SEC_ADMINISTRATOR, true, NULL, "", instanceCommandTable }, -- cgit v1.2.3 From bed3fb6d98e6c43c8588318e6baa8c4433da80ac Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 25 Feb 2012 15:59:40 -0330 Subject: DB/SAI: SAI for Quest: 12843 "They Took Our Men!". Remove cpp script. --- sql/updates/world/2012_02_25_02_world_sai.sql | 28 ++++++++++++++++++++++++++ src/server/scripts/World/go_scripts.cpp | 29 --------------------------- 2 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 sql/updates/world/2012_02_25_02_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_25_02_world_sai.sql b/sql/updates/world/2012_02_25_02_world_sai.sql new file mode 100644 index 00000000000..e2ff99534b4 --- /dev/null +++ b/sql/updates/world/2012_02_25_02_world_sai.sql @@ -0,0 +1,28 @@ +-- Fix for Quest: 12843 "They Took Our Men!" +-- SAI for Rusty Cage +SET @ENTRY=191544; +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=1); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,1,0,1,70,0,100,0,2,0,0,0,45,0,1,0,0,0,0,11,29466,5,0,0,0,0,0,'Rusty Cage - On activate - set data on Goblin Prisoner'), +(@ENTRY,1,1,0,61,0,100,0,0,0,0,0,33,29466,0,0,0,0,0,7,0,0,0,0,0,0,0,'Rusty Cage - On activate - quest credit'); +-- SAI for Goblin Prisoner +SET @ENTRY=29466; +UPDATE `creature` SET `modelid`=0,`spawntimesecs`=120,`curhealth`=1 WHERE `id`=29466; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,32,0,0,0,0,0,0,15,191544,5,0,0,0,0,0,'Goblin Prisoner - On respawn - reset cage'), +(@ENTRY,0,1,0,38,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - On dataset - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - set data 0'), +(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,1000,1000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - Say random text'), +(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - move 10 yards'), +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - despawn'); +-- Goblin Prisoner +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I can''t believe it! I''m free to go!',12,0,100,5,0,0, 'Goblin Prisoner'), +(@ENTRY,0,1, 'I''m free? I''m free!',12,0,100,5,0,0, 'Goblin Prisoner'), +(@ENTRY,0,2, 'Time to hightail it! Thanks, friend!',12,0,100,5,0,0, 'Goblin Prisoner'); diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 541c3e2e7ec..59ed06788cb 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -34,7 +34,6 @@ go_tablet_of_madness go_tablet_of_the_seven go_tele_to_dalaran_crystal go_tele_to_violet_stand -go_rusty_cage go_scourge_cage go_jotunheim_cage go_table_theka @@ -714,33 +713,6 @@ public: } }; -/*###### -## go_rusty_cage -######*/ - -enum eRustyCage -{ - NPC_GOBLIN_PRISIONER = 29466 -}; - -class go_rusty_cage : public GameObjectScript -{ -public: - go_rusty_cage() : GameObjectScript("go_rusty_cage") { } - - bool OnGossipHello(Player* player, GameObject* pGO) - { - if (Creature* pGoblinPrisoner = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER, 5.0f, true)) - { - pGO->SetGoState(GO_STATE_ACTIVE); - player->KilledMonsterCredit(NPC_GOBLIN_PRISIONER, pGoblinPrisoner->GetGUID()); - pGoblinPrisoner->DisappearAndDie(); - } - - return true; - } -}; - /*###### ## go_scourge_cage ######*/ @@ -1303,7 +1275,6 @@ void AddSC_go_scripts() new go_fel_crystalforge; new go_bashir_crystalforge; new go_matrix_punchograph; - new go_rusty_cage; new go_scourge_cage; new go_arcane_prison; new go_blood_filled_orb; -- cgit v1.2.3 From ca17e1c7e49200e1df6b9c29f7f12b408fce9f48 Mon Sep 17 00:00:00 2001 From: Anubisss Date: Sun, 26 Feb 2012 05:15:20 +0100 Subject: Add a missing semicolon (;) to a SQL. Signed-off-by: Anubisss --- sql/updates/characters/2012_02_19_00_characters_warden_action.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/characters/2012_02_19_00_characters_warden_action.sql b/sql/updates/characters/2012_02_19_00_characters_warden_action.sql index 6e317f5100d..587f65fedc5 100644 --- a/sql/updates/characters/2012_02_19_00_characters_warden_action.sql +++ b/sql/updates/characters/2012_02_19_00_characters_warden_action.sql @@ -4,4 +4,4 @@ CREATE TABLE `warden_action` ( `wardenId` smallint(5) unsigned NOT NULL, `action` tinyint(3) unsigned DEFAULT NULL, PRIMARY KEY (`wardenId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- cgit v1.2.3 From 9dbd9c02f47480d19bed4b79a3bb982a35bf8902 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 26 Feb 2012 14:37:03 +0000 Subject: Misc: - Fix errors in recent SQLs (1fc122e5c6a5e0099,a3755f8355e64c9efc) - Proper defines in DBCStructure.h (Holiday Entry) --- sql/updates/world/2012_02_26_00_world_misc.sql | 13 +++++++++++++ src/server/game/DataStores/DBCStructure.h | 12 ++++++++---- src/server/game/Miscellaneous/SharedDefines.h | 4 ---- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 sql/updates/world/2012_02_26_00_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_26_00_world_misc.sql b/sql/updates/world/2012_02_26_00_world_misc.sql new file mode 100644 index 00000000000..3df42934aa9 --- /dev/null +++ b/sql/updates/world/2012_02_26_00_world_misc.sql @@ -0,0 +1,13 @@ +UPDATE `spell_area` SET `quest_start`=12987,`quest_end`=12987 WHERE `spell`=56305; + +DELETE FROM `reference_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; -- bad data +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Deathbringer's Cache +(28058,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28074,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28088,49908,20,1,0,1,1), -- Primordial Saronite 25H +-- Cache of the Dreamwalker +(28064,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28082,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28096,49908,20,1,0,1,1); -- Primordial Saronite 25H diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 75a6b71d943..1978dbc71f9 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1066,14 +1066,18 @@ struct HolidayNamesEntry }; */ +#define MAX_HOLIDAY_DURATIONS 10 +#define MAX_HOLIDAY_DATES 26 +#define MAX_HOLIDAY_FLAGS 10 + struct HolidaysEntry { uint32 Id; // 0 m_ID - uint32 Duration[10]; // 1-10 m_duration (MAX_HOLIDAY_DURATIONS) - uint32 Date[26]; // 11-36 m_date (dates in unix time starting at January, 1, 2000) (MAX_HOLIDAY_DATES) + uint32 Duration[MAX_HOLIDAY_DURATIONS]; // 1-10 m_duration + uint32 Date[MAX_HOLIDAY_DATES]; // 11-36 m_date (dates in unix time starting at January, 1, 2000) uint32 Region; // 37 m_region (wow region) uint32 Looping; // 38 m_looping - uint32 CalendarFlags[10]; // 39-48 m_calendarFlags (MAX_HOLIDAY_FLAGS) + uint32 CalendarFlags[MAX_HOLIDAY_FLAGS]; // 39-48 m_calendarFlags //uint32 holidayNameId; // 49 m_holidayNameID (HolidayNames.dbc) //uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc) char* TextureFilename; // 51 m_textureFilename @@ -1086,7 +1090,7 @@ struct ItemEntry { uint32 ID; // 0 uint32 Class; // 1 - uint32 SubClass; // 2 some items have strnage subclasses + uint32 SubClass; // 2 some items have strange subclasses int32 Unk0; // 3 int32 Material; // 4 uint32 DisplayId; // 5 diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 369b20252ab..c404277f61f 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -3424,10 +3424,6 @@ enum ActivateTaxiReply // Calendar - start -#define MAX_HOLIDAY_DATES 26 -#define MAX_HOLIDAY_FLAGS 10 -#define MAX_HOLIDAY_DURATIONS 10 - enum CalendarFlags { CALENDAR_FLAG_ALL_ALLOWED = 0x001, -- cgit v1.2.3 From 05097c7fc55420db48c4f1e79ef362b9995ba38b Mon Sep 17 00:00:00 2001 From: Souler Date: Sun, 26 Feb 2012 17:06:58 +0100 Subject: Scripts/Spells: Move Demonic Circle mechanics to spell_warlock.cpp --- .../2012_02_26_01_world_spell_script_names.sql | 4 + src/server/game/Spells/Auras/SpellAuraEffects.cpp | 21 ----- src/server/game/Spells/Auras/SpellAuras.cpp | 24 ------ src/server/scripts/Spells/spell_warlock.cpp | 89 ++++++++++++++++++++++ 4 files changed, 93 insertions(+), 45 deletions(-) create mode 100644 sql/updates/world/2012_02_26_01_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_26_01_world_spell_script_names.sql b/sql/updates/world/2012_02_26_01_world_spell_script_names.sql new file mode 100644 index 00000000000..d066218db8f --- /dev/null +++ b/sql/updates/world/2012_02_26_01_world_spell_script_names.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (48018, 48020); +INSERT INTO `spell_script_names` VALUES (`spell_id`,`ScriptName`) +(48018,'spell_warl_demonic_circle_summon'), +(48020,'spell_warl_demonic_circle_teleport'); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index cb79bd00776..2cf6938f67a 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -5668,27 +5668,6 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const target->CastSpell((Unit*)NULL, m_spellInfo->Effects[m_effIndex].TriggerSpell, true); break; } - case SPELLFAMILY_WARLOCK: - { - switch (GetSpellInfo()->Id) - { - // Demonic Circle - case 48018: - if (GameObject* obj = target->GetGameObject(GetSpellInfo()->Id)) - { - SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(48020); - if (target->IsWithinDist(obj, spellInfo->GetMaxRange(true))) - { - if (!target->HasAura(62388)) - target->CastSpell(target, 62388, true); - } - else - target->RemoveAura(62388); - } - break; - } - break; - } case SPELLFAMILY_DRUID: { switch (GetSpellInfo()->Id) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 5329c1a0914..32473a93a26 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1202,19 +1202,6 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b break; } break; - case SPELLFAMILY_WARLOCK: - switch (GetId()) - { - case 48020: // Demonic Circle - if (target->GetTypeId() == TYPEID_PLAYER) - if (GameObject* obj = target->GetGameObject(48018)) - { - target->NearTeleportTo(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation()); - target->RemoveMovementImpairingAuras(); - } - break; - } - break; case SPELLFAMILY_PRIEST: if (!caster) break; @@ -1418,17 +1405,6 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b caster->CastSpell(target, spellId, true); } } - switch (GetId()) - { - case 48018: // Demonic Circle - // Do not remove GO when aura is removed by stack - // to prevent remove GO added by new spell - // old one is already removed - if (!onReapply) - target->RemoveGameObject(GetId(), true); - target->RemoveAura(62388); - break; - } break; case SPELLFAMILY_PRIEST: if (!caster) diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index b1aff706db0..ceebba8cd96 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -34,6 +34,9 @@ enum WarlockSpells WARLOCK_DEMONIC_EMPOWERMENT_IMP = 54444, WARLOCK_IMPROVED_HEALTHSTONE_R1 = 18692, WARLOCK_IMPROVED_HEALTHSTONE_R2 = 18693, + WARLOCK_DEMONIC_CIRCLE_SUMMON = 48018, + WARLOCK_DEMONIC_CIRCLE_TELEPORT = 48020, + WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST = 62388, }; class spell_warl_banish : public SpellScriptLoader @@ -443,6 +446,90 @@ class spell_warl_life_tap : public SpellScriptLoader } }; +class spell_warl_demonic_circle_summon : public SpellScriptLoader +{ + public: + spell_warl_demonic_circle_summon() : SpellScriptLoader("spell_warl_demonic_circle_summon") { } + + class spell_warl_demonic_circle_summon_AuraScript : public AuraScript + { + PrepareAuraScript(spell_warl_demonic_circle_summon_AuraScript); + + void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode) + { + // If effect is removed by expire remove the summoned demonic circle too. + if (!(mode & AURA_EFFECT_HANDLE_REAPPLY)) + GetTarget()->RemoveGameObject(GetId(), true); + + GetTarget()->RemoveAura(WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST); + } + + void HandleDummyTick(AuraEffect const* /*aurEff*/) + { + if (GameObject* circle = GetTarget()->GetGameObject(GetId())) + { + // Here we check if player is in demonic circle teleport range, if so add + // WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST; allowing him to cast the WARLOCK_DEMONIC_CIRCLE_TELEPORT. + // If not in range remove the WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST. + + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(WARLOCK_DEMONIC_CIRCLE_TELEPORT); + + if (GetTarget()->IsWithinDist(circle, spellInfo->GetMaxRange(true))) + { + if (!GetTarget()->HasAura(WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST)) + GetTarget()->CastSpell(GetTarget(), WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST, true); + } + else + GetTarget()->RemoveAura(WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST); + } + } + + void Register() + { + OnEffectRemove += AuraEffectApplyFn(spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_warl_demonic_circle_summon_AuraScript(); + } +}; + +class spell_warl_demonic_circle_teleport : public SpellScriptLoader +{ + public: + spell_warl_demonic_circle_teleport() : SpellScriptLoader("spell_warl_demonic_circle_teleport") { } + + class spell_warl_demonic_circle_teleport_AuraScript : public AuraScript + { + PrepareAuraScript(spell_warl_demonic_circle_teleport_AuraScript); + + void HandleTeleport(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Player* player = GetTarget()->ToPlayer()) + { + if (GameObject* circle = player->GetGameObject(WARLOCK_DEMONIC_CIRCLE_SUMMON)) + { + player->NearTeleportTo(circle->GetPositionX(), circle->GetPositionY(), circle->GetPositionZ(), circle->GetOrientation()); + player->RemoveMovementImpairingAuras(); + } + } + } + + void Register() + { + OnEffectApply += AuraEffectApplyFn(spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_warl_demonic_circle_teleport_AuraScript(); + } +}; + void AddSC_warlock_spell_scripts() { new spell_warl_banish(); @@ -453,4 +540,6 @@ void AddSC_warlock_spell_scripts() new spell_warl_seed_of_corruption(); new spell_warl_soulshatter(); new spell_warl_life_tap(); + new spell_warl_demonic_circle_summon(); + new spell_warl_demonic_circle_teleport(); } -- cgit v1.2.3 From b8310cb2fbaeea95dc123a22a0f9df36f034bf5d Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Mon, 27 Feb 2012 17:20:07 +0100 Subject: DB/Loot: add gold drops to ICC Partial fix for #5449 --- sql/updates/world/2012_02_27_world_creature_template.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2012_02_27_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_27_world_creature_template.sql b/sql/updates/world/2012_02_27_world_creature_template.sql new file mode 100644 index 00000000000..b8936774e36 --- /dev/null +++ b/sql/updates/world/2012_02_27_world_creature_template.sql @@ -0,0 +1,8 @@ +-- Update gold drops in ICC bosses based on old.wowhead.com data +UPDATE `creature_template` SET `mingold`=250000,`maxgold`=300000 WHERE `entry` IN(36612,37957,37958,37959); -- Lord Marrowgar +UPDATE `creature_template` SET `mingold`=175000,`maxgold`=225000 WHERE `entry` IN (36626,37504,37505,37506); -- Festergut +UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36627,38390,38549,38550); -- Rotface +UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36678,38431,38585,38586); -- Professor Putricide +UPDATE `creature_template` SET `mingold`=300000,`maxgold`=350000 WHERE `entry` IN (37955,38434,38435,38436); -- Blood-Queen Lana'thel +UPDATE `creature_template` SET `mingold`=1330000,`maxgold`=1400000 WHERE `entry` IN (36853,38265,38266,38267); -- Sindragosa +UPDATE `creature_template` SET `mingold`=1300000,`maxgold`=1500000 WHERE `entry` IN (36597,39166,39167,39168); -- The Lich King -- cgit v1.2.3 From dc55d9ed13f203941382c24c935b275b096e2ee1 Mon Sep 17 00:00:00 2001 From: QAston Date: Mon, 27 Feb 2012 21:07:59 +0100 Subject: Fix sql update in 8653016bddc6cfe591ce7d4b9b569fe36d50c77b - thanks to RedSonja --- sql/updates/world/2012_02_26_01_world_spell_script_names.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_26_01_world_spell_script_names.sql b/sql/updates/world/2012_02_26_01_world_spell_script_names.sql index d066218db8f..7bb38d5f2e0 100644 --- a/sql/updates/world/2012_02_26_01_world_spell_script_names.sql +++ b/sql/updates/world/2012_02_26_01_world_spell_script_names.sql @@ -1,4 +1,4 @@ DELETE FROM `spell_script_names` WHERE `spell_id` IN (48018, 48020); -INSERT INTO `spell_script_names` VALUES (`spell_id`,`ScriptName`) -(48018,'spell_warl_demonic_circle_summon'), +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(48018,'spell_warl_demonic_circle_summon'), (48020,'spell_warl_demonic_circle_teleport'); -- cgit v1.2.3 From 02b0cc825e14f1f5c899ee1599a21b856ee802b8 Mon Sep 17 00:00:00 2001 From: Kandera Date: Tue, 28 Feb 2012 15:00:32 -0500 Subject: DB/Wintergrasp: added spawn data for wintergrasp mobs --- .../2012_02_28_00_world_wintergrasp_spawns.sql | 366 +++++++++++++++++++++ 1 file changed, 366 insertions(+) create mode 100644 sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql b/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql new file mode 100644 index 00000000000..99c2444f20b --- /dev/null +++ b/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql @@ -0,0 +1,366 @@ +-- Delete unused creature_data rows +DELETE FROM `creature_addon` WHERE `guid` IN (131728,131282,131283,131284,131285,131286,131287,131288,131289,131290,131291,131292,131293,131294,131295,131296,131297,131298,131299,131300,131301,131302,131303,131304,131305,131306,131307,131308,131309,131310,131311,131312,131313,131314,131315,131316,131317,131318,131319,131320,131321,131322,131326,131327,131328,131350,131351,131352,131353,131354,131376,131377,131378,131379,131380,131392,131437,131458,131631,131632,131633,131634,131635,131636,131706,131727,13128,131729,131730,131731); + +-- Replace Wintergrasp spawns with properly phased spawns +SET @GUID := 88310; +DELETE FROM `creature` WHERE `id` IN (31841,31842,30400,30499,30489,30869,31036,31051,31052,31054,31108,31109,31153,39172,30870,31053,31091,31101,31102,31106,31107,31151,32294,39173,32296,30488); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +-- Taunka Spirit Guide (Horde) +(@GUID+0,31841,571,1,0x00000010,0,0,4318.436,2408.06738,392.675751,6.23082542,120,0,0,1,0,0), -- Eastspark Workshop +(@GUID+1,31841,571,1,0x00000010,0,0,4336.25439,3235.51978,390.334,0.628318548,120,0,0,1,0,0), -- Westspark Workshop +(@GUID+2,31841,571,1,0x00000010,0,0,5104.753,2300.9458,368.568054,0.7330383,120,0,0,1,0,0), -- The Sunken Ring +(@GUID+3,31841,571,1,0x00000010,0,0,5103.133,3462.128,368.568054,5.270895,120,0,0,1,0,0), -- The Chilled Quagmire "Outside broker Temple" +(@GUID+4,31841,571,1,0x00000040,0,0,5537.482,2898.90674,517.2589,4.86946869,120,0,0,1,0,0), -- Fortress +(@GUID+5,31841,571,1,0x00000001,0,0,5031.84131,3710.74878,372.4835,0,120,5,0,1,0,0), -- Horde Landing Zone +-- Dwarven Spirit Guide (Alliance) +(@GUID+6,31842,571,1,0x00000020,0,0,4318.436,2408.06738,392.675751,6.23082542,120,0,0,1,0,0), -- Eastspark Workshop +(@GUID+7,31842,571,1,0x00000020,0,0,4336.25439,3235.51978,390.334,0.628318548,120,0,0,1,0,0), -- Westspark Workshop +(@GUID+8,31842,571,1,0x00000020,0,0,5104.753,2300.9458,368.568054,0.7330383,120,0,0,1,0,0), -- The Sunken Ring +(@GUID+9,31842,571,1,0x00000020,0,0,5103.133,3462.128,368.568054,5.270895,120,0,0,1,0,0), -- The Chilled Quagmire "Outside The Broken Temple" +(@GUID+10,31842,571,1,0x00000080,0,0,5537.482,2898.90674,517.2589,4.86946869,120,0,0,1,0,0), -- Fortress +(@GUID+11,31842,571,1,0x00000001,0,0,5140.7876,2179.12451,390.9512,1.97222209,120,0,0,1,0,0), -- Aliance Landing Zone +-- Goblin Mechanic (Horde) +(@GUID+12,30400,571,1,0x00000010,0,0,4964.89,3383.06,382.911,6.12611,180,0,0,1,0,0), -- The Broken Temple +(@GUID+13,30400,571,1,0x00000010,0,0,4939.76,2389.06,326.153,3.26377,180,0,0,1,0,0), -- The Sunken Ring +(@GUID+14,30400,571,1,0x00000010,0,0,4357.67,2357.99,382.007,1.67552,180,0,0,1,0,0), -- Eastspark Workshop +(@GUID+15,30400,571,1,0x00000010,0,0,4354.15,3312.82,378.046,1.67552,180,0,0,1,0,0), -- Westspark Workshop +(@GUID+16,30400,571,1,0x00000040,0,0,5391.61,2707.72,415.051,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +(@GUID+17,30400,571,1,0x00000040,0,0,5392.91,2975.26,415.223,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +-- Gnomish Engineer (Alliance) +(@GUID+18,30499,571,1,0x00000020,0,0,4964.89,3383.06,382.911,6.12611,180,0,0,1,0,0), -- The Broken Temple +(@GUID+19,30499,571,1,0x00000020,0,0,4939.76,2389.06,326.153,3.26377,180,0,0,1,0,0), -- The Sunken Ring +(@GUID+20,30499,571,1,0x00000020,0,0,4357.67,2357.99,382.007,1.67552,180,0,0,1,0,0), -- Eastspark Workshop +(@GUID+21,30499,571,1,0x00000020,0,0,4354.15,3312.82,378.046,1.67552,180,0,0,1,0,0), -- Westspark Workshop +(@GUID+22,30499,571,1,0x00000080,0,0,5391.61,2707.72,415.051,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +(@GUID+23,30499,571,1,0x00000080,0,0,5392.91,2975.26,415.223,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +-- Alliance NPC's +(@GUID+24,30489,571,1,0x00000080,0,0,5369.973,2874.83081,409.3225,3.12413931,120,0,0,1,0,0), -- Morgan Day +(@GUID+25,30869,571,1,0x00000001,0,0,5102.75049,2187.82837,365.707855,3.996804,120,0,0,1,0,0), -- Arzo Safeflight +(@GUID+26,31036,571,1,0x00000040,0,0,5078.281,2183.704,365.028564,1.46607661,120,0,0,1,0,0), -- Commander Zanneth +(@GUID+27,31036,571,1,0x00000080,0,0,5358.641,2841.76416,409.3225,1.13262534,120,0,0,1,0,0), +(@GUID+28,31051,571,1,0x00000040,0,0,5081.697,2173.73,365.8777,0.8552113,120,0,0,1,0,0), -- Sorceress Kaylana +(@GUID+29,31051,571,1,0x00000080,0,0,5296.869,2887.67114,409.274658,5.60250664,120,0,0,1,0,0), +(@GUID+30,31052,571,1,0x00000040,0,0,5100.06543,2168.89,365.7788,1.97222209,120,0,0,1,0,0), -- Bowyer Randolph +(@GUID+31,31052,571,1,0x00000080,0,0,5302.57373,2750.40332,409.274658,5.46288061,120,0,0,1,0,0), +(@GUID+32,31054,571,1,0x00000040,0,0,5088.611,2167.66235,365.688751,0.6806784,120,0,0,1,0,0), -- Anchorite Tessa +(@GUID+33,31054,571,1,0x00000080,0,0,5372.05859,3028.33618,409.206024,0.012565271,120,0,0,1,0,0), +(@GUID+34,31108,571,1,0x00000040,0,0,5095.673,2193.284,365.9236,4.939282,120,0,0,1,0,0), -- Siege Master Stouthandle +(@GUID+35,31108,571,1,0x00000080,0,0,5298.267,2924.97632,409.274658,0.9075712,120,0,0,1,0,0), +(@GUID+36,31109,571,1,0x00000040,0,0,5080.403,2199.00244,359.4894,2.96705961,120,0,0,1,0,0), -- Senior Demolitionist Legoso +(@GUID+37,31109,571,1,0x00000080,0,0,5228.2915,2809.888,409.274658,3.19395256,120,0,0,1,0,0), +(@GUID+38,31153,571,1,0x00000040,0,0,5088.48633,2188.17871,365.646973,5.253441,120,0,0,1,0,0), -- Tactical Officer Ahbramis +(@GUID+39,31153,571,1,0x00000080,0,0,5364.784,2835.135,409.3225,3.12413931,120,0,0,1,0,0), +(@GUID+40,32294,571,1,0x00000080,0,0,5374.568,2790.784,409.3225,2.72271371,120,0,0,1,0,0), -- Knight Dameron +(@GUID+41,39172,571,1,0x00000080,0,0,5372.672,2786.74048,409.4423,2.80998015,120,0,0,1,0,0), -- Marshal Magruder +(@GUID+42,30488,571,1,0x00000080,0,0,5370.428,2814.274,409.3225,3.054326,120,0,0,1,0,0), -- Travis Day +-- Horde NPC's +(@GUID+43,30870,571,1,0x00000001,0,0,5023.4043,3686.03345,363.1192,5.131268,120,0,0,1,0,0), -- Herzo Safeflight +(@GUID+44,31053,571,1,0x00000040,0,0,5379.875,3027.43359,409.206024,0,120,0,0,1,0,0), -- Primalist Mulfort +(@GUID+45,31053,571,1,0x00000080,0,0,5034.703125,3666.703125,363.273865,4.310963,120,0,0,1,0,0), +(@GUID+46,31091,571,1,0x00000040,0,0,5347.7915,2837.38574,409.3466,2.62603331,120,0,0,1,0,0), -- Commander Dardosh +(@GUID+47,31091,571,1,0x00000080,0,0,5018.662109,3672.279541,362.862885,2.209141,120,0,0,1,0,0), +(@GUID+48,31101,571,1,0x00000040,0,0,5296.564,2789.87378,409.274658,0.7330383,120,0,0,1,0,0), -- Hoodoo Master Fu'jin +(@GUID+49,31101,571,1,0x00000080,0,0,5014.065430,3678.846436,362.995575,5.096361,120,0,0,1,0,0), +(@GUID+50,31102,571,1,0x00000040,0,0,5295.455,2732.87549,409.274658,4.7211113,120,0,0,1,0,0), -- Vieron Blazefeather +(@GUID+51,31102,571,1,0x00000080,0,0,5031.676270,3655.820801,362.234558,5.131268,120,0,0,1,0,0), +(@GUID+52,31106,571,1,0x00000040,0,0,5295.56348,2926.67188,409.274658,0.87266463,120,0,0,1,0,0), -- Siegesmith Stronghoof +(@GUID+53,31106,571,1,0x00000080,0,0,5037.602051,3675.459717,363.147888,3.176499,120,0,0,1,0,0), +(@GUID+54,31107,571,1,0x00000040,0,0,5230.09033,2876.635,409.316254,-2.19854617,120,0,0,1,0,0), -- Lieutenant Murp +(@GUID+55,31107,571,1,0x00000080,0,0,5004.455078,3661.089111,361.335785,3.979351,120,0,0,1,0,0), +(@GUID+56,31151,571,1,0x00000040,0,0,5363.2876,2834.52954,409.3606,2.76273036,120,0,0,1,0,0), -- Tactical Officer Kilrath +(@GUID+57,31151,571,1,0x00000080,0,0,5034.698242,3683.268799,363.129120,4.310963,120,0,0,1,0,0), +(@GUID+58,32296,571,1,0x00000040,0,0,5374.568,2790.784,409.3225,2.60054,120,0,0,1,0,0), -- Stone Guard Mukar +-- Missing noc in fortress +(@GUID+60,39173,571,1,0x00000040,0,0,5372.672,2786.74048,409.4423,2.80998015,120,0,0,1,0,0); -- Champion Ros'slai + +-- corrects previously inserted creature +UPDATE `creature` SET `spawndist`=0 WHERE `guid`=88315; + +-- Pathing for Anchorite Tessa Entry: 31054 +SET @NPC := @GUID+33; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5382.507,3028.468,409.206,0,0,0,100,0), +(@PATH,2,5392.744,3028.737,409.206,0,0,0,100,0), +(@PATH,3,5382.507,3028.468,409.206,0,0,0,100,0), +(@PATH,4,5371.491,3028.329,409.206,0,0,0,100,0), +(@PATH,5,5360.032,3028.516,409.3161,0,0,0,100,0), +(@PATH,6,5371.491,3028.329,409.206,0,0,0,100,0); + +-- Pathing for Commander Zanneth Entry: 31036 +SET @NPC := @GUID+27; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5358.854,`position_y`=2859.232,`position_z`=409.5425 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,14337, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5359.788,2846.359,409.3642,0,0,0,100,0), +(@PATH,2,5359.187,2839.211,409.3642,0,0,0,100,0), +(@PATH,3,5360.083,2823.116,409.5381,0,0,0,100,0), +(@PATH,4,5359.187,2839.211,409.3642,0,0,0,100,0), +(@PATH,5,5359.788,2846.359,409.3642,0,0,0,100,0), +(@PATH,6,5358.854,2859.232,409.5425,0,0,0,100,0); + +-- Pathing for Commander Dardosh Entry: 31091 +SET @NPC := @GUID+46; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2,`position_x`=5359.546,`position_y`=2858.049,`position_z`=409.3642 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5359.202,2843.208,409.3642,0,0,0,100,0), +(@PATH,2,5358.997,2827.974,409.3639,0,0,0,100,0), +(@PATH,3,5359.202,2843.208,409.3642,0,0,0,100,0), +(@PATH,4,5359.546,2858.049,409.3642,0,0,0,100,0); + +-- Pathing for Commander Dardosh Entry: 31091 +SET @NPC := @GUID+47; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2,`position_x`=5018.411133,`position_y`=3672.615967,`position_z`=362.863525 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5022.827637,3666.665771,362.205750,0,0,0,100,0), +(@PATH,2,5024.270508,3658.739258,361.705750,0,0,0,100,0), +(@PATH,3,5022.827637,3666.665771,362.205750,0,0,0,100,0), +(@PATH,4,5018.411133,3672.615967,362.863525,0,0,0,100,0); + +-- Pathing for Primalist Mulfort Entry: 31053 +SET @NPC := @GUID+44; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5390.624,3027.994,409.206,0,0,0,100,0), +(@PATH,2,5379.875,3027.434,409.206,0,0,0,100,0), +(@PATH,3,5371.404,3026.511,409.206,0,0,0,100,0), +(@PATH,4,5379.875,3027.434,409.206,0,0,0,100,0); + +-- Pathing for Vieron Blazefeather Entry: 31102 +SET @NPC := @GUID+50; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2,`position_x`=5296.644,`position_y`=2731.107,`position_z`=409.3163 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5295.544,2722.631,409.3163,0,0,0,100,0), +(@PATH,2,5296.644,2731.107,409.3163,0,0,0,100,0), +(@PATH,3,5297.874,2738.155,409.3163,0,0,0,100,0), +(@PATH,4,5305.192,2746.161,409.3061,0,0,0,100,0), +(@PATH,5,5297.874,2738.155,409.3163,0,0,0,100,0), +(@PATH,6,5296.644,2731.107,409.3163,0,0,0,100,0); + +-- Guards "Alliance" (Valiance Expedition Champion) +SET @GUID := 88371; +DELETE FROM `creature` WHERE `id`=30740; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +-- Fortress +(@GUID+0,30740,571,1,0x00000080,0,0,5150.26855,2786.02173,409.5469,3.22885919,120,0,0,1,0,0), +(@GUID+1,30740,571,1,0x00000080,0,0,5150.657,2777.9502,409.4053,2.94960642,120,0,0,1,0,0), +(@GUID+2,30740,571,1,0x00000080,0,0,5193.632,2734.172,409.272552,4.694936,120,0,0,1,0,0), +(@GUID+3,30740,571,1,0x00000080,0,0,5200.497,2733.88843,409.272552,4.677482,120,0,0,1,0,0), +(@GUID+4,30740,571,1,0x00000080,0,0,5264.64648,2670.1936,409.1819,3.07177949,120,0,0,1,0,0), +(@GUID+5,30740,571,1,0x00000080,0,0,5265.30566,2663.15381,409.1819,3.12413931,120,0,0,1,0,0), +(@GUID+6,30740,571,1,0x00000080,0,0,5307.02051,2613.89771,409.172363,4.694936,120,0,0,1,0,0), +(@GUID+7,30740,571,1,0x00000080,0,0,5311.133,3061.04248,408.809937,1.50098312,120,0,0,1,0,0), +(@GUID+8,30740,571,1,0x00000080,0,0,5315.87354,2614.21924,408.972748,4.677482,120,0,0,1,0,0), +(@GUID+9,30740,571,1,0x00000080,0,0,5318.09,3060.634,408.882782,1.62315619,120,0,0,1,0,0), +(@GUID+10,30740,571,1,0x00000080,0,0,5149.395,2897.044,409.304443,3.03687286,120,0,0,1,0,0), +(@GUID+11,30740,571,1,0x00000080,0,0,5149.51953,2904.19336,409.276062,3.07177949,120,0,0,1,0,0), +(@GUID+12,30740,571,1,0x00000080,0,0,5192.79248,2948.454,409.2746,1.50098312,120,0,0,1,0,0), +(@GUID+13,30740,571,1,0x00000080,0,0,5201.645,2948.77612,409.2746,1.62315619,120,0,0,1,0,0), +(@GUID+14,30740,571,1,0x00000080,0,0,5265.28,3010.10083,408.895782,2.82743335,120,0,0,1,0,0), +(@GUID+15,30740,571,1,0x00000080,0,0,5265.47559,3017.39941,408.582977,3.07177949,120,0,0,1,0,0), +(@GUID+16,30740,571,1,0x00000080,0,0,5367.91455,2826.52026,409.3225,3.33357882,120,0,0,1,0,0), +(@GUID+17,30740,571,1,0x00000080,0,0,5368.71338,2856.36035,409.3225,2.94960642,120,0,0,1,0,0), +(@GUID+18,30740,571,1,0x00000080,0,0,5388.56,2834.76782,418.7585,3.07177949,120,0,0,1,0,0), +(@GUID+19,30740,571,1,0x00000080,0,0,5389.272,2847.36816,418.7585,3.106686,120,0,0,1,0,0), +(@GUID+20,30740,571,1,0x00000080,0,0,4684.475,2414.28979,369.9621,-2.85779858,120,0,0,1,0,0), +(@GUID+21,30740,571,1,0x00000080,0,0,4692.75635,2392.88574,369.0177,-2.82921553,120,0,0,1,0,0), +(@GUID+22,30740,571,1,0x00000080,0,0,5327.264648,2659.455322,409.178711,3.069901,120,0,0,1,0,0), -- F1307814000A2DAD path +(@GUID+23,30740,571,1,0x00000080,0,0,5154.225586,2833.824219,409.262451,3.124139,120,0,0,1,0,0), +(@GUID+24,30740,571,1,0x00000080,0,0,5154.119629,2847.892822,409.247559,3.071779,120,0,0,1,0,0), +(@GUID+25,30740,571,1,0x00000080,0,0,5179.111328,2837.129639,409.274658,3.211406,120,0,0,1,0,0), +(@GUID+26,30740,571,1,0x00000080,0,0,5179.666504,2846.597900,409.274658,3.089233,120,0,0,1,0,0), +(@GUID+27,30740,571,1,0x00000080,0,0,5270.163086,2833.479248,409.274658,3.124139,120,0,0,1,0,0), +(@GUID+28,30740,571,1,0x00000080,0,0,5270.057129,2847.547607,409.274658,3.071779,120,0,0,1,0,0), +(@GUID+29,30740,571,1,0x00000080,0,0,5307.750000,3008.872559,409.193024,4.781681,120,0,0,1,0,0), -- F1307814000A43AE path +(@GUID+30,30740,571,1,0x00000080,0,0,5335.117188,2916.802002,409.443756,1.500983,120,0,0,1,0,0), +(@GUID+31,30740,571,1,0x00000080,0,0,5350.681152,2917.011719,409.274658,1.466077,120,0,0,1,0,0), +(@GUID+32,30740,571,1,0x00000080,0,0,5335.306152,2764.110352,409.274567,4.834562,120,0,0,1,0,0), +(@GUID+33,30740,571,1,0x00000080,0,0,5349.811523,2763.634766,409.333374,4.660029,120,0,0,1,0,0), +-- Eastspark Workshop +(@GUID+34,30740,571,1,0x00000080,0,0,4349.537,2411.25781,374.743317,2.05948853,120,0,0,1,0,0), +(@GUID+35,30740,571,1,0x00000080,0,0,4388.13135,2411.97827,374.743317,1.6406095,120,0,0,1,0,0), +(@GUID+36,30740,571,1,0x00000080,0,0,4391.6665,2300.60913,374.7433,4.92182827,120,0,0,1,0,0), +(@GUID+37,30740,571,1,0x00000080,0,0,4413.42969,2393.44946,376.3599,1.06465089,120,0,0,1,0,0), +(@GUID+38,30740,571,1,0x00000080,0,0,4417.92,2331.237,370.9189,5.846853,120,0,0,1,0,0), +(@GUID+39,30740,571,1,0x00000080,0,0,4349.11768,2299.27954,374.7433,4.904375,120,0,0,1,0,0), +(@GUID+40,30740,571,1,0x00000080,0,0,4418.608,2355.28735,372.4907,6.02138567,120,0,0,1,0,0); + +-- banners +SET @OGUID := 75939; +DELETE FROM `gameobject` WHERE `id` IN (192254,192255,192269,192284,192285,192286,192287,192292,192299,192304,192305,192306,192307,192308,192309,192310,192312,192313,192314,192316,192317,192318,192319,192320,192321, + 192322,192323,192324,192325,192326,192327,192328,192329,192330,192331,192332,192333,192334,192335,192336,192338,192339,192349,192350,192351,192352,192353,192354,192355,192356, + 192357,192358,192359,192360,192361,192362,192363,192364,192366,192367,192368,192369,192370,192371,192372,192373,192374,192375,192376,192377,192378,192379,192487,192488,192501, + 192502); +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+115; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +-- Fortress Banners "Alliance" +(@OGUID+0,192286,571,1,128,5371.44873,2820.79346,409.426575,3.124123,0,0,0,0,120,0,1), +(@OGUID+1,192287,571,1,128,5372.42432,2862.47925,409.3659,3.14159274,0,0,0,0,120,0,1), +(@OGUID+2,192292,571,1,128,5154.35059,2862.08423,445.0105,3.14159274,0,0,0,0,120,0,1), +(@OGUID+3,192299,571,1,128,5155.21631,2820.63013,444.9789,-3.115388,0,0,0,0,120,0,1), +(@OGUID+4,192304,571,1,128,5398.03564,2873.013,455.203552,3.132858,0,0,0,0,120,0,1), +(@OGUID+5,192305,571,1,128,5397.31348,2809.264,455.101624,3.132858,0,0,0,0,120,0,1), +(@OGUID+6,192306,571,1,128,5270.55469,2861.68237,444.917236,-3.124123,0,0,0,0,120,0,1), +(@OGUID+7,192307,571,1,128,5271.16064,2820.10864,445.109,-3.132858,0,0,0,0,120,0,1), +(@OGUID+8,192308,571,1,128,5235.12744,2942.12329,444.2792,1.58824873,0,0,0,0,120,0,1), +(@OGUID+9,192309,571,1,128,5272.549,2976.54175,444.493,3.132858,0,0,0,0,120,0,1), +(@OGUID+10,192310,571,1,128,5352.19775,3055.0166,444.5646,1.57952213,0,0,0,0,120,0,1), +(@OGUID+11,192312,571,1,128,5236.315,2739.21533,444.992828,-1.60570168,0,0,0,0,120,0,1), +(@OGUID+12,192313,571,1,128,5271.634,2704.829,445.182617,-3.124123,0,0,0,0,120,0,1), +(@OGUID+13,192314,571,1,128,5350.905,2622.48,444.649323,-1.56206989,0,0,0,0,120,0,1), +(@OGUID+14,192316,571,1,128,5322.013,2781.13281,435.6727,1.57952213,0,0,0,0,120,0,1), +(@OGUID+15,192317,571,1,128,5363.387,2781.27856,435.634125,1.58824873,0,0,0,0,120,0,1), +(@OGUID+16,192318,571,1,128,5322.24854,2898.94629,435.642975,-1.57952213,0,0,0,0,120,0,1), +(@OGUID+17,192319,571,1,128,5364.30371,2899.216,435.690826,-1.55334139,0,0,0,0,120,0,1), +(@OGUID+18,192320,571,1,128,5289.048,2820.22656,435.6738,0,0,0,0,0,120,0,1), +(@OGUID+19,192321,571,1,128,5288.847,2861.82128,435.590485,0.0261791088,0,0,0,0,120,0,1), +(@OGUID+20,192322,571,1,128,5322.89258,2917.14233,445.1543,1.56206989,0,0,0,0,120,0,1), +(@OGUID+21,192323,571,1,128,5364.283,2917.264,445.332184,1.58824611,0,0,0,0,120,0,1), +(@OGUID+22,192324,571,1,128,5290.514,2976.56177,435.087463,0.008724241,0,0,0,0,120,0,1), +(@OGUID+23,192325,571,1,128,5352.37744,3036.95483,435.111053,-1.56206989,0,0,0,0,120,0,1), +(@OGUID+24,192326,571,1,128,5392.64063,3036.967,433.648682,-1.51843357,0,0,0,0,120,0,1), +(@OGUID+25,192327,571,1,128,5172.336,2862.57544,435.65802,0,0,0,0,0,120,0,1), +(@OGUID+26,192328,571,1,128,5173.12842,2820.95654,435.657623,0.0261791088,0,0,0,0,120,0,1), +(@OGUID+27,192329,571,1,128,5235.32227,2924.31079,434.8981,-1.56206989,0,0,0,0,120,0,1), +(@OGUID+28,192330,571,1,128,5237.02344,2757.35669,435.625641,1.55334139,0,0,0,0,120,0,1), +(@OGUID+29,192331,571,1,128,5289.78125,2704.62158,435.714325,0.008724241,0,0,0,0,120,0,1), +(@OGUID+30,192332,571,1,128,5350.93945,2640.43066,435.2642,1.56206989,0,0,0,0,120,0,1), +(@OGUID+31,192333,571,1,128,5392.28027,2639.84033,435.207916,1.52716041,0,0,0,0,120,0,1), +(@OGUID+32,192334,571,1,128,5322.17041,2763.20142,444.9744,-1.56206715,0,0,0,0,120,0,1), +(@OGUID+33,192335,571,1,128,5363.71631,2763.24731,445.023132,-1.54461551,0,0,0,0,120,0,1), +(@OGUID+34,192487,571,1,128,5145.11133,2934.948,433.254852,-3.10665226,0,0,0,0,120,0,1), +(@OGUID+35,192487,571,1,128,5146.04443,2747.30249,433.527039,3.124123,0,0,0,0,120,0,1), +(@OGUID+36,192487,571,1,128,5158.71,2882.90161,431.27417,3.14159274,0,0,0,0,120,0,1), +(@OGUID+37,192487,571,1,128,5160.28369,2798.59766,430.6037,-3.124123,0,0,0,0,120,0,1), +(@OGUID+38,192487,571,1,128,5162.90674,2952.59766,433.368,1.57079577,0,0,0,0,120,0,1), +(@OGUID+39,192487,571,1,128,5163.85,2729.677,433.327545,-1.60570168,0,0,0,0,120,0,1), +(@OGUID+40,192487,571,1,128,5260.82471,2631.81763,433.181061,3.124123,0,0,0,0,120,0,1), +(@OGUID+41,192487,571,1,128,5262.544,3047.93018,431.96524,3.124123,0,0,0,0,120,0,1), +(@OGUID+42,192487,571,1,128,5278.43066,2613.83276,433.294434,-1.62315571,0,0,0,0,120,0,1), +(@OGUID+43,192487,571,1,128,5280.894,3064.95386,431.9758,1.55334139,0,0,0,0,120,0,1), +-- Fortress Banners "Horde" +(@OGUID+44,192269,571,1,64,4526.46,2810.18,391.2,-2.99322,0,0,0,1,180,0,1), +(@OGUID+45,192284,571,1,64,5372.48,2862.5,409.049,3.14159,0,0,0,1,180,0,1), +(@OGUID+46,192285,571,1,64,5371.49,2820.8,409.177,3.14159,0,0,0,1,180,0,1), +(@OGUID+47,192338,571,1,64,5397.76,2873.08,455.461,3.10665,0,0,0,1,180,0,1), +(@OGUID+48,192339,571,1,64,5397.39,2809.33,455.344,3.10665,0,0,0,1,180,0,1), +(@OGUID+49,192349,571,1,64,5155.31,2820.74,444.979,-3.13286,0,0,0,1,180,0,1), +(@OGUID+50,192350,571,1,64,5270.69,2861.78,445.058,-3.11539,0,0,0,1,180,0,1), +(@OGUID+51,192351,571,1,64,5271.28,2820.16,445.201,-3.13286,0,0,0,1,180,0,1), +(@OGUID+52,192352,571,1,64,5173.02,2820.93,435.72,0.017452,0,0,0,1,180,0,1), +(@OGUID+53,192353,571,1,64,5172.11,2862.57,435.721,0.017452,0,0,0,1,180,0,1), +(@OGUID+54,192354,571,1,64,5288.41,2861.79,435.721,0.017452,0,0,0,1,180,0,1), +(@OGUID+55,192355,571,1,64,5288.92,2820.22,435.721,0.017452,0,0,0,1,180,0,1), +(@OGUID+56,192356,571,1,64,5237.07,2757.03,435.796,1.51844,0,0,0,1,180,0,1), +(@OGUID+57,192357,571,1,64,5235.34,2924.34,435.04,-1.5708,0,0,0,1,180,0,1), +(@OGUID+58,192358,571,1,64,5322.23,2899.43,435.808,-1.58825,0,0,0,1,180,0,1), +(@OGUID+59,192359,571,1,64,5364.35,2899.4,435.839,-1.5708,0,0,0,1,180,0,1), +(@OGUID+60,192360,571,1,64,5352.37,3037.09,435.252,-1.5708,0,0,0,1,180,0,1), +(@OGUID+61,192361,571,1,64,5392.65,3037.11,433.713,-1.52716,0,0,0,1,180,0,1), +(@OGUID+62,192362,571,1,64,5322.12,2763.61,444.974,-1.55334,0,0,0,1,180,0,1), +(@OGUID+63,192363,571,1,64,5363.61,2763.39,445.024,-1.54462,0,0,0,1,180,0,1), +(@OGUID+64,192364,571,1,64,5350.88,2622.72,444.686,-1.5708,0,0,0,1,180,0,1), +(@OGUID+65,192366,571,1,64,5236.27,2739.46,444.992,-1.59698,0,0,0,1,180,0,1), +(@OGUID+66,192367,571,1,64,5271.8,2704.87,445.183,-3.13286,0,0,0,1,180,0,1), +(@OGUID+67,192368,571,1,64,5289.46,2704.68,435.875,-0.017451,0,0,0,1,180,0,1), +(@OGUID+68,192369,571,1,64,5350.95,2640.36,435.408,1.5708,0,0,0,1,180,0,1), +(@OGUID+69,192370,571,1,64,5392.27,2639.74,435.331,1.50971,0,0,0,1,180,0,1), +(@OGUID+70,192371,571,1,64,5364.29,2916.94,445.331,1.57952,0,0,0,1,180,0,1), +(@OGUID+71,192372,571,1,64,5322.86,2916.95,445.154,1.56207,0,0,0,1,180,0,1), +(@OGUID+72,192373,571,1,64,5290.35,2976.56,435.221,0.017452,0,0,0,1,180,0,1), +(@OGUID+73,192374,571,1,64,5272.94,2976.55,444.492,3.12412,0,0,0,1,180,0,1), +(@OGUID+74,192375,571,1,64,5235.19,2941.9,444.278,1.58825,0,0,0,1,180,0,1), +(@OGUID+75,192376,571,1,64,5352.19775,3055.0166,444.5646,1.57952,0,0,0,0,120,0,1), +(@OGUID+76,192377,571,1,64,5414.19,3069.8,415.187,1.64061,0,0,0,1,180,0,1), +(@OGUID+77,192378,571,1,64,5322.02,2781.13,435.811,1.5708,0,0,0,1,180,0,1), +(@OGUID+78,192379,571,1,64,5363.42,2781.03,435.763,1.5708,0,0,0,1,180,0,1), +(@OGUID+79,192254,571,1,64,5154.46,2828.94,409.189,3.14159,0,0,0,1,180,0,1), +(@OGUID+80,192255,571,1,64,5154.52,2853.31,409.183,3.14159,0,0,0,1,180,0,1), +(@OGUID+81,192336,571,1,64,5154.49,2862.15,445.012,3.14159,0,0,0,1,180,0,1), +(@OGUID+82,192488,571,1,64,5160.34,2798.61,430.769,3.14159,0,0,0,1,180,0,1), +(@OGUID+83,192488,571,1,64,5158.81,2883.13,431.618,3.14159,0,0,0,1,180,0,1), +(@OGUID+84,192488,571,1,64,5278.38,2613.83,433.409,-1.58825,0,0,0,1,180,0,1), +(@OGUID+85,192488,571,1,64,5260.82,2631.8,433.324,3.05433,0,0,0,1,180,0,1), +(@OGUID+86,192488,571,1,64,5163.13,2952.59,433.503,1.53589,0,0,0,1,180,0,1), +(@OGUID+87,192488,571,1,64,5145.11,2935,433.386,3.14159,0,0,0,1,180,0,1), +(@OGUID+88,192488,571,1,64,5262.54,3047.95,432.055,3.10665,0,0,0,1,180,0,1), +(@OGUID+89,192488,571,1,64,5146.04,2747.21,433.584,3.07177,0,0,0,1,180,0,1), +(@OGUID+90,192488,571,1,64,5163.78,2729.68,433.394,-1.58825,0,0,0,1,180,0,1), +(@OGUID+91,192488,571,1,64,5280.894,3064.95386,431.9758,1.55334139,0,0,0,0,120,0,1), +-- Tower Banners "Alliance" +(@OGUID+92,192501,571,1,64,4398.82,2804.7,429.792,-1.58825,0,0,0,1,180,0,1), +(@OGUID+93,192501,571,1,64,4416,2822.67,429.851,-0.017452,0,0,0,1,180,0,1), +(@OGUID+94,192501,571,1,64,4559.11,3606.22,419.999,-1.48353,0,0,0,1,180,0,1), +(@OGUID+95,192501,571,1,64,4539.42,3622.49,420.034,-3.07177,0,0,0,1,180,0,1), +(@OGUID+96,192501,571,1,64,4555.26,3641.65,419.974,1.67551,0,0,0,1,180,0,1), +(@OGUID+97,192501,571,1,64,4574.87,3625.91,420.079,0.087266,0,0,0,1,180,0,1), +(@OGUID+98,192501,571,1,64,4466.79,1960.42,459.144,1.15192,0,0,0,1,180,0,1), +(@OGUID+99,192501,571,1,64,4475.35,1937.03,459.07,-0.436332,0,0,0,1,180,0,1), +(@OGUID+100,192501,571,1,64,4451.76,1928.1,459.076,-2.00713,0,0,0,1,180,0,1), +(@OGUID+101,192501,571,1,64,4442.99,1951.9,459.093,2.74016,0,0,0,1,180,0,1), +(@OGUID+102,192501,571,1,64,4380.36328,2822.38013,429.8818,-3.106652,0,0,0,0,120,0,1), +(@OGUID+103,192501,571,1,64,4397.6626,2840.299,429.921661,1.58824873,0,0,0,0,120,0,1), +-- Tower Banners "Horde" +(@OGUID+104,192502,571,1,128,4398.82,2804.7,429.792,-1.58825,0,0,0,1,180,0,1), +(@OGUID+105,192502,571,1,128,4416,2822.67,429.851,-0.017452,0,0,0,1,180,0,1), +(@OGUID+106,192502,571,1,128,4559.11,3606.22,419.999,-1.48353,0,0,0,1,180,0,1), +(@OGUID+107,192502,571,1,128,4539.42,3622.49,420.034,-3.07177,0,0,0,1,180,0,1), +(@OGUID+108,192502,571,1,128,4555.26,3641.65,419.974,1.67551,0,0,0,1,180,0,1), +(@OGUID+109,192502,571,1,128,4574.87,3625.91,420.079,0.087266,0,0,0,1,180,0,1), +(@OGUID+110,192502,571,1,128,4466.79,1960.42,459.144,1.15192,0,0,0,1,180,0,1), +(@OGUID+111,192502,571,1,128,4475.35,1937.03,459.07,-0.436332,0,0,0,1,180,0,1), +(@OGUID+112,192502,571,1,128,4451.76,1928.1,459.076,-2.00713,0,0,0,1,180,0,1), +(@OGUID+113,192502,571,1,128,4442.99,1951.9,459.093,2.74016,0,0,0,1,180,0,1), +(@OGUID+114,192502,571,1,128,4380.36328,2822.38013,429.8818,-3.106652,0,0,0,0,120,0,1), +(@OGUID+115,192502,571,1,128,4397.6626,2840.299,429.921661,1.58824873,0,0,0,0,120,0,1); + +SET @OGUID := 17780; +DELETE FROM `gameobject` WHERE `id` IN (192458,192459,192460,192461,192289,192290,192434,192435,192280,192283,192425,192426,192427,192428,192288,192291,192400,192401,192281,192282); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +-- The Sunken Ring "Horde" +(@OGUID+0,192458,571,1,16,4811.4,2441.9,358.207,-2.0333,0,0,0,1,180,0,1), +(@OGUID+1,192459,571,1,16,4805.67,2407.48,358.191,1.78023,0,0,0,1,180,0,1), +(@OGUID+2,192460,571,1,16,5004.35,2486.36,358.449,2.17294,0,0,0,1,180,0,1), +(@OGUID+3,192461,571,1,16,4983.28,2503.09,358.177,-0.427603,0,0,0,1,180,0,1), +(@OGUID+4,192289,571,1,16,4778.19,2438.06,345.644,-2.94088,0,0,0,1,180,0,1), +(@OGUID+5,192290,571,1,16,5024.57,2532.75,344.023,-1.93732,0,0,0,1,180,0,1), +-- The Sunken Ring "Alliance" +(@OGUID+6,192425,571,1,32,4811.435,2441.84546,357.982483,-2.02457881,0,0,0,0,120,0,1), +(@OGUID+7,192426,571,1,32,4805.514,2407.84375,357.940765,1.7715075,0,0,0,0,120,0,1), +(@OGUID+8,192427,571,1,32,5004.35,2486.36,358.449,2.17294,0,0,0,1,180,0,1), +(@OGUID+9,192428,571,1,32,4983.221,2503.27271,357.959534,-0.43633157,0,0,0,0,120,0,1), +(@OGUID+10,192288,571,1,32,4778.065,2438.02441,345.7063,-2.932139,0,0,0,0,120,0,1), +(@OGUID+11,192291,571,1,32,5024.608,2532.72583,344.4308,-1.94604158,0,0,0,0,120,0,1), +-- The Broken Temple "Horde" +(@OGUID+12,192434,571,1,16,5041.61,3294.4,382.15,-1.63188,0,0,0,1,180,0,1), +(@OGUID+13,192435,571,1,16,4855.63,3297.62,376.739,-3.13286,0,0,0,1,180,0,1), +(@OGUID+14,192280,571,1,16,4857.97,3335.44,368.881,-2.94959,0,0,0,1,180,0,1), +(@OGUID+15,192283,571,1,16,5006.34,3280.4,371.163,2.22529,0,0,0,1,180,0,1), +-- The Broken Temple "Alliance" +(@OGUID+16,192400,571,1,32,5041.650879,3294.318604,381.919952,-1.605702,0,0,0,1,180,0,1), +(@OGUID+17,192401,571,1,32,4855.444336,3297.600830,376.495758,-3.115388,0,0,0,1,180,0,1), +(@OGUID+18,192281,571,1,32,4857.971191,3335.415771,369.291901,-2.888511,0,0,0,1,180,0,1), +(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1); \ No newline at end of file -- cgit v1.2.3 From dbec50b89dae9035e8df7817bad67e498551a83f Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 29 Feb 2012 23:44:06 +0100 Subject: DB/Conditions: Fix a lot of spellclick conditions (conversion didn't properly take ElseGroup into account). Also add primary key to npc_spellclick_spells and remove duplicates. --- .../world/2012_02_29_00_world_conditions_misc.sql | 126 +++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 sql/updates/world/2012_02_29_00_world_conditions_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_29_00_world_conditions_misc.sql b/sql/updates/world/2012_02_29_00_world_conditions_misc.sql new file mode 100644 index 00000000000..34eb1261ed1 --- /dev/null +++ b/sql/updates/world/2012_02_29_00_world_conditions_misc.sql @@ -0,0 +1,126 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup` IN(34125,33796,33798,33799,33791,33792,33790, +33795,33793,33800,33794,33843,33842,26421,26477,28161,29856,32788,32790); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`, +`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +-- Stabled Campagin Warhorse Requires Any of the Dailies +(18,34125,63215,1,9,0,13847,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,2,9,0,13851,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,3,9,0,13852,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,4,9,0,13854,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,5,9,0,13855,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,6,9,0,13856,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,7,9,0,13857,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,8,9,0,13858,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,9,9,0,13859,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,10,9,0,13860,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,11,9,0,13861,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,12,9,0,13862,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,13,9,0,13863,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,14,9,0,13864,0,0,0,'Required quest active for spellclick'), +-- Raptor requires (A) Valiant of Sen'Jin +(18,33796,62784,1,8,0,13693,0,0,0,'Required quest rewarded for spellclick'), +(18,33796,62784,2,8,0,13708,0,0,0,'Required quest rewarded for spellclick'), +-- Forsaken Warhorse requires (A) Valiant of Undercity +(18,33798,62787,1,8,0,13695,0,0,0,'Required quest rewarded for spellclick'), +(18,33798,62787,2,8,0,13710,0,0,0,'Required quest rewarded for spellclick'), +-- Orgrimmar Wolf requires (A) Valiant of Orgrimmar +(18,33799,62783,1,8,0,13691,0,0,0,'Required quest rewarded for spellclick'), +(18,33799,62783,2,8,0,13707,0,0,0,'Required quest rewarded for spellclick'), +-- Silvermoon Hawkstrider requires (A) Valiant of Silvermoon +(18,33791,62786,1,8,0,13696,0,0,0,'Required quest rewarded for spellclick'), +(18,33791,62786,2,8,0,13711,0,0,0,'Required quest rewarded for spellclick'), +-- Thunder Bluff Kodo requires (A) Valiant of Thunder Bluff +(18,33792,62785,1,8,0,13694,0,0,0,'Required quest rewarded for spellclick'), +(18,33792,62785,2,8,0,13709,0,0,0,'Required quest rewarded for spellclick'), +-- Exodar Elekk requires (A) Valiant of the Exodar +(18,33790,62781,1,8,0,13690,0,0,0,'Required quest rewarded for spellclick'), +(18,33790,62781,2,8,0,13705,0,0,0,'Required quest rewarded for spellclick'), +-- Ironforge Ram requires (A) Valiant of Ironforge +(18,33795,62779,1,8,0,13685,0,0,0,'Required quest rewarded for spellclick'), +(18,33795,62779,2,8,0,13703,0,0,0,'Required quest rewarded for spellclick'), +-- Gnomeregan Mechanostrider requires (A) Valiant of Gnomeregan +(18,33793,62780,1,8,0,13688,0,0,0,'Required quest rewarded for spellclick'), +(18,33793,62780,2,8,0,13704,0,0,0,'Required quest rewarded for spellclick'), +-- Stormwind Steed requires (A) Valiant of Stormwind +(18,33800,62774,1,8,0,13593,0,0,0,'Required quest rewarded for spellclick'), +(18,33800,62774,2,8,0,13684,0,0,0,'Required quest rewarded for spellclick'), +-- Darnassian Nightsaber requires (A) Valiant of Darnassus +(18,33794,62782,1,8,0,13689,0,0,0,'Required quest rewarded for spellclick'), +(18,33794,62782,2,8,0,13706,0,0,0,'Required quest rewarded for spellclick'), +-- Stabled Quel'Dorei steeds requires The Argent Tournament rewarded +(18,33843,63792,0,8,0,13667,0,0,0,'Required quest rewarded for spellclick'), +-- Stabled Quel'Dorei steed forbids Alliance Eligibility Marker rewarded +(18,33843,63792,0,8,0,13686,0,0,1,'Forbidden rewarded quest for spellclick'), +-- Sunreaver Hawkstrider requires The Argent Tournament rewarded +(18,33842,63791,0,8,0,13668,0,0,0,'Required quest rewarded for spellclick'), +-- Sunreaver Hawkstrider forbids Horde Eligibility Marker rewarded +(18,33842,63791,0,8,0,13687,0,0,1,'Forbidden rewarded quest for spellclick'), +-- Misc +(18,26421,47575,0,8,0,12092,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26421,47575,0,8,0,12096,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26421,47575,1,9,0,12092,0,0,0,'Required quest active for spellclick'), +(18,26421,47575,2,9,0,12096,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,47096,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61832,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61832,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,1,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,61286,2,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,1,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,2,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,26477,61832,1,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,61832,2,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,28161,39996,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,39996,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,39996,1,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,39996,2,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,28161,51037,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51037,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51037,1,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,51037,2,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,28161,51961,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51961,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51961,1,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,51961,2,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,29856,55363,0,8,0,12629,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29856,55363,0,8,0,12643,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29856,55363,1,9,0,12629,0,0,0,'Required quest active for spellclick'), +(18,29856,55363,2,9,0,12643,0,0,0,'Required quest active for spellclick'), +(18,32788,57539,1,8,0,13075,0,0,0,'Required quest rewarded for spellclick'), +(18,32788,57539,2,9,0,13075,0,0,0,'Required quest active for spellclick'), +(18,32790,57654,1,8,0,13073,0,0,0,'Required quest rewarded for spellclick'), +(18,32790,57654,2,9,0,13073,0,0,0,'Required quest active for spellclick'); + +-- Remove duplicate entries in npc_spellclick_spells (leave 1) +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN(34125,26421,26477,28161, +31157,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,34944,29856,30564,29414,31269); +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES +(26477,47096,2,0), +(26477,61286,2,0), +(26477,61832,0,0), +(29414,18277,1,0), +(29856,55363,2,0), +(31269,46598,1,0), +(33794,62782,1,0), +(28161,51037,2,0), +(28161,39996,1,0), +(30564,57401,1,0), +(34125,63215,1,0), +(34944,68458,1,0), +(33790,62781,1,0), +(33793,62780,1,0), +(33795,62779,1,0), +(33800,62774,1,0), +(33798,62787,1,0), +(31157,46598,1,0), +(26421,47575,1,0), +(28161,51961,1,0), +(33791,62786,1,0), +(33792,62785,1,0), +(33796,62784,1,0), +(33799,62783,1,0); + +-- If this query fails, fix your custom content +ALTER TABLE `npc_spellclick_spells` ADD PRIMARY KEY(`npc_entry`,`spell_id`); \ No newline at end of file -- cgit v1.2.3 From e3e958e293b7b7b27b187dfd9d417897c408f19d Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 1 Mar 2012 00:10:16 +0100 Subject: DB/Conditions: Proper conditions for The Scarlet Harvest Closes #5422 --- sql/updates/world/2012_02_29_01_world_conditions.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_02_29_01_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_29_01_world_conditions.sql b/sql/updates/world/2012_02_29_01_world_conditions.sql new file mode 100644 index 00000000000..bae8baf51a9 --- /dev/null +++ b/sql/updates/world/2012_02_29_01_world_conditions.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, +`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +(18,29488,54568,15,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), +(18,29488,54568,15,9,0,12670,0,0,0,'Required quest active for spellclick'); -- cgit v1.2.3 From b9b8f27e455ec91aaf842e2ebdfc972f0b230ccc Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 1 Mar 2012 00:42:18 +0100 Subject: DB/Conditions: *Proper* conditions for The Scarlet Harvest. Saving the file before committing works. --- sql/updates/world/2012_02_29_02_world_conditions.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_02_29_02_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_29_02_world_conditions.sql b/sql/updates/world/2012_02_29_02_world_conditions.sql new file mode 100644 index 00000000000..a28e6d6424f --- /dev/null +++ b/sql/updates/world/2012_02_29_02_world_conditions.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, +`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +(18,29488,54568,1,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), +(18,29488,54568,2,9,0,12670,0,0,0,'Required quest active for spellclick'); -- cgit v1.2.3 From 8692eee01434f3872a72d2f58cb63d0b270eaabd Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 29 Feb 2012 21:15:02 -0330 Subject: DB/Creature_Text: Convert script_texts to creature_text for boss Loken, Halls of Lightning & Added sound. --- .../world/2012_02_29_03_world_creature_text.sql | 18 ++++++++++ .../Ulduar/HallsOfLightning/boss_loken.cpp | 40 ++++++++++------------ 2 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 sql/updates/world/2012_02_29_03_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_29_03_world_creature_text.sql b/sql/updates/world/2012_02_29_03_world_creature_text.sql new file mode 100644 index 00000000000..2e1d3d77dde --- /dev/null +++ b/sql/updates/world/2012_02_29_03_world_creature_text.sql @@ -0,0 +1,18 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28923; +DELETE FROM `creature_text` WHERE `entry`=28923; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28923,0,0, 'I have witnessed the rise and fall of empires... the birth and extinction of entire species... Over countless millennia the foolishness of mortals has remained the only constant. Your presence here confirms this.',14,0,100,0,0,14160, 'Loken'), +(28923,1,0, 'My master has shown me the future, and you have no place in it. Azeroth will be reborn in darkness. Yogg-Saron shall be released! The Pantheon shall fall!',14,0,100,0,0,14161, 'Loken'), +(28923,2,0, 'What hope is there for you? None!',14,0,100,0,0,14162, 'Loken'), +(28923,3,0, 'You cannot hide from fate!',14,0,100,0,0,14163, 'Loken'), +(28923,3,1, 'Come closer. I will make it quick.',14,0,100,0,0,14164, 'Loken'), +(28923,3,2, 'Your flesh cannot hold out for long.',14,0,100,0,0,14165, 'Loken'), +(28923,4,0, 'Only mortal...',14,0,100,0,0,14166, 'Loken'), +(28923,4,1, 'I... am... FOREVER!',14,0,100,0,0,14167, 'Loken'), +(28923,4,2, 'What little time you had, you wasted!',14,0,100,0,0,14168, 'Loken'), +(28923,5,0, 'You stare blindly into the abyss!',14,0,100,0,0,14169, 'Loken'), +(28923,6,0, 'Your ignorance is profound. Can you not see where this path leads?',14,0,100,0,0,14170, 'Loken'), +(28923,7,0, 'You cross the precipice of oblivion!',14,0,100,0,0,14171, 'Loken'), +(28923,8,0, 'My death... heralds the end of this world.',14,0,100,0,0,14172, 'Loken'), +(28923,9,0, '%s begins to cast Lightning Nova!',41,0,100,0,0,0, 'Loken'); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 171215c605a..e4f2bb5ce01 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -30,20 +30,16 @@ enum eEnums { ACHIEV_TIMELY_DEATH_START_EVENT = 20384, - SAY_AGGRO = -1602018, - SAY_INTRO_1 = -1602019, - SAY_INTRO_2 = -1602020, - SAY_SLAY_1 = -1602021, - SAY_SLAY_2 = -1602022, - SAY_SLAY_3 = -1602023, - SAY_DEATH = -1602024, - SAY_NOVA_1 = -1602025, - SAY_NOVA_2 = -1602026, - SAY_NOVA_3 = -1602027, - SAY_75HEALTH = -1602028, - SAY_50HEALTH = -1602029, - SAY_25HEALTH = -1602030, - EMOTE_NOVA = -1602031, + SAY_INTRO_1 = 0, + SAY_INTRO_2 = 1, + SAY_AGGRO = 2, + SAY_NOVA = 3, + SAY_SLAY = 4, + SAY_75HEALTH = 5, + SAY_50HEALTH = 6, + SAY_25HEALTH = 7, + SAY_DEATH = 8, + EMOTE_NOVA = 9, SPELL_ARC_LIGHTNING = 52921, SPELL_LIGHTNING_NOVA_N = 52960, @@ -106,7 +102,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (m_instance) { @@ -117,7 +113,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (m_instance) m_instance->SetData(TYPE_LOKEN, DONE); @@ -125,7 +121,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 uiDiff) @@ -190,8 +186,8 @@ public: if (m_uiLightningNova_Timer <= uiDiff) { - DoScriptText(RAND(SAY_NOVA_1, SAY_NOVA_2, SAY_NOVA_3), me); - DoScriptText(EMOTE_NOVA, me); + Talk(SAY_NOVA); + Talk(EMOTE_NOVA); DoCast(me, SPELL_LIGHTNING_NOVA_N); m_bIsAura = false; @@ -206,9 +202,9 @@ public: { switch (m_uiHealthAmountModifier) { - case 1: DoScriptText(SAY_75HEALTH, me); break; - case 2: DoScriptText(SAY_50HEALTH, me); break; - case 3: DoScriptText(SAY_25HEALTH, me); break; + case 1: Talk(SAY_75HEALTH); break; + case 2: Talk(SAY_50HEALTH); break; + case 3: Talk(SAY_25HEALTH); break; } ++m_uiHealthAmountModifier; -- cgit v1.2.3 From 67e6f9afabe10eadd4b4212cc6d536ed8f7cf381 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 29 Feb 2012 21:35:59 -0330 Subject: DB/Creature_Text: Convert script_texts to creature_text for boss Ionar, Halls of Lightning. --- .../world/2012_02_29_04_world_creature_text.sql | 11 +++++++++++ .../Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp | 19 ++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 sql/updates/world/2012_02_29_04_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_29_04_world_creature_text.sql b/sql/updates/world/2012_02_29_04_world_creature_text.sql new file mode 100644 index 00000000000..d8b7c2c048a --- /dev/null +++ b/sql/updates/world/2012_02_29_04_world_creature_text.sql @@ -0,0 +1,11 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28546; +DELETE FROM `creature_text` WHERE `entry`=28546; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28546,0,0, 'You wish to confront the master? You must first weather the storm!',14,0,100,0,0,14453, 'Ionar'), +(28546,1,0, 'The slightest spark shall be your undoing.',14,0,100,0,0,14454, 'Ionar'), +(28546,1,1, 'No one is safe!',14,0,100,0,0,14455, 'Ionar'), +(28546,2,0, 'Shocking ... I know!',14,0,100,0,0,14456, 'Ionar'), +(28546,2,1, 'You atempt the unpossible.',14,0,100,0,0,14457, 'Ionar'), +(28546,2,2, 'Your spark of light is ... extinguish.',14,0,100,0,0,14458, 'Ionar'), +(28546,3,0, 'Master... you have guests.',14,0,100,0,0,14459, 'Ionar'); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 016c4d27cfa..abdf5ecb1e1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -41,13 +41,10 @@ enum Spells enum Yells { - SAY_AGGRO = -1602011, - SAY_SLAY_1 = -1602012, - SAY_SLAY_2 = -1602013, - SAY_SLAY_3 = -1602014, - SAY_DEATH = -1602015, - SAY_SPLIT_1 = -1602016, - SAY_SPLIT_2 = -1602017 + SAY_AGGRO = 0, + SAY_SPLIT = 1, + SAY_SLAY = 2, + SAY_DEATH = 3 }; enum Creatures @@ -122,7 +119,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_IONAR, IN_PROGRESS); @@ -130,7 +127,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); lSparkList.DespawnAll(); @@ -140,7 +137,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void SpellHit(Unit* /*caster*/, const SpellInfo* spell) @@ -278,7 +275,7 @@ public: { bHasDispersed = true; - DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); + Talk(SAY_SPLIT); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); -- cgit v1.2.3 From c531cbc695b4c3ae5fe2716e0d237649ebecc3ce Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 29 Feb 2012 21:56:22 -0330 Subject: DB/Creature_Text: Convert script_texts to creature_text for boss Volkhan, Halls of Lightning. --- .../world/2012_02_29_05_world_creature_text.sql | 15 ++++++++++ .../Ulduar/HallsOfLightning/boss_volkhan.cpp | 32 ++++++++++------------ 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 sql/updates/world/2012_02_29_05_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_29_05_world_creature_text.sql b/sql/updates/world/2012_02_29_05_world_creature_text.sql new file mode 100644 index 00000000000..332fecf6326 --- /dev/null +++ b/sql/updates/world/2012_02_29_05_world_creature_text.sql @@ -0,0 +1,15 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28587; +DELETE FROM `creature_text` WHERE `entry`=28587; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28587,0,0, 'It is you who have destroyed my children? You... shall... pay!',14,0,100,0,0,13960, 'Volkhan'), +(28587,1,0, 'Life from lifelessness... death for you.',14,0,100,0,0,13961, 'Volkhan'), +(28587,1,1, 'Nothing is wasted in the process. You will see....',14,0,100,0,0,13962, 'Volkhan'), +(28587,2,0, 'I will crush you beneath my boots!',14,0,100,0,0,13963, 'Volkhan'), +(28587,2,1, 'All my work... undone!',14,0,100,0,0,13964, 'Volkhan'), +(28587,3,0, 'The armies of iron will conquer all!',14,0,100,0,0,13965, 'Volkhan'), +(28587,3,1, 'Ha, pathetic!',14,0,100,0,0,13966, 'Volkhan'), +(28587,3,2, 'You have cost me too much work!',14,0,100,0,0,13967, 'Volkhan'), +(28587,4,0, 'The master was right... to be concerned.',14,0,100,0,0,13968, 'Volkhan'), +(28587,5,0, '%s runs to his anvil!',41,0,100,0,0,0, 'Volkhan'), +(28587,6,0, '%s prepares to shatter his Brittle Golems!',41,0,100,0,0,0, 'Volkhan'); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 1fc724c8b6c..83604ed4153 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -28,17 +28,13 @@ EndScriptData */ enum eEnums { - SAY_AGGRO = -1602032, - SAY_SLAY_1 = -1602033, - SAY_SLAY_2 = -1602034, - SAY_SLAY_3 = -1602035, - SAY_DEATH = -1602036, - SAY_STOMP_1 = -1602037, - SAY_STOMP_2 = -1602038, - SAY_FORGE_1 = -1602039, - SAY_FORGE_2 = -1602040, - EMOTE_TO_ANVIL = -1602041, - EMOTE_SHATTER = -1602042, + SAY_AGGRO = 0, + SAY_FORGE = 1, + SAY_STOMP = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + EMOTE_TO_ANVIL = 5, + EMOTE_SHATTER = 6, SPELL_HEAT_N = 52387, SPELL_HEAT_H = 59528, @@ -127,7 +123,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (m_instance) m_instance->SetData(TYPE_VOLKHAN, IN_PROGRESS); @@ -148,7 +144,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); DespawnGolem(); if (m_instance) @@ -172,7 +168,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void DespawnGolem() @@ -263,11 +259,11 @@ public: if (m_uiShatteringStomp_Timer <= uiDiff) { // Should he stomp even if he has no brittle golem to shatter? - DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2), me); + Talk(SAY_STOMP); DoCast(me, SPELL_SHATTERING_STOMP_N); - DoScriptText(EMOTE_SHATTER, me); + Talk(EMOTE_SHATTER); m_uiShatteringStomp_Timer = 30000; m_bCanShatterGolem = true; @@ -297,7 +293,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - DoScriptText(RAND(SAY_FORGE_1, SAY_FORGE_2), me); + Talk(SAY_FORGE); m_bHasTemper = true; @@ -308,7 +304,7 @@ public: { case 1: // 1 - Start run to Anvil - DoScriptText(EMOTE_TO_ANVIL, me); + Talk(EMOTE_TO_ANVIL); me->GetMotionMaster()->MoveTargetedHome(); m_uiSummonPhase = 2; // Set Next Phase break; -- cgit v1.2.3 From a36a0a77ef75e66933ac5b8802a9ec7906acfd0b Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 1 Mar 2012 14:22:17 +0100 Subject: Core/Player: Quests with status QUEST_STATUS_NONE(0) shouldn't be loaded into player's queststatus storage. These should be removed since they are remnants from the old queststatus storage system. --- .../2012_03_01_00_characters_character_queststatus.sql | 1 + src/server/game/Entities/Player/Player.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql (limited to 'sql/updates') diff --git a/sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql b/sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql new file mode 100644 index 00000000000..da3a0f786b8 --- /dev/null +++ b/sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql @@ -0,0 +1 @@ +DELETE FROM `character_queststatus` WHERE `status`=0; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 095f9d49361..963cfc308d8 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17781,12 +17781,19 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) QuestStatusData& questStatusData = m_QuestStatus[quest_id]; uint8 qstatus = fields[1].GetUInt8(); - if (qstatus < MAX_QUEST_STATUS) + if (qstatus < MAX_QUEST_STATUS && qstatus > QUEST_STATUS_NONE) questStatusData.Status = QuestStatus(qstatus); + else if (qstatus == QUEST_STATUS_NONE) + { + sLog->outError("Player %s (GUID: %u) has QUEST_STATUS_NONE for quest %u and should be removed from character_queststatus.", + GetName(), GetGUIDLow(), quest_id); + continue; + } else { questStatusData.Status = QUEST_STATUS_INCOMPLETE; - sLog->outError("Player %s have invalid quest %d status (%u), replaced by QUEST_STATUS_INCOMPLETE(3).", GetName(), quest_id, qstatus); + sLog->outError("Player %s (GUID: %u) has invalid quest %d status (%u), replaced by QUEST_STATUS_INCOMPLETE(3).", + GetName(), GetGUIDLow(), quest_id, qstatus); } questStatusData.Explored = (fields[2].GetUInt8() > 0); -- cgit v1.2.3 From 844e2ca857bc130d5f86d673b233a2833301fc22 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 1 Mar 2012 14:41:58 +0100 Subject: DB/Conditions: Really fix the Scarlet Harvest. Quest automatically had STATUS_COMPLETE, so condition needed to be adjusted --- sql/updates/world/2012_03_01_00_world_conditions.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_03_01_00_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_01_00_world_conditions.sql b/sql/updates/world/2012_03_01_00_world_conditions.sql new file mode 100644 index 00000000000..794a5ce1210 --- /dev/null +++ b/sql/updates/world/2012_03_01_00_world_conditions.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, +`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +(18,29488,54568,1,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), +(18,29488,54568,2,28,0,12670,0,0,0,'Required quest completed for spellclick'); -- cgit v1.2.3 From 91e7dc8561e48650488f6b85628b85abbef2fd09 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 1 Mar 2012 17:42:49 -0330 Subject: DB/Creature_Text: Convert script_texts to creature_text for boss General Bjarngrim --- .../world/2012_03_01_01_world_creature_text.sql | 15 +++++++++ .../Ulduar/HallsOfLightning/boss_bjarngrim.cpp | 38 ++++++++++------------ 2 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 sql/updates/world/2012_03_01_01_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_01_01_world_creature_text.sql b/sql/updates/world/2012_03_01_01_world_creature_text.sql new file mode 100644 index 00000000000..dd4f6693654 --- /dev/null +++ b/sql/updates/world/2012_03_01_01_world_creature_text.sql @@ -0,0 +1,15 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28586; +DELETE FROM `creature_text` WHERE `entry`=28586; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28586,0,0, 'I am the greatest of my father''s sons! Your end has come!',14,0,100,0,0,14149, 'General Bjarngrim'), +(28586,1,0, 'Give me your worst!',14,0,100,0,0,14150, 'General Bjarngrim'), +(28586,2,0, 'Defend yourself, for all the good it will do!',14,0,100,0,0,14151, 'General Bjarngrim'), +(28586,3,0, 'GRAAAAAH! Behold the fury of iron and steel!',14,0,100,0,0,14152, 'General Bjarngrim'), +(28586,4,0, 'So ends your curse!',14,0,100,0,0,14153, 'General Bjarngrim'), +(28586,4,1, 'Flesh... is... weak!',14,0,100,0,0,14154, 'General Bjarngrim'), +(28586,4,2, '...',14,0,100,0,0,14155, 'General Bjarngrim'), +(28586,5,0, 'How can it be...? Flesh is not... stronger!',14,0,100,0,0,14156, 'General Bjarngrim'), +(28586,6,0, '%s switches to Defensive Stance!',41,0,100,0,0,0, 'General Bjarngrim'), +(28586,7,0, '%s switches to Battle Stance!',41,0,100,0,0,0, 'General Bjarngrim'), +(28586,8,0, '%s switches to Berserker Stance!',41,0,100,0,0,0, 'General Bjarngrim'); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index c6f72890d1f..a025cd677bd 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -29,17 +29,15 @@ EndScriptData */ enum eEnums { //Yell - SAY_AGGRO = -1602000, - SAY_SLAY_1 = -1602001, - SAY_SLAY_2 = -1602002, - SAY_SLAY_3 = -1602003, - SAY_DEATH = -1602004, - SAY_BATTLE_STANCE = -1602005, - EMOTE_BATTLE_STANCE = -1602006, - SAY_BERSEKER_STANCE = -1602007, - EMOTE_BERSEKER_STANCE = -1602008, - SAY_DEFENSIVE_STANCE = -1602009, - EMOTE_DEFENSIVE_STANCE = -1602010, + SAY_AGGRO = 0, + SAY_DEFENSIVE_STANCE = 1, + SAY_BATTLE_STANCE = 2, + SAY_BERSEKER_STANCE = 3, + SAY_SLAY = 4, + SAY_DEATH = 5, + EMOTE_DEFENSIVE_STANCE = 6, + EMOTE_BATTLE_STANCE = 7, + EMOTE_BERSEKER_STANCE = 8, SPELL_DEFENSIVE_STANCE = 53790, //SPELL_DEFENSIVE_AURA = 41105, @@ -185,7 +183,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); //must get both lieutenants here and make sure they are with him me->CallForHelp(30.0f); @@ -196,12 +194,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY), me); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (m_instance) m_instance->SetData(TYPE_BJARNGRIM, DONE); @@ -249,20 +247,20 @@ public: switch (m_uiStance) { case STANCE_DEFENSIVE: - DoScriptText(SAY_DEFENSIVE_STANCE, me); - DoScriptText(EMOTE_DEFENSIVE_STANCE, me); + Talk(SAY_DEFENSIVE_STANCE); + Talk(EMOTE_DEFENSIVE_STANCE); DoCast(me, SPELL_DEFENSIVE_STANCE); SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SHIELD, EQUIP_NO_CHANGE); break; case STANCE_BERSERKER: - DoScriptText(SAY_BERSEKER_STANCE, me); - DoScriptText(EMOTE_BERSEKER_STANCE, me); + Talk(SAY_BERSEKER_STANCE); + Talk(EMOTE_BERSEKER_STANCE); DoCast(me, SPELL_BERSEKER_STANCE); SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SWORD, EQUIP_NO_CHANGE); break; case STANCE_BATTLE: - DoScriptText(SAY_BATTLE_STANCE, me); - DoScriptText(EMOTE_BATTLE_STANCE, me); + Talk(SAY_BATTLE_STANCE); + Talk(EMOTE_BATTLE_STANCE); DoCast(me, SPELL_BATTLE_STANCE); SetEquipmentSlots(false, EQUIP_MACE, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); break; -- cgit v1.2.3 From 09f0a2c04fd5d01a4a2bbe1392750947b8911b5b Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 1 Mar 2012 22:26:05 +0100 Subject: Core/CreatureTextMgr: Added support for creature_text localization --- .../2012_03_01_02_world_locales_creature_text.sql | 15 + src/server/game/AI/SmartScripts/SmartScript.cpp | 45 ++- src/server/game/Texts/CreatureTextMgr.cpp | 403 ++++++++++++--------- src/server/game/Texts/CreatureTextMgr.h | 168 ++++++++- src/server/game/World/World.cpp | 3 + .../Ulduar/HallsOfLightning/boss_bjarngrim.cpp | 2 +- 6 files changed, 450 insertions(+), 186 deletions(-) create mode 100644 sql/updates/world/2012_03_01_02_world_locales_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql b/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql new file mode 100644 index 00000000000..c44ca191835 --- /dev/null +++ b/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql @@ -0,0 +1,15 @@ +DROP TABLE IF EXISTS `locales_creature_text`; +CREATE TABLE `locales_creature_text` ( + `entry` int(10) UNSIGNED NOT NULL, + `textGroup` tinyint(3) UNSIGNED NOT NULL, + `id` int(10) UNSIGNED NOT NULL, + `text_loc1` text, + `text_loc2` text, + `text_loc3` text, + `text_loc4` text, + `text_loc5` text, + `text_loc6` text, + `text_loc7` text, + `text_loc8` text, + PRIMARY KEY (`entry`,`textGroup`,`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 67d26ea06dd..0498cd1f07e 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -34,6 +34,46 @@ #include "Vehicle.h" #include "ScriptedGossip.h" +class TrinityStringTextBuilder +{ + public: + TrinityStringTextBuilder(WorldObject* obj, ChatMsg msgtype, int32 id, uint32 language, uint64 targetGUID) + : _source(obj), _msgType(msgtype), _textId(id), _language(language), _targetGUID(targetGUID) + { + } + + size_t operator()(WorldPacket* data, LocaleConstant locale) const + { + std::string text = sObjectMgr->GetTrinityString(_textId, locale); + char const* localizedName = _source->GetNameForLocaleIdx(locale); + + *data << uint8(_msgType); + *data << uint32(_language); + *data << uint64(_source->GetGUID()); + *data << uint32(1); // 2.1.0 + *data << uint32(strlen(localizedName)+1); + *data << localizedName; + size_t whisperGUIDpos = data->wpos(); + *data << uint64(_targetGUID); // Unit Target + if (_targetGUID && !IS_PLAYER_GUID(_targetGUID)) + { + *data << uint32(1); // target name length + *data << uint8(0); // target name + } + *data << uint32(text.length() + 1); + *data << text; + *data << uint8(0); // ChatTag + + return whisperGUIDpos; + } + + WorldObject* _source; + ChatMsg _msgType; + int32 _textId; + uint32 _language; + uint64 _targetGUID; +}; + SmartScript::SmartScript() { go = NULL; @@ -695,7 +735,10 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u me->DoFleeToGetAssistance(); if (e.action.flee.withEmote) - sCreatureTextMgr->SendChatString(me, sObjectMgr->GetTrinityStringForDBCLocale(LANG_FLEE), CHAT_MSG_MONSTER_EMOTE); + { + TrinityStringTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, LANG_FLEE, LANG_UNIVERSAL, 0); + sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE); + } sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_FLEE_FOR_ASSIST: Creature %u DoFleeToGetAssistance", me->GetGUIDLow()); break; } diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index e5a12693aa7..f1088f54007 100755 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -17,8 +17,53 @@ #include "Common.h" #include "DatabaseEnv.h" -#include "CreatureTextMgr.h" #include "ObjectMgr.h" +#include "Cell.h" +#include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "CreatureTextMgr.h" + +class CreatureTextBuilder +{ + public: + CreatureTextBuilder(WorldObject* obj, ChatMsg msgtype, uint8 textGroup, uint32 id, uint32 language, uint64 targetGUID) + : _source(obj), _msgType(msgtype), _textGroup(textGroup), _textId(id), _language(language), _targetGUID(targetGUID) + { + } + + size_t operator()(WorldPacket* data, LocaleConstant locale) const + { + std::string text = sCreatureTextMgr->GetLocalizedChatString(_source->GetEntry(), _textGroup, _textId, locale); + char const* localizedName = _source->GetNameForLocaleIdx(locale); + + *data << uint8(_msgType); + *data << uint32(_language); + *data << uint64(_source->GetGUID()); + *data << uint32(1); // 2.1.0 + *data << uint32(strlen(localizedName)+1); + *data << localizedName; + size_t whisperGUIDpos = data->wpos(); + *data << uint64(_targetGUID); // Unit Target + if (_targetGUID && !IS_PLAYER_GUID(_targetGUID)) + { + *data << uint32(1); // target name length + *data << uint8(0); // target name + } + *data << uint32(text.length() + 1); + *data << text; + *data << uint8(0); // ChatTag + + return whisperGUIDpos; + } + + WorldObject* _source; + ChatMsg _msgType; + uint8 _textGroup; + uint32 _textId; + uint32 _language; + uint64 _targetGUID; +}; void CreatureTextMgr::LoadCreatureTexts() { @@ -83,17 +128,8 @@ void CreatureTextMgr::LoadCreatureTexts() } //entry not yet added, add empty TextHolder (list of groups) if (mTextMap.find(temp.entry) == mTextMap.end()) - { ++creatureCount; - CreatureTextHolder TextHolder; - mTextMap[temp.entry] = TextHolder; - } - //group not yet added, add empty TextGroup (list of texts) - if (mTextMap[temp.entry].find(temp.group) == mTextMap[temp.entry].end()) - { - CreatureTextGroup TextGroup; - mTextMap[temp.entry][temp.group] = TextGroup; - } + //add the text into our entry's group mTextMap[temp.entry][temp.group].push_back(temp); @@ -104,42 +140,76 @@ void CreatureTextMgr::LoadCreatureTexts() sLog->outString(); } +void CreatureTextMgr::LoadCreatureTextLocales() +{ + uint32 oldMSTime = getMSTime(); + + mLocaleTextMap.clear(); // for reload case + + QueryResult result = WorldDatabase.Query("SELECT entry, textGroup, id, text_loc1, text_loc2, text_loc3, text_loc4, text_loc5, text_loc6, text_loc7, text_loc8 FROM locales_creature_text"); + + if (!result) + return; + + uint32 textCount = 0; + + do + { + Field* fields = result->Fetch(); + CreatureTextLocale& loc = mLocaleTextMap[CreatureTextId(fields[0].GetUInt32(), uint32(fields[1].GetUInt8()), fields[2].GetUInt32())]; + for (uint8 i = 1; i < TOTAL_LOCALES; ++i) + { + LocaleConstant locale = LocaleConstant(i); + ObjectMgr::AddLocaleString(fields[2 + i - 1].GetString(), locale, loc.Text); + } + + ++textCount; + } while (result->NextRow()); + + sLog->outString(">> Loaded %u creature localized texts in %u ms", textCount, GetMSTimeDiffToNow(oldMSTime)); + sLog->outString(); +} + uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, uint64 whisperGuid /*= 0*/, ChatMsg msgType /*= CHAT_MSG_ADDON*/, Language language /*= LANG_ADDON*/, TextRange range /*= TEXT_RANGE_NORMAL*/, uint32 sound /*= 0*/, Team team /*= TEAM_OTHER*/, bool gmOnly /*= false*/, Player* srcPlr /*= NULL*/) { if (!source) return 0; + CreatureTextMap::const_iterator sList = mTextMap.find(source->GetEntry()); if (sList == mTextMap.end()) { sLog->outErrorDb("CreatureTextMgr: Could not find Text for Creature(%s) Entry %u in 'creature_text' table. Ignoring.", source->GetName(), source->GetEntry()); return 0; } - CreatureTextHolder TextHolder = (*sList).second; - CreatureTextHolder::const_iterator itr = TextHolder.find(textGroup); - if (itr == TextHolder.end()) + + CreatureTextHolder const& textHolder = sList->second; + CreatureTextHolder::const_iterator itr = textHolder.find(textGroup); + if (itr == textHolder.end()) { sLog->outErrorDb("CreatureTextMgr: Could not find TextGroup %u for Creature(%s) GuidLow %u Entry %u. Ignoring.", uint32(textGroup), source->GetName(), source->GetGUIDLow(), source->GetEntry()); return 0; } - CreatureTextGroup TextGroup = (*itr).second;//has all texts in the group + + CreatureTextGroup const& textGroupContainer = itr->second; //has all texts in the group CreatureTextRepeatIds repeatGroup = GetRepeatGroup(source, textGroup);//has all textIDs from the group that were already said CreatureTextGroup tempGroup;//will use this to talk after sorting repeatGroup - for (CreatureTextGroup::const_iterator giter = TextGroup.begin(); giter != TextGroup.end(); ++giter) - { - if (std::find(repeatGroup.begin(), repeatGroup.end(), (*giter).id) == repeatGroup.end()) - tempGroup.push_back((*giter)); - } + for (CreatureTextGroup::const_iterator giter = textGroupContainer.begin(); giter != textGroupContainer.end(); ++giter) + if (std::find(repeatGroup.begin(), repeatGroup.end(), giter->id) == repeatGroup.end()) + tempGroup.push_back(*giter); + if (tempGroup.empty()) { CreatureTextRepeatMap::iterator mapItr = mTextRepeatMap.find(source->GetGUID()); if (mapItr != mTextRepeatMap.end()) { - CreatureTextRepeatGroup::iterator groupItr = (*mapItr).second.find(textGroup); - (*groupItr).second.clear(); + CreatureTextRepeatGroup::iterator groupItr = mapItr->second.find(textGroup); + groupItr->second.clear(); } - tempGroup = TextGroup; + + tempGroup = textGroupContainer; } + uint8 count = 0; float lastChance = -1; bool isEqualChanced = true; @@ -148,173 +218,92 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, uint64 whisp for (CreatureTextGroup::const_iterator iter = tempGroup.begin(); iter != tempGroup.end(); ++iter) { - if (lastChance >= 0 && lastChance != (*iter).probability) + if (lastChance >= 0 && lastChance != iter->probability) isEqualChanced = false; - lastChance = (*iter).probability; - totalChance += (*iter).probability; - count++; + lastChance = iter->probability; + totalChance += iter->probability; + ++count; } + int32 offset = -1; if (!isEqualChanced) { for (CreatureTextGroup::const_iterator iter = tempGroup.begin(); iter != tempGroup.end(); ++iter) { - uint32 chance = uint32((*iter).probability); + uint32 chance = uint32(iter->probability); uint32 r = urand(0, 100); - offset++; + ++offset; if (r <= chance) break; } } + uint32 pos = 0; if (isEqualChanced || offset < 0) pos = urand(0, count - 1); else if (offset >= 0) pos = offset; + CreatureTextGroup::const_iterator iter = tempGroup.begin() + pos; - ChatMsg finalType = (msgType == CHAT_MSG_ADDON) ? (*iter).type : msgType; - Language finalLang = (language == LANG_ADDON) ? (*iter).lang : language; - uint32 finalSound = sound ? sound : (*iter).sound; + ChatMsg finalType = (msgType == CHAT_MSG_ADDON) ? iter->type : msgType; + Language finalLang = (language == LANG_ADDON) ? iter->lang : language; + uint32 finalSound = sound ? sound : iter->sound; if (finalSound) SendSound(source, finalSound, finalType, whisperGuid, range, team, gmOnly); - if ((*iter).emote) - SendEmote(srcPlr ? srcPlr->ToUnit() : source, (*iter).emote); - - SendChatString(srcPlr ? srcPlr->ToUnit() : source, (*iter).text.c_str(), finalType, finalLang, whisperGuid, range, team, gmOnly); - if (isEqualChanced || (!isEqualChanced && totalChance == 100.0f)) - SetRepeatId(source, textGroup, (*iter).id); - - return (*iter).duration; -} - -void CreatureTextMgr::SendSound(Creature* source, uint32 sound, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) -{ - if (!sound || !source) - return; - WorldPacket data(SMSG_PLAY_SOUND, 4); - data << uint32(sound); - SendChatPacket(&data, source, msgType, whisperGuid, range, team, gmOnly); -} - -void CreatureTextMgr::SendEmote(Unit* source, uint32 emote) -{ - if (!source) return; - source->HandleEmoteCommand(emote); -} - -void CreatureTextMgr::SetRepeatId(Creature* source, uint8 textGroup, uint8 id) -{ - if (!source) - return; - - if (mTextRepeatMap.find(source->GetGUID()) == mTextRepeatMap.end()) - { - CreatureTextRepeatGroup TextGroup; - mTextRepeatMap[source->GetGUID()] = TextGroup; - } - if (mTextRepeatMap[source->GetGUID()].find(textGroup) == mTextRepeatMap[source->GetGUID()].end()) - { - CreatureTextRepeatIds ids; - mTextRepeatMap[source->GetGUID()][textGroup] = ids; - } - if (std::find(mTextRepeatMap[source->GetGUID()][textGroup].begin(), mTextRepeatMap[source->GetGUID()][textGroup].end(), id) == mTextRepeatMap[source->GetGUID()][textGroup].end()) - { - mTextRepeatMap[source->GetGUID()][textGroup].push_back(id); - } - else - sLog->outErrorDb("CreatureTextMgr: TextGroup %u for Creature(%s) GuidLow %u Entry %u, id %u already added", uint32(textGroup), source->GetName(), source->GetGUIDLow(), source->GetEntry(), uint32(id)); -} - -CreatureTextRepeatIds CreatureTextMgr::GetRepeatGroup(Creature* source, uint8 textGroup) -{ - ASSERT(source);//should never happen - CreatureTextRepeatIds ids; + Unit* finalSource = source; + if (srcPlr) + finalSource = srcPlr; - CreatureTextRepeatMap::const_iterator mapItr = mTextRepeatMap.find(source->GetGUID()); - if (mapItr != mTextRepeatMap.end()) - { - CreatureTextRepeatGroup::const_iterator groupItr = (*mapItr).second.find(textGroup); - if (groupItr != (*mapItr).second.end()) - { - ids = (*groupItr).second; - } - } - return ids; -} + if (iter->emote) + SendEmote(finalSource, iter->emote); -void CreatureTextMgr::SendChatString(WorldObject* source, char const* text, ChatMsg msgtype /*= CHAT_MSG_MONSTER_SAY*/, Language language /*= LANG_UNIVERSAL*/, uint64 whisperGuid /*= 0*/, TextRange range /*= TEXT_RANGE_NORMAL*/, Team team /*= TEAM_OTHER*/, bool gmOnly /*= false*/) const -{ - if (!source) - return; + CreatureTextBuilder builder(finalSource, finalType, iter->group, iter->id, finalLang, whisperGuid); + SendChatPacket(finalSource, builder, finalType, whisperGuid, range, team, gmOnly); + if (isEqualChanced || (!isEqualChanced && totalChance == 100.0f)) + SetRepeatId(source, textGroup, iter->id); - WorldPacket data(SMSG_MESSAGECHAT, 200); - BuildMonsterChat(&data, source, msgtype, text, language, whisperGuid);//build our packet - SendChatPacket(&data, source, msgtype, whisperGuid, range, team, gmOnly);//send our packet + return iter->duration; } -void CreatureTextMgr::BuildMonsterChat(WorldPacket* data, WorldObject* source, ChatMsg msgType, char const* text, Language language, uint64 whisperGuid) const +float CreatureTextMgr::GetRangeForChatType(ChatMsg msgType) const { - if (!source) - return; - + float dist = sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY); switch (msgType) { - case CHAT_MSG_MONSTER_WHISPER: - if (!whisperGuid) - { - sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent CHAT_TYPE_WHISPER with targetGuid 0. Ignoring.", source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); - return; - } + case CHAT_MSG_MONSTER_YELL: + dist = sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL); break; - case CHAT_MSG_RAID_BOSS_WHISPER: - if (!whisperGuid) - { - sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent CHAT_TYPE_BOSS_WHISPER with targetGuid 0. Ignoring.", source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); - return; - } + case CHAT_MSG_MONSTER_EMOTE: + case CHAT_MSG_RAID_BOSS_EMOTE: + dist = sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE); break; default: break; } - *data << uint8(msgType); - *data << uint32(language); - *data << uint64(source->GetGUID()); - *data << uint32(0); // 2.1.0 - *data << uint32(strlen(source->GetName()) + 1); - *data << source->GetName(); - *data << uint64(whisperGuid); // Unit Target - if (whisperGuid && !IS_PLAYER_GUID(whisperGuid)) //can only whisper players - { - sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent WHISPER msg to Non-Player target. Ignoring.", source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); - return; - // *data << (uint32)1; // target name length - // *data << (uint8)0; // target name - } - *data << uint32(strlen(text) + 1); - *data << text; - *data << uint8(0); // ChatTag + + return dist; } -void CreatureTextMgr::SendChatPacket(WorldPacket* data, WorldObject* source, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) const +void CreatureTextMgr::SendSound(Creature* source, uint32 sound, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) { - if (!source) + if (!sound || !source) return; - float dist = sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY); + WorldPacket data(SMSG_PLAY_SOUND, 4); + data << uint32(sound); + SendNonChatPacket(source, &data, msgType, whisperGuid, range, team, gmOnly); +} + +void CreatureTextMgr::SendNonChatPacket(WorldObject* source, WorldPacket* data, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) const +{ + float dist = GetRangeForChatType(msgType); switch (msgType) { - case CHAT_MSG_MONSTER_YELL: - dist = sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL); - break; - case CHAT_MSG_MONSTER_EMOTE: - case CHAT_MSG_RAID_BOSS_EMOTE: - dist = sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE); - break; case CHAT_MSG_MONSTER_WHISPER: case CHAT_MSG_RAID_BOSS_WHISPER: { @@ -337,83 +326,135 @@ void CreatureTextMgr::SendChatPacket(WorldPacket* data, WorldObject* source, Cha case TEXT_RANGE_AREA: { uint32 areaId = source->GetAreaId(); - Map::PlayerList const& pList = source->GetMap()->GetPlayers(); - for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) - { + Map::PlayerList const& players = source->GetMap()->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if (itr->getSource()->GetAreaId() == areaId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - { - if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid - data->put(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID())); - (itr->getSource())->GetSession()->SendPacket(data); - } - } + itr->getSource()->GetSession()->SendPacket(data); return; } case TEXT_RANGE_ZONE: { uint32 zoneId = source->GetZoneId(); - Map::PlayerList const& pList = source->GetMap()->GetPlayers(); - for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) - { + Map::PlayerList const& players = source->GetMap()->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if (itr->getSource()->GetZoneId() == zoneId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - { - if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid - data->put(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID())); - (itr->getSource())->GetSession()->SendPacket(data); - } - } + itr->getSource()->GetSession()->SendPacket(data); return; } case TEXT_RANGE_MAP: { - Map::PlayerList const& pList = source->GetMap()->GetPlayers(); - for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) - { - if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid - data->put(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID())); + Map::PlayerList const& players = source->GetMap()->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if ((!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) - (itr->getSource())->GetSession()->SendPacket(data); - } + itr->getSource()->GetSession()->SendPacket(data); return; } case TEXT_RANGE_WORLD: { - const SessionMap smap = sWorld->GetAllSessions(); + SessionMap const& smap = sWorld->GetAllSessions(); for (SessionMap::const_iterator iter = smap.begin(); iter != smap.end(); ++iter) - { - if (Player* player = (*iter).second->GetPlayer()) - { - if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid - data->put(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(player->GetGUID())); + if (Player* player = iter->second->GetPlayer()) if (player->GetSession() && (!team || Team(player->GetTeam()) == team) && (!gmOnly || player->isGameMaster())) player->GetSession()->SendPacket(data); - } - } return; } case TEXT_RANGE_NORMAL: default: break; } + source->SendMessageToSetInRange(data, dist, true); } +void CreatureTextMgr::SendEmote(Unit* source, uint32 emote) +{ + if (!source) + return; + + source->HandleEmoteCommand(emote); +} + +void CreatureTextMgr::SetRepeatId(Creature* source, uint8 textGroup, uint8 id) +{ + if (!source) + return; + + CreatureTextRepeatIds& repeats = mTextRepeatMap[source->GetGUID()][textGroup]; + if (std::find(repeats.begin(), repeats.end(), id) == repeats.end()) + repeats.push_back(id); + else + sLog->outErrorDb("CreatureTextMgr: TextGroup %u for Creature(%s) GuidLow %u Entry %u, id %u already added", uint32(textGroup), source->GetName(), source->GetGUIDLow(), source->GetEntry(), uint32(id)); +} + +CreatureTextRepeatIds CreatureTextMgr::GetRepeatGroup(Creature* source, uint8 textGroup) +{ + ASSERT(source);//should never happen + CreatureTextRepeatIds ids; + + CreatureTextRepeatMap::const_iterator mapItr = mTextRepeatMap.find(source->GetGUID()); + if (mapItr != mTextRepeatMap.end()) + { + CreatureTextRepeatGroup::const_iterator groupItr = (*mapItr).second.find(textGroup); + if (groupItr != mapItr->second.end()) + ids = groupItr->second; + } + return ids; +} + bool CreatureTextMgr::TextExist(uint32 sourceEntry, uint8 textGroup) { if (!sourceEntry) return false; + CreatureTextMap::const_iterator sList = mTextMap.find(sourceEntry); if (sList == mTextMap.end()) { sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find Text for Creature (entry %u) in 'creature_text' table.", sourceEntry); return false; } - CreatureTextHolder TextHolder = (*sList).second; - CreatureTextHolder::const_iterator itr = TextHolder.find(textGroup); - if (itr == TextHolder.end()) + + CreatureTextHolder const& textHolder = sList->second; + CreatureTextHolder::const_iterator itr = textHolder.find(textGroup); + if (itr == textHolder.end()) { sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find TextGroup %u for Creature (entry %u).", uint32(textGroup), sourceEntry); return false; } + return true; } + +std::string CreatureTextMgr::GetLocalizedChatString(uint32 entry, uint8 textGroup, uint32 id, LocaleConstant locale) const +{ + CreatureTextMap::const_iterator mapitr = mTextMap.find(entry); + if (mapitr == mTextMap.end()) + return ""; + + CreatureTextHolder::const_iterator holderItr = mapitr->second.find(textGroup); + if (holderItr == mapitr->second.end()) + return ""; + + CreatureTextGroup::const_iterator groupItr = holderItr->second.begin(); + for (; groupItr != holderItr->second.end(); ++groupItr) + if (groupItr->id == id) + break; + + if (groupItr == holderItr->second.end()) + return ""; + + std::string baseText = groupItr->text; + if (locale == DEFAULT_LOCALE) + return baseText; + + if (locale > MAX_LOCALES) + return baseText; + + LocaleCreatureTextMap::const_iterator locItr = mLocaleTextMap.find(CreatureTextId(entry, uint32(textGroup), id)); + if (locItr == mLocaleTextMap.end()) + return baseText; + + if (locItr->second.Text[locale].length()) + return locItr->second.Text[locale]; + + return baseText; +} diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 0c80e2d568f..c9e3d44f346 100755 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -44,10 +44,33 @@ enum TextRange TEXT_RANGE_WORLD = 4 }; +struct CreatureTextLocale +{ + StringVector Text; +}; + +struct CreatureTextId +{ + CreatureTextId(uint32 e, uint32 g, uint32 i) : entry(e), textGroup(g), textId(i) + { + } + + bool operator<(CreatureTextId const& right) const + { + return memcmp(this, &right, sizeof(CreatureTextId)) < 0; + } + + uint32 entry; + uint32 textGroup; + uint32 textId; +}; + typedef std::vector CreatureTextGroup; //texts in a group typedef UNORDERED_MAP CreatureTextHolder; //groups for a creature by groupid typedef UNORDERED_MAP CreatureTextMap; //all creatures by entry +typedef std::map LocaleCreatureTextMap; + //used for handling non-repeatable random texts typedef std::vector CreatureTextRepeatIds; typedef UNORDERED_MAP CreatureTextRepeatGroup; @@ -57,9 +80,11 @@ class CreatureTextMgr { friend class ACE_Singleton; CreatureTextMgr() {}; + public: ~CreatureTextMgr() {}; void LoadCreatureTexts(); + void LoadCreatureTextLocales(); CreatureTextMap const& GetTextMap() const { return mTextMap; } void SendSound(Creature* source, uint32 sound, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly); @@ -67,17 +92,154 @@ class CreatureTextMgr //if sent, returns the 'duration' of the text else 0 if error uint32 SendChat(Creature* source, uint8 textGroup, uint64 whisperGuid = 0, ChatMsg msgType = CHAT_MSG_ADDON, Language language = LANG_ADDON, TextRange range = TEXT_RANGE_NORMAL, uint32 sound = 0, Team team = TEAM_OTHER, bool gmOnly = false, Player* srcPlr = NULL); - void SendChatString(WorldObject* source, char const* text, ChatMsg msgtype = CHAT_MSG_MONSTER_SAY, Language language = LANG_UNIVERSAL, uint64 whisperGuid = 0, TextRange range = TEXT_RANGE_NORMAL, Team team = TEAM_OTHER, bool gmOnly = false) const; bool TextExist(uint32 sourceEntry, uint8 textGroup); + std::string GetLocalizedChatString(uint32 entry, uint8 textGroup, uint32 id, LocaleConstant locale) const; + + template + void SendChatPacket(WorldObject* source, Builder const& builder, ChatMsg msgType, uint64 whisperGuid = 0, TextRange range = TEXT_RANGE_NORMAL, Team team = TEAM_OTHER, bool gmOnly = false) const; private: CreatureTextRepeatIds GetRepeatGroup(Creature* source, uint8 textGroup); void SetRepeatId(Creature* source, uint8 textGroup, uint8 id); - void BuildMonsterChat(WorldPacket* data, WorldObject* source, ChatMsg msgType, char const* text, Language language, uint64 whisperGuid) const; - void SendChatPacket(WorldPacket* data, WorldObject* source, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) const; + + void SendNonChatPacket(WorldObject* source, WorldPacket* data, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) const; + float GetRangeForChatType(ChatMsg msgType) const; CreatureTextMap mTextMap; CreatureTextRepeatMap mTextRepeatMap; + LocaleCreatureTextMap mLocaleTextMap; }; #define sCreatureTextMgr ACE_Singleton::instance() + +template +class CreatureTextLocalizer +{ + public: + CreatureTextLocalizer(Builder const& builder, ChatMsg msgType) : _builder(builder), _msgType(msgType) + { + _packetCache.resize(TOTAL_LOCALES, NULL); + } + + ~CreatureTextLocalizer() + { + for (size_t i = 0; i < _packetCache.size(); ++i) + { + if (_packetCache[i]) + delete _packetCache[i]->first; + delete _packetCache[i]; + } + } + + void operator()(Player* player) + { + LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); + WorldPacket* messageTemplate; + size_t whisperGUIDpos; + + // create if not cached yet + if (!_packetCache[loc_idx]) + { + messageTemplate = new WorldPacket(SMSG_MESSAGECHAT, 200); + whisperGUIDpos = _builder(messageTemplate, loc_idx); + _packetCache[loc_idx] = new std::pair(messageTemplate, whisperGUIDpos); + } + else + { + messageTemplate = _packetCache[loc_idx]->first; + whisperGUIDpos = _packetCache[loc_idx]->second; + } + + WorldPacket data(*messageTemplate); + switch (_msgType) + { + case CHAT_MSG_MONSTER_WHISPER: + case CHAT_MSG_RAID_BOSS_WHISPER: + data.put(whisperGUIDpos, player->GetGUID()); + break; + } + + player->SendDirectMessage(&data); + } + + private: + std::vector* > _packetCache; + Builder const& _builder; + ChatMsg _msgType; +}; + +template +void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder, ChatMsg msgType, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) const +{ + if (!source) + return; + + CreatureTextLocalizer localizer(builder, msgType); + + switch (msgType) + { + case CHAT_MSG_MONSTER_WHISPER: + case CHAT_MSG_RAID_BOSS_WHISPER: + { + if (range == TEXT_RANGE_NORMAL) //ignores team and gmOnly + { + Player* player = ObjectAccessor::FindPlayer(whisperGuid); + if (!player || !player->GetSession()) + return; + + localizer(player); + return; + } + break; + } + default: + break; + } + + switch (range) + { + case TEXT_RANGE_AREA: + { + uint32 areaId = source->GetAreaId(); + Map::PlayerList const& players = source->GetMap()->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + if (itr->getSource()->GetAreaId() == areaId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) + localizer(itr->getSource()); + return; + } + case TEXT_RANGE_ZONE: + { + uint32 zoneId = source->GetZoneId(); + Map::PlayerList const& players = source->GetMap()->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + if (itr->getSource()->GetZoneId() == zoneId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) + localizer(itr->getSource()); + return; + } + case TEXT_RANGE_MAP: + { + Map::PlayerList const& players = source->GetMap()->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + if ((!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster())) + localizer(itr->getSource()); + return; + } + case TEXT_RANGE_WORLD: + { + SessionMap const& smap = sWorld->GetAllSessions(); + for (SessionMap::const_iterator iter = smap.begin(); iter != smap.end(); ++iter) + if (Player* player = iter->second->GetPlayer()) + if (player->GetSession() && (!team || Team(player->GetTeam()) == team) && (!gmOnly || player->isGameMaster())) + localizer(player); + return; + } + case TEXT_RANGE_NORMAL: + default: + break; + } + + float dist = GetRangeForChatType(msgType); + Trinity::PlayerDistWorker > worker(source, dist, localizer); + source->VisitNearbyWorldObject(dist, worker); +} + #endif diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index fcdb6b7fcd6..3efa976e1d3 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1651,6 +1651,9 @@ void World::SetInitialWorldSettings() sLog->outString("Loading Creature Texts..."); sCreatureTextMgr->LoadCreatureTexts(); + sLog->outString("Loading Creature Text Locales..."); + sCreatureTextMgr->LoadCreatureTextLocales(); + sLog->outString("Initializing Scripts..."); sScriptMgr->Initialize(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index a025cd677bd..284babb7193 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -194,7 +194,7 @@ public: void KilledUnit(Unit* /*victim*/) { - Talk(SAY_SLAY), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) -- cgit v1.2.3 From c119c0ce13ab85e775ff399f7e28a38d72ac4e45 Mon Sep 17 00:00:00 2001 From: Souler Date: Sat, 25 Feb 2012 17:27:19 +0100 Subject: Core/Arenas/Dalaran Sewers: Players who stay on the pipe after the battle has begun should be knocked into the arena. Also corrected the orientation of horde starting position --- sql/updates/world/2012_02_25_01_world_misc.sql | 11 +++++++ .../game/Battlegrounds/Zones/BattlegroundDS.cpp | 25 +++++++++++++- .../game/Battlegrounds/Zones/BattlegroundDS.h | 32 ++++++++++++++++-- src/server/scripts/Spells/spell_generic.cpp | 38 ++++++++++++++++++++++ 4 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/2012_02_25_01_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_25_01_world_misc.sql b/sql/updates/world/2012_02_25_01_world_misc.sql new file mode 100644 index 00000000000..deedd50a819 --- /dev/null +++ b/sql/updates/world/2012_02_25_01_world_misc.sql @@ -0,0 +1,11 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (61698); +INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES +(61698,'spell_gen_ds_flush_knockback'); + +DELETE FROM `spell_dbc` WHERE `id`=61698; +INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES +(61698,0,0,536871296,269058048,67108868,268894272,2048,0,1024,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,-1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,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,'Flush - Knockback effect'); + +UPDATE `battleground_template` SET `HordeStartO`=3.14159 WHERE `id`=10; + +UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry`=28567; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp index d24058cdd8a..aec828ef62f 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp @@ -27,6 +27,7 @@ BattlegroundDS::BattlegroundDS() { BgObjects.resize(BG_DS_OBJECT_MAX); + BgCreatures.resize(BG_DS_NPC_MAX); StartDelayTimes[BG_STARTING_EVENT_FIRST] = BG_START_DELAY_1M; StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S; @@ -49,6 +50,21 @@ void BattlegroundDS::PostUpdateImpl(uint32 diff) if (GetStatus() != STATUS_IN_PROGRESS) return; + if (getPipeKnockBackCount() < BG_DS_PIPE_KNOCKBACK_TOTAL_COUNT) + { + if (getPipeKnockBackTimer() < diff) + { + for (uint32 i = BG_DS_NPC_PIPE_KNOCKBACK_1; i <= BG_DS_NPC_PIPE_KNOCKBACK_2; ++i) + if (Creature* waterSpout = GetBgMap()->GetCreature(BgCreatures[i])) + waterSpout->CastSpell(waterSpout, BG_DS_SPELL_FLUSH, true); + + setPipeKnockBackCount(getPipeKnockBackCount() + 1); + setPipeKnockBackTimer(BG_DS_PIPE_KNOCKBACK_DELAY); + } + else + setPipeKnockBackTimer(getPipeKnockBackTimer() - diff); + } + if (getWaterFallTimer() < diff) { if (getWaterFallStatus() == BG_DS_WATERFALL_STATUS_OFF) // Add the water @@ -97,6 +113,9 @@ void BattlegroundDS::StartingEventOpenDoors() setWaterFallTimer(urand(BG_DS_WATERFALL_TIMER_MIN, BG_DS_WATERFALL_TIMER_MAX)); setWaterFallStatus(BG_DS_WATERFALL_STATUS_OFF); + setPipeKnockBackTimer(BG_DS_PIPE_KNOCKBACK_FIRST_DELAY); + setPipeKnockBackCount(0); + SpawnBGObject(BG_DS_OBJECT_WATER_2, RESPAWN_IMMEDIATELY); DoorOpen(BG_DS_OBJECT_WATER_2); @@ -187,7 +206,11 @@ bool BattlegroundDS::SetupBattleground() || !AddObject(BG_DS_OBJECT_WATER_2, BG_DS_OBJECT_TYPE_WATER_2, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120) // buffs || !AddObject(BG_DS_OBJECT_BUFF_1, BG_DS_OBJECT_TYPE_BUFF_1, 1291.7f, 813.424f, 7.11472f, 4.64562f, 0, 0, 0.730314f, -0.683111f, 120) - || !AddObject(BG_DS_OBJECT_BUFF_2, BG_DS_OBJECT_TYPE_BUFF_2, 1291.7f, 768.911f, 7.11472f, 1.55194f, 0, 0, 0.700409f, 0.713742f, 120)) + || !AddObject(BG_DS_OBJECT_BUFF_2, BG_DS_OBJECT_TYPE_BUFF_2, 1291.7f, 768.911f, 7.11472f, 1.55194f, 0, 0, 0.700409f, 0.713742f, 120) + // knockback creatures + || !AddCreature(BG_DS_NPC_TYPE_WATER_SPOUT, BG_DS_NPC_WATERFALL_KNOCKBACK, 0, 1292.587f, 790.2205f, 7.19796f, 3.054326f, RESPAWN_IMMEDIATELY) + || !AddCreature(BG_DS_NPC_TYPE_WATER_SPOUT, BG_DS_NPC_PIPE_KNOCKBACK_1, 0, 1369.977f, 817.2882f, 16.08718f, 3.106686f, RESPAWN_IMMEDIATELY) + || !AddCreature(BG_DS_NPC_TYPE_WATER_SPOUT, BG_DS_NPC_PIPE_KNOCKBACK_2, 0, 1212.833f, 765.3871f, 16.09484f, 0.0f, RESPAWN_IMMEDIATELY)) { sLog->outErrorDb("BatteGroundDS: Failed to spawn some object!"); return false; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h index 7efc6e1caa7..034749d1be8 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h @@ -42,12 +42,34 @@ enum BattlegroundDSObjects BG_DS_OBJECT_TYPE_BUFF_2 = 184664 }; +enum BattlegroundDSCreatureTypes +{ + BG_DS_NPC_WATERFALL_KNOCKBACK = 0, + BG_DS_NPC_PIPE_KNOCKBACK_1 = 1, + BG_DS_NPC_PIPE_KNOCKBACK_2 = 2, + BG_DS_NPC_MAX = 3 +}; + +enum BattlegroundDSCreatures +{ + BG_DS_NPC_TYPE_WATER_SPOUT = 28567, +}; + +enum BattlegroundDSSpells +{ + BG_DS_SPELL_FLUSH = 57405, // Visual and target selector for the starting knockback from the pipe + BG_DS_SPELL_FLUSH_KNOCKBACK = 61698, // Knockback effect for previous spell (triggered, not need to be casted) +}; + enum BattlegroundDSData { // These values are NOT blizzlike... need the correct data! BG_DS_WATERFALL_TIMER_MIN = 30000, BG_DS_WATERFALL_TIMER_MAX = 60000, BG_DS_WATERFALL_WARNING_DURATION = 7000, BG_DS_WATERFALL_DURATION = 10000, + BG_DS_PIPE_KNOCKBACK_FIRST_DELAY = 5000, + BG_DS_PIPE_KNOCKBACK_DELAY = 3000, + BG_DS_PIPE_KNOCKBACK_TOTAL_COUNT = 2, BG_DS_WATERFALL_STATUS_WARNING = 1, // Water starting to fall, but no LoS Blocking nor movement blocking BG_DS_WATERFALL_STATUS_ON = 2, // LoS and Movement blocking active @@ -83,12 +105,18 @@ class BattlegroundDS : public Battleground private: uint32 _waterfallTimer; uint8 _waterfallStatus; + uint32 _pipeKnockBackTimer; + uint8 _pipeKnockBackCount; virtual void PostUpdateImpl(uint32 diff); protected: uint32 getWaterFallStatus() { return _waterfallStatus; }; - void setWaterFallStatus(uint32 status) { _waterfallStatus = status; }; - void setWaterFallTimer(uint32 timer) { _waterfallTimer = timer; }; + void setWaterFallStatus(uint8 status) { _waterfallStatus = status; }; uint32 getWaterFallTimer() { return _waterfallTimer; }; + void setWaterFallTimer(uint32 timer) { _waterfallTimer = timer; }; + uint8 getPipeKnockBackCount() { return _pipeKnockBackCount; }; + void setPipeKnockBackCount(uint8 count) { _pipeKnockBackCount = count; }; + uint32 getPipeKnockBackTimer() { return _pipeKnockBackTimer; }; + void setPipeKnockBackTimer(uint32 timer) { _pipeKnockBackTimer = timer; }; }; #endif diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index db33a9e0332..f2a48b0f9d2 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2548,6 +2548,43 @@ class spell_gen_chaos_blast : public SpellScriptLoader }; +class spell_gen_ds_flush_knockback : public SpellScriptLoader +{ + public: + spell_gen_ds_flush_knockback() : SpellScriptLoader("spell_gen_ds_flush_knockback") {} + + class spell_gen_ds_flush_knockback_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_ds_flush_knockback_SpellScript); + + void HandleScript(SpellEffIndex /*effIndex*/) + { + // Here the target is the water spout and determines the position where the player is knocked from + if (Unit* target = GetHitUnit()) + { + if (Player* player = GetCaster()->ToPlayer()) + { + float horizontalSpeed = 20.0f + (40.0f - GetCaster()->GetDistance(target)); + float verticalSpeed = 8.0f; + // This method relies on the Dalaran Sewer map disposition and Water Spout position + // What we do is knock the player from a position exactly behind him and at the end of the pipe + player->KnockbackFrom(target->GetPositionX(), player->GetPositionY(), horizontalSpeed, verticalSpeed); + } + } + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_gen_ds_flush_knockback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gen_ds_flush_knockback_SpellScript(); + } +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -2597,4 +2634,5 @@ void AddSC_generic_spell_scripts() new spell_gen_on_tournament_mount(); new spell_gen_tournament_pennant(); new spell_gen_chaos_blast(); + new spell_gen_ds_flush_knockback(); } -- cgit v1.2.3 From d1e4eb051239c51f84e07938077da82f99367e8d Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sat, 3 Mar 2012 16:12:28 +0100 Subject: Core/Commands: Implement .debug moveflags command. With params you can set MoveFlags and MoveFlagsExtra for targeted unit. Without params it will display the current MoveFlags and MoveFlagsExtra. Useful for debugging upcoming changes. --- sql/updates/world/2012_03_03_00_world_command.sql | 9 ++++++ src/server/game/Miscellaneous/Language.h | 4 ++- src/server/scripts/Commands/cs_debug.cpp | 34 +++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_03_03_00_world_command.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_03_00_world_command.sql b/sql/updates/world/2012_03_03_00_world_command.sql new file mode 100644 index 00000000000..52938c0b76b --- /dev/null +++ b/sql/updates/world/2012_03_03_00_world_command.sql @@ -0,0 +1,9 @@ +DELETE FROM `command` WHERE `name` LIKE 'debug moveflags'; +INSERT INTO `command` (`name`,`security`,`help`) VALUES +('debug moveflags',3,'Syntax: .debug moveflags [$newMoveFlags [$newMoveFlags2]]\r\nNo params given will output the current moveflags of the target'); + +DELETE FROM `trinity_string` WHERE `entry` IN(1143,1144); +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(1143,'Target''s moveFlags: %u, moveFlagsExtra: %u.'), +(1144,'Target''s moveFlags set to: %u, moveFlagsExtra to: %u'); + diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index e751dbf92fe..547f1679b61 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -811,7 +811,9 @@ enum TrinityStrings LANG_MOVEGENS_FOLLOW_CREATURE = 1140, LANG_MOVEGENS_FOLLOW_NULL = 1141, LANG_MOVEGENS_EFFECT = 1142, - // Room for more level 3 1143-1199 not used + LANG_MOVEFLAGS_GET = 1143, + LANG_MOVEFLAGS_SET = 1144, + // Room for more level 3 1144-1199 not used // Debug commands LANG_CINEMATIC_NOT_EXIST = 1200, diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 8ca40231090..d4c94061e01 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -89,6 +89,7 @@ public: { "itemexpire", SEC_ADMINISTRATOR, false, &HandleDebugItemExpireCommand, "", NULL }, { "areatriggers", SEC_ADMINISTRATOR, false, &HandleDebugAreaTriggersCommand, "", NULL }, { "los", SEC_MODERATOR, false, &HandleDebugLoSCommand, "", NULL }, + { "moveflags", SEC_ADMINISTRATOR, false, &HandleDebugMoveflagsCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand commandTable[] = @@ -1283,6 +1284,39 @@ public: handler->PSendSysMessage(LANG_SET_32BIT_FIELD, opcode, value); return true; } + + static bool HandleDebugMoveflagsCommand(ChatHandler* handler, char const* args) + { + Unit* target = handler->getSelectedUnit(); + if (!target) + target = handler->GetSession()->GetPlayer(); + + if (!*args) + { + //! Display case + handler->PSendSysMessage(LANG_MOVEFLAGS_GET, target->GetUnitMovementFlags(), target->GetExtraUnitMovementFlags()); + } + else + { + char* mask1 = strtok((char*)args, " "); + if (!mask1) + return false; + + char* mask2 = strtok(NULL, " \n"); + + uint32 moveFlags = (uint32)atoi(mask1); + target->SetUnitMovementFlags(moveFlags); + + if (mask2) + { + uint32 moveFlagsExtra = uint32(atoi(mask2)); + target->SetExtraUnitMovementFlags(moveFlagsExtra); + } + + target->SendMovementFlagUpdate(); + handler->PSendSysMessage(LANG_MOVEFLAGS_SET, target->GetUnitMovementFlags(), target->GetExtraUnitMovementFlags()); + } + } }; void AddSC_debug_commandscript() -- cgit v1.2.3 From c48a1ad17db9b623795d24bbe83d77247b6ef756 Mon Sep 17 00:00:00 2001 From: Discover- Date: Sun, 4 Mar 2012 02:45:21 +0100 Subject: Scripts/Misc: Script entrance areatriggers for Area 52. --- ...2012_03_04_00_world_creature_template_addon.sql | 13 +++++++ src/server/scripts/World/areatrigger_scripts.cpp | 43 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 sql/updates/world/2012_03_04_00_world_creature_template_addon.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_04_00_world_creature_template_addon.sql b/sql/updates/world/2012_03_04_00_world_creature_template_addon.sql new file mode 100644 index 00000000000..358dc651735 --- /dev/null +++ b/sql/updates/world/2012_03_04_00_world_creature_template_addon.sql @@ -0,0 +1,13 @@ +-- Spotlight aura for spotlight NPC +DELETE FROM `creature_template_addon` WHERE `entry`=19913; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(19913,0,0,0,0,'39312'); + +-- Scriptnames for areatriggers +SET @AT_AREA_52_SOUTHSET := 4472; +SET @AT_AREA_52_NORTHSET := 4466; +SET @AT_AREA_52_WESTSET := 4471; +SET @AT_AREA_52_EASTSET := 4422; +DELETE FROM `areatrigger_scripts` WHERE `entry` IN (@AT_AREA_52_SOUTH,@AT_AREA_52_NORTH,@AT_AREA_52_WEST,@AT_AREA_52_EAST) +INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES +(@AT_AREA_52_SOUTH,"at_area_52_entrance"),(@AT_AREA_52_NORTH,"at_area_52_entrance"),(@AT_AREA_52_WEST,"at_area_52_entrance"),(@AT_AREA_52_EAST,"at_area_52_entrance"); diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 8f86f760775..77f3a64a13f 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -32,6 +32,7 @@ at_sholazar_waygate q12548 at_nats_landing q11209 at_bring_your_orphan_to q910 q910 q1800 q1479 q1687 q1558 q10951 q10952 at_brewfest +at_area_52_entrance EndContentData */ #include "ScriptPCH.h" @@ -420,6 +421,47 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript std::map _triggerTimes; }; +/*###### +## at_area_52_entrance +######*/ + +enum Area52Entrance +{ + NPC_SPOTLIGHT = 19913, + SUMMON_COOLDOWN = 5, + + AT_AREA_52_SOUTH = 4472, + AT_AREA_52_NORTH = 4466, + AT_AREA_52_WEST = 4471, + AT_AREA_52_EAST = 4422, +}; + +class AreaTrigger_at_area_52_entrance : public AreaTriggerScript +{ + public: + AreaTrigger_at_area_52_entrance() : AreaTriggerScript("at_area_52_entrance") + { + _triggerTimes[AT_AREA_52_SOUTH] = _triggerTimes[AT_AREA_52_NORTH] = _triggerTimes[AT_AREA_52_WEST] = _triggerTimes[AT_AREA_52_EAST] = 0; + } + + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + { + if (!player->isAlive()) + return false; + + if (sWorld->GetGameTime() - _triggerTimes[trigger->id] < SUMMON_COOLDOWN) + return false; + + player->SummonCreature(NPC_SPOTLIGHT, trigger->x, trigger->y, trigger->z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 5000); + + _triggerTimes[trigger->id] = sWorld->GetGameTime(); + return false; + } + + private: + std::map _triggerTimes; +}; + void AddSC_areatrigger_scripts() { new AreaTrigger_at_coilfang_waterfall(); @@ -431,4 +473,5 @@ void AddSC_areatrigger_scripts() new AreaTrigger_at_nats_landing(); new AreaTrigger_at_bring_your_orphan_to(); new AreaTrigger_at_brewfest(); + new AreaTrigger_at_area_52_entrance(); } -- cgit v1.2.3 From 1776b16773cbff1262ef62268b7a6827ac002c07 Mon Sep 17 00:00:00 2001 From: Discover- Date: Sun, 4 Mar 2012 13:19:47 +0100 Subject: DB/Misc: Fix SQL of c48a1ad17db9b623795d24bbe83d77247b6ef756 --- .../world/2012_03_04_00_world_creature_template_addon.sql | 13 ------------- sql/updates/world/2012_03_04_00_world_misc.sql | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 sql/updates/world/2012_03_04_00_world_creature_template_addon.sql create mode 100644 sql/updates/world/2012_03_04_00_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_04_00_world_creature_template_addon.sql b/sql/updates/world/2012_03_04_00_world_creature_template_addon.sql deleted file mode 100644 index 358dc651735..00000000000 --- a/sql/updates/world/2012_03_04_00_world_creature_template_addon.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Spotlight aura for spotlight NPC -DELETE FROM `creature_template_addon` WHERE `entry`=19913; -INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(19913,0,0,0,0,'39312'); - --- Scriptnames for areatriggers -SET @AT_AREA_52_SOUTHSET := 4472; -SET @AT_AREA_52_NORTHSET := 4466; -SET @AT_AREA_52_WESTSET := 4471; -SET @AT_AREA_52_EASTSET := 4422; -DELETE FROM `areatrigger_scripts` WHERE `entry` IN (@AT_AREA_52_SOUTH,@AT_AREA_52_NORTH,@AT_AREA_52_WEST,@AT_AREA_52_EAST) -INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES -(@AT_AREA_52_SOUTH,"at_area_52_entrance"),(@AT_AREA_52_NORTH,"at_area_52_entrance"),(@AT_AREA_52_WEST,"at_area_52_entrance"),(@AT_AREA_52_EAST,"at_area_52_entrance"); diff --git a/sql/updates/world/2012_03_04_00_world_misc.sql b/sql/updates/world/2012_03_04_00_world_misc.sql new file mode 100644 index 00000000000..af556f648b8 --- /dev/null +++ b/sql/updates/world/2012_03_04_00_world_misc.sql @@ -0,0 +1,13 @@ +-- Spotlight aura for spotlight NPC +DELETE FROM `creature_template_addon` WHERE `entry`=19913; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(19913,0,0,0,0,'39312'); + +-- Scriptnames for areatriggers +SET @AT_AREA_52_SOUTH := 4472; +SET @AT_AREA_52_NORTH := 4466; +SET @AT_AREA_52_WEST := 4471; +SET @AT_AREA_52_EAST := 4422; +DELETE FROM `areatrigger_scripts` WHERE `entry` IN (@AT_AREA_52_SOUTH,@AT_AREA_52_NORTH,@AT_AREA_52_WEST,@AT_AREA_52_EAST); +INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES +(@AT_AREA_52_SOUTH,"at_area_52_entrance"),(@AT_AREA_52_NORTH,"at_area_52_entrance"),(@AT_AREA_52_WEST,"at_area_52_entrance"),(@AT_AREA_52_EAST,"at_area_52_entrance"); -- cgit v1.2.3 From 45ef7dbfcba4625d514f5e4d07e34634f3282292 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 4 Mar 2012 16:44:27 -0330 Subject: Add handling for areatriggers at Area 52 entances. --- .../2012_03_04_01_world_areatrigger_scripts.sql | 7 ++++ src/server/scripts/World/areatrigger_scripts.cpp | 46 +++++++++++++++++----- 2 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql b/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql new file mode 100644 index 00000000000..ae4a0bc1f77 --- /dev/null +++ b/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql @@ -0,0 +1,7 @@ +-- Add Area trigger scripts +DELETE FROM `areatrigger_scripts` WHERE `entry` IN (4422,4466,4471,4472); +INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES +(4422,'at_area_52_entrance'), +(4466,'at_area_52_entrance'), +(4471,'at_area_52_entrance'), +(4472,'at_area_52_entrance'); diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 77f3a64a13f..d8a90b2ffd5 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -427,13 +427,14 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript enum Area52Entrance { - NPC_SPOTLIGHT = 19913, - SUMMON_COOLDOWN = 5, - - AT_AREA_52_SOUTH = 4472, - AT_AREA_52_NORTH = 4466, - AT_AREA_52_WEST = 4471, - AT_AREA_52_EAST = 4422, + SPELL_A52_NEURALYZER = 34400, + NPC_SPOTLIGHT = 19913, + SUMMON_COOLDOWN = 5, + + AT_AREA_52_SOUTH = 4472, + AT_AREA_52_NORTH = 4466, + AT_AREA_52_WEST = 4471, + AT_AREA_52_EAST = 4422, }; class AreaTrigger_at_area_52_entrance : public AreaTriggerScript @@ -446,14 +447,41 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { + float x, y, z; + if (!player->isAlive()) return false; + uint32 triggerId = trigger->id; if (sWorld->GetGameTime() - _triggerTimes[trigger->id] < SUMMON_COOLDOWN) return false; - player->SummonCreature(NPC_SPOTLIGHT, trigger->x, trigger->y, trigger->z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 5000); + switch (triggerId) + { + case AT_AREA_52_EAST: + x = 3044.176f; + y = 3610.692f; + z = 143.61f; + break; + case AT_AREA_52_NORTH: + x = 3114.87f; + y = 3687.619f; + z = 143.62f; + break; + case AT_AREA_52_WEST: + x = 3017.79f; + y = 3746.806f; + z = 144.27f; + break; + case AT_AREA_52_SOUTH: + x = 2950.63f; + y = 3719.905f; + z = 143.33f; + break; + } + player->SummonCreature(NPC_SPOTLIGHT, x, y, z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 5000); + player->AddAura(SPELL_A52_NEURALYZER, player); _triggerTimes[trigger->id] = sWorld->GetGameTime(); return false; } @@ -474,4 +502,4 @@ void AddSC_areatrigger_scripts() new AreaTrigger_at_bring_your_orphan_to(); new AreaTrigger_at_brewfest(); new AreaTrigger_at_area_52_entrance(); -} +} \ No newline at end of file -- cgit v1.2.3 From 96a05600c4eec194d274857547396e3f39c814d7 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Mon, 5 Mar 2012 23:25:32 +0100 Subject: Core/Commands: add command to reload locales_creature_text --- sql/updates/world/2012_03_06_00_world_commands.sql | 3 +++ src/server/scripts/Commands/cs_reload.cpp | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sql/updates/world/2012_03_06_00_world_commands.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_06_00_world_commands.sql b/sql/updates/world/2012_03_06_00_world_commands.sql new file mode 100644 index 00000000000..d782a76c70d --- /dev/null +++ b/sql/updates/world/2012_03_06_00_world_commands.sql @@ -0,0 +1,3 @@ +DELETE FROM `command` WHERE `name` = 'reload locales_creature_text'; +INSERT INTO `command` (`name`, `security`, `help`) VALUES +('reload locales_creature_text', 3, 'Syntax: .reload locales_creature_text\nReload locales_creature_text Table.'); \ No newline at end of file diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 361d329ac6b..b6e15ca25ea 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -106,6 +106,7 @@ public: { "lfg_dungeon_rewards", SEC_ADMINISTRATOR, true, &HandleReloadLfgRewardsCommand, "", NULL }, { "locales_achievement_reward", SEC_ADMINISTRATOR, true, &HandleReloadLocalesAchievementRewardCommand, "", NULL }, { "locales_creature", SEC_ADMINISTRATOR, true, &HandleReloadLocalesCreatureCommand, "", NULL }, + { "locales_creature_text", SEC_ADMINISTRATOR, true, &HandleReloadLocalesCreatureTextCommand, "", NULL }, { "locales_gameobject", SEC_ADMINISTRATOR, true, &HandleReloadLocalesGameobjectCommand, "", NULL }, { "locales_gossip_menu_option", SEC_ADMINISTRATOR, true, &HandleReloadLocalesGossipMenuOptionCommand, "", NULL }, { "locales_item", SEC_ADMINISTRATOR, true, &HandleReloadLocalesItemCommand, "", NULL }, @@ -319,6 +320,7 @@ public: { HandleReloadLocalesAchievementRewardCommand(handler, "a"); HandleReloadLocalesCreatureCommand(handler, "a"); + HandleReloadLocalesCreatureTextCommand(handler, "a"); HandleReloadLocalesGameobjectCommand(handler, "a"); HandleReloadLocalesGossipMenuOptionCommand(handler, "a"); HandleReloadLocalesItemCommand(handler, "a"); @@ -1171,6 +1173,14 @@ public: return true; } + static bool HandleReloadLocalesCreatureTextCommand(ChatHandler* handler, const char* /*args*/) + { + sLog->outString("Re-Loading Locales Creature Texts..."); + sCreatureTextMgr->LoadCreatureTextLocales(); + handler->SendGlobalGMSysMessage("DB table `locales_creature_text` reloaded."); + return true; + } + static bool HandleReloadLocalesGameobjectCommand(ChatHandler* handler, const char* /*args*/) { sLog->outString("Re-Loading Locales Gameobject ... "); -- cgit v1.2.3 From f506674ab85107d5866c2f90111e7bf949233711 Mon Sep 17 00:00:00 2001 From: leak Date: Tue, 6 Mar 2012 20:34:09 +0100 Subject: DB/Schema: Convert all world db tables to use MYISAM storage engine --- sql/updates/world/2012_03_06_01_world_misc.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_03_06_01_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_06_01_world_misc.sql b/sql/updates/world/2012_03_06_01_world_misc.sql new file mode 100644 index 00000000000..20893d03ceb --- /dev/null +++ b/sql/updates/world/2012_03_06_01_world_misc.sql @@ -0,0 +1,5 @@ +ALTER TABLE `warden_checks` ENGINE=MYISAM; +ALTER TABLE `achievement_dbc` ENGINE=MYISAM; +ALTER TABLE `character_queststatus_seasonal` ENGINE=MYISAM; +ALTER TABLE `creature_text` ENGINE=MYISAM; +ALTER TABLE `game_event_seasonal_questrelation` ENGINE=MYISAM; -- cgit v1.2.3 From 1b34965808fe394cf6535c64876068921f3a9726 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 6 Mar 2012 21:22:47 +0000 Subject: DB/World: Remove character_queststatus_seasonal from the world database (if it exists) --- sql/updates/world/2012_02_27_00_world_creature_template.sql | 8 ++++++++ sql/updates/world/2012_02_27_world_creature_template.sql | 8 -------- sql/updates/world/2012_03_06_01_world_misc.sql | 1 - sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql | 1 + 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2012_02_27_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_02_27_world_creature_template.sql create mode 100644 sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_27_00_world_creature_template.sql b/sql/updates/world/2012_02_27_00_world_creature_template.sql new file mode 100644 index 00000000000..b8936774e36 --- /dev/null +++ b/sql/updates/world/2012_02_27_00_world_creature_template.sql @@ -0,0 +1,8 @@ +-- Update gold drops in ICC bosses based on old.wowhead.com data +UPDATE `creature_template` SET `mingold`=250000,`maxgold`=300000 WHERE `entry` IN(36612,37957,37958,37959); -- Lord Marrowgar +UPDATE `creature_template` SET `mingold`=175000,`maxgold`=225000 WHERE `entry` IN (36626,37504,37505,37506); -- Festergut +UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36627,38390,38549,38550); -- Rotface +UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36678,38431,38585,38586); -- Professor Putricide +UPDATE `creature_template` SET `mingold`=300000,`maxgold`=350000 WHERE `entry` IN (37955,38434,38435,38436); -- Blood-Queen Lana'thel +UPDATE `creature_template` SET `mingold`=1330000,`maxgold`=1400000 WHERE `entry` IN (36853,38265,38266,38267); -- Sindragosa +UPDATE `creature_template` SET `mingold`=1300000,`maxgold`=1500000 WHERE `entry` IN (36597,39166,39167,39168); -- The Lich King diff --git a/sql/updates/world/2012_02_27_world_creature_template.sql b/sql/updates/world/2012_02_27_world_creature_template.sql deleted file mode 100644 index b8936774e36..00000000000 --- a/sql/updates/world/2012_02_27_world_creature_template.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Update gold drops in ICC bosses based on old.wowhead.com data -UPDATE `creature_template` SET `mingold`=250000,`maxgold`=300000 WHERE `entry` IN(36612,37957,37958,37959); -- Lord Marrowgar -UPDATE `creature_template` SET `mingold`=175000,`maxgold`=225000 WHERE `entry` IN (36626,37504,37505,37506); -- Festergut -UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36627,38390,38549,38550); -- Rotface -UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36678,38431,38585,38586); -- Professor Putricide -UPDATE `creature_template` SET `mingold`=300000,`maxgold`=350000 WHERE `entry` IN (37955,38434,38435,38436); -- Blood-Queen Lana'thel -UPDATE `creature_template` SET `mingold`=1330000,`maxgold`=1400000 WHERE `entry` IN (36853,38265,38266,38267); -- Sindragosa -UPDATE `creature_template` SET `mingold`=1300000,`maxgold`=1500000 WHERE `entry` IN (36597,39166,39167,39168); -- The Lich King diff --git a/sql/updates/world/2012_03_06_01_world_misc.sql b/sql/updates/world/2012_03_06_01_world_misc.sql index 20893d03ceb..7eb208a9673 100644 --- a/sql/updates/world/2012_03_06_01_world_misc.sql +++ b/sql/updates/world/2012_03_06_01_world_misc.sql @@ -1,5 +1,4 @@ ALTER TABLE `warden_checks` ENGINE=MYISAM; ALTER TABLE `achievement_dbc` ENGINE=MYISAM; -ALTER TABLE `character_queststatus_seasonal` ENGINE=MYISAM; ALTER TABLE `creature_text` ENGINE=MYISAM; ALTER TABLE `game_event_seasonal_questrelation` ENGINE=MYISAM; diff --git a/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql b/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql new file mode 100644 index 00000000000..0efbb6609cf --- /dev/null +++ b/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS `character_queststatus_seasonal`; -- cgit v1.2.3 From 0e18d64050270be1f2283892371ecc50a0909539 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 6 Mar 2012 20:55:17 -0330 Subject: DB/SAI: SAI for Elrodan & Aurosalia text --- sql/updates/world/2012_03_06_03_world_smart_scripts.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2012_03_06_03_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_06_03_world_smart_scripts.sql b/sql/updates/world/2012_03_06_03_world_smart_scripts.sql new file mode 100644 index 00000000000..cb2468c4d5c --- /dev/null +++ b/sql/updates/world/2012_03_06_03_world_smart_scripts.sql @@ -0,0 +1,17 @@ +-- SAI for Elrodan +SET @ENTRY=18743; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,1,0,100,0,5000,8000,15000,25000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Elrodan - OOC - run script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,11,18744,20,0,0,0,0,0,'Elrodan - Script - Aurosalia say random'), +(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,3000,3000,11,32826,0,0,0,0,0,1,0,0,0,0,0,0,0,'Elrodan - Script - cast Polymorph Cast Visual'); +-- Aurosalia fix model +UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid`=18145; +-- Aurosalia text +DELETE FROM `creature_text` WHERE `entry`=18744; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(18744,0,0, 'Stop!',1,0,100,5,0,0, 'Aurosalia'), +(18744,0,1, 'Will you stop--',1,0,100,274,0,0, 'Aurosalia'), +(18744,0,2, '',1,0,100,6,0,0, 'Aurosalia'); -- cgit v1.2.3 From 9f93681625f16b4a118df755eccb8ac80f713c16 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 6 Mar 2012 21:02:16 -0330 Subject: DB/text: Fixed text from last commit :) --- sql/updates/world/2012_03_06_04_world_creature_text.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_03_06_04_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_06_04_world_creature_text.sql b/sql/updates/world/2012_03_06_04_world_creature_text.sql new file mode 100644 index 00000000000..f49599e1ba0 --- /dev/null +++ b/sql/updates/world/2012_03_06_04_world_creature_text.sql @@ -0,0 +1,6 @@ +-- Aurosalia text +DELETE FROM `creature_text` WHERE `entry`=18744; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(18744,0,0, 'Stop!',12,1,100,5,0,0, 'Aurosalia'), +(18744,0,1, 'Will you stop--',12,1,100,6,0,0, 'Aurosalia'), +(18744,0,2, '',12,1,100,274,0,0, 'Aurosalia'); -- cgit v1.2.3 From e5d23103f37c40d2e946fa0e2db66d2f527ad9af Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 7 Mar 2012 13:09:35 +0100 Subject: Core/Maps * Corrected liquid type extraction in maps - MCLQ chunk must be parsed together with MH2O (they stack) * Fixed liquid detection in WMO objects * Implemented LiquidType.dbc use, players will now get proper auras in special liquids * Turned off slime damage by default (Naxxramas uses periodic damage aura for this purpose) * Implemented liquid type overrides basing on area/zone * Renamed final temp_gameobject_models to GameObjectModels.dtree (the temporary one produced by vmap extractor remains unaffected) Note: Map and Vmap re-extraction is required --- .../world/2012_03_07_00_world_trinity_string.sql | 3 + src/server/collision/Management/VMapManager2.cpp | 2 +- src/server/collision/Maps/TileAssembler.cpp | 2 +- src/server/collision/Models/WorldModel.cpp | 3 +- src/server/collision/VMapDefinitions.h | 6 +- src/server/game/DataStores/DBCStores.cpp | 3 +- src/server/game/DataStores/DBCStores.h | 2 +- src/server/game/DataStores/DBCStructure.h | 42 ++--- src/server/game/DataStores/DBCfmt.h | 4 +- src/server/game/Entities/Player/Player.cpp | 48 ++++-- src/server/game/Entities/Player/Player.h | 1 + src/server/game/Maps/Map.cpp | 123 +++++++++++---- src/server/game/Maps/Map.h | 6 +- src/server/scripts/Commands/cs_gps.cpp | 2 +- src/tools/map_extractor/System.cpp | 173 +++++++++++---------- src/tools/vmap4_extractor/vmapexport.cpp | 2 +- src/tools/vmap4_extractor/wmo.cpp | 48 +++++- 17 files changed, 310 insertions(+), 160 deletions(-) create mode 100644 sql/updates/world/2012_03_07_00_world_trinity_string.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_07_00_world_trinity_string.sql b/sql/updates/world/2012_03_07_00_world_trinity_string.sql new file mode 100644 index 00000000000..96344520236 --- /dev/null +++ b/sql/updates/world/2012_03_07_00_world_trinity_string.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry`=175; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.'); \ No newline at end of file diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 62abc31831a..6139a27fb52 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -233,7 +233,7 @@ namespace VMAP { floor = info.ground_Z; ASSERT(floor < std::numeric_limits::max()); - type = info.hitModel->GetLiquidType(); + type = info.hitModel->GetLiquidType(); // entry from LiquidType.dbc if (reqLiquidType && !(type & reqLiquidType)) return false; if (info.hitInstance->GetLiquidLevel(pos, info, level)) diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index 68ea3ec80cd..e7693a70de4 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -335,7 +335,7 @@ namespace VMAP void TileAssembler::exportGameobjectModels() { - FILE* model_list = fopen((iSrcDir + "/" + GAMEOBJECT_MODELS).c_str(), "rb"); + FILE* model_list = fopen((iSrcDir + "/" + "temp_gameobject_models").c_str(), "rb"); FILE* model_list_copy = fopen((iDestDir + "/" + GAMEOBJECT_MODELS).c_str(), "wb"); if (!model_list || !model_list_copy) return; diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index d4b08dde5dd..b818232fb32 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -392,9 +392,8 @@ namespace VMAP uint32 GroupModel::GetLiquidType() const { - // convert to type mask, matching MAP_LIQUID_TYPE_* defines in Map.h if (iLiquid) - return (1 << iLiquid->GetType()); + return iLiquid->GetType(); return 0; } diff --git a/src/server/collision/VMapDefinitions.h b/src/server/collision/VMapDefinitions.h index 72a62807b4c..cc796d96dd5 100644 --- a/src/server/collision/VMapDefinitions.h +++ b/src/server/collision/VMapDefinitions.h @@ -24,9 +24,9 @@ namespace VMAP { - const char VMAP_MAGIC[] = "VMAP_4.0"; - const char RAW_VMAP_MAGIC[] = "VMAP004"; // used in extracted vmap files with raw data - const char GAMEOBJECT_MODELS[] = "temp_gameobject_models"; + const char VMAP_MAGIC[] = "VMAP_4.1"; + const char RAW_VMAP_MAGIC[] = "VMAP041"; // used in extracted vmap files with raw data + const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree"; // defined in TileAssembler.cpp currently... bool readChunk(FILE* rf, char *dest, const char *compare, uint32 len); diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index b6c18103f1e..4fa8e09cead 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -119,7 +119,7 @@ DBCStorage sItemRandomSuffixStore(ItemRandomSuffixfmt); DBCStorage sItemSetStore(ItemSetEntryfmt); DBCStorage sLFGDungeonStore(LFGDungeonEntryfmt); -//DBCStorage sLiquidTypeStore(LiquidTypeEntryfmt); +DBCStorage sLiquidTypeStore(LiquidTypefmt); DBCStorage sLockStore(LockEntryfmt); DBCStorage sMailTemplateStore(MailTemplateEntryfmt); @@ -357,6 +357,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sItemSetStore, dbcPath, "ItemSet.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sLFGDungeonStore, dbcPath, "LFGDungeons.dbc"); + LoadDBC(availableDbcLocales, bad_dbc_files, sLiquidTypeStore, dbcPath, "LiquidType.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sLockStore, dbcPath, "Lock.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sMailTemplateStore, dbcPath, "MailTemplate.dbc"); diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h index 58c85adc11b..0bbf06c5311 100755 --- a/src/server/game/DataStores/DBCStores.h +++ b/src/server/game/DataStores/DBCStores.h @@ -119,7 +119,7 @@ extern DBCStorage sItemRandomPropertiesStore; extern DBCStorage sItemRandomSuffixStore; extern DBCStorage sItemSetStore; extern DBCStorage sLFGDungeonStore; -//extern DBCStorage sLiquidTypeStore; +extern DBCStorage sLiquidTypeStore; extern DBCStorage sLockStore; extern DBCStorage sMailTemplateStore; extern DBCStorage sMapStore; diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 0d721e3f832..1e52866539a 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -527,6 +527,7 @@ struct AreaTableEntry char* area_name[16]; // 11-26 // 27, string flags, unused uint32 team; // 28 + uint32 LiquidTypeOverride[4]; // 29-32 liquid override by type // helpers bool IsSanctuary() const @@ -1214,30 +1215,29 @@ struct LFGDungeonEntry uint32 Entry() const { return ID + (type << 24); } }; -/* + struct LiquidTypeEntry { - uint32 ID; // 0 - char* name; // 1 - uint32 flags; // 2 Water: 1|2|4|8, Magma: 8|16|32|64, Slime: 2|64|256, WMO Ocean: 1|2|4|8|512 - uint32 type; // 3 0: Water, 1: Ocean, 2: Magma, 3: Slime - uint32 soundid; // 4 Reference to SoundEntries.dbc - uint32 spellID; // 5 Reference to Spell.dbc - float maxDarkenDepth // 6 Only Slime (6) and Magma (7) - float fogDarkenIntensity // 7 Only oceans got values here! - float ambDarkenIntensity // 8 Only oceans got values here! - float dirDarkenIntensity // 9 Only oceans got values here! - uint32 lightID // 10 Only Slime (6) and Magma (7) - float particleScale // 11 0: Slime, 1: Water/Ocean, 4: Magma - uint32 particleMovement // 12 - uint32 particleTexSlots // 13 - uint32 LiquidMaterialID // 14 Reference to LiquidMaterial.dbc - char* texture[6]; // 15-20 - uint32 color[2] // 21-22 - float floats[18]; // 23-40 Most likely these are attributes for the shaders. Water: (23, TextureTilesPerBlock),(24, Rotation) Magma: (23, AnimationX),(24, AnimationY) - uint32 ints[4] // 41-44 + uint32 Id; + //char* Name; + //uint32 Flags; + uint32 Type; + //uint32 SoundId; + uint32 SpellId; + //float MaxDarkenDepth; + //float FogDarkenIntensity; + //float AmbDarkenIntensity; + //float DirDarkenIntensity; + //uint32 LightID; + //float ParticleScale; + //uint32 ParticleMovement; + //uint32 ParticleTexSlots; + //uint32 LiquidMaterialID; + //char* Texture[6]; + //uint32 Color[2]; + //float Unk1[18]; + //uint32 Unk2[4]; }; -*/ #define MAX_LOCK_CASE 8 diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 54be02a619e..ce887cac09b 100755 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -23,7 +23,7 @@ const char Achievementfmt[]="niixssssssssssssssssxxxxxxxxxxxxxxxxxxiixixxxxxxxxx const std::string CustomAchievementfmt="pppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapapaaaaaaaaaaaaaaaaaapp"; const std::string CustomAchievementIndex = "ID"; const char AchievementCriteriafmt[]="niiiiiiiixxxxxxxxxxxxxxxxxiiiix"; -const char AreaTableEntryfmt[]="iiinixxxxxissssssssssssssssxixxxxxxx"; +const char AreaTableEntryfmt[]="iiinixxxxxissssssssssssssssxiiiiixxx"; const char AreaGroupEntryfmt[]="niiiiiii"; const char AreaPOIEntryfmt[]="niiiiiiiiiiifffixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxix"; const char AreaTriggerEntryfmt[]="niffffffff"; @@ -78,7 +78,7 @@ const char ItemRandomPropertiesfmt[]="nxiiixxssssssssssssssssx"; const char ItemRandomSuffixfmt[]="nssssssssssssssssxxiiixxiiixx"; const char ItemSetEntryfmt[]="dssssssssssssssssxiiiiiiiiiixxxxxxxiiiiiiiiiiiiiiiiii"; const char LFGDungeonEntryfmt[]="nxxxxxxxxxxxxxxxxxiiiiiiixixxixixxxxxxxxxxxxxxxxx"; -//const char LiquidTypeEntryfmt[]="nsiiiiffffifiiisssssiiffffffffffffffffffiiii"; +const char LiquidTypefmt[]="nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; const char LockEntryfmt[]="niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx"; const char MailTemplateEntryfmt[]="nxxxxxxxxxxxxxxxxxssssssssssssssssx"; const char MapEntryfmt[]="nxixxssssssssssssssssxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixiffxiix"; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 870b6f683b8..729a2fe0b00 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -724,6 +724,7 @@ Player::Player(WorldSession* session): Unit(true), m_achievementMgr(this), m_rep for (uint8 i=0; iSpellId)) { // Breath timer not activated - activate it if (m_MirrorTimer[FIRE_TIMER] == DISABLED_MIRROR_TIMER) m_MirrorTimer[FIRE_TIMER] = getMaxTimer(FIRE_TIMER); else { - m_MirrorTimer[FIRE_TIMER]-=time_diff; + m_MirrorTimer[FIRE_TIMER] -= time_diff; if (m_MirrorTimer[FIRE_TIMER] < 0) { m_MirrorTimer[FIRE_TIMER]+= 1*IN_MILLISECONDS; @@ -1434,8 +1435,8 @@ void Player::HandleDrowning(uint32 time_diff) EnvironmentalDamage(DAMAGE_LAVA, damage); // need to skip Slime damage in Undercity, // maybe someone can find better way to handle environmental damage - else if (m_zoneUpdateId != 1497) - EnvironmentalDamage(DAMAGE_SLIME, damage); + //else if (m_zoneUpdateId != 1497) + // EnvironmentalDamage(DAMAGE_SLIME, damage); } } } @@ -23059,15 +23060,34 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z) ZLiquidStatus res = m->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &liquid_status); if (!res) { - m_MirrorTimerFlags &= ~(UNDERWATER_INWATER|UNDERWATER_INLAVA|UNDERWATER_INSLIME|UNDERWARER_INDARKWATER); - // Small hack for enable breath in WMO - /* if (IsInWater()) - m_MirrorTimerFlags|=UNDERWATER_INWATER; */ + m_MirrorTimerFlags &= ~(UNDERWATER_INWATER | UNDERWATER_INLAVA | UNDERWATER_INSLIME | UNDERWARER_INDARKWATER); + if (_lastLiquid && _lastLiquid->SpellId) + RemoveAurasDueToSpell(_lastLiquid->SpellId); + + _lastLiquid = NULL; return; } + if (uint32 liqEntry = liquid_status.entry) + { + LiquidTypeEntry const* liquid = sLiquidTypeStore.LookupEntry(liqEntry); + if (_lastLiquid && _lastLiquid->SpellId && _lastLiquid->Id != liqEntry) + RemoveAurasDueToSpell(_lastLiquid->SpellId); + + if (liquid && liquid->SpellId) + AddAura(liquid->SpellId, this); + + _lastLiquid = liquid; + } + else if (_lastLiquid && _lastLiquid->SpellId) + { + RemoveAurasDueToSpell(_lastLiquid->SpellId); + _lastLiquid = NULL; + } + + // All liquids type - check under water position - if (liquid_status.type&(MAP_LIQUID_TYPE_WATER|MAP_LIQUID_TYPE_OCEAN|MAP_LIQUID_TYPE_MAGMA|MAP_LIQUID_TYPE_SLIME)) + if (liquid_status.type_flags & (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME)) { if (res & LIQUID_MAP_UNDER_WATER) m_MirrorTimerFlags |= UNDERWATER_INWATER; @@ -23076,23 +23096,23 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z) } // Allow travel in dark water on taxi or transport - if ((liquid_status.type & MAP_LIQUID_TYPE_DARK_WATER) && !isInFlight() && !GetTransport()) + if ((liquid_status.type_flags & MAP_LIQUID_TYPE_DARK_WATER) && !isInFlight() && !GetTransport()) m_MirrorTimerFlags |= UNDERWARER_INDARKWATER; else m_MirrorTimerFlags &= ~UNDERWARER_INDARKWATER; // in lava check, anywhere in lava level - if (liquid_status.type&MAP_LIQUID_TYPE_MAGMA) + if (liquid_status.type_flags & MAP_LIQUID_TYPE_MAGMA) { - if (res & (LIQUID_MAP_UNDER_WATER|LIQUID_MAP_IN_WATER|LIQUID_MAP_WATER_WALK)) + if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER | LIQUID_MAP_WATER_WALK)) m_MirrorTimerFlags |= UNDERWATER_INLAVA; else m_MirrorTimerFlags &= ~UNDERWATER_INLAVA; } // in slime check, anywhere in slime level - if (liquid_status.type&MAP_LIQUID_TYPE_SLIME) + if (liquid_status.type_flags & MAP_LIQUID_TYPE_SLIME) { - if (res & (LIQUID_MAP_UNDER_WATER|LIQUID_MAP_IN_WATER|LIQUID_MAP_WATER_WALK)) + if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER | LIQUID_MAP_WATER_WALK)) m_MirrorTimerFlags |= UNDERWATER_INSLIME; else m_MirrorTimerFlags &= ~UNDERWATER_INSLIME; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 3d510148aa4..362fd8a9016 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2813,6 +2813,7 @@ class Player : public Unit, public GridObject uint32 m_lastFallTime; float m_lastFallZ; + LiquidTypeEntry const* _lastLiquid; int32 m_MirrorTimer[MAX_TIMERS]; uint8 m_MirrorTimerFlags; uint8 m_MirrorTimerFlagsLast; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 00b52bf746b..7f27a474534 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -41,7 +41,7 @@ union u_map_magic }; u_map_magic MapMagic = { {'M','A','P','S'} }; -u_map_magic MapVersionMagic = { {'v','1','.','1'} }; +u_map_magic MapVersionMagic = { {'v','1','.','2'} }; u_map_magic MapAreaMagic = { {'A','R','E','A'} }; u_map_magic MapHeightMagic = { {'M','H','G','T'} }; u_map_magic MapLiquidMagic = { {'M','L','I','Q'} }; @@ -1044,7 +1044,8 @@ GridMap::GridMap() _liquidWidth = 0; _liquidHeight = 0; _liquidLevel = INVALID_HEIGHT; - _liquidData = NULL; + _liquidEntry = NULL; + _liquidFlags = NULL; _liquidMap = NULL; } @@ -1106,12 +1107,14 @@ void GridMap::unloadData() delete[] _areaMap; delete[] m_V9; delete[] m_V8; - delete[] _liquidData; + delete[] _liquidEntry; + delete[] _liquidFlags; delete[] _liquidMap; _areaMap = NULL; m_V9 = NULL; m_V8 = NULL; - _liquidData = NULL; + _liquidEntry = NULL; + _liquidFlags = NULL; _liquidMap = NULL; _gridGetHeight = &GridMap::getHeightFromFlat; } @@ -1192,18 +1195,22 @@ bool GridMap::loadLiquidData(FILE* in, uint32 offset, uint32 /*size*/) _liquidOffX = header.offsetX; _liquidOffY = header.offsetY; _liquidWidth = header.width; - _liquidHeight= header.height; + _liquidHeight = header.height; _liquidLevel = header.liquidLevel; if (!(header.flags & MAP_LIQUID_NO_TYPE)) { - _liquidData = new uint8 [16*16]; - if (fread(_liquidData, sizeof(uint8), 16*16, in) != 16*16) + _liquidEntry = new uint16[16*16]; + if (fread(_liquidEntry, sizeof(uint16), 16*16, in) != 16*16) + return false; + + _liquidFlags = new uint8[16*16]; + if (fread(_liquidFlags, sizeof(uint8), 16*16, in) != 16*16) return false; } if (!(header.flags & MAP_LIQUID_NO_HEIGHT)) { - _liquidMap = new float [_liquidWidth*_liquidHeight]; + _liquidMap = new float[_liquidWidth*_liquidHeight]; if (fread(_liquidMap, sizeof(float), _liquidWidth*_liquidHeight, in) != _liquidWidth*_liquidHeight) return false; } @@ -1462,23 +1469,24 @@ float GridMap::getLiquidLevel(float x, float y) return _liquidMap[cx_int*_liquidWidth + cy_int]; } +// Why does this return LIQUID data? uint8 GridMap::getTerrainType(float x, float y) { - if (!_liquidData) + if (!_liquidFlags) return 0; x = 16 * (32 - x/SIZE_OF_GRIDS); y = 16 * (32 - y/SIZE_OF_GRIDS); int lx = (int)x & 15; int ly = (int)y & 15; - return _liquidData[lx*16 + ly]; + return _liquidFlags[lx*16 + ly]; } // Get water state on map inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, LiquidData* data) { // Check water type (if no water return) - if (!_liquidType && !_liquidData) + if (!_liquidType && !_liquidFlags) return LIQUID_MAP_NO_WATER; // Get cell @@ -1489,7 +1497,37 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R int y_int = (int)cy & (MAP_RESOLUTION-1); // Check water type in cell - uint8 type = _liquidData ? _liquidData[(x_int>>3)*16 + (y_int>>3)] : _liquidType; + int idx=(x_int>>3)*16 + (y_int>>3); + uint8 type = _liquidFlags ? _liquidFlags[idx] : _liquidType; + uint32 entry = 0; + if (_liquidEntry) + { + if (LiquidTypeEntry const* liquidEntry = sLiquidTypeStore.LookupEntry(_liquidEntry[idx])) + { + entry = liquidEntry->Id; + type &= MAP_LIQUID_TYPE_DARK_WATER; + uint32 liqTypeIdx = liquidEntry->Type; + if (entry < 21) + { + if (AreaTableEntry const* area = GetAreaEntryByAreaFlagAndMap(getArea(x, y), MAPID_INVALID)) + { + uint32 overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type]; + if (!overrideLiquid && area->zone) + if (area = GetAreaEntryByAreaID(area->zone)) + overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type]; + + if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid)) + { + entry = overrideLiquid; + liqTypeIdx = liq->Type; + } + } + } + + type |= 1 << liqTypeIdx; + } + } + if (type == 0) return LIQUID_MAP_NO_WATER; @@ -1518,20 +1556,20 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R // All ok in water -> store data if (data) { - data->type = type; + data->entry = entry; + data->type_flags = type; data->level = liquid_level; data->depth_level = ground_level; } // For speed check as int values - int delta = int((liquid_level - z) * 10); + float delta = liquid_level - z; - // Get position delta - if (delta > 20) // Under water + if (delta > 2.0f) // Under water return LIQUID_MAP_UNDER_WATER; - if (delta > 0) // In water + if (delta > 0.0f) // In water return LIQUID_MAP_IN_WATER; - if (delta > -1) // Walk on water + if (delta > -0.1f) // Walk on water return LIQUID_MAP_WATER_WALK; // Above water return LIQUID_MAP_ABOVE_WATER; @@ -1722,8 +1760,9 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp { ZLiquidStatus result = LIQUID_MAP_NO_WATER; VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager(); - float liquid_level, ground_level = INVALID_HEIGHT; - uint32 liquid_type; + float liquid_level = INVALID_HEIGHT; + float ground_level = INVALID_HEIGHT; + uint32 liquid_type = 0; if (vmgr->GetLiquidLevel(GetId(), x, y, z, ReqLiquidType, liquid_level, ground_level, liquid_type)) { sLog->outDebug(LOG_FILTER_MAPS, "getLiquidStatus(): vmap liquid level: %f ground: %f type: %u", liquid_level, ground_level, liquid_type); @@ -1733,20 +1772,46 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp // All ok in water -> store data if (data) { - data->type = liquid_type; + // hardcoded in client like this + if (GetId() == 530 && liquid_type == 2) + liquid_type = 15; + + uint32 liquidFlagType = 0; + if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(liquid_type)) + liquidFlagType = liq->Type; + + if (liquid_type && liquid_type < 21) + { + if (AreaTableEntry const* area = GetAreaEntryByAreaFlagAndMap(GetAreaFlag(x, y, z), GetId())) + { + uint32 overrideLiquid = area->LiquidTypeOverride[liquidFlagType]; + if (!overrideLiquid && area->zone) + if (area = GetAreaEntryByAreaID(area->zone)) + overrideLiquid = area->LiquidTypeOverride[liquidFlagType]; + + if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid)) + { + liquid_type = overrideLiquid; + liquidFlagType = liq->Type; + } + } + } + data->level = liquid_level; data->depth_level = ground_level; + + data->entry = liquid_type; + data->type_flags = 1 << liquidFlagType; } - // For speed check as int values - int delta = int((liquid_level - z) * 10); + float delta = liquid_level - z; // Get position delta - if (delta > 20) // Under water + if (delta > 2.0f) // Under water return LIQUID_MAP_UNDER_WATER; - if (delta > 0 ) // In water + if (delta > 0.0f) // In water return LIQUID_MAP_IN_WATER; - if (delta > -1) // Walk on water + if (delta > -0.1f) // Walk on water return LIQUID_MAP_WATER_WALK; result = LIQUID_MAP_ABOVE_WATER; } @@ -1760,7 +1825,13 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp if (map_result != LIQUID_MAP_NO_WATER && (map_data.level > ground_level)) { if (data) + { + // hardcoded in client like this + if (GetId() == 530 && map_data.entry == 2) + map_data.entry = 15; + *data = map_data; + } return map_result; } } diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index d8db4c947a3..d0f99610262 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -136,7 +136,8 @@ enum ZLiquidStatus struct LiquidData { - uint32 type; + uint32 type_flags; + uint32 entry; float level; float depth_level; }; @@ -163,7 +164,8 @@ class GridMap // Liquid data float _liquidLevel; - uint8* _liquidData; + uint16* _liquidEntry; + uint8* _liquidFlags; float* _liquidMap; uint16 _gridArea; uint16 _liquidType; diff --git a/src/server/scripts/Commands/cs_gps.cpp b/src/server/scripts/Commands/cs_gps.cpp index 589ed4af3b8..59e2ec90905 100644 --- a/src/server/scripts/Commands/cs_gps.cpp +++ b/src/server/scripts/Commands/cs_gps.cpp @@ -122,7 +122,7 @@ public: ZLiquidStatus status = map->getLiquidStatus(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), MAP_ALL_LIQUIDS, &liquidStatus); if (status) - handler->PSendSysMessage(LANG_LIQUID_STATUS, liquidStatus.level, liquidStatus.depth_level, liquidStatus.type, status); + handler->PSendSysMessage(LANG_LIQUID_STATUS, liquidStatus.level, liquidStatus.depth_level, liquidStatus.entry, liquidStatus.type_flags, status); return true; } diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 335fd924be8..bbde9f4675e 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -276,7 +276,7 @@ void ReadLiquidTypeTableDBC() // Map file format data static char const* MAP_MAGIC = "MAPS"; -static char const* MAP_VERSION_MAGIC = "v1.1"; +static char const* MAP_VERSION_MAGIC = "v1.2"; static char const* MAP_AREA_MAGIC = "AREA"; static char const* MAP_HEIGHT_MAGIC = "MHGT"; static char const* MAP_LIQUID_MAGIC = "MLIQ"; @@ -359,7 +359,8 @@ uint16 uint16_V9[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1]; uint8 uint8_V8[ADT_GRID_SIZE][ADT_GRID_SIZE]; uint8 uint8_V9[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1]; -uint8 liquid_type[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID]; +uint16 liquid_entry[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID]; +uint8 liquid_flags[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID]; bool liquid_show[ADT_GRID_SIZE][ADT_GRID_SIZE]; float liquid_height[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1]; @@ -378,7 +379,8 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 } memset(liquid_show, 0, sizeof(liquid_show)); - memset(liquid_type, 0, sizeof(liquid_type)); + memset(liquid_flags, 0, sizeof(liquid_flags)); + memset(liquid_entry, 0, sizeof(liquid_entry)); // Prepare map header map_fileheader map; @@ -612,13 +614,75 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 map.heightMapSize+= sizeof(V9) + sizeof(V8); } + // Get from MCLQ chunk (old) + for (int i = 0; i < ADT_CELLS_PER_GRID; i++) + { + for(int j = 0; j < ADT_CELLS_PER_GRID; j++) + { + adt_MCNK *cell = cells->getMCNK(i, j); + if (!cell) + continue; + + adt_MCLQ *liquid = cell->getMCLQ(); + int count = 0; + if (!liquid || cell->sizeMCLQ <= 8) + continue; + + for (int y = 0; y < ADT_CELL_SIZE; y++) + { + int cy = i * ADT_CELL_SIZE + y; + for (int x = 0; x < ADT_CELL_SIZE; x++) + { + int cx = j * ADT_CELL_SIZE + x; + if (liquid->flags[y][x] != 0x0F) + { + liquid_show[cy][cx] = true; + if (liquid->flags[y][x] & (1<<7)) + liquid_flags[i][j] |= MAP_LIQUID_TYPE_DARK_WATER; + ++count; + } + } + } + + uint32 c_flag = cell->flags; + if (c_flag & (1<<2)) + { + liquid_entry[i][j] = 1; + liquid_flags[i][j] |= MAP_LIQUID_TYPE_WATER; // water + } + if (c_flag & (1<<3)) + { + liquid_entry[i][j] = 2; + liquid_flags[i][j] |= MAP_LIQUID_TYPE_OCEAN; // ocean + } + if (c_flag & (1<<4)) + { + liquid_entry[i][j] = 3; + liquid_flags[i][j] |= MAP_LIQUID_TYPE_MAGMA; // magma/slime + } + + if (!count && liquid_flags[i][j]) + fprintf(stderr, "Wrong liquid detect in MCLQ chunk"); + + for (int y = 0; y <= ADT_CELL_SIZE; y++) + { + int cy = i * ADT_CELL_SIZE + y; + for (int x = 0; x <= ADT_CELL_SIZE; x++) + { + int cx = j * ADT_CELL_SIZE + x; + liquid_height[cy][cx] = liquid->liquid[y][x].height; + } + } + } + } + // Get liquid map for grid (in WOTLK used MH2O chunk) adt_MH2O * h2o = adt.a_grid->getMH2O(); if (h2o) { - for (int i=0;igetLiquidData(i,j); if (!h) @@ -626,41 +690,41 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 int count = 0; uint64 show = h2o->getLiquidShowMap(h); - for (int y=0; y < h->height;y++) + for (int y = 0; y < h->height; y++) { - int cy = i*ADT_CELL_SIZE + y + h->yOffset; - for (int x=0; x < h->width; x++) + int cy = i * ADT_CELL_SIZE + y + h->yOffset; + for (int x = 0; x < h->width; x++) { - int cx = j*ADT_CELL_SIZE + x + h->xOffset; + int cx = j * ADT_CELL_SIZE + x + h->xOffset; if (show & 1) { liquid_show[cy][cx] = true; ++count; } - show>>=1; + show >>= 1; } } - uint32 type = LiqType[h->liquidType]; - switch (type) + liquid_entry[i][j] = h->liquidType; + switch (LiqType[h->liquidType]) { - case LIQUID_TYPE_WATER: liquid_type[i][j] |= MAP_LIQUID_TYPE_WATER; break; - case LIQUID_TYPE_OCEAN: liquid_type[i][j] |= MAP_LIQUID_TYPE_OCEAN; break; - case LIQUID_TYPE_MAGMA: liquid_type[i][j] |= MAP_LIQUID_TYPE_MAGMA; break; - case LIQUID_TYPE_SLIME: liquid_type[i][j] |= MAP_LIQUID_TYPE_SLIME; break; + case LIQUID_TYPE_WATER: liquid_flags[i][j] |= MAP_LIQUID_TYPE_WATER; break; + case LIQUID_TYPE_OCEAN: liquid_flags[i][j] |= MAP_LIQUID_TYPE_OCEAN; break; + case LIQUID_TYPE_MAGMA: liquid_flags[i][j] |= MAP_LIQUID_TYPE_MAGMA; break; + case LIQUID_TYPE_SLIME: liquid_flags[i][j] |= MAP_LIQUID_TYPE_SLIME; break; default: printf("\nCan't find Liquid type %u for map %s\nchunk %d,%d\n", h->liquidType, filename, i, j); break; } // Dark water detect - if (type == LIQUID_TYPE_OCEAN) + if (LiqType[h->liquidType] == LIQUID_TYPE_OCEAN) { uint8 *lm = h2o->getLiquidLightMap(h); if (!lm) - liquid_type[i][j]|=MAP_LIQUID_TYPE_DARK_WATER; + liquid_flags[i][j] |= MAP_LIQUID_TYPE_DARK_WATER; } - if (!count && liquid_type[i][j]) + if (!count && liquid_flags[i][j]) printf("Wrong liquid detect in MH2O chunk"); float *height = h2o->getLiquidHeightMap(h); @@ -681,72 +745,16 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 } } } - else - { - // Get from MCLQ chunk (old) - for (int i=0;igetMCNK(i, j); - if (!cell) - continue; - - adt_MCLQ *liquid = cell->getMCLQ(); - int count = 0; - if (!liquid || cell->sizeMCLQ <= 8) - continue; - - for (int y=0; y < ADT_CELL_SIZE; y++) - { - int cy = i*ADT_CELL_SIZE + y; - for (int x=0; x < ADT_CELL_SIZE; x++) - { - int cx = j*ADT_CELL_SIZE + x; - if (liquid->flags[y][x] != 0x0F) - { - liquid_show[cy][cx] = true; - if (liquid->flags[y][x]&(1<<7)) - liquid_type[i][j]|=MAP_LIQUID_TYPE_DARK_WATER; - ++count; - } - } - } - - uint32 c_flag = cell->flags; - if(c_flag & (1<<2)) - liquid_type[i][j]|=MAP_LIQUID_TYPE_WATER; // water - if(c_flag & (1<<3)) - liquid_type[i][j]|=MAP_LIQUID_TYPE_OCEAN; // ochean - if(c_flag & (1<<4)) - liquid_type[i][j]|=MAP_LIQUID_TYPE_MAGMA; // magma/slime - - if (!count && liquid_type[i][j]) - printf("Wrong liquid detect in MCLQ chunk"); - - for (int y=0; y <= ADT_CELL_SIZE; y++) - { - int cy = i*ADT_CELL_SIZE + y; - for (int x=0; x<= ADT_CELL_SIZE; x++) - { - int cx = j*ADT_CELL_SIZE + x; - liquid_height[cy][cx] = liquid->liquid[y][x].height; - } - } - } - } - } - //============================================ // Pack liquid data //============================================ - uint8 type = liquid_type[0][0]; + uint8 type = liquid_flags[0][0]; bool fullType = false; for (int y=0;yliquidType & 4) liquidEntry = liquidType; else if (liquidType == 15) - liquidEntry = 1; // first entry, generic "Water" + liquidEntry = 0; else liquidEntry = liquidType + 1; - // overwrite material type in header... - hlq->type = LiqType[liquidEntry]; + + if (!liquidEntry) + { + int v1; // edx@1 + int v2; // eax@1 + + v1 = hlq->xtiles * hlq->ytiles; + v2 = 0; + if (v1 > 0) + { + while ((LiquBytes[v2] & 0xF) == 15) + { + ++v2; + if (v2 >= v1) + break; + } + + if (v2 < v1 && (LiquBytes[v2] & 0xF) != 15) + liquidEntry = (LiquBytes[v2] & 0xF) + 1; + } + } + + if (liquidEntry && liquidEntry < 21) + { + switch (((uint8)liquidEntry - 1) & 3) + { + case 0: + liquidEntry = ((mogpFlags & 0x80000) != 0) + 13; + break; + case 1: + liquidEntry = 14; + break; + case 2: + liquidEntry = 19; + break; + case 3: + liquidEntry = 20; + break; + default: + break; + } + } + + hlq->type = liquidEntry; /* std::ofstream llog("Buildings/liquid.log", ios_base::out | ios_base::app); llog << filename; -- cgit v1.2.3 From 0ad6238a969c4bcb7e5d17148c07850c1c91429c Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 10 Mar 2012 06:37:15 -0330 Subject: DB/SAI,Waypoints,creature: Some updates for Silvermoon City --- sql/updates/world/2012_03_10_00_world_creature.sql | 21 ++++ .../world/2012_03_10_00_world_smart_scripts | 129 +++++++++++++++++++++ .../world/2012_03_10_00_world_waypoint_data.sql | 25 ++++ 3 files changed, 175 insertions(+) create mode 100644 sql/updates/world/2012_03_10_00_world_creature.sql create mode 100644 sql/updates/world/2012_03_10_00_world_smart_scripts create mode 100644 sql/updates/world/2012_03_10_00_world_waypoint_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_10_00_world_creature.sql b/sql/updates/world/2012_03_10_00_world_creature.sql new file mode 100644 index 00000000000..3a0f9dbda58 --- /dev/null +++ b/sql/updates/world/2012_03_10_00_world_creature.sql @@ -0,0 +1,21 @@ +-- Add some missing guids +SET @GUID := 42153; +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+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`) VALUES +(@GUID,32666,530,1,0,0,0,9830.201,-7389.711,13.68803,5.532694,120,0,0,1,0,0), +(@GUID+1,32667,530,1,0,0,0,9859.044,-7406.975,13.7113,1.658063,120,0,0,1,0,0), +(@GUID+2,31144,530,1,0,0,0,9869.401,-7389.657,13.69022,3.90953755,120,0,0,1,0,0), +(@GUID+3,31144,530,1,0,0,0,9871.973,-7392.763,13.6818113,3.35103226,120,0,0,1,0,0), +(@GUID+4,31146,530,1,0,0,0,9850.529,-7395.442,13.72216,4.694936,120,0,0,1,0,0); +-- Addons +DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+4; +DELETE FROM `creature_addon` WHERE `guid`=66686; +INSERT INTO `creature_addon` (`guid`,`bytes2`,`auras`) VALUES +(@GUID,1, '7056 61573'), +(@GUID+1,1, '7056 61573'), +(@GUID+2,1, '7056 61573'), +(@GUID+3,1, '7056 61573'), +(@GUID+4,1, '7056 61573'), +(66686,1, '7056'); +-- convert npc to trigger +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=18504; diff --git a/sql/updates/world/2012_03_10_00_world_smart_scripts b/sql/updates/world/2012_03_10_00_world_smart_scripts new file mode 100644 index 00000000000..aaa02c2e3df --- /dev/null +++ b/sql/updates/world/2012_03_10_00_world_smart_scripts @@ -0,0 +1,129 @@ +-- SAI for Champion Vranesh +SET @ENTRY=18146; +UPDATE `creature` SET `position_x`=9834.044,`position_y`=-7480.845,`position_z`=14.93467 WHERE `id`=@ENTRY; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +UPDATE `creature_template_addon` SET `mount`=0 WHERE `entry`=@ENTRY; -- 19085 +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2,@ENTRY*100+3,@ENTRY*100+4); +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 +-- AI +(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On respawn - load path'), +(@ENTRY,0,1,2,40,0,100,0,7,@ENTRY,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,3,4,40,0,100,0,11,@ENTRY,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,5,6,40,0,100,0,25,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,7,8,40,0,100,0,34,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,9,10,40,0,100,0,50,@ENTRY,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,11,0,40,0,100,0,57,@ENTRY,0,0,54,600000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +-- Script 0 +(@ENTRY*100,9,0,0,0,0,100,0,3500,3500,3500,3500,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 0 - emote bow'), +-- Script 1 +(@ENTRY*100+1,9,0,0,0,0,100,0,100,100,100,100,43,0,19085,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - mount horse'), +(@ENTRY*100+1,9,1,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - say 0'), +(@ENTRY*100+1,9,2,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian emote bow'), +(@ENTRY*100+1,9,3,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,19,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian say 0'), +-- Script 2 +(@ENTRY*100+2,9,0,0,0,0,100,0,3000,3000,3000,3000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 2 - say 1'), +(@ENTRY*100+2,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian emote bow'), +(@ENTRY*100+2,9,2,0,0,0,100,0,100,100,100,100,1,1,0,0,0,0,0,19,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian say 1'), +-- Script 3 +(@ENTRY*100+3,9,0,0,0,0,100,0,3000,3000,3000,3000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 2'), +(@ENTRY*100+3,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,30,0,0,0,0,0,'Champion Vranesh - Script 3 - Silvermoon City Guardian emote bow'), +-- Script 4 +(@ENTRY*100+4,9,0,0,0,0,100,0,1000,1000,1000,1000,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 4 - dismount horse'), +(@ENTRY*100+4,9,1,0,0,0,100,0,1000,1000,1000,1000,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 3'); + +-- NPC talk text for Champion Vranesh and Silvermoon City Guardian +DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY,16222); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'Champion Vranesh inclines his head slightly to the pair of guardians in greeting.',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,1,0, 'Champion Vranesh arches a scrulpled brow at the guards. a disapproving scowl on his face',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,2,0, 'Champion Vranesh glances from guard to guard.',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,3,0, 'Champion Vranesh surveys the small ranger practice ground with a condescending smirk.',16,1,100,0,0,0, 'Champion Vranesh'), +(16222,0,0, 'Glory to the Sun K-- ah... Silvermoon!',12,1,100,0,0,0, 'Silvermoon City Guardian'), +(16222,1,0, 'Our lives are yours, Blood Knight.',12,1,100,0,0,0, 'Silvermoon City Guardian'); + +-- Pathing for Champion Vranesh +DELETE FROM `waypoints` WHERE `entry`=@ENTRY; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY,1,9834.044,-7480.845,14.93467, 'Champion Vranesh'), +(@ENTRY,2,9829.106,-7493.609,14.93653, 'Champion Vranesh'), +(@ENTRY,3,9826.172,-7516.15,19.73714, 'Champion Vranesh'), +(@ENTRY,4,9841.332,-7518.849,19.70547, 'Champion Vranesh'), +(@ENTRY,5,9845.063,-7512.885,19.68096, 'Champion Vranesh'), +(@ENTRY,6,9850.942,-7512.470,19.71548, 'Champion Vranesh'), +(@ENTRY,7,9850.934,-7513.604,19.71813, 'Champion Vranesh'), -- pause 6000 +(@ENTRY,8,9872.733,-7517.256,19.75283, 'Champion Vranesh'), +(@ENTRY,9,9872.419,-7489.979,14.91272, 'Champion Vranesh'), +(@ENTRY,10,9851.401,-7490.209,14.93464, 'Champion Vranesh'), +(@ENTRY,11,9850.948,-7470.096,14.91403, 'Champion Vranesh'), -- pause 1000 +(@ENTRY,12,9851.16,-7469.154,14.91319, 'Champion Vranesh'), +(@ENTRY,13,9849.688,-7442.579,13.50931, 'Champion Vranesh'), +(@ENTRY,14,9848.726,-7423.561,13.31949, 'Champion Vranesh'), +(@ENTRY,15,9816.583,-7423.817,13.30332, 'Champion Vranesh'), +(@ENTRY,16,9794.673,-7424.877,13.50989, 'Champion Vranesh'), +(@ENTRY,17,9794.48,-7442.293,14.40225, 'Champion Vranesh'), +(@ENTRY,18,9767.989,-7442.611,14.39258, 'Champion Vranesh'), +(@ENTRY,19,9767.406,-7422.982,13.35852, 'Champion Vranesh'), +(@ENTRY,20,9739.563,-7422.83,13.28878, 'Champion Vranesh'), +(@ENTRY,21,9736.46,-7440.873,13.53963, 'Champion Vranesh'), +(@ENTRY,22,9740.345,-7464.682,13.57483, 'Champion Vranesh'), +(@ENTRY,23,9746.739,-7482.594,13.55744, 'Champion Vranesh'), +(@ENTRY,24,9748.767,-7486.576,13.54981, 'Champion Vranesh'), +(@ENTRY,25,9753.25,-7486.52,13.5461, 'Champion Vranesh'), -- pause 8000 +(@ENTRY,26,9720.037,-7486.478,13.52865, 'Champion Vranesh'), +(@ENTRY,27,9681.502,-7475.868,13.52783, 'Champion Vranesh'), +(@ENTRY,28,9666.59,-7479.547,13.53783, 'Champion Vranesh'), +(@ENTRY,29,9638.033,-7492.629,13.50889, 'Champion Vranesh'), +(@ENTRY,30,9620.123,-7488.486,13.53853, 'Champion Vranesh'), +(@ENTRY,31,9605.795,-7475.276,13.55774, 'Champion Vranesh'), +(@ENTRY,32,9597.921,-7460.307,13.54336, 'Champion Vranesh'), +(@ENTRY,33,9594.605,-7450.369,13.5353, 'Champion Vranesh'), +(@ENTRY,34,9592.944,-7450.381,13.53116, 'Champion Vranesh'), -- pause 8000 +(@ENTRY,35,9594.605,-7450.369,13.5353, 'Champion Vranesh'), +(@ENTRY,36,9615.793,-7419.515,13.30549, 'Champion Vranesh'), +(@ENTRY,37,9654.939,-7420.383,13.29342, 'Champion Vranesh'), +(@ENTRY,38,9673.072,-7429.818,13.2933, 'Champion Vranesh'), +(@ENTRY,39,9689.373,-7431.429,13.2933, 'Champion Vranesh'), +(@ENTRY,40,9709.577,-7422.25,13.2933, 'Champion Vranesh'), +(@ENTRY,41,9722.3,-7415.217,13.39988, 'Champion Vranesh'), +(@ENTRY,42,9748.049,-7414.597,13.32135, 'Champion Vranesh'), +(@ENTRY,43,9766.792,-7413.542,13.38617, 'Champion Vranesh'), +(@ENTRY,44,9767.26,-7396.828,14.43101, 'Champion Vranesh'), +(@ENTRY,45,9793.145,-7395.393,14.3936, 'Champion Vranesh'), +(@ENTRY,46,9794.217,-7415.122,13.48684, 'Champion Vranesh'), +(@ENTRY,47,9817.575,-7415.299,13.30596, 'Champion Vranesh'), +(@ENTRY,48,9837.021,-7414.861,13.30863, 'Champion Vranesh'), +(@ENTRY,49,9848.048,-7414.794,13.31137, 'Champion Vranesh'), +(@ENTRY,50,9848.199,-7414.07,13.31068, 'Champion Vranesh'), -- pause 7000 +(@ENTRY,51,9847.695,-7415.903,13.31243, 'Champion Vranesh'), +(@ENTRY,52,9848.259,-7428.576,13.33225, 'Champion Vranesh'), +(@ENTRY,53,9846.748,-7446.964,13.56501, 'Champion Vranesh'), +(@ENTRY,54,9850.373,-7465.03,14.9097, 'Champion Vranesh'), +(@ENTRY,55,9850.84,-7480.409,14.93768, 'Champion Vranesh'), +(@ENTRY,56,9840.165,-7480.267,14.92917, 'Champion Vranesh'), +(@ENTRY,57,9843.284,-7480.133,14.92655, 'Champion Vranesh'); -- pause 60000 + +-- SAI for Silvermoon Farstrider +SET @ENTRY=18507; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - Reset - Set Phase 1'), +(@ENTRY,0,1,2,1,1,100,0,3000,3000,5000,5000,11,36802,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 1)'), +(@ENTRY,0,2,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 2 (Phase 1)'), +(@ENTRY,0,3,4,1,2,100,0,3000,3000,5000,5000,11,36803,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 2)'), +(@ENTRY,0,4,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 1 (Phase 2)'); +-- SAI for Silvermoon Ranger +SET @ENTRY=18147; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-64950,-64951,-64952,-64953); +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 +(-64950,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64951,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64952,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29120,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64953,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29122,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'); diff --git a/sql/updates/world/2012_03_10_00_world_waypoint_data.sql b/sql/updates/world/2012_03_10_00_world_waypoint_data.sql new file mode 100644 index 00000000000..01c2bc50402 --- /dev/null +++ b/sql/updates/world/2012_03_10_00_world_waypoint_data.sql @@ -0,0 +1,25 @@ +-- Silvermoon City Guardian pathing +SET @NPC := 56902; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=9595.755,`position_y`=-7366.754,`position_z`=13.50131 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,9595.755,-7366.754,13.50131,0,0,0,100,0), +(@PATH,2,9594.553,-7336.536,14.15131,0,0,0,100,0), +(@PATH,3,9586.897,-7325.241,14.1312,0,0,0,100,0), +(@PATH,4,9561.705,-7326.179,14.05934,0,0,0,100,0), +(@PATH,5,9519.901,-7327.064,14.12175,0,0,0,100,0), +(@PATH,6,9508.228,-7352.014,14.33403,0,0,0,100,0), +(@PATH,7,9505.697,-7394.406,14.32095,0,0,0,100,0), +(@PATH,8,9535.751,-7396.176,16.8303,0,0,0,100,0), +(@PATH,9,9564.451,-7396.184,16.84703,0,0,0,100,0), +(@PATH,10,9563.777,-7415.961,19.47212,0,0,0,100,0), +(@PATH,11,9559.149,-7418.953,19.47643,0,0,0,100,0), +(@PATH,12,9563.34,-7432.895,15.4851,0,0,0,100,0), +(@PATH,13,9564.645,-7464.229,15.51088,0,0,0,100,0), +(@PATH,14,9588.409,-7464.643,13.52051,0,0,0,100,0), +(@PATH,15,9603.896,-7430.126,13.30448,0,0,0,100,0), +(@PATH,16,9595.137,-7387.862,13.52731,0,0,0,100,0), +(@PATH,17,9572.599,-7384.971,14.39343,0,0,0,100,0), +(@PATH,18,9573.106,-7369.531,14.40827,0,0,0,100,0); -- cgit v1.2.3 From 73282f9789724e30f45c89b80bd26fc8e618e8b0 Mon Sep 17 00:00:00 2001 From: click Date: Sat, 10 Mar 2012 15:10:36 +0100 Subject: SQL: Fix one of the filenames from commit 0ad6238a96 --- .../world/2012_03_10_00_world_smart_scripts | 129 --------------------- .../world/2012_03_10_00_world_smart_scripts.sql | 129 +++++++++++++++++++++ 2 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 sql/updates/world/2012_03_10_00_world_smart_scripts create mode 100644 sql/updates/world/2012_03_10_00_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_10_00_world_smart_scripts b/sql/updates/world/2012_03_10_00_world_smart_scripts deleted file mode 100644 index aaa02c2e3df..00000000000 --- a/sql/updates/world/2012_03_10_00_world_smart_scripts +++ /dev/null @@ -1,129 +0,0 @@ --- SAI for Champion Vranesh -SET @ENTRY=18146; -UPDATE `creature` SET `position_x`=9834.044,`position_y`=-7480.845,`position_z`=14.93467 WHERE `id`=@ENTRY; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -UPDATE `creature_template_addon` SET `mount`=0 WHERE `entry`=@ENTRY; -- 19085 -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2,@ENTRY*100+3,@ENTRY*100+4); -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 --- AI -(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On respawn - load path'), -(@ENTRY,0,1,2,40,0,100,0,7,@ENTRY,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,3,4,40,0,100,0,11,@ENTRY,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,5,6,40,0,100,0,25,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,7,8,40,0,100,0,34,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,9,10,40,0,100,0,50,@ENTRY,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,11,0,40,0,100,0,57,@ENTRY,0,0,54,600000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), --- Script 0 -(@ENTRY*100,9,0,0,0,0,100,0,3500,3500,3500,3500,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 0 - emote bow'), --- Script 1 -(@ENTRY*100+1,9,0,0,0,0,100,0,100,100,100,100,43,0,19085,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - mount horse'), -(@ENTRY*100+1,9,1,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - say 0'), -(@ENTRY*100+1,9,2,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian emote bow'), -(@ENTRY*100+1,9,3,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,19,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian say 0'), --- Script 2 -(@ENTRY*100+2,9,0,0,0,0,100,0,3000,3000,3000,3000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 2 - say 1'), -(@ENTRY*100+2,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian emote bow'), -(@ENTRY*100+2,9,2,0,0,0,100,0,100,100,100,100,1,1,0,0,0,0,0,19,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian say 1'), --- Script 3 -(@ENTRY*100+3,9,0,0,0,0,100,0,3000,3000,3000,3000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 2'), -(@ENTRY*100+3,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,30,0,0,0,0,0,'Champion Vranesh - Script 3 - Silvermoon City Guardian emote bow'), --- Script 4 -(@ENTRY*100+4,9,0,0,0,0,100,0,1000,1000,1000,1000,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 4 - dismount horse'), -(@ENTRY*100+4,9,1,0,0,0,100,0,1000,1000,1000,1000,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 3'); - --- NPC talk text for Champion Vranesh and Silvermoon City Guardian -DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY,16222); -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'Champion Vranesh inclines his head slightly to the pair of guardians in greeting.',16,1,100,0,0,0, 'Champion Vranesh'), -(@ENTRY,1,0, 'Champion Vranesh arches a scrulpled brow at the guards. a disapproving scowl on his face',16,1,100,0,0,0, 'Champion Vranesh'), -(@ENTRY,2,0, 'Champion Vranesh glances from guard to guard.',16,1,100,0,0,0, 'Champion Vranesh'), -(@ENTRY,3,0, 'Champion Vranesh surveys the small ranger practice ground with a condescending smirk.',16,1,100,0,0,0, 'Champion Vranesh'), -(16222,0,0, 'Glory to the Sun K-- ah... Silvermoon!',12,1,100,0,0,0, 'Silvermoon City Guardian'), -(16222,1,0, 'Our lives are yours, Blood Knight.',12,1,100,0,0,0, 'Silvermoon City Guardian'); - --- Pathing for Champion Vranesh -DELETE FROM `waypoints` WHERE `entry`=@ENTRY; -INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES -(@ENTRY,1,9834.044,-7480.845,14.93467, 'Champion Vranesh'), -(@ENTRY,2,9829.106,-7493.609,14.93653, 'Champion Vranesh'), -(@ENTRY,3,9826.172,-7516.15,19.73714, 'Champion Vranesh'), -(@ENTRY,4,9841.332,-7518.849,19.70547, 'Champion Vranesh'), -(@ENTRY,5,9845.063,-7512.885,19.68096, 'Champion Vranesh'), -(@ENTRY,6,9850.942,-7512.470,19.71548, 'Champion Vranesh'), -(@ENTRY,7,9850.934,-7513.604,19.71813, 'Champion Vranesh'), -- pause 6000 -(@ENTRY,8,9872.733,-7517.256,19.75283, 'Champion Vranesh'), -(@ENTRY,9,9872.419,-7489.979,14.91272, 'Champion Vranesh'), -(@ENTRY,10,9851.401,-7490.209,14.93464, 'Champion Vranesh'), -(@ENTRY,11,9850.948,-7470.096,14.91403, 'Champion Vranesh'), -- pause 1000 -(@ENTRY,12,9851.16,-7469.154,14.91319, 'Champion Vranesh'), -(@ENTRY,13,9849.688,-7442.579,13.50931, 'Champion Vranesh'), -(@ENTRY,14,9848.726,-7423.561,13.31949, 'Champion Vranesh'), -(@ENTRY,15,9816.583,-7423.817,13.30332, 'Champion Vranesh'), -(@ENTRY,16,9794.673,-7424.877,13.50989, 'Champion Vranesh'), -(@ENTRY,17,9794.48,-7442.293,14.40225, 'Champion Vranesh'), -(@ENTRY,18,9767.989,-7442.611,14.39258, 'Champion Vranesh'), -(@ENTRY,19,9767.406,-7422.982,13.35852, 'Champion Vranesh'), -(@ENTRY,20,9739.563,-7422.83,13.28878, 'Champion Vranesh'), -(@ENTRY,21,9736.46,-7440.873,13.53963, 'Champion Vranesh'), -(@ENTRY,22,9740.345,-7464.682,13.57483, 'Champion Vranesh'), -(@ENTRY,23,9746.739,-7482.594,13.55744, 'Champion Vranesh'), -(@ENTRY,24,9748.767,-7486.576,13.54981, 'Champion Vranesh'), -(@ENTRY,25,9753.25,-7486.52,13.5461, 'Champion Vranesh'), -- pause 8000 -(@ENTRY,26,9720.037,-7486.478,13.52865, 'Champion Vranesh'), -(@ENTRY,27,9681.502,-7475.868,13.52783, 'Champion Vranesh'), -(@ENTRY,28,9666.59,-7479.547,13.53783, 'Champion Vranesh'), -(@ENTRY,29,9638.033,-7492.629,13.50889, 'Champion Vranesh'), -(@ENTRY,30,9620.123,-7488.486,13.53853, 'Champion Vranesh'), -(@ENTRY,31,9605.795,-7475.276,13.55774, 'Champion Vranesh'), -(@ENTRY,32,9597.921,-7460.307,13.54336, 'Champion Vranesh'), -(@ENTRY,33,9594.605,-7450.369,13.5353, 'Champion Vranesh'), -(@ENTRY,34,9592.944,-7450.381,13.53116, 'Champion Vranesh'), -- pause 8000 -(@ENTRY,35,9594.605,-7450.369,13.5353, 'Champion Vranesh'), -(@ENTRY,36,9615.793,-7419.515,13.30549, 'Champion Vranesh'), -(@ENTRY,37,9654.939,-7420.383,13.29342, 'Champion Vranesh'), -(@ENTRY,38,9673.072,-7429.818,13.2933, 'Champion Vranesh'), -(@ENTRY,39,9689.373,-7431.429,13.2933, 'Champion Vranesh'), -(@ENTRY,40,9709.577,-7422.25,13.2933, 'Champion Vranesh'), -(@ENTRY,41,9722.3,-7415.217,13.39988, 'Champion Vranesh'), -(@ENTRY,42,9748.049,-7414.597,13.32135, 'Champion Vranesh'), -(@ENTRY,43,9766.792,-7413.542,13.38617, 'Champion Vranesh'), -(@ENTRY,44,9767.26,-7396.828,14.43101, 'Champion Vranesh'), -(@ENTRY,45,9793.145,-7395.393,14.3936, 'Champion Vranesh'), -(@ENTRY,46,9794.217,-7415.122,13.48684, 'Champion Vranesh'), -(@ENTRY,47,9817.575,-7415.299,13.30596, 'Champion Vranesh'), -(@ENTRY,48,9837.021,-7414.861,13.30863, 'Champion Vranesh'), -(@ENTRY,49,9848.048,-7414.794,13.31137, 'Champion Vranesh'), -(@ENTRY,50,9848.199,-7414.07,13.31068, 'Champion Vranesh'), -- pause 7000 -(@ENTRY,51,9847.695,-7415.903,13.31243, 'Champion Vranesh'), -(@ENTRY,52,9848.259,-7428.576,13.33225, 'Champion Vranesh'), -(@ENTRY,53,9846.748,-7446.964,13.56501, 'Champion Vranesh'), -(@ENTRY,54,9850.373,-7465.03,14.9097, 'Champion Vranesh'), -(@ENTRY,55,9850.84,-7480.409,14.93768, 'Champion Vranesh'), -(@ENTRY,56,9840.165,-7480.267,14.92917, 'Champion Vranesh'), -(@ENTRY,57,9843.284,-7480.133,14.92655, 'Champion Vranesh'); -- pause 60000 - --- SAI for Silvermoon Farstrider -SET @ENTRY=18507; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - Reset - Set Phase 1'), -(@ENTRY,0,1,2,1,1,100,0,3000,3000,5000,5000,11,36802,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 1)'), -(@ENTRY,0,2,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 2 (Phase 1)'), -(@ENTRY,0,3,4,1,2,100,0,3000,3000,5000,5000,11,36803,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 2)'), -(@ENTRY,0,4,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 1 (Phase 2)'); --- SAI for Silvermoon Ranger -SET @ENTRY=18147; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-64950,-64951,-64952,-64953); -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 -(-64950,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), -(-64951,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), -(-64952,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29120,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), -(-64953,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29122,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'); diff --git a/sql/updates/world/2012_03_10_00_world_smart_scripts.sql b/sql/updates/world/2012_03_10_00_world_smart_scripts.sql new file mode 100644 index 00000000000..aaa02c2e3df --- /dev/null +++ b/sql/updates/world/2012_03_10_00_world_smart_scripts.sql @@ -0,0 +1,129 @@ +-- SAI for Champion Vranesh +SET @ENTRY=18146; +UPDATE `creature` SET `position_x`=9834.044,`position_y`=-7480.845,`position_z`=14.93467 WHERE `id`=@ENTRY; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +UPDATE `creature_template_addon` SET `mount`=0 WHERE `entry`=@ENTRY; -- 19085 +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2,@ENTRY*100+3,@ENTRY*100+4); +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 +-- AI +(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On respawn - load path'), +(@ENTRY,0,1,2,40,0,100,0,7,@ENTRY,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,3,4,40,0,100,0,11,@ENTRY,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,5,6,40,0,100,0,25,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,7,8,40,0,100,0,34,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,9,10,40,0,100,0,50,@ENTRY,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,11,0,40,0,100,0,57,@ENTRY,0,0,54,600000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +-- Script 0 +(@ENTRY*100,9,0,0,0,0,100,0,3500,3500,3500,3500,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 0 - emote bow'), +-- Script 1 +(@ENTRY*100+1,9,0,0,0,0,100,0,100,100,100,100,43,0,19085,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - mount horse'), +(@ENTRY*100+1,9,1,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - say 0'), +(@ENTRY*100+1,9,2,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian emote bow'), +(@ENTRY*100+1,9,3,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,19,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian say 0'), +-- Script 2 +(@ENTRY*100+2,9,0,0,0,0,100,0,3000,3000,3000,3000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 2 - say 1'), +(@ENTRY*100+2,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian emote bow'), +(@ENTRY*100+2,9,2,0,0,0,100,0,100,100,100,100,1,1,0,0,0,0,0,19,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian say 1'), +-- Script 3 +(@ENTRY*100+3,9,0,0,0,0,100,0,3000,3000,3000,3000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 2'), +(@ENTRY*100+3,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,30,0,0,0,0,0,'Champion Vranesh - Script 3 - Silvermoon City Guardian emote bow'), +-- Script 4 +(@ENTRY*100+4,9,0,0,0,0,100,0,1000,1000,1000,1000,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 4 - dismount horse'), +(@ENTRY*100+4,9,1,0,0,0,100,0,1000,1000,1000,1000,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 3'); + +-- NPC talk text for Champion Vranesh and Silvermoon City Guardian +DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY,16222); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'Champion Vranesh inclines his head slightly to the pair of guardians in greeting.',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,1,0, 'Champion Vranesh arches a scrulpled brow at the guards. a disapproving scowl on his face',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,2,0, 'Champion Vranesh glances from guard to guard.',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,3,0, 'Champion Vranesh surveys the small ranger practice ground with a condescending smirk.',16,1,100,0,0,0, 'Champion Vranesh'), +(16222,0,0, 'Glory to the Sun K-- ah... Silvermoon!',12,1,100,0,0,0, 'Silvermoon City Guardian'), +(16222,1,0, 'Our lives are yours, Blood Knight.',12,1,100,0,0,0, 'Silvermoon City Guardian'); + +-- Pathing for Champion Vranesh +DELETE FROM `waypoints` WHERE `entry`=@ENTRY; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY,1,9834.044,-7480.845,14.93467, 'Champion Vranesh'), +(@ENTRY,2,9829.106,-7493.609,14.93653, 'Champion Vranesh'), +(@ENTRY,3,9826.172,-7516.15,19.73714, 'Champion Vranesh'), +(@ENTRY,4,9841.332,-7518.849,19.70547, 'Champion Vranesh'), +(@ENTRY,5,9845.063,-7512.885,19.68096, 'Champion Vranesh'), +(@ENTRY,6,9850.942,-7512.470,19.71548, 'Champion Vranesh'), +(@ENTRY,7,9850.934,-7513.604,19.71813, 'Champion Vranesh'), -- pause 6000 +(@ENTRY,8,9872.733,-7517.256,19.75283, 'Champion Vranesh'), +(@ENTRY,9,9872.419,-7489.979,14.91272, 'Champion Vranesh'), +(@ENTRY,10,9851.401,-7490.209,14.93464, 'Champion Vranesh'), +(@ENTRY,11,9850.948,-7470.096,14.91403, 'Champion Vranesh'), -- pause 1000 +(@ENTRY,12,9851.16,-7469.154,14.91319, 'Champion Vranesh'), +(@ENTRY,13,9849.688,-7442.579,13.50931, 'Champion Vranesh'), +(@ENTRY,14,9848.726,-7423.561,13.31949, 'Champion Vranesh'), +(@ENTRY,15,9816.583,-7423.817,13.30332, 'Champion Vranesh'), +(@ENTRY,16,9794.673,-7424.877,13.50989, 'Champion Vranesh'), +(@ENTRY,17,9794.48,-7442.293,14.40225, 'Champion Vranesh'), +(@ENTRY,18,9767.989,-7442.611,14.39258, 'Champion Vranesh'), +(@ENTRY,19,9767.406,-7422.982,13.35852, 'Champion Vranesh'), +(@ENTRY,20,9739.563,-7422.83,13.28878, 'Champion Vranesh'), +(@ENTRY,21,9736.46,-7440.873,13.53963, 'Champion Vranesh'), +(@ENTRY,22,9740.345,-7464.682,13.57483, 'Champion Vranesh'), +(@ENTRY,23,9746.739,-7482.594,13.55744, 'Champion Vranesh'), +(@ENTRY,24,9748.767,-7486.576,13.54981, 'Champion Vranesh'), +(@ENTRY,25,9753.25,-7486.52,13.5461, 'Champion Vranesh'), -- pause 8000 +(@ENTRY,26,9720.037,-7486.478,13.52865, 'Champion Vranesh'), +(@ENTRY,27,9681.502,-7475.868,13.52783, 'Champion Vranesh'), +(@ENTRY,28,9666.59,-7479.547,13.53783, 'Champion Vranesh'), +(@ENTRY,29,9638.033,-7492.629,13.50889, 'Champion Vranesh'), +(@ENTRY,30,9620.123,-7488.486,13.53853, 'Champion Vranesh'), +(@ENTRY,31,9605.795,-7475.276,13.55774, 'Champion Vranesh'), +(@ENTRY,32,9597.921,-7460.307,13.54336, 'Champion Vranesh'), +(@ENTRY,33,9594.605,-7450.369,13.5353, 'Champion Vranesh'), +(@ENTRY,34,9592.944,-7450.381,13.53116, 'Champion Vranesh'), -- pause 8000 +(@ENTRY,35,9594.605,-7450.369,13.5353, 'Champion Vranesh'), +(@ENTRY,36,9615.793,-7419.515,13.30549, 'Champion Vranesh'), +(@ENTRY,37,9654.939,-7420.383,13.29342, 'Champion Vranesh'), +(@ENTRY,38,9673.072,-7429.818,13.2933, 'Champion Vranesh'), +(@ENTRY,39,9689.373,-7431.429,13.2933, 'Champion Vranesh'), +(@ENTRY,40,9709.577,-7422.25,13.2933, 'Champion Vranesh'), +(@ENTRY,41,9722.3,-7415.217,13.39988, 'Champion Vranesh'), +(@ENTRY,42,9748.049,-7414.597,13.32135, 'Champion Vranesh'), +(@ENTRY,43,9766.792,-7413.542,13.38617, 'Champion Vranesh'), +(@ENTRY,44,9767.26,-7396.828,14.43101, 'Champion Vranesh'), +(@ENTRY,45,9793.145,-7395.393,14.3936, 'Champion Vranesh'), +(@ENTRY,46,9794.217,-7415.122,13.48684, 'Champion Vranesh'), +(@ENTRY,47,9817.575,-7415.299,13.30596, 'Champion Vranesh'), +(@ENTRY,48,9837.021,-7414.861,13.30863, 'Champion Vranesh'), +(@ENTRY,49,9848.048,-7414.794,13.31137, 'Champion Vranesh'), +(@ENTRY,50,9848.199,-7414.07,13.31068, 'Champion Vranesh'), -- pause 7000 +(@ENTRY,51,9847.695,-7415.903,13.31243, 'Champion Vranesh'), +(@ENTRY,52,9848.259,-7428.576,13.33225, 'Champion Vranesh'), +(@ENTRY,53,9846.748,-7446.964,13.56501, 'Champion Vranesh'), +(@ENTRY,54,9850.373,-7465.03,14.9097, 'Champion Vranesh'), +(@ENTRY,55,9850.84,-7480.409,14.93768, 'Champion Vranesh'), +(@ENTRY,56,9840.165,-7480.267,14.92917, 'Champion Vranesh'), +(@ENTRY,57,9843.284,-7480.133,14.92655, 'Champion Vranesh'); -- pause 60000 + +-- SAI for Silvermoon Farstrider +SET @ENTRY=18507; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - Reset - Set Phase 1'), +(@ENTRY,0,1,2,1,1,100,0,3000,3000,5000,5000,11,36802,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 1)'), +(@ENTRY,0,2,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 2 (Phase 1)'), +(@ENTRY,0,3,4,1,2,100,0,3000,3000,5000,5000,11,36803,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 2)'), +(@ENTRY,0,4,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 1 (Phase 2)'); +-- SAI for Silvermoon Ranger +SET @ENTRY=18147; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-64950,-64951,-64952,-64953); +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 +(-64950,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64951,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64952,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29120,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64953,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29122,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'); -- cgit v1.2.3 From 2b2d054f64f1fa137364d2f840c7005e7936bdc2 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 11 Mar 2012 16:59:17 +0000 Subject: R.I.P SimpleAI - Convert SimpleAI to (DB) SmartAI - Spell ids corrected (and completed some of the scripts) - Random cleanup (code style) in some scripts --- sql/updates/world/2012_03_11_00_world_sai.sql | 59 ++ src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp | 280 --------- src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h | 73 --- src/server/game/Scripting/ScriptLoader.cpp | 2 - src/server/scripts/CMakeLists.txt | 1 - src/server/scripts/EasternKingdoms/CMakeLists.txt | 1 - .../Karazhan/boss_shade_of_aran.cpp | 26 - .../EasternKingdoms/MoltenCore/molten_core.cpp | 86 --- .../SerpentShrine/boss_lady_vashj.cpp | 635 +++++++++------------ .../SerpentShrine/boss_lurker_below.cpp | 148 ++--- 10 files changed, 373 insertions(+), 938 deletions(-) create mode 100644 sql/updates/world/2012_03_11_00_world_sai.sql delete mode 100755 src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp delete mode 100644 src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h delete mode 100644 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_11_00_world_sai.sql b/sql/updates/world/2012_03_11_00_world_sai.sql new file mode 100644 index 00000000000..e5eee10f6f1 --- /dev/null +++ b/sql/updates/world/2012_03_11_00_world_sai.sql @@ -0,0 +1,59 @@ +-- Coilfang Guardian + +DELETE FROM `smart_scripts` WHERE (`entryorguid`=21873 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 +(21873, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 15000, 11, 28168, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Arcing Smash'), +(21873, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 9080, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Harmstring'), +(21873, 0, 2, 0, 0, 0, 50, 0, 3000, 4000, 10000, 20000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Say 0'); -- randomly guessed timers + +DELETE FROM `creature_text` WHERE `entry`=21873; +INSERT INTO `world`.`creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(21873, 0, 0, 'By Nazjatar''s Depths!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 1, 'Die, warmblood!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 2, 'For the Master!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 3, 'Illidan reigns!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 4, 'My blood is like venom!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=21873; + +-- Coilfang Strider + +DELETE FROM `smart_scripts` WHERE (`entryorguid`=22056 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 +(22056, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 11, 38257, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - On Reset - Cast Panic Periodic'), +(22056, 0, 1, 0, 0, 0, 0, 0, 8000, 8000, 30000, 40000, 11, 38259, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - IC - Cast Mind Blast'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22056; + +-- Coilfang Elite + +DELETE FROM `smart_scripts` WHERE (`entryorguid`=22055 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 +(22055, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 20000, 11, 38260, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Cleave'), +(22055, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 38262, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Harmstring'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22055; + +-- Core Hound + +DELETE FROM `smart_scripts` WHERE (`entryorguid`=11673 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 +(11673, 0, 0, 0, 0, 0, 0, 0, 10000, 10000, 7000, 7000, 11, 19272, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Lava Breath'), +(11673, 0, 1, 0, 0, 0, 0, 0, 4000, 4000, 6000, 6000, 11, 19319, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Vicious Bite'), +(11673, 0, 2, 0, 0, 0, 0, 0, 15000, 15000, 24000, 24000, 88, 11673*100+0, 11673*100+5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Call random script'), +(11673*100+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19364, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 0 - Cast Ground Stomp'), +(11673*100+1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19366, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 1 - Cast Cauterizing Flames'), +(11673*100+2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19367, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 2 - Cast Withering Heat'), +(11673*100+3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19369, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 3 - Cast Ancient Despair'), +(11673*100+4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19372, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 4 - Cast Ancient Hysteria'), +(11673*100+5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19365, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 5 - Cast Ancient Dread'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=11673; + +-- Shadow of Aran + +DELETE FROM `smart_scripts` WHERE (`entryorguid`=18254 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 +(18254, 0, 0, 0, 0, 0, 0, 0, 1000, 1000, 5000, 5000, 11, 29978, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Shadow of Aran - IC - Cast Pyro Blast'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=18254; diff --git a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp deleted file mode 100755 index 25c7f6f44b7..00000000000 --- a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright (C) 2008-2012 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/* ScriptData -SDName: SimpleAI -SD%Complete: 100 -SDComment: Base Class for SimpleAI creatures -SDCategory: Creatures -EndScriptData */ - -#include "ScriptPCH.h" -#include "ScriptedSimpleAI.h" - -SimpleAI::SimpleAI(Creature* c) : ScriptedAI(c) -{ - //Clear all data - Aggro_TextId[0] = 0; - Aggro_TextId[1] = 0; - Aggro_TextId[2] = 0; - Aggro_Sound[0] = 0; - Aggro_Sound[1] = 0; - Aggro_Sound[2] = 0; - - Death_TextId[0] = 0; - Death_TextId[1] = 0; - Death_TextId[2] = 0; - Death_Sound[0] = 0; - Death_Sound[1] = 0; - Death_Sound[2] = 0; - Death_Spell = 0; - Death_Target_Type = 0; - - Kill_TextId[0] = 0; - Kill_TextId[1] = 0; - Kill_TextId[2] = 0; - Kill_Sound[0] = 0; - Kill_Sound[1] = 0; - Kill_Sound[2] = 0; - Kill_Spell = 0; - Kill_Target_Type = 0; - - memset(Spell, 0, sizeof(Spell)); - - EnterEvadeMode(); -} - -void SimpleAI::Reset() -{ -} - -void SimpleAI::EnterCombat(Unit* who) -{ - //Reset cast timers - if (Spell[0].First_Cast >= 0) - Spell_Timer[0] = Spell[0].First_Cast; - else Spell_Timer[0] = 1000; - if (Spell[1].First_Cast >= 0) - Spell_Timer[1] = Spell[1].First_Cast; - else Spell_Timer[1] = 1000; - if (Spell[2].First_Cast >= 0) - Spell_Timer[2] = Spell[2].First_Cast; - else Spell_Timer[2] = 1000; - if (Spell[3].First_Cast >= 0) - Spell_Timer[3] = Spell[3].First_Cast; - else Spell_Timer[3] = 1000; - if (Spell[4].First_Cast >= 0) - Spell_Timer[4] = Spell[4].First_Cast; - else Spell_Timer[4] = 1000; - if (Spell[5].First_Cast >= 0) - Spell_Timer[5] = Spell[5].First_Cast; - else Spell_Timer[5] = 1000; - if (Spell[6].First_Cast >= 0) - Spell_Timer[6] = Spell[6].First_Cast; - else Spell_Timer[6] = 1000; - if (Spell[7].First_Cast >= 0) - Spell_Timer[7] = Spell[7].First_Cast; - else Spell_Timer[7] = 1000; - if (Spell[8].First_Cast >= 0) - Spell_Timer[8] = Spell[8].First_Cast; - else Spell_Timer[8] = 1000; - if (Spell[9].First_Cast >= 0) - Spell_Timer[9] = Spell[9].First_Cast; - else Spell_Timer[9] = 1000; - - uint8 random_text = urand(0, 2); - - //Random text - if (Aggro_TextId[random_text]) - DoScriptText(Aggro_TextId[random_text], me, who); - - //Random sound - if (Aggro_Sound[random_text]) - DoPlaySoundToSet(me, Aggro_Sound[random_text]); -} - -void SimpleAI::KilledUnit(Unit* victim) -{ - uint8 random_text = urand(0, 2); - - //Random yell - if (Kill_TextId[random_text]) - DoScriptText(Kill_TextId[random_text], me, victim); - - //Random sound - if (Kill_Sound[random_text]) - DoPlaySoundToSet(me, Kill_Sound[random_text]); - - if (!Kill_Spell) - return; - - Unit* target = NULL; - - switch (Kill_Target_Type) - { - case CAST_SELF: - target = me; - break; - case CAST_HOSTILE_TARGET: - target = me->getVictim(); - break; - case CAST_HOSTILE_SECOND_AGGRO: - target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - break; - case CAST_HOSTILE_LAST_AGGRO: - target = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0); - break; - case CAST_HOSTILE_RANDOM: - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - break; - case CAST_KILLEDUNIT_VICTIM: - target = victim; - break; - } - - //Target is ok, cast a spell on it - if (target) - DoCast(target, Kill_Spell); -} - -void SimpleAI::DamageTaken(Unit* killer, uint32& damage) -{ - //Return if damage taken won't kill us - if (me->GetHealth() > damage) - return; - - uint8 random_text = urand(0, 2); - - //Random yell - if (Death_TextId[random_text]) - DoScriptText(Death_TextId[random_text], me, killer); - - //Random sound - if (Death_Sound[random_text]) - DoPlaySoundToSet(me, Death_Sound[random_text]); - - if (!Death_Spell) - return; - - Unit* target = NULL; - - switch (Death_Target_Type) - { - case CAST_SELF: - target = me; - break; - case CAST_HOSTILE_TARGET: - target = me->getVictim(); - break; - case CAST_HOSTILE_SECOND_AGGRO: - target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - break; - case CAST_HOSTILE_LAST_AGGRO: - target = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0); - break; - case CAST_HOSTILE_RANDOM: - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - break; - case CAST_JUSTDIED_KILLER: - target = killer; - break; - } - - //Target is ok, cast a spell on it - if (target) - DoCast(target, Death_Spell); -} - -void SimpleAI::UpdateAI(const uint32 diff) -{ - //Return since we have no target - if (!UpdateVictim()) - return; - - //Spells - for (uint32 i = 0; i < MAX_SIMPLEAI_SPELLS; ++i) - { - //Spell not valid - if (!Spell[i].Enabled || !Spell[i].Spell_Id) - continue; - - if (Spell_Timer[i] <= diff) - { - //Check if this is a percentage based - if (Spell[i].First_Cast < 0 && Spell[i].First_Cast > -100 && HealthAbovePct(uint32(-Spell[i].First_Cast))) - continue; - - //Check Current spell - if (!(Spell[i].InterruptPreviousCast && me->IsNonMeleeSpellCasted(false))) - { - Unit* target = NULL; - - switch (Spell[i].Cast_Target_Type) - { - case CAST_SELF: - target = me; - break; - case CAST_HOSTILE_TARGET: - target = me->getVictim(); - break; - case CAST_HOSTILE_SECOND_AGGRO: - target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - break; - case CAST_HOSTILE_LAST_AGGRO: - target = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0); - break; - case CAST_HOSTILE_RANDOM: - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - break; - } - - //Target is ok, cast a spell on it and then do our random yell - if (target) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - - DoCast(target, Spell[i].Spell_Id); - - //Yell and sound use the same number so that you can make - //the Creature yell with the correct sound effect attached - uint8 random_text = urand(0, 2); - - //Random yell - if (Spell[i].TextId[random_text]) - DoScriptText(Spell[i].TextId[random_text], me, target); - - //Random sound - if (Spell[i].Text_Sound[random_text]) - DoPlaySoundToSet(me, Spell[i].Text_Sound[random_text]); - } - - } - - //Spell will cast agian when the cooldown is up - if (Spell[i].CooldownRandomAddition) - Spell_Timer[i] = Spell[i].Cooldown + (rand() % Spell[i].CooldownRandomAddition); - else Spell_Timer[i] = Spell[i].Cooldown; - - } else Spell_Timer[i] -= diff; - - } - - DoMeleeAttackIfReady(); -} - diff --git a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h deleted file mode 100644 index a38bdf85e14..00000000000 --- a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software licensed under GPL version 2 -* Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef SC_SIMPLEAI_H -#define SC_SIMPLEAI_H - -enum CastTarget -{ - CAST_SELF = 0, //Self cast - CAST_HOSTILE_TARGET, //Our current target (ie: highest aggro) - CAST_HOSTILE_SECOND_AGGRO, //Second highest aggro (generaly used for cleaves and some special attacks) - CAST_HOSTILE_LAST_AGGRO, //Dead last on aggro (no idea what this could be used for) - CAST_HOSTILE_RANDOM, //Just any random target on our threat list - CAST_FRIENDLY_RANDOM, //NOT YET IMPLEMENTED - - //Special cases - CAST_KILLEDUNIT_VICTIM, //Only works within KilledUnit function - CAST_JUSTDIED_KILLER, //Only works within JustDied function -}; - -#define MAX_SIMPLEAI_SPELLS 10 - -struct SimpleAI : public ScriptedAI -{ - SimpleAI(Creature* c);// : ScriptedAI(c); - - void Reset(); - - void EnterCombat(Unit* /*who*/); - - void KilledUnit(Unit* /*victim*/); - - void DamageTaken(Unit* killer, uint32& damage); - - void UpdateAI(const uint32 diff); - -public: - - int32 Aggro_TextId[3]; - uint32 Aggro_Sound[3]; - - int32 Death_TextId[3]; - uint32 Death_Sound[3]; - uint32 Death_Spell; - uint32 Death_Target_Type; - - int32 Kill_TextId[3]; - uint32 Kill_Sound[3]; - uint32 Kill_Spell; - uint32 Kill_Target_Type; - - struct SimpleAI_Spell - { - uint32 Spell_Id; //Spell ID to cast - int32 First_Cast; //Delay for first cast - uint32 Cooldown; //Cooldown between casts - uint32 CooldownRandomAddition; //Random addition to cooldown (in range from 0 - CooldownRandomAddition) - uint32 Cast_Target_Type; //Target type (note that certain spells may ignore this) - bool InterruptPreviousCast; //Interrupt a previous cast if this spell needs to be cast - bool Enabled; //Spell enabled or disabled (default: false) - - //3 texts to many? - int32 TextId[3]; - uint32 Text_Sound[3]; - }Spell[MAX_SIMPLEAI_SPELLS]; - -protected: - uint32 Spell_Timer[MAX_SIMPLEAI_SPELLS]; -}; - -#endif - diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 1207b654817..76c3f1c073c 100755 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -151,7 +151,6 @@ void AddSC_boss_sulfuron(); void AddSC_boss_majordomo(); void AddSC_boss_ragnaros(); void AddSC_instance_molten_core(); -void AddSC_molten_core(); void AddSC_the_scarlet_enclave(); //Scarlet Enclave void AddSC_the_scarlet_enclave_c1(); void AddSC_the_scarlet_enclave_c2(); @@ -761,7 +760,6 @@ void AddEasternKingdomsScripts() AddSC_boss_majordomo(); AddSC_boss_ragnaros(); AddSC_instance_molten_core(); - AddSC_molten_core(); AddSC_the_scarlet_enclave(); //Scarlet Enclave AddSC_the_scarlet_enclave_c1(); AddSC_the_scarlet_enclave_c2(); diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 62336e95ff6..728d95a0851 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -34,7 +34,6 @@ set(scripts_STAT_SRCS ../game/AI/ScriptedAI/ScriptedEscortAI.cpp ../game/AI/ScriptedAI/ScriptedCreature.cpp ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp - ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp ) if(SCRIPTS) diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt index 129e88a4e3b..5dc3b52dec1 100644 --- a/src/server/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt @@ -84,7 +84,6 @@ set(scripts_STAT_SRCS EasternKingdoms/MoltenCore/instance_molten_core.cpp EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp EasternKingdoms/MoltenCore/boss_magmadar.cpp - EasternKingdoms/MoltenCore/molten_core.cpp EasternKingdoms/MoltenCore/boss_shazzrah.cpp EasternKingdoms/Stratholme/boss_baroness_anastari.cpp EasternKingdoms/Stratholme/boss_nerubenkan.cpp diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 119cb7d9de6..d3d8ad38a43 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -24,7 +24,6 @@ SDCategory: Karazhan EndScriptData */ #include "ScriptPCH.h" -#include "ScriptedSimpleAI.h" #include "karazhan.h" #include "GameObject.h" @@ -549,33 +548,8 @@ public: }; -// CONVERT TO ACID -class mob_shadow_of_aran : public CreatureScript -{ -public: - mob_shadow_of_aran() : CreatureScript("mob_shadow_of_aran") { } - - CreatureAI* GetAI(Creature* creature) const - { - sLog->outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", creature->GetEntry()); - SimpleAI* ai = new SimpleAI (creature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = SPELL_SHADOW_PYRO; - ai->Spell[0].Cooldown = 5000; - ai->Spell[0].First_Cast = 1000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - - ai->EnterEvadeMode(); - - return ai; - } - -}; - void AddSC_boss_shade_of_aran() { new boss_shade_of_aran(); - new mob_shadow_of_aran(); new mob_aran_elemental(); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp deleted file mode 100644 index 801a11fbfc8..00000000000 --- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2008-2012 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/* ScriptData -SDName: Molten_Core -SD%Complete: 100 -SDComment: -SDCategory: Molten Core -EndScriptData */ - -/* ContentData -mob_ancient_core_hound -EndContentData */ - -#include "ScriptPCH.h" -#include "ScriptedSimpleAI.h" - -enum Spells -{ - SPELL_CONE_OF_FIRE = 19630, - SPELL_BITE = 19771, - - //Random Debuff (each hound has only one of these) - SPELL_GROUND_STOMP = 19364, - SPELL_ANCIENT_DREAD = 19365, - SPELL_CAUTERIZING_FLAMES = 19366, - SPELL_WITHERING_HEAT = 19367, - SPELL_ANCIENT_DESPAIR = 19369, - SPELL_ANCIENT_HYSTERIA = 19372 -}; - -class mob_ancient_core_hound : public CreatureScript -{ -public: - mob_ancient_core_hound() : CreatureScript("mob_ancient_core_hound") { } - - CreatureAI* GetAI(Creature* creature) const - { - SimpleAI* ai = new SimpleAI(creature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = SPELL_CONE_OF_FIRE; - ai->Spell[0].Cooldown = 7000; - ai->Spell[0].First_Cast = 10000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - - uint32 RandDebuff = RAND(SPELL_GROUND_STOMP, SPELL_ANCIENT_DREAD, SPELL_CAUTERIZING_FLAMES, - SPELL_WITHERING_HEAT, SPELL_ANCIENT_DESPAIR, SPELL_ANCIENT_HYSTERIA); - - ai->Spell[1].Enabled = true; - ai->Spell[1].Spell_Id = RandDebuff; - ai->Spell[1].Cooldown = 24000; - ai->Spell[1].First_Cast = 15000; - ai->Spell[1].Cast_Target_Type = CAST_HOSTILE_TARGET; - - ai->Spell[2].Enabled = true; - ai->Spell[2].Spell_Id = SPELL_BITE; - ai->Spell[2].Cooldown = 6000; - ai->Spell[2].First_Cast = 4000; - ai->Spell[2].Cast_Target_Type = CAST_HOSTILE_TARGET; - - ai->EnterEvadeMode(); - - return ai; - } -}; - -void AddSC_molten_core() -{ - new mob_ancient_core_hound(); -} diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 6de4c1c60ca..fbafb9615f7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -25,7 +25,6 @@ EndScriptData */ #include "ScriptPCH.h" #include "serpent_shrine.h" -#include "ScriptedSimpleAI.h" #include "Spell.h" #define SAY_INTRO -1548042 @@ -132,7 +131,6 @@ float ShieldGeneratorChannelPos[4][4] = {49.3126f, -943.398f, 42.5501f, 2.40174f} }; -//Lady Vashj AI class boss_lady_vashj : public CreatureScript { public: @@ -147,29 +145,29 @@ public: { boss_lady_vashjAI (Creature* c) : ScriptedAI(c) { - instance = c->GetInstanceScript(); + Instance = c->GetInstanceScript(); Intro = false; JustCreated = true; - c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on Creature create (no need do intro if wiped) + c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); // set it only once on Creature create (no need do intro if wiped) } - InstanceScript* instance; + InstanceScript* Instance; uint64 ShieldGeneratorChannel[4]; uint32 AggroTimer; - uint32 ShockBlast_Timer; - uint32 Entangle_Timer; - uint32 StaticCharge_Timer; - uint32 ForkedLightning_Timer; - uint32 Check_Timer; - uint32 EnchantedElemental_Timer; - uint32 TaintedElemental_Timer; - uint32 CoilfangElite_Timer; - uint32 CoilfangStrider_Timer; - uint32 SummonSporebat_Timer; - uint32 SummonSporebat_StaticTimer; - uint8 EnchantedElemental_Pos; + uint32 ShockBlastTimer; + uint32 EntangleTimer; + uint32 StaticChargeTimer; + uint32 ForkedLightningTimer; + uint32 CheckTimer; + uint32 EnchantedElementalTimer; + uint32 TaintedElementalTimer; + uint32 CoilfangEliteTimer; + uint32 CoilfangStriderTimer; + uint32 SummonSporebatTimer; + uint32 SummonSporebatStaticTimer; + uint8 EnchantedElementalPos; uint8 Phase; bool Entangle; @@ -180,18 +178,18 @@ public: void Reset() { AggroTimer = 19000; - ShockBlast_Timer = 1+rand()%60000; - Entangle_Timer = 30000; - StaticCharge_Timer = 10000+rand()%15000; - ForkedLightning_Timer = 2000; - Check_Timer = 15000; - EnchantedElemental_Timer = 5000; - TaintedElemental_Timer = 50000; - CoilfangElite_Timer = 45000+rand()%5000; - CoilfangStrider_Timer = 60000+rand()%10000; - SummonSporebat_Timer = 10000; - SummonSporebat_StaticTimer = 30000; - EnchantedElemental_Pos = 0; + ShockBlastTimer = 1+rand()%60000; + EntangleTimer = 30000; + StaticChargeTimer = 10000+rand()%15000; + ForkedLightningTimer = 2000; + CheckTimer = 15000; + EnchantedElementalTimer = 5000; + TaintedElementalTimer = 50000; + CoilfangEliteTimer = 45000+rand()%5000; + CoilfangStriderTimer = 60000+rand()%10000; + SummonSporebatTimer = 10000; + SummonSporebatStaticTimer = 30000; + EnchantedElementalPos = 0; Phase = 0; Entangle = false; @@ -201,16 +199,13 @@ public: JustCreated = false; } else CanAttack = true; - Unit* remo; + for (uint8 i = 0; i < 4; ++i) - { - remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i]); - if (remo) + if (Unit* remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i])) remo->setDeathState(JUST_DIED); - } - if (instance) - instance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); + if (Instance) + Instance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); ShieldGeneratorChannel[0] = 0; ShieldGeneratorChannel[1] = 0; ShieldGeneratorChannel[2] = 0; @@ -219,12 +214,12 @@ public: me->SetCorpseDelay(1000*60*60); } - //Called when a tainted elemental dies + // Called when a tainted elemental dies void EventTaintedElementalDeath() { - //the next will spawn 50 seconds after the previous one's death - if (TaintedElemental_Timer > 50000) - TaintedElemental_Timer = 50000; + // the next will spawn 50 seconds after the previous one's death + if (TaintedElementalTimer > 50000) + TaintedElementalTimer = 50000; } void KilledUnit(Unit* /*victim*/) { @@ -235,8 +230,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (instance) - instance->SetData(DATA_LADYVASHJEVENT, DONE); + if (Instance) + Instance->SetData(DATA_LADYVASHJEVENT, DONE); } void StartEvent() @@ -245,26 +240,22 @@ public: Phase = 1; - if (instance) - instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); + if (Instance) + Instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } void EnterCombat(Unit* who) { - if (instance) + if (Instance) { - //remove old tainted cores to prevent cheating in phase 2 + // remove old tainted cores to prevent cheating in phase 2 Map* map = me->GetMap(); Map::PlayerList const &PlayerList = map->GetPlayers(); - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - { - if (Player* i_pl = i->getSource()) - { - i_pl->DestroyItemCount(31088, 1, true); - } - } + for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) + if (Player* player = itr->getSource()) + player->DestroyItemCount(31088, 1, true); } - StartEvent();//this is EnterCombat(), so were are 100% in combat, start the event + StartEvent(); // this is EnterCombat(), so were are 100% in combat, start the event if (Phase != 2) AttackStart(who); @@ -287,10 +278,7 @@ public: float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius) && me->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && me->IsWithinLOSInMap(who)) { - //if (who->HasStealthAura()) - // who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - if (!me->isInCombat())//AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking + if (!me->isInCombat()) // AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking StartEvent(); if (Phase != 2) @@ -304,13 +292,13 @@ public: switch (urand(0, 1)) { case 0: - //Shoot - //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits her target for 4097-5543 Physical damage. + // Shoot + // Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits her target for 4097-5543 Physical damage. DoCast(me->getVictim(), SPELL_SHOOT); break; case 1: - //Multishot - //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits 1 person and 4 people around him for 6475-7525 physical damage. + // Multishot + // Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits 1 person and 4 people around him for 6475-7525 physical damage. DoCast(me->getVictim(), SPELL_MULTI_SHOT); break; } @@ -329,231 +317,209 @@ public: CanAttack = true; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); AggroTimer=19000; - }else + } + else { AggroTimer-=diff; return; } } - //to prevent abuses during phase 2 + // to prevent abuses during phase 2 if (Phase == 2 && !me->getVictim() && me->isInCombat()) { EnterEvadeMode(); return; } - //Return since we have no target + // Return since we have no target if (!UpdateVictim()) return; if (Phase == 1 || Phase == 3) { - //ShockBlast_Timer - if (ShockBlast_Timer <= diff) + // ShockBlastTimer + if (ShockBlastTimer <= diff) { - //Shock Burst - //Randomly used in Phases 1 and 3 on Vashj's target, it's a Shock spell doing 8325-9675 nature damage and stunning the target for 5 seconds, during which she will not attack her target but switch to the next person on the aggro list. + // Shock Burst + // Randomly used in Phases 1 and 3 on Vashj's target, it's a Shock spell doing 8325-9675 nature damage and stunning the target for 5 seconds, during which she will not attack her target but switch to the next person on the aggro list. DoCast(me->getVictim(), SPELL_SHOCK_BLAST); me->TauntApply(me->getVictim()); - ShockBlast_Timer = 1000+rand()%14000; //random cooldown - } else ShockBlast_Timer -= diff; + ShockBlastTimer = 1000+rand()%14000; // random cooldown + } else ShockBlastTimer -= diff; - //StaticCharge_Timer - if (StaticCharge_Timer <= diff) + // StaticChargeTimer + if (StaticChargeTimer <= diff) { - //Static Charge - //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); - - if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) - //cast Static Charge every 2 seconds for 20 seconds - DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); + // Static Charge + // Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); + if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) + DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); // cast Static Charge every 2 seconds for 20 seconds - StaticCharge_Timer = 10000+rand()%20000; //blizzlike - } else StaticCharge_Timer -= diff; + StaticChargeTimer = 10000+rand()%20000; + } else StaticChargeTimer -= diff; - //Entangle_Timer - if (Entangle_Timer <= diff) + // EntangleTimer + if (EntangleTimer <= diff) { if (!Entangle) { - //Entangle - //Used in Phases 1 and 3, it casts Entangling Roots on everybody in a 15 yard radius of Vashj, immobilzing them for 10 seconds and dealing 500 damage every 2 seconds. It's not a magic effect so it cannot be dispelled, but is removed by various buffs such as Cloak of Shadows or Blessing of Freedom. + // Entangle + // Used in Phases 1 and 3, it casts Entangling Roots on everybody in a 15 yard radius of Vashj, immobilzing them for 10 seconds and dealing 500 damage every 2 seconds. It's not a magic effect so it cannot be dispelled, but is removed by various buffs such as Cloak of Shadows or Blessing of Freedom. DoCast(me->getVictim(), SPELL_ENTANGLE); Entangle = true; - Entangle_Timer = 10000; + EntangleTimer = 10000; } else { CastShootOrMultishot(); Entangle = false; - Entangle_Timer = 20000+rand()%5000; + EntangleTimer = 20000+rand()%5000; } - } else Entangle_Timer -= diff; + } else EntangleTimer -= diff; - //Phase 1 + // Phase 1 if (Phase == 1) { - //Start phase 2 + // Start phase 2 if (HealthBelowPct(70)) { - //Phase 2 begins when Vashj hits 70%. She will run to the middle of her platform and surround herself in a shield making her invulerable. + // Phase 2 begins when Vashj hits 70%. She will run to the middle of her platform and surround herself in a shield making her invulerable. Phase = 2; me->GetMotionMaster()->Clear(); DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z); - Creature* creature; for (uint8 i = 0; i < 4; ++i) - { - creature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); - if (creature) + if (Creature* creature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0)) ShieldGeneratorChannel[i] = creature->GetGUID(); - } + DoScriptText(SAY_PHASE2, me); } } - //Phase 3 + // Phase 3 else { - //SummonSporebat_Timer - if (SummonSporebat_Timer <= diff) + // SummonSporebatTimer + if (SummonSporebatTimer <= diff) { - Creature* Sporebat = NULL; - Sporebat = me->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0); + if (Creature* sporebat = me->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + sporebat->AI()->AttackStart(target); - if (Sporebat) - { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (target) - Sporebat->AI()->AttackStart(target); - } + // summon sporebats faster and faster + if (SummonSporebatStaticTimer > 1000) + SummonSporebatStaticTimer -= 1000; - //summon sporebats faster and faster - if (SummonSporebat_StaticTimer > 1000) - SummonSporebat_StaticTimer -= 1000; + SummonSporebatTimer = SummonSporebatStaticTimer; - SummonSporebat_Timer = SummonSporebat_StaticTimer; + if (SummonSporebatTimer < 5000) + SummonSporebatTimer = 5000; - if (SummonSporebat_Timer < 5000) - SummonSporebat_Timer = 5000; - - } else SummonSporebat_Timer -= diff; + } else SummonSporebatTimer -= diff; } - //Melee attack + // Melee attack DoMeleeAttackIfReady(); - //Check_Timer - used to check if somebody is in melee range - if (Check_Timer <= diff) + // CheckTimer - used to check if somebody is in melee range + if (CheckTimer <= diff) { - bool InMeleeRange = false; - Unit* target; + bool inMeleeRange = false; std::list t_list = me->getThreatManager().getThreatList(); for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - //if in melee range - if (target && target->IsWithinDistInMap(me, 5)) + Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (target && target->IsWithinDistInMap(me, 5)) // if in melee range { - InMeleeRange = true; + inMeleeRange = true; break; } } - //if nobody is in melee range - if (!InMeleeRange) + // if nobody is in melee range + if (!inMeleeRange) CastShootOrMultishot(); - Check_Timer = 5000; - } else Check_Timer -= diff; + CheckTimer = 5000; + } else CheckTimer -= diff; } - //Phase 2 + // Phase 2 else { - //ForkedLightning_Timer - if (ForkedLightning_Timer <= diff) + // ForkedLightningTimer + if (ForkedLightningTimer <= diff) { - //Forked Lightning - //Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + // Forked Lightning + // Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!target) target = me->getVictim(); DoCast(target, SPELL_FORKED_LIGHTNING); - ForkedLightning_Timer = 2000+rand()%6000; //blizzlike - } else ForkedLightning_Timer -= diff; + ForkedLightningTimer = 2000+rand()%6000; + } else ForkedLightningTimer -= diff; - //EnchantedElemental_Timer - if (EnchantedElemental_Timer <= diff) + // EnchantedElementalTimer + if (EnchantedElementalTimer <= diff) { - me->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElemental_Pos][0], ElementPos[EnchantedElemental_Pos][1], ElementPos[EnchantedElemental_Pos][2], ElementPos[EnchantedElemental_Pos][3], TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElementalPos][0], ElementPos[EnchantedElementalPos][1], ElementPos[EnchantedElementalPos][2], ElementPos[EnchantedElementalPos][3], TEMPSUMMON_CORPSE_DESPAWN, 0); - if (EnchantedElemental_Pos == 7) - EnchantedElemental_Pos = 0; + if (EnchantedElementalPos == 7) + EnchantedElementalPos = 0; else - ++EnchantedElemental_Pos; + ++EnchantedElementalPos; - EnchantedElemental_Timer = 10000+rand()%5000; - } else EnchantedElemental_Timer -= diff; + EnchantedElementalTimer = 10000+rand()%5000; + } else EnchantedElementalTimer -= diff; - //TaintedElemental_Timer - if (TaintedElemental_Timer <= diff) + // TaintedElementalTimer + if (TaintedElementalTimer <= diff) { uint32 pos = rand()%8; me->SummonCreature(TAINTED_ELEMENTAL, ElementPos[pos][0], ElementPos[pos][1], ElementPos[pos][2], ElementPos[pos][3], TEMPSUMMON_DEAD_DESPAWN, 0); - TaintedElemental_Timer = 120000; - } else TaintedElemental_Timer -= diff; + TaintedElementalTimer = 120000; + } else TaintedElementalTimer -= diff; - //CoilfangElite_Timer - if (CoilfangElite_Timer <= diff) + // CoilfangEliteTimer + if (CoilfangEliteTimer <= diff) { uint32 pos = rand()%3; - Creature* CoilfangElite = NULL; - CoilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - if (CoilfangElite) + Creature* coilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + if (coilfangElite) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (target) - CoilfangElite->AI()->AttackStart(target); + if (Unit* target = target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + coilfangElite->AI()->AttackStart(target); else if (me->getVictim()) - CoilfangElite->AI()->AttackStart(me->getVictim()); + coilfangElite->AI()->AttackStart(me->getVictim()); } - CoilfangElite_Timer = 45000+rand()%5000; - } else CoilfangElite_Timer -= diff; + CoilfangEliteTimer = 45000+rand()%5000; + } else CoilfangEliteTimer -= diff; - //CoilfangStrider_Timer - if (CoilfangStrider_Timer <= diff) + // CoilfangStriderTimer + if (CoilfangStriderTimer <= diff) { uint32 pos = rand()%3; - Creature* CoilfangStrider = NULL; - CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - if (CoilfangStrider) + if (Creature* CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (target) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) CoilfangStrider->AI()->AttackStart(target); else if (me->getVictim()) CoilfangStrider->AI()->AttackStart(me->getVictim()); } - CoilfangStrider_Timer = 60000+rand()%10000; - } else CoilfangStrider_Timer -= diff; + CoilfangStriderTimer = 60000+rand()%10000; + } else CoilfangStriderTimer -= diff; - //Check_Timer - if (Check_Timer <= diff) + // CheckTimer + if (CheckTimer <= diff) { - //Start Phase 3 - if (instance && instance->GetData(DATA_CANSTARTPHASE3)) + // Start Phase 3 + if (Instance && Instance->GetData(DATA_CANSTARTPHASE3)) { - //set life 50% + // set life 50% me->SetHealth(me->CountPctFromMaxHealth(50)); me->RemoveAurasDueToSpell(SPELL_MAGIC_BARRIER); @@ -562,19 +528,19 @@ public: Phase = 3; - //return to the tank + // return to the tank me->GetMotionMaster()->MoveChase(me->getVictim()); } - Check_Timer = 1000; - } else Check_Timer -= diff; + CheckTimer = 1000; + } else CheckTimer -= diff; } } }; }; -//Enchanted Elemental -//If one of them reaches Vashj he will increase her damage done by 5%. +// Enchanted Elemental +// If one of them reaches Vashj he will increase her damage done by 5%. class mob_enchanted_elemental : public CreatureScript { public: @@ -589,42 +555,42 @@ public: { mob_enchanted_elementalAI(Creature* c) : ScriptedAI(c) { - instance = c->GetInstanceScript(); + Instance = c->GetInstanceScript(); } - InstanceScript* instance; - uint32 move; - uint32 phase; - float x, y, z; + InstanceScript* Instance; + uint32 Move; + uint32 Phase; + float X, Y, Z; uint64 VashjGUID; void Reset() { - me->SetSpeed(MOVE_WALK, 0.6f);//walk - me->SetSpeed(MOVE_RUN, 0.6f);//run - move = 0; - phase = 1; + me->SetSpeed(MOVE_WALK, 0.6f); // walk + me->SetSpeed(MOVE_RUN, 0.6f); // run + Move = 0; + Phase = 1; VashjGUID = 0; - x = ElementWPPos[0][0]; - y = ElementWPPos[0][1]; - z = ElementWPPos[0][2]; + X = ElementWPPos[0][0]; + Y = ElementWPPos[0][1]; + Z = ElementWPPos[0][2]; //search for nearest waypoint (up on stairs) for (uint32 i = 1; i < 8; ++i) { - if (me->GetDistance(ElementWPPos[i][0], ElementWPPos[i][1], ElementWPPos[i][2]) < me->GetDistance(x, y, z)) + if (me->GetDistance(ElementWPPos[i][0], ElementWPPos[i][1], ElementWPPos[i][2]) < me->GetDistance(X, Y, Z)) { - x = ElementWPPos[i][0]; - y = ElementWPPos[i][1]; - z = ElementWPPos[i][2]; + X = ElementWPPos[i][0]; + Y = ElementWPPos[i][1]; + Z = ElementWPPos[i][2]; } } - if (instance) - VashjGUID = instance->GetData64(DATA_LADYVASHJ); + if (Instance) + VashjGUID = Instance->GetData64(DATA_LADYVASHJ); } void EnterCombat(Unit* /*who*/) {} @@ -633,47 +599,42 @@ public: void UpdateAI(const uint32 diff) { - if (!instance) + if (!Instance) return; if (!VashjGUID) return; - if (move <= diff) + if (Move <= diff) { me->SetWalk(true); - if (phase == 1) - me->GetMotionMaster()->MovePoint(0, x, y, z); - if (phase == 1 && me->IsWithinDist3d(x, y, z, 0.1f)) - phase = 2; - if (phase == 2) + if (Phase == 1) + me->GetMotionMaster()->MovePoint(0, X, Y, Z); + if (Phase == 1 && me->IsWithinDist3d(X, Y, Z, 0.1f)) + Phase = 2; + if (Phase == 2) { me->GetMotionMaster()->MovePoint(0, MIDDLE_X, MIDDLE_Y, MIDDLE_Z); - phase = 3; + Phase = 3; } - if (phase == 3) + if (Phase == 3) { me->GetMotionMaster()->MovePoint(0, MIDDLE_X, MIDDLE_Y, MIDDLE_Z); if (me->IsWithinDist3d(MIDDLE_X, MIDDLE_Y, MIDDLE_Z, 3)) DoCast(me, SPELL_SURGE); } - if (Creature* Vashj = Unit::GetCreature(*me, VashjGUID)) - { - if (!Vashj->isInCombat() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase != 2 || Vashj->isDead()) - { - //call Unsummon() + if (Creature* vashj = Unit::GetCreature(*me, VashjGUID)) + if (!vashj->isInCombat() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->Phase != 2 || vashj->isDead()) me->Kill(me); - } - } - move = 1000; - } else move -= diff; + Move = 1000; + } else Move -= diff; } }; }; -//Tainted Elemental -//This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental +// Tainted Elemental +// This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental class mob_tainted_elemental : public CreatureScript { public: @@ -688,30 +649,25 @@ public: { mob_tainted_elementalAI(Creature* c) : ScriptedAI(c) { - instance = c->GetInstanceScript(); + Instance = c->GetInstanceScript(); } - InstanceScript* instance; + InstanceScript* Instance; - uint32 PoisonBolt_Timer; - uint32 Despawn_Timer; + uint32 PoisonBoltTimer; + uint32 DespawnTimer; void Reset() { - PoisonBolt_Timer = 5000+rand()%5000; - Despawn_Timer = 30000; + PoisonBoltTimer = 5000+rand()%5000; + DespawnTimer = 30000; } void JustDied(Unit* /*killer*/) { - if (instance) - { - Creature* Vashj = NULL; - Vashj = (Unit::GetCreature((*me), instance->GetData64(DATA_LADYVASHJ))); - - if (Vashj) - CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->EventTaintedElementalDeath(); - } + if (Instance) + if (Creature* vashj = Unit::GetCreature((*me), Instance->GetData64(DATA_LADYVASHJ))) + CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->EventTaintedElementalDeath(); } void EnterCombat(Unit* who) @@ -721,27 +677,26 @@ public: void UpdateAI(const uint32 diff) { - //PoisonBolt_Timer - if (PoisonBolt_Timer <= diff) + // PoisonBoltTimer + if (PoisonBoltTimer <= diff) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (target && target->IsWithinDistInMap(me, 30)) DoCast(target, SPELL_POISON_BOLT); - PoisonBolt_Timer = 5000+rand()%5000; - } else PoisonBolt_Timer -= diff; + PoisonBoltTimer = 5000+rand()%5000; + } else PoisonBoltTimer -= diff; - //Despawn_Timer - if (Despawn_Timer <= diff) + // DespawnTimer + if (DespawnTimer <= diff) { - //call Unsummon() + // call Unsummon() me->setDeathState(DEAD); - //to prevent crashes - Despawn_Timer = 1000; - } else Despawn_Timer -= diff; + // to prevent crashes + DespawnTimer = 1000; + } else DespawnTimer -= diff; } }; @@ -763,35 +718,29 @@ public: { mob_toxic_sporebatAI(Creature* c) : ScriptedAI(c) { - instance = c->GetInstanceScript(); + Instance = c->GetInstanceScript(); EnterEvadeMode(); } - InstanceScript* instance; + InstanceScript* Instance; - uint32 movement_timer; - uint32 ToxicSpore_Timer; - uint32 bolt_timer; - uint32 Check_Timer; + uint32 MovementTimer; + uint32 ToxicSporeTimer; + uint32 BoltTimer; + uint32 CheckTimer; void Reset() { me->SetLevitate(true); me->setFaction(14); - movement_timer = 0; - ToxicSpore_Timer = 5000; - bolt_timer = 5500; - Check_Timer = 1000; - } - - void EnterCombat(Unit* /*who*/) - { - + MovementTimer = 0; + ToxicSporeTimer = 5000; + BoltTimer = 5500; + CheckTimer = 1000; } void MoveInLineOfSight(Unit* /*who*/) { - } void MovementInform(uint32 type, uint32 id) @@ -800,113 +749,57 @@ public: return; if (id == 1) - movement_timer = 0; + MovementTimer = 0; } void UpdateAI (const uint32 diff) { - //Random movement - if (movement_timer <= diff) + // Random movement + if (MovementTimer <= diff) { uint32 rndpos = rand()%8; me->GetMotionMaster()->MovePoint(1, SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); - movement_timer = 6000; - } else movement_timer -= diff; + MovementTimer = 6000; + } else MovementTimer -= diff; - //toxic spores - if (bolt_timer <= diff) + // toxic spores + if (BoltTimer <= diff) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (target) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); - if (trig) + if (Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000)) { trig->setFaction(14); trig->CastSpell(trig, SPELL_TOXIC_SPORES, true); } } - bolt_timer = 10000+rand()%5000; + BoltTimer = 10000+rand()%5000; } - else bolt_timer -= diff; + else BoltTimer -= diff; - //Check_Timer - if (Check_Timer <= diff) + // CheckTimer + if (CheckTimer <= diff) { - if (instance) + if (Instance) { - //check if vashj is death - Unit* Vashj = NULL; - Vashj = Unit::GetUnit((*me), instance->GetData64(DATA_LADYVASHJ)); + // check if vashj is death + Unit* Vashj = Unit::GetUnit((*me), Instance->GetData64(DATA_LADYVASHJ)); if (!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashj::boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3)) { - //remove + // remove me->setDeathState(DEAD); me->RemoveCorpse(); me->setFaction(35); } } - Check_Timer = 1000; - } else Check_Timer -= diff; + CheckTimer = 1000; + } else CheckTimer -= diff; } }; }; -//Coilfang Elite -//It's an elite Naga mob with 170, 000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage -class mob_coilfang_elite : public CreatureScript -{ -public: - mob_coilfang_elite() : CreatureScript("mob_coilfang_elite") { } - - CreatureAI* GetAI(Creature* creature) const - { - SimpleAI* ai = new SimpleAI (creature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = 31345; //Cleave - ai->Spell[0].Cooldown = 15000; - ai->Spell[0].CooldownRandomAddition = 5000; - ai->Spell[0].First_Cast = 5000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_RANDOM; - - ai->EnterEvadeMode(); - - return ai; - } - -}; - -//Coilfang Strider -//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds, for 5 seconds and increasing their movement speed by 150% during the fear. -class mob_coilfang_strider : public CreatureScript -{ -public: - mob_coilfang_strider() : CreatureScript("mob_coilfang_strider") { } - - CreatureAI* GetAI(Creature* creature) const - { - SimpleAI* ai = new SimpleAI (creature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = 41374; //Mind Blast - ai->Spell[0].Cooldown = 30000; - ai->Spell[0].CooldownRandomAddition = 10000; - ai->Spell[0].First_Cast = 8000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - - //Scream aura not implemented - - ai->EnterEvadeMode(); - - return ai; - } - -}; - class mob_shield_generator_channel : public CreatureScript { public: @@ -921,46 +814,44 @@ public: { mob_shield_generator_channelAI(Creature* c) : ScriptedAI(c) { - instance = c->GetInstanceScript(); + Instance = c->GetInstanceScript(); } - InstanceScript* instance; - uint32 Check_Timer; + InstanceScript* Instance; + uint32 CheckTimer; bool Casted; + void Reset() { - Check_Timer = 0; + CheckTimer = 0; Casted = false; - me->SetDisplayId(11686); //invisible + me->SetDisplayId(11686); // invisible me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI (const uint32 diff) { - if (!instance) + if (!Instance) return; - if (Check_Timer <= diff) + if (CheckTimer <= diff) { - Unit* Vashj = NULL; - Vashj = Unit::GetUnit((*me), instance->GetData64(DATA_LADYVASHJ)); + Unit* vashj = Unit::GetUnit((*me), Instance->GetData64(DATA_LADYVASHJ)); - if (Vashj && Vashj->isAlive()) + if (vashj && vashj->isAlive()) { - //start visual channel - if (!Casted || !Vashj->HasAura(SPELL_MAGIC_BARRIER)) + // start visual channel + if (!Casted || !vashj->HasAura(SPELL_MAGIC_BARRIER)) { - DoCast(Vashj, SPELL_MAGIC_BARRIER, true); + DoCast(vashj, SPELL_MAGIC_BARRIER, true); Casted = true; } } - Check_Timer = 1000; - } else Check_Timer -= diff; + CheckTimer = 1000; + } else CheckTimer -= diff; } }; @@ -971,7 +862,7 @@ class item_tainted_core : public ItemScript public: item_tainted_core() : ItemScript("item_tainted_core") { } - bool OnUse(Player* player, Item* /*_Item*/, SpellCastTargets const& targets) + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) { InstanceScript* instance = player->GetInstanceScript(); @@ -981,31 +872,30 @@ public: return true; } - Creature* Vashj = NULL; - Vashj = (Unit::GetCreature((*player), instance->GetData64(DATA_LADYVASHJ))); - if (Vashj && (CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase == 2)) + Creature* vashj = Unit::GetCreature((*player), instance->GetData64(DATA_LADYVASHJ)); + if (vashj && (CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->Phase == 2)) { if (GameObject* gObj = targets.GetGOTarget()) { uint32 identifier; - uint8 channel_identifier; + uint8 channelIdentifier; switch (gObj->GetEntry()) { case 185052: identifier = DATA_SHIELDGENERATOR1; - channel_identifier = 0; + channelIdentifier = 0; break; case 185053: identifier = DATA_SHIELDGENERATOR2; - channel_identifier = 1; + channelIdentifier = 1; break; case 185051: identifier = DATA_SHIELDGENERATOR3; - channel_identifier = 2; + channelIdentifier = 2; break; case 185054: identifier = DATA_SHIELDGENERATOR4; - channel_identifier = 3; + channelIdentifier = 3; break; default: return true; @@ -1017,18 +907,17 @@ public: return true; } - //get and remove channel - Unit* Channel = NULL; - Channel = Unit::GetCreature(*Vashj, CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->ShieldGeneratorChannel[channel_identifier]); - if (Channel) + // get and remove channel + + if (Unit* channel = Unit::GetCreature(*vashj, CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->ShieldGeneratorChannel[channelIdentifier])) { - //call Unsummon() - Channel->setDeathState(JUST_DIED); + // call Unsummon() + channel->setDeathState(JUST_DIED); } instance->SetData(identifier, 1); - //remove this item + // remove this item player->DestroyItemCount(31088, 1, true); return true; } @@ -1052,8 +941,6 @@ void AddSC_boss_lady_vashj() new mob_enchanted_elemental(); new mob_tainted_elemental(); new mob_toxic_sporebat(); - new mob_coilfang_elite(); - new mob_coilfang_strider(); new mob_shield_generator_channel(); new item_tainted_core(); } 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 0ed9d8e7833..4af20d70816 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -25,7 +25,6 @@ EndScriptData */ #include "ScriptPCH.h" #include "serpent_shrine.h" -#include "ScriptedSimpleAI.h" #include "Spell.h" #define SPELL_SPOUT 37433 @@ -55,15 +54,16 @@ EndScriptData */ float AddPos[9][3] = { - {2.8553810f, -459.823914f, -19.182686f}, //MOVE_AMBUSHER_1 X, Y, Z - {12.400000f, -466.042267f, -19.182686f}, //MOVE_AMBUSHER_2 X, Y, Z - {51.366653f, -460.836060f, -19.182686f}, //MOVE_AMBUSHER_3 X, Y, Z - {62.597980f, -457.433044f, -19.182686f}, //MOVE_AMBUSHER_4 X, Y, Z - {77.607452f, -384.302765f, -19.182686f}, //MOVE_AMBUSHER_5 X, Y, Z - {63.897900f, -378.984924f, -19.182686f}, //MOVE_AMBUSHER_6 X, Y, Z - {34.447250f, -387.333618f, -19.182686f}, //MOVE_GUARDIAN_1 X, Y, Z - {14.388216f, -423.468018f, -19.625271f}, //MOVE_GUARDIAN_2 X, Y, Z - {42.471519f, -445.115295f, -19.769423f} //MOVE_GUARDIAN_3 X, Y, Z + // MOVE_AMBUSHER_1 X, Y, Z + {2.8553810f, -459.823914f, -19.182686f}, + {12.400000f, -466.042267f, -19.182686f}, + {51.366653f, -460.836060f, -19.182686f}, + {62.597980f, -457.433044f, -19.182686f}, + {77.607452f, -384.302765f, -19.182686f}, + {63.897900f, -378.984924f, -19.182686f}, + {34.447250f, -387.333618f, -19.182686f}, + {14.388216f, -423.468018f, -19.625271f}, + {42.471519f, -445.115295f, -19.769423f} }; class boss_the_lurker_below : public CreatureScript @@ -80,10 +80,10 @@ public: { boss_the_lurker_belowAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { - instance = c->GetInstanceScript(); + Instance = c->GetInstanceScript(); } - InstanceScript* instance; + InstanceScript* Instance; SummonList Summons; bool Spawned; @@ -103,7 +103,7 @@ public: bool CheckCanStart()//check if players fished { - if (instance && instance->GetData(DATA_STRANGE_POOL) == NOT_STARTED) + if (Instance && Instance->GetData(DATA_STRANGE_POOL) == NOT_STARTED) return false; return true; } @@ -112,39 +112,39 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); SpoutAnimTimer = 1000; RotTimer = 0; - WaterboltTimer = 15000;//give time to get in range when fight starts + WaterboltTimer = 15000; // give time to get in range when fight starts SpoutTimer = 45000; - WhirlTimer = 18000;//after avery spout + WhirlTimer = 18000; // after avery spout PhaseTimer = 120000; GeyserTimer = rand()%5000 + 15000; - CheckTimer = 15000;//give time to get in range when fight starts - WaitTimer = 60000;//never reached - WaitTimer2 = 60000;//never reached + CheckTimer = 15000; // give time to get in range when fight starts + WaitTimer = 60000; // never reached + WaitTimer2 = 60000; // never reached - Submerged = true;//will be false at combat start + Submerged = true; // will be false at combat start Spawned = false; InRange = false; CanStartEvent = false; Summons.DespawnAll(); - if (instance) + if (Instance) { - instance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED); - instance->SetData(DATA_STRANGE_POOL, NOT_STARTED); + Instance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED); + Instance->SetData(DATA_STRANGE_POOL, NOT_STARTED); } - DoCast(me, SPELL_SUBMERGE);//submerge anim - me->SetVisible(false);//we start invis under water, submerged + DoCast(me, SPELL_SUBMERGE); // submerge anim + me->SetVisible(false); // we start invis under water, submerged me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustDied(Unit* /*Killer*/) + void JustDied(Unit* /*killer*/) { - if (instance) + if (Instance) { - instance->SetData(DATA_THELURKERBELOWEVENT, DONE); - instance->SetData(DATA_STRANGE_POOL, IN_PROGRESS); + Instance->SetData(DATA_THELURKERBELOWEVENT, DONE); + Instance->SetData(DATA_STRANGE_POOL, IN_PROGRESS); } Summons.DespawnAll(); @@ -152,22 +152,20 @@ public: void EnterCombat(Unit* who) { - if (instance) - instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); + if (Instance) + Instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); Scripted_NoMovementAI::EnterCombat(who); } void MoveInLineOfSight(Unit* who) { - if (!CanStartEvent)//boss is invisible, don't attack + if (!CanStartEvent) // boss is invisible, don't attack return; if (!me->getVictim() && who->IsValidAttackTarget(me)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius)) - { AttackStart(who); - } } } @@ -179,7 +177,7 @@ public: void UpdateAI(const uint32 diff) { - if (!CanStartEvent)//boss is invisible, don't attack + if (!CanStartEvent) // boss is invisible, don't attack { if (CheckCanStart()) { @@ -190,21 +188,21 @@ public: WaitTimer2 = 500; } - if (!Submerged && WaitTimer2 <= diff)//wait 500ms before emerge anim + if (!Submerged && WaitTimer2 <= diff) // wait 500ms before emerge anim { me->RemoveAllAuras(); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); DoCast(me, SPELL_EMERGE, false); - WaitTimer2 = 60000;//never reached + WaitTimer2 = 60000; // never reached WaitTimer = 3000; } else WaitTimer2 -= diff; - if (WaitTimer <= diff)//wait 3secs for emerge anim, then attack + if (WaitTimer <= diff) // wait 3secs for emerge anim, then attack { WaitTimer = 3000; - CanStartEvent = true;//fresh fished from pool + CanStartEvent = true; // fresh fished from pool me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } @@ -214,7 +212,7 @@ public: return; } - if (me->getThreatManager().getThreatList().empty())//check if should evade + if (me->getThreatManager().getThreatList().empty()) // check if should evade { if (me->isInCombat()) EnterEvadeMode(); @@ -226,7 +224,7 @@ public: { me->InterruptNonMeleeSpells(false); DoCast(me, SPELL_SUBMERGE); - PhaseTimer = 60000;//60secs submerged + PhaseTimer = 60000; // 60secs submerged Submerged = true; } else PhaseTimer-=diff; @@ -236,12 +234,12 @@ public: me->SetReactState(REACT_PASSIVE); me->GetMotionMaster()->MoveRotate(20000, urand(0, 1) ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT); SpoutTimer = 45000; - WhirlTimer = 20000;//whirl directly after spout + WhirlTimer = 20000; // whirl directly after spout RotTimer = 20000; return; } else SpoutTimer -= diff; - //Whirl directly after a Spout and at random times + // Whirl directly after a Spout and at random times if (WhirlTimer <= diff) { WhirlTimer = 18000; @@ -273,7 +271,7 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) - DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water + DoCast(i->getSource(), SPELL_SPOUT, true); // only knock back players in arc, in 100yards, not in water } } @@ -300,7 +298,7 @@ public: GeyserTimer = rand()%5000 + 15000; } else GeyserTimer -= diff; - if (!InRange)//if on players in melee range cast Waterbolt + if (!InRange) // if on players in melee range cast Waterbolt { if (WaterboltTimer <= diff) { @@ -318,12 +316,13 @@ public: DoMeleeAttackIfReady(); - }else//submerged + } + else // submerged { if (PhaseTimer <= diff) { Submerged = false; - me->InterruptNonMeleeSpells(false);//shouldn't be any + me->InterruptNonMeleeSpells(false); // shouldn't be any me->RemoveAllAuras(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SUBMERGED); @@ -334,28 +333,22 @@ public: return; } else PhaseTimer-=diff; - if (me->getThreatManager().getThreatList().empty())//check if should evade + if (me->getThreatManager().getThreatList().empty()) // check if should evade { EnterEvadeMode(); return; } + if (!me->isInCombat()) DoZoneInCombat(); if (!Spawned) { me->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - //spawn adds + // spawn adds for (uint8 i = 0; i < 9; ++i) - { - Creature* Summoned; - if (i < 6) - Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - - if (Summoned) - Summons.Summon(Summoned); - } + if (Creature* summoned = me->SummonCreature(i < 6 ? MOB_COILFANG_AMBUSHER : MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0)) + Summons.Summon(summoned); Spawned = true; } } @@ -363,32 +356,6 @@ public: }; }; -class mob_coilfang_guardian : public CreatureScript -{ -public: - mob_coilfang_guardian() : CreatureScript("mob_coilfang_guardian") { } - - CreatureAI* GetAI(Creature* creature) const - { - SimpleAI* ai = new SimpleAI (creature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = SPELL_ARCINGSMASH; - ai->Spell[0].Cooldown = 15000; - ai->Spell[0].First_Cast = 5000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - - ai->Spell[1].Enabled = true; - ai->Spell[1].Spell_Id = SPELL_HAMSTRING; - ai->Spell[1].Cooldown = 10000; - ai->Spell[1].First_Cast = 2000; - ai->Spell[1].Cast_Target_Type = CAST_HOSTILE_TARGET; - - return ai; - } - -}; - class mob_coilfang_ambusher : public CreatureScript { public: @@ -412,12 +379,6 @@ public: { MultiShotTimer = 10000; ShootBowTimer = 4000; - - } - - void EnterCombat(Unit* /*who*/) - { - } void MoveInLineOfSight(Unit* who) @@ -438,18 +399,16 @@ public: DoCast(me->getVictim(), SPELL_SPREAD_SHOT, true); MultiShotTimer = 10000+rand()%10000; - ShootBowTimer += 1500;//add global cooldown + ShootBowTimer += 1500; // add global cooldown } else MultiShotTimer -= diff; if (ShootBowTimer <= diff) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); int bp0 = 1100; - if (target) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->CastCustomSpell(target, SPELL_SHOOT, &bp0, NULL, NULL, true); ShootBowTimer = 4000+rand()%5000; - MultiShotTimer += 1500;//add global cooldown + MultiShotTimer += 1500; // add global cooldown } else ShootBowTimer -= diff; } }; @@ -482,7 +441,6 @@ class go_strange_pool : public GameObjectScript void AddSC_boss_the_lurker_below() { new boss_the_lurker_below(); - new mob_coilfang_guardian(); new mob_coilfang_ambusher(); new go_strange_pool(); } -- cgit v1.2.3 From 6ffdef1e6c6aab91b70f78df44e4adda63a2c010 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 11 Mar 2012 17:10:27 +0000 Subject: SQL: Fix some failures in previous commit (2b2d054) Please, re-apply the SQL files. --- sql/updates/world/2012_03_10_00_world_creature.sql | 10 ++++----- sql/updates/world/2012_03_11_00_world_sai.sql | 25 +++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_10_00_world_creature.sql b/sql/updates/world/2012_03_10_00_world_creature.sql index 3a0f9dbda58..a0143af73c7 100644 --- a/sql/updates/world/2012_03_10_00_world_creature.sql +++ b/sql/updates/world/2012_03_10_00_world_creature.sql @@ -2,11 +2,11 @@ SET @GUID := 42153; DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+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`) VALUES -(@GUID,32666,530,1,0,0,0,9830.201,-7389.711,13.68803,5.532694,120,0,0,1,0,0), -(@GUID+1,32667,530,1,0,0,0,9859.044,-7406.975,13.7113,1.658063,120,0,0,1,0,0), -(@GUID+2,31144,530,1,0,0,0,9869.401,-7389.657,13.69022,3.90953755,120,0,0,1,0,0), -(@GUID+3,31144,530,1,0,0,0,9871.973,-7392.763,13.6818113,3.35103226,120,0,0,1,0,0), -(@GUID+4,31146,530,1,0,0,0,9850.529,-7395.442,13.72216,4.694936,120,0,0,1,0,0); +(@GUID,32666,530,1,1,0,0,9830.201,-7389.711,13.68803,5.532694,120,0,0,1,0,0), +(@GUID+1,32667,530,1,1,0,0,9859.044,-7406.975,13.7113,1.658063,120,0,0,1,0,0), +(@GUID+2,31144,530,1,1,0,0,9869.401,-7389.657,13.69022,3.90953755,120,0,0,1,0,0), +(@GUID+3,31144,530,1,1,0,0,9871.973,-7392.763,13.6818113,3.35103226,120,0,0,1,0,0), +(@GUID+4,31146,530,1,1,0,0,9850.529,-7395.442,13.72216,4.694936,120,0,0,1,0,0); -- Addons DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+4; DELETE FROM `creature_addon` WHERE `guid`=66686; diff --git a/sql/updates/world/2012_03_11_00_world_sai.sql b/sql/updates/world/2012_03_11_00_world_sai.sql index e5eee10f6f1..a8cab265ac0 100644 --- a/sql/updates/world/2012_03_11_00_world_sai.sql +++ b/sql/updates/world/2012_03_11_00_world_sai.sql @@ -1,13 +1,13 @@ -- Coilfang Guardian -DELETE FROM `smart_scripts` WHERE (`entryorguid`=21873 AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE `entryorguid`=21873 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 (21873, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 15000, 11, 28168, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Arcing Smash'), (21873, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 9080, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Harmstring'), (21873, 0, 2, 0, 0, 0, 50, 0, 3000, 4000, 10000, 20000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Say 0'); -- randomly guessed timers DELETE FROM `creature_text` WHERE `entry`=21873; -INSERT INTO `world`.`creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES (21873, 0, 0, 'By Nazjatar''s Depths!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), (21873, 0, 1, 'Die, warmblood!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), (21873, 0, 2, 'For the Master!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), @@ -18,7 +18,7 @@ UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` -- Coilfang Strider -DELETE FROM `smart_scripts` WHERE (`entryorguid`=22056 AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE `entryorguid`=22056 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 (22056, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 11, 38257, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - On Reset - Cast Panic Periodic'), (22056, 0, 1, 0, 0, 0, 0, 0, 8000, 8000, 30000, 40000, 11, 38259, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - IC - Cast Mind Blast'); @@ -27,7 +27,7 @@ UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` -- Coilfang Elite -DELETE FROM `smart_scripts` WHERE (`entryorguid`=22055 AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE `entryorguid`=22055 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 (22055, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 20000, 11, 38260, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Cleave'), (22055, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 38262, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Harmstring'); @@ -36,23 +36,24 @@ UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` -- Core Hound -DELETE FROM `smart_scripts` WHERE (`entryorguid`=11673 AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE `entryorguid`=11673 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 11673*100+0 AND 11673*100+5 AND `source_type`=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 (11673, 0, 0, 0, 0, 0, 0, 0, 10000, 10000, 7000, 7000, 11, 19272, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Lava Breath'), (11673, 0, 1, 0, 0, 0, 0, 0, 4000, 4000, 6000, 6000, 11, 19319, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Vicious Bite'), (11673, 0, 2, 0, 0, 0, 0, 0, 15000, 15000, 24000, 24000, 88, 11673*100+0, 11673*100+5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Call random script'), -(11673*100+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19364, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 0 - Cast Ground Stomp'), -(11673*100+1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19366, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 1 - Cast Cauterizing Flames'), -(11673*100+2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19367, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 2 - Cast Withering Heat'), -(11673*100+3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19369, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 3 - Cast Ancient Despair'), -(11673*100+4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19372, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 4 - Cast Ancient Hysteria'), -(11673*100+5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19365, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 5 - Cast Ancient Dread'); +(11673*100+0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19364, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 0 - Cast Ground Stomp'), +(11673*100+1, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19366, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 1 - Cast Cauterizing Flames'), +(11673*100+2, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19367, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 2 - Cast Withering Heat'), +(11673*100+3, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19369, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 3 - Cast Ancient Despair'), +(11673*100+4, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19372, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 4 - Cast Ancient Hysteria'), +(11673*100+5, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19365, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 5 - Cast Ancient Dread'); UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=11673; -- Shadow of Aran -DELETE FROM `smart_scripts` WHERE (`entryorguid`=18254 AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE `entryorguid`=18254 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 (18254, 0, 0, 0, 0, 0, 0, 0, 1000, 1000, 5000, 5000, 11, 29978, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Shadow of Aran - IC - Cast Pyro Blast'); -- cgit v1.2.3 From 03a24a84e493f914d46488e8c4ae9e9d663c21d7 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 12 Mar 2012 00:45:58 +0100 Subject: Core/Units: - Implement UNIT_FIELD_HOVERHEIGHT (requires DB data). This field, sent in update object packet, will determine the height at which a creature hovers if it has movementflag_hover applied. Note that hovering will now update the server-sided z-coordinate by the value of this field, and that all subsequent positional updates to the client will need to send z coordinate MINUS the hover height offset, or the hoverheight will be visually doubled client side. - Correct our usage of movementflag_flying, movementflag_can_fly, movementflag_hover and movementflag_disable_gravity (previously levitate), and how they relate to InhabitType in the database. This fixes "flying creatures on steroids" bug (wings flapping too fast), and potentially a lot of visual issues in AI scripts. Note that a lot of scripts still set wrong movementflags, these need to be fixed on a case by case basis. - Send correct packets for SPELL_AURA_FEATHER_FALL, SPELL_AURA_WATER_WALK and SPELL_AURA_HOVER apply/unapply. - Send correct packet contents for movement update in Unit::SetSpeed. - Misc. cleanup in affected scripts. --- .../2012_03_12_00_world_creature_template.sql | 1 + src/server/game/AI/CoreAI/GuardAI.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 +- src/server/game/AI/SmartScripts/SmartAI.cpp | 12 +-- src/server/game/Entities/Creature/Creature.cpp | 104 ++++++++++++++------ src/server/game/Entities/Creature/Creature.h | 6 +- src/server/game/Entities/Object/Object.cpp | 19 +++- src/server/game/Entities/Object/Object.h | 3 +- src/server/game/Entities/Player/Player.cpp | 20 ++++ src/server/game/Entities/Player/Player.h | 9 +- src/server/game/Entities/Unit/Unit.cpp | 109 ++++++++++++++------- src/server/game/Entities/Unit/Unit.h | 45 ++++++--- src/server/game/Globals/ObjectMgr.cpp | 49 +++++---- src/server/game/Maps/Map.cpp | 12 +++ .../MovementGenerators/PointMovementGenerator.cpp | 2 +- .../MovementGenerators/RandomMovementGenerator.cpp | 2 +- src/server/game/Movement/Spline/MoveSplineInit.cpp | 2 +- src/server/game/Server/Protocol/Opcodes.cpp | 6 +- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 41 ++++---- src/server/scripts/Commands/cs_reload.cpp | 35 +++---- .../EasternKingdoms/Karazhan/boss_nightbane.cpp | 4 +- .../scripts/EasternKingdoms/Karazhan/karazhan.cpp | 2 +- .../MagistersTerrace/boss_felblood_kaelthas.cpp | 4 +- .../ScarletEnclave/the_scarlet_enclave.cpp | 2 +- .../ScarletMonastery/boss_headless_horseman.cpp | 4 +- .../SunwellPlateau/boss_brutallus.cpp | 2 +- .../SunwellPlateau/boss_felmyst.cpp | 6 +- .../SunwellPlateau/boss_kalecgos.cpp | 8 +- .../SunwellPlateau/boss_kiljaeden.cpp | 6 +- .../EasternKingdoms/ZulAman/boss_akilzon.cpp | 6 +- .../EasternKingdoms/ZulAman/boss_janalai.cpp | 2 +- src/server/scripts/EasternKingdoms/undercity.cpp | 4 +- .../EasternKingdoms/western_plaguelands.cpp | 2 +- .../BattleForMountHyjal/hyjal_trash.cpp | 6 +- .../scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp | 4 +- src/server/scripts/Kalimdor/silithus.cpp | 8 +- .../AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 1 + .../RubySanctum/boss_saviana_ragefire.cpp | 12 +-- .../TrialOfTheCrusader/boss_anubarak_trial.cpp | 5 +- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 4 +- .../FrozenHalls/PitOfSaron/boss_krickandick.cpp | 4 +- .../PitOfSaron/boss_scourgelord_tyrannus.cpp | 2 +- .../IcecrownCitadel/boss_blood_prince_council.cpp | 2 +- .../IcecrownCitadel/boss_blood_queen_lana_thel.cpp | 36 +++---- .../IcecrownCitadel/boss_deathbringer_saurfang.cpp | 10 +- .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 40 ++++---- .../IcecrownCitadel/boss_the_lich_king.cpp | 8 +- .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 4 +- .../scripts/Northrend/Naxxramas/boss_sapphiron.cpp | 4 +- .../Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 20 ++-- .../scripts/Northrend/Nexus/Oculus/boss_urom.cpp | 4 +- .../scripts/Northrend/Nexus/Oculus/boss_varos.cpp | 1 + .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_razorscale.cpp | 8 +- .../UtgardeKeep/boss_ingvar_the_plunderer.cpp | 1 + .../UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp | 1 + .../UtgardeKeep/UtgardePinnacle/boss_skadi.cpp | 6 +- .../UtgardeKeep/UtgardePinnacle/boss_svala.cpp | 94 ++++-------------- .../UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp | 2 +- src/server/scripts/Northrend/sholazar_basin.cpp | 2 +- .../SethekkHalls/boss_tailonking_ikiss.cpp | 2 +- .../scripts/Outland/BlackTemple/boss_illidan.cpp | 6 +- .../SerpentShrine/boss_lady_vashj.cpp | 2 +- .../SerpentShrine/boss_lurker_below.cpp | 2 +- .../SerpentShrine/instance_serpent_shrine.cpp | 2 +- .../HellfireRamparts/boss_vazruden_the_herald.cpp | 4 +- .../boss_watchkeeper_gargolmar.cpp | 2 +- .../scripts/Outland/TempestKeep/Eye/boss_alar.cpp | 6 +- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 2 +- .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 2 +- .../scripts/Outland/blades_edge_mountains.cpp | 2 +- src/server/scripts/Outland/shadowmoon_valley.cpp | 8 +- src/server/scripts/World/npcs_special.cpp | 3 +- 74 files changed, 487 insertions(+), 382 deletions(-) create mode 100644 sql/updates/world/2012_03_12_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_12_00_world_creature_template.sql b/sql/updates/world/2012_03_12_00_world_creature_template.sql new file mode 100644 index 00000000000..cc70ff7a557 --- /dev/null +++ b/sql/updates/world/2012_03_12_00_world_creature_template.sql @@ -0,0 +1 @@ +ALTER TABLE `creature_template` ADD COLUMN `HoverHeight` FLOAT NOT NULL DEFAULT 1 AFTER `InhabitType`; diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index b78fec7c142..df29d485cba 100755 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -54,7 +54,7 @@ bool GuardAI::CanSeeAlways(WorldObject const* obj) void GuardAI::MoveInLineOfSight(Unit* unit) { // Ignore Z for flying creatures - if (!me->canFly() && me->GetDistanceZ(unit) > CREATURE_Z_ATTACK_RANGE) + if (!me->CanFly() && me->GetDistanceZ(unit) > CREATURE_Z_ATTACK_RANGE) return; if (!me->getVictim() && me->IsValidAttackTarget(unit) && diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 1e0c3f5c1fc..688d48b41ad 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -95,7 +95,7 @@ void npc_escortAI::MoveInLineOfSight(Unit* who) if (HasEscortState(STATE_ESCORT_ESCORTING) && AssistPlayerInCombat(who)) return; - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; if (me->IsHostileTo(who)) diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index e0fe12082f1..13bbbe2c338 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -93,7 +93,7 @@ void FollowerAI::MoveInLineOfSight(Unit* who) if (HasFollowState(STATE_FOLLOW_INPROGRESS) && AssistPlayerInCombat(who)) return; - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; if (me->IsHostileTo(who)) diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 50c7aba0360..4cf438da5a4 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -729,17 +729,7 @@ void SmartAI::SetRun(bool run) void SmartAI::SetFly(bool fly) { - if (fly) - { - me->SetLevitate(true); - me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - } - else - { - me->SetLevitate(false); - me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - } - me->SetFlying(fly); + me->SetDisableGravity(fly); me->SendMovementFlagUpdate(); } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 2b4f1275993..1fb972ccfdf 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -334,7 +334,8 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData* data SetSpeed(MOVE_FLIGHT, 1.0f); // using 1.0 rate SetFloatValue(OBJECT_FIELD_SCALE_X, cinfo->scale); - SetLevitate(canFly()); + + SetFloatValue(UNIT_FIELD_HOVERHEIGHT, cinfo->HoverHeight); // checked at loading m_defaultMovementType = MovementGeneratorType(cinfo->MovementType); @@ -418,10 +419,25 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData* data) ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } - // TODO: In fact monster move flags should be set - not movement flags. - if (cInfo->InhabitType & INHABIT_AIR) - AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_FLYING); - + //! Suspect it works this way: + //! If creature can walk and fly (usually with pathing) + //! Set MOVEMENTFLAG_CAN_FLY. Otherwise if it can only fly + //! Set MOVEMENTFLAG_DISABLE_GRAVITY + //! The only time I saw Movement Flags: DisableGravity, CanFly, Flying (50332672) on the same unit + //! it was a vehicle + if (cInfo->InhabitType & INHABIT_AIR && cInfo->InhabitType & INHABIT_GROUND) + SetCanFly(true); + else if (cInfo->InhabitType & INHABIT_AIR) + SetDisableGravity(true); + /*! Implemented in LoadCreatureAddon. Suspect there's a rule for UNIT_BYTE_1_FLAG_HOVER + in relation to DisableGravity also. + + else if (GetByteValue(UNIT_FIELD_BYTES_1, 3) & UNIT_BYTE_1_FLAG_HOVER) + SetHover(true); + + */ + + // TODO: Shouldn't we check whether or not the creature is in water first? if (cInfo->InhabitType & INHABIT_WATER) AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING); @@ -742,6 +758,14 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, return false; } + //oX = x; oY = y; dX = x; dY = y; m_moveTime = 0; m_startMove = 0; + if (!CreateFromProto(guidlow, Entry, vehId, team, data)) + return false; + + //! Need to be called after CreateFromProto + if (HasUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY)) + z += GetFloatValue(UNIT_FIELD_HOVERHEIGHT); + Relocate(x, y, z, ang); if (!IsPositionValid()) @@ -750,10 +774,6 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, return false; } - //oX = x; oY = y; dX = x; dY = y; m_moveTime = 0; m_startMove = 0; - if (!CreateFromProto(guidlow, Entry, vehId, team, data)) - return false; - switch (GetCreatureTemplate()->rank) { case CREATURE_ELITE_RARE: @@ -783,17 +803,6 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender); } - if (GetCreatureTemplate()->InhabitType & INHABIT_AIR) - { - if (GetDefaultMovementType() == IDLE_MOTION_TYPE) - AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); - else - SetFlying(true); - } - - if (GetCreatureTemplate()->InhabitType & INHABIT_WATER) - AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING); - LastUsedScriptID = GetCreatureTemplate()->ScriptID; // TODO: Replace with spell, handle from DB @@ -1065,11 +1074,11 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) data.equipmentId = GetEquipmentId(); data.posX = GetPositionX(); data.posY = GetPositionY(); - data.posZ = GetPositionZ(); + data.posZ = GetPositionZMinusOffset(); data.orientation = GetOrientation(); data.spawntimesecs = m_respawnDelay; // prevent add data integrity problems - data.spawndist = GetDefaultMovementType() == IDLE_MOTION_TYPE ? 0 : m_respawnradius; + data.spawndist = GetDefaultMovementType() == IDLE_MOTION_TYPE ? 0.0f : m_respawnradius; data.currentwaypoint = 0; data.curhealth = GetHealth(); data.curmana = GetPower(POWER_MANA); @@ -1287,7 +1296,7 @@ bool Creature::LoadCreatureFromDB(uint32 guid, Map* map, bool addToMap) if (m_respawnTime) // respawn on Update { m_deathState = DEAD; - if (canFly()) + if (CanFly()) { float tz = map->GetHeight(GetPhaseMask(), data->posX, data->posY, data->posZ, false); if (data->posZ - tz > 0.1f) @@ -1420,7 +1429,7 @@ bool Creature::canStartAttack(Unit const* who, bool force) const if (who->GetTypeId() == TYPEID_UNIT && who->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET) return false; - if (!canFly() && (GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE + m_CombatDistance)) + if (!CanFly() && (GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE + m_CombatDistance)) //|| who->IsControlledByPlayer() && who->IsFlying())) // we cannot check flying for other creatures, too much map/vmap calculation // TODO: should switch to range attack @@ -1517,7 +1526,7 @@ void Creature::setDeathState(DeathState s) if (m_formation && m_formation->getLeader() == this) m_formation->FormationReset(true); - if ((canFly() || IsFlying())) + if ((CanFly() || IsFlying())) i_motionMaster.MoveFall(); Unit::setDeathState(CORPSE); @@ -1532,7 +1541,7 @@ void Creature::setDeathState(DeathState s) CreatureTemplate const* cinfo = GetCreatureTemplate(); SetWalk(true); if (GetCreatureTemplate()->InhabitType & INHABIT_AIR) - AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_FLYING); + SetDisableGravity(true); if (GetCreatureTemplate()->InhabitType & INHABIT_WATER) AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING); SetUInt32Value(UNIT_NPC_FLAGS, cinfo->npcflag); @@ -2040,6 +2049,12 @@ bool Creature::LoadCreaturesAddon(bool reload) SetByteValue(UNIT_FIELD_BYTES_1, 1, 0); SetByteValue(UNIT_FIELD_BYTES_1, 2, uint8((cainfo->bytes1 >> 16) & 0xFF)); SetByteValue(UNIT_FIELD_BYTES_1, 3, uint8((cainfo->bytes1 >> 24) & 0xFF)); + + //! Suspected correlation between UNIT_FIELD_BYTES_1, offset 3, value 0x2: + //! If no inhabittype_fly (if no MovementFlag_DisableGravity flag found in sniffs) + //! Set MovementFlag_Hover. Otherwise do nothing. + if (GetByteValue(UNIT_FIELD_BYTES_1, 3) & UNIT_BYTE1_FLAG_HOVER && !IsLevitating()) + AddUnitMovementFlag(MOVEMENTFLAG_HOVER); } if (cainfo->bytes2 != 0) @@ -2088,6 +2103,7 @@ bool Creature::LoadCreaturesAddon(bool reload) sLog->outDebug(LOG_FILTER_UNITS, "Spell: %u added to creature (GUID: %u Entry: %u)", *itr, GetGUIDLow(), GetEntry()); } } + return true; } @@ -2415,17 +2431,43 @@ bool Creature::SetWalk(bool enable) WorldPacket data(enable ? SMSG_SPLINE_MOVE_SET_WALK_MODE : SMSG_SPLINE_MOVE_SET_RUN_MODE, 9); data.append(GetPackGUID()); - SendMessageToSet(&data, true); + SendMessageToSet(&data, false); + return true; +} + +bool Creature::SetDisableGravity(bool disable, bool packetOnly/*=false*/) +{ + //! It's possible only a packet is sent but moveflags are not updated + //! Need more research on this + if (!packetOnly && !Unit::SetDisableGravity(disable)) + return false; + + if (!movespline->Initialized()) + return true; + + WorldPacket data(disable ? SMSG_SPLINE_MOVE_GRAVITY_DISABLE : SMSG_SPLINE_MOVE_GRAVITY_ENABLE, 9); + data.append(GetPackGUID()); + SendMessageToSet(&data, false); return true; } -bool Creature::SetLevitate(bool enable) +bool Creature::SetHover(bool enable) { - if (!Unit::SetLevitate(enable)) + if (!Unit::SetHover(enable)) return false; - WorldPacket data(enable ? SMSG_SPLINE_MOVE_GRAVITY_DISABLE : SMSG_SPLINE_MOVE_GRAVITY_ENABLE, 9); + //! Unconfirmed for players: + if (enable) + SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER); + else + RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER); + + if (!movespline->Initialized()) + return true; + + //! Not always a packet is sent + WorldPacket data(enable ? SMSG_SPLINE_MOVE_SET_HOVER : SMSG_SPLINE_MOVE_UNSET_HOVER, 9); data.append(GetPackGUID()); - SendMessageToSet(&data, true); + SendMessageToSet(&data, false); return true; } diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index f986e09e7cb..2f9549fd70a 100755 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -134,6 +134,7 @@ struct CreatureTemplate std::string AIName; uint32 MovementType; uint32 InhabitType; + float HoverHeight; float ModHealth; float ModMana; float ModArmor; @@ -467,7 +468,7 @@ class Creature : public Unit, public GridObject, public MapCreature bool isGuard() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_GUARD; } bool canWalk() const { return GetCreatureTemplate()->InhabitType & INHABIT_GROUND; } bool canSwim() const { return GetCreatureTemplate()->InhabitType & INHABIT_WATER; } - //bool canFly() const { return GetCreatureTemplate()->InhabitType & INHABIT_AIR; } + bool CanFly() const { return GetCreatureTemplate()->InhabitType & INHABIT_AIR; } void SetReactState(ReactStates st) { m_reactState = st; } ReactStates GetReactState() { return m_reactState; } @@ -521,7 +522,8 @@ class Creature : public Unit, public GridObject, public MapCreature CreatureAI* AI() const { return (CreatureAI*)i_AI; } bool SetWalk(bool enable); - bool SetLevitate(bool enable); + bool SetDisableGravity(bool disable, bool packetOnly = false); + bool SetHover(bool enable); uint32 GetShieldBlockValue() const //dunno mob block value { diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 2a2b78f4630..56ddd14dc3a 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -340,7 +340,10 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const *data << ((WorldObject*)this)->GetPositionX(); *data << ((WorldObject*)this)->GetPositionY(); - *data << ((WorldObject*)this)->GetPositionZ(); + if (isType(TYPEMASK_UNIT)) + *data << ((Unit*)this)->GetPositionZMinusOffset(); + else + *data << ((WorldObject*)this)->GetPositionZ(); if (transport) { @@ -352,7 +355,10 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const { *data << ((WorldObject*)this)->GetPositionX(); *data << ((WorldObject*)this)->GetPositionY(); - *data << ((WorldObject*)this)->GetPositionZ(); + if (isType(TYPEMASK_UNIT)) + *data << ((Unit*)this)->GetPositionZMinusOffset(); + else + *data << ((WorldObject*)this)->GetPositionZ(); } *data << ((WorldObject*)this)->GetOrientation(); @@ -369,7 +375,10 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const { *data << ((WorldObject*)this)->GetPositionX(); *data << ((WorldObject*)this)->GetPositionY(); - *data << ((WorldObject*)this)->GetPositionZ(); + if (isType(TYPEMASK_UNIT)) + *data << ((Unit*)this)->GetPositionZMinusOffset(); + else + *data << ((WorldObject*)this)->GetPositionZ(); *data << ((WorldObject*)this)->GetOrientation(); } } @@ -1557,7 +1566,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const { // non fly unit don't must be in air // non swim unit must be at ground (mostly speedup, because it don't must be in water and water level check less fast - if (!ToCreature()->canFly()) + if (!ToCreature()->CanFly()) { bool canSwim = ToCreature()->canSwim(); float ground_z = z; @@ -1583,7 +1592,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const case TYPEID_PLAYER: { // for server controlled moves playr work same as creature (but it can always swim) - if (!ToPlayer()->canFly()) + if (!ToPlayer()->CanFly()) { float ground_z = z; float max_z = GetBaseMap()->GetWaterOrGroundLevel(x, y, z, &ground_z, !ToUnit()->HasAuraType(SPELL_AURA_WATER_WALK)); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index c243527570b..fd8deb1b841 100755 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -776,7 +776,8 @@ class WorldObject : public Object, public WorldLocation GetClosePoint(x, y, z, GetObjectSize()); ang = GetOrientation(); } - Position pos = {x, y, z, ang}; + Position pos; + pos.Relocate(x, y, z, ang); return SummonCreature(id, pos, spwtype, despwtime, 0); } GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8318bd246d0..f3f376dae04 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22170,6 +22170,18 @@ void Player::SendAurasForTarget(Unit* target) if (!target || target->GetVisibleAuras()->empty()) // speedup things return; + /*! Blizz sends certain movement packets sometimes even before CreateObject + These movement packets are usually found in SMSG_COMPRESSED_MOVES + */ + if (target->HasAuraType(SPELL_AURA_FEATHER_FALL)) + target->SendMovementFeatherFall(); + + if (target->HasAuraType(SPELL_AURA_WATER_WALK)) + target->SendMovementWaterWalking(); + + if (target->HasAuraType(SPELL_AURA_HOVER)) + target->SendMovementHover(); + WorldPacket data(SMSG_AURA_UPDATE_ALL); data.append(target->GetPackGUID()); @@ -25158,3 +25170,11 @@ bool Player::IsInWhisperWhiteList(uint64 guid) } return false; } + +bool Player::SetHover(bool enable) +{ + if (!Unit::SetHover(enable)) + return false; + + return true; +} diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index bd58827c0e4..7f6b2322e93 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2287,6 +2287,8 @@ class Player : public Unit, public GridObject m_mover->m_movedPlayer = this; } + bool SetHover(bool enable); + void SetSeer(WorldObject* target) { m_seer = target; } void SetViewpoint(WorldObject* target, bool apply); WorldObject* GetViewpoint() const; @@ -2479,6 +2481,10 @@ class Player : public Unit, public GridObject void AddWhisperWhiteList(uint64 guid) { WhisperList.push_back(guid); } bool IsInWhisperWhiteList(uint64 guid); + #pragma region Player Movement + + bool CanFly() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_CAN_FLY); } + //! Return collision height sent to client float GetCollisionHeight(bool mounted) { @@ -2511,8 +2517,9 @@ class Player : public Unit, public GridObject return modelData->CollisionHeight; } - //! TODO: Need a proper calculation for collision height when mounted } + #pragma endregion Player Movement + protected: // Gamemaster whisper whitelist diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3411d285b1e..6d4963f1960 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3049,7 +3049,7 @@ bool Unit::isInAccessiblePlaceFor(Creature const* c) const if (IsInWater()) return c->canSwim(); else - return c->canWalk() || c->canFly(); + return c->canWalk() || c->CanFly(); } bool Unit::IsInWater() const @@ -12597,15 +12597,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) return; } - data.append(GetPackGUID()); - data << uint32(0); // movement flags - data << uint16(0); // unk flags - data << uint32(getMSTime()); - data << float(GetPositionX()); - data << float(GetPositionY()); - data << float(GetPositionZ()); - data << float(GetOrientation()); - data << uint32(0); // fall time + BuildMovementPacket(&data); data << float(GetSpeed(mtype)); SendMessageToSet(&data, true); } @@ -12664,14 +12656,6 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) } } -void Unit::SetHover(bool on) -{ - if (on) - CastSpell(this, 11010, true); - else - RemoveAurasDueToSpell(11010); -} - void Unit::setDeathState(DeathState s) { // death state needs to be updated before RemoveAllAurasOnDeath() calls HandleChannelDeathItem(..) so that @@ -17058,12 +17042,12 @@ void Unit::_ExitVehicle(Position const* exitPosition) void Unit::BuildMovementPacket(ByteBuffer *data) const { - *data << uint32(GetUnitMovementFlags()); // movement flags - *data << uint16(m_movementInfo.flags2); // 2.3.0 - *data << uint32(getMSTime()); // time + *data << uint32(GetUnitMovementFlags()); // movement flags + *data << uint16(GetExtraUnitMovementFlags()); // 2.3.0 + *data << uint32(getMSTime()); // time / counter *data << GetPositionX(); *data << GetPositionY(); - *data << GetPositionZ(); + *data << GetPositionZMinusOffset(); *data << GetOrientation(); // 0x00000200 @@ -17108,18 +17092,12 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const *data << (float)m_movementInfo.splineElevation; } -void Unit::SetFlying(bool apply) +void Unit::SetCanFly(bool apply) { if (apply) - { - SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x02); - AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_FLYING); - } + AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); else - { - RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x02); - RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_FLYING); - } + RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); } void Unit::NearTeleportTo(float x, float y, float z, float orientation, bool casting /*= false*/) @@ -17165,11 +17143,20 @@ bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool tel return (relocated || turn); } +//! Only server-side orientation update, does not broadcast to client void Unit::UpdateOrientation(float orientation) { SetOrientation(orientation); if (IsVehicle()) - GetVehicleKit()->RelocatePassengers(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); + GetVehicleKit()->RelocatePassengers(GetPositionX(), GetPositionY(), GetPositionZ(), orientation); +} + +//! Only server-side height update, does not broadcast to client +void Unit::UpdateHeight(float newZ) +{ + Relocate(GetPositionX(), GetPositionY(), newZ); + if (IsVehicle()) + GetVehicleKit()->RelocatePassengers(GetPositionX(), GetPositionY(), newZ, GetOrientation()); } void Unit::SendThreatListUpdate() @@ -17457,15 +17444,65 @@ bool Unit::SetWalk(bool enable) return true; } -bool Unit::SetLevitate(bool enable) +bool Unit::SetDisableGravity(bool disable) +{ + if (disable == IsLevitating()) + return false; + + if (disable) + AddUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY); + else + RemoveUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY); + + return true; +} + +bool Unit::SetHover(bool enable) { - if (enable == IsLevitating()) + if (enable == HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) return false; if (enable) - AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + { + //! No need to check height on ascent + AddUnitMovementFlag(MOVEMENTFLAG_HOVER); + if (float hh = GetFloatValue(UNIT_FIELD_HOVERHEIGHT)) + UpdateHeight(GetPositionZ() + hh); + } else - RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + { + RemoveUnitMovementFlag(MOVEMENTFLAG_HOVER); + if (float hh = GetFloatValue(UNIT_FIELD_HOVERHEIGHT)) + { + float newZ = GetPositionZ() - hh; + UpdateAllowedPositionZ(GetPositionX(), GetPositionY(), newZ); + UpdateHeight(newZ); + } + } return true; } + +void Unit::SendMovementHover() +{ + WorldPacket data(MSG_MOVE_HOVER, 64); + data.append(GetPackGUID()); + BuildMovementPacket(&data); + SendMessageToSet(&data, true); +} + +void Unit::SendMovementWaterWalking() +{ + WorldPacket data(MSG_MOVE_WATER_WALK, 64); + data.append(GetPackGUID()); + BuildMovementPacket(&data); + SendMessageToSet(&data, true); +} + +void Unit::SendMovementFeatherFall() +{ + WorldPacket data(MSG_MOVE_FEATHER_FALL, 64); + data.append(GetPackGUID()); + BuildMovementPacket(&data); + SendMessageToSet(&data, true); +} diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index b07f2ae1c16..79ed0ec2f3d 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -184,10 +184,10 @@ enum UnitStandFlags // byte flags value (UNIT_FIELD_BYTES_1, 3) enum UnitBytes1_Flags { - UNIT_BYTE1_FLAG_ALWAYS_STAND = 0x01, - UNIT_BYTE1_FLAG_UNK_2 = 0x02, - UNIT_BYTE1_FLAG_UNK_3 = 0x04, - UNIT_BYTE1_FLAG_ALL = 0xFF + UNIT_BYTE1_FLAG_ALWAYS_STAND = 0x01, + UNIT_BYTE1_FLAG_HOVER = 0x02, + UNIT_BYTE1_FLAG_UNK_3 = 0x04, + UNIT_BYTE1_FLAG_ALL = 0xFF }; // high byte (3 from 0..3) of UNIT_FIELD_BYTES_2 @@ -676,7 +676,7 @@ enum MovementFlags MOVEMENTFLAG_PITCH_DOWN = 0x00000080, MOVEMENTFLAG_WALKING = 0x00000100, // Walking MOVEMENTFLAG_ONTRANSPORT = 0x00000200, // Used for flying on some creatures - MOVEMENTFLAG_LEVITATING = 0x00000400, + MOVEMENTFLAG_DISABLE_GRAVITY = 0x00000400, // Former MOVEMENTFLAG_LEVITATING. This is used when walking is not possible. MOVEMENTFLAG_ROOT = 0x00000800, // Must not be set along with MOVEMENTFLAG_MASK_MOVING MOVEMENTFLAG_JUMPING = 0x00001000, MOVEMENTFLAG_FALLING = 0x00002000, // damage dealt on that type of falling @@ -690,8 +690,8 @@ enum MovementFlags MOVEMENTFLAG_SWIMMING = 0x00200000, // appears with fly flag also MOVEMENTFLAG_ASCENDING = 0x00400000, // press "space" when flying MOVEMENTFLAG_DESCENDING = 0x00800000, - MOVEMENTFLAG_CAN_FLY = 0x01000000, // can fly - MOVEMENTFLAG_FLYING = 0x02000000, // hover + MOVEMENTFLAG_CAN_FLY = 0x01000000, // Appears when unit can fly AND also walk + MOVEMENTFLAG_FLYING = 0x02000000, // unit is actually flying. pretty sure this is only used for players. creatures use disable_gravity MOVEMENTFLAG_SPLINE_ELEVATION = 0x04000000, // used for flight paths MOVEMENTFLAG_SPLINE_ENABLED = 0x08000000, // used for flight paths MOVEMENTFLAG_WATERWALKING = 0x10000000, // prevent unit from falling through water @@ -706,6 +706,10 @@ enum MovementFlags MOVEMENTFLAG_MASK_TURNING = MOVEMENTFLAG_LEFT | MOVEMENTFLAG_RIGHT, + + //! TODO if needed: add more flags to this masks that are exclusive to players + MOVEMENTFLAG_MASK_PLAYER_ONLY = + MOVEMENTFLAG_FLYING, }; enum MovementFlags2 { @@ -1615,6 +1619,7 @@ class Unit : public WorldObject // returns true if unit's position really changed bool UpdatePosition(const Position &pos, bool teleport = false) { return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); } void UpdateOrientation(float orientation); + void UpdateHeight(float newZ); void KnockbackFrom(float x, float y, float speedXY, float speedZ); void JumpTo(float speedXY, float speedZ, bool forward = true); @@ -1626,10 +1631,14 @@ class Unit : public WorldObject //void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint8 type, uint32 MovementFlags, uint32 Time, Player* player = NULL); void SendMonsterMoveTransport(Unit* vehicleOwner); void SendMovementFlagUpdate(); - bool IsLevitating() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_LEVITATING);} + void SendMovementHover(); + void SendMovementFeatherFall(); + void SendMovementWaterWalking(); + bool IsLevitating() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);} bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING);} virtual bool SetWalk(bool enable); - virtual bool SetLevitate(bool enable); + virtual bool SetDisableGravity(bool disable); + bool SetHover(bool enable); void SetInFront(Unit const* target); void SetFacingTo(float ori); @@ -2053,7 +2062,6 @@ class Unit : public WorldObject void SetSpeed(UnitMoveType mtype, float rate, bool forced = false); float m_TempSpeed; - void SetHover(bool on); bool isHover() const { return HasAuraType(SPELL_AURA_HOVER); } float ApplyEffectModifiers(SpellInfo const* spellProto, uint8 effect_index, float value) const; @@ -2077,7 +2085,7 @@ class Unit : public WorldObject void AddUnitMovementFlag(uint32 f) { m_movementInfo.flags |= f; } void RemoveUnitMovementFlag(uint32 f) { m_movementInfo.flags &= ~f; } - uint32 HasUnitMovementFlag(uint32 f) const { return m_movementInfo.flags & f; } + bool HasUnitMovementFlag(uint32 f) const { return (m_movementInfo.flags & f) == f; } uint32 GetUnitMovementFlags() const { return m_movementInfo.flags; } void SetUnitMovementFlags(uint32 f) { m_movementInfo.flags = f; } @@ -2087,6 +2095,15 @@ class Unit : public WorldObject uint16 GetExtraUnitMovementFlags() const { return m_movementInfo.flags2; } void SetExtraUnitMovementFlags(uint16 f) { m_movementInfo.flags2 = f; } + float GetPositionZMinusOffset() const + { + float offset = 0.0f; + if (HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) + offset = GetFloatValue(UNIT_FIELD_HOVERHEIGHT); + + return GetPositionZ() - offset; + } + void SetControlled(bool apply, UnitState state); void AddComboPointHolder(uint32 lowguid) { m_ComboPointHolders.insert(lowguid); } @@ -2171,9 +2188,9 @@ class Unit : public WorldObject bool isMoving() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_MASK_MOVING); } bool isTurning() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_MASK_TURNING); } - bool canFly() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_CAN_FLY); } - bool IsFlying() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_FLYING); } - void SetFlying(bool apply); + virtual bool CanFly() const = 0; + bool IsFlying() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_DISABLE_GRAVITY); } + void SetCanFly(bool apply); void RewardRage(uint32 damage, uint32 weaponSpeedHitFactor, bool attacker); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 11977280177..f2b867b91ff 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -377,9 +377,9 @@ void ObjectMgr::LoadCreatureTemplates() // 54 55 56 57 58 59 60 61 62 63 64 65 66 "spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, " // 67 68 69 70 71 72 73 74 75 76 77 - "InhabitType, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, " + "InhabitType, HoverHeight, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, " // 78 79 80 81 82 83 - "movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName " + " questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName " "FROM creature_template;"); if (!result) @@ -463,20 +463,21 @@ void ObjectMgr::LoadCreatureTemplates() creatureTemplate.AIName = fields[65].GetString(); creatureTemplate.MovementType = uint32(fields[66].GetUInt8()); creatureTemplate.InhabitType = uint32(fields[67].GetUInt8()); - creatureTemplate.ModHealth = fields[68].GetFloat(); - creatureTemplate.ModMana = fields[69].GetFloat(); - creatureTemplate.ModArmor = fields[70].GetFloat(); - creatureTemplate.RacialLeader = fields[71].GetBool(); + creatureTemplate.HoverHeight = fields[68].GetFloat(); + creatureTemplate.ModHealth = fields[69].GetFloat(); + creatureTemplate.ModMana = fields[70].GetFloat(); + creatureTemplate.ModArmor = fields[71].GetFloat(); + creatureTemplate.RacialLeader = fields[72].GetBool(); for (uint8 i = 0; i < MAX_CREATURE_QUEST_ITEMS; ++i) - creatureTemplate.questItems[i] = fields[72 + i].GetUInt32(); + creatureTemplate.questItems[i] = fields[73 + i].GetUInt32(); - creatureTemplate.movementId = fields[78].GetUInt32(); - creatureTemplate.RegenHealth = fields[79].GetBool(); - creatureTemplate.equipmentId = fields[80].GetUInt32(); - creatureTemplate.MechanicImmuneMask = fields[81].GetUInt32(); - creatureTemplate.flags_extra = fields[82].GetUInt32(); - creatureTemplate.ScriptID = GetScriptId(fields[83].GetCString()); + creatureTemplate.movementId = fields[79].GetUInt32(); + creatureTemplate.RegenHealth = fields[80].GetBool(); + creatureTemplate.equipmentId = fields[81].GetUInt32(); + creatureTemplate.MechanicImmuneMask = fields[82].GetUInt32(); + creatureTemplate.flags_extra = fields[83].GetUInt32(); + creatureTemplate.ScriptID = GetScriptId(fields[84].GetCString()); ++count; } @@ -494,7 +495,7 @@ void ObjectMgr::LoadCreatureTemplateAddons() { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 4 5 6 + // 0 1 2 3 4 5 6 QueryResult result = WorldDatabase.Query("SELECT entry, path_id, mount, bytes1, bytes2, emote, auras FROM creature_template_addon"); if (!result) @@ -549,7 +550,10 @@ void ObjectMgr::LoadCreatureTemplateAddons() } if (!sEmotesStore.LookupEntry(creatureAddon.emote)) - sLog->outErrorDb("Creature (Entry: %u) has invalid emote (%u) defined in `creature_template_addon`.", entry, creatureAddon.emote); + { + sLog->outErrorDb("Creature (Entry: %u) has invalid emote (%u) defined in `creature_addon`.", entry, creatureAddon.emote); + creatureAddon.emote = 0; + } ++count; } @@ -793,6 +797,12 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) const_cast(cInfo)->InhabitType = INHABIT_ANYWHERE; } + if (cInfo->HoverHeight < 0.0f) + { + sLog->outErrorDb("Creature (Entry: %u) has wrong value (%f) in `HoverHeight`", cInfo->Entry, cInfo->HoverHeight); + const_cast(cInfo)->HoverHeight = 1.0f; + } + if (cInfo->VehicleId) { VehicleEntry const* vehId = sVehicleStore.LookupEntry(cInfo->VehicleId); @@ -862,7 +872,7 @@ void ObjectMgr::LoadCreatureAddons() { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 4 5 6 + // 0 1 2 3 4 5 6 QueryResult result = WorldDatabase.Query("SELECT guid, path_id, mount, bytes1, bytes2, emote, auras FROM creature_addon"); if (!result) @@ -899,7 +909,7 @@ void ObjectMgr::LoadCreatureAddons() creatureAddon.bytes1 = fields[3].GetUInt32(); creatureAddon.bytes2 = fields[4].GetUInt32(); creatureAddon.emote = fields[5].GetUInt32(); - + Tokens tokens(fields[6].GetString(), ' '); uint8 i = 0; creatureAddon.auras.resize(tokens.size()); @@ -914,7 +924,7 @@ void ObjectMgr::LoadCreatureAddons() creatureAddon.auras[i++] = uint32(atol(*itr)); } - if (creatureAddon.mount) + if (creatureAddon.mount) { if (!sCreatureDisplayInfoStore.LookupEntry(creatureAddon.mount)) { @@ -924,7 +934,10 @@ void ObjectMgr::LoadCreatureAddons() } if (!sEmotesStore.LookupEntry(creatureAddon.emote)) + { sLog->outErrorDb("Creature (GUID: %u) has invalid emote (%u) defined in `creature_addon`.", guid, creatureAddon.emote); + creatureAddon.emote = 0; + } ++count; } diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 7f27a474534..7403a86a47f 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -702,6 +702,12 @@ void Map::PlayerRelocation(Player* player, float x, float y, float z, float orie Cell old_cell(player->GetPositionX(), player->GetPositionY()); Cell new_cell(x, y); + //! If hovering, always increase our server-side Z position + //! Client automatically projects correct position based on Z coord sent in monster move + //! and UNIT_FIELD_HOVERHEIGHT sent in object updates + if (player->HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) + z += player->GetFloatValue(UNIT_FIELD_HOVERHEIGHT); + player->Relocate(x, y, z, orientation); if (player->IsVehicle()) player->GetVehicleKit()->RelocatePassengers(x, y, z, orientation); @@ -731,6 +737,12 @@ void Map::CreatureRelocation(Creature* creature, float x, float y, float z, floa if (!respawnRelocationOnFail && !getNGrid(new_cell.GridX(), new_cell.GridY())) return; + //! If hovering, always increase our server-side Z position + //! Client automatically projects correct position based on Z coord sent in monster move + //! and UNIT_FIELD_HOVERHEIGHT sent in object updates + if (creature->HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) + z += creature->GetFloatValue(UNIT_FIELD_HOVERHEIGHT); + // delay creature move for grid/cell to grid/cell moves if (old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell)) { diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index fddfe5f8fb0..91b50344ccb 100755 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -57,7 +57,7 @@ bool PointMovementGenerator::Update(T &unit, const uint32 & /*diff*/) } template -void PointMovementGenerator:: Finalize(T &unit) +void PointMovementGenerator::Finalize(T &unit) { unit.ClearUnitState(UNIT_STATE_ROAMING|UNIT_STATE_ROAMING_MOVE); diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index b65fa210723..e520253eb46 100755 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -42,7 +42,7 @@ void RandomMovementGenerator::_setRandomLocation(Creature& creature) // For 2D/3D system selection //bool is_land_ok = creature.CanWalk(); // not used? //bool is_water_ok = creature.CanSwim(); // not used? - bool is_air_ok = creature.canFly(); + bool is_air_ok = creature.CanFly(); const float angle = float(rand_norm()) * static_cast(M_PI*2.0f); const float range = float(rand_norm()) * wander_distance; diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index b5ae923dc32..f5d2ae59329 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -100,7 +100,7 @@ namespace Movement { // mix existing state into new args.flags.walkmode = unit.m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING); - args.flags.flying = unit.m_movementInfo.HasMovementFlag((MovementFlags)(MOVEMENTFLAG_FLYING|MOVEMENTFLAG_LEVITATING)); + args.flags.flying = unit.m_movementInfo.HasMovementFlag((MovementFlags)(MOVEMENTFLAG_CAN_FLY|MOVEMENTFLAG_DISABLE_GRAVITY)); } void MoveSplineInit::SetFacing(const Unit * target) diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index e5b5b20dcfa..c6ccfaa8004 100755 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -270,10 +270,10 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x0F1*/ { "MSG_MOVE_KNOCK_BACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x0F2*/ { "SMSG_MOVE_FEATHER_FALL", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x0F3*/ { "SMSG_MOVE_NORMAL_FALL", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x0F4*/ { "SMSG_MOVE_SET_HOVER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x0F5*/ { "SMSG_MOVE_UNSET_HOVER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x0F4*/ { "SMSG_MOVE_SET_HOVER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x0F5*/ { "SMSG_MOVE_UNSET_HOVER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x0F6*/ { "CMSG_MOVE_HOVER_ACK", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMoveHoverAck }, - /*0x0F7*/ { "MSG_MOVE_HOVER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x0F7*/ { "MSG_MOVE_HOVER", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x0F8*/ { "CMSG_TRIGGER_CINEMATIC_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x0F9*/ { "CMSG_OPENING_CINEMATIC", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x0FA*/ { "SMSG_TRIGGER_CINEMATIC", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 56bca65788c..387f76bbc7f 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2845,7 +2845,7 @@ void AuraEffect::HandleAuraAllowFlight(AuraApplication const* aurApp, uint8 mode } if (target->GetTypeId() == TYPEID_UNIT) - target->SetFlying(apply); + target->SetCanFly(apply); if (Player* player = target->m_movedPlayer) { @@ -2856,7 +2856,7 @@ void AuraEffect::HandleAuraAllowFlight(AuraApplication const* aurApp, uint8 mode else data.Initialize(SMSG_MOVE_UNSET_CAN_FLY, 12); data.append(target->GetPackGUID()); - data << uint32(0); // unk + data << uint32(0); // movement counter player->SendDirectMessage(&data); } } @@ -2875,14 +2875,16 @@ void AuraEffect::HandleAuraWaterWalk(AuraApplication const* aurApp, uint8 mode, return; } - WorldPacket data; if (apply) - data.Initialize(SMSG_MOVE_WATER_WALK, 8+4); + { + target->AddUnitMovementFlag(MOVEMENTFLAG_WATERWALKING); + target->SendMovementWaterWalking(); + } else - data.Initialize(SMSG_MOVE_LAND_WALK, 8+4); - data.append(target->GetPackGUID()); - data << uint32(0); - target->SendMessageToSet(&data, true); + { + target->RemoveUnitMovementFlag(MOVEMENTFLAG_WATERWALKING); + target->SendMovementFlagUpdate(); + } } void AuraEffect::HandleAuraFeatherFall(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -2899,14 +2901,16 @@ void AuraEffect::HandleAuraFeatherFall(AuraApplication const* aurApp, uint8 mode return; } - WorldPacket data; if (apply) - data.Initialize(SMSG_MOVE_FEATHER_FALL, 8+4); + { + target->AddUnitMovementFlag(MOVEMENTFLAG_FALLING_SLOW); + target->SendMovementFeatherFall(); + } else - data.Initialize(SMSG_MOVE_NORMAL_FALL, 8+4); - data.append(target->GetPackGUID()); - data << uint32(0); - target->SendMessageToSet(&data, true); + { + target->RemoveUnitMovementFlag(MOVEMENTFLAG_FALLING_SLOW); + target->SendMovementFlagUpdate(); + } // start fall from current height if (!apply && target->GetTypeId() == TYPEID_PLAYER) @@ -2927,14 +2931,11 @@ void AuraEffect::HandleAuraHover(AuraApplication const* aurApp, uint8 mode, bool return; } - WorldPacket data; + target->SetHover(apply); //! Sets movementflags if (apply) - data.Initialize(SMSG_MOVE_SET_HOVER, 8+4); + target->SendMovementHover(); else - data.Initialize(SMSG_MOVE_UNSET_HOVER, 8+4); - data.append(target->GetPackGUID()); - data << uint32(0); - target->SendMessageToSet(&data, true); + target->SendMovementFlagUpdate(); } void AuraEffect::HandleWaterBreathing(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 28920f7c109..1520a944f6e 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -413,7 +413,7 @@ public: for (Tokens::const_iterator itr = entries.begin(); itr != entries.end(); ++itr) { uint32 entry = uint32(atoi(*itr)); - QueryResult result = WorldDatabase.PQuery("SELECT difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction_A, faction_H, npcflag, speed_walk, speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = %u", entry); + QueryResult result = WorldDatabase.PQuery("SELECT difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction_A, faction_H, npcflag, speed_walk, speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, HoverHeight, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = %u", entry); if (!result) { handler->PSendSysMessage(LANG_COMMAND_CREATURETEMPLATE_NOTFOUND, entry); @@ -498,22 +498,23 @@ public: const_cast(cInfo)->AIName = fields[64].GetString(); const_cast(cInfo)->MovementType = fields[65].GetUInt32(); const_cast(cInfo)->InhabitType = fields[66].GetUInt32(); - const_cast(cInfo)->ModHealth = fields[67].GetFloat(); - const_cast(cInfo)->ModMana = fields[68].GetFloat(); - const_cast(cInfo)->ModArmor = fields[69].GetFloat(); - const_cast(cInfo)->RacialLeader = fields[70].GetBool(); - const_cast(cInfo)->questItems[0] = fields[71].GetUInt32(); - const_cast(cInfo)->questItems[1] = fields[72].GetUInt32(); - const_cast(cInfo)->questItems[2] = fields[73].GetUInt32(); - const_cast(cInfo)->questItems[3] = fields[74].GetUInt32(); - const_cast(cInfo)->questItems[4] = fields[75].GetUInt32(); - const_cast(cInfo)->questItems[5] = fields[76].GetUInt32(); - const_cast(cInfo)->movementId = fields[77].GetUInt32(); - const_cast(cInfo)->RegenHealth = fields[78].GetBool(); - const_cast(cInfo)->equipmentId = fields[79].GetUInt32(); - const_cast(cInfo)->MechanicImmuneMask = fields[80].GetUInt32(); - const_cast(cInfo)->flags_extra = fields[81].GetUInt32(); - const_cast(cInfo)->ScriptID = sObjectMgr->GetScriptId(fields[82].GetCString()); + const_cast(cInfo)->HoverHeight = fields[67].GetFloat(); + const_cast(cInfo)->ModHealth = fields[68].GetFloat(); + const_cast(cInfo)->ModMana = fields[69].GetFloat(); + const_cast(cInfo)->ModArmor = fields[70].GetFloat(); + const_cast(cInfo)->RacialLeader = fields[71].GetBool(); + const_cast(cInfo)->questItems[0] = fields[72].GetUInt32(); + const_cast(cInfo)->questItems[1] = fields[73].GetUInt32(); + const_cast(cInfo)->questItems[2] = fields[74].GetUInt32(); + const_cast(cInfo)->questItems[3] = fields[75].GetUInt32(); + const_cast(cInfo)->questItems[4] = fields[76].GetUInt32(); + const_cast(cInfo)->questItems[5] = fields[77].GetUInt32(); + const_cast(cInfo)->movementId = fields[78].GetUInt32(); + const_cast(cInfo)->RegenHealth = fields[79].GetBool(); + const_cast(cInfo)->equipmentId = fields[80].GetUInt32(); + const_cast(cInfo)->MechanicImmuneMask = fields[81].GetUInt32(); + const_cast(cInfo)->flags_extra = fields[82].GetUInt32(); + const_cast(cInfo)->ScriptID = sObjectMgr->GetScriptId(fields[83].GetCString()); sObjectMgr->CheckCreatureTemplate(cInfo); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 2a8676d7915..0cf68852041 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -121,7 +121,7 @@ public: MovePhase = 0; me->SetSpeed(MOVE_RUN, 2.0f); - me->SetLevitate(true); + me->SetDisableGravity(true); me->SetWalk(false); me->setActive(true); @@ -240,7 +240,7 @@ public: me->InterruptSpell(CURRENT_GENERIC_SPELL); me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - me->SetLevitate(true); + me->SetDisableGravity(true); (*me).GetMotionMaster()->Clear(false); (*me).GetMotionMaster()->MovePoint(0, IntroWay[2][0], IntroWay[2][1], IntroWay[2][2]); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index b4345c61a77..fd5a77fb816 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -527,7 +527,7 @@ public: if (!Arcanagos) return; ArcanagosGUID = Arcanagos->GetGUID(); - Arcanagos->SetLevitate(true); + Arcanagos->SetDisableGravity(true); (*Arcanagos).GetMotionMaster()->MovePoint(0, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2]); Arcanagos->SetOrientation(ArcanagosPos[3]); me->SetOrientation(MedivPos[3]); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index a46037f2662..0c1017edfdb 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -497,7 +497,7 @@ public: void Reset() { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); - me->SetLevitate(true); + me->SetDisableGravity(true); DoCast(me, SPELL_PHOENIX_BURN, true); BurnTimer = 2000; Death_Timer = 3000; @@ -651,7 +651,7 @@ public: ChangeTargetTimer = urand(6000, 12000); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetLevitate(true); + me->SetDisableGravity(true); me->setFaction(14); DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index 4f4622b6d4a..bf09e008dff 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -46,7 +46,7 @@ public: me->setActive(true); me->SetVisible(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetFlying(true); + me->SetCanFly(true); FlyBackTimer = 500; phase = 0; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 77099f2e2d7..b71f0ef8b9a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -429,7 +429,7 @@ public: { me->SetVisible(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING); + me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY); me->SetSpeed(MOVE_WALK, 5.0f, true); wp_reached = false; count = 0; @@ -462,7 +462,7 @@ public: instance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0); //hide gameobject break; case 19: - me->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING); + me->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY); break; case 20: { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 78d00e19cdf..5089c3b8074 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -216,7 +216,7 @@ public: break; case 3: DoCast(me, SPELL_INTRO_FROST_BLAST); - Madrigosa->SetLevitate(true); + Madrigosa->SetDisableGravity(true); me->AttackStop(); Madrigosa->AttackStop(); IntroFrostBoltTimer = 3000; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 0d98efd703b..b3ea89c1d66 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -137,7 +137,7 @@ public: uiFlightCount = 0; - me->SetLevitate(true); + me->SetDisableGravity(true); me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); @@ -254,7 +254,7 @@ public: events.ScheduleEvent(EVENT_FLIGHT, 60000); break; case PHASE_FLIGHT: - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1000); uiFlightCount = 0; uiBreathCount = 0; @@ -391,7 +391,7 @@ public: } break; case 10: - me->SetLevitate(false); + me->SetDisableGravity(false); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); EnterPhase(PHASE_GROUND); AttackStart(SelectTarget(SELECT_TARGET_TOPAGGRO)); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 1735c0c4f07..45153c21ea6 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -159,7 +159,7 @@ public: if (!bJustReset) //first reset at create { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE); - me->SetLevitate(false); + me->SetDisableGravity(false); me->SetVisible(true); me->SetStandState(UNIT_STAND_STATE_SLEEP); } @@ -231,7 +231,7 @@ public: if (ResetTimer <= diff) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - me->SetLevitate(false); + me->SetDisableGravity(false); me->SetVisible(true); me->SetStandState(UNIT_STAND_STATE_SLEEP); ResetTimer = 10000; @@ -400,7 +400,7 @@ public: TalkTimer = 10000; break; case 3: - me->SetLevitate(true); + me->SetDisableGravity(true); me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z); TalkTimer = 600000; break; @@ -418,7 +418,7 @@ public: TalkTimer = 3000; break; case 2: - me->SetLevitate(true); + me->SetDisableGravity(true); me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z); TalkTimer = 15000; break; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 02a8de14fdf..e9101d123dc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -264,7 +264,7 @@ public: { OrbsEmpowered = 0; EmpowerCount = 0; - me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING); + me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->setActive(true); @@ -451,7 +451,7 @@ public: summoned->CastSpell(summoned, SPELL_SHADOW_CHANNELING, false); break; case CREATURE_ANVEENA: - summoned->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING); + summoned->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY); summoned->CastSpell(summoned, SPELL_ANVEENA_PRISON, true); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); break; @@ -1188,7 +1188,7 @@ public: void Reset() { - me->SetLevitate(true); + me->SetDisableGravity(true); bPointReached = true; uiTimer = urand(500, 1000); uiCheckTimer = 1000; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index eee6b08d834..df8d9bb83f8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -324,14 +324,14 @@ class boss_akilzon : public CreatureScript target->GetPosition(x, y, z); if (target) { - target->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + target->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); target->MonsterMoveWithSpeed(x, y, me->GetPositionZ()+15, 0); } Unit* Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); if (Cloud) { CloudGUID = Cloud->GetGUID(); - Cloud->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + Cloud->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); Cloud->StopMoving(); Cloud->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f); Cloud->setFaction(35); @@ -409,7 +409,7 @@ class mob_akilzon_eagle : public CreatureScript EagleSwoop_Timer = urand(5000, 10000); arrived = true; TargetGUID = 0; - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); } void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 8bbcdd6c036..8d29cfefc6e 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -632,7 +632,7 @@ class mob_janalai_hatchling : public CreatureScript else me->GetMotionMaster()->MovePoint(0, hatcherway[1][3][0]+rand()%4-2, 1150.0f+rand()%4-2, hatcherway[1][3][2]); - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); } void EnterCombat(Unit* /*who*/) {/*DoZoneInCombat();*/} diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index bf3d07ad5ae..3f088bf00b9 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -114,7 +114,7 @@ public: summoned->CastSpell(target, SPELL_RIBBON_OF_SOULS, false); } - summoned->SetLevitate(true); + summoned->SetDisableGravity(true); targetGUID = summoned->GetGUID(); } } @@ -184,7 +184,7 @@ public: { if (EventMove_Timer <= diff) { - me->SetLevitate(true); + me->SetDisableGravity(true); me->MonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, me->GetDistance(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW) / (5000 * 0.001f)); me->SetPosition(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, me->GetOrientation()); EventMove = false; diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 07766455495..1a31c29f5bb 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -355,7 +355,7 @@ public: break; case 23: Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f, 81.99f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - Ughost->SetLevitate(true); + Ughost->SetDisableGravity(true); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index ecc6b865b3d..e1d7d97e0b8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -459,7 +459,7 @@ public: { trigger->SetVisible(false); trigger->setFaction(me->getFaction()); - trigger->SetLevitate(true); + trigger->SetDisableGravity(true); trigger->CastSpell(me, SPELL_METEOR, true); } me->GetMotionMaster()->Clear(); @@ -1176,7 +1176,7 @@ public: { FrostBreathTimer = 5000; MoveTimer = 0; - me->SetLevitate(true); + me->SetDisableGravity(true); } void WaypointReached(uint32 i) @@ -1298,7 +1298,7 @@ public: Zpos = 10.0f; StrikeTimer = 2000+rand()%5000; MoveTimer = 0; - me->SetLevitate(true); + me->SetDisableGravity(true); } void WaypointReached(uint32 i) diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 3b42fc3ed7b..3b3dfae92b2 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -261,7 +261,7 @@ public: m_uiBellowingRoarTimer = 1000; break; case 10: - me->SetFlying(true); + me->SetCanFly(true); me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(), Phase2Location.GetPositionY(), Phase2Location.GetPositionZ()+25); me->SetSpeed(MOVE_FLIGHT, 1.0f); DoScriptText(SAY_PHASE_2_TRANS, me); @@ -414,7 +414,7 @@ public: DoScriptText(SAY_PHASE_3_TRANS, me); SetCombatMovement(true); - me->SetFlying(false); + me->SetCanFly(false); m_bIsMoving = false; me->GetMotionMaster()->MovePoint(9, me->GetHomePosition()); return; diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 2c21ac18752..2c498cfdc43 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -576,7 +576,7 @@ public: break; case 10: Merithra->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - Merithra->SetLevitate(true); + Merithra->SetDisableGravity(true); Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 3); break; case 11: @@ -603,7 +603,7 @@ public: break; case 18: Arygos->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - Arygos->SetLevitate(true); + Arygos->SetDisableGravity(true); Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 42); break; case 19: @@ -630,7 +630,7 @@ public: break; case 26: Caelestrasz->HandleEmoteCommand(254); - Caelestrasz->SetLevitate(true); + Caelestrasz->SetDisableGravity(true); Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 7.61f, 4); break; case 27: @@ -769,7 +769,7 @@ public: break; case 63: me->HandleEmoteCommand(254); - me->SetLevitate(true); + me->SetDisableGravity(true); break; case 64: me->GetMotionMaster()->MoveCharge(-8000, 1400, 150, 9); 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 636be5e29be..c756aa4f232 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -349,6 +349,7 @@ public: void Reset() { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING); me->setFaction(16); me->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 03a04648793..3407b42b2a7 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -105,8 +105,8 @@ class boss_saviana_ragefire : public CreatureScript Talk(SAY_CONFLAGRATION); break; case POINT_LAND: - me->SetFlying(false); - me->SetLevitate(false); + me->SetCanFly(false); + me->SetDisableGravity(false); me->SetReactState(REACT_AGGRESSIVE); if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); @@ -120,8 +120,8 @@ class boss_saviana_ragefire : public CreatureScript void JustReachedHome() { _JustReachedHome(); - me->SetFlying(false); - me->SetLevitate(false); + me->SetCanFly(false); + me->SetDisableGravity(false); } void KilledUnit(Unit* victim) @@ -146,8 +146,8 @@ class boss_saviana_ragefire : public CreatureScript { case EVENT_FLIGHT: { - me->SetFlying(true); - me->SetLevitate(true); + me->SetCanFly(true); + me->SetDisableGravity(true); me->SetReactState(REACT_PASSIVE); me->GetMotionMaster()->MovePoint(POINT_FLIGHT, SavianaRagefireFlyPos); events.ScheduleEvent(EVENT_FLIGHT, 50000); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 7dcdaa28879..b64e324d4da 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -571,7 +571,10 @@ class mob_frost_sphere : public CreatureScript { _isFalling = false; me->SetReactState(REACT_PASSIVE); - me->SetFlying(true); + //! Confirmed sniff 3.3.5.a + me->SetDisableGravity(true); + me->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); + //! end me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); me->SetSpeed(MOVE_RUN, 0.5f, false); me->GetMotionMaster()->MoveRandom(20.0f); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 0e604566276..3e2427d66b3 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -576,8 +576,8 @@ struct mob_unleashed_ballAI : public ScriptedAI { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); - me->SetLevitate(true); - me->SetFlying(true); + me->SetDisableGravity(true); + me->SetCanFly(true); SetCombatMovement(false); MoveToNextPoint(); m_uiRangeCheckTimer = IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 8e211cbd2cb..6520d58da20 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -347,7 +347,7 @@ class boss_krick : public CreatureScript else tyrannusPtr = me->SummonCreature(NPC_TYRANNUS_EVENTS, outroPos[1], TEMPSUMMON_MANUAL_DESPAWN); - tyrannusPtr->SetFlying(true); + tyrannusPtr->SetCanFly(true); me->GetMotionMaster()->MovePoint(POINT_KRICK_INTRO, outroPos[0].GetPositionX(), outroPos[0].GetPositionY(), outroPos[0].GetPositionZ()); tyrannusPtr->SetFacingToObject(me); } @@ -439,6 +439,7 @@ class boss_krick : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_8, 5000); break; case EVENT_OUTRO_8: + //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING); me->GetMotionMaster()->MovePoint(0, outroPos[5]); DoCast(me, SPELL_STRANGULATING); @@ -453,6 +454,7 @@ class boss_krick : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_10, 1000); break; case EVENT_OUTRO_10: + //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->RemoveUnitMovementFlag(MOVEMENTFLAG_FLYING); me->AddUnitMovementFlag(MOVEMENTFLAG_FALLING); me->GetMotionMaster()->MovePoint(0, outroPos[6]); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index d6b2c2e3a97..88e9bedcd07 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -295,7 +295,7 @@ class boss_rimefang : public CreatureScript _events.SetPhase(PHASE_NONE); _currentWaypoint = 0; _hoarfrostTargetGUID = 0; - me->SetFlying(true); + me->SetCanFly(true); me->SetReactState(REACT_PASSIVE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 8ee0ef02cbd..c557b6ad831 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -1058,7 +1058,7 @@ class npc_blood_queen_lana_thel : public CreatureScript void Reset() { _events.Reset(); - me->SetLevitate(true); + me->SetDisableGravity(true); if (_instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == DONE) { me->SetVisible(false); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 5eeb941d9aa..784cda8f595 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -198,8 +198,8 @@ class boss_blood_queen_lana_thel : public CreatureScript if (Creature* minchar = me->FindNearestCreature(NPC_INFILTRATOR_MINCHAR_BQ, 200.0f)) { minchar->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); - minchar->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - minchar->SetFlying(false); + minchar->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); + minchar->SetCanFly(false); minchar->SendMovementFlagUpdate(); minchar->RemoveAllAuras(); minchar->GetMotionMaster()->MoveCharge(4629.3711f, 2782.6089f, 401.5301f, SPEED_CHARGE/3.0f); @@ -216,9 +216,9 @@ class boss_blood_queen_lana_thel : public CreatureScript _killMinchar = true; else { - me->SetLevitate(true); - me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - me->SetFlying(true); + me->SetDisableGravity(true); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); + me->SetCanFly(true); me->SendMovementFlagUpdate(); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } @@ -230,9 +230,9 @@ class boss_blood_queen_lana_thel : public CreatureScript if (_killMinchar) { _killMinchar = false; - me->SetLevitate(true); - me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - me->SetFlying(true); + me->SetDisableGravity(true); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); + me->SetCanFly(true); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } else @@ -244,9 +244,9 @@ class boss_blood_queen_lana_thel : public CreatureScript void JustReachedHome() { - me->SetLevitate(false); - me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - me->SetFlying(false); + me->SetDisableGravity(false); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); + me->SetCanFly(false); me->SetReactState(REACT_AGGRESSIVE); _JustReachedHome(); Talk(SAY_WIPE); @@ -295,9 +295,9 @@ class boss_blood_queen_lana_thel : public CreatureScript events.ScheduleEvent(EVENT_AIR_FLY_DOWN, 10000); break; case POINT_GROUND: - me->SetLevitate(false); - me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - me->SetFlying(false); + me->SetDisableGravity(false); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); + me->SetCanFly(false); me->SendMovementFlagUpdate(); me->SetReactState(REACT_AGGRESSIVE); if (Unit* victim = me->SelectVictim()) @@ -372,7 +372,7 @@ class boss_blood_queen_lana_thel : public CreatureScript break; } case EVENT_DELIRIOUS_SLASH: - if (_offtank && !me->HasByteFlag(UNIT_FIELD_BYTES_1, 3, 0x03)) + if (_offtank && !me->HasByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER)) DoCast(_offtank, SPELL_DELIRIOUS_SLASH); events.ScheduleEvent(EVENT_DELIRIOUS_SLASH, urand(20000, 24000), EVENT_GROUP_NORMAL); break; @@ -424,9 +424,9 @@ class boss_blood_queen_lana_thel : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_CENTER, centerPos); break; case EVENT_AIR_START_FLYING: - me->SetLevitate(true); - me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x01); - me->SetFlying(true); + me->SetDisableGravity(true); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); + me->SetCanFly(true); me->SendMovementFlagUpdate(); me->GetMotionMaster()->MovePoint(POINT_AIR, airPos); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 5177f65f670..e57fd7bbcb8 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -605,7 +605,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_HORDE_3, 18000); // say _events.ScheduleEvent(EVENT_OUTRO_HORDE_4, 24000); // cast _events.ScheduleEvent(EVENT_OUTRO_HORDE_5, 30000); // move - me->SetLevitate(false); + me->SetDisableGravity(false); me->SendMovementFlagUpdate(); me->Relocate(me->GetPositionX(), me->GetPositionY(), 539.2917f); me->MonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), 539.2917f, 0.0f); @@ -629,7 +629,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript { if (spell->Id == SPELL_GRIP_OF_AGONY) { - me->SetLevitate(true); + me->SetDisableGravity(true); me->GetMotionMaster()->MovePoint(POINT_CHOKE, chokePos[0]); } } @@ -812,7 +812,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript { me->RemoveAurasDueToSpell(SPELL_GRIP_OF_AGONY); Talk(SAY_OUTRO_ALLIANCE_1); - me->SetLevitate(false); + me->SetDisableGravity(false); me->SendMovementFlagUpdate(); me->Relocate(me->GetPositionX(), me->GetPositionY(), 539.2917f); me->MonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), 539.2917f, 0.0f); @@ -832,7 +832,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript { if (spell->Id == SPELL_GRIP_OF_AGONY) { - me->SetLevitate(true); + me->SetDisableGravity(true); me->GetMotionMaster()->MovePoint(POINT_CHOKE, chokePos[0]); } } @@ -934,7 +934,7 @@ class npc_saurfang_event : public CreatureScript { if (spell->Id == SPELL_GRIP_OF_AGONY) { - me->SetLevitate(true); + me->SetDisableGravity(true); me->GetMotionMaster()->MovePoint(POINT_CHOKE, chokePos[_index]); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 01879240e3a..649efc59681 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -198,8 +198,8 @@ class boss_sindragosa : public CreatureScript if (instance->GetData(DATA_SINDRAGOSA_FROSTWYRMS) != 255) { - me->SetFlying(true); - me->SetLevitate(true); + me->SetCanFly(true); + me->SetDisableGravity(true); } } @@ -228,8 +228,8 @@ class boss_sindragosa : public CreatureScript { BossAI::JustReachedHome(); instance->SetBossState(DATA_SINDRAGOSA, FAIL); - me->SetFlying(false); - me->SetLevitate(false); + me->SetCanFly(false); + me->SetDisableGravity(false); } void KilledUnit(Unit* victim) @@ -275,8 +275,8 @@ class boss_sindragosa : public CreatureScript { case POINT_FROSTWYRM_LAND: me->setActive(false); - me->SetFlying(false); - me->SetLevitate(false); + me->SetCanFly(false); + me->SetDisableGravity(false); me->SetHomePosition(SindragosaLandPos); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetSpeed(MOVE_FLIGHT, 2.0f); @@ -292,8 +292,8 @@ class boss_sindragosa : public CreatureScript events.ScheduleEvent(EVENT_FROST_BOMB, 8000); break; case POINT_LAND: - me->SetFlying(false); - me->SetLevitate(false); + me->SetCanFly(false); + me->SetDisableGravity(false); me->SetReactState(REACT_DEFENSIVE); if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); @@ -425,8 +425,8 @@ class boss_sindragosa : public CreatureScript { _isInAirPhase = true; Talk(SAY_AIR_PHASE); - me->SetFlying(true); - me->SetLevitate(true); + me->SetCanFly(true); + me->SetDisableGravity(true); me->SetReactState(REACT_PASSIVE); Position pos; pos.Relocate(me); @@ -617,8 +617,8 @@ class npc_spinestalker : public CreatureScript if (_instance->GetData(DATA_SPINESTALKER) != 255) { - me->SetFlying(true); - me->SetLevitate(true); + me->SetCanFly(true); + me->SetDisableGravity(true); } } @@ -660,8 +660,8 @@ class npc_spinestalker : public CreatureScript return; me->setActive(false); - me->SetFlying(false); - me->SetLevitate(false); + me->SetCanFly(false); + me->SetDisableGravity(false); me->SetHomePosition(SpinestalkerLandPos); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -742,8 +742,8 @@ class npc_rimefang : public CreatureScript if (_instance->GetData(DATA_RIMEFANG) != 255) { - me->SetFlying(true); - me->SetLevitate(true); + me->SetCanFly(true); + me->SetDisableGravity(true); } } @@ -785,8 +785,8 @@ class npc_rimefang : public CreatureScript return; me->setActive(false); - me->SetFlying(false); - me->SetLevitate(false); + me->SetCanFly(false); + me->SetDisableGravity(false); me->SetHomePosition(RimefangLandPos); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } @@ -819,7 +819,7 @@ class npc_rimefang : public CreatureScript _icyBlastCounter = RAID_MODE(5, 7, 6, 8); me->SetReactState(REACT_PASSIVE); me->AttackStop(); - me->SetFlying(true); + me->SetCanFly(true); me->GetMotionMaster()->MovePoint(POINT_FROSTWYRM_FLY_IN, RimefangFlyPos); float moveTime = me->GetExactDist(&RimefangFlyPos)/(me->GetSpeed(MOVE_FLIGHT)*0.001f); _events.ScheduleEvent(EVENT_ICY_BLAST, uint64(moveTime) + urand(60000, 70000)); @@ -840,7 +840,7 @@ class npc_rimefang : public CreatureScript { me->SetReactState(REACT_DEFENSIVE); AttackStart(victim); - me->SetFlying(false); + me->SetCanFly(false); } break; default: 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 19a8e42e14b..554ac228be0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -500,8 +500,8 @@ class boss_the_lich_king : public CreatureScript { _JustDied(); DoCastAOE(SPELL_PLAY_MOVIE, false); - me->SetLevitate(false); - me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x03); + me->SetDisableGravity(false); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNK_3); me->GetMotionMaster()->MoveFall(); } @@ -1073,8 +1073,8 @@ class boss_the_lich_king : public CreatureScript DoCastAOE(SPELL_SOUL_BARRAGE); sCreatureTextMgr->SendSound(me, SOUND_PAIN, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_OTHER, false); // set flight - me->SetLevitate(true); - me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x03); + me->SetDisableGravity(true); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNK_3); me->GetMotionMaster()->MovePoint(POINT_LK_OUTRO_2, OutroFlying); break; case EVENT_OUTRO_TALK_7: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 60e85165cd5..ef222963dfb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -796,7 +796,7 @@ class boss_sister_svalna : public CreatureScript { _JustReachedHome(); me->SetReactState(REACT_PASSIVE); - me->SetFlying(false); + me->SetCanFly(false); } void DoAction(int32 const action) @@ -844,7 +844,7 @@ class boss_sister_svalna : public CreatureScript _isEventInProgress = false; me->setActive(false); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - me->SetFlying(false); + me->SetCanFly(false); } void SpellHitTarget(Unit* target, SpellInfo const* spell) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index abd16cd9c93..e37ceb6925f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -296,7 +296,7 @@ public: { case EVENT_LIFTOFF: me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - me->SetLevitate(true); + me->SetDisableGravity(true); me->SendMovementFlagUpdate(); events.ScheduleEvent(EVENT_ICEBOLT, 1500); iceboltCount = RAID_MODE(2, 3); @@ -340,7 +340,7 @@ public: return; case EVENT_LAND: me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); - me->SetLevitate(false); + me->SetDisableGravity(false); me->SendMovementFlagUpdate(); events.ScheduleEvent(EVENT_GROUND, 1500); return; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index e03440cec98..9e889bb9941 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -240,7 +240,7 @@ public: _cannotMove = true; - me->SetFlying(true); + me->SetCanFly(true); if (instance) instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); @@ -271,7 +271,7 @@ public: { me->SetHomePosition(_homePosition); - me->SetLevitate(true); + me->SetDisableGravity(true); BossAI::EnterEvadeMode(); @@ -354,8 +354,8 @@ public: { _EnterCombat(); - me->SetLevitate(false); - me->SetFlying(false); + me->SetDisableGravity(false); + me->SetCanFly(false); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -412,8 +412,8 @@ public: void PrepareForVortex() { - me->SetLevitate(true); - me->SetFlying(true); + me->SetDisableGravity(true); + me->SetCanFly(true); me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MovePoint(MOVE_VORTEX, MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ()); @@ -461,8 +461,8 @@ public: { SetPhase(PHASE_TWO, true); - me->SetLevitate(true); - me->SetFlying(true); + me->SetDisableGravity(true); + me->SetCanFly(true); me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[0]); @@ -704,8 +704,8 @@ class spell_malygos_vortex_visual : public SpellScriptLoader // Anyway even with this issue, the boss does not enter in evade mode - this prevents iterate an empty list in the next vortex execution. malygos->SetInCombatWithZone(); - malygos->SetLevitate(false); - malygos->SetFlying(false); + malygos->SetDisableGravity(false); + malygos->SetCanFly(false); malygos->GetMotionMaster()->MoveChase(caster->getVictim()); malygos->RemoveAura(SPELL_VORTEX_1); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 9671d59bcec..357b0bad13c 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -316,7 +316,9 @@ public: LeaveCombat(); break; case SPELL_TELEPORT: - me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); // with out it the npc will fall down while is casting + //! Unconfirmed, previous below + me->SetDisableGravity(true); + //me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); // with out it the npc will fall down while is casting canCast = true; break; default: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 187dbed6901..7ebaac1e938 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -170,6 +170,7 @@ class npc_azure_ring_captain : public CreatureScript targetGUID = 0; me->SetWalk(true); + //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING); me->SetReactState(REACT_AGGRESSIVE); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 1671953aba1..f7c523d1521 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -575,7 +575,7 @@ class boss_stormcaller_brundir : public CreatureScript _Reset(); phase = 0; me->RemoveAllAuras(); - me->SetLevitate(false); + me->SetDisableGravity(false); me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_INTERRUPT, false); // Should be interruptable unless overridden by spell (Overload) me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, false); // Reset immumity, Brundir should be stunnable by default RespawnEncounter(instance, me); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index d245c77b9df..85b5c13c6ee 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -330,7 +330,7 @@ class boss_razorscale : public CreatureScript void Reset() { _Reset(); - me->SetFlying(true); + me->SetCanFly(true); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); PermaGround = false; @@ -419,7 +419,7 @@ class boss_razorscale : public CreatureScript case EVENT_FLIGHT: phase = PHASE_FLIGHT; events.SetPhase(PHASE_FLIGHT); - me->SetFlying(true); + me->SetCanFly(true); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); me->AttackStop(); @@ -430,7 +430,7 @@ class boss_razorscale : public CreatureScript ++FlyCount; return; case EVENT_LAND: - me->SetFlying(false); + me->SetCanFly(false); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); if (Creature* commander = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_EXPEDITION_COMMANDER) : 0)) @@ -524,7 +524,7 @@ class boss_razorscale : public CreatureScript me->MonsterTextEmote(EMOTE_PERMA, 0, true); phase = PHASE_PERMAGROUND; events.SetPhase(PHASE_PERMAGROUND); - me->SetFlying(false); + me->SetCanFly(false); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); me->RemoveAurasDueToSpell(SPELL_HARPOON_TRIGGER); 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 a11f88fc6af..7d37621e787 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 @@ -321,6 +321,7 @@ public: void Reset() { + //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_HOVER); me->SetSpeed(MOVE_SWIM, 1.0f); me->SetSpeed(MOVE_RUN, 1.0f); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 656b2931abb..d40dba22fcd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -765,6 +765,7 @@ public: { currentPhase = PHASE_NONE; SummonTimer = 5000; + //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING); me->RemoveAurasDueToSpell(SPELL_ORB_VISUAL); me->SetSpeed(MOVE_FLIGHT, 0.5f); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index dd3557071cd..5ce26ab1467 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -217,7 +217,7 @@ public: void JustReachedHome() { - me->SetFlying(false); + me->SetCanFly(false); me->Dismount(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); if (Unit::GetCreature((*me), m_uiGraufGUID) == NULL) @@ -284,7 +284,7 @@ public: if (m_uiSpellHitCount >= 3) { Phase = SKADI; - me->SetFlying(false); + 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)) { @@ -328,7 +328,7 @@ public: if (m_uiMountTimer && m_uiMountTimer <= diff) { me->Mount(DATA_MOUNT); - me->SetFlying(true); + me->SetCanFly(true); m_uiMountTimer = 0; } else m_uiMountTimer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index a4289b2eb06..10dc8957d93 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -91,12 +91,6 @@ enum SvalaPhase INTRO, NORMAL, SACRIFICING, - SVALADEAD -}; - -enum SvalaPoint -{ - POINT_FALL_GROUND = 1, }; #define DATA_INCREDIBLE_HULK 2043 @@ -158,15 +152,11 @@ public: summons.DespawnAll(); me->RemoveAllAuras(); - if (Phase > INTRO) - { - me->SetFlying(true); - me->SetLevitate(true); - } - if (Phase > NORMAL) Phase = NORMAL; + me->SetDisableGravity(Phase == NORMAL); + introTimer = 1 * IN_MILLISECONDS; introPhase = 0; arthasGUID = 0; @@ -178,17 +168,6 @@ public: } } - void JustReachedHome() - { - if (Phase > INTRO) - { - me->SetFlying(false); - me->SetLevitate(false); - me->SetOrientation(1.58f); - me->SendMovementFlagUpdate(); - } - } - void EnterCombat(Unit* /*who*/) { Talk(SAY_AGGRO); @@ -240,44 +219,13 @@ public: Talk(SAY_SLAY); } - void DamageTaken(Unit* attacker, uint32 &damage) - { - if (Phase == SVALADEAD) - { - if (attacker != me) - damage = 0; - return; - } - - if (damage >= me->GetHealth()) - { - if (Phase == SACRIFICING) - SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); - - damage = 0; - Phase = SVALADEAD; - me->InterruptNonMeleeSpells(true); - me->RemoveAllAuras(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetHealth(1); - - SetCombatMovement(false); - me->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); - me->GetMotionMaster()->MoveFall(POINT_FALL_GROUND); - } - } - - void MovementInform(uint32 motionType, uint32 pointId) + void JustDied(Unit* /*killer*/) { - if (motionType != EFFECT_MOTION_TYPE) - return; + if (Phase == SACRIFICING) + SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); - if (pointId == POINT_FALL_GROUND) - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } + me->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); - void JustDied(Unit* /*killer*/) - { summons.DespawnAll(); if (instance) @@ -325,8 +273,6 @@ public: break; case 2: arthas->CastSpell(me, SPELL_TRANSFORMING_CHANNEL, false); - me->SetFlying(true); - me->SetLevitate(true); pos.Relocate(me); pos.m_positionZ += 8.0f; me->GetMotionMaster()->MoveTakeoff(0, pos, 3.30078125f); @@ -382,14 +328,13 @@ public: introTimer = 13800; break; case 8: - me->SetFlying(false); - me->SetLevitate(false); - me->SendMovementFlagUpdate(); pos.Relocate(me); pos.m_positionX = me->GetHomePosition().GetPositionX(); pos.m_positionY = me->GetHomePosition().GetPositionY(); pos.m_positionZ = 90.6065f; me->GetMotionMaster()->MoveLand(0, pos, 6.247422f); + me->SetDisableGravity(false, true); + me->SetHover(true); ++introPhase; introTimer = 3000; break; @@ -403,7 +348,8 @@ public: break; } } - else introTimer -= diff; + else + introTimer -= diff; return; } @@ -414,33 +360,29 @@ public: if (!UpdateVictim()) return; - if (me->IsWithinMeleeRange(me->getVictim()) && me->HasUnitMovementFlag(MOVEMENTFLAG_LEVITATING)) - { - me->SetFlying(false); - me->SetLevitate(false); - me->SendMovementFlagUpdate(); - } - if (sinsterStrikeTimer <= diff) { DoCast(me->getVictim(), SPELL_SINSTER_STRIKE); sinsterStrikeTimer = urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS); - } else sinsterStrikeTimer -= diff; + } + else + sinsterStrikeTimer -= diff; if (callFlamesTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) { DoCast(target, SPELL_CALL_FLAMES); callFlamesTimer = urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS); } - } else callFlamesTimer -= diff; + } + else callFlamesTimer -= diff; if (!sacrificed) { if (HealthBelowPct(50)) { - if (Unit* sacrificeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) + if (Unit* sacrificeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80.0f, true)) { if (instance) instance->SetData64(DATA_SACRIFICED_PLAYER, sacrificeTarget->GetGUID()); @@ -450,8 +392,6 @@ public: DoCast(sacrificeTarget, SPELL_RITUAL_PREPARATION); SetCombatMovement(false); - me->SetFlying(true); - me->SetLevitate(true); Phase = SACRIFICING; sacrePhase = 0; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 35bbb98fd77..0d8e22ff630 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -218,7 +218,7 @@ public: m_uiActivedCreatureGUID = temp->GetGUID(); temp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - temp->SetLevitate(true); + temp->SetDisableGravity(true); switch (m_uiActiveOrder[m_uiActivedNumber]) { case 0: m_bIsActiveWithBJORN = true; break; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index f0445273d43..d43cf6fb98f 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -92,7 +92,7 @@ public: me->RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING); me->RemoveUnitMovementFlag(MOVEMENTFLAG_JUMPING); me->SetSpeed(MOVE_SWIM, 0.85f, true); - me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); + me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_DISABLE_GRAVITY); break; case 19: me->SetUnitMovementFlags(MOVEMENTFLAG_JUMPING); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index c3c53416a9b..51271cdfe42 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -101,7 +101,7 @@ public: DoScriptText(SAY_INTRO, me); } - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; float attackRadius = me->GetAttackDistance(who); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index ace1a2ab717..93b687d3f3d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -798,7 +798,7 @@ public: { case 1: // lift off me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); me->StopMoving(); me->MonsterYell(SAY_TAKEOFF, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_TAKEOFF); @@ -867,7 +867,7 @@ public: Timer[EVENT_FLIGHT_SEQUENCE] = 2000; break; case 9: // land - me->SetLevitate(false); + me->SetDisableGravity(false); me->StopMoving(); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); for (uint8 i = 0; i < 2; ++i) @@ -1869,7 +1869,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); - me->SetLevitate(false); + me->SetDisableGravity(false); me->setActive(false); Summons.DespawnAll(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index fbafb9615f7..2df9e0e65ba 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -731,7 +731,7 @@ public: void Reset() { - me->SetLevitate(true); + me->SetDisableGravity(true); me->setFaction(14); MovementTimer = 0; ToxicSporeTimer = 5000; 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 4af20d70816..41a8b12dd51 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -109,7 +109,7 @@ public: } void Reset() { - me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); + me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_DISABLE_GRAVITY); SpoutAnimTimer = 1000; RotTimer = 0; WaterboltTimer = 15000; // give time to get in range when fight starts 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 6c4019c7989..3ed3d1a82de 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -153,7 +153,7 @@ class instance_serpent_shrine : public InstanceMapScript if (Creature* frenzy = player->SummonCreature(MOB_COILFANG_FRENZY, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000)) { frenzy->Attack(player, false); - frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); + frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_DISABLE_GRAVITY); } DoSpawnFrenzy = false; } 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 4f422da35ad..66d445c1f39 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 @@ -145,7 +145,7 @@ class boss_nazan : public CreatureScript flight = false; BellowingRoar_Timer = 6000; ConeOfFire_Timer = 12000; - me->SetLevitate(false); + me->SetDisableGravity(false); me->SetWalk(true); me->GetMotionMaster()->Clear(); if (Unit* victim = SelectTarget(SELECT_TARGET_NEAREST, 0)) @@ -374,7 +374,7 @@ class boss_vazruden_the_herald : public CreatureScript if (summoned->GetEntry() == ENTRY_NAZAN) { CAST_AI(boss_nazan::boss_nazanAI, summoned->AI())->VazrudenGUID = VazrudenGUID; - summoned->SetLevitate(true); + summoned->SetDisableGravity(true); summoned->SetSpeed(MOVE_FLIGHT, 2.5f); if (victim) AttackStartNoMove(victim); 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 b2f8af2c80d..cc732b86ea4 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -87,7 +87,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript { if (!me->getVictim() && me->canCreatureAttack(who)) { - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; float attackRadius = me->GetAttackDistance(who); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index fcfe6c0ea16..97ac0b9da5e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -130,7 +130,7 @@ class boss_alar : public CreatureScript //me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); //me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->setActive(false); } @@ -140,7 +140,7 @@ class boss_alar : public CreatureScript if (instance) instance->SetData(DATA_ALAREVENT, IN_PROGRESS); - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); // after enterevademode will be set walk movement + me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); // after enterevademode will be set walk movement DoZoneInCombat(); me->setActive(true); } @@ -470,7 +470,7 @@ class mob_ember_of_alar : public CreatureScript mob_ember_of_alarAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); - creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + creature->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY); creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 904b2851816..577c8bf9f54 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -399,7 +399,7 @@ class boss_kaelthas : public CreatureScript { if (!me->HasUnitState(UNIT_STATE_STUNNED) && me->canCreatureAttack(who)) { - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; float attackRadius = me->GetAttackDistance(who); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index db95f60f556..24ea29702f5 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -316,7 +316,7 @@ class npc_warden_mellichar : public CreatureScript if (!me->getVictim() && me->canCreatureAttack(who)) { - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; if (who->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index d5b08d83c71..f46f7f1d745 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -751,7 +751,7 @@ class npc_simon_bunny : public CreatureScript // Used for getting involved player guid. Parameter id is used for defining if is a large(Monument) or small(Relic) node void SetGUID(uint64 guid, int32 id) { - me->SetFlying(true); + me->SetCanFly(true); large = (bool)id; playerGUID = guid; diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 79d284d779a..be0166b6d19 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -223,7 +223,7 @@ public: me->setFaction(FACTION_DEFAULT); FlyTimer = 10000; - me->SetLevitate(false); + me->SetDisableGravity(false); me->SetVisible(true); } @@ -270,7 +270,7 @@ public: PlayerGUID = 0; } me->SetVisible(false); - me->SetLevitate(false); + me->SetDisableGravity(false); me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); me->RemoveCorpse(); } @@ -308,7 +308,7 @@ public: pos.m_positionZ += 25; } - me->SetLevitate(true); + me->SetDisableGravity(true); me->GetMotionMaster()->MovePoint(1, pos); } } @@ -808,7 +808,7 @@ public: case 19: DoScriptText(LORD_ILLIDAN_SAY_7, Illi); return 5000; break; case 20: Illi->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - Illi->SetLevitate(true); + Illi->SetDisableGravity(true); return 500; break; case 21: DoScriptText(OVERLORD_SAY_5, me); return 500; break; case 22: diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index b7aee4a3f07..67b04dab29d 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -421,7 +421,7 @@ public: float x, y, z; me->GetPosition(x, y, z); me->Relocate(x, y, z + 0.94f); - me->SetLevitate(true); + me->SetDisableGravity(true); me->HandleEmoteCommand(EMOTE_ONESHOT_DANCE); WorldPacket data; //send update position to client me->BuildHeartBeatMsg(&data); @@ -1937,6 +1937,7 @@ public: me->CastSpell(me, 54661, true); me->SetReactState(REACT_PASSIVE); + //! HACK: Creature's can't have MOVEMENTFLAG_FLYING // Fly Away me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY|MOVEMENTFLAG_ASCENDING|MOVEMENTFLAG_FLYING); me->SetSpeed(MOVE_FLIGHT, 0.75f, true); -- cgit v1.2.3 From c0165ec7f84845c511ad426e318e96e5420687db Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 12 Mar 2012 18:09:06 +0100 Subject: Scripts/Icecrown Citadel: Lock Deathbringer Saurfang and Valithria Dreamwalker chests to players who fought them --- .../world/2012_03_12_01_world_conditions.sql | 3 + .../world/2012_03_12_01_world_gameobject.sql | 4 ++ .../2012_03_12_01_world_spell_script_names.sql | 3 + .../IcecrownCitadel/boss_deathbringer_saurfang.cpp | 72 +++++++++++++++++++--- .../IcecrownCitadel/boss_the_lich_king.cpp | 9 ++- .../IcecrownCitadel/boss_valithria_dreamwalker.cpp | 7 ++- .../Northrend/IcecrownCitadel/icecrown_citadel.h | 4 ++ .../IcecrownCitadel/instance_icecrown_citadel.cpp | 16 ++++- 8 files changed, 102 insertions(+), 16 deletions(-) create mode 100644 sql/updates/world/2012_03_12_01_world_conditions.sql create mode 100644 sql/updates/world/2012_03_12_01_world_gameobject.sql create mode 100644 sql/updates/world/2012_03_12_01_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_12_01_world_conditions.sql b/sql/updates/world/2012_03_12_01_world_conditions.sql new file mode 100644 index 00000000000..d58d8f54ddf --- /dev/null +++ b/sql/updates/world/2012_03_12_01_world_conditions.sql @@ -0,0 +1,3 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=72257; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,72257,0,0,32,0,144,0,0,0,0,'','Remove Marks of the Fallen Champion - target player'); diff --git a/sql/updates/world/2012_03_12_01_world_gameobject.sql b/sql/updates/world/2012_03_12_01_world_gameobject.sql new file mode 100644 index 00000000000..38c615a3b0a --- /dev/null +++ b/sql/updates/world/2012_03_12_01_world_gameobject.sql @@ -0,0 +1,4 @@ +UPDATE `gameobject_template` SET `flags`=0x32 WHERE `entry` IN (202239,202240,202238,202241,201959,202339,202338,202340); + +-- Set Deathbringer's Cache spawned by default +UPDATE `gameobject` SET `spawntimesecs`=604800 WHERE `id` IN (202239,202240,202238,202241); diff --git a/sql/updates/world/2012_03_12_01_world_spell_script_names.sql b/sql/updates/world/2012_03_12_01_world_spell_script_names.sql new file mode 100644 index 00000000000..db98aa0fbea --- /dev/null +++ b/sql/updates/world/2012_03_12_01_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_deathbringer_remove_marks'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(72257,'spell_deathbringer_remove_marks'); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index e57fd7bbcb8..b794970d24e 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -111,6 +111,8 @@ enum Spells SPELL_RIDE_VEHICLE = 70640, // Outro SPELL_ACHIEVEMENT = 72928, + SPELL_REMOVE_MARKS_OF_THE_FALLEN_CHAMPION = 72257, + SPELL_PERMANENT_FEIGN_DEATH = 70628, }; // Helper to get id of the aura on different modes (HasAura(baseId) wont work) @@ -254,6 +256,7 @@ class boss_deathbringer_saurfang : public CreatureScript me->SetReactState(REACT_DEFENSIVE); events.SetPhase(PHASE_COMBAT); _frenzied = false; + _dead = false; me->SetPower(POWER_ENERGY, 0); DoCast(me, SPELL_ZERO_POWER, true); DoCast(me, SPELL_BLOOD_LINK, true); @@ -303,13 +306,6 @@ class boss_deathbringer_saurfang : public CreatureScript void JustDied(Unit* /*killer*/) { - _JustDied(); - DoCast(me, SPELL_ACHIEVEMENT, true); - Talk(SAY_DEATH); - - instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MARK_OF_THE_FALLEN_CHAMPION); - if (Creature* creature = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SAURFANG_EVENT_NPC))) - creature->AI()->DoAction(ACTION_START_OUTRO); } void AttackStart(Unit* victim) @@ -348,6 +344,22 @@ class boss_deathbringer_saurfang : public CreatureScript DoCast(me, SPELL_FRENZY); Talk(SAY_FRENZY); } + + if (!_dead && me->GetHealth() < FightWonValue) + { + _dead = true; + _JustDied(); + _EnterEvadeMode(); + + DoCastAOE(SPELL_REMOVE_MARKS_OF_THE_FALLEN_CHAMPION); + DoCast(me, SPELL_ACHIEVEMENT, true); + Talk(SAY_DEATH); + + //instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MARK_OF_THE_FALLEN_CHAMPION); + DoCast(me, SPELL_PERMANENT_FEIGN_DEATH); + if (Creature* creature = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SAURFANG_EVENT_NPC))) + creature->AI()->DoAction(ACTION_START_OUTRO); + } } void JustSummoned(Creature* summon) @@ -542,10 +554,13 @@ class boss_deathbringer_saurfang : public CreatureScript } } + static uint32 const FightWonValue; + private: uint32 _fallenChampionCastCount; bool _introDone; bool _frenzied; // faster than iterating all auras to find Frenzy + bool _dead; }; CreatureAI* GetAI(Creature* creature) const @@ -554,6 +569,8 @@ class boss_deathbringer_saurfang : public CreatureScript } }; +uint32 const boss_deathbringer_saurfang::boss_deathbringer_saurfangAI::FightWonValue = 100000; + class npc_high_overlord_saurfang_icc : public CreatureScript { public: @@ -655,7 +672,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript { deathbringer->CastSpell(me, SPELL_RIDE_VEHICLE, true); // for the packet logs. deathbringer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - deathbringer->setDeathState(ALIVE); + deathbringer->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DROWNED); } _events.ScheduleEvent(EVENT_OUTRO_HORDE_5, 1000); // move _events.ScheduleEvent(EVENT_OUTRO_HORDE_6, 4000); // say @@ -818,6 +835,10 @@ class npc_muradin_bronzebeard_icc : public CreatureScript me->MonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), 539.2917f, 0.0f); for (std::list::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr) (*itr)->AI()->DoAction(ACTION_DESPAWN); + + // temp until outro fully done - to put deathbringer on respawn timer (until next reset) + if (Creature* deathbringer = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_DEATHBRINGER_SAURFANG))) + deathbringer->DespawnOrUnsummon(5000); break; } case ACTION_INTERRUPT_INTRO: @@ -1175,6 +1196,9 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader void FilterTargetsInitial(std::list& unitList) { + if (unitList.empty()) + return; + // select one random target, with preference of ranged targets uint32 targetsAtRange = 0; uint32 const minTargets = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 10 : 4); @@ -1189,7 +1213,9 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader if (targetsAtRange < minTargets) targetsAtRange = std::min(unitList.size() - 1, minTargets); - target = SelectRandomContainerElement(unitList); + std::list::const_iterator itr = unitList.begin(); + std::advance(itr, urand(0, targetsAtRange)); + target = *itr; unitList.clear(); unitList.push_back(target); } @@ -1256,6 +1282,33 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader } }; +class spell_deathbringer_remove_marks : public SpellScriptLoader +{ + public: + spell_deathbringer_remove_marks() : SpellScriptLoader("spell_deathbringer_remove_marks") { } + + class spell_deathbringer_remove_marks_SpellScript : public SpellScript + { + PrepareSpellScript(spell_deathbringer_remove_marks_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_deathbringer_remove_marks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_deathbringer_remove_marks_SpellScript(); + } +}; + class achievement_ive_gone_and_made_a_mess : public AchievementCriteriaScript { public: @@ -1285,5 +1338,6 @@ void AddSC_boss_deathbringer_saurfang() new spell_deathbringer_blood_nova(); new spell_deathbringer_blood_nova_targeting(); new spell_deathbringer_boiling_blood(); + new spell_deathbringer_remove_marks(); new achievement_ive_gone_and_made_a_mess(); } 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 d352871ba6d..90ee6e1af71 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -585,8 +585,8 @@ class boss_the_lich_king : public CreatureScript SendLightOverride(0, 5000); break; case ACTION_BREAK_FROSTMOURNE: - DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE); - DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE_2); + me->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE, TRIGGERED_IGNORE_CAST_IN_PROGRESS); + me->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE_2, TRIGGERED_IGNORE_CAST_IN_PROGRESS); SetEquipmentSlots(false, EQUIP_BROKEN_FROSTMOURNE); events.ScheduleEvent(EVENT_OUTRO_TALK_6, 2500, 0, PHASE_OUTRO); break; @@ -1065,12 +1065,11 @@ class boss_the_lich_king : public CreatureScript Talk(SAY_LK_OUTRO_6); if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) tirion->SetFacingToObject(me); - me->ClearUnitState(UNIT_STATE_CASTING); - DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE_3); + me->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE_3, TRIGGERED_IGNORE_CAST_IN_PROGRESS); SetEquipmentSlots(false, EQUIP_UNEQUIP); break; case EVENT_OUTRO_SOUL_BARRAGE: - DoCastAOE(SPELL_SOUL_BARRAGE); + me->CastSpell((Unit*)NULL, SPELL_SOUL_BARRAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS); sCreatureTextMgr->SendSound(me, SOUND_PAIN, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_OTHER, false); // set flight me->SetDisableGravity(true); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index e0993178890..36594d5a684 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -329,8 +329,13 @@ class boss_valithria_dreamwalker : public CreatureScript _events.ScheduleEvent(EVENT_BERSERK, 420000); } - void HealReceived(Unit* /*healer*/, uint32& heal) + void HealReceived(Unit* healer, uint32& heal) { + if (!me->hasLootRecipient()) + me->SetLootRecipient(healer); + + me->LowerPlayerDamageReq(heal); + // encounter complete if (me->HealthAbovePctHealed(100, heal) && !_done) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 085aea139a3..224777c3db7 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -331,6 +331,10 @@ enum GameObjectsIds GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_02 = 201381, GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_03 = 201382, GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_04 = 201383, + GO_CACHE_OF_THE_DREAMWALKER_10N = 201959, + GO_CACHE_OF_THE_DREAMWALKER_25N = 202339, + GO_CACHE_OF_THE_DREAMWALKER_10H = 202338, + GO_CACHE_OF_THE_DREAMWALKER_25H = 202340, // Sindragosa GO_SINDRAGOSA_ENTRANCE_DOOR = 201373, diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 98f5c04ba42..cb83efc748f 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -452,6 +452,14 @@ class instance_icecrown_citadel : public InstanceMapScript case GO_DRINK_ME: PutricideTableGUID = go->GetGUID(); break; + case GO_CACHE_OF_THE_DREAMWALKER_10N: + case GO_CACHE_OF_THE_DREAMWALKER_25N: + case GO_CACHE_OF_THE_DREAMWALKER_10H: + case GO_CACHE_OF_THE_DREAMWALKER_25H: + if (Creature* valithria = instance->GetCreature(ValithriaDreamwalkerGUID)) + go->SetLootRecipient(valithria->GetLootRecipient()); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN); + break; case GO_ARTHAS_PLATFORM: // this enables movement at The Frozen Throne, when printed this value is 0.000000f // however, when represented as integer client will accept only this value @@ -638,7 +646,13 @@ class instance_icecrown_citadel : public InstanceMapScript switch (state) { case DONE: - DoRespawnGameObject(DeathbringersCacheGUID, 7*DAY); + if (GameObject* loot = instance->GetGameObject(DeathbringersCacheGUID)) + { + if (Creature* deathbringer = instance->GetCreature(DeathbringerSaurfangGUID)) + loot->SetLootRecipient(deathbringer->GetLootRecipient()); + loot->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN); + } + // no break case NOT_STARTED: if (GameObject* teleporter = instance->GetGameObject(SaurfangTeleportGUID)) { -- cgit v1.2.3 From 4a96ae22a98b1e4b9865c53e9194fe9e133226a1 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 15 Mar 2012 13:10:42 +0100 Subject: Scripts/Icecrown Citadel: Corrected flying animations for frostwyrms in Sindragosa's Lair and prevent reentering combat with Deathbringer Saurfang after encounter is won --- sql/updates/world/2012_03_14_00_world_creature_addon.sql | 2 ++ .../Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp | 9 ++++++++- .../scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 sql/updates/world/2012_03_14_00_world_creature_addon.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_14_00_world_creature_addon.sql b/sql/updates/world/2012_03_14_00_world_creature_addon.sql new file mode 100644 index 00000000000..c7e4edb97ed --- /dev/null +++ b/sql/updates/world/2012_03_14_00_world_creature_addon.sql @@ -0,0 +1,2 @@ +UPDATE `creature_addon` SET `bytes1`=0x3000000 WHERE `guid`=207210; +UPDATE `creature_addon` SET `bytes1`=0x3000000 WHERE `guid`=207211; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index b794970d24e..3ce62d939d3 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -269,6 +269,9 @@ class boss_deathbringer_saurfang : public CreatureScript void EnterCombat(Unit* who) { + if (_dead) + return; + if (!instance->CheckRequiredBosses(DATA_DEATHBRINGER_SAURFANG, who->ToPlayer())) { EnterEvadeMode(); @@ -336,8 +339,11 @@ class boss_deathbringer_saurfang : public CreatureScript Talk(SAY_KILL); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& damage) { + if (damage >= me->GetHealth()) + damage = me->GetHealth() - 1; + if (!_frenzied && HealthBelowPct(31)) // AT 30%, not below { _frenzied = true; @@ -350,6 +356,7 @@ class boss_deathbringer_saurfang : public CreatureScript _dead = true; _JustDied(); _EnterEvadeMode(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE); DoCastAOE(SPELL_REMOVE_MARKS_OF_THE_FALLEN_CHAMPION); DoCast(me, SPELL_ACHIEVEMENT, true); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 649efc59681..c88b3aa8b37 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -250,6 +250,9 @@ class boss_sindragosa : public CreatureScript return; me->setActive(true); + me->SetCanFly(true); + me->SetDisableGravity(true); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetSpeed(MOVE_FLIGHT, 4.0f); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); float moveTime = me->GetExactDist(&SindragosaFlyPos) / (me->GetSpeed(MOVE_FLIGHT) * 0.001f); @@ -277,9 +280,10 @@ class boss_sindragosa : public CreatureScript me->setActive(false); me->SetCanFly(false); me->SetDisableGravity(false); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetHomePosition(SindragosaLandPos); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetSpeed(MOVE_FLIGHT, 2.0f); + me->SetSpeed(MOVE_FLIGHT, 2.5f); // Sindragosa enters combat as soon as she lands DoZoneInCombat(); @@ -294,6 +298,7 @@ class boss_sindragosa : public CreatureScript case POINT_LAND: me->SetCanFly(false); me->SetDisableGravity(false); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetReactState(REACT_DEFENSIVE); if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); @@ -427,6 +432,7 @@ class boss_sindragosa : public CreatureScript Talk(SAY_AIR_PHASE); me->SetCanFly(true); me->SetDisableGravity(true); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetReactState(REACT_PASSIVE); Position pos; pos.Relocate(me); @@ -662,6 +668,7 @@ class npc_spinestalker : public CreatureScript me->setActive(false); me->SetCanFly(false); me->SetDisableGravity(false); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetHomePosition(SpinestalkerLandPos); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -787,6 +794,7 @@ class npc_rimefang : public CreatureScript me->setActive(false); me->SetCanFly(false); me->SetDisableGravity(false); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetHomePosition(RimefangLandPos); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } -- cgit v1.2.3 From 7bbd1f106b851d926eeb5a897a19ec73c3bb4eb3 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 19 Mar 2012 19:07:36 -0230 Subject: DB/SAI: SAI & Gossip for Unrestrained Dragonhawk --- .../world/2012_03_19_00_world_smart_scripts.sql | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 sql/updates/world/2012_03_19_00_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_19_00_world_smart_scripts.sql b/sql/updates/world/2012_03_19_00_world_smart_scripts.sql new file mode 100644 index 00000000000..20241efa9cc --- /dev/null +++ b/sql/updates/world/2012_03_19_00_world_smart_scripts.sql @@ -0,0 +1,21 @@ +-- SAI for Unrestrained Dragonhawk +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=25236; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=25236 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 +(25236,0,0,1,62,0,100,0,9143,0,0,0,11,45353,0,0,0,0,0,7,0,0,0,0,0,0,0,'Unrestrained Dragonhawk - On Gossip option select - cast "Quest - Sunwell Daily - Ship Bombing Run Return" on player'), +(25236,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Unrestrained Dragonhawk - On Gossip option select - Close Gossip'); +-- Unrestrained Dragonhawk Gossip +UPDATE `creature_template` SET `gossip_menu_id`=9143 WHERE `entry`=25236; +-- Gossip_menu from UDB +DELETE FROM `gossip_menu` WHERE `entry`=9143; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9143,12371); +-- Gossip_menu_option Update from UDB +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9143; +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 +(9143,0,0, '',1,1,0,0,0,0, ''); +-- Gossip option Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9143; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,9143,0,0,9,11542,0,0,0,'','Show gossip option if player has quest 11542 but not complete'), +(15,9143,0,1,9,11543,0,0,0,'','Show gossip option if player has quest 11543 but not complete'); -- cgit v1.2.3 From ec3d3782ce87575e3d685085ba3f30d943f38fd9 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 20 Mar 2012 15:22:26 -0230 Subject: DB/Gossip: Quel'Danas gossips Closes #5803 --- sql/updates/world/2012_03_20_00_world_gossip.sql | 88 ++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 sql/updates/world/2012_03_20_00_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_20_00_world_gossip.sql b/sql/updates/world/2012_03_20_00_world_gossip.sql new file mode 100644 index 00000000000..00214d805e7 --- /dev/null +++ b/sql/updates/world/2012_03_20_00_world_gossip.sql @@ -0,0 +1,88 @@ +-- Creature Gossip_menu_id Update from sniff +UPDATE `creature_template` SET `gossip_menu_id`=9052 WHERE `entry`=24965; -- Vindicator Xayann +UPDATE `creature_template` SET `gossip_menu_id`=9050 WHERE `entry`=24975; -- Mar'nah +UPDATE `creature_template` SET `gossip_menu_id`=9126 WHERE `entry`=25032; -- Eldara Dawnrunner +UPDATE `creature_template` SET `gossip_menu_id`=9087 WHERE `entry`=25046; -- Smith Hauthaa +UPDATE `creature_template` SET `gossip_menu_id`=9064 WHERE `entry`=25057; -- Battlemage Arynna +UPDATE `creature_template` SET `gossip_menu_id`=9062, `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=25059; -- Ayren Cloudbreaker +UPDATE `creature_template` SET `gossip_menu_id`=9063 WHERE `entry`=25061; -- Harbinger Inuuro +UPDATE `creature_template` SET `gossip_menu_id`=9127 WHERE `entry`=25069; -- Magister Ilastar +UPDATE `creature_template` SET `gossip_menu_id`=9115 WHERE `entry`=25112; -- Anchorite Ayuri +UPDATE `creature_template` SET `gossip_menu_id`=9105 WHERE `entry`=25169; -- Archmage Ne'thul +UPDATE `creature_template` SET `gossip_menu_id`=9286 WHERE `entry`=25632; -- Vindicator Moorba +UPDATE `creature_template` SET `gossip_menu_id`=9285 WHERE `entry`=25638; -- Captain Selana +UPDATE `creature_template` SET `gossip_menu_id`=9198 WHERE `entry`=25950; -- Shaani + +-- Gossip Menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=9050 AND `text_id`=12237; +DELETE FROM `gossip_menu` WHERE `entry`=9052 AND `text_id`=12241; +DELETE FROM `gossip_menu` WHERE `entry`=9062 AND `text_id`=12252; +DELETE FROM `gossip_menu` WHERE `entry`=9063 AND `text_id`=12256; +DELETE FROM `gossip_menu` WHERE `entry`=9064 AND `text_id`=12258; +DELETE FROM `gossip_menu` WHERE `entry`=9087 AND `text_id`=12286; +DELETE FROM `gossip_menu` WHERE `entry`=9115 AND `text_id`=12323; +DELETE FROM `gossip_menu` WHERE `entry`=9126 AND `text_id`=12338; +DELETE FROM `gossip_menu` WHERE `entry`=9127 AND `text_id`=12340; +DELETE FROM `gossip_menu` WHERE `entry`=9198 AND `text_id`=12497; +DELETE FROM `gossip_menu` WHERE `entry`=9285 AND `text_id`=12596; +DELETE FROM `gossip_menu` WHERE `entry`=9286 AND `text_id`=12597; +DELETE FROM `gossip_menu` WHERE `entry`=9287 AND `text_id`=12598; +DELETE FROM `gossip_menu` WHERE `entry`=9288 AND `text_id`=12599; +DELETE FROM `gossip_menu` WHERE `entry`=9289 AND `text_id`=12600; +DELETE FROM `gossip_menu` WHERE `entry`=9290 AND `text_id`=12601; +DELETE FROM `gossip_menu` WHERE `entry`=9293 AND `text_id`=12604; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9050,12237), +(9052,12241), +(9062,12252), +(9063,12256), +(9064,12258), +(9087,12286), +(9115,12323), +(9126,12338), +(9127,12340), +(9198,12497), +(9285,12596), +(9286,12597), +(9287,12598), +(9288,12599), +(9289,12600), +(9290,12601), +(9293,12604); + +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9050,9087,9126,9198,9285,9287,9288,9289) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9062 AND `id` IN (0,1); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9286 AND `id`=2; +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 +(9050,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9062,0,0,'Speaking of action, I''ve been ordered to undertake an air strike.',1,1,0,0,0,0,''), +(9062,1,0,'I need to intercept the Dawnblade reinforcements.',1,1,0,0,0,0,''), +(9087,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9126,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9198,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9285,0,0,'Give me a situation report, Captain.',1,1,9287,0,0,0,''), +(9286,2,0,'What is the current state of the Sunwell''s Gates?',1,1,9293,0,0,0,''), +(9287,0,0,'What went wrong?',1,1,9288,0,0,0,''), +(9288,0,0,'Why did they stop?',1,1,9289,0,0,0,''), +(9289,0,0,'Your insight is appreciated.',1,1,9290,0,0,0,''); + +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9062 AND `SourceEntry` IN (0,1); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,9062,0,0,0,9,11532,0,0,0,0,'','Show gossip option only if player has taken quest 11532'), +(15,9062,0,0,1,9,11533,0,0,0,0,'','Show gossip option only if player has taken quest 11533'), +(15,9062,1,0,0,9,11542,0,0,0,0,'','Show gossip option only if player has taken quest 11542'), +(15,9062,1,0,1,9,11543,0,0,0,0,'','Show gossip option only if player has taken quest 11543'); + +-- SmartAI +DELETE FROM `smart_scripts` WHERE `entryorguid`=25059 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 +(25059,0,0,2,62,0,100,0,9062,0,0,0,11,45071,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Cast "Quest - Sunwell Daily - Dead Scar Bombing Run" on player'), +(25059,0,1,2,62,0,100,0,9062,1,0,0,11,45113,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Cast "Quest - Sunwell Daily - Ship Bombing Run" on player'), +(25059,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Close Gossip'); + +-- Spell scripts from sniff +DELETE FROM `spell_scripts` WHERE `id`=45071; +INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(45071,2,0,16,12318,1,0,0,0,0,0); -- Play sound -- cgit v1.2.3 From e8c3cb1c10f8c7cb8edcddeb6b7b0705563c161c Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Wed, 21 Mar 2012 22:17:34 +0200 Subject: Scripts/ToCr/Val'kyr Twins: Fix orb targeting. Add missing triggers. --- sql/updates/world/2012_03_21_00_world_creature.sql | 71 ++++++++++++++++++++++ .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 6 +- 2 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 sql/updates/world/2012_03_21_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_21_00_world_creature.sql b/sql/updates/world/2012_03_21_00_world_creature.sql new file mode 100644 index 00000000000..254e86b94dc --- /dev/null +++ b/sql/updates/world/2012_03_21_00_world_creature.sql @@ -0,0 +1,71 @@ +-- ToC missing trigger spawns + +SET @GUID := 88412; +SET @NPC_TRIGGER1 := 34704; -- Val'kyr Twins Bullet Stalker Dark +SET @NPC_TRIGGER2 := 34720; -- Val'kyr Twins Bullet Stalker Light + +UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (@NPC_TRIGGER1,@NPC_TRIGGER2); +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+61; +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,@NPC_TRIGGER1,649,15,1,0,0,619.771,143.71,395.244,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+1,@NPC_TRIGGER1,649,15,1,0,0,515.352,115.349,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+2,@NPC_TRIGGER1,649,15,1,0,0,605.514,103.863,395.29,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+3,@NPC_TRIGGER1,649,15,1,0,0,615.137,156.997,395.28,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+4,@NPC_TRIGGER1,649,15,1,0,0,539.179,184.132,395.282,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+5,@NPC_TRIGGER1,649,15,1,0,0,547.76,184.634,395.289,2.93215,7200,0,0,1,0,0,0,0,0), +(@GUID+6,@NPC_TRIGGER1,649,15,1,0,0,549.764,86.4444,395.266,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+7,@NPC_TRIGGER1,649,15,1,0,0,511.417,127.158,395.266,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+8,@NPC_TRIGGER1,649,15,1,0,0,597.38,183.672,395.28,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+9,@NPC_TRIGGER1,649,15,1,0,0,573.578,187.665,395.492,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+10,@NPC_TRIGGER1,649,15,1,0,0,620.465,134.66,395.233,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+11,@NPC_TRIGGER1,649,15,1,0,0,560.484,187.743,395.959,2.93215,7200,0,0,1,0,0,0,0,0), +(@GUID+12,@NPC_TRIGGER1,649,15,1,0,0,577.299,186.854,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+13,@NPC_TRIGGER1,649,15,1,0,0,563.467,81.9323,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+14,@NPC_TRIGGER1,649,15,1,0,0,534.748,92.6424,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+15,@NPC_TRIGGER1,649,15,1,0,0,518.503,170.649,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+16,@NPC_TRIGGER1,649,15,1,0,0,514.566,159.918,395.287,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+17,@NPC_TRIGGER1,649,15,1,0,0,568.049,187.67,395.563,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+18,@NPC_TRIGGER1,649,15,1,0,0,522.955,102.127,395.29,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+19,@NPC_TRIGGER1,649,15,1,0,0,611.656,114.281,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+20,@NPC_TRIGGER1,649,15,1,0,0,616.432,126.418,395.264,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+21,@NPC_TRIGGER1,649,15,1,0,0,526.833,181.783,395.285,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+22,@NPC_TRIGGER1,649,15,1,0,0,578.722,87.4444,395.272,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+23,@NPC_TRIGGER1,649,15,1,0,0,509.743,149.005,395.253,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+24,@NPC_TRIGGER1,649,15,1,0,0,592.736,93.6667,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+25,@NPC_TRIGGER1,649,15,1,0,0,506.038,139.517,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+26,@NPC_TRIGGER1,649,15,1,0,0,608.116,171.731,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+27,@NPC_TRIGGER1,649,15,1,0,0,586.344,184.078,395.283,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+28,@NPC_TRIGGER1,649,15,1,0,0,554.818,187.568,395.288,2.93215,7200,0,0,1,0,0,0,0,0), +(@GUID+29,@NPC_TRIGGER2,649,15,1,0,0,557.743,187.729,395.915,0,7200,0,0,1,0,0,0,0,0), +(@GUID+30,@NPC_TRIGGER2,649,15,1,0,0,544.094,184.648,395.286,0,7200,0,0,1,0,0,0,0,0), +(@GUID+31,@NPC_TRIGGER2,649,15,1,0,0,551.328,187.646,395.596,0,7200,0,0,1,0,0,0,0,0), +(@GUID+32,@NPC_TRIGGER2,649,15,1,0,0,615.137,150.818,395.269,0,7200,0,0,1,0,0,0,0,0), +(@GUID+33,@NPC_TRIGGER2,649,15,1,0,0,571.158,187.691,395.629,0,7200,0,0,1,0,0,0,0,0), +(@GUID+34,@NPC_TRIGGER2,649,15,1,0,0,606.686,106.731,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+35,@NPC_TRIGGER2,649,15,1,0,0,612.118,118.844,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+36,@NPC_TRIGGER2,649,15,1,0,0,546.057,88.7691,395.284,0,7200,0,0,1,0,0,0,0,0), +(@GUID+37,@NPC_TRIGGER2,649,15,1,0,0,517.722,169.069,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+38,@NPC_TRIGGER2,649,15,1,0,0,507.181,142.285,395.255,0,7200,0,0,1,0,0,0,0,0), +(@GUID+39,@NPC_TRIGGER2,649,15,1,0,0,515.399,159.75,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+40,@NPC_TRIGGER2,649,15,1,0,0,592.151,183.8,395.279,0,7200,0,0,1,0,0,0,0,0), +(@GUID+41,@NPC_TRIGGER2,649,15,1,0,0,510.759,127.333,395.263,0,7200,0,0,1,0,0,0,0,0), +(@GUID+42,@NPC_TRIGGER2,649,15,1,0,0,524.257,178.134,395.29,0,7200,0,0,1,0,0,0,0,0), +(@GUID+43,@NPC_TRIGGER2,649,15,1,0,0,570.779,86.2986,395.253,0,7200,0,0,1,0,0,0,0,0), +(@GUID+44,@NPC_TRIGGER2,649,15,1,0,0,588.675,93.0938,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+45,@NPC_TRIGGER2,649,15,1,0,0,603.528,175.476,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+46,@NPC_TRIGGER2,649,15,1,0,0,509.639,133.26,395.247,0,7200,0,0,1,0,0,0,0,0), +(@GUID+47,@NPC_TRIGGER2,649,15,1,0,0,618.965,139.174,395.288,0,7200,0,0,1,0,0,0,0,0), +(@GUID+48,@NPC_TRIGGER2,649,15,1,0,0,514.785,118.731,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+49,@NPC_TRIGGER2,649,15,1,0,0,581.243,184.062,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+50,@NPC_TRIGGER2,649,15,1,0,0,577.757,184.436,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+51,@NPC_TRIGGER2,649,15,1,0,0,580.486,89.691,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+52,@NPC_TRIGGER2,649,15,1,0,0,511.132,151.156,395.264,0,7200,0,0,1,0,0,0,0,0), +(@GUID+53,@NPC_TRIGGER2,649,15,1,0,0,615.401,130.816,395.263,0,7200,0,0,1,0,0,0,0,0), +(@GUID+54,@NPC_TRIGGER2,649,15,1,0,0,599.307,98.8003,395.29,0,7200,0,0,1,0,0,0,0,0), +(@GUID+55,@NPC_TRIGGER2,649,15,1,0,0,520.212,108.429,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+56,@NPC_TRIGGER2,649,15,1,0,0,610.983,164.696,395.288,0,7200,0,0,1,0,0,0,0,0), +(@GUID+57,@NPC_TRIGGER2,649,15,1,0,0,526.337,99.5556,395.29,0,7200,0,0,1,0,0,0,0,0), +(@GUID+58,@NPC_TRIGGER2,649,15,1,0,0,563.997,187.644,395.489,0,7200,0,0,1,0,0,0,0,0), +(@GUID+59,@NPC_TRIGGER2,649,15,1,0,0,555.695,86.0208,395.253,0,7200,0,0,1,0,0,0,0,0), +(@GUID+60,@NPC_TRIGGER2,649,15,1,0,0,535.924,184.207,395.279,0,7200,0,0,1,0,0,0,0,0), +(@GUID+61,@NPC_TRIGGER2,649,15,1,0,0,538.024,92.441,395.289,0,7200,0,0,1,0,0,0,0,0); \ No newline at end of file diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index c2901d16fa1..dfd1f5ba5e1 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -619,8 +619,7 @@ public: { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit* target = me->SelectNearestTarget(2.0f)) - if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + if (Player* target = me->SelectNearestPlayer(2.0f)) { DoCastAOE(SPELL_UNLEASHED_DARK); me->GetMotionMaster()->MoveIdle(); @@ -661,8 +660,7 @@ public: { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit* target = me->SelectNearestTarget(2.0f)) - if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + if (Player* target = me->SelectNearestPlayer(2.0f)) { DoCastAOE(SPELL_UNLEASHED_LIGHT); me->GetMotionMaster()->MoveIdle(); -- cgit v1.2.3 From ee305cbb26d173002f4b93d992e825b1d031d317 Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Thu, 22 Mar 2012 12:54:31 +0200 Subject: Scripts/Ahn'kahet/Prince Taldaram: Fix Conjure Flame Sphere visual casting. Flame Sphere should not be visible to players(only their visual). --- sql/updates/world/2012_03_22_00_world_creature_template.sql | 2 ++ .../scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_03_22_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_22_00_world_creature_template.sql b/sql/updates/world/2012_03_22_00_world_creature_template.sql new file mode 100644 index 00000000000..6cf07ff4103 --- /dev/null +++ b/sql/updates/world/2012_03_22_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Flame Sphere should not be visible to players(only their visual) +UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (30106,31686,31687); \ No newline at end of file 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 12ef2075857..38879364d83 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -201,7 +201,8 @@ public: if (uiFlamesphereTimer <= diff) { - DoCast(me, SPELL_CONJURE_FLAME_SPHERE); + // because TARGET_UNIT_TARGET_ENEMY we need a target selected to cast + DoCast(me->getVictim(), SPELL_CONJURE_FLAME_SPHERE); Phase = CASTING_FLAME_SPHERES; uiPhaseTimer = 3*IN_MILLISECONDS + diff; uiFlamesphereTimer = 15*IN_MILLISECONDS; -- cgit v1.2.3 From 011a73e3e5d1e18508b6a594b9dc26a26ce374d6 Mon Sep 17 00:00:00 2001 From: ShinDarth Date: Thu, 22 Mar 2012 21:50:13 +0000 Subject: DB/Conditions: 39152 should only be lootable if you have at least 390 skills in First Aid; Also add proper file ending to recent SQLs Closes #5840 --- sql/updates/world/2012_03_21_00_world_creature.sql | 2 +- sql/updates/world/2012_03_22_00_world_creature_template.sql | 2 +- sql/updates/world/2012_03_22_01_world_conditions.sql | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 sql/updates/world/2012_03_22_01_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_21_00_world_creature.sql b/sql/updates/world/2012_03_21_00_world_creature.sql index 254e86b94dc..def72f74cd6 100644 --- a/sql/updates/world/2012_03_21_00_world_creature.sql +++ b/sql/updates/world/2012_03_21_00_world_creature.sql @@ -68,4 +68,4 @@ INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid` (@GUID+58,@NPC_TRIGGER2,649,15,1,0,0,563.997,187.644,395.489,0,7200,0,0,1,0,0,0,0,0), (@GUID+59,@NPC_TRIGGER2,649,15,1,0,0,555.695,86.0208,395.253,0,7200,0,0,1,0,0,0,0,0), (@GUID+60,@NPC_TRIGGER2,649,15,1,0,0,535.924,184.207,395.279,0,7200,0,0,1,0,0,0,0,0), -(@GUID+61,@NPC_TRIGGER2,649,15,1,0,0,538.024,92.441,395.289,0,7200,0,0,1,0,0,0,0,0); \ No newline at end of file +(@GUID+61,@NPC_TRIGGER2,649,15,1,0,0,538.024,92.441,395.289,0,7200,0,0,1,0,0,0,0,0); diff --git a/sql/updates/world/2012_03_22_00_world_creature_template.sql b/sql/updates/world/2012_03_22_00_world_creature_template.sql index 6cf07ff4103..e6c03ed589c 100644 --- a/sql/updates/world/2012_03_22_00_world_creature_template.sql +++ b/sql/updates/world/2012_03_22_00_world_creature_template.sql @@ -1,2 +1,2 @@ -- Flame Sphere should not be visible to players(only their visual) -UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (30106,31686,31687); \ No newline at end of file +UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (30106,31686,31687); diff --git a/sql/updates/world/2012_03_22_01_world_conditions.sql b/sql/updates/world/2012_03_22_01_world_conditions.sql new file mode 100644 index 00000000000..074328137a5 --- /dev/null +++ b/sql/updates/world/2012_03_22_01_world_conditions.sql @@ -0,0 +1,2 @@ +-- Manual: Heavy Frostweave Bandage should be lootable if you have at least 390 skills in First Aid +UPDATE `conditions` SET `ConditionValue2`=390 WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry`=39152 AND `ConditionTypeOrReference`=7 AND `ConditionValue1`=129; -- cgit v1.2.3 From 0fe4580fe0f526b864586a9cc3e7727be1980323 Mon Sep 17 00:00:00 2001 From: Spp Date: Fri, 23 Mar 2012 05:35:32 +0100 Subject: Core/Commands: Add support for ip2nation database lookups when using .pinfo command. This will (when a full database exists) allow for seeing (approximately) which country a player might be from when doing .pinfo Note: External data required for this patch to work correctly can be found at http://www.ip2nation.com/ip2nation/Download Signed-off-by: click --- sql/updates/world/2012_03_23_00_world_ip2nation.sql | 21 +++++++++++++++++++++ src/server/game/Chat/Commands/Level2.cpp | 15 +++++++++++++++ src/server/game/World/World.cpp | 20 ++++++++++++++++++++ src/server/game/World/World.h | 2 ++ 4 files changed, 58 insertions(+) create mode 100644 sql/updates/world/2012_03_23_00_world_ip2nation.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_23_00_world_ip2nation.sql b/sql/updates/world/2012_03_23_00_world_ip2nation.sql new file mode 100644 index 00000000000..dadeaddf85a --- /dev/null +++ b/sql/updates/world/2012_03_23_00_world_ip2nation.sql @@ -0,0 +1,21 @@ +DROP TABLE IF EXISTS ip2nation; + +CREATE TABLE ip2nation ( + ip int(11) unsigned NOT NULL default '0', + country char(2) NOT NULL default '', + KEY ip (ip) +); + +DROP TABLE IF EXISTS ip2nationCountries; + +CREATE TABLE ip2nationCountries ( + code varchar(4) NOT NULL default '', + iso_code_2 varchar(2) NOT NULL default '', + iso_code_3 varchar(3) default '', + iso_country varchar(255) NOT NULL default '', + country varchar(255) NOT NULL default '', + lat float NOT NULL default '0', + lon float NOT NULL default '0', + PRIMARY KEY (code), + KEY code (code) +); diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 062cdb331ea..c973ebe272b 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -42,6 +42,7 @@ #include "Transport.h" #include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand #include "CreatureGroups.h" +#include "ace/INET_Addr.h" //mute player for some times bool ChatHandler::HandleMuteCommand(const char* args) @@ -347,6 +348,20 @@ bool ChatHandler::HandlePInfoCommand(const char* args) { last_ip = fields[3].GetString(); last_login = fields[4].GetString(); + + uint32 ip = inet_addr(last_ip.c_str()); +#if TRINITY_ENDIAN == BIGENDIAN + EndianConvertReverse(ip); +#endif + + if (QueryResult result2 = WorldDatabase.PQuery("SELECT c.country FROM ip2nationCountries c, ip2nation i WHERE " + "i.ip < %u AND c.code = i.country ORDER BY i.ip DESC LIMIT 0,1", ip)) + { + Field* fields2 = result2->Fetch(); + last_ip.append(" ("); + last_ip.append(fields2[0].GetString()); + last_ip.append(")"); + } } else { diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 4c02d1058b2..af0c83a7a1b 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1625,6 +1625,9 @@ void World::SetInitialWorldSettings() sLog->outString("Loading Autobroadcasts..."); LoadAutobroadcasts(); + sLog->outString("Loading Ip2nation..."); + LoadIp2nation(); + ///- Load and initialize scripts sObjectMgr->LoadQuestStartScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate sObjectMgr->LoadQuestEndScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate @@ -1881,6 +1884,23 @@ void World::LoadAutobroadcasts() sLog->outString(); } +void World::LoadIp2nation() +{ + uint32 oldMSTime = getMSTime(); + + QueryResult result = WorldDatabase.Query("SELECT count(c.code) FROM ip2nationCountries c, ip2nation i WHERE c.code = i.country"); + uint32 count = 0; + + if (result) + { + Field* fields = result->Fetch(); + count = fields[0].GetUInt32(); + } + + sLog->outString(">> Loaded %u ip2nation definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + sLog->outString(); +} + /// Update the World ! void World::Update(uint32 diff) { diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index be4c41214ec..cab9c19da8b 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -740,6 +740,8 @@ class World void LoadAutobroadcasts(); + void LoadIp2nation(); + void UpdateAreaDependentAuras(); void ProcessStartEvent(); -- cgit v1.2.3 From dae82111b7ff621445c96ab9d3775aae51b9fd26 Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Sat, 24 Mar 2012 13:24:24 +0200 Subject: Scripts/Ahn'kahet/Prince Taldaram: Fix movement after shield drops.(no more LoS issues) Update boss texts and move them to creature_text. Add proper sounds to text. Add condition for a visual spell. Add usage of different Embrace of the Vampyr spell based on difficulty. --- sql/updates/world/2012_03_24_00_world_misc.sql | 22 +++++++++++ .../AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 45 ++++++++++++---------- 2 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 sql/updates/world/2012_03_24_00_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_24_00_world_misc.sql b/sql/updates/world/2012_03_24_00_world_misc.sql new file mode 100644 index 00000000000..e6f6ce77307 --- /dev/null +++ b/sql/updates/world/2012_03_24_00_world_misc.sql @@ -0,0 +1,22 @@ +-- Beam Visual +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=60342; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,60342,0,0,31,0,3,29308,0,0,0,'','Beam Visual target Prince Taldaram'); + +-- script texts for Prince Taldaram +DELETE FROM `creature_text` WHERE `entry`=29308; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(29308,0,0,'The hum of magic energy in the air diminishes...',16,0,100,0,0,0,'prince taldaram SAY_1'), +(29308,1,0,'Intruders! Who trespasses in the Old Kingdom?',14,0,100,0,0,0,'prince taldaram SAY_WARNING'), +(29308,2,0,'I will feast on your remains.',14,0,100,0,0,14360,'prince taldaram SAY_AGGRO'), +(29308,3,0,'',14,10,100,0,0,14365,'prince taldaram SAY_SLAY_0'), +(29308,3,1,'I will drink no blood before it''s time.',14,0,100,0,0,14366,'prince taldaram SAY_SLAY_1'), +(29308,3,2,'One final embrace.',14,0,100,0,0,14367,'prince taldaram SAY_SLAY_2'), +(29308,4,0,'Still I hunger. Still... I... thirst.',14,0,100,0,0,14368,'prince taldaram SAY_DEATH'), +(29308,5,0,'So... appetizing.',14,0,100,0,0,14363,'prince taldaram SAY_FEED1'), +(29308,5,1,'Fresh, warm blood. It has been too long.',14,0,100,0,0,14364,'prince taldaram SAY_FEED2'), +(29308,6,0,'Your heartbeat is... music to my ears.',14,0,100,0,0,14361,'prince taldaram SAY_VANISH1'), +(29308,6,1,'I am nowhere... I am everywhere. I am the watcher, unseen.',14,0,100,0,0,14362,'prince taldaram SAY_VANISH2'); + +-- cleanup +DELETE FROM `script_texts` WHERE `npc_entry`=29308; 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 38879364d83..6a0ccc54773 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -36,7 +36,8 @@ enum Spells SPELL_VANISH = 55964, CREATURE_FLAME_SPHERE = 30106, H_CREATURE_FLAME_SPHERE_1 = 31686, - H_CREATURE_FLAME_SPHERE_2 = 31687 + H_CREATURE_FLAME_SPHERE_2 = 31687, + SPELL_HOVER_FALL = 60425 }; enum Misc { @@ -45,18 +46,17 @@ enum Misc DATA_SPHERE_DISTANCE = 15 }; #define DATA_SPHERE_ANGLE_OFFSET 0.7f -#define DATA_GROUND_POSITION_Z 11.4f +#define DATA_GROUND_POSITION_Z 11.30809f enum Yells { - SAY_AGGRO = -1619021, - SAY_SLAY_1 = -1619022, - SAY_SLAY_2 = -1619023, - SAY_DEATH = -1619024, - SAY_FEED_1 = -1619025, - SAY_FEED_2 = -1619026, - SAY_VANISH_1 = -1619027, - SAY_VANISH_2 = -1619028 + SAY_1 = 0, + SAY_WARNING = 1, + SAY_AGGRO = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + SAY_FEED = 5, + SAY_VANISH = 6, }; enum CombatPhase { @@ -82,8 +82,7 @@ public: boss_taldaramAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetDisableGravity(true); } uint32 uiBloodthirstTimer; @@ -118,7 +117,7 @@ public: { if (instance) instance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -180,7 +179,8 @@ public: break; case VANISHED: if (Unit* pEmbraceTarget = GetEmbraceTarget()) - DoCast(pEmbraceTarget, SPELL_EMBRACE_OF_THE_VAMPYR); + DoCast(pEmbraceTarget, DUNGEON_MODE(SPELL_EMBRACE_OF_THE_VAMPYR, H_SPELL_EMBRACE_OF_THE_VAMPYR)); + Talk(SAY_FEED); me->GetMotionMaster()->Clear(); me->SetSpeed(MOVE_WALK, 1.0f, true); me->GetMotionMaster()->MoveChase(me->getVictim()); @@ -202,7 +202,7 @@ public: if (uiFlamesphereTimer <= diff) { // because TARGET_UNIT_TARGET_ENEMY we need a target selected to cast - DoCast(me->getVictim(), SPELL_CONJURE_FLAME_SPHERE); + DoCastVictim(SPELL_CONJURE_FLAME_SPHERE); Phase = CASTING_FLAME_SPHERES; uiPhaseTimer = 3*IN_MILLISECONDS + diff; uiFlamesphereTimer = 15*IN_MILLISECONDS; @@ -225,7 +225,7 @@ public: //He only vanishes if there are 3 or more alive players if (target_list.size() > 2) { - DoScriptText(RAND(SAY_VANISH_1, SAY_VANISH_2), me); + Talk(SAY_VANISH); DoCast(me, SPELL_VANISH); Phase = JUST_VANISHED; uiPhaseTimer = 500; @@ -261,7 +261,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); @@ -279,7 +279,7 @@ public: uiPhaseTimer = 0; uiEmbraceTarget = 0; } - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } bool CheckSpheres() @@ -315,12 +315,13 @@ public: { if (!instance) return; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveAurasDueToSpell(SPELL_BEAM_VISUAL); - me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation()); + DoCast(SPELL_HOVER_FALL); + me->SetDisableGravity(false); + me->GetMotionMaster()->MovePoint(0, me->GetHomePosition()); + Talk(SAY_WARNING); uint64 prison_GUID = instance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM); instance->HandleGameObject(prison_GUID, true); } @@ -405,10 +406,12 @@ public: { case GO_SPHERE1: instance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); + pPrinceTaldaram->AI()->Talk(SAY_1); break; case GO_SPHERE2: instance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); + pPrinceTaldaram->AI()->Talk(SAY_1); break; } -- cgit v1.2.3 From 7c4b2f17bf75f685ace2490321f8df8f4ecc8682 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 24 Mar 2012 12:55:44 +0100 Subject: DB/Loot: Update Loot for first 4 bosses in Ulduar --- .../2012_03_24_01_world_creature_loot_template.sql | 290 +++++++++++++++++++++ 1 file changed, 290 insertions(+) create mode 100644 sql/updates/world/2012_03_24_01_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql b/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql new file mode 100644 index 00000000000..078c48a47b7 --- /dev/null +++ b/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql @@ -0,0 +1,290 @@ +-- ----------------------------------- +-- -- Loot for The Siege of Ulduar -- +-- ----------------------------------- + +-- Old Cleanups: +DELETE FROM `reference_loot_template` WHERE `entry` IN ( 34116,34117,34118,34119,34120,34121,34157,34158,34159,34160,34161,34162); +-- ------------------- +-- -- Set Variables -- +-- ------------------- +-- 10 man mode npcids +SET @FlameLevi10 :=33113; +SET @IgnisFM10 :=33118; +SET @Razorscale10 :=33186; +SET @XT002_10 :=33293; +-- 25 man mode npcids (via procedure) +call `sp_get_npc_diffentry`(@FlameLevi10,1,@FlameLevi25); +call `sp_get_npc_diffentry`(@IgnisFM10,1,@IgnisFM25); +call `sp_get_npc_diffentry`(@Razorscale10,1,@Razorscale25); +call `sp_get_npc_diffentry`(@XT002_10,1,@XT002_25); + +SET @Emblem := 47241; +SET @Orb := 45087; +-- ------------------------------------- +-- -- Set Reference Loot Template ids -- +-- ------------------------------------- + +SET @EmblemRef := 34349; -- First Free ID +SET @OrbRef := @EmblemRef+1; +SET @Flame10Ref := @EmblemRef+2; +SET @Flame25Ref := @EmblemRef+3; +SET @Ignis10Ref := @EmblemRef+4; +SET @Ignis25Ref := @EmblemRef+5; +SET @Razor10Ref := @EmblemRef+6; +SET @Razor25Ref := @EmblemRef+7; +SET @XT002_10Ref := @EmblemRef+8; +SET @XT002_25Ref := @EmblemRef+9; +-- Flame Levithian +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @EmblemRef AND @EmblemRef+9; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Emblem Ref +(@EmblemRef,47241,0,1,1,1,1), -- Emblem of Triumph 1x +-- OrbRef +(@OrbRef,45087,0,1,1,1,1), -- Runed Orb 1x +-- Flame Levithian 10man +(@Flame10Ref,45286,0,1,1,1,1), -- Pyrite Infuser +(@Flame10Ref,45287,0,1,1,1,1), -- Firesoul +(@Flame10Ref,45288,0,1,1,1,1), -- Firestrider Chestguard +(@Flame10Ref,45289,0,1,1,1,1), -- Lifespark Visage +(@Flame10Ref,45291,0,1,1,1,1), -- Combustion Bracers +(@Flame10Ref,45284,0,1,1,1,1), -- Kinetic Ripper +(@Flame10Ref,45282,0,1,1,1,1), -- Ironsoul +(@Flame10Ref,45285,0,1,1,1,1), -- Might of the Leviathan +(@Flame10Ref,45292,0,1,1,1,1), -- Energy Siphon +(@Flame10Ref,45283,0,1,1,1,1), -- Flamewatch Armguards +-- Flame Levithian 25man +(@Flame25Ref,45117,0,1,1,1,1), -- Constructors Handwraps +(@Flame25Ref,45119,0,1,1,1,1), -- Embrace of the Leviathan +(@Flame25Ref,45113,0,1,1,1,1), -- Glowing Ring of Reclamation +(@Flame25Ref,45115,0,1,1,1,1), -- Leviathan Fueling Manual +(@Flame25Ref,45108,0,1,1,1,1), -- Mechanists Bindings +(@Flame25Ref,45106,0,1,1,1,1), -- Strenght of the Automaton +(@Flame25Ref,45109,0,1,1,1,1), -- Gloves of the Fiery Behemoth +(@Flame25Ref,45114,0,1,1,1,1), -- Steamcallers Totem +(@Flame25Ref,45118,0,1,1,1,1), -- Steamworkers Goggles +(@Flame25Ref,45116,0,1,1,1,1), -- Freya's Choker of Warding +(@Flame25Ref,45111,0,1,1,1,1), -- Mimiron's Inferno Couplings +(@Flame25Ref,45112,0,1,1,1,1), -- The Leviathan's Coil +(@Flame25Ref,45107,0,1,1,1,1), -- Iron Riveted War Helm + +-- Ignis the Furnace Master 10man +(@Ignis10Ref,45309,0,1,1,1,1), -- Rifle of the Platinum Guard +(@Ignis10Ref,45310,0,1,1,1,1), -- Gauntlets of the Iron Furnace +(@Ignis10Ref,45311,0,1,1,1,1), -- Relentless Edge +(@Ignis10Ref,45312,0,1,1,1,1), -- Gloves of Smoldering Touch +(@Ignis10Ref,45313,0,1,1,1,1), -- Furnace Stone +(@Ignis10Ref,45314,0,1,1,1,1), -- Igniter Rod +(@Ignis10Ref,45316,0,1,1,1,1), -- Armbraces of the Vibrant Flame +(@Ignis10Ref,45317,0,1,1,1,1), -- Shawl of the Caretaker +(@Ignis10Ref,45318,0,1,1,1,1), -- Drape of Fuming Anger +(@Ignis10Ref,45321,0,1,1,1,1), -- Pauldrons of Tempered Will +-- Ignis the Furnace Master 25man +(@Ignis25Ref,45157,0,1,1,1,1), -- Cindershard Ring +(@Ignis25Ref,45158,0,1,1,1,1), -- Heart of Iron +(@Ignis25Ref,45161,0,1,1,1,1), -- Girdle of Embers +(@Ignis25Ref,45162,0,1,1,1,1), -- Flamestalker Boots +(@Ignis25Ref,45164,0,1,1,1,1), -- Helm of the Furnace Master +(@Ignis25Ref,45165,0,1,1,1,1), -- Worldcarver +(@Ignis25Ref,45166,0,1,1,1,1), -- Charred Saronite Greaves +(@Ignis25Ref,45167,0,1,1,1,1), -- Lifeforge Breastplate +(@Ignis25Ref,45168,0,1,1,1,1), -- Pyrelight Circle +(@Ignis25Ref,45169,0,1,1,1,1), -- Totem of the Dancing Flame +(@Ignis25Ref,45170,0,1,1,1,1), -- Scepter of Creation +(@Ignis25Ref,45171,0,1,1,1,1), -- Intensity +(@Ignis25Ref,45185,0,1,1,1,1), -- Flamewrought Cinch +(@Ignis25Ref,45186,0,1,1,1,1), -- Soot-Covered Mantle +(@Ignis25Ref,45187,0,1,1,1,1), -- Wristguards of the Firetender + +-- Razorscale 10man +(@Razor10Ref,45298,0,1,1,1,1), -- RazoRazorcale Talon +(@Razor10Ref,45299,0,1,1,1,1), -- Dragonsteel Faceplate +(@Razor10Ref,45301,0,1,1,1,1), -- BraceRazor of the Smothering Inferno +(@Razor10Ref,45302,0,1,1,1,1), -- Treads of the Invader +(@Razor10Ref,45303,0,1,1,1,1), -- Band of Draconic Guile +(@Razor10Ref,45304,0,1,1,1,1), -- Stormtempered Girdle +(@Razor10Ref,45305,0,1,1,1,1), -- Breastplate of the Afterlife +(@Razor10Ref,45306,0,1,1,1,1), -- Binding of the Dragon Matriarch +(@Razor10Ref,45307,0,1,1,1,1), -- Ironscale Leggings +(@Razor10Ref,45308,0,1,1,1,1), -- Eye of the Broodmother +-- Razorscale 25man +(@Razor25Ref,45137,0,1,1,1,1), -- Veranus' Bane +(@Razor25Ref,45138,0,1,1,1,1), -- Drape of the Drakerider +(@Razor25Ref,45139,0,1,1,1,1), -- Dragonslayer's Brace +(@Razor25Ref,45140,0,1,1,1,1), -- RazoRazorcale Shoulderguards +(@Razor25Ref,45141,0,1,1,1,1), -- Proto-hide Leggings +(@Razor25Ref,45142,0,1,1,1,1), -- RemoRazore +(@Razor25Ref,45143,0,1,1,1,1), -- Saronite Mesh Legguards +(@Razor25Ref,45144,0,1,1,1,1), -- Sigil of Deflection +(@Razor25Ref,45146,0,1,1,1,1), -- Shackles of the Odalisque +(@Razor25Ref,45147,0,1,1,1,1), -- Guiding Star +(@Razor25Ref,45148,0,1,1,1,1), -- Living Flame +(@Razor25Ref,45149,0,1,1,1,1), -- BraceRazor of the Broodmother +(@Razor25Ref,45150,0,1,1,1,1), -- Collar of the Wyrmhunter +(@Razor25Ref,45151,0,1,1,1,1), -- Belt of the Fallen Wyrm +(@Razor25Ref,45510,0,1,1,1,1), -- Libram of Discord + +-- XT-002 Deconstructor 10man +(@XT002_10Ref,45675,0,1,1,1,1), -- Power Enchancing Loop +(@XT002_10Ref,45676,0,1,1,1,1), -- Chestplate of Vicious Potency +(@XT002_10Ref,45677,0,1,1,1,1), -- Treacherous shoulderpads +(@XT002_10Ref,45679,0,1,1,1,1), -- Gloves of Taut grip +(@XT002_10Ref,45680,0,1,1,1,1), -- Armbands of the construct +(@XT002_10Ref,45682,0,1,1,1,1), -- Pulsing spellshield +(@XT002_10Ref,45685,0,1,1,1,1), -- Plasma Foil +(@XT002_10Ref,45686,0,1,1,1,1), -- Vest of the glowing Cresent +(@XT002_10Ref,45687,0,1,1,1,1), -- Helm of Veiled Energies +(@XT002_10Ref,45694,0,1,1,1,1), -- Conductive cord +(@XT002_10Ref,45867,0,2,2,1,1), -- Breasktplate of the Stoneshaper +(@XT002_10Ref,45868,0,2,2,1,1), -- Aesir's Edge +(@XT002_10Ref,45869,0,2,2,1,1), -- Fluxing Energy Coils +(@XT002_10Ref,45870,0,2,2,1,1), -- Magnetized Projectile Emitter +(@XT002_10Ref,45871,0,2,2,1,1), -- Seal of Ulduar +-- XT-002 Deconstructor 25man +(@XT002_25Ref,45254,0,1,1,1,1), -- Sigil of the Vengeful Heart +(@XT002_25Ref,45251,0,1,1,1,1), -- Shoulderplates of the Deconstructor +(@XT002_25Ref,45247,0,1,1,1,1), -- Signet of the Earthshaker +(@XT002_25Ref,45256,0,1,1,1,1), -- Twisted Visage +(@XT002_25Ref,45250,0,1,1,1,1), -- Crazed Construct Ring +(@XT002_25Ref,45257,0,1,1,1,1), -- Quartz Crystal Wand +(@XT002_25Ref,45260,0,1,1,1,1), -- Boots of Hasty Revival +(@XT002_25Ref,45252,0,1,1,1,1), -- Horologist's Wristguards +(@XT002_25Ref,45253,0,1,1,1,1), -- Mantle of Wavering Calm +(@XT002_25Ref,45258,0,1,1,1,1), -- Sandals of Rash Temperament +(@XT002_25Ref,45249,0,1,1,1,1), -- Brass-lined Boots +(@XT002_25Ref,45246,0,1,1,1,1), -- Golem-Shard Sticker +(@XT002_25Ref,45248,0,1,1,1,1), -- Clockwork Legplates +(@XT002_25Ref,45259,0,1,1,1,1), -- Quartz-studded Harness +(@XT002_25Ref,45255,0,1,1,1,1); -- Thunderfall Totem +-- ----------------------------------------------------------------------------------------------- +-- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- +-- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- +-- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- +-- ----------------------------------------------------------------------------------------------- + +-- Flame Levithian 10Man: +-- NORMAL MODE : 2x [Normal Loot Item] + 1x [Emblem of Valor] +-- ONE TOWER : 2x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Recipe] +-- TWO TOWERS : 2x [Normal Loot Item] + 2x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] +-- THREE TOWERS: 2x [Normal Loot Item] + 3x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] + 1x [Recipe] +-- FOUR TOWERS : 2x [Normal Loot Item] + 3x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] + 1x [Recipe] + 1x [Hard Loot Item] +-- Flame Levithian 25 man +-- NORMAL MODE : 3x [Normal Loot Item] + 1x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] +-- ONE TOWER : 3x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] +-- TWO TOWERS : 3x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] +-- THREE TOWERS: 3x [Normal Loot Item] + 3x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] + [Recipe] +-- FOUR TOWERS : 3x [Normal Loot Item] + 3x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] + [Recipe] + 1x [Hard Loot Item] + +DELETE FROM `creature_loot_template` WHERE `entry` IN (@FlameLevi10,@FlameLevi25,@IgnisFM10,@IgnisFM25,@Razorscale10,@Razorscale25,@XT002_10,@XT002_25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- --------------------------- +-- -- Flame Levithian 10man -- +-- --------------------------- +(@FlameLevi10,1,100,1,0,-@EmblemRef,1), -- 1x emblem +(@FlameLevi10,2,100,1,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 1 tower left +(@FlameLevi10,3,100,2,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi10,4,100,2,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 2 towers left +(@FlameLevi10,5,100,4,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi10,6,100,4,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 3 towers left +(@FlameLevi10,7,100,8,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi10,8,100,8,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 4 towers left +(@FlameLevi10,9,100,16,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi10,10,100,16,0,-@Flame10Ref,2), -- 2 from 10man reference +-- one from hardmodeloot: +(@FlameLevi10,45296,0,16,1,1,1), -- Twirling Blades +(@FlameLevi10,45293,0,16,1,1,1), -- Handguards of Potent Cures +(@FlameLevi10,45295,0,16,1,1,1), -- Gilded Steel Legplates +(@FlameLevi10,45300,0,16,1,1,1), -- Mantle of Fiery Vengeance +(@FlameLevi10,45297,0,16,1,1,1), -- Shimmering Seal +-- Shared Loot over the modes (masked) +-- Non-Normal (Modes 2|4|8|16) +(@FlameLevi10,11,5,30,0,-34154,1), -- 1 from recepies (chanced) +-- More then 1 tower up (Modes 4|8|16) +(@FlameLevi10,@Orb,100,28,0,1,3), -- Runed Orb (1-3) +-- More then 2 towers up (Modes 8|16) +(@FlameLevi10,12,100,24,0,-34154,1), -- 1 from recepies +-- --------------------------- +-- -- Flame Levithian 25man -- +-- --------------------------- +(@FlameLevi25,1,100,1,0,-@EmblemRef,1), -- 1x emblem +(@FlameLevi25,2,100,1,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 1 tower left +(@FlameLevi25,3,100,2,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi25,4,100,2,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 2 towers left +(@FlameLevi25,5,100,4,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi25,6,100,4,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 3 towers left +(@FlameLevi25,7,100,8,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi25,8,100,8,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 4 towers left +(@FlameLevi25,9,100,16,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi25,10,100,16,0,-@Flame25Ref,3), -- 3 from 25man reference +-- one from hardmodeloot: +(@FlameLevi25,45132,0,16,1,1,1), -- Golden Saronite Dragon +(@FlameLevi25,45133,0,16,1,1,1), -- Pendant of Fiery Havoc +(@FlameLevi25,45134,0,16,1,1,1), -- Plated Leggings of Ruination +(@FlameLevi25,45135,0,16,1,1,1), -- Boots of Fiery Resolution +(@FlameLevi25,45136,0,16,1,1,1), -- Shoulderpads of Dormant Energies +(@FlameLevi25,45086,0,16,1,1,1), -- Rising Sun +(@FlameLevi25,45110,0,16,1,1,1), -- Titanguard +-- Shared Loot over the modes (masked) +-- All Modes (1|2|4|8|16): +(@FlameLevi25,11,5,31,0,-@OrbRef,1), -- Runed Orb (1x Chanced) +(@FlameLevi25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@FlameLevi25,12,5,31,0,-34154,1), -- 1 from recepies (chanced) +-- More then 1 tower up (Modes 4|8|16) +(@FlameLevi25,13,100,28,0,-@OrbRef,2), -- Runed Orb (2x garanteed) +-- More then 2 towers up (Modes 8|16) +(@FlameLevi25,14,100,24,0,-34154,1), -- 1 from recepies +-- ------------------------------ +-- -- IGNIS THE FURNACE MASTER -- +-- ------------------------------ +-- Ignis the Furnace Master 10man +(@IgnisFM10,1,100,1,0,-@Ignis10Ref,2), -- 2 items from Ref loot +(@IgnisFM10,@Emblem,100,1,0,1,1), -- 1 Emblem +-- Ignis the Furnace Master 25man +(@IgnisFM25,1,100,1,0,-@Ignis25Ref,3), -- 3 items from Ref loot +(@IgnisFM25,@Emblem,100,1,0,2,2), -- 2 Emblem +(@IgnisFM25,3,10,1,0,-34154,1), -- 1 from recepies +(@IgnisFM25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@IgnisFM25,45087,75,1,0,1,1), -- Runed Orb +-- ---------------- +-- -- RAZORSCALE -- +-- ---------------- +-- Razorscale 10man +(@Razorscale10,1,100,1,0,-@Razor10Ref ,2), -- 2 items from ref loot +(@Razorscale10,@Emblem,100,1,0,1,1), -- Emblem of Triumph +-- Razorscale 25man +(@Razorscale25,1,100,1,0,-@Razor25Ref,3), -- 3 items from Ref loot +(@Razorscale25,@Emblem,100,1,0,1,2), -- 2 Emblems +(@Razorscale25,2,10,1,0,-34154,1), -- 1 from recepies +(@Razorscale25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@Razorscale25,45087,75,1,0,1,1), -- Runed Orb +-- ------------------------- +-- -- XT002 DECONSTRUCTOR -- +-- ------------------------- +-- X002 Deconstructor 10man (and hardmode) +(@XT002_10,1,100,3,0,-@XT002_10Ref,2), -- 2items from Ref loot +(@XT002_10,@Emblem,100,3,0,1,1), -- 1x Emblem +-- Hard mode 10man only: +(@XT002_10,45442,0,2,1,1,1), -- Sorthalis,Hammer of the Watchers +(@XT002_10,45443,0,2,1,1,1), -- Charm of Meticulous Timing +(@XT002_10,45444,0,2,1,1,1), -- Gloves of the Steady Hand +(@XT002_10,45445,0,2,1,1,1), -- Breastplate of the Devoted +(@XT002_10,45446,0,2,1,1,1), -- Grasps of Reason +-- X002 Deconstructor 25man (and hardmode) +(@XT002_25,1,100,3,0,-@XT002_25Ref,3), -- 3 items from Ref loot +(@XT002_25,2,10,3,0,-34154,1), -- 1 from recepies +(@XT002_25,45038,8,3,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@XT002_25,45087,75,3,0,1,1), -- Runed Orb +(@XT002_25,47241,100,3,0,1,2), -- 2 Emblem of Triumph +-- Hard Mode 25man only: +(@XT002_25,45442,0,2,1,1,1), -- Sorthalis,Hammer of the Watchers +(@XT002_25,45443,0,2,1,1,1), -- Charm of Meticulous Timing +(@XT002_25,45444,0,2,1,1,1), -- Gloves of the Steady Hand +(@XT002_25,45445,0,2,1,1,1), -- Breastplate of the Devoted +(@XT002_25,45446,0,2,1,1,1); -- Grasps of Reason -- cgit v1.2.3 From c058e6740b33d064e46f2f693e7ae3d9aaf52a01 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 24 Mar 2012 16:58:07 +0100 Subject: DB/Loot: Add some Missing loot, thx Helias for spotting and initial work Closes #5842 --- .../2012_03_24_02_world_creature_loot_template.sql | 136 +++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 sql/updates/world/2012_03_24_02_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql b/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..cdac3335aed --- /dev/null +++ b/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql @@ -0,0 +1,136 @@ +-- (re) Add reference 26042 +SET @NEC := 26042; -- Northrend Emotion Cooking Recipe Reference +DELETE FROM `reference_loot_template` WHERE `entry`=@NEC; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@NEC,43507,0,1,1,1,1), -- Recipe: Tasty cupcake +(@NEC,43508,0,1,1,1,1), -- Recipe: Last Week's Mammoth +(@NEC,43509,0,1,1,1,1), -- Recipe: Bad Clams +(@NEC,43510,0,1,1,1,1); -- Recipe: Haunted Herring + +DELETE FROM `creature_loot_template` WHERE `entry` IN (2436,5928,5936,12239,12240,12241,12242,12243,14527,14529,14531,16506,16836,17307,21166,23809,23954,23963,23964,23983,24175,25234,28027,28113,28138,28494,29554,30177,30954,31779,40419); +UPDATE `creature_template`SET `lootid`=entry WHERE `entry` IN (2436,5928,5936,12239,12240,12241,12242,12243,14527,14529,14531,16506,16836,21166,23809,23963,23964,23983,25234,28027,28138,28494,29554,30954,31779,40419); +UPDATE `creature_template` SET `lootid`=0 WHERE `entry` IN (17307,23954,24175,28113,30177); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Farmer Kent (friendly?) +(2436,3692,-100,1,0,1,1), -- Hilsbrad Human Skull +-- Sorrow Wing +(5928,5808,-50,1,0,1,1), -- Pridewing Venom Sac +(5928,5137,80,1,0,1,1), -- Bright Eyeball +(5928,5136,10,1,0,1,1), -- Torn Furry Ear +(5928,1,100,1,0,-@NEC,1), -- Random world green drop ilvl 25-30 +-- Orca +(5936,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(5936,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(5936,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(5936,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(5936,26005,1,1,1,-26005,1), -- Northrend World Green Reference #3 +(5936,26006,1,1,1,-26006,1), -- Northrend World Green Reference #4 +(5936,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(5936,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(5936,26019,0.5,1,1,-26019,1), -- Northrend World Blue Reference #3 +(5936,26020,0.5,1,1,-26020,1), -- Northrend World Blue Reference #4 +-- Add Theradric Crystal Carving (17684) to the following creatures +(12239,17684,-25,1,0,1,1), -- Spirit of Gelk +(12240,17684,-25,1,0,1,1), -- Spirit of Kolk +(12241,17684,-25,1,0,1,1), -- Spirit of Magra +(12242,17684,-25,1,0,1,1), -- Spirit of Maraudos +(12243,17684,-25,1,0,1,1), -- Spirit of Veng +(14527,18952,-100,1,0,1,1), -- Simone the Inconspicuous - Simone's Head +(14529,18953,-100,1,0,1,1), -- Franklin the Friendly - Klinfran's Head +(14531,18955,-100,1,0,1,1), -- Artorius the Amiable - Artorius's Head +(16506,22708,-100,1,0,1,1), -- Naxxramas Worshipper - Fate of Ramaladni +(16836,23460,-100,1,0,1,1), -- Escaped Dreghood - Broken Blood Sample +(21166,30451,-15,1,0,1,1), -- Illidari Dreadlord - Lohn'goron, Bow of the Torn-heart +-- Vengeance Landing Cannoneer +(23809,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23809,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23809,26005,1,1,1,-26005,1), -- Northrend World Green Reference #3 +-- Sergeant Lorric +(23963,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23963,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23963,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(23963,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(23963,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(23963,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(23963,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +-- Lieutenant Celeyne +(23964,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23964,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23964,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(23964,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(23964,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(23964,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(23964,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +-- North Fleet Marine +(23983,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23983,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23983,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(23983,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(23983,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(23983,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(23983,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +-- Stormfleet Deckhand +(25234,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(25234,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +-- High-Oracle Soo-say +(28027,17058,50,1,0,1,1), -- Fish Oil +(28027,17057,30,1,0,1,1), -- Shiny Fish Scales +(28027,33470,15,1,0,2,4), -- Frostweave Cloth +(28027,35951,10,1,0,1,3), -- Poached Emperor Salmon +(28027,38642,-1,1,0,1,1), -- Golden Engagement Ring +-- Elder Harkek +(28138,33470,40,1,0,2,4), -- Frostweave Cloth +(28138,33447,4,1,0,1,1), -- Runic Healing Potion +(28138,38642,-1,1,0,1,1), -- Golden Engagement Ring +-- Kutube'sa +(28494,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(28494,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 +(28494,26010,1,1,1,-26010,1), -- Northrend World Green Reference #4 +(28494,26011,1,1,1,-26011,1), -- Northrend World Green Reference #5 +(28494,26012,1,1,1,-26012,1), -- Northrend World Green Reference #6 +(28494,26023,0.5,1,1,-26023,1), -- Northrend World Blue Reference #3 +(28494,26025,0.5,1,1,-26025,1), -- Northrend World Blue Reference #4 +(28494,26026,0.5,1,1,-26026,1), -- Northrend World Blue Reference #5 +(28494,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +(28494,39152,35,1,0,1,1), -- Manual: Heavy Frostweave Bandage +(28494,43297,1,1,0,1,1), -- Damaged Necklace +-- Snowblind Devotee +(29554,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(29554,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 +(29554,26009,1,1,1,-26009,1), -- Northrend World Green Reference #3 +(29554,26010,1,1,1,-26010,1), -- Northrend World Green Reference #4 +(29554,26011,1,1,1,-26011,1), -- Northrend World Green Reference #5 +(29554,26012,1,1,1,-26012,1), -- Northrend World Green Reference #6 +(29554,26013,1,1,1,-26013,1), -- Northrend World Green Reference #7 +(29554,26023,0.5,1,1,-26023,1), -- Northrend World Blue Reference #3 +(29554,26024,0.5,1,1,-26024,1), -- Northrend World Blue Reference #4 +(29554,26025,0.5,1,1,-26025,1), -- Northrend World Blue Reference #5 +(29554,26026,0.5,1,1,-26026,1), -- Northrend World Blue Reference #6 +(29554,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +(29554,39152,35,1,0,1,1), -- Manual: Heavy Frostweave Bandage +(29554,43297,1,1,0,1,1), -- Damaged Necklace +-- Rokir +(30954,26001,6,1,1,-26001,1), -- Northrend World Grey Reference #2 +(30954,26002,6,1,1,-26002,1), -- Northrend World Grey Reference #3 +(30954,26014,2,1,1,-26014,1), -- Northrend World Green Reference #8 +(30954,26015,2,1,1,-26015,1), -- Northrend World Green Reference #9 +-- Skeletal Archmage +(31779,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(31779,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 +(31779,26013,1,1,1,-26013,1), -- Northrend World Green Reference #7 +(31779,26014,1,1,1,-26014,1), -- Northrend World Green Reference #8 +(31779,26015,1,1,1,-26015,1), -- Northrend World Green Reference #9 +(31779,26028,0.5,1,1,-26028,1), -- Northrend World Blue Reference #8 +(31779,39152,50,1,0,1,1), -- Manual: Heavy Frostweave Bandage +(31779,43297,1,1,0,1,1), -- Damaged Necklace +-- Charscale Assaulter +(40419,26001,6,1,1,-26001,1), -- Northrend World Grey Reference #2 +(40419,26002,6,1,1,-26002,1), -- Northrend World Grey Reference #3 +(40419,26015,2,1,1,-26015,1), -- Northrend World Green Reference #9 +(40419,26016,2,1,1,-26016,1); -- Northrend World Green Reference #10 +-- conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 1 AND `SourceGroup` IN (28494,29554,31779); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(1,28494,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'), +(1,29554,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'), +(1,31779,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'); -- cgit v1.2.3 From ffbee169f49d2eba408d76a1e181a3e4589dd8ab Mon Sep 17 00:00:00 2001 From: leak Date: Sun, 25 Mar 2012 21:22:53 +0200 Subject: Core/DBLayer: Restore pinfo ban info output --- sql/updates/auth/2012_03_25_00_auth_misc.sql | 8 ++++++++ src/server/game/Chat/Commands/Level2.cpp | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 sql/updates/auth/2012_03_25_00_auth_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/auth/2012_03_25_00_auth_misc.sql b/sql/updates/auth/2012_03_25_00_auth_misc.sql new file mode 100644 index 00000000000..f34882af8f6 --- /dev/null +++ b/sql/updates/auth/2012_03_25_00_auth_misc.sql @@ -0,0 +1,8 @@ +ALTER TABLE `account_banned` + CHANGE `bandate` `bandate` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `unbandate` `unbandate` INT(10) UNSIGNED DEFAULT 0 NOT NULL; + +ALTER TABLE `ip_banned` + CHANGE `ip` `ip` VARCHAR(15) CHARSET utf8 COLLATE utf8_general_ci DEFAULT '127.0.0.1' NOT NULL, + CHANGE `bandate` `bandate` INT(10) UNSIGNED NOT NULL, + CHANGE `unbandate` `unbandate` INT(10) UNSIGNED NOT NULL; diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index ca6a43457f1..cc7c9020d38 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -395,8 +395,8 @@ bool ChatHandler::HandlePInfoCommand(const char* args) if (result2) { - Field* fields = result->Fetch(); - banTime = fields[1].GetBool() ? 0 : fields[0].GetUInt64(); + Field* fields = result2->Fetch(); + banTime = int64(fields[1].GetBool() ? 0 : fields[0].GetUInt32()); bannedby = fields[2].GetString(); banreason = fields[3].GetString(); } -- cgit v1.2.3 From 107a6f2c4b904bff557ec489419db6aa85a17fcb Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 25 Mar 2012 21:15:22 +0100 Subject: DB/Auth: Update auth_database.sql with recent changes DB/GameEvent: Resync Darkmoon, again - by Aokromes --- sql/base/auth_database.sql | 16 ++++++++-------- sql/base/characters_database.sql | 6 ++++-- sql/updates/world/2012_03_25_00_world_game_event.sql | 4 ++++ 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 sql/updates/world/2012_03_25_00_world_game_event.sql (limited to 'sql/updates') diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 3a9bd6fb08b..c80bebdac39 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.13 Distrib 5.5.19, for Win64 (x86) +-- MySQL dump 10.13 Distrib 5.5.21, for Win64 (x86) -- -- Host: localhost Database: auth -- ------------------------------------------------------ --- Server version 5.5.19 +-- Server version 5.5.21 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -88,8 +88,8 @@ DROP TABLE IF EXISTS `account_banned`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `account_banned` ( `id` int(11) NOT NULL DEFAULT '0' COMMENT 'Account id', - `bandate` bigint(40) NOT NULL DEFAULT '0', - `unbandate` bigint(40) NOT NULL DEFAULT '0', + `bandate` int(10) unsigned NOT NULL DEFAULT '0', + `unbandate` int(10) unsigned NOT NULL DEFAULT '0', `bannedby` varchar(50) NOT NULL, `banreason` varchar(255) NOT NULL, `active` tinyint(4) NOT NULL DEFAULT '1', @@ -114,9 +114,9 @@ DROP TABLE IF EXISTS `ip_banned`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `ip_banned` ( - `ip` varchar(32) NOT NULL DEFAULT '127.0.0.1', - `bandate` bigint(40) NOT NULL, - `unbandate` bigint(40) NOT NULL, + `ip` varchar(15) NOT NULL DEFAULT '127.0.0.1', + `bandate` int(10) unsigned NOT NULL, + `unbandate` int(10) unsigned NOT NULL, `bannedby` varchar(50) NOT NULL DEFAULT '[Console]', `banreason` varchar(255) NOT NULL DEFAULT 'no reason', PRIMARY KEY (`ip`,`bandate`) @@ -250,4 +250,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2012-02-19 13:18:35 +-- Dump completed on 2012-03-25 21:05:26 diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index c38dced90dd..f0e919a5bcd 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.13 Distrib 5.5.9, for Win64 (x86) +-- MySQL dump 10.13 Distrib 5.5.21, for Win64 (x86) -- -- Host: localhost Database: characters -- ------------------------------------------------------ --- Server version 5.5.9 +-- Server version 5.5.21 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2270,3 +2270,5 @@ UNLOCK TABLES; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2012-03-25 21:14:19 diff --git a/sql/updates/world/2012_03_25_00_world_game_event.sql b/sql/updates/world/2012_03_25_00_world_game_event.sql new file mode 100644 index 00000000000..82dfaa3f494 --- /dev/null +++ b/sql/updates/world/2012_03_25_00_world_game_event.sql @@ -0,0 +1,4 @@ +-- darkmoon faerie resync, again +UPDATE `game_event` SET `start_time`='2012-04-01 00:01:00' WHERE `eventEntry`=5; +UPDATE `game_event` SET `start_time`='2012-05-06 00:01:00' WHERE `eventEntry`=3; +UPDATE `game_event` SET `start_time`='2012-06-03 00:01:00' WHERE `eventEntry`=4; -- cgit v1.2.3 From 19f821d00a2ce2e2b6bc5b972a6cc9759ff3e4ee Mon Sep 17 00:00:00 2001 From: kaelima Date: Mon, 26 Mar 2012 05:14:10 +0200 Subject: Auth/Realmlist: Make use of RealmFlags and rename color to flag (core- and dbwise) Also fix connecting with realmflag & 4 --- sql/updates/auth/2012_03_26_00_auth_realmlist.sql | 2 ++ src/server/authserver/Realms/RealmList.cpp | 8 ++++---- src/server/authserver/Realms/RealmList.h | 17 +++++++++++++++-- src/server/authserver/Server/AuthSocket.cpp | 11 ++++++++++- src/server/authserver/Server/AuthSocket.h | 13 ------------- .../shared/Database/Implementation/LoginDatabase.cpp | 2 +- src/server/worldserver/CMakeLists.txt | 1 + src/server/worldserver/Master.cpp | 7 ++++--- 8 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 sql/updates/auth/2012_03_26_00_auth_realmlist.sql (limited to 'sql/updates') diff --git a/sql/updates/auth/2012_03_26_00_auth_realmlist.sql b/sql/updates/auth/2012_03_26_00_auth_realmlist.sql new file mode 100644 index 00000000000..0a570a31773 --- /dev/null +++ b/sql/updates/auth/2012_03_26_00_auth_realmlist.sql @@ -0,0 +1,2 @@ +ALTER TABLE `realmlist` + CHANGE `color` `flag` tinyint(3) unsigned NOT NULL DEFAULT '2'; diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp index 245b9c7cc8c..efcced51089 100755 --- a/src/server/authserver/Realms/RealmList.cpp +++ b/src/server/authserver/Realms/RealmList.cpp @@ -31,7 +31,7 @@ void RealmList::Initialize(uint32 updateInterval) UpdateRealms(true); } -void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, uint8 color, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build) +void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build) { // Create new if not exist or update existed Realm& realm = m_realms[name]; @@ -39,7 +39,7 @@ void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::strin realm.m_ID = ID; realm.name = name; realm.icon = icon; - realm.color = color; + realm.flag = flag; realm.timezone = timezone; realm.allowedSecurityLevel = allowedSecurityLevel; realm.populationLevel = popu; @@ -84,13 +84,13 @@ void RealmList::UpdateRealms(bool init) const std::string& address = fields[2].GetString(); uint32 port = fields[3].GetUInt32(); uint8 icon = fields[4].GetUInt8(); - uint8 color = fields[5].GetUInt8(); + RealmFlags flag = RealmFlags(fields[5].GetUInt8()); uint8 timezone = fields[6].GetUInt8(); uint8 allowedSecurityLevel = fields[7].GetUInt8(); float pop = fields[8].GetFloat(); uint32 build = fields[9].GetUInt32(); - UpdateRealm(realmId, name, address, port, icon, color, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build); + UpdateRealm(realmId, name, address, port, icon, flag, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build); if (init) sLog->outString("Added realm \"%s\".", fields[1].GetCString()); diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h index 698026876fb..4d258953ae0 100755 --- a/src/server/authserver/Realms/RealmList.h +++ b/src/server/authserver/Realms/RealmList.h @@ -23,13 +23,26 @@ #include #include "Common.h" +enum RealmFlags +{ + REALM_FLAG_NONE = 0x00, + REALM_FLAG_INVALID = 0x01, + REALM_FLAG_OFFLINE = 0x02, + REALM_FLAG_SPECIFYBUILD = 0x04, + REALM_FLAG_UNK1 = 0x08, + REALM_FLAG_UNK2 = 0x10, + REALM_FLAG_RECOMMENDED = 0x20, + REALM_FLAG_NEW = 0x40, + REALM_FLAG_FULL = 0x80 +}; + // Storage object for a realm struct Realm { std::string address; std::string name; uint8 icon; - uint8 color; + RealmFlags flag; uint8 timezone; uint32 m_ID; AccountTypes allowedSecurityLevel; @@ -58,7 +71,7 @@ public: private: void UpdateRealms(bool init=false); - void UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, uint8 color, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build); + void UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build); RealmMap m_realms; uint32 m_UpdateInterval; diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index e1d77c60286..15555e4d607 100755 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -871,7 +871,7 @@ bool AuthSocket::_HandleRealmList() pkt << i->second.icon; // realm type if ( _expversion & POST_BC_EXP_FLAG ) // only 2.x and 3.x clients pkt << lock; // if 1, then realm locked - pkt << i->second.color; // if 2, then realm is offline + pkt << uint8(i->second.flag); // RealmFlags pkt << i->first; pkt << i->second.address; pkt << i->second.populationLevel; @@ -882,6 +882,15 @@ bool AuthSocket::_HandleRealmList() else pkt << (uint8)0x0; // 1.12.1 and 1.12.2 clients + if (i->second.flag & REALM_FLAG_SPECIFYBUILD) + { + // TODO: Make this customizable + pkt << uint8(3); + pkt << uint8(3); + pkt << uint8(5); + pkt << uint16(12340); + } + ++RealmListSize; } diff --git a/src/server/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h index 9d59a9f7602..9be2136b55c 100755 --- a/src/server/authserver/Server/AuthSocket.h +++ b/src/server/authserver/Server/AuthSocket.h @@ -23,19 +23,6 @@ #include "BigNumber.h" #include "RealmSocket.h" -enum RealmFlags -{ - REALM_FLAG_NONE = 0x00, - REALM_FLAG_INVALID = 0x01, - REALM_FLAG_OFFLINE = 0x02, - REALM_FLAG_SPECIFYBUILD = 0x04, - REALM_FLAG_UNK1 = 0x08, - REALM_FLAG_UNK2 = 0x10, - REALM_FLAG_RECOMMENDED = 0x20, - REALM_FLAG_NEW = 0x40, - REALM_FLAG_FULL = 0x80 -}; - // Handle login commands class AuthSocket: public RealmSocket::Session { diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp index bc8eb709788..df92c6fa77c 100755 --- a/src/server/shared/Database/Implementation/LoginDatabase.cpp +++ b/src/server/shared/Database/Implementation/LoginDatabase.cpp @@ -22,7 +22,7 @@ void LoginDatabaseConnection::DoPrepareStatements() if (!m_reconnecting) m_stmts.resize(MAX_LOGINDATABASE_STATEMENTS); - PREPARE_STATEMENT(LOGIN_SEL_REALMLIST, "SELECT id, name, address, port, icon, color, timezone, allowedSecurityLevel, population, gamebuild FROM realmlist WHERE color <> 3 ORDER BY name", CONNECTION_SYNCH) + PREPARE_STATEMENT(LOGIN_SEL_REALMLIST, "SELECT id, name, address, port, icon, flag, timezone, allowedSecurityLevel, population, gamebuild FROM realmlist WHERE flag <> 3 ORDER BY name", CONNECTION_SYNCH) PREPARE_STATEMENT(LOGIN_DEL_EXPIRED_IP_BANS, "DELETE FROM ip_banned WHERE unbandate<>bandate AND unbandate<=UNIX_TIMESTAMP()", CONNECTION_ASYNC) PREPARE_STATEMENT(LOGIN_UPD_EXPIRED_ACCOUNT_BANS, "UPDATE account_banned SET active = 0 WHERE active = 1 AND unbandate<>bandate AND unbandate<=UNIX_TIMESTAMP()", CONNECTION_ASYNC) PREPARE_STATEMENT(LOGIN_SEL_IP_BANNED, "SELECT * FROM ip_banned WHERE ip = ?", CONNECTION_SYNCH) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 28aab37d1dd..d1419cb0fcb 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -134,6 +134,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Weather ${CMAKE_SOURCE_DIR}/src/server/game/World ${CMAKE_SOURCE_DIR}/src/server/authserver/Server + ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/CommandLine ${CMAKE_CURRENT_SOURCE_DIR}/RemoteAccess diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 45827b10c2c..f1be4a6889b 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -41,6 +41,7 @@ #include "Timer.h" #include "Util.h" #include "AuthSocket.h" +#include "RealmList.h" #include "BigNumber.h" @@ -162,7 +163,7 @@ int Master::Run() return 1; // set server offline (not connectable) - LoginDatabase.DirectPExecute("UPDATE realmlist SET color = (color & ~%u) | %u WHERE id = '%d'", REALM_FLAG_OFFLINE, REALM_FLAG_INVALID, realmID); + LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = (flag & ~%u) | %u WHERE id = '%d'", REALM_FLAG_OFFLINE, REALM_FLAG_INVALID, realmID); ///- Initialize the World sWorld->SetInitialWorldSettings(); @@ -273,7 +274,7 @@ int Master::Run() } // set server online (allow connecting now) - LoginDatabase.DirectPExecute("UPDATE realmlist SET color = color & ~%u, population = 0 WHERE id = '%u'", REALM_FLAG_INVALID, realmID); + LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag & ~%u, population = 0 WHERE id = '%u'", REALM_FLAG_INVALID, realmID); sLog->outString("%s (worldserver-daemon) ready...", _FULLVERSION); sWorldSocketMgr->Wait(); @@ -286,7 +287,7 @@ int Master::Run() } // set server offline - LoginDatabase.DirectPExecute("UPDATE realmlist SET color = color | %u WHERE id = '%d'", REALM_FLAG_OFFLINE, realmID); + LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag | %u WHERE id = '%d'", REALM_FLAG_OFFLINE, realmID); // when the main thread closes the singletons get unloaded // since worldrunnable uses them, it will crash if unloaded after master -- cgit v1.2.3 From f18946a72e5f4d8075dcf631f63502f235e5c8b4 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 26 Mar 2012 15:38:52 +0200 Subject: DB/Creature Template: Some updates, mostly HoverHeight and InhabitType. Thanks to KingPin for re-parsing ~5GB of sniffs. --- .../2012_03_26_00_world_creature_template.sql | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 sql/updates/world/2012_03_26_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_26_00_world_creature_template.sql b/sql/updates/world/2012_03_26_00_world_creature_template.sql new file mode 100644 index 00000000000..f60849476bd --- /dev/null +++ b/sql/updates/world/2012_03_26_00_world_creature_template.sql @@ -0,0 +1,73 @@ +UPDATE `creature_template` SET `HoverHeight`=10.8, `VehicleId`=232 WHERE `entry`=30393; +UPDATE `creature_template` SET `HoverHeight`=10.8, `VehicleId`=237 WHERE `entry`=30461; +UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=27530; +UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=26277; +UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=26276; +UPDATE `creature_template` SET `HoverHeight`=1.2 WHERE `entry`=31070; +UPDATE `creature_template` SET `HoverHeight`=12 WHERE `entry`=37126; +UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=27608; +UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=27608; +UPDATE `creature_template` SET `HoverHeight`=1.6 WHERE `entry`=38392; +UPDATE `creature_template` SET `HoverHeight`=2.25 WHERE `entry`=30272; +UPDATE `creature_template` SET `HoverHeight`=2.58, `Scale`=1.72 WHERE `entry`=26607; +UPDATE `creature_template` SET `HoverHeight`=25 WHERE `entry`=37755; +UPDATE `creature_template` SET `HoverHeight`=26 WHERE `entry`=29790; +UPDATE `creature_template` SET `HoverHeight`=2.7 WHERE `entry`=25451; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=29048; +UPDATE `creature_template` SET `HoverHeight`=2, `VehicleId`=234 WHERE `entry`=30228; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25445; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=26761; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=26761; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25721; +UPDATE `creature_template` SET `HoverHeight`=35 WHERE `entry`=27789; +UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=34567; +UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=26668; +UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=390 WHERE `entry`=34120; +UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=108 WHERE `entry`=24083; +UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=270 WHERE `entry`=31137; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=24272; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=37098; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=28534; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=28511; +UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=32534; +UPDATE `creature_template` SET `HoverHeight`=5, `VehicleId`=348 WHERE `entry`=33214; +UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=27693; +UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=34203; +UPDATE `creature_template` SET `HoverHeight`=6.25 WHERE `entry`=40083; +UPDATE `creature_template` SET `HoverHeight`=6.25 WHERE `entry`=40100; +UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34496; +UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34496; +UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34497; +UPDATE `creature_template` SET `HoverHeight`=7.5 WHERE `entry`=26933; +UPDATE `creature_template` SET `HoverHeight`=8.4, `VehicleId`=232 WHERE `entry`=30420; +UPDATE `creature_template` SET `HoverHeight`=8 WHERE `entry`=33186; +UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=26933; +UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37528; +UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37230; +UPDATE `creature_template` SET `HoverHeight`=9, `VehicleId`=375 WHERE `entry`=33687; +UPDATE `creature_template` SET `HoverHeight`=9, `VehicleId`=535 WHERE `entry`=36661; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10.8, `VehicleId`=232 WHERE `entry`=30393; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10 WHERE `entry`=27608; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10 WHERE `entry`=27608; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=15 WHERE `entry`=32630; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=1.6 WHERE `entry`=38391; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2.25, `VehicleId`=247 WHERE `entry`=30564; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2.25 WHERE `entry`=30272; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=25721; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=29570; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=26761; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3.12, `Scale`=2.08 WHERE `entry`=26607; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3 WHERE `entry`=26668; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3, `VehicleId`=108 WHERE `entry`=24083; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=4 WHERE `entry`=37098; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=4 WHERE `entry`=30945; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5, `VehicleId`=276 WHERE `entry`=31432; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=6 WHERE `entry`=30501; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=7.5 WHERE `entry`=26933; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=8.4, `VehicleId`=232 WHERE `entry`=30420; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=9 WHERE `entry`=26933; + -- cgit v1.2.3 From 02a8388b8e623345aebc44eaff5c9511d075a416 Mon Sep 17 00:00:00 2001 From: Kandera Date: Mon, 26 Mar 2012 12:22:55 -0400 Subject: Core/Spells: Added sql for misdirection fix (thx dasio) --- sql/updates/world/2012_03_26_01_world_spell_script_names.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_03_26_01_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_26_01_world_spell_script_names.sql b/sql/updates/world/2012_03_26_01_world_spell_script_names.sql new file mode 100644 index 00000000000..0a5c90f798f --- /dev/null +++ b/sql/updates/world/2012_03_26_01_world_spell_script_names.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (34477, 35079); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(34477,'spell_hun_misdirection'), +(35079,'spell_hun_misdirection_proc'); -- cgit v1.2.3 From a92820b51c791595676805396a599fa345d58db2 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 27 Mar 2012 00:43:56 +0100 Subject: Core/DBLayer: Correct few more wrong read types (No. 1) DB/World: Some consistency in the ints "length" field (not really a length) From A to D world tables verified; missing all the others int(11) -> int32 unsigned int(10) -> uint32 mediumint(8) -> int32 unsigned mediumint(8) -> uint32 smallint(6) -> int16 unsigned smallint(5) -> uint16 tinyint(4) -> int8 unsigned tinyint(3) -> uint8 --- sql/updates/world/2012_03_27_00_world_misc.sql | 49 ++++++++++++++++++++++ src/server/game/AI/EventAI/CreatureEventAIMgr.cpp | 32 +++++++------- src/server/game/Achievements/AchievementMgr.cpp | 2 +- src/server/game/Battlegrounds/BattlegroundMgr.cpp | 8 ++-- src/server/game/Conditions/ConditionMgr.cpp | 4 +- .../game/Entities/Creature/CreatureGroups.cpp | 2 +- src/server/game/Entities/Transport/Transport.cpp | 8 ++-- src/server/game/Globals/ObjectMgr.cpp | 24 +++++------ src/server/game/Loot/LootMgr.cpp | 2 +- src/server/game/Scripting/ScriptSystem.cpp | 8 ++-- src/server/scripts/Commands/cs_npc.cpp | 2 +- 11 files changed, 95 insertions(+), 46 deletions(-) create mode 100644 sql/updates/world/2012_03_27_00_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_27_00_world_misc.sql b/sql/updates/world/2012_03_27_00_world_misc.sql new file mode 100644 index 00000000000..132c91b81d7 --- /dev/null +++ b/sql/updates/world/2012_03_27_00_world_misc.sql @@ -0,0 +1,49 @@ +ALTER TABLE `battleground_template` CHANGE `Weight` `Weight` tinyint(3) unsigned NOT NULL DEFAULT '1'; +ALTER TABLE `conditions` CHANGE `SourceId` `SourceId` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `creature` CHANGE `equipment_id` `equipment_id` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_addon` CHANGE `path_id` `path_id` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_ai_scripts` CHANGE `id` `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier'; +ALTER TABLE `creature_ai_scripts` CHANGE `creature_id` `creature_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Creature Template Identifier'; +ALTER TABLE `creature_ai_scripts` CHANGE `event_type` `event_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event Type'; +ALTER TABLE `creature_ai_scripts` CHANGE `event_chance` `event_chance` int(10) unsigned NOT NULL DEFAULT '100'; +ALTER TABLE `creature_ai_scripts` CHANGE `event_flags` `event_flags` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_ai_scripts` CHANGE `action1_type` `action1_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; +ALTER TABLE `creature_ai_scripts` CHANGE `action2_type` `action2_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; +ALTER TABLE `creature_ai_scripts` CHANGE `action3_type` `action3_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; +ALTER TABLE `creature_ai_summons` CHANGE `id` `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Location Identifier'; +ALTER TABLE `creature_ai_summons` CHANGE `spawntimesecs` `spawntimesecs` int(10) unsigned NOT NULL DEFAULT '120'; +ALTER TABLE `creature_classlevelstats` CHANGE `level` `level` tinyint(4) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `class` `class` tinyint(4) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basehp0` `basehp0` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basehp1` `basehp1` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basehp2` `basehp2` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basemana` `basemana` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basearmor` `basearmor` smallint(6) NOT NULL; +ALTER TABLE `creature_formations` CHANGE `leaderGUID` `leaderGUID` int(10) unsigned NOT NULL; +ALTER TABLE `creature_formations` CHANGE `memberGUID` `memberGUID` int(10) unsigned NOT NULL; +ALTER TABLE `creature_formations` CHANGE `groupAI` `groupAI` int(10) unsigned NOT NULL; +ALTER TABLE `creature_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `creature_onkill_reputation` CHANGE `RewOnKillRepValue1` `RewOnKillRepValue1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `KillCredit1` `KillCredit1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `KillCredit2` `KillCredit2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `exp` `exp` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance1` `resistance1` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance2` `resistance2` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance3` `resistance3` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance4` `resistance4` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance5` `resistance5` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance6` `resistance6` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem1` `questItem1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem2` `questItem2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem3` `questItem3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem4` `questItem4` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem5` `questItem5` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem6` `questItem6` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `creature_template_addon` CHANGE `path_id` `path_id` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_transport` CHANGE `guid` `guid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'GUID of NPC on transport - not the same as creature.guid'; +ALTER TABLE `creature_transport` CHANGE `transport_entry` `transport_entry` int(11) NOT NULL COMMENT 'Transport entry'; +ALTER TABLE `creature_transport` CHANGE `npc_entry` `npc_entry` int(11) NOT NULL COMMENT 'NPC entry'; +ALTER TABLE `creature_transport` CHANGE `emote` `emote` int(11) NOT NULL; +ALTER TABLE `db_script_string` CHANGE `entry` `entry` int(10) unsigned NOT NULL DEFAULT '0'; + \ No newline at end of file diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp index add7b4db174..facfbd7581c 100755 --- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp @@ -56,10 +56,10 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Texts() StringTextData temp; int32 i = fields[0].GetInt32(); - temp.SoundId = fields[1].GetInt32(); - temp.Type = fields[2].GetInt32(); - temp.Language = fields[3].GetInt32(); - temp.Emote = fields[4].GetInt32(); + temp.SoundId = fields[1].GetUInt32(); + temp.Type = fields[2].GetUInt8(); + temp.Language = fields[3].GetUInt8(); + temp.Emote = fields[4].GetUInt16(); // range negative if (i > MIN_CREATURE_AI_TEXT_STRING_ID || i <= MAX_CREATURE_AI_TEXT_STRING_ID) @@ -187,7 +187,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() temp.creature_id = fields[1].GetUInt32(); uint32 creature_id = temp.creature_id; - uint32 e_type = fields[2].GetUInt32(); + uint32 e_type = fields[2].GetUInt8(); //Report any errors in event if (e_type >= EVENT_T_END) { @@ -196,13 +196,13 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() } temp.event_type = EventAI_Type(e_type); - temp.event_inverse_phase_mask = fields[3].GetUInt32(); - temp.event_chance = fields[4].GetUInt8(); - temp.event_flags = fields[5].GetUInt8(); - temp.raw.param1 = fields[6].GetUInt32(); - temp.raw.param2 = fields[7].GetUInt32(); - temp.raw.param3 = fields[8].GetUInt32(); - temp.raw.param4 = fields[9].GetUInt32(); + temp.event_inverse_phase_mask = fields[3].GetInt32(); + temp.event_chance = fields[4].GetUInt32(); + temp.event_flags = fields[5].GetUInt32(); + temp.raw.param1 = fields[6].GetInt32(); + temp.raw.param2 = fields[7].GetInt32(); + temp.raw.param3 = fields[8].GetInt32(); + temp.raw.param4 = fields[9].GetInt32(); //Creature does not exist in database if (!sObjectMgr->GetCreatureTemplate(temp.creature_id)) @@ -399,7 +399,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() for (uint32 j = 0; j < MAX_ACTIONS; j++) { - uint16 action_type = fields[10+(j*4)].GetUInt16(); + uint16 action_type = fields[10+(j*4)].GetUInt8(); if (action_type >= ACTION_T_END) { sLog->outErrorDb("CreatureEventAI: Event %u Action %u has incorrect action type (%u), replace by ACTION_T_NONE.", i, j+1, action_type); @@ -410,9 +410,9 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() CreatureEventAI_Action& action = temp.action[j]; action.type = EventAI_ActionType(action_type); - action.raw.param1 = fields[11+(j*4)].GetUInt32(); - action.raw.param2 = fields[12+(j*4)].GetUInt32(); - action.raw.param3 = fields[13+(j*4)].GetUInt32(); + action.raw.param1 = fields[11+(j*4)].GetInt32(); + action.raw.param2 = fields[12+(j*4)].GetInt32(); + action.raw.param3 = fields[13+(j*4)].GetInt32(); //Report any errors in actions switch (action.type) diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 5a97f6fa18f..7b2e157eac8 100755 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -2282,7 +2282,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() continue; } - uint32 dataType = fields[1].GetUInt32(); + uint32 dataType = fields[1].GetUInt8(); const char* scriptName = fields[4].GetCString(); uint32 scriptId = 0; if (strcmp(scriptName, "")) // not empty diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 77b985b205f..e1b99cbdcb9 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -708,10 +708,10 @@ void BattlegroundMgr::CreateInitialBattlegrounds() CreateBattlegroundData data; data.bgTypeId = BattlegroundTypeId(bgTypeID_); data.IsArena = (bl->type == TYPE_ARENA); - data.MinPlayersPerTeam = fields[1].GetUInt32(); - data.MaxPlayersPerTeam = fields[2].GetUInt32(); - data.LevelMin = fields[3].GetUInt32(); - data.LevelMax = fields[4].GetUInt32(); + data.MinPlayersPerTeam = fields[1].GetUInt16(); + data.MaxPlayersPerTeam = fields[2].GetUInt16(); + data.LevelMin = fields[3].GetUInt8(); + data.LevelMax = fields[4].GetUInt8(); //check values from DB if (data.MaxPlayersPerTeam == 0 || data.MinPlayersPerTeam == 0 || data.MinPlayersPerTeam > data.MaxPlayersPerTeam) { diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 7fe6df14679..3fcabea4c74 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -719,8 +719,8 @@ void ConditionMgr::LoadConditions(bool isReload) Condition* cond = new Condition(); int32 iSourceTypeOrReferenceId = fields[0].GetInt32(); cond->SourceGroup = fields[1].GetUInt32(); - cond->SourceEntry = fields[2].GetInt32(); - cond->SourceId = fields[3].GetUInt32(); + cond->SourceEntry = fields[2].GetUInt32(); + cond->SourceId = fields[3].GetInt32(); cond->ElseGroup = fields[4].GetUInt32(); int32 iConditionTypeOrReference = fields[5].GetInt32(); cond->ConditionTarget = fields[6].GetUInt8(); diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index bcedfa40864..2104f474072 100755 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -101,7 +101,7 @@ void FormationMgr::LoadCreatureFormations() group_member = new FormationInfo(); group_member->leaderGUID = fields[0].GetUInt32(); uint32 memberGUID = fields[1].GetUInt32(); - group_member->groupAI = fields[4].GetUInt8(); + group_member->groupAI = fields[4].GetUInt32(); //If creature is group leader we may skip loading of dist/angle if (group_member->leaderGUID != memberGUID) { diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index ebb524d5f64..81a505b7acc 100755 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -144,14 +144,14 @@ void MapManager::LoadTransportNPCs() do { Field* fields = result->Fetch(); - uint32 guid = fields[0].GetUInt32(); - uint32 entry = fields[1].GetUInt32(); - uint32 transportEntry = fields[2].GetUInt32(); + uint32 guid = fields[0].GetInt32(); + uint32 entry = fields[1].GetInt32(); + uint32 transportEntry = fields[2].GetInt32(); float tX = fields[3].GetFloat(); float tY = fields[4].GetFloat(); float tZ = fields[5].GetFloat(); float tO = fields[6].GetFloat(); - uint32 anim = fields[7].GetUInt32(); + uint32 anim = fields[7].GetInt32(); for (MapManager::TransportSet::iterator itr = m_Transports.begin(); itr != m_Transports.end(); ++itr) { diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 91ce5c44537..f66ca460c0a 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -422,7 +422,7 @@ void ObjectMgr::LoadCreatureTemplates() creatureTemplate.GossipMenuId = fields[13].GetUInt32(); creatureTemplate.minlevel = fields[14].GetUInt8(); creatureTemplate.maxlevel = fields[15].GetUInt8(); - creatureTemplate.expansion = uint32(fields[16].GetUInt16()); + creatureTemplate.expansion = uint32(fields[16].GetInt16()); creatureTemplate.faction_A = uint32(fields[17].GetUInt16()); creatureTemplate.faction_H = uint32(fields[18].GetUInt16()); creatureTemplate.npcflag = fields[19].GetUInt32(); @@ -455,7 +455,7 @@ void ObjectMgr::LoadCreatureTemplates() creatureTemplate.SkinLootId = fields[46].GetUInt32(); for (uint8 i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i) - creatureTemplate.resistance[i] = fields[47 + i -1].GetInt32(); + creatureTemplate.resistance[i] = fields[47 + i -1].GetInt16(); for (uint8 i = 0; i < CREATURE_MAX_SPELLS; ++i) creatureTemplate.spells[i] = fields[53 + i].GetUInt32(); @@ -5975,7 +5975,7 @@ void ObjectMgr::LoadAreaTriggerTeleports() AreaTrigger at; - at.target_mapId = fields[1].GetUInt32(); + at.target_mapId = fields[1].GetUInt16(); at.target_X = fields[2].GetFloat(); at.target_Y = fields[3].GetFloat(); at.target_Z = fields[4].GetFloat(); @@ -6837,13 +6837,13 @@ void ObjectMgr::LoadReputationOnKill() uint32 creature_id = fields[0].GetUInt32(); ReputationOnKillEntry repOnKill; - repOnKill.RepFaction1 = fields[1].GetUInt32(); - repOnKill.RepFaction2 = fields[2].GetUInt32(); + repOnKill.RepFaction1 = fields[1].GetInt16(); + repOnKill.RepFaction2 = fields[2].GetInt16(); repOnKill.IsTeamAward1 = fields[3].GetBool(); - repOnKill.ReputationMaxCap1 = fields[4].GetUInt32(); + repOnKill.ReputationMaxCap1 = fields[4].GetUInt8(); repOnKill.RepValue1 = fields[5].GetInt32(); repOnKill.IsTeamAward2 = fields[6].GetBool(); - repOnKill.ReputationMaxCap2 = fields[7].GetUInt32(); + repOnKill.ReputationMaxCap2 = fields[7].GetUInt8(); repOnKill.RepValue2 = fields[8].GetInt32(); repOnKill.TeamDependent = fields[9].GetUInt8(); @@ -8692,16 +8692,16 @@ void ObjectMgr::LoadCreatureClassLevelStats() { Field* fields = result->Fetch(); - uint8 Level = fields[0].GetUInt8(); - uint8 Class = fields[1].GetUInt8(); + uint8 Level = fields[0].GetInt8(); + uint8 Class = fields[1].GetInt8(); CreatureBaseStats stats; for (uint8 i = 0; i < MAX_CREATURE_BASE_HP; ++i) - stats.BaseHealth[i] = fields[i + 2].GetUInt16(); + stats.BaseHealth[i] = fields[i + 2].GetInt16(); - stats.BaseMana = fields[5].GetUInt16(); - stats.BaseArmor = fields[6].GetUInt16(); + stats.BaseMana = fields[5].GetInt16(); + stats.BaseArmor = fields[6].GetInt16(); if (!Class || ((1 << (Class - 1)) & CLASSMASK_ALL_CREATURES) == 0) sLog->outErrorDb("Creature base stats for level %u has invalid class %u", Level, Class); diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 3522571775c..7c7cc06201c 100755 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -116,7 +116,7 @@ uint32 LootStore::LoadLootTable() uint16 lootmode = fields[3].GetUInt16(); uint8 group = fields[4].GetUInt8(); int32 mincountOrRef = fields[5].GetInt32(); - int32 maxcount = fields[6].GetInt32(); + int32 maxcount = fields[6].GetUInt8(); if (maxcount > std::numeric_limits::max()) { diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index ecb82a80a8d..66f5a4089dc 100755 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -109,11 +109,11 @@ void SystemMgr::LoadScriptTextsCustom() Field* pFields = result->Fetch(); StringTextData temp; - int32 iId = pFields[0].GetInt32(); + int32 iId = pFields[0].GetInt32(); temp.uiSoundId = pFields[1].GetUInt32(); - temp.uiType = pFields[2].GetUInt32(); - temp.uiLanguage = pFields[3].GetUInt32(); - temp.uiEmote = pFields[4].GetUInt32(); + temp.uiType = pFields[2].GetUInt8(); + temp.uiLanguage = pFields[3].GetUInt8(); + temp.uiEmote = pFields[4].GetUInt16(); if (iId >= 0) { diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 249506fb0f1..a9959c60201 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -694,7 +694,7 @@ public: { PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_TRANSPORT_EMOTE); - stmt->setInt16(0, int16(emote)); + stmt->setInt32(0, int32(emote)); stmt->setInt32(1, target->GetTransport()->GetEntry()); stmt->setInt32(2, target->GetGUIDTransport()); -- cgit v1.2.3 From e40eb4bfbcbbd62aca97a9aaa9c203500582dca7 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 27 Mar 2012 15:47:40 +0100 Subject: Core/DBLayer: Correct few more wrong read types (No. 2) DB/World: Some consistency in the ints "length" field (not really a length) From A to G world tables verified; missing all the others --- sql/updates/world/2012_03_27_01_world_misc.sql | 15 ++++++++ src/server/game/Events/GameEventMgr.cpp | 49 +++++++++++++------------- src/server/game/Globals/ObjectMgr.cpp | 30 +++++++++------- src/server/game/Weather/WeatherMgr.cpp | 6 ++-- 4 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 sql/updates/world/2012_03_27_01_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_27_01_world_misc.sql b/sql/updates/world/2012_03_27_01_world_misc.sql new file mode 100644 index 00000000000..38c11c8ae65 --- /dev/null +++ b/sql/updates/world/2012_03_27_01_world_misc.sql @@ -0,0 +1,15 @@ +ALTER TABLE `exploration_basexp` CHANGE `level` `level` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `exploration_basexp` CHANGE `basexp` `basexp` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `fishing_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `game_event_creature` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; +ALTER TABLE `game_event_gameobject` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; +ALTER TABLE `game_event_model_equip` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.'; +ALTER TABLE `game_event_npc_vendor` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.'; +ALTER TABLE `game_event_pool` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; +ALTER TABLE `gameobject_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `gameobject_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `gossip_menu` CHANGE `entry` `entry` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `menu_id` `menu_id` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `id` `id` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `box_money` `box_money` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `action_menu_id` `action_menu_id` int(10) unsigned NOT NULL DEFAULT '0'; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 808da1ac791..7224007fb2c 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -220,7 +220,7 @@ void GameEventMgr::LoadFromDB() { Field* fields = result->Fetch(); - uint16 event_id = fields[0].GetUInt16(); + uint16 event_id = fields[0].GetUInt8(); if (event_id == 0) { sLog->outErrorDb("`game_event` game event entry 0 is reserved and can't be used."); @@ -232,8 +232,8 @@ void GameEventMgr::LoadFromDB() pGameEvent.start = time_t(starttime); uint64 endtime = fields[2].GetUInt64(); pGameEvent.end = time_t(endtime); - pGameEvent.occurence = fields[3].GetUInt32(); - pGameEvent.length = fields[4].GetUInt32(); + pGameEvent.occurence = fields[3].GetUInt64(); + pGameEvent.length = fields[4].GetUInt64(); pGameEvent.holiday_id = HolidayIds(fields[5].GetUInt32()); pGameEvent.state = (GameEventState)(fields[7].GetUInt8()); @@ -315,6 +315,7 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); + // 0 1 QueryResult result = WorldDatabase.Query("SELECT eventEntry, prerequisite_event FROM game_event_prerequisite"); if (!result) { @@ -328,7 +329,7 @@ void GameEventMgr::LoadFromDB() { Field* fields = result->Fetch(); - uint16 event_id = fields[0].GetUInt16(); + uint16 event_id = fields[0].GetUInt8(); if (event_id >= mGameEvent.size()) { @@ -338,7 +339,7 @@ void GameEventMgr::LoadFromDB() if (mGameEvent[event_id].state != GAMEEVENT_NORMAL && mGameEvent[event_id].state != GAMEEVENT_INTERNAL) { - uint16 prerequisite_event = fields[1].GetUInt16(); + uint16 prerequisite_event = fields[1].GetUInt32(); if (prerequisite_event >= mGameEvent.size()) { sLog->outErrorDb("`game_event_prerequisite` game event prerequisite id (%i) is out of range compared to max event id in `game_event`", prerequisite_event); @@ -382,7 +383,7 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); - int16 event_id = fields[1].GetInt16(); + int16 event_id = fields[1].GetInt8(); int32 internal_event_id = mGameEvent.size() + event_id - 1; @@ -408,7 +409,7 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 1 2 + // 0 1 QueryResult result = WorldDatabase.Query("SELECT gameobject.guid, game_event_gameobject.eventEntry FROM gameobject" " JOIN game_event_gameobject ON gameobject.guid=game_event_gameobject.guid"); @@ -425,7 +426,7 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); - int16 event_id = fields[1].GetInt16(); + int16 event_id = fields[1].GetInt8(); int32 internal_event_id = mGameEvent.size() + event_id - 1; @@ -525,7 +526,7 @@ void GameEventMgr::LoadFromDB() uint32 id = fields[0].GetUInt32(); uint32 quest = fields[1].GetUInt32(); - uint16 event_id = fields[2].GetUInt16(); + uint16 event_id = fields[2].GetUInt8(); if (event_id >= mGameEventCreatureQuests.size()) { @@ -566,7 +567,7 @@ void GameEventMgr::LoadFromDB() uint32 id = fields[0].GetUInt32(); uint32 quest = fields[1].GetUInt32(); - uint16 event_id = fields[2].GetUInt16(); + uint16 event_id = fields[2].GetUInt8(); if (event_id >= mGameEventGameObjectQuests.size()) { @@ -590,7 +591,7 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 + // 0 1 2 3 QueryResult result = WorldDatabase.Query("SELECT quest, eventEntry, condition_id, num FROM game_event_quest_condition"); if (!result) @@ -606,7 +607,7 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 quest = fields[0].GetUInt32(); - uint16 event_id = fields[1].GetUInt16(); + uint16 event_id = fields[1].GetUInt8(); uint32 condition = fields[2].GetUInt32(); float num = fields[3].GetFloat(); @@ -648,7 +649,7 @@ void GameEventMgr::LoadFromDB() { Field* fields = result->Fetch(); - uint16 event_id = fields[0].GetUInt16(); + uint16 event_id = fields[0].GetUInt8(); uint32 condition = fields[1].GetUInt32(); if (event_id >= mGameEvent.size()) @@ -659,8 +660,8 @@ void GameEventMgr::LoadFromDB() mGameEvent[event_id].conditions[condition].reqNum = fields[2].GetFloat(); mGameEvent[event_id].conditions[condition].done = 0; - mGameEvent[event_id].conditions[condition].max_world_state = fields[3].GetUInt32(); - mGameEvent[event_id].conditions[condition].done_world_state = fields[4].GetUInt32(); + mGameEvent[event_id].conditions[condition].max_world_state = fields[3].GetUInt16(); + mGameEvent[event_id].conditions[condition].done_world_state = fields[4].GetUInt16(); ++count; } @@ -739,7 +740,7 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); - uint16 event_id = fields[1].GetUInt16(); + uint16 event_id = fields[1].GetUInt8(); uint32 npcflag = fields[2].GetUInt32(); if (event_id >= mGameEvent.size()) @@ -763,7 +764,7 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 0 1 + // 0 1 QueryResult result = WorldDatabase.Query("SELECT questId, eventEntry FROM game_event_seasonal_questrelation"); if (!result) @@ -779,7 +780,7 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 questId = fields[0].GetUInt32(); - uint16 eventEntry = fields[1].GetUInt16(); + uint32 eventEntry = fields[1].GetUInt32(); // TODO: Change to uint8 if (!sObjectMgr->GetQuestTemplate(questId)) { @@ -822,7 +823,7 @@ void GameEventMgr::LoadFromDB() { Field* fields = result->Fetch(); - uint16 event_id = fields[0].GetUInt16(); + int8 event_id = fields[0].GetInt8(); if (event_id >= mGameEventVendors.size()) { @@ -834,7 +835,7 @@ void GameEventMgr::LoadFromDB() NPCVendorEntry newEntry; uint32 guid = fields[1].GetUInt32(); newEntry.item = fields[2].GetUInt32(); - newEntry.maxcount = fields[3].GetInt32(); + newEntry.maxcount = fields[3].GetUInt32(); newEntry.incrtime = fields[4].GetUInt32(); newEntry.ExtendedCost = fields[5].GetUInt32(); // get the event npc flag for checking if the npc will be vendor during the event or not @@ -888,7 +889,7 @@ void GameEventMgr::LoadFromDB() { Field* fields = result->Fetch(); - uint16 event_id = fields[0].GetUInt16(); + uint16 event_id = fields[0].GetUInt8(); if (event_id >= mGameEvent.size()) { @@ -911,7 +912,7 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 1 2 + // 0 1 QueryResult result = WorldDatabase.Query("SELECT pool_template.entry, game_event_pool.eventEntry FROM pool_template" " JOIN game_event_pool ON pool_template.entry = game_event_pool.pool_entry"); @@ -928,7 +929,7 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 entry = fields[0].GetUInt32(); - int16 event_id = fields[1].GetInt16(); + int16 event_id = fields[1].GetInt8(); int32 internal_event_id = mGameEvent.size() + event_id - 1; @@ -1019,7 +1020,7 @@ void GameEventMgr::StartArenaSeason() } Field* fields = result->Fetch(); - uint16 eventId = fields[0].GetUInt16(); + uint16 eventId = fields[0].GetUInt8(); if (eventId >= mGameEvent.size()) { diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f66ca460c0a..61c47779c85 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1767,7 +1767,7 @@ void ObjectMgr::LoadGameobjects() GameObjectData& data = _gameObjectDataStore[guid]; data.id = entry; - data.mapid = fields[2].GetUInt32(); + data.mapid = fields[2].GetUInt16(); data.posX = fields[3].GetFloat(); data.posY = fields[4].GetFloat(); data.posZ = fields[5].GetFloat(); @@ -1790,10 +1790,10 @@ void ObjectMgr::LoadGameobjects() sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with `spawntimesecs` (0) value, but the gameobejct is marked as despawnable at action.", guid, data.id); } - data.animprogress = fields[12].GetUInt32(); + data.animprogress = fields[12].GetUInt8(); data.artKit = 0; - uint32 go_state = fields[13].GetUInt32(); + uint32 go_state = fields[13].GetUInt8(); if (go_state >= MAX_GO_STATE) { sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid `state` (%u) value, skip", guid, data.id, go_state); @@ -1807,7 +1807,7 @@ void ObjectMgr::LoadGameobjects() sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) that has wrong spawn mask %u including not supported difficulty modes for map (Id: %u), skip", guid, data.id, data.spawnMask, data.mapid); data.phaseMask = fields[15].GetUInt16(); - int16 gameEvent = fields[16].GetInt16(); + int16 gameEvent = fields[16].GetInt8(); uint32 PoolId = fields[17].GetUInt32(); if (data.rotation2 < -1.0f || data.rotation2 > 1.0f) @@ -5661,6 +5661,7 @@ void ObjectMgr::LoadGraveyardZones() GraveYardStore.clear(); // need for reload case + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT id, ghost_zone, faction FROM game_graveyard_zone"); if (!result) @@ -5680,7 +5681,7 @@ void ObjectMgr::LoadGraveyardZones() uint32 safeLocId = fields[0].GetUInt32(); uint32 zoneId = fields[1].GetUInt32(); - uint32 team = fields[2].GetUInt32(); + uint32 team = fields[2].GetUInt16(); WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(safeLocId); if (!entry) @@ -6449,7 +6450,7 @@ void ObjectMgr::LoadGameObjectTemplate() got.questItems[i] = fields[10 + i].GetUInt32(); for (uint8 i = 0; i < MAX_GAMEOBJECT_DATA; ++i) - got.raw.data[i] = fields[16 + i].GetUInt32(); + got.raw.data[i] = fields[16 + i].GetInt32(); // data1 and data6 can be -1 got.AIName = fields[40].GetString(); got.ScriptId = GetScriptId(fields[41].GetCString()); @@ -6612,7 +6613,7 @@ void ObjectMgr::LoadExplorationBaseXP() { Field* fields = result->Fetch(); uint8 level = fields[0].GetUInt8(); - uint32 basexp = fields[1].GetUInt32(); + uint32 basexp = fields[1].GetInt32(); _baseXPTable[level] = basexp; ++count; } @@ -7897,6 +7898,7 @@ void ObjectMgr::LoadGameTele() _gameTeleStore.clear(); // for reload case + // 0 1 2 3 4 5 6 QueryResult result = WorldDatabase.Query("SELECT id, position_x, position_y, position_z, orientation, map, name FROM game_tele"); if (!result) @@ -7920,7 +7922,7 @@ void ObjectMgr::LoadGameTele() gt.position_y = fields[2].GetFloat(); gt.position_z = fields[3].GetFloat(); gt.orientation = fields[4].GetFloat(); - gt.mapId = fields[5].GetUInt32(); + gt.mapId = fields[5].GetUInt16(); gt.name = fields[6].GetString(); if (!MapManager::IsValidMapCoord(gt.mapId, gt.position_x, gt.position_y, gt.position_z, gt.orientation)) @@ -8326,7 +8328,7 @@ void ObjectMgr::LoadGossipMenu() GossipMenus gMenu; - gMenu.entry = fields[0].GetUInt32(); + gMenu.entry = fields[0].GetUInt16(); gMenu.text_id = fields[1].GetUInt32(); if (!GetGossipText(gMenu.text_id)) @@ -8352,7 +8354,9 @@ void ObjectMgr::LoadGossipMenuItems() _gossipMenuItemsStore.clear(); QueryResult result = WorldDatabase.Query( + // 0 1 2 3 4 "SELECT menu_id, id, option_icon, option_text, option_id, npc_option_npcflag, " + // 5 6 7 8 9 "action_menu_id, action_poi_id, box_coded, box_money, box_text " "FROM gossip_menu_option ORDER BY menu_id, id"); @@ -8371,11 +8375,11 @@ void ObjectMgr::LoadGossipMenuItems() GossipMenuItems gMenuItem; - gMenuItem.MenuId = fields[0].GetUInt32(); - gMenuItem.OptionIndex = fields[1].GetUInt32(); - gMenuItem.OptionIcon = fields[2].GetUInt8(); + gMenuItem.MenuId = fields[0].GetUInt16(); + gMenuItem.OptionIndex = fields[1].GetUInt16(); + gMenuItem.OptionIcon = fields[2].GetUInt32(); gMenuItem.OptionText = fields[3].GetString(); - gMenuItem.OptionType = fields[4].GetUInt32(); + gMenuItem.OptionType = fields[4].GetUInt8(); gMenuItem.OptionNpcflag = fields[5].GetUInt32(); gMenuItem.ActionMenuId = fields[6].GetUInt32(); gMenuItem.ActionPoiId = fields[7].GetUInt32(); diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index 41241583ea1..bb8fadf08bc 100755 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -108,9 +108,9 @@ void LoadWeatherData() for (uint8 season = 0; season < WEATHER_SEASONS; ++season) { - wzc.data[season].rainChance = fields[season * (MAX_WEATHER_TYPE-1) + 1].GetUInt32(); - wzc.data[season].snowChance = fields[season * (MAX_WEATHER_TYPE-1) + 2].GetUInt32(); - wzc.data[season].stormChance = fields[season * (MAX_WEATHER_TYPE-1) + 3].GetUInt32(); + wzc.data[season].rainChance = fields[season * (MAX_WEATHER_TYPE-1) + 1].GetUInt8(); + wzc.data[season].snowChance = fields[season * (MAX_WEATHER_TYPE-1) + 2].GetUInt8(); + wzc.data[season].stormChance = fields[season * (MAX_WEATHER_TYPE-1) + 3].GetUInt8(); if (wzc.data[season].rainChance > 100) { -- cgit v1.2.3 From ead019b0611bd930eaa6bc7078b430bdc4fe8279 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 27 Mar 2012 19:26:58 +0100 Subject: Core/DBLayer: Correct few more wrong read types (No. 3) DB/World: Some consistency in the ints "length" field (not really a length) From A to G world tables verified; missing all the others --- sql/updates/world/2012_03_27_02_world_misc.sql | 78 ++++++++++++++++++++ .../game/Entities/Item/ItemEnchantmentMgr.cpp | 1 + src/server/game/Globals/ObjectMgr.cpp | 86 +++++++++++----------- src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp | 4 +- src/server/game/Pools/PoolMgr.cpp | 2 +- src/server/game/Quests/QuestDef.cpp | 68 ++++++++--------- 6 files changed, 160 insertions(+), 79 deletions(-) create mode 100644 sql/updates/world/2012_03_27_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_27_02_world_misc.sql b/sql/updates/world/2012_03_27_02_world_misc.sql new file mode 100644 index 00000000000..f83a98b8100 --- /dev/null +++ b/sql/updates/world/2012_03_27_02_world_misc.sql @@ -0,0 +1,78 @@ +ALTER TABLE `instance_template` CHANGE `allowMount` `allowMount` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `ip2nation` CHANGE `ip` `ip` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `item_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `item_set_names` CHANGE `WDBVerified` `WDBVerified` smallint(6) NOT NULL DEFAULT '1'; +ALTER TABLE `item_template` CHANGE `spellcharges_1` `spellcharges_1` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_2` `spellcharges_2` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_3` `spellcharges_3` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_4` `spellcharges_4` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_5` `spellcharges_5` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `BagFamily` `BagFamily` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `TotemCategory` `TotemCategory` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketContent_1` `socketContent_1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketContent_2` `socketContent_2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketContent_3` `socketContent_3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketBonus` `socketBonus` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `GemProperties` `GemProperties` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `item_template` CHANGE `ScalingStatValue` `ScalingStatValue` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `mail_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `milling_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `npc_spellclick_spells` CHANGE `user_type` `user_type` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'relation with summoner: 0-no 1-friendly 2-raid 3-party player can click'; +ALTER TABLE `outdoorpvp_template` CHANGE `TypeId` `TypeId` tinyint(3) unsigned NOT NULL; +ALTER TABLE `page_text` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `pet_name_generation` CHANGE `half` `half` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `pickpocketing_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `player_factionchange_achievement` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_achievement` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `race_A` `race_A` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `race_H` `race_H` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_reputations` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_reputations` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_spells` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_spells` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_xp_for_level` CHANGE `lvl` `lvl` tinyint(3) unsigned NOT NULL; -- also changed from int to tinyint +ALTER TABLE `playercreateinfo_action` CHANGE `action` `action` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `playercreateinfo_item` CHANGE `amount` `amount` tinyint(4) NOT NULL DEFAULT '1'; +ALTER TABLE `playercreateinfo_spell_custom` DROP `Active`; -- delete field, it's not used anywhere +ALTER TABLE `prospecting_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `quest_poi` CHANGE `objIndex` `objIndex` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_poi_points` CHANGE `x` `x` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_poi_points` CHANGE `y` `y` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredFactionValue1` `RequiredFactionValue1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredFactionValue2` `RequiredFactionValue2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredMinRepValue` `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredMinRepValue` `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredMaxRepValue` `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `PrevQuestId` `PrevQuestId` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `NextQuestId` `NextQuestId` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `ExclusiveGroup` `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardSpellCast` `RewardSpellCast` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardHonor` `RewardHonor` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardXPId` `RewardXPId` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId1` `RewardFactionValueId1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId2` `RewardFactionValueId2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId3` `RewardFactionValueId3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId4` `RewardFactionValueId4` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId5` `RewardFactionValueId5` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride1` `RewardFactionValueIdOverride1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride2` `RewardFactionValueIdOverride2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride3` `RewardFactionValueIdOverride3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride4` `RewardFactionValueIdOverride4` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride5` `RewardFactionValueIdOverride5` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo1` `RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo2` `RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo3` `RequiredNpcOrGo3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo4` `RequiredNpcOrGo4` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `Unknown0` `Unknown0` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay1` `DetailsEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay2` `DetailsEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay3` `DetailsEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay4` `DetailsEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay1` `OfferRewardEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay2` `OfferRewardEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay3` `OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay4` `OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NOT NULL DEFAULT '1'; diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index b8eaf043b1f..0236e9450f5 100755 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -49,6 +49,7 @@ void LoadRandomEnchantmentsTable() RandomItemEnch.clear(); // for reload case + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT entry, ench, chance FROM item_enchantment_template"); if (result) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 61c47779c85..63a02378787 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1171,6 +1171,7 @@ void ObjectMgr::LoadLinkedRespawn() uint32 oldMSTime = getMSTime(); _linkedRespawnStore.clear(); + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT guid, linkedGuid, linkType FROM linked_respawn ORDER BY guid ASC"); if (!result) @@ -2730,7 +2731,8 @@ void ObjectMgr::LoadItemSetNames() if (setEntry->itemId[i]) itemSetItems.insert(setEntry->itemId[i]); } - + + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT `entry`, `name`, `InventoryType` FROM `item_set_names`"); if (!result) @@ -2757,7 +2759,7 @@ void ObjectMgr::LoadItemSetNames() ItemSetNameEntry &data = _itemSetNameStore[entry]; data.name = fields[1].GetString(); - uint32 invType = fields[2].GetUInt32(); + uint32 invType = fields[2].GetUInt8(); if (invType >= MAX_INVTYPE) { sLog->outErrorDb("Item set name (Entry: %u) has wrong InventoryType value (%u)", entry, invType); @@ -2899,7 +2901,7 @@ void ObjectMgr::LoadPetLevelInfo() uint32 oldMSTime = getMSTime(); // 0 1 2 3 4 5 6 7 8 9 - QueryResult result = WorldDatabase.Query("SELECT creature_entry, level, hp, mana, str, agi, sta, inte, spi, armor FROM pet_levelstats"); + QueryResult result = WorldDatabase.Query("SELECT creature_entry, level, hp, mana, str, agi, sta, inte, spi, armor FROM pet_levelstats"); if (!result) { @@ -2921,7 +2923,7 @@ void ObjectMgr::LoadPetLevelInfo() continue; } - uint32 current_level = fields[1].GetUInt32(); + uint32 current_level = fields[1].GetUInt8(); if (current_level > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { if (current_level > STRONG_MAX_LEVEL) // hardcoded level maximum @@ -2949,7 +2951,7 @@ void ObjectMgr::LoadPetLevelInfo() pLevelInfo->health = fields[2].GetUInt16(); pLevelInfo->mana = fields[3].GetUInt16(); - pLevelInfo->armor = fields[9].GetUInt16(); + pLevelInfo->armor = fields[9].GetUInt32(); for (int i = 0; i < MAX_STATS; i++) { @@ -3045,7 +3047,7 @@ void ObjectMgr::LoadPlayerInfo() // Load playercreate { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 4 5 6 + // 0 1 2 3 4 5 6 QueryResult result = WorldDatabase.Query("SELECT race, class, map, zone, position_x, position_y, position_z, orientation FROM playercreateinfo"); if (!result) @@ -3062,10 +3064,10 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_race = fields[0].GetUInt32(); - uint32 current_class = fields[1].GetUInt32(); - uint32 mapId = fields[2].GetUInt32(); - uint32 areaId = fields[3].GetUInt32(); + uint32 current_race = fields[0].GetUInt8(); + uint32 current_class = fields[1].GetUInt8(); + uint32 mapId = fields[2].GetUInt16(); + uint32 areaId = fields[3].GetUInt32(); // zone float positionX = fields[4].GetFloat(); float positionY = fields[5].GetFloat(); float positionZ = fields[6].GetFloat(); @@ -3150,14 +3152,14 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_race = fields[0].GetUInt32(); + uint32 current_race = fields[0].GetUInt8(); if (current_race >= MAX_RACES) { sLog->outErrorDb("Wrong race %u in `playercreateinfo_item` table, ignoring.", current_race); continue; } - uint32 current_class = fields[1].GetUInt32(); + uint32 current_class = fields[1].GetUInt8(); if (current_class >= MAX_CLASSES) { sLog->outErrorDb("Wrong class %u in `playercreateinfo_item` table, ignoring.", current_class); @@ -3172,7 +3174,7 @@ void ObjectMgr::LoadPlayerInfo() continue; } - int32 amount = fields[3].GetInt32(); + int32 amount = fields[3].GetInt8(); if (!amount) { @@ -3207,11 +3209,8 @@ void ObjectMgr::LoadPlayerInfo() { uint32 oldMSTime = getMSTime(); - QueryResult result = QueryResult(NULL); - if (sWorld->getBoolConfig(CONFIG_START_ALL_SPELLS)) - result = WorldDatabase.Query("SELECT race, class, Spell, Active FROM playercreateinfo_spell_custom"); - else - result = WorldDatabase.Query("SELECT race, class, Spell FROM playercreateinfo_spell"); + std::string tableName = sWorld->getBoolConfig(CONFIG_START_ALL_SPELLS) ? "playercreateinfo_spell_custom" : "playercreateinfo_spell"; + QueryResult result = WorldDatabase.PQuery("SELECT race, class, Spell FROM %s", tableName); if (!result) { @@ -3226,14 +3225,14 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_race = fields[0].GetUInt32(); + uint32 current_race = fields[0].GetUInt8(); if (current_race >= MAX_RACES) { sLog->outErrorDb("Wrong race %u in `playercreateinfo_spell` table, ignoring.", current_race); continue; } - uint32 current_class = fields[1].GetUInt32(); + uint32 current_class = fields[1].GetUInt8(); if (current_class >= MAX_CLASSES) { sLog->outErrorDb("Wrong class %u in `playercreateinfo_spell` table, ignoring.", current_class); @@ -3283,14 +3282,14 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_race = fields[0].GetUInt32(); + uint32 current_race = fields[0].GetUInt8(); if (current_race >= MAX_RACES) { sLog->outErrorDb("Wrong race %u in `playercreateinfo_action` table, ignoring.", current_race); continue; } - uint32 current_class = fields[1].GetUInt32(); + uint32 current_class = fields[1].GetUInt8(); if (current_class >= MAX_CLASSES) { sLog->outErrorDb("Wrong class %u in `playercreateinfo_action` table, ignoring.", current_class); @@ -3298,7 +3297,7 @@ void ObjectMgr::LoadPlayerInfo() } PlayerInfo* pInfo = &_playerInfo[current_race][current_class]; - pInfo->action.push_back(PlayerCreateInfoAction(fields[2].GetUInt8(), fields[3].GetUInt32(), fields[4].GetUInt8())); + pInfo->action.push_back(PlayerCreateInfoAction(fields[2].GetUInt16(), fields[3].GetUInt32(), fields[4].GetUInt16())); ++count; } @@ -3330,7 +3329,7 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_class = fields[0].GetUInt32(); + uint32 current_class = fields[0].GetUInt8(); if (current_class >= MAX_CLASSES) { sLog->outErrorDb("Wrong class %u in `player_classlevelstats` table, ignoring.", current_class); @@ -3411,21 +3410,21 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_race = fields[0].GetUInt32(); + uint32 current_race = fields[0].GetUInt8(); if (current_race >= MAX_RACES) { sLog->outErrorDb("Wrong race %u in `player_levelstats` table, ignoring.", current_race); continue; } - uint32 current_class = fields[1].GetUInt32(); + uint32 current_class = fields[1].GetUInt8(); if (current_class >= MAX_CLASSES) { sLog->outErrorDb("Wrong class %u in `player_levelstats` table, ignoring.", current_class); continue; } - uint32 current_level = fields[2].GetUInt32(); + uint32 current_level = fields[2].GetUInt8(); if (current_level > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { if (current_level > STRONG_MAX_LEVEL) // hardcoded level maximum @@ -3529,7 +3528,7 @@ void ObjectMgr::LoadPlayerInfo() { Field* fields = result->Fetch(); - uint32 current_level = fields[0].GetUInt32(); + uint32 current_level = fields[0].GetUInt8(); uint32 current_xp = fields[1].GetUInt32(); if (current_level >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) @@ -4419,9 +4418,8 @@ void ObjectMgr::LoadScripts(ScriptsType type) scripts->clear(); // need for reload support bool isSpellScriptTable = (type == SCRIPTS_SPELL); - char buff[125]; - sprintf(buff, "SELECT id, delay, command, datalong, datalong2, dataint, x, y, z, o%s FROM %s", isSpellScriptTable ? ", effIndex" : "", tableName.c_str()); - QueryResult result = WorldDatabase.Query(buff); + // 0 1 2 3 4 5 6 7 8 9 + QueryResult result = WorldDatabase.PQuery("SELECT id, delay, command, datalong, datalong2, dataint, x, y, z, o%s FROM %s", isSpellScriptTable ? ", effIndex" : "", tableName.c_str()); if (!result) { @@ -4976,6 +4974,7 @@ void ObjectMgr::LoadPageTexts() { uint32 oldMSTime = getMSTime(); + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT entry, text, next_page FROM page_text"); if (!result) @@ -4993,7 +4992,7 @@ void ObjectMgr::LoadPageTexts() PageText& pageText = _pageTextStore[fields[0].GetUInt32()]; pageText.Text = fields[1].GetString(); - pageText.NextPage = fields[2].GetInt16(); + pageText.NextPage = fields[2].GetUInt32(); ++count; } @@ -5054,6 +5053,7 @@ void ObjectMgr::LoadInstanceTemplate() { uint32 oldMSTime = getMSTime(); + // 0 1 2 4 QueryResult result = WorldDatabase.Query("SELECT map, parent, script, allowMount FROM instance_template"); if (!result) @@ -5105,6 +5105,7 @@ void ObjectMgr::LoadInstanceEncounters() { uint32 oldMSTime = getMSTime(); + // 0 1 2 3 QueryResult result = WorldDatabase.Query("SELECT entry, creditType, creditEntry, lastEncounterDungeon FROM instance_encounters"); if (!result) { @@ -5121,7 +5122,7 @@ void ObjectMgr::LoadInstanceEncounters() uint32 entry = fields[0].GetUInt32(); uint8 creditType = fields[1].GetUInt8(); uint32 creditEntry = fields[2].GetUInt32(); - uint32 lastEncounterDungeon = fields[3].GetUInt32(); + uint32 lastEncounterDungeon = fields[3].GetUInt16(); DungeonEncounterEntry const* dungeonEncounter = sDungeonEncounterStore.LookupEntry(entry); if (!dungeonEncounter) { @@ -5227,13 +5228,13 @@ void ObjectMgr::LoadGossipText() gText.Options[i].Text_0 = fields[cic++].GetString(); gText.Options[i].Text_1 = fields[cic++].GetString(); - gText.Options[i].Language = fields[cic++].GetUInt32(); + gText.Options[i].Language = fields[cic++].GetUInt8(); gText.Options[i].Probability = fields[cic++].GetFloat(); for (uint8 j=0; j < MAX_GOSSIP_TEXT_EMOTES; ++j) { - gText.Options[i].Emotes[j]._Delay = fields[cic++].GetUInt32(); - gText.Options[i].Emotes[j]._Emote = fields[cic++].GetUInt32(); + gText.Options[i].Emotes[j]._Delay = fields[cic++].GetUInt16(); + gText.Options[i].Emotes[j]._Emote = fields[cic++].GetUInt16(); } } } while (result->NextRow()); @@ -6638,7 +6639,7 @@ uint32 ObjectMgr::GetXPForLevel(uint8 level) void ObjectMgr::LoadPetNames() { uint32 oldMSTime = getMSTime(); - + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT word, entry, half FROM pet_name_generation"); if (!result) @@ -7003,7 +7004,7 @@ void ObjectMgr::LoadPointsOfInterest() uint32 count = 0; - // 0 1 2 3 4 5 6 + // 0 1 2 3 4 5 6 QueryResult result = WorldDatabase.Query("SELECT entry, x, y, icon, flags, data, icon_name FROM points_of_interest"); if (!result) @@ -7155,7 +7156,7 @@ void ObjectMgr::LoadNPCSpellClickSpells() if (userType >= SPELL_CLICK_USER_MAX) sLog->outErrorDb("Table npc_spellclick_spells references unknown user type %u. Skipping entry.", uint32(userType)); - uint8 castFlags = fields[2].GetUInt8(); + uint8 castFlags = fields[2].GetUInt16(); SpellClickInfo info; info.spellId = spellid; info.castFlags = castFlags; @@ -8039,6 +8040,7 @@ void ObjectMgr::LoadMailLevelRewards() _mailLevelRewardStore.clear(); // for reload case + // 0 1 2 3 QueryResult result = WorldDatabase.Query("SELECT level, raceMask, mailTemplateId, senderEntry FROM mail_level_reward"); if (!result) @@ -8200,9 +8202,9 @@ void ObjectMgr::LoadTrainerSpell() uint32 entry = fields[0].GetUInt32(); uint32 spell = fields[1].GetUInt32(); uint32 spellCost = fields[2].GetUInt32(); - uint32 reqSkill = fields[3].GetUInt32(); - uint32 reqSkillValue = fields[4].GetUInt32(); - uint32 reqLevel = fields[5].GetUInt32(); + uint32 reqSkill = fields[3].GetUInt16(); + uint32 reqSkillValue = fields[4].GetUInt16(); + uint32 reqLevel = fields[5].GetUInt8(); AddSpellToTrainer(entry, spell, spellCost, reqSkill, reqSkillValue, reqLevel); diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index 608067935ea..a079d2f643b 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -41,7 +41,7 @@ void OutdoorPvPMgr::InitOutdoorPvP() { uint32 oldMSTime = getMSTime(); - // 0 1 + // 0 1 QueryResult result = WorldDatabase.Query("SELECT TypeId, ScriptName FROM outdoorpvp_template"); if (!result) @@ -58,7 +58,7 @@ void OutdoorPvPMgr::InitOutdoorPvP() { Field* fields = result->Fetch(); - typeId = fields[0].GetUInt32(); + typeId = fields[0].GetUInt8(); if (DisableMgr::IsDisabledFor(DISABLE_TYPE_OUTDOORPVP, typeId, NULL)) continue; diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 71204f92826..5ebf78e484c 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -600,7 +600,7 @@ void PoolMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 1 2 3 + // 1 2 3 QueryResult result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_creature"); if (!result) diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 173df8dc809..debc8760ea9 100755 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -23,31 +23,31 @@ Quest::Quest(Field* questRecord) { Id = questRecord[0].GetUInt32(); - Method = questRecord[1].GetUInt32(); - Level = questRecord[2].GetInt32(); - MinLevel = questRecord[3].GetUInt32(); - MaxLevel = questRecord[4].GetUInt32(); - ZoneOrSort = questRecord[5].GetInt32(); - Type = questRecord[6].GetUInt32(); - SuggestedPlayers = questRecord[7].GetUInt32(); + Method = questRecord[1].GetUInt8(); + Level = questRecord[2].GetInt16(); + MinLevel = questRecord[3].GetUInt8(); + MaxLevel = questRecord[4].GetUInt8(); + ZoneOrSort = questRecord[5].GetInt16(); + Type = questRecord[6].GetUInt16(); + SuggestedPlayers = questRecord[7].GetUInt8(); LimitTime = questRecord[8].GetUInt32(); - RequiredClasses = questRecord[9].GetUInt32(); - RequiredRaces = questRecord[10].GetUInt32(); - RequiredSkillId = questRecord[11].GetUInt32(); - RequiredSkillPoints = questRecord[12].GetUInt32(); - RequiredFactionId1 = questRecord[13].GetUInt32(); - RequiredFactionId2 = questRecord[14].GetUInt32(); + RequiredClasses = questRecord[9].GetUInt16(); + RequiredRaces = questRecord[10].GetUInt16(); + RequiredSkillId = questRecord[11].GetUInt16(); + RequiredSkillPoints = questRecord[12].GetUInt16(); + RequiredFactionId1 = questRecord[13].GetUInt16(); + RequiredFactionId2 = questRecord[14].GetUInt16(); RequiredFactionValue1 = questRecord[15].GetInt32(); RequiredFactionValue2 = questRecord[16].GetInt32(); - RequiredMinRepFaction = questRecord[17].GetUInt32(); - RequiredMaxRepFaction = questRecord[18].GetUInt32(); + RequiredMinRepFaction = questRecord[17].GetUInt16(); + RequiredMaxRepFaction = questRecord[18].GetUInt16(); RequiredMinRepValue = questRecord[19].GetInt32(); RequiredMaxRepValue = questRecord[20].GetInt32(); PrevQuestId = questRecord[21].GetInt32(); NextQuestId = questRecord[22].GetInt32(); ExclusiveGroup = questRecord[23].GetInt32(); NextQuestIdChain = questRecord[24].GetUInt32(); - RewardXPId = questRecord[25].GetUInt32(); + RewardXPId = questRecord[25].GetUInt8(); RewardOrRequiredMoney = questRecord[26].GetInt32(); RewardMoneyMaxLevel = questRecord[27].GetUInt32(); RewardSpell = questRecord[28].GetUInt32(); @@ -57,29 +57,29 @@ Quest::Quest(Field* questRecord) RewardMailTemplateId = questRecord[32].GetUInt32(); RewardMailDelay = questRecord[33].GetUInt32(); SourceItemId = questRecord[34].GetUInt32(); - SourceItemIdCount = questRecord[35].GetUInt32(); + SourceItemIdCount = questRecord[35].GetUInt8(); SourceSpellid = questRecord[36].GetUInt32(); Flags = questRecord[37].GetUInt32(); - uint32 SpecialFlags = questRecord[38].GetUInt16(); - RewardTitleId = questRecord[39].GetUInt32(); - RequiredPlayerKills = questRecord[40].GetUInt32(); - RewardTalents = questRecord[41].GetUInt32(); - RewardArenaPoints = questRecord[42].GetInt32(); + uint32 SpecialFlags = questRecord[38].GetUInt8(); + RewardTitleId = questRecord[39].GetUInt8(); + RequiredPlayerKills = questRecord[40].GetUInt8(); + RewardTalents = questRecord[41].GetUInt8(); + RewardArenaPoints = questRecord[42].GetUInt16(); for (int i = 0; i < QUEST_REWARDS_COUNT; ++i) RewardItemId[i] = questRecord[43+i].GetUInt32(); for (int i = 0; i < QUEST_REWARDS_COUNT; ++i) - RewardItemIdCount[i] = questRecord[47+i].GetUInt32(); + RewardItemIdCount[i] = questRecord[47+i].GetUInt16(); for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i) RewardChoiceItemId[i] = questRecord[51+i].GetUInt32(); for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i) - RewardChoiceItemCount[i] = questRecord[57+i].GetUInt32(); + RewardChoiceItemCount[i] = questRecord[57+i].GetUInt16(); for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) - RewardFactionId[i] = questRecord[63+i].GetUInt32(); + RewardFactionId[i] = questRecord[63+i].GetUInt168(); for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) RewardFactionValueId[i] = questRecord[68+i].GetInt32(); @@ -87,7 +87,7 @@ Quest::Quest(Field* questRecord) for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) RewardFactionValueIdOverride[i] = questRecord[73+i].GetInt32(); - PointMapId = questRecord[78].GetUInt32(); + PointMapId = questRecord[78].GetUInt16(); PointX = questRecord[79].GetFloat(); PointY = questRecord[80].GetFloat(); PointOption = questRecord[81].GetUInt32(); @@ -103,39 +103,39 @@ Quest::Quest(Field* questRecord) RequiredNpcOrGo[i] = questRecord[89+i].GetInt32(); for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) - RequiredNpcOrGoCount[i] = questRecord[93+i].GetUInt32(); + RequiredNpcOrGoCount[i] = questRecord[93+i].GetUInt16(); for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) RequiredSourceItemId[i] = questRecord[97+i].GetUInt32(); for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) - RequiredSourceItemCount[i] = questRecord[101+i].GetUInt32(); + RequiredSourceItemCount[i] = questRecord[101+i].GetUInt16(); for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) RequiredItemId[i] = questRecord[105+i].GetUInt32(); for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) - RequiredItemCount[i] = questRecord[111+i].GetUInt32(); + RequiredItemCount[i] = questRecord[111+i].GetUInt16(); for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) RequiredSpellCast[i] = questRecord[117+i].GetUInt32(); - // int8 Unknown0 = questRecord[121].GetUInt32(); + // int8 Unknown0 = questRecord[121].GetUInt8(); for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) ObjectiveText[i] = questRecord[122+i].GetString(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) - DetailsEmote[i] = questRecord[126+i].GetUInt32(); + DetailsEmote[i] = questRecord[126+i].GetUInt16(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) DetailsEmoteDelay[i] = questRecord[130+i].GetUInt32(); - EmoteOnIncomplete = questRecord[134].GetUInt32(); - EmoteOnComplete = questRecord[135].GetUInt32(); + EmoteOnIncomplete = questRecord[134].GetUInt16(); + EmoteOnComplete = questRecord[135].GetUInt16(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) - OfferRewardEmote[i] = questRecord[136+i].GetInt32(); + OfferRewardEmote[i] = questRecord[136+i].GetInt16(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) OfferRewardEmoteDelay[i] = questRecord[140+i].GetInt32(); -- cgit v1.2.3 From 729f419af10f3fbac0d77319f7244bfbe2a443c0 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 27 Mar 2012 21:36:16 +0100 Subject: Core/DBLayer: Correct few more wrong read types (No. 4) DB/World: Some consistency in the ints "length" field (not really a length) All world dbs checked --- sql/updates/world/2012_03_27_03_world_misc.sql | 59 ++++++++++++++++++++++ src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 1 - src/server/game/Globals/ObjectMgr.cpp | 26 +++++----- .../game/Movement/Waypoints/WaypointManager.cpp | 1 + src/server/game/Scripting/ScriptSystem.cpp | 10 ++-- src/server/game/Skills/SkillDiscovery.cpp | 2 +- src/server/game/Skills/SkillExtraItems.cpp | 2 +- src/server/game/Spells/SpellMgr.cpp | 29 ++++++----- 8 files changed, 97 insertions(+), 33 deletions(-) create mode 100644 sql/updates/world/2012_03_27_03_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_27_03_world_misc.sql b/sql/updates/world/2012_03_27_03_world_misc.sql new file mode 100644 index 00000000000..aba847dbc3f --- /dev/null +++ b/sql/updates/world/2012_03_27_03_world_misc.sql @@ -0,0 +1,59 @@ +ALTER TABLE `reference_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction` `faction` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction entry'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction1` `faction1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction to give spillover for'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction2` `faction2` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction3` `faction3` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction4` `faction4` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `skinning_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `spell_area` CHANGE `quest_start_active` `quest_start_active` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_area` CHANGE `gender` `gender` tinyint(3) unsigned NOT NULL DEFAULT '2'; +ALTER TABLE `spell_area` CHANGE `autocast` `autocast` tinyint(3) unsigned NOT NULL DEFAULT '0'; +-- All the fields in spell_dbc where changed to full int32 since the DBC structure is used +ALTER TABLE `spell_dbc` CHANGE `Dispel` `Dispel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `Mechanic` `Mechanic` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `CastingTimeIndex` `CastingTimeIndex` int(10) unsigned NOT NULL DEFAULT '1'; +ALTER TABLE `spell_dbc` CHANGE `DurationIndex` `DurationIndex` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `ProcChance` `ProcChance` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `ProcCharges` `ProcCharges` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `BaseLevel` `BaseLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `MaxLevel` `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `SpellLevel` `SpellLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `RangeIndex` `RangeIndex` int(10) unsigned NOT NULL DEFAULT '1'; +ALTER TABLE `spell_dbc` CHANGE `Effect1` `Effect1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `Effect2` `Effect2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `Effect3` `Effect3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectMechanic1` `EffectMechanic1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectMechanic2` `EffectMechanic2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectMechanic3` `EffectMechanic3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA1` `EffectImplicitTargetA1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA2` `EffectImplicitTargetA2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA3` `EffectImplicitTargetA3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB1` `EffectImplicitTargetB1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB2` `EffectImplicitTargetB2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB3` `EffectImplicitTargetB3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex1` `EffectRadiusIndex1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex2` `EffectRadiusIndex2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex3` `EffectRadiusIndex3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName1` `EffectApplyAuraName1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName2` `EffectApplyAuraName2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName3` `EffectApplyAuraName3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `MaxTargetLevel` `MaxTargetLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `SpellFamilyName` `SpellFamilyName` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `MaxAffectedTargets` `MaxAffectedTargets` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `DmgClass` `DmgClass` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `PreventionType` `PreventionType` int(10) unsigned NOT NULL DEFAULT '0'; +-- +ALTER TABLE `spell_group` CHANGE `id` `id` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `spell_proc` CHANGE `spellPhaseMask` `spellPhaseMask` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_proc` CHANGE `hitMask` `hitMask` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_enchant_proc_data` CHANGE `procEx` `procEx` int(10) unsigned NOT NULL DEFAULT '0'; -- changed from float to int +ALTER TABLE `spell_required` CHANGE `spell_id` `spell_id` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_required` CHANGE `req_spell` `req_spell` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_threat` CHANGE `flatMod` `flatMod` int(11) NULL DEFAULT NULL; +ALTER TABLE `vehicle_accessory` CHANGE `seat_id` `seat_id` tinyint(4) NOT NULL DEFAULT '0'; +ALTER TABLE `vehicle_accessory` CHANGE `minion` `minion` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `vehicle_template_accessory` CHANGE `seat_id` `seat_id` tinyint(4) NOT NULL DEFAULT '0'; +ALTER TABLE `vehicle_template_accessory` CHANGE `minion` `minion` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `version` CHANGE `cache_id` `cache_id` int(11) NULL DEFAULT '0'; +ALTER TABLE `waypoint_data` CHANGE `move_flag` `move_flag` tinyint(4) NOT NULL DEFAULT '0'; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 776ffd78a9a..e3264adc310 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -198,7 +198,6 @@ void SmartAIMgr::LoadSmartAIFromDB() temp.event.raw.param4 = fields[11].GetUInt32(); temp.action.type = (SMART_ACTION)fields[12].GetUInt8(); - temp.action.raw.param1 = fields[13].GetUInt32(); temp.action.raw.param2 = fields[14].GetUInt32(); temp.action.raw.param3 = fields[15].GetUInt32(); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 63a02378787..2a92a437d72 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2804,6 +2804,7 @@ void ObjectMgr::LoadVehicleTemplateAccessories() uint32 count = 0; + // 0 1 2 3 4 5 QueryResult result = WorldDatabase.Query("SELECT `entry`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_template_accessory`"); if (!result) @@ -2860,6 +2861,7 @@ void ObjectMgr::LoadVehicleAccessories() uint32 count = 0; + // 0 1 2 3 4 5 QueryResult result = WorldDatabase.Query("SELECT `guid`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_accessory`"); if (!result) @@ -6753,7 +6755,7 @@ void ObjectMgr::LoadReputationRewardRate() _repRewardRateStore.clear(); // for reload case - uint32 count = 0; + uint32 count = 0; // 0 1 2 3 QueryResult result = WorldDatabase.Query("SELECT faction, quest_rate, creature_rate, spell_rate FROM reputation_reward_rate"); if (!result) @@ -6890,7 +6892,7 @@ void ObjectMgr::LoadReputationSpilloverTemplate() _repSpilloverTemplateStore.clear(); // for reload case - uint32 count = 0; + uint32 count = 0; // 0 1 2 3 4 5 6 7 8 9 10 11 12 QueryResult result = WorldDatabase.Query("SELECT faction, faction1, rate_1, rank_1, faction2, rate_2, rank_2, faction3, rate_3, rank_3, faction4, rate_4, rank_4 FROM reputation_spillover_template"); if (!result) @@ -6904,22 +6906,22 @@ void ObjectMgr::LoadReputationSpilloverTemplate() { Field* fields = result->Fetch(); - uint32 factionId = fields[0].GetUInt32(); + uint32 factionId = fields[0].GetUInt16(); RepSpilloverTemplate repTemplate; - repTemplate.faction[0] = fields[1].GetUInt32(); + repTemplate.faction[0] = fields[1].GetUInt16(); repTemplate.faction_rate[0] = fields[2].GetFloat(); - repTemplate.faction_rank[0] = fields[3].GetUInt32(); - repTemplate.faction[1] = fields[4].GetUInt32(); + repTemplate.faction_rank[0] = fields[3].GetUInt8(); + repTemplate.faction[1] = fields[4].GetUInt16(); repTemplate.faction_rate[1] = fields[5].GetFloat(); - repTemplate.faction_rank[1] = fields[6].GetUInt32(); - repTemplate.faction[2] = fields[7].GetUInt32(); + repTemplate.faction_rank[1] = fields[6].GetUInt8(); + repTemplate.faction[2] = fields[7].GetUInt16(); repTemplate.faction_rate[2] = fields[8].GetFloat(); - repTemplate.faction_rank[2] = fields[9].GetUInt32(); - repTemplate.faction[3] = fields[10].GetUInt32(); + repTemplate.faction_rank[2] = fields[9].GetUInt8(); + repTemplate.faction[3] = fields[10].GetUInt16(); repTemplate.faction_rate[3] = fields[11].GetFloat(); - repTemplate.faction_rank[3] = fields[12].GetUInt32(); + repTemplate.faction_rank[3] = fields[12].GetUInt8(); FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionId); @@ -7806,7 +7808,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel() { Field* fields = result->Fetch(); uint32 entry = fields[0].GetUInt32(); - int32 skill = fields[1].GetInt32(); + int32 skill = fields[1].GetInt16(); AreaTableEntry const* fArea = GetAreaEntryByAreaID(entry); if (!fArea) diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index 2c3a58f55a3..93d9e2290c1 100755 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -43,6 +43,7 @@ void WaypointMgr::Load() { uint32 oldMSTime = getMSTime(); + // 0 1 2 3 4 5 6 7 8 9 QueryResult result = WorldDatabase.Query("SELECT id, point, position_x, position_y, position_z, orientation, move_flag, delay, action, action_chance FROM waypoint_data ORDER BY id, point"); if (!result) diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 66f5a4089dc..c38d559372f 100755 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -30,7 +30,8 @@ void SystemMgr::LoadScriptTexts() sLog->outString("TSCR: Loading Script Texts additional data..."); uint32 oldMSTime = getMSTime(); - + + // 0 1 2 3 QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts"); if (!result) @@ -49,9 +50,9 @@ void SystemMgr::LoadScriptTexts() int32 iId = pFields[0].GetInt32(); temp.uiSoundId = pFields[1].GetUInt32(); - temp.uiType = pFields[2].GetUInt32(); - temp.uiLanguage = pFields[3].GetUInt32(); - temp.uiEmote = pFields[4].GetUInt32(); + temp.uiType = pFields[2].GetUInt8(); + temp.uiLanguage = pFields[3].GetUInt8(); + temp.uiEmote = pFields[4].GetUInt16(); if (iId >= 0) { @@ -164,6 +165,7 @@ void SystemMgr::LoadScriptWaypoints() sLog->outString("TSCR: Loading Script Waypoints for " UI64FMTD " creature(s)...", uiCreatureCount); + // 0 1 2 3 4 5 result = WorldDatabase.Query("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid"); if (!result) diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp index 3ece4b57741..e314fab07be 100755 --- a/src/server/game/Skills/SkillDiscovery.cpp +++ b/src/server/game/Skills/SkillDiscovery.cpp @@ -71,7 +71,7 @@ void LoadSkillDiscoveryTable() uint32 spellId = fields[0].GetUInt32(); int32 reqSkillOrSpell = fields[1].GetInt32(); - uint32 reqSkillValue = fields[2].GetUInt32(); + uint32 reqSkillValue = fields[2].GetUInt16(); float chance = fields[3].GetFloat(); if (chance <= 0) // chance diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index c68e3cdcfe0..3bb435145f1 100755 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -55,7 +55,7 @@ void LoadSkillExtraItemTable() SkillExtraItemStore.clear(); // need for reload - // 0 1 2 3 + // 0 1 2 3 QueryResult result = WorldDatabase.Query("SELECT spellId, requiredSpecialization, additionalCreateChance, additionalMaxNum FROM skill_extra_item_template"); if (!result) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 7bfb71d83d4..965f27a6456 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1163,7 +1163,7 @@ void SpellMgr::LoadSpellRanks() mSpellInfoMap[itr->first]->ChainEntry = NULL; } mSpellChains.clear(); - + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT first_spell_id, spell_id, rank from spell_ranks ORDER BY first_spell_id, rank"); if (!result) @@ -1276,6 +1276,7 @@ void SpellMgr::LoadSpellRequired() mSpellsReqSpell.clear(); // need for reload case mSpellReq.clear(); // need for reload case + // 0 1 QueryResult result = WorldDatabase.Query("SELECT spell_id, req_spell from spell_required"); if (!result) @@ -1386,10 +1387,10 @@ void SpellMgr::LoadSpellLearnSpells() { Field* fields = result->Fetch(); - uint32 spell_id = fields[0].GetUInt32(); + uint32 spell_id = fields[0].GetUInt16(); SpellLearnSpellNode node; - node.spell = fields[1].GetUInt32(); + node.spell = fields[1].GetUInt16(); node.active = fields[2].GetBool(); node.autoLearned= false; @@ -1475,7 +1476,7 @@ void SpellMgr::LoadSpellTargetPositions() mSpellTargetPositions.clear(); // need for reload case - // 0 1 2 3 4 5 + // 0 1 2 3 4 5 QueryResult result = WorldDatabase.Query("SELECT id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM spell_target_position"); if (!result) { @@ -1494,7 +1495,7 @@ void SpellMgr::LoadSpellTargetPositions() SpellTargetPosition st; - st.target_mapId = fields[1].GetUInt32(); + st.target_mapId = fields[1].GetUInt16(); st.target_X = fields[2].GetFloat(); st.target_Y = fields[3].GetFloat(); st.target_Z = fields[4].GetFloat(); @@ -1599,7 +1600,7 @@ void SpellMgr::LoadSpellGroups() uint32 count = 0; - // 0 1 + // 0 1 QueryResult result = WorldDatabase.Query("SELECT id, spell_id FROM spell_group"); if (!result) { @@ -1696,7 +1697,7 @@ void SpellMgr::LoadSpellGroupStackRules() Field* fields = result->Fetch(); uint32 group_id = fields[0].GetUInt32(); - uint8 stack_rule = fields[1].GetUInt32(); + uint8 stack_rule = fields[1].GetInt8(); if (stack_rule >= SPELL_GROUP_STACK_RULE_MAX) { sLog->outErrorDb("SpellGroupStackRule %u listed in `spell_group_stack_rules` does not exist", stack_rule); @@ -1753,8 +1754,8 @@ void SpellMgr::LoadSpellProcEvents() SpellProcEventEntry spe; - spe.schoolMask = fields[1].GetUInt32(); - spe.spellFamilyName = fields[2].GetUInt32(); + spe.schoolMask = fields[1].GetInt8(); + spe.spellFamilyName = fields[2].GetUInt16(); spe.spellFamilyMask[0] = fields[3].GetUInt32(); spe.spellFamilyMask[1] = fields[4].GetUInt32(); spe.spellFamilyMask[2] = fields[5].GetUInt32(); @@ -1793,7 +1794,7 @@ void SpellMgr::LoadSpellProcs() uint32 count = 0; - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 QueryResult result = WorldDatabase.Query("SELECT spellId, schoolMask, spellFamilyName, spellFamilyMask0, spellFamilyMask1, spellFamilyMask2, typeMask, spellTypeMask, spellPhaseMask, hitMask, attributesMask, ratePerMinute, chance, cooldown, charges FROM spell_proc"); if (!result) { @@ -1833,8 +1834,8 @@ void SpellMgr::LoadSpellProcs() SpellProcEntry baseProcEntry; - baseProcEntry.schoolMask = fields[1].GetUInt32(); - baseProcEntry.spellFamilyName = fields[2].GetUInt32(); + baseProcEntry.schoolMask = fields[1].GetInt8(); + baseProcEntry.spellFamilyName = fields[2].GetUInt16(); baseProcEntry.spellFamilyMask[0] = fields[3].GetUInt32(); baseProcEntry.spellFamilyMask[1] = fields[4].GetUInt32(); baseProcEntry.spellFamilyMask[2] = fields[5].GetUInt32(); @@ -1997,7 +1998,7 @@ void SpellMgr::LoadSpellThreats() } SpellThreatEntry ste; - ste.flatMod = fields[1].GetInt16(); + ste.flatMod = fields[1].GetInt32(); ste.pctMod = fields[2].GetFloat(); ste.apPctMod = fields[3].GetFloat(); @@ -2204,7 +2205,7 @@ void SpellMgr::LoadSpellLinked() int32 trigger = fields[0].GetInt32(); int32 effect = fields[1].GetInt32(); - int32 type = fields[2].GetInt32(); + int32 type = fields[2].GetUInt8(); SpellInfo const* spellInfo = GetSpellInfo(abs(trigger)); if (!spellInfo) -- cgit v1.2.3 From f44e6834df4278fece0ca9c419b644512de812a6 Mon Sep 17 00:00:00 2001 From: Nay Date: Wed, 28 Mar 2012 00:38:04 +0100 Subject: Core/DBLayer: Fix remaining errors in loading world tables and a couple of them in characters database Also removed World::LoadIp2nation(), it was not doing anything. Closes #5897 --- sql/updates/world/2012_03_27_04_world_misc.sql | 3 +++ src/server/game/Events/GameEventMgr.cpp | 6 +++--- src/server/game/Globals/ObjectMgr.cpp | 10 +++++----- src/server/game/Instances/InstanceSaveMgr.cpp | 2 +- .../game/Movement/Waypoints/WaypointManager.cpp | 2 +- src/server/game/World/World.cpp | 20 -------------------- src/server/game/World/World.h | 2 -- 7 files changed, 13 insertions(+), 32 deletions(-) create mode 100644 sql/updates/world/2012_03_27_04_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_27_04_world_misc.sql b/sql/updates/world/2012_03_27_04_world_misc.sql new file mode 100644 index 00000000000..e85350476c9 --- /dev/null +++ b/sql/updates/world/2012_03_27_04_world_misc.sql @@ -0,0 +1,3 @@ +ALTER TABLE `spell_dbc` CHANGE `StackAmount` `StackAmount` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `waypoint_data` CHANGE `action_chance` `action_chance` smallint(6) NOT NULL DEFAULT '100'; +ALTER TABLE `item_loot_template` CHANGE `maxcount` `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1'; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 7224007fb2c..182aaa35c49 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -283,7 +283,7 @@ void GameEventMgr::LoadFromDB() { Field* fields = result->Fetch(); - uint16 event_id = fields[0].GetUInt16(); + uint16 event_id = fields[0].GetUInt8(); if (event_id >= mGameEvent.size()) { @@ -469,7 +469,7 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); - uint16 event_id = fields[1].GetUInt16(); + uint16 event_id = fields[1].GetUInt8(); if (event_id >= mGameEventModelEquip.size()) { @@ -982,7 +982,7 @@ void GameEventMgr::Initialize() { Field* fields = result->Fetch(); - uint32 maxEventId = fields[0].GetUInt16(); + uint32 maxEventId = fields[0].GetUInt8(); // Id starts with 1 and vector with 0, thus increment maxEventId++; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 6e0a5928c02..d8107576ee4 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2820,7 +2820,7 @@ void ObjectMgr::LoadVehicleTemplateAccessories() uint32 uiEntry = fields[0].GetUInt32(); uint32 uiAccessory = fields[1].GetUInt32(); - int8 uiSeat = int8(fields[2].GetInt16()); + int8 uiSeat = int8(fields[2].GetInt8()); bool bMinion = fields[3].GetBool(); uint8 uiSummonType = fields[4].GetUInt8(); uint32 uiSummonTimer= fields[5].GetUInt32(); @@ -7154,11 +7154,11 @@ void ObjectMgr::LoadNPCSpellClickSpells() continue; } - uint8 userType = fields[3].GetUInt8(); + uint8 userType = fields[3].GetUInt16(); if (userType >= SPELL_CLICK_USER_MAX) sLog->outErrorDb("Table npc_spellclick_spells references unknown user type %u. Skipping entry.", uint32(userType)); - uint8 castFlags = fields[2].GetUInt16(); + uint8 castFlags = fields[2].GetUInt8(); SpellClickInfo info; info.spellId = spellid; info.castFlags = castFlags; @@ -8240,7 +8240,7 @@ int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, std::set *s count += LoadReferenceVendor(vendor, -item_id, skip_vendors); else { - int32 maxcount = fields[1].GetUInt8(); // tinyint(3) unsigned + int32 maxcount = fields[1].GetUInt8(); uint32 incrtime = fields[2].GetUInt32(); uint32 ExtendedCost = fields[3].GetUInt32(); @@ -8290,7 +8290,7 @@ void ObjectMgr::LoadVendors() count += LoadReferenceVendor(entry, -item_id, &skip_vendors); else { - int32 maxcount = fields[2].GetInt32(); + uint32 maxcount = fields[2].GetUInt8(); uint32 incrtime = fields[3].GetUInt32(); uint32 ExtendedCost = fields[4].GetUInt32(); diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index ca39c137274..c17c7edbf0d 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -358,7 +358,7 @@ void InstanceSaveManager::LoadResetTimes() { Field* fields = result->Fetch(); uint32 mapid = fields[0].GetUInt16(); - Difficulty difficulty = Difficulty(fields[1].GetUInt32()); + Difficulty difficulty = Difficulty(fields[1].GetUInt8()); uint64 oldresettime = fields[2].GetUInt32(); MapDifficulty const* mapDiff = GetMapDifficultyData(mapid, difficulty); diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index 93d9e2290c1..296c9eee50f 100755 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -79,7 +79,7 @@ void WaypointMgr::Load() wp->run = fields[6].GetBool(); wp->delay = fields[7].GetUInt32(); wp->event_id = fields[8].GetUInt32(); - wp->event_chance = fields[9].GetUInt8(); + wp->event_chance = fields[9].GetInt16(); path.push_back(wp); ++count; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index cb365eefbd6..489278f63e6 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1625,9 +1625,6 @@ void World::SetInitialWorldSettings() sLog->outString("Loading Autobroadcasts..."); LoadAutobroadcasts(); - sLog->outString("Loading Ip2nation..."); - LoadIp2nation(); - ///- Load and initialize scripts sObjectMgr->LoadQuestStartScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate sObjectMgr->LoadQuestEndScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate @@ -1884,23 +1881,6 @@ void World::LoadAutobroadcasts() sLog->outString(); } -void World::LoadIp2nation() -{ - uint32 oldMSTime = getMSTime(); - - QueryResult result = WorldDatabase.Query("SELECT count(c.code) FROM ip2nationCountries c, ip2nation i WHERE c.code = i.country"); - uint32 count = 0; - - if (result) - { - Field* fields = result->Fetch(); - count = fields[0].GetUInt32(); - } - - sLog->outString(">> Loaded %u ip2nation definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - sLog->outString(); -} - /// Update the World ! void World::Update(uint32 diff) { diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 1247504678a..95e9fbda8ca 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -741,8 +741,6 @@ class World void LoadAutobroadcasts(); - void LoadIp2nation(); - void UpdateAreaDependentAuras(); void ProcessStartEvent(); -- cgit v1.2.3 From 63c4d2b96eda0f7f3e7fba2a6a009b52be01cbbd Mon Sep 17 00:00:00 2001 From: click Date: Wed, 28 Mar 2012 04:33:51 +0200 Subject: Core/DB: Adjust AP-bonuses for Hunter Volley (thanks to Jildor) --- sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql b/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql new file mode 100644 index 00000000000..e150cad1c2e --- /dev/null +++ b/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql @@ -0,0 +1,2 @@ +-- Hunter Volley +UPDATE `spell_bonus_data` SET `ap_bonus`=0.0837 WHERE `entry`=42243; -- cgit v1.2.3 From b21725ecac647b0a5af79f1ef730a9cbaf5e4070 Mon Sep 17 00:00:00 2001 From: leak Date: Wed, 28 Mar 2012 16:39:59 +0200 Subject: SQL: Auth db data type cleanup `account` / Storage engine switched to InnoDB --- sql/base/auth_database.sql | 30 ++++++++++++------------- sql/updates/auth/2012_03_28_00_auth_account.sql | 13 +++++++++++ 2 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 sql/updates/auth/2012_03_28_00_auth_account.sql (limited to 'sql/updates') diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 305ba679bf2..3c851d4dac7 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.13 Distrib 5.5.21, for Win64 (x86) +-- MySQL dump 10.13 Distrib 5.5.22, for Win64 (x86) -- -- Host: localhost Database: auth -- ------------------------------------------------------ --- Server version 5.5.21 +-- Server version 5.5.22 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -23,27 +23,27 @@ DROP TABLE IF EXISTS `account`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `account` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier', + `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier', `username` varchar(32) NOT NULL DEFAULT '', `sha_pass_hash` varchar(40) NOT NULL DEFAULT '', - `sessionkey` longtext, - `v` longtext, - `s` longtext, - `email` text, + `sessionkey` varchar(80) NOT NULL DEFAULT '', + `v` varchar(64) NOT NULL DEFAULT '', + `s` varchar(64) NOT NULL DEFAULT '', + `email` varchar(254) NOT NULL DEFAULT '', `joindate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `last_ip` varchar(30) NOT NULL DEFAULT '127.0.0.1', - `failed_logins` int(11) unsigned NOT NULL DEFAULT '0', + `last_ip` varchar(15) NOT NULL DEFAULT '127.0.0.1', + `failed_logins` int(10) unsigned NOT NULL DEFAULT '0', `locked` tinyint(3) unsigned NOT NULL DEFAULT '0', `last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `online` tinyint(4) NOT NULL DEFAULT '0', + `online` tinyint(3) unsigned NOT NULL DEFAULT '0', `expansion` tinyint(3) unsigned NOT NULL DEFAULT '2', - `mutetime` bigint(40) NOT NULL DEFAULT '0', + `mutetime` bigint(20) NOT NULL DEFAULT '0', `locale` tinyint(3) unsigned NOT NULL DEFAULT '0', - `os` varchar(4) NOT NULL DEFAULT '', - `recruiter` int(11) NOT NULL DEFAULT '0', + `os` varchar(3) NOT NULL DEFAULT '', + `recruiter` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`), UNIQUE KEY `idx_username` (`username`) -) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Account System'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Account System'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -250,4 +250,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2012-03-26 18:21:51 +-- Dump completed on 2012-03-27 14:28:21 diff --git a/sql/updates/auth/2012_03_28_00_auth_account.sql b/sql/updates/auth/2012_03_28_00_auth_account.sql new file mode 100644 index 00000000000..199baac5178 --- /dev/null +++ b/sql/updates/auth/2012_03_28_00_auth_account.sql @@ -0,0 +1,13 @@ +ALTER TABLE `account` + CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Identifier', + CHANGE `sessionkey` `sessionkey` VARCHAR(80) NOT NULL DEFAULT '', + CHANGE `v` `v` VARCHAR(64) NOT NULL DEFAULT '', + CHANGE `s` `s` VARCHAR(64) NOT NULL DEFAULT '', + CHANGE `email` `email` VARCHAR(254) NOT NULL DEFAULT '', + CHANGE `last_ip` `last_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1', + CHANGE `failed_logins` `failed_logins` INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE `online` `online` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', + CHANGE `mutetime` `mutetime` BIGINT(20) NOT NULL DEFAULT '0', + CHANGE `os` `os` VARCHAR(3) NOT NULL DEFAULT '', + CHANGE `recruiter` `recruiter` INT(10) UNSIGNED NOT NULL DEFAULT '0', + ROW_FORMAT=DEFAULT ENGINE=INNODB; -- cgit v1.2.3 From a01e2a59cd2904db7c39e2b8fc40901b0926f883 Mon Sep 17 00:00:00 2001 From: leak Date: Wed, 28 Mar 2012 16:48:49 +0200 Subject: SQL: Auth db data type cleanup `account_access`, `account_banned`, `ip_banned` / Storage engine switched to InnoDB --- sql/base/auth_database.sql | 14 +++++++------- sql/updates/auth/2012_03_28_01_auth_account_access.sql | 4 ++++ sql/updates/auth/2012_03_28_02_auth_account_banned.sql | 4 ++++ sql/updates/auth/2012_03_28_03_ip_banned.sql | 2 ++ 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 sql/updates/auth/2012_03_28_01_auth_account_access.sql create mode 100644 sql/updates/auth/2012_03_28_02_auth_account_banned.sql create mode 100644 sql/updates/auth/2012_03_28_03_ip_banned.sql (limited to 'sql/updates') diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 3c851d4dac7..20bb870ff56 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -63,11 +63,11 @@ DROP TABLE IF EXISTS `account_access`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `account_access` ( - `id` int(11) unsigned NOT NULL, + `id` int(10) unsigned NOT NULL, `gmlevel` tinyint(3) unsigned NOT NULL, `RealmID` int(11) NOT NULL DEFAULT '-1', PRIMARY KEY (`id`,`RealmID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -87,14 +87,14 @@ DROP TABLE IF EXISTS `account_banned`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `account_banned` ( - `id` int(11) NOT NULL DEFAULT '0' COMMENT 'Account id', + `id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account id', `bandate` int(10) unsigned NOT NULL DEFAULT '0', `unbandate` int(10) unsigned NOT NULL DEFAULT '0', `bannedby` varchar(50) NOT NULL, `banreason` varchar(255) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', + `active` tinyint(3) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id`,`bandate`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Ban List'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Ban List'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -120,7 +120,7 @@ CREATE TABLE `ip_banned` ( `bannedby` varchar(50) NOT NULL DEFAULT '[Console]', `banreason` varchar(255) NOT NULL DEFAULT 'no reason', PRIMARY KEY (`ip`,`bandate`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Banned IPs'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Banned IPs'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -250,4 +250,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2012-03-27 14:28:21 +-- Dump completed on 2012-03-28 16:44:39 diff --git a/sql/updates/auth/2012_03_28_01_auth_account_access.sql b/sql/updates/auth/2012_03_28_01_auth_account_access.sql new file mode 100644 index 00000000000..7f79634d765 --- /dev/null +++ b/sql/updates/auth/2012_03_28_01_auth_account_access.sql @@ -0,0 +1,4 @@ +ALTER TABLE `account_access` + CHANGE `id` `id` INT(10) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; + \ No newline at end of file diff --git a/sql/updates/auth/2012_03_28_02_auth_account_banned.sql b/sql/updates/auth/2012_03_28_02_auth_account_banned.sql new file mode 100644 index 00000000000..917cea1a684 --- /dev/null +++ b/sql/updates/auth/2012_03_28_02_auth_account_banned.sql @@ -0,0 +1,4 @@ +ALTER TABLE `account_banned` + CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Account id', + CHANGE `active` `active` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_03_ip_banned.sql b/sql/updates/auth/2012_03_28_03_ip_banned.sql new file mode 100644 index 00000000000..2e754effc60 --- /dev/null +++ b/sql/updates/auth/2012_03_28_03_ip_banned.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ip_banned` + ROW_FORMAT=DEFAULT ENGINE=INNODB; -- cgit v1.2.3 From 6237ddac34fe40e851dbf052d5911aa8ef076be1 Mon Sep 17 00:00:00 2001 From: click Date: Wed, 28 Mar 2012 19:31:06 +0200 Subject: Partially revert a36a0a77ef75e66933ac5b8802a9ec7906acfd0b. Cleaning databases for old/deprecated and expired quests should never be a developers choice specifically. This should be done by admins, not developers, through the use of the already existing paramters found in the worldserver config : CleanCharacterDB / PersistentCharacterCleanFlags An adjustment to the respective questloader prepared statement has been done to accomodate for the earlier change (by not loading such quests into memory at all). Documentation for how this cleanup-procedures work already exists in the core : doc/CharacterDBCleanup.txt. --- .../characters/2012_03_01_00_characters_character_queststatus.sql | 1 - src/server/game/Entities/Player/Player.cpp | 8 +------- src/server/shared/Database/Implementation/CharacterDatabase.cpp | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql (limited to 'sql/updates') diff --git a/sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql b/sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql deleted file mode 100644 index da3a0f786b8..00000000000 --- a/sql/updates/characters/2012_03_01_00_characters_character_queststatus.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM `character_queststatus` WHERE `status`=0; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 4b57e8e8fc0..1961d5dc452 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17962,14 +17962,8 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) QuestStatusData& questStatusData = m_QuestStatus[quest_id]; uint8 qstatus = fields[1].GetUInt8(); - if (qstatus < MAX_QUEST_STATUS && qstatus > QUEST_STATUS_NONE) + if (qstatus < MAX_QUEST_STATUS) questStatusData.Status = QuestStatus(qstatus); - else if (qstatus == QUEST_STATUS_NONE) - { - sLog->outError("Player %s (GUID: %u) has QUEST_STATUS_NONE for quest %u and should be removed from character_queststatus.", - GetName(), GetGUIDLow(), quest_id); - continue; - } else { questStatusData.Status = QUEST_STATUS_INCOMPLETE; diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 3d30e97544a..a9754cfc73d 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -71,7 +71,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() "base_amount0, base_amount1, base_amount2, maxduration, remaintime, remaincharges FROM character_aura WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_SPELL, "SELECT spell, active, disabled FROM character_spell WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_QUESTSTATUS, "SELECT quest, status, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, " - "itemcount1, itemcount2, itemcount3, itemcount4, playercount FROM character_queststatus WHERE guid = ?", CONNECTION_ASYNC) + "itemcount1, itemcount2, itemcount3, itemcount4, playercount FROM character_queststatus WHERE guid = ? AND status <> 0", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_DAILYQUESTSTATUS, "SELECT quest, time FROM character_queststatus_daily WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_WEEKLYQUESTSTATUS, "SELECT quest FROM character_queststatus_weekly WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_SEASONALQUESTSTATUS, "SELECT quest, event FROM character_queststatus_seasonal WHERE guid = ?", CONNECTION_ASYNC) -- cgit v1.2.3 From 7309ee562195146220b5f048a50af15096759fd3 Mon Sep 17 00:00:00 2001 From: leak Date: Wed, 28 Mar 2012 18:37:06 +0200 Subject: SQL: Auth db data type cleanup `logs`, `realmcharacters`, `realmlist`, `uptime` / Storage engine switched to InnoDB Note: As for the redundant `uptime`.`startstring` being removed, this page might be of interest how to generate time strings from unix timestamps http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_from-unixtime --- sql/base/auth_database.sql | 37 +++++++++++----------- sql/updates/auth/2012_03_28_04_logs.sql | 5 +++ sql/updates/auth/2012_03_28_05_realmcharacters.sql | 4 +++ sql/updates/auth/2012_03_28_06_realmlist.sql | 6 ++++ sql/updates/auth/2012_03_28_07_uptime.sql | 6 ++++ src/server/authserver/Realms/RealmList.cpp | 4 +-- src/server/authserver/Realms/RealmList.h | 2 +- src/server/game/World/World.cpp | 18 +++-------- src/server/shared/Logging/Log.cpp | 2 +- 9 files changed, 48 insertions(+), 36 deletions(-) create mode 100644 sql/updates/auth/2012_03_28_04_logs.sql create mode 100644 sql/updates/auth/2012_03_28_05_realmcharacters.sql create mode 100644 sql/updates/auth/2012_03_28_06_realmlist.sql create mode 100644 sql/updates/auth/2012_03_28_07_uptime.sql (limited to 'sql/updates') diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 20bb870ff56..5803529da1e 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -140,11 +140,11 @@ DROP TABLE IF EXISTS `logs`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `logs` ( - `time` int(14) NOT NULL, - `realm` int(4) NOT NULL, - `type` int(4) NOT NULL, - `string` text -) ENGINE=MyISAM DEFAULT CHARSET=latin1; + `time` int(10) unsigned NOT NULL, + `realm` int(10) unsigned NOT NULL, + `type` tinyint(3) unsigned NOT NULL, + `string` text CHARACTER SET latin1 +) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -164,12 +164,12 @@ DROP TABLE IF EXISTS `realmcharacters`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `realmcharacters` ( - `realmid` int(11) unsigned NOT NULL DEFAULT '0', - `acctid` bigint(20) unsigned NOT NULL, + `realmid` int(10) unsigned NOT NULL DEFAULT '0', + `acctid` int(10) unsigned NOT NULL, `numchars` tinyint(3) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`realmid`,`acctid`), KEY `acctid` (`acctid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm Character Tracker'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Realm Character Tracker'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -189,19 +189,19 @@ DROP TABLE IF EXISTS `realmlist`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `realmlist` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL DEFAULT '', - `address` varchar(32) NOT NULL DEFAULT '127.0.0.1', - `port` int(11) NOT NULL DEFAULT '8085', + `address` varchar(15) NOT NULL DEFAULT '127.0.0.1', + `port` smallint(5) unsigned NOT NULL DEFAULT '8085', `icon` tinyint(3) unsigned NOT NULL DEFAULT '0', `flag` tinyint(3) unsigned NOT NULL DEFAULT '2', `timezone` tinyint(3) unsigned NOT NULL DEFAULT '0', `allowedSecurityLevel` tinyint(3) unsigned NOT NULL DEFAULT '0', `population` float unsigned NOT NULL DEFAULT '0', - `gamebuild` int(11) unsigned NOT NULL DEFAULT '12340', + `gamebuild` int(10) unsigned NOT NULL DEFAULT '12340', PRIMARY KEY (`id`), UNIQUE KEY `idx_name` (`name`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm System'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='Realm System'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -222,14 +222,13 @@ DROP TABLE IF EXISTS `uptime`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `uptime` ( - `realmid` int(11) unsigned NOT NULL, - `starttime` bigint(20) unsigned NOT NULL DEFAULT '0', - `startstring` varchar(64) NOT NULL DEFAULT '', - `uptime` bigint(20) unsigned NOT NULL DEFAULT '0', + `realmid` int(10) unsigned NOT NULL, + `starttime` int(10) unsigned NOT NULL DEFAULT '0', + `uptime` int(10) unsigned NOT NULL DEFAULT '0', `maxplayers` smallint(5) unsigned NOT NULL DEFAULT '0', `revision` varchar(255) NOT NULL DEFAULT 'Trinitycore', PRIMARY KEY (`realmid`,`starttime`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Uptime system'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -250,4 +249,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2012-03-28 16:44:39 +-- Dump completed on 2012-03-28 18:26:06 diff --git a/sql/updates/auth/2012_03_28_04_logs.sql b/sql/updates/auth/2012_03_28_04_logs.sql new file mode 100644 index 00000000000..4c837a47ed1 --- /dev/null +++ b/sql/updates/auth/2012_03_28_04_logs.sql @@ -0,0 +1,5 @@ +ALTER TABLE `logs` + CHANGE `time` `time` INT(10) UNSIGNED NOT NULL, + CHANGE `realm` `realm` INT(10) UNSIGNED NOT NULL, + CHANGE `type` `type` TINYINT(3) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_05_realmcharacters.sql b/sql/updates/auth/2012_03_28_05_realmcharacters.sql new file mode 100644 index 00000000000..e50b3c3f331 --- /dev/null +++ b/sql/updates/auth/2012_03_28_05_realmcharacters.sql @@ -0,0 +1,4 @@ +ALTER TABLE `realmcharacters` + CHANGE `realmid` `realmid` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `acctid` `acctid` INT(10) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_06_realmlist.sql b/sql/updates/auth/2012_03_28_06_realmlist.sql new file mode 100644 index 00000000000..e5e7b2e00d4 --- /dev/null +++ b/sql/updates/auth/2012_03_28_06_realmlist.sql @@ -0,0 +1,6 @@ +ALTER TABLE `realmlist` + CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + CHANGE `address` `address` VARCHAR(15) DEFAULT '127.0.0.1' NOT NULL, + CHANGE `port` `port` SMALLINT(5) UNSIGNED DEFAULT '8085' NOT NULL, + CHANGE `gamebuild` `gamebuild` INT(10) UNSIGNED DEFAULT '12340' NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; \ No newline at end of file diff --git a/sql/updates/auth/2012_03_28_07_uptime.sql b/sql/updates/auth/2012_03_28_07_uptime.sql new file mode 100644 index 00000000000..0ea4e3321df --- /dev/null +++ b/sql/updates/auth/2012_03_28_07_uptime.sql @@ -0,0 +1,6 @@ +ALTER TABLE `uptime` + DROP COLUMN `startstring`, + CHANGE `realmid` `realmid` INT(10) UNSIGNED NOT NULL, + CHANGE `starttime` `starttime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `uptime` `uptime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp index efcced51089..f856156825d 100755 --- a/src/server/authserver/Realms/RealmList.cpp +++ b/src/server/authserver/Realms/RealmList.cpp @@ -31,7 +31,7 @@ void RealmList::Initialize(uint32 updateInterval) UpdateRealms(true); } -void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build) +void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build) { // Create new if not exist or update existed Realm& realm = m_realms[name]; @@ -82,7 +82,7 @@ void RealmList::UpdateRealms(bool init) uint32 realmId = fields[0].GetUInt32(); const std::string& name = fields[1].GetString(); const std::string& address = fields[2].GetString(); - uint32 port = fields[3].GetUInt32(); + uint16 port = fields[3].GetUInt16(); uint8 icon = fields[4].GetUInt8(); RealmFlags flag = RealmFlags(fields[5].GetUInt8()); uint8 timezone = fields[6].GetUInt8(); diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h index 4d258953ae0..c8407b0fea1 100755 --- a/src/server/authserver/Realms/RealmList.h +++ b/src/server/authserver/Realms/RealmList.h @@ -71,7 +71,7 @@ public: private: void UpdateRealms(bool init=false); - void UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build); + void UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build); RealmMap m_realms; uint32 m_UpdateInterval; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 489278f63e6..9683d847f86 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1669,18 +1669,10 @@ void World::SetInitialWorldSettings() ///- Initialize game time and timers sLog->outString("Initialize game time and timers"); m_gameTime = time(NULL); - m_startTime=m_gameTime; - - tm local; - time_t curr; - time(&curr); - local=*(localtime(&curr)); // dereference and assign - char isoDate[128]; - sprintf(isoDate, "%04d-%02d-%02d %02d:%02d:%02d", - local.tm_year+1900, local.tm_mon+1, local.tm_mday, local.tm_hour, local.tm_min, local.tm_sec); + m_startTime = m_gameTime; - LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, startstring, uptime, revision) VALUES('%u', " UI64FMTD ", '%s', 0, '%s')", - realmID, uint64(m_startTime), isoDate, _FULLVERSION); // One-time query + LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES(%u, %u, '%s', 0, '%s')", + realmID, uint32(m_startTime), _FULLVERSION); // One-time query m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS); m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILLISECONDS); @@ -1965,10 +1957,10 @@ void World::Update(uint32 diff) PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_UPTIME_PLAYERS); - stmt->setUInt64(0, uint64(tmpDiff)); + stmt->setUInt32(0, tmpDiff); stmt->setUInt16(1, uint16(maxOnlinePlayers)); stmt->setUInt32(2, realmID); - stmt->setUInt64(3, uint64(m_startTime)); + stmt->setUInt32(3, uint32(m_startTime)); LoginDatabase.Execute(stmt); } diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index a9bb282cf86..0a53706fea2 100755 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -382,7 +382,7 @@ void Log::outDB(LogTypes type, const char * str) PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG); stmt->setInt32(0, realm); - stmt->setInt32(1, type); + stmt->setUInt8(1, uint8(type)); stmt->setString(2, logStr); LoginDatabase.Execute(stmt); -- cgit v1.2.3 From 4bead55dcd50f13bf065841ed3eb3c46cb7b4c37 Mon Sep 17 00:00:00 2001 From: leak Date: Wed, 28 Mar 2012 19:51:13 +0200 Subject: SQL: Proper prefixing --- sql/updates/auth/2012_03_28_03_auth_ip_banned.sql | 2 ++ sql/updates/auth/2012_03_28_03_ip_banned.sql | 2 -- sql/updates/auth/2012_03_28_04_auth_logs.sql | 5 +++++ sql/updates/auth/2012_03_28_04_logs.sql | 5 ----- sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql | 4 ++++ sql/updates/auth/2012_03_28_05_realmcharacters.sql | 4 ---- sql/updates/auth/2012_03_28_06_auth_realmlist.sql | 6 ++++++ sql/updates/auth/2012_03_28_06_realmlist.sql | 6 ------ sql/updates/auth/2012_03_28_07_auth_uptime.sql | 6 ++++++ sql/updates/auth/2012_03_28_07_uptime.sql | 6 ------ 10 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 sql/updates/auth/2012_03_28_03_auth_ip_banned.sql delete mode 100644 sql/updates/auth/2012_03_28_03_ip_banned.sql create mode 100644 sql/updates/auth/2012_03_28_04_auth_logs.sql delete mode 100644 sql/updates/auth/2012_03_28_04_logs.sql create mode 100644 sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql delete mode 100644 sql/updates/auth/2012_03_28_05_realmcharacters.sql create mode 100644 sql/updates/auth/2012_03_28_06_auth_realmlist.sql delete mode 100644 sql/updates/auth/2012_03_28_06_realmlist.sql create mode 100644 sql/updates/auth/2012_03_28_07_auth_uptime.sql delete mode 100644 sql/updates/auth/2012_03_28_07_uptime.sql (limited to 'sql/updates') diff --git a/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql b/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql new file mode 100644 index 00000000000..2e754effc60 --- /dev/null +++ b/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ip_banned` + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_03_ip_banned.sql b/sql/updates/auth/2012_03_28_03_ip_banned.sql deleted file mode 100644 index 2e754effc60..00000000000 --- a/sql/updates/auth/2012_03_28_03_ip_banned.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `ip_banned` - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_04_auth_logs.sql b/sql/updates/auth/2012_03_28_04_auth_logs.sql new file mode 100644 index 00000000000..4c837a47ed1 --- /dev/null +++ b/sql/updates/auth/2012_03_28_04_auth_logs.sql @@ -0,0 +1,5 @@ +ALTER TABLE `logs` + CHANGE `time` `time` INT(10) UNSIGNED NOT NULL, + CHANGE `realm` `realm` INT(10) UNSIGNED NOT NULL, + CHANGE `type` `type` TINYINT(3) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_04_logs.sql b/sql/updates/auth/2012_03_28_04_logs.sql deleted file mode 100644 index 4c837a47ed1..00000000000 --- a/sql/updates/auth/2012_03_28_04_logs.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE `logs` - CHANGE `time` `time` INT(10) UNSIGNED NOT NULL, - CHANGE `realm` `realm` INT(10) UNSIGNED NOT NULL, - CHANGE `type` `type` TINYINT(3) UNSIGNED NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql b/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql new file mode 100644 index 00000000000..e50b3c3f331 --- /dev/null +++ b/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql @@ -0,0 +1,4 @@ +ALTER TABLE `realmcharacters` + CHANGE `realmid` `realmid` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `acctid` `acctid` INT(10) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_05_realmcharacters.sql b/sql/updates/auth/2012_03_28_05_realmcharacters.sql deleted file mode 100644 index e50b3c3f331..00000000000 --- a/sql/updates/auth/2012_03_28_05_realmcharacters.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `realmcharacters` - CHANGE `realmid` `realmid` INT(10) UNSIGNED DEFAULT 0 NOT NULL, - CHANGE `acctid` `acctid` INT(10) UNSIGNED NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_06_auth_realmlist.sql b/sql/updates/auth/2012_03_28_06_auth_realmlist.sql new file mode 100644 index 00000000000..e5e7b2e00d4 --- /dev/null +++ b/sql/updates/auth/2012_03_28_06_auth_realmlist.sql @@ -0,0 +1,6 @@ +ALTER TABLE `realmlist` + CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + CHANGE `address` `address` VARCHAR(15) DEFAULT '127.0.0.1' NOT NULL, + CHANGE `port` `port` SMALLINT(5) UNSIGNED DEFAULT '8085' NOT NULL, + CHANGE `gamebuild` `gamebuild` INT(10) UNSIGNED DEFAULT '12340' NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; \ No newline at end of file diff --git a/sql/updates/auth/2012_03_28_06_realmlist.sql b/sql/updates/auth/2012_03_28_06_realmlist.sql deleted file mode 100644 index e5e7b2e00d4..00000000000 --- a/sql/updates/auth/2012_03_28_06_realmlist.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE `realmlist` - CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, - CHANGE `address` `address` VARCHAR(15) DEFAULT '127.0.0.1' NOT NULL, - CHANGE `port` `port` SMALLINT(5) UNSIGNED DEFAULT '8085' NOT NULL, - CHANGE `gamebuild` `gamebuild` INT(10) UNSIGNED DEFAULT '12340' NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; \ No newline at end of file diff --git a/sql/updates/auth/2012_03_28_07_auth_uptime.sql b/sql/updates/auth/2012_03_28_07_auth_uptime.sql new file mode 100644 index 00000000000..0ea4e3321df --- /dev/null +++ b/sql/updates/auth/2012_03_28_07_auth_uptime.sql @@ -0,0 +1,6 @@ +ALTER TABLE `uptime` + DROP COLUMN `startstring`, + CHANGE `realmid` `realmid` INT(10) UNSIGNED NOT NULL, + CHANGE `starttime` `starttime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `uptime` `uptime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_07_uptime.sql b/sql/updates/auth/2012_03_28_07_uptime.sql deleted file mode 100644 index 0ea4e3321df..00000000000 --- a/sql/updates/auth/2012_03_28_07_uptime.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE `uptime` - DROP COLUMN `startstring`, - CHANGE `realmid` `realmid` INT(10) UNSIGNED NOT NULL, - CHANGE `starttime` `starttime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, - CHANGE `uptime` `uptime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; -- cgit v1.2.3 From a14aa3758593c903d024199f70df4d7a4cd72c0f Mon Sep 17 00:00:00 2001 From: leak Date: Wed, 28 Mar 2012 21:34:26 +0200 Subject: Core/DBLayer: Fix value list from recent changes --- sql/updates/auth/2012_03_28_01_auth_account_access.sql | 1 - sql/updates/auth/2012_03_28_06_auth_realmlist.sql | 2 +- src/server/game/World/World.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/auth/2012_03_28_01_auth_account_access.sql b/sql/updates/auth/2012_03_28_01_auth_account_access.sql index 7f79634d765..456dbf6c104 100644 --- a/sql/updates/auth/2012_03_28_01_auth_account_access.sql +++ b/sql/updates/auth/2012_03_28_01_auth_account_access.sql @@ -1,4 +1,3 @@ ALTER TABLE `account_access` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL, ROW_FORMAT=DEFAULT ENGINE=INNODB; - \ No newline at end of file diff --git a/sql/updates/auth/2012_03_28_06_auth_realmlist.sql b/sql/updates/auth/2012_03_28_06_auth_realmlist.sql index e5e7b2e00d4..725702a9803 100644 --- a/sql/updates/auth/2012_03_28_06_auth_realmlist.sql +++ b/sql/updates/auth/2012_03_28_06_auth_realmlist.sql @@ -3,4 +3,4 @@ ALTER TABLE `realmlist` CHANGE `address` `address` VARCHAR(15) DEFAULT '127.0.0.1' NOT NULL, CHANGE `port` `port` SMALLINT(5) UNSIGNED DEFAULT '8085' NOT NULL, CHANGE `gamebuild` `gamebuild` INT(10) UNSIGNED DEFAULT '12340' NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; \ No newline at end of file + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 9683d847f86..f4eff49f439 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1671,7 +1671,7 @@ void World::SetInitialWorldSettings() m_gameTime = time(NULL); m_startTime = m_gameTime; - LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES(%u, %u, '%s', 0, '%s')", + LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES(%u, %u, 0, '%s')", realmID, uint32(m_startTime), _FULLVERSION); // One-time query m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS); -- cgit v1.2.3 From 7efb63725853b7c2221a800bf6204dcf5635c63c Mon Sep 17 00:00:00 2001 From: click Date: Sat, 31 Mar 2012 04:59:58 +0200 Subject: DB/Quest: Add SAI-script for quests - thanks to Unholy and Redsonja for recreating the SQL. Closes #1448, #3812, #4312, #385. --- .../world/2012_03_30_00_world_smart_scripts.sql | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 sql/updates/world/2012_03_30_00_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_30_00_world_smart_scripts.sql b/sql/updates/world/2012_03_30_00_world_smart_scripts.sql new file mode 100644 index 00000000000..08d4ee90168 --- /dev/null +++ b/sql/updates/world/2012_03_30_00_world_smart_scripts.sql @@ -0,0 +1,95 @@ +-- revised from Unholys original works +-- quest 12702 chicken party! +-- quest 12532 flown the coop! +-- +SET @ENTRY := 28161; -- the chicken +SET @PARTY := 12702; -- chicken party quest +SET @COOP := 12532; -- flown the coop quest +SET @LIFE := 900000; -- minutes + +-- set up required spells for the spells to work as they should +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@ENTRY; +INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES +(@ENTRY,39996,1,0), -- cover spell (dummy) +(@ENTRY,51037,2,0); -- creates item in players back pack + +-- set npc up to use event script +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; + +-- convert over to smart script +DELETE FROM `creature_ai_scripts` WHERE `id`=@ENTRY; -- delete old eai scripts +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,0,1000,1000,2000,3000,89,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'create random movement every 2-3 secs'), +(@ENTRY,0,1,0,8,0,100,0,51951,0,0,0,11,50839,0,0,0,0,0,1,0,0,0,0,0,0,0, 'when hit with net cast self stun'), +(@ENTRY,0,2,0,8,0,100,0,39996,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'force despawn @1 sec when hit with dummy spell'); + +-- Remove previous scripts that may interfere with this work +DELETE FROM `quest_start_scripts` WHERE `id` IN (@PARTY,@COOP); + +-- start script for quest chicken party (they do not all spawn at same time) +UPDATE `quest_template` SET `StartScript`=@PARTY WHERE `id`=@PARTY; -- 12072 +INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(@PARTY,1,10,@ENTRY,@LIFE, 0,5251.09,4413.76,-96.086,4.8714), +(@PARTY,2,10,@ENTRY,@LIFE, 0,5251.22,4419.74,-95.8995,3.58335), +(@PARTY,23,10,@ENTRY,@LIFE, 0,5257.58,4421.77,-95.9072,2.62124), +(@PARTY,4,10,@ENTRY,@LIFE,0, 5255.97,4420.37,-95.9999,0.0451326), +(@PARTY,5,10,@ENTRY,@LIFE,0, 5256.78,4420.63,-95.9957,0.320021), +(@PARTY,6,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,0.956194), +(@PARTY,27,10,@ENTRY,@LIFE,0, 5258.54,4420.49,-96.0195,0.551714), +(@PARTY,8,10,@ENTRY,@LIFE,0, 5250.67,4417.98,-95.9787,4.39231), +(@PARTY,9,10,@ENTRY,@LIFE,0, 5273.53,4430.32,-96.0241,1.0897), +(@PARTY,40,10,@ENTRY,@LIFE,0, 5158.3,4605.25,-130.988,3.7522), +(@PARTY,21,10,@ENTRY,@LIFE,0, 5164.6,4609.43,-130.427,3.70115), +(@PARTY,22,10,@ENTRY,@LIFE,0, 5169.53,4612.44,-130.817,4.05065), +(@PARTY,23,10,@ENTRY,@LIFE,0, 5188.49,4627.85,-132.485,3.60691), +(@PARTY,44,10,@ENTRY,@LIFE,0, 5203.19,4631.63,-132.611,2.849), +(@PARTY,25,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.378917), +(@PARTY,26,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.66166), +(@PARTY,27,10,@ENTRY,@LIFE,0, 5203.5,4595.02,-111.327,5.51542), +(@PARTY,48,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,0.579192), +(@PARTY,29,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,1.09756), +(@PARTY,30,10,@ENTRY,@LIFE,0, 5172.43,4533.25,-97.3836,1.15253), +(@PARTY,41,10,@ENTRY,@LIFE,0, 5186.29,4522.69,-91.0957,3.02571), +(@PARTY,32,10,@ENTRY,@LIFE,0, 5214.67,4485.22,-91.3113,2.40524), +(@PARTY,33,10,@ENTRY,@LIFE,0, 5221.85,4475.99,-96.8801,4.89495), +(@PARTY,34,10,@ENTRY,@LIFE,0, 5222.95,4438.1,-96.8062,1.6277), +(@PARTY,35,10,@ENTRY,@LIFE,0, 5224.36,4427.83,-96.9221,2.63301), +(@PARTY,36,10,@ENTRY,@LIFE,0, 5234.72,4406.44,-95.2917,0.0647549), +(@PARTY,47,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,3.79933), +(@PARTY,38,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,4.29414), +(@PARTY,39,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,3.90536), +(@PARTY,40,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,4.36089); + +-- start script for quest flown the coop (they do not all spawn at same time) +UPDATE `quest_template` SET `StartScript`=@COOP WHERE `id`=@COOP; -- 12532 +INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(@COOP,23,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,2.62124), +(@COOP,4,10,@ENTRY,@LIFE,0, 5255.97,4420.37,-95.9999,0.0451326), +(@COOP,5,10,@ENTRY,@LIFE,0, 5256.78,4420.63,-95.9957,0.320021), +(@COOP,6,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,0.956194), +(@COOP,27,10,@ENTRY,@LIFE,0, 5258.54,4420.49,-96.0195,0.551714), +(@COOP,8,10,@ENTRY,@LIFE,0, 5250.67,4417.98,-95.9787,4.39231), +(@COOP,9,10,@ENTRY,@LIFE,0, 5273.53,4430.32,-96.0241,1.0897), +(@COOP,40,10,@ENTRY,@LIFE,0, 5158.3,4605.25,-130.988,3.7522), +(@COOP,21,10,@ENTRY,@LIFE,0, 5164.6,4609.43,-130.427,3.70115), +(@COOP,22,10,@ENTRY,@LIFE,0, 5169.53,4612.44,-130.817,4.05065), +(@COOP,23,10,@ENTRY,@LIFE,0, 5188.49,4627.85,-132.485,3.60691), +(@COOP,44,10,@ENTRY,@LIFE,0, 5203.19,4631.63,-132.611,2.849), +(@COOP,25,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.378917), +(@COOP,26,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.66166), +(@COOP,27,10,@ENTRY,@LIFE,0, 5203.5,4595.02,-111.327,5.51542), +(@COOP,48,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,0.579192), +(@COOP,29,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,1.09756), +(@COOP,30,10,@ENTRY,@LIFE,0, 5172.43,4533.25,-97.3836,1.15253), +(@COOP,41,10,@ENTRY,@LIFE,0, 5186.29,4522.69,-91.0957,3.02571), +(@COOP,32,10,@ENTRY,@LIFE,0, 5214.67,4485.22,-91.3113,2.40524), +(@COOP,33,10,@ENTRY,@LIFE,0, 5221.85,4475.99,-96.8801,4.89495), +(@COOP,34,10,@ENTRY,@LIFE,0, 5222.95,4438.1,-96.8062,1.6277), +(@COOP,35,10,@ENTRY,@LIFE,0, 5224.36,4427.83,-96.9221,2.63301), +(@COOP,36,10,@ENTRY,@LIFE,0, 5234.72,4406.44,-95.2917,0.0647549), +(@COOP,47,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,3.79933), +(@COOP,38,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,4.29414), +(@COOP,39,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,3.90536), +(@COOP,40,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,4.36089); + -- cgit v1.2.3 From 343a93a56f48ba760c0a38cd45cc597955883bff Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 31 Mar 2012 19:20:38 +0200 Subject: DB/Loot: Antechamber of Ulduar reworked --- .../2012_03_31_00_world_creature_loot_template.sql | 191 +++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 sql/updates/world/2012_03_31_00_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql b/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql new file mode 100644 index 00000000000..a817cdccf50 --- /dev/null +++ b/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql @@ -0,0 +1,191 @@ +-- ------------------------------- +-- -- The Antechamber of Ulduar -- +-- ------------------------------- +-- Creatures +SET @Brundir10 :=32857; +call `sp_get_npc_diffentry`(@Brundir10,1,@Brundir25); -- Get 25man id using procedure +SET @Molgeim10 :=32927; +call `sp_get_npc_diffentry`(@Molgeim10,1,@Molgeim25); -- Get 25man id using procedure +SET @Steelbreaker10 :=32867; +call `sp_get_npc_diffentry`(@Steelbreaker10,1,@Steelbreaker25); -- Get 25man id using procedure +SET @Auriaya10 :=33515; +call `sp_get_npc_diffentry`(@Auriaya10,1,@Auriaya25); -- Get 25man id using procedure +-- Gameobjects +SET @Kologarn10 := 195046; -- Cache of the Living Stone 10man +CALL `sp_get_go_lootid`(@Kologarn10,@CacheLivingStone10); -- Get Lootid from data1 field using procedure +SET @Kologarn25 := 195047; -- Cache of the Living Stone 25man +CALL `sp_get_go_lootid`(@Kologarn25,@CacheLivingStone25); -- Get Lootid from data1 field using procedure +-- bosses +SET @Assembly10Ref := 34359; +SET @Assembly25Ref := @Assembly10Ref+1; +SET @Kologarn10Ref := @Assembly10Ref+2; +SET @Kologarn25Ref := @Assembly10Ref+3; +SET @Auriaya10Ref := @Assembly10Ref+4; +SET @Auriaya25Ref := @Assembly10Ref+5; + +-- ------------------------------ +-- -- Reference Loot Templates -- +-- ------------------------------ +-- Delete previous templates if existing +DELETE FROM `reference_loot_template` WHERE `entry` IN (12019,34122,34123,34124,34163,34216); +-- Delete the current if existing & add +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Assembly10Ref AND @Assembly10Ref+5; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Assembly Of Iron 10man +(@Assembly10Ref,45322,0,1,1,1,1), -- Cloak of the Iron Council +(@Assembly10Ref,45324,0,1,1,1,1), -- Leggings of Swift Reflexes +(@Assembly10Ref,45329,0,1,1,1,1), -- Circlet of True Sight +(@Assembly10Ref,45330,0,1,1,1,1), -- Greaves of Iron Intensity +(@Assembly10Ref,45331,0,1,1,1,1), -- Rune-Etched Nightblade +(@Assembly10Ref,45332,0,1,1,1,1), -- Stormtip +(@Assembly10Ref,45333,0,1,1,1,1), -- Belt of the Iron Servant +(@Assembly10Ref,45378,0,1,1,1,1), -- Boots of the Petrified Forest +(@Assembly10Ref,45418,0,1,1,1,1), -- Lady Maye's Sapphire Ring +(@Assembly10Ref,45423,0,1,1,1,1), -- Runetouch Wristwraps +-- Assembly Of Iron 25man +(@Assembly25Ref,45233,0,1,1,1,1), -- Stormrune Edge +(@Assembly25Ref,45234,0,1,1,1,1), -- Rapture +(@Assembly25Ref,45237,0,1,1,1,1), -- Phaelia's Vestments of the Sprouting Seed +(@Assembly25Ref,45193,0,1,1,1,1), -- Insurmountable Fervor +(@Assembly25Ref,45236,0,1,1,1,1), -- Unblinking Eye +(@Assembly25Ref,45225,0,1,1,1,1), -- Steelbreaker's Embrace +(@Assembly25Ref,45240,0,1,1,1,1), -- Raiments of the Iron Council +(@Assembly25Ref,45226,0,1,1,1,1), -- Ancient Iron Heaume +(@Assembly25Ref,45235,0,1,1,1,1), -- Radiant Seal +(@Assembly25Ref,45227,0,1,1,1,1), -- Iron-studded Mantle +(@Assembly25Ref,45239,0,1,1,1,1), -- Runeshaper's Gloves +(@Assembly25Ref,45224,0,1,1,1,1), -- Drape of the Lithe +(@Assembly25Ref,45232,0,1,1,1,1), -- Runed Ironhide Boots +(@Assembly25Ref,45228,0,1,1,1,1), -- Handguards of the Enclave +(@Assembly25Ref,45238,0,1,1,1,1), -- Overload Legwraps +-- Cache of Living Stone 10man +(@Kologarn10Ref,45701,0,1,1,1,1), -- Greaves of the Earthbinder +(@Kologarn10Ref,45965,0,1,1,1,1), -- Spire of Withering Dreams +(@Kologarn10Ref,45702,0,1,1,1,1), -- Emerald Signet Ring +(@Kologarn10Ref,45696,0,1,1,1,1), -- Mark of the Unyielding +(@Kologarn10Ref,45698,0,1,1,1,1), -- Sabatons of the Iron Watcher +(@Kologarn10Ref,45697,0,1,1,1,1), -- Shoulderguards of the Solemn Watch +(@Kologarn10Ref,45703,0,2,2,1,1), -- Spark of Hope +(@Kologarn10Ref,45700,0,2,2,1,1), -- Stoneguard +(@Kologarn10Ref,45699,0,2,2,1,1), -- Pendant of the Piercing Glare +(@Kologarn10Ref,45704,0,2,2,1,1), -- Shawl of the Shattered Giant +-- Cache of Living Stone 25man +(@Kologarn25Ref,45261,0,1,1,1,1), -- Giant's Bane +(@Kologarn25Ref,45266,0,1,1,1,1), -- Malice +(@Kologarn25Ref,45274,0,1,1,1,1), -- Leggings of the Stoneweaver +(@Kologarn25Ref,45269,0,1,1,1,1), -- Unfaltering Armguards +(@Kologarn25Ref,45268,0,1,1,1,1), -- Gloves of the Pythonic Guardian +(@Kologarn25Ref,45262,0,1,1,1,1), -- Necklace of Unerring Mettle +(@Kologarn25Ref,45275,0,1,1,1,1), -- Bracers of Unleashed Magic +(@Kologarn25Ref,45272,0,1,1,1,1), -- Robes of the Umbral Brute +(@Kologarn25Ref,45267,0,1,1,1,1), -- Saronite Plated Legguards +(@Kologarn25Ref,45263,0,1,1,1,1), -- Wrathstone +(@Kologarn25Ref,45271,0,1,1,1,1), -- Ironmender +(@Kologarn25Ref,45264,0,1,1,1,1), -- Decimator's Armguards +(@Kologarn25Ref,45265,0,1,1,1,1), -- Shoulderpads of the Monolith +(@Kologarn25Ref,45273,0,1,1,1,1), -- Handwraps of Plentiful Recovery +(@Kologarn25Ref,45270,0,1,1,1,1), -- Idol of the Crying Wind +-- Auriaya 10man +(@Auriaya10Ref,45707,0,1,1,1,1), -- Shieldwall of the Breaker +(@Auriaya10Ref,45708,0,1,1,1,1), -- Archaedas' Lost Legplates +(@Auriaya10Ref,45709,0,1,1,1,1), -- Nimble Climber's Belt +(@Auriaya10Ref,45711,0,1,1,1,1), -- Ironaya's Discarded Mantle +(@Auriaya10Ref,45712,0,1,1,1,1), -- Chestplate of Titanic Fury +(@Auriaya10Ref,45713,0,1,1,1,1), -- Nurturing Touch +(@Auriaya10Ref,45832,0,1,1,1,1), -- Mantle of the Preserver +(@Auriaya10Ref,45864,0,1,1,1,1), -- Cover of the Keepers +(@Auriaya10Ref,45865,0,1,1,1,1), -- Raiments of the Corrupted +(@Auriaya10Ref,45866,0,1,1,1,1), -- Elemental Focus Stone +-- Auriaya 25man +(@Auriaya25Ref,45327,0,1,1,1,1), -- Siren's Cry +(@Auriaya25Ref,45437,0,1,1,1,1), -- Runescribed Blade +(@Auriaya25Ref,45315,0,1,1,1,1), -- Stonerender +(@Auriaya25Ref,45439,0,1,1,1,1), -- Unwavering Stare +(@Auriaya25Ref,45326,0,1,1,1,1), -- Platinum Band of the Aesir +(@Auriaya25Ref,45441,0,1,1,1,1), -- Sandals of the Ancient Keeper +(@Auriaya25Ref,45435,0,1,1,1,1), -- Cowl of the Absolute +(@Auriaya25Ref,45438,0,1,1,1,1), -- Ring of the Faithful Servant +(@Auriaya25Ref,45434,0,1,1,1,1), -- Greaves of the Rockmender +(@Auriaya25Ref,45320,0,1,1,1,1), -- Shoulderplates of the Eternal +(@Auriaya25Ref,45325,0,1,1,1,1), -- Gloves of the Stonereaper +(@Auriaya25Ref,45440,0,1,1,1,1), -- Amice of the Stoic Watch +(@Auriaya25Ref,45334,0,1,1,1,1), -- Unbreakable Chestguard +(@Auriaya25Ref,45319,0,1,1,1,1), -- Cloak of the Makers +(@Auriaya25Ref,45436,0,1,1,1,1); -- Libram of the Resolute + +-- --------------------------- +-- -- ASSIGN CREATURE LOOTS -- +-- --------------------------- +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (@Brundir10,@Molgeim10,@Steelbreaker10,@Brundir25,@Molgeim25,@Steelbreaker25,@Auriaya10,@Auriaya25); +DELETE FROM `creature_loot_template` WHERE `entry` IN (@Brundir10,@Molgeim10,@Steelbreaker10,@Brundir25,@Molgeim25,@Steelbreaker25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ASSEMBLY OF IRON 10-man +-- Stormcaller Brundir killed last +(@Brundir10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot +(@Brundir10,47241,100,1,0,1,1), -- 1 Emblem of Triumph +-- Runemaster Molgeim killed last +(@Molgeim10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot +(@Molgeim10,47241,100,1,0,2,2), -- 2 Emblem of Triumph +(@Molgeim10,45506,100,2,0,1,1), -- Archivum Data Disc +(@Molgeim10,45087,75,1,0,1,1), -- Runed Orb +-- Steelbreaker killed last +(@Steelbreaker10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot +(@Steelbreaker10,47241,100,1,0,2,2), -- 2 Emblem of Triumph +(@Steelbreaker10,45087,75,1,0,1,1), -- Runed Orb +(@Steelbreaker10,45506,100,1,0,1,1), -- Archivum Data Disc for Quest +(@Steelbreaker10,25455,0,1,1,1,1), -- Belt fo the Crystal Tree +(@Steelbreaker10,45447,0,1,1,1,1), -- Watchful Eye of Fate +(@Steelbreaker10,45456,0,1,1,1,1), -- Loop of the Agile +(@Steelbreaker10,45449,0,1,1,1,1), -- The Masticator +(@Steelbreaker10,45448,0,1,1,1,1), -- Perilous Bite +-- ASSEMBLY OF IRON 25-man +-- Stormcaller Brundir killed last +(@Brundir25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot +(@Brundir25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Brundir25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@Brundir25,45087,75,1,0,1,1), -- Runed Orb +(@Brundir25,47241,100,1,0,1,2), -- 2 Emblems of Triumph +-- Runemaster Molgeim killed last +(@Molgeim25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot +(@Molgeim25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Molgeim25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@Molgeim25,45087,75,1,0,1,1), -- Runed Orb +(@Molgeim25,47241,100,1,0,2,2), -- 2 Emblems of Triumph +(@Molgeim25,45506,100,1,0,1,1), -- Archivum Data Disc +-- Steelbreaker killed last +(@Steelbreaker25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot +(@Steelbreaker25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Steelbreaker25,45038,18,1,0,1,1), -- Fragment of Val'anyr +(@Steelbreaker25,45087,75,1,0,2,2), -- 2x Runed Orb +(@Steelbreaker25,47241,100,1,0,2,2), -- 2 Emblems of Triumph +(@Steelbreaker25,45506,100,1,0,1,1), -- Archivum Data Disc +(@Steelbreaker25,45241,0,1,1,1,1), -- Belt of Colossal Rage +(@Steelbreaker25,45242,0,1,1,1,1), -- Drape of Mortal Downfall +(@Steelbreaker25,45607,0,1,1,1,1), -- Fang of Oblivion +(@Steelbreaker25,45244,0,1,1,1,1), -- Greaves of Swift Vengeance +(@Steelbreaker25,45243,0,1,1,1,1), -- Sapphire Amulet of Renewal +(@Steelbreaker25,45245,0,1,1,1,1); -- Shoulderpads of the Intruder + +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@CacheLivingStone10,@CacheLivingStone25); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- KOLOGARN 10-man +(@CacheLivingStone10,1,100,1,0,-@Kologarn10Ref,2), -- 2 items from reference loot +(@CacheLivingStone10,47241,100,1,0,1,1), -- 1 Emblem of Triumph +-- KOLOGARN 25-Man +(@CacheLivingStone25,1,100,1,0,-@Kologarn25Ref,3), -- 3 items from reference loot +(@CacheLivingStone25,2,10,1,0,-34154,1), -- Chance on Recipe +(@CacheLivingStone25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@CacheLivingStone25,45087,50,1,0,1,1), -- Runed Orb +(@CacheLivingStone25,47241,100,1,0,1,2); -- 2 Emblems of Triumph + +DELETE FROM `creature_loot_template` WHERE `entry` IN (@Auriaya10,@Auriaya25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- AURIAYA 10-man +(@Auriaya10,1,100,1,0,-@Auriaya10Ref,2), -- 2 items from reference loot +(@Auriaya10,47241,100,1,0,1,1), -- 1 Emblem of Triumph +-- AURIAYA 25-man +(@Auriaya25,1,100,1,0,-@Auriaya25Ref,3), -- 3 items from reference loot +(@Auriaya25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Auriaya25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@Auriaya25,45087,75,1,0,1,1), -- Runed Orb +(@Auriaya25,47241,100,1,0,1,2); -- 2 Emblems of Triumph -- cgit v1.2.3 From 00264e45cf7b815061ac6503988506ec454b8360 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 1 Apr 2012 03:08:33 +0100 Subject: DB/Auth: Increase realmlist.address size to 64 (varchar) You might want to verify if the previous size did not truncate your address (it was 15) --- sql/base/auth_database.sql | 2 +- sql/updates/auth/2012_04_01_auth_realmlist.sql | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sql/updates/auth/2012_04_01_auth_realmlist.sql (limited to 'sql/updates') diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 5803529da1e..1075644db3d 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -191,7 +191,7 @@ DROP TABLE IF EXISTS `realmlist`; CREATE TABLE `realmlist` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL DEFAULT '', - `address` varchar(15) NOT NULL DEFAULT '127.0.0.1', + `address` varchar(64) NOT NULL DEFAULT '127.0.0.1', `port` smallint(5) unsigned NOT NULL DEFAULT '8085', `icon` tinyint(3) unsigned NOT NULL DEFAULT '0', `flag` tinyint(3) unsigned NOT NULL DEFAULT '2', diff --git a/sql/updates/auth/2012_04_01_auth_realmlist.sql b/sql/updates/auth/2012_04_01_auth_realmlist.sql new file mode 100644 index 00000000000..e2e1efaf993 --- /dev/null +++ b/sql/updates/auth/2012_04_01_auth_realmlist.sql @@ -0,0 +1 @@ +ALTER TABLE `realmlist` CHANGE `address` `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; -- cgit v1.2.3 From 512aa8897bf30bbb8379f4c4efc59cc0779ec061 Mon Sep 17 00:00:00 2001 From: Discover- Date: Sun, 1 Apr 2012 14:54:15 +0200 Subject: Database/Spawns: Spawn some missing creatures. Closes #5974 --- sql/updates/world/2012_04_01_00_world_creature.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2012_04_01_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_00_world_creature.sql b/sql/updates/world/2012_04_01_00_world_creature.sql new file mode 100644 index 00000000000..f6a42a6ef08 --- /dev/null +++ b/sql/updates/world/2012_04_01_00_world_creature.sql @@ -0,0 +1,17 @@ +-- Add missing spawns to db +DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `curhealth`) VALUES +(4764,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,9156), -- Alchemy +(28648,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,9156), -- Blacksmithing +(40266,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,9156), -- Enchanting +(40267,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,9156), -- Engineering +(40470,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,9156), -- Leatherworking +(40471,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,9156), -- Tailoring +(40510,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,9156), -- Jewelcrafting +(40516,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,9156), -- Inscription +(40517,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,9156), -- Herbalism +(40518,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,9156), -- Mining +(40601,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,9156), -- Skinning +(40602,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,9156), -- Cooking +(40603,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,9156), -- First Aid +(41320,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,9156); -- Fishing -- cgit v1.2.3 From 1bc99cd5af348c578a8cfe7e3641c1e8f59bb7a0 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 1 Apr 2012 14:55:19 +0100 Subject: DB/Spawns: Fix previous commit (512aa8897bf30bbb8) --- sql/updates/world/2012_04_01_world_creature.sql | 26 +++++++++++++++++++++++++ src/server/game/Entities/Player/Player.cpp | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_04_01_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_world_creature.sql b/sql/updates/world/2012_04_01_world_creature.sql new file mode 100644 index 00000000000..f6dff34cfa9 --- /dev/null +++ b/sql/updates/world/2012_04_01_world_creature.sql @@ -0,0 +1,26 @@ +-- Re-add deleted data +DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); +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 +(4764,26796,576,2,1,0,0,424.547,185.962,-34.9367,4.72984,3600,0,0,1,0,0,0,0,0), +(28648,17148,530,1,1,0,0,-2910.22,6473.03,82.4898,2.49669,300,0,0,5914,0,0,0,0,0), +(40267,37671,1,1,1,0,0,1391.2,-4486.23,31.4544,3.3355,300,0,0,42,0,0,0,0,0), +(40470,37671,1,1,1,0,0,1392.66,-4481.87,31.3782,1.97284,300,0,0,42,0,0,0,0,0), +(40471,37671,1,1,1,0,0,1393.92,-4489.57,31.4737,4.93701,300,0,0,42,0,0,0,0,0); + +-- Add missing spawns to db (trainers) +DELETE FROM `creature` WHERE `guid` IN (40266,40510,40516,40517,40518,40601,40602,40603,41320,41674,41723,41775,41779,41780); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`curhealth`) VALUES +(40266,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,1), -- Alchemy +(40510,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,1), -- Blacksmithing +(40516,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,1), -- Enchanting +(40517,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,1), -- Engineering +(40518,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,1), -- Leatherworking +(40601,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,1), -- Tailoring +(40602,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,1), -- Jewelcrafting +(40603,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,1), -- Inscription +(41320,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,1), -- Herbalism +(41674,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,1), -- Mining +(41723,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,1), -- Skinning +(41775,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,1), -- Cooking +(41779,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,1), -- First Aid +(41780,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,1); -- Fishing diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1126262bafa..2afa3c7bc58 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4822,7 +4822,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC Field* fields = resultMail->Fetch(); uint32 mail_id = fields[0].GetUInt32(); - uint16 mailType = fields[1].GetUInt8(); + uint8 mailType = fields[1].GetUInt8(); uint16 mailTemplateId= fields[2].GetUInt16(); uint32 sender = fields[3].GetUInt32(); std::string subject = fields[4].GetString(); -- cgit v1.2.3 From b8558a699016276393954f228c26c3ddf3e49aed Mon Sep 17 00:00:00 2001 From: Jildor Date: Sun, 1 Apr 2012 18:00:37 +0200 Subject: Core/Spells: Fix Spinning Pain Spike damage Close: #5652 --- .../2012_04_01_00_world_spell_script_names.sql | 6 +++++ .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 31 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 sql/updates/world/2012_04_01_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_00_world_spell_script_names.sql b/sql/updates/world/2012_04_01_00_world_spell_script_names.sql new file mode 100644 index 00000000000..9d37f6ad4cb --- /dev/null +++ b/sql/updates/world/2012_04_01_00_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_spinning_pain_spike'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(66316,'spell_spinning_pain_spike'), +(67100,'spell_spinning_pain_spike'), +(67101,'spell_spinning_pain_spike'), +(67102,'spell_spinning_pain_spike'); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index a7328b43826..a7f584b8206 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -515,6 +515,36 @@ public: }; +class spell_spinning_pain_spike : public SpellScriptLoader +{ + public: + spell_spinning_pain_spike() : SpellScriptLoader("spell_spinning_pain_spike") {} + + class spell_spinning_pain_spike_SpellScript : public SpellScript + { + PrepareSpellScript(spell_spinning_pain_spike_SpellScript); + + void HandleBeforeHit() + { + Unit* target = GetHitUnit(); + if (!target) + return; + + if (target->isAlive()) + SetHitDamage(target->GetMaxHealth()*0.5f); + } + void Register() + { + BeforeHit += SpellHitFn(spell_spinning_pain_spike_SpellScript::HandleBeforeHit); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_spinning_pain_spike_SpellScript(); + } +}; + void AddSC_boss_jaraxxus() { new boss_jaraxxus(); @@ -523,4 +553,5 @@ void AddSC_boss_jaraxxus() new mob_fel_infernal(); new mob_nether_portal(); new mob_mistress_of_pain(); + new spell_spinning_pain_spike(); } -- cgit v1.2.3 From 8b81c1a570812b441ea573254e9e2e3c0cbbf7d6 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 1 Apr 2012 17:04:19 +0100 Subject: DB/NPC: Fix trainers added in 1bc99cd5af348c578a8c --- sql/updates/world/2012_04_01_01_world_creature.sql | 26 +++++++ sql/updates/world/2012_04_01_world_creature.sql | 26 ------- sql/updates/world/2012_04_02_world_trainers.sql | 83 ++++++++++++++++++++++ 3 files changed, 109 insertions(+), 26 deletions(-) create mode 100644 sql/updates/world/2012_04_01_01_world_creature.sql delete mode 100644 sql/updates/world/2012_04_01_world_creature.sql create mode 100644 sql/updates/world/2012_04_02_world_trainers.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_01_world_creature.sql b/sql/updates/world/2012_04_01_01_world_creature.sql new file mode 100644 index 00000000000..f6dff34cfa9 --- /dev/null +++ b/sql/updates/world/2012_04_01_01_world_creature.sql @@ -0,0 +1,26 @@ +-- Re-add deleted data +DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); +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 +(4764,26796,576,2,1,0,0,424.547,185.962,-34.9367,4.72984,3600,0,0,1,0,0,0,0,0), +(28648,17148,530,1,1,0,0,-2910.22,6473.03,82.4898,2.49669,300,0,0,5914,0,0,0,0,0), +(40267,37671,1,1,1,0,0,1391.2,-4486.23,31.4544,3.3355,300,0,0,42,0,0,0,0,0), +(40470,37671,1,1,1,0,0,1392.66,-4481.87,31.3782,1.97284,300,0,0,42,0,0,0,0,0), +(40471,37671,1,1,1,0,0,1393.92,-4489.57,31.4737,4.93701,300,0,0,42,0,0,0,0,0); + +-- Add missing spawns to db (trainers) +DELETE FROM `creature` WHERE `guid` IN (40266,40510,40516,40517,40518,40601,40602,40603,41320,41674,41723,41775,41779,41780); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`curhealth`) VALUES +(40266,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,1), -- Alchemy +(40510,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,1), -- Blacksmithing +(40516,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,1), -- Enchanting +(40517,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,1), -- Engineering +(40518,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,1), -- Leatherworking +(40601,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,1), -- Tailoring +(40602,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,1), -- Jewelcrafting +(40603,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,1), -- Inscription +(41320,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,1), -- Herbalism +(41674,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,1), -- Mining +(41723,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,1), -- Skinning +(41775,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,1), -- Cooking +(41779,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,1), -- First Aid +(41780,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,1); -- Fishing diff --git a/sql/updates/world/2012_04_01_world_creature.sql b/sql/updates/world/2012_04_01_world_creature.sql deleted file mode 100644 index f6dff34cfa9..00000000000 --- a/sql/updates/world/2012_04_01_world_creature.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Re-add deleted data -DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); -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 -(4764,26796,576,2,1,0,0,424.547,185.962,-34.9367,4.72984,3600,0,0,1,0,0,0,0,0), -(28648,17148,530,1,1,0,0,-2910.22,6473.03,82.4898,2.49669,300,0,0,5914,0,0,0,0,0), -(40267,37671,1,1,1,0,0,1391.2,-4486.23,31.4544,3.3355,300,0,0,42,0,0,0,0,0), -(40470,37671,1,1,1,0,0,1392.66,-4481.87,31.3782,1.97284,300,0,0,42,0,0,0,0,0), -(40471,37671,1,1,1,0,0,1393.92,-4489.57,31.4737,4.93701,300,0,0,42,0,0,0,0,0); - --- Add missing spawns to db (trainers) -DELETE FROM `creature` WHERE `guid` IN (40266,40510,40516,40517,40518,40601,40602,40603,41320,41674,41723,41775,41779,41780); -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`curhealth`) VALUES -(40266,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,1), -- Alchemy -(40510,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,1), -- Blacksmithing -(40516,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,1), -- Enchanting -(40517,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,1), -- Engineering -(40518,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,1), -- Leatherworking -(40601,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,1), -- Tailoring -(40602,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,1), -- Jewelcrafting -(40603,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,1), -- Inscription -(41320,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,1), -- Herbalism -(41674,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,1), -- Mining -(41723,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,1), -- Skinning -(41775,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,1), -- Cooking -(41779,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,1), -- First Aid -(41780,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,1); -- Fishing diff --git a/sql/updates/world/2012_04_02_world_trainers.sql b/sql/updates/world/2012_04_02_world_trainers.sql new file mode 100644 index 00000000000..1edc9ae09af --- /dev/null +++ b/sql/updates/world/2012_04_02_world_trainers.sql @@ -0,0 +1,83 @@ +-- Template updates +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33608; -- Alchemy +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16/*80*/,`trainer_type`=2 WHERE `entry`=33609; -- Blacksmithing +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33610; -- Enchanting +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33611; -- Engineering +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33612; -- Leatherworking +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33613; -- Tailoring +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33614; -- Jewelcrafting +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33616; -- Herbalism +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33618; -- Skinning (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33617; -- Mining (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33619; -- Cooking (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33621; -- First Aid (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33615; -- Inscription (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33623; -- Fishing (guessed) + +-- Model data +UPDATE `creature_model_info` SET `bounding_radius`=0.11,`combat_reach`=0,`gender`=2 WHERE `modelid`=28738; -- shared by many +UPDATE `creature_model_info` SET `bounding_radius`=0.14,`combat_reach`=0,`gender`=2 WHERE `modelid`=28758; -- shared by many + +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(33608,0,0,1,0, NULL), -- Alchemy +(33609,0,0,1,0, NULL), -- Blacksmithing +(33610,0,0,1,0, NULL), -- Enchanting +(33611,0,0,1,0, NULL), -- Engineering +(33612,0,0,1,0, NULL), -- Leatherworking +(33613,0,0,1,0, NULL), -- Tailoring +(33614,0,0,1,0, NULL), -- Jewelcrafting +(33616,0,0,1,0, NULL), -- Herbalism +(33618,0,0,1,0, NULL), -- Skinning (guessed) +(33617,0,0,1,0, NULL), -- Mining (guessed) +(33619,0,0,1,0, NULL), -- Cooking (guessed) +(33621,0,0,1,0, NULL), -- First Aid (guessed) +(33615,0,0,1,0, NULL), -- Inscription (guessed) +(33623,0,0,1,0, NULL); -- Fishing (guessed) + +-- Trainer spells +DELETE FROM `npc_trainer` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); +INSERT INTO `npc_trainer` (`entry`, `spell`, `spellcost`, `reqskill`, `reqskillvalue`, `reqlevel`) VALUES +(33608, -201001, 0, 0, 0, 0), -- Alchemy +(33608, -201002, 0, 0, 0, 0), -- Alchemy +(33608, -201003, 0, 0, 0, 0), -- Alchemy +(33609, -201004, 0, 0, 0, 0), -- Blacksmithing +(33609, -201005, 0, 0, 0, 0), -- Blacksmithing +(33609, -201006, 0, 0, 0, 0), -- Blacksmithing +(33610, -201009, 0, 0, 0, 0), -- Enchanting +(33610, -201010, 0, 0, 0, 0), -- Enchanting +(33610, -201011, 0, 0, 0, 0), -- Enchanting +(33611, -201012, 0, 0, 0, 0), -- Engineering +(33611, -201013, 0, 0, 0, 0), -- Engineering +(33611, -201014, 0, 0, 0, 0), -- Engineering +(33612, -201027, 0, 0, 0, 0), -- Leatherworking +(33612, -201028, 0, 0, 0, 0), -- Leatherworking +(33612, -201029, 0, 0, 0, 0), -- Leatherworking +(33613, -201039, 0, 0, 0, 0), -- Tailoring +(33613, -201040, 0, 0, 0, 0), -- Tailoring +(33613, -201041, 0, 0, 0, 0), -- Tailoring +(33614, -201024, 0, 0, 0, 0), -- Jewelcrafting +(33614, -201025, 0, 0, 0, 0), -- Jewelcrafting +(33614, -201026, 0, 0, 0, 0), -- Jewelcrafting +(33616, -201018, 0, 0, 0, 0), -- Herbalism +(33616, -201019, 0, 0, 0, 0), -- Herbalism +(33616, -201020, 0, 0, 0, 0), -- Herbalism +(33618, -201036, 0, 0, 0, 0), -- Skinning +(33618, -201037, 0, 0, 0, 0), -- Skinning +(33618, -201038, 0, 0, 0, 0), -- Skinning +(33617, -201033, 0, 0, 0, 0), -- Mining +(33617, -201034, 0, 0, 0, 0), -- Mining +(33617, -201035, 0, 0, 0, 0), -- Mining +(33619, -202004, 0, 0, 0, 0), -- Cooking +(33619, -202005, 0, 0, 0, 0), -- Cooking +(33619, -202006, 0, 0, 0, 0), -- Cooking +(33621, -202007, 0, 0, 0, 0), -- First Aid +(33621, -202008, 0, 0, 0, 0), -- First Aid +(33621, -202009, 0, 0, 0, 0), -- First Aid +(33615, -201021, 0, 0, 0, 0), -- Inscription +(33615, -201022, 0, 0, 0, 0), -- Inscription +(33615, -201023, 0, 0, 0, 0), -- Inscription +(33623, -202001, 0, 0, 0, 0), -- Fishing +(33623, -202002, 0, 0, 0, 0), -- Fishing +(33623, -202003, 0, 0, 0, 0); -- Fishing -- cgit v1.2.3 From 65ba081b6c6106021343c964fdc75b6c2b49100d Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 1 Apr 2012 11:06:08 -0500 Subject: SQL/Spells: Missing SQL from previous commit --- .../world/2012_04_01_02_world_spell_group_stack_rules.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql b/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql new file mode 100644 index 00000000000..d42afd1d955 --- /dev/null +++ b/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql @@ -0,0 +1,9 @@ +-- Greater Blessing of Wisdom and Mana Spring Totem should not stack (hotfix) +SET @GROUP := 1117; +DELETE FROM `spell_group` WHERE id=@GROUP; +INSERT INTO `spell_group`(`id`,`spell_id`) VALUES +(@GROUP,25894), -- Greater Blessing of Wisdom +(@GROUP,5677); -- Mana Spring (cast by Mana Spring Totem) +DELETE FROM `spell_group_stack_rules` WHERE `group_id`=@GROUP; +INSERT INTO `spell_group_stack_rules`(`group_id`,`stack_rule`) VALUES +(@GROUP,3); -- Make them SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT -- cgit v1.2.3 From 860c0cb43a3aba8cfb343d7e5f6c31aa8c75b9fe Mon Sep 17 00:00:00 2001 From: Svannon Date: Sun, 1 Apr 2012 17:42:39 +0100 Subject: DB/Conditions: Imbued Scourge Shroud should only be used in City area (conditions) Closes #1527 --- sql/updates/world/2012_04_01_03_world_trainers.sql | 83 ++++++++++++++++++++++ .../world/2012_04_01_04_world_conditions.sql | 5 ++ sql/updates/world/2012_04_02_world_trainers.sql | 83 ---------------------- 3 files changed, 88 insertions(+), 83 deletions(-) create mode 100644 sql/updates/world/2012_04_01_03_world_trainers.sql create mode 100644 sql/updates/world/2012_04_01_04_world_conditions.sql delete mode 100644 sql/updates/world/2012_04_02_world_trainers.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_03_world_trainers.sql b/sql/updates/world/2012_04_01_03_world_trainers.sql new file mode 100644 index 00000000000..1edc9ae09af --- /dev/null +++ b/sql/updates/world/2012_04_01_03_world_trainers.sql @@ -0,0 +1,83 @@ +-- Template updates +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33608; -- Alchemy +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16/*80*/,`trainer_type`=2 WHERE `entry`=33609; -- Blacksmithing +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33610; -- Enchanting +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33611; -- Engineering +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33612; -- Leatherworking +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33613; -- Tailoring +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33614; -- Jewelcrafting +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33616; -- Herbalism +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33618; -- Skinning (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33617; -- Mining (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33619; -- Cooking (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33621; -- First Aid (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33615; -- Inscription (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33623; -- Fishing (guessed) + +-- Model data +UPDATE `creature_model_info` SET `bounding_radius`=0.11,`combat_reach`=0,`gender`=2 WHERE `modelid`=28738; -- shared by many +UPDATE `creature_model_info` SET `bounding_radius`=0.14,`combat_reach`=0,`gender`=2 WHERE `modelid`=28758; -- shared by many + +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(33608,0,0,1,0, NULL), -- Alchemy +(33609,0,0,1,0, NULL), -- Blacksmithing +(33610,0,0,1,0, NULL), -- Enchanting +(33611,0,0,1,0, NULL), -- Engineering +(33612,0,0,1,0, NULL), -- Leatherworking +(33613,0,0,1,0, NULL), -- Tailoring +(33614,0,0,1,0, NULL), -- Jewelcrafting +(33616,0,0,1,0, NULL), -- Herbalism +(33618,0,0,1,0, NULL), -- Skinning (guessed) +(33617,0,0,1,0, NULL), -- Mining (guessed) +(33619,0,0,1,0, NULL), -- Cooking (guessed) +(33621,0,0,1,0, NULL), -- First Aid (guessed) +(33615,0,0,1,0, NULL), -- Inscription (guessed) +(33623,0,0,1,0, NULL); -- Fishing (guessed) + +-- Trainer spells +DELETE FROM `npc_trainer` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); +INSERT INTO `npc_trainer` (`entry`, `spell`, `spellcost`, `reqskill`, `reqskillvalue`, `reqlevel`) VALUES +(33608, -201001, 0, 0, 0, 0), -- Alchemy +(33608, -201002, 0, 0, 0, 0), -- Alchemy +(33608, -201003, 0, 0, 0, 0), -- Alchemy +(33609, -201004, 0, 0, 0, 0), -- Blacksmithing +(33609, -201005, 0, 0, 0, 0), -- Blacksmithing +(33609, -201006, 0, 0, 0, 0), -- Blacksmithing +(33610, -201009, 0, 0, 0, 0), -- Enchanting +(33610, -201010, 0, 0, 0, 0), -- Enchanting +(33610, -201011, 0, 0, 0, 0), -- Enchanting +(33611, -201012, 0, 0, 0, 0), -- Engineering +(33611, -201013, 0, 0, 0, 0), -- Engineering +(33611, -201014, 0, 0, 0, 0), -- Engineering +(33612, -201027, 0, 0, 0, 0), -- Leatherworking +(33612, -201028, 0, 0, 0, 0), -- Leatherworking +(33612, -201029, 0, 0, 0, 0), -- Leatherworking +(33613, -201039, 0, 0, 0, 0), -- Tailoring +(33613, -201040, 0, 0, 0, 0), -- Tailoring +(33613, -201041, 0, 0, 0, 0), -- Tailoring +(33614, -201024, 0, 0, 0, 0), -- Jewelcrafting +(33614, -201025, 0, 0, 0, 0), -- Jewelcrafting +(33614, -201026, 0, 0, 0, 0), -- Jewelcrafting +(33616, -201018, 0, 0, 0, 0), -- Herbalism +(33616, -201019, 0, 0, 0, 0), -- Herbalism +(33616, -201020, 0, 0, 0, 0), -- Herbalism +(33618, -201036, 0, 0, 0, 0), -- Skinning +(33618, -201037, 0, 0, 0, 0), -- Skinning +(33618, -201038, 0, 0, 0, 0), -- Skinning +(33617, -201033, 0, 0, 0, 0), -- Mining +(33617, -201034, 0, 0, 0, 0), -- Mining +(33617, -201035, 0, 0, 0, 0), -- Mining +(33619, -202004, 0, 0, 0, 0), -- Cooking +(33619, -202005, 0, 0, 0, 0), -- Cooking +(33619, -202006, 0, 0, 0, 0), -- Cooking +(33621, -202007, 0, 0, 0, 0), -- First Aid +(33621, -202008, 0, 0, 0, 0), -- First Aid +(33621, -202009, 0, 0, 0, 0), -- First Aid +(33615, -201021, 0, 0, 0, 0), -- Inscription +(33615, -201022, 0, 0, 0, 0), -- Inscription +(33615, -201023, 0, 0, 0, 0), -- Inscription +(33623, -202001, 0, 0, 0, 0), -- Fishing +(33623, -202002, 0, 0, 0, 0), -- Fishing +(33623, -202003, 0, 0, 0, 0); -- Fishing diff --git a/sql/updates/world/2012_04_01_04_world_conditions.sql b/sql/updates/world/2012_04_01_04_world_conditions.sql new file mode 100644 index 00000000000..e84307e0b05 --- /dev/null +++ b/sql/updates/world/2012_04_01_04_world_conditions.sql @@ -0,0 +1,5 @@ +-- Quest: Blending In (11633) +-- Spell from Cape only Appliable in City Area +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=45614; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,45614,11633,23,4125,0,0,0, '', 'Shroud of the Scourge - Temple City of En''kilah'); diff --git a/sql/updates/world/2012_04_02_world_trainers.sql b/sql/updates/world/2012_04_02_world_trainers.sql deleted file mode 100644 index 1edc9ae09af..00000000000 --- a/sql/updates/world/2012_04_02_world_trainers.sql +++ /dev/null @@ -1,83 +0,0 @@ --- Template updates -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33608; -- Alchemy -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16/*80*/,`trainer_type`=2 WHERE `entry`=33609; -- Blacksmithing -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33610; -- Enchanting -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33611; -- Engineering -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33612; -- Leatherworking -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33613; -- Tailoring -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33614; -- Jewelcrafting -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33616; -- Herbalism -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33618; -- Skinning (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33617; -- Mining (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33619; -- Cooking (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33621; -- First Aid (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33615; -- Inscription (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33623; -- Fishing (guessed) - --- Model data -UPDATE `creature_model_info` SET `bounding_radius`=0.11,`combat_reach`=0,`gender`=2 WHERE `modelid`=28738; -- shared by many -UPDATE `creature_model_info` SET `bounding_radius`=0.14,`combat_reach`=0,`gender`=2 WHERE `modelid`=28758; -- shared by many - --- Addon data -DELETE FROM `creature_template_addon` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); -INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(33608,0,0,1,0, NULL), -- Alchemy -(33609,0,0,1,0, NULL), -- Blacksmithing -(33610,0,0,1,0, NULL), -- Enchanting -(33611,0,0,1,0, NULL), -- Engineering -(33612,0,0,1,0, NULL), -- Leatherworking -(33613,0,0,1,0, NULL), -- Tailoring -(33614,0,0,1,0, NULL), -- Jewelcrafting -(33616,0,0,1,0, NULL), -- Herbalism -(33618,0,0,1,0, NULL), -- Skinning (guessed) -(33617,0,0,1,0, NULL), -- Mining (guessed) -(33619,0,0,1,0, NULL), -- Cooking (guessed) -(33621,0,0,1,0, NULL), -- First Aid (guessed) -(33615,0,0,1,0, NULL), -- Inscription (guessed) -(33623,0,0,1,0, NULL); -- Fishing (guessed) - --- Trainer spells -DELETE FROM `npc_trainer` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); -INSERT INTO `npc_trainer` (`entry`, `spell`, `spellcost`, `reqskill`, `reqskillvalue`, `reqlevel`) VALUES -(33608, -201001, 0, 0, 0, 0), -- Alchemy -(33608, -201002, 0, 0, 0, 0), -- Alchemy -(33608, -201003, 0, 0, 0, 0), -- Alchemy -(33609, -201004, 0, 0, 0, 0), -- Blacksmithing -(33609, -201005, 0, 0, 0, 0), -- Blacksmithing -(33609, -201006, 0, 0, 0, 0), -- Blacksmithing -(33610, -201009, 0, 0, 0, 0), -- Enchanting -(33610, -201010, 0, 0, 0, 0), -- Enchanting -(33610, -201011, 0, 0, 0, 0), -- Enchanting -(33611, -201012, 0, 0, 0, 0), -- Engineering -(33611, -201013, 0, 0, 0, 0), -- Engineering -(33611, -201014, 0, 0, 0, 0), -- Engineering -(33612, -201027, 0, 0, 0, 0), -- Leatherworking -(33612, -201028, 0, 0, 0, 0), -- Leatherworking -(33612, -201029, 0, 0, 0, 0), -- Leatherworking -(33613, -201039, 0, 0, 0, 0), -- Tailoring -(33613, -201040, 0, 0, 0, 0), -- Tailoring -(33613, -201041, 0, 0, 0, 0), -- Tailoring -(33614, -201024, 0, 0, 0, 0), -- Jewelcrafting -(33614, -201025, 0, 0, 0, 0), -- Jewelcrafting -(33614, -201026, 0, 0, 0, 0), -- Jewelcrafting -(33616, -201018, 0, 0, 0, 0), -- Herbalism -(33616, -201019, 0, 0, 0, 0), -- Herbalism -(33616, -201020, 0, 0, 0, 0), -- Herbalism -(33618, -201036, 0, 0, 0, 0), -- Skinning -(33618, -201037, 0, 0, 0, 0), -- Skinning -(33618, -201038, 0, 0, 0, 0), -- Skinning -(33617, -201033, 0, 0, 0, 0), -- Mining -(33617, -201034, 0, 0, 0, 0), -- Mining -(33617, -201035, 0, 0, 0, 0), -- Mining -(33619, -202004, 0, 0, 0, 0), -- Cooking -(33619, -202005, 0, 0, 0, 0), -- Cooking -(33619, -202006, 0, 0, 0, 0), -- Cooking -(33621, -202007, 0, 0, 0, 0), -- First Aid -(33621, -202008, 0, 0, 0, 0), -- First Aid -(33621, -202009, 0, 0, 0, 0), -- First Aid -(33615, -201021, 0, 0, 0, 0), -- Inscription -(33615, -201022, 0, 0, 0, 0), -- Inscription -(33615, -201023, 0, 0, 0, 0), -- Inscription -(33623, -202001, 0, 0, 0, 0), -- Fishing -(33623, -202002, 0, 0, 0, 0), -- Fishing -(33623, -202003, 0, 0, 0, 0); -- Fishing -- cgit v1.2.3 From f7b1edf60df72de58a3a743d2776f0327632f7c4 Mon Sep 17 00:00:00 2001 From: Discover- Date: Sun, 1 Apr 2012 17:45:43 +0100 Subject: DB/NPC: Mana Beast shouldn't reward XP Closes #1887 --- sql/updates/world/2012_04_01_05_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_01_05_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_05_world_creature_template.sql b/sql/updates/world/2012_04_01_05_world_creature_template.sql new file mode 100644 index 00000000000..a4d13f1513a --- /dev/null +++ b/sql/updates/world/2012_04_01_05_world_creature_template.sql @@ -0,0 +1,2 @@ +-- CREATURE_FLAG_EXTRA_NO_XP_AT_KILL +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64 WHERE `entry`=21267; -- Mana Beast -- cgit v1.2.3 From b07e2367839b0c94799717f422c4b461bc6782d1 Mon Sep 17 00:00:00 2001 From: Odyssey Date: Sun, 1 Apr 2012 17:53:02 +0100 Subject: DB/SAI: Fix quest Falcon Versus Hawk Closes #2127 --- sql/updates/world/2012_04_01_06_world_sai.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_04_01_06_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_06_world_sai.sql b/sql/updates/world/2012_04_01_06_world_sai.sql new file mode 100644 index 00000000000..9b8857da1e4 --- /dev/null +++ b/sql/updates/world/2012_04_01_06_world_sai.sql @@ -0,0 +1,7 @@ +-- Fix quest 11468 - Falcon versus hawk +SET @entry := 24747; -- Fjord Hawk +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,1,8,0,100,0,44407,0,0,0,11,44408,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fjord Hawk - On Spellhit - Cast spell on invoker'), +(@entry,0,1,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fjord Hawk - On Spellhit - Despawn'); -- cgit v1.2.3 From 4e58efcfec2e6e5d75d8be4b3319acf00b64cd65 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 1 Apr 2012 18:44:09 +0100 Subject: DB/Conditions: Capture Jormungar Spawn can only be used in Ice Heart Cavern Fix by Discover and Havenard Closes #2452 Also fix a typo in a previous commit --- sql/updates/world/2012_04_01_07_world_misc.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_01_07_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_01_07_world_misc.sql b/sql/updates/world/2012_04_01_07_world_misc.sql new file mode 100644 index 00000000000..346627fd88b --- /dev/null +++ b/sql/updates/world/2012_04_01_07_world_misc.sql @@ -0,0 +1,4 @@ +UPDATE `conditions` SET `ElseGroup`=0 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=45614; -- typo fix for previous commit +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=47431; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,47431,0,23,4195,0,0,64,'','Capture Jormungar Spawn can only be used in Ice Heart Cavern'); -- cgit v1.2.3 From cce8b56a2671b8c5655f45f58d5d877a6fdd60e9 Mon Sep 17 00:00:00 2001 From: Kandera Date: Tue, 3 Apr 2012 10:19:17 -0400 Subject: Core/Spells: fix wintergrasp water being applied to players. small codestyle fix --- .../2012_04_03_00_world_spell_script_names.sql | 3 + src/server/scripts/Spells/spell_generic.cpp | 67 ++++++++++++++++------ 2 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 sql/updates/world/2012_04_03_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_03_00_world_spell_script_names.sql b/sql/updates/world/2012_04_03_00_world_spell_script_names.sql new file mode 100644 index 00000000000..e296ed55d53 --- /dev/null +++ b/sql/updates/world/2012_04_03_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 36444; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(36444, 'spell_gen_wg_water'); \ No newline at end of file diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 929206dec05..41d1c24c517 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1234,30 +1234,30 @@ class spell_gen_magic_rooster : public SpellScriptLoader class spell_gen_allow_cast_from_item_only : public SpellScriptLoader { -public: - spell_gen_allow_cast_from_item_only() : SpellScriptLoader("spell_gen_allow_cast_from_item_only") { } - - class spell_gen_allow_cast_from_item_only_SpellScript : public SpellScript - { - PrepareSpellScript(spell_gen_allow_cast_from_item_only_SpellScript); + public: + spell_gen_allow_cast_from_item_only() : SpellScriptLoader("spell_gen_allow_cast_from_item_only") { } - SpellCastResult CheckRequirement() + class spell_gen_allow_cast_from_item_only_SpellScript : public SpellScript { - if (!GetCastItem()) - return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; - return SPELL_CAST_OK; - } + PrepareSpellScript(spell_gen_allow_cast_from_item_only_SpellScript); - void Register() + SpellCastResult CheckRequirement() + { + if (!GetCastItem()) + return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; + return SPELL_CAST_OK; + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); + } + }; + + SpellScript* GetSpellScript() const { - OnCheckCast += SpellCheckCastFn(spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); + return new spell_gen_allow_cast_from_item_only_SpellScript(); } - }; - - SpellScript* GetSpellScript() const - { - return new spell_gen_allow_cast_from_item_only_SpellScript(); - } }; enum Launch @@ -2590,6 +2590,34 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader } }; +class spell_gen_wg_water : public SpellScriptLoader +{ + public: + spell_gen_wg_water() : SpellScriptLoader("spell_gen_wg_water") {} + + class spell_gen_wg_water_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_wg_water_SpellScript); + + SpellCastResult CheckCast() + { + if (!GetSpellInfo()->CheckTargetCreatureType(GetTargetUnit())) + return SPELL_FAILED_DONT_REPORT; + return SPELL_CAST_OK; + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_gen_wg_water_SpellScript::CheckCast); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gen_wg_water_SpellScript(); + } +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -2640,4 +2668,5 @@ void AddSC_generic_spell_scripts() new spell_gen_tournament_pennant(); new spell_gen_chaos_blast(); new spell_gen_ds_flush_knockback(); + new spell_gen_wg_water(); } -- cgit v1.2.3 From 0814bfb35e765027d2fca4d8ea9db4b220a1a054 Mon Sep 17 00:00:00 2001 From: kandera Date: Tue, 3 Apr 2012 11:21:53 -0300 Subject: Update sql/updates/world/2012_04_03_00_world_spell_script_names.sql --- sql/updates/world/2012_04_03_00_world_spell_script_names.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_03_00_world_spell_script_names.sql b/sql/updates/world/2012_04_03_00_world_spell_script_names.sql index e296ed55d53..70f675daa20 100644 --- a/sql/updates/world/2012_04_03_00_world_spell_script_names.sql +++ b/sql/updates/world/2012_04_03_00_world_spell_script_names.sql @@ -1,3 +1,3 @@ DELETE FROM `spell_script_names` WHERE `spell_id` = 36444; INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(36444, 'spell_gen_wg_water'); \ No newline at end of file +(36444, 'spell_gen_wg_water'); -- cgit v1.2.3 From e359bfef1b868cbbbc3a802b00710982dbf4c89e Mon Sep 17 00:00:00 2001 From: leak Date: Wed, 4 Apr 2012 17:58:17 +0200 Subject: SQL: Adjust rollup filename and change address length to 255 according to RFC 1035 --- sql/updates/auth/2012_04_01_00_auth_realmlist.sql | 1 + sql/updates/auth/2012_04_01_auth_realmlist.sql | 1 - sql/updates/auth/2012_04_04_00_auth_realmlist.sql | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sql/updates/auth/2012_04_01_00_auth_realmlist.sql delete mode 100644 sql/updates/auth/2012_04_01_auth_realmlist.sql create mode 100644 sql/updates/auth/2012_04_04_00_auth_realmlist.sql (limited to 'sql/updates') diff --git a/sql/updates/auth/2012_04_01_00_auth_realmlist.sql b/sql/updates/auth/2012_04_01_00_auth_realmlist.sql new file mode 100644 index 00000000000..e2e1efaf993 --- /dev/null +++ b/sql/updates/auth/2012_04_01_00_auth_realmlist.sql @@ -0,0 +1 @@ +ALTER TABLE `realmlist` CHANGE `address` `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; diff --git a/sql/updates/auth/2012_04_01_auth_realmlist.sql b/sql/updates/auth/2012_04_01_auth_realmlist.sql deleted file mode 100644 index e2e1efaf993..00000000000 --- a/sql/updates/auth/2012_04_01_auth_realmlist.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `realmlist` CHANGE `address` `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; diff --git a/sql/updates/auth/2012_04_04_00_auth_realmlist.sql b/sql/updates/auth/2012_04_04_00_auth_realmlist.sql new file mode 100644 index 00000000000..18f2d7b3d4c --- /dev/null +++ b/sql/updates/auth/2012_04_04_00_auth_realmlist.sql @@ -0,0 +1 @@ +ALTER TABLE `realmlist` CHANGE `address` `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; -- cgit v1.2.3 From 98687770ffb3edd98e839eb8b532220852870ed5 Mon Sep 17 00:00:00 2001 From: Subv Date: Wed, 4 Apr 2012 14:13:19 -0500 Subject: SQL/Spells: Will of Sartharion should only affect the drakes and Sartharion, patch by Vincent-Michael Closes #5641 --- sql/updates/world/2012_04_04_00_world_conditions.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_04_04_00_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_04_00_world_conditions.sql b/sql/updates/world/2012_04_04_00_world_conditions.sql new file mode 100644 index 00000000000..f4d0a6c41b4 --- /dev/null +++ b/sql/updates/world/2012_04_04_00_world_conditions.sql @@ -0,0 +1,7 @@ +-- Will of Sartharion should only target the drakes and Sartharion +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=61254; +INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13, 1, 61254, 0, 0, 31, 0, 3, 30449, 0, 0, 0, '', 'Will of Sartharion'), +(13, 1, 61254, 0, 1, 31, 0, 3, 30451, 0, 0, 0, '', 'Will of Sartharion'), +(13, 1, 61254, 0, 2, 31, 0, 3, 30452, 0, 0, 0, '', 'Will of Sartharion'), +(13, 1, 61254, 0, 3, 31, 0, 3, 28860, 0, 0, 0, '', 'Will of Sartharion'); \ No newline at end of file -- cgit v1.2.3 From a7de92a7a1bae464b94d3ea15f2a203abd3d8d02 Mon Sep 17 00:00:00 2001 From: Subv Date: Wed, 4 Apr 2012 21:41:54 -0500 Subject: Core/Spells: Rune Strike should only be available for use once after a block/parry Closes #6007 Signed-off-by: Subv --- sql/updates/world/2012_04_04_01_world_spell_dbc.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_04_01_world_spell_dbc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_04_01_world_spell_dbc.sql b/sql/updates/world/2012_04_04_01_world_spell_dbc.sql new file mode 100644 index 00000000000..1b8b0868648 --- /dev/null +++ b/sql/updates/world/2012_04_04_01_world_spell_dbc.sql @@ -0,0 +1,2 @@ +UPDATE `spell_dbc` SET `EffectApplyAuraName1`=4 WHERE `Id`=56817; + -- cgit v1.2.3 From d155304f8409a55254d57f646e612098d20bf886 Mon Sep 17 00:00:00 2001 From: Nay Date: Thu, 5 Apr 2012 17:38:13 +0100 Subject: DB/GOs: Correct some templates and add a missing one (WDB) DB/Auth: Add missed change to auth_base.sql Also fix file endings in some of hte sqls --- sql/base/auth_database.sql | 2 +- .../world/2012_03_30_00_world_smart_scripts.sql | 1 - .../world/2012_04_04_00_world_conditions.sql | 2 +- .../world/2012_04_04_01_world_spell_dbc.sql | 1 - .../2012_04_05_00_world_gameobject_template.sql | 32 ++++++++++++++++++++++ 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 sql/updates/world/2012_04_05_00_world_gameobject_template.sql (limited to 'sql/updates') diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 1075644db3d..14aaa4658e9 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -191,7 +191,7 @@ DROP TABLE IF EXISTS `realmlist`; CREATE TABLE `realmlist` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL DEFAULT '', - `address` varchar(64) NOT NULL DEFAULT '127.0.0.1', + `address` varchar(255) NOT NULL DEFAULT '127.0.0.1', `port` smallint(5) unsigned NOT NULL DEFAULT '8085', `icon` tinyint(3) unsigned NOT NULL DEFAULT '0', `flag` tinyint(3) unsigned NOT NULL DEFAULT '2', diff --git a/sql/updates/world/2012_03_30_00_world_smart_scripts.sql b/sql/updates/world/2012_03_30_00_world_smart_scripts.sql index 08d4ee90168..3ec709d76c1 100644 --- a/sql/updates/world/2012_03_30_00_world_smart_scripts.sql +++ b/sql/updates/world/2012_03_30_00_world_smart_scripts.sql @@ -92,4 +92,3 @@ INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2` (@COOP,38,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,4.29414), (@COOP,39,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,3.90536), (@COOP,40,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,4.36089); - diff --git a/sql/updates/world/2012_04_04_00_world_conditions.sql b/sql/updates/world/2012_04_04_00_world_conditions.sql index f4d0a6c41b4..55cab4ca730 100644 --- a/sql/updates/world/2012_04_04_00_world_conditions.sql +++ b/sql/updates/world/2012_04_04_00_world_conditions.sql @@ -4,4 +4,4 @@ INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,` (13, 1, 61254, 0, 0, 31, 0, 3, 30449, 0, 0, 0, '', 'Will of Sartharion'), (13, 1, 61254, 0, 1, 31, 0, 3, 30451, 0, 0, 0, '', 'Will of Sartharion'), (13, 1, 61254, 0, 2, 31, 0, 3, 30452, 0, 0, 0, '', 'Will of Sartharion'), -(13, 1, 61254, 0, 3, 31, 0, 3, 28860, 0, 0, 0, '', 'Will of Sartharion'); \ No newline at end of file +(13, 1, 61254, 0, 3, 31, 0, 3, 28860, 0, 0, 0, '', 'Will of Sartharion'); diff --git a/sql/updates/world/2012_04_04_01_world_spell_dbc.sql b/sql/updates/world/2012_04_04_01_world_spell_dbc.sql index 1b8b0868648..7eccdf811e4 100644 --- a/sql/updates/world/2012_04_04_01_world_spell_dbc.sql +++ b/sql/updates/world/2012_04_04_01_world_spell_dbc.sql @@ -1,2 +1 @@ UPDATE `spell_dbc` SET `EffectApplyAuraName1`=4 WHERE `Id`=56817; - diff --git a/sql/updates/world/2012_04_05_00_world_gameobject_template.sql b/sql/updates/world/2012_04_05_00_world_gameobject_template.sql new file mode 100644 index 00000000000..ab05bf43b86 --- /dev/null +++ b/sql/updates/world/2012_04_05_00_world_gameobject_template.sql @@ -0,0 +1,32 @@ +DELETE FROM `gameobject_template` WHERE `entry`=202931; +INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `data0`, `data1`, `data2`, `data3`, `data4`, `data5`, `data6`, `data7`, `data8`, `data9`, `data10`, `data11`, `data12`, `data13`, `data14`, `data15`, `data16`, `data17`, `data18`, `data19`, `data20`, `data21`, `data22`, `data23`, `size`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `WDBVerified`) VALUES +(202931, 5, 9463, 'Serpent Offering', '', '', '', 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.17, 0, 0, 0, 0, 0, 0, 12340); -- -Unknown- + +UPDATE `gameobject_template` SET `questItem1`=30527, `questItem2`=30524, `questItem3`=30525, `questItem4`=30526 WHERE `entry`=184815; -- Sealed Coffin +-- UPDATE `gameobject_template` SET `data0`=2061, `WDBVerified`=12340 WHERE `entry`=151951; -- Idol Oven Fire +-- UPDATE `gameobject_template` SET `type`=5, `data3`=0, `data5`=0 WHERE `entry`=188187; -- Snow Pile +UPDATE `gameobject_template` SET `size`=0.45 WHERE `entry`=190169; -- Tiger Lily +UPDATE `gameobject_template` SET `unk1`='' WHERE `entry`=190549; -- The Zephyr +UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=191300; -- Fire +UPDATE `gameobject_template` SET `displayId`=7836 WHERE `entry`=196485; -- Saronite Rock +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126337; -- 126337 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126338; -- 126338 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126339; -- 126339 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126340; -- 126340 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126341; -- 126341 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126345; -- 126345 +UPDATE `gameobject_template` SET `data2`=23787, `data7`=3605, `data19`=0 WHERE `entry`=202443; -- Dedication of Honor +UPDATE `gameobject_template` SET `type`=10 WHERE `entry`=166872; -- Supply Crate +UPDATE `gameobject_template` SET `data6`=-1000 WHERE `entry`=178559; -- Larva Spewer + +/* +GameObject (Entry: 126337 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126338 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126339 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126340 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126341 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126345 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 151951 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 191300 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +Gameobject (Entry: 188192 GoType: 3) have data7=188187 but GO (Entry 188187) have not GAMEOBJECT_TYPE_TRAP (6) type. +*/ -- cgit v1.2.3 From e3fd50b7f5af048501cc952499a87c277b9d22d3 Mon Sep 17 00:00:00 2001 From: Nay Date: Thu, 5 Apr 2012 17:42:19 +0100 Subject: This should have been commented out (@ previous commit) --- sql/updates/world/2012_04_05_00_world_gameobject_template.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_05_00_world_gameobject_template.sql b/sql/updates/world/2012_04_05_00_world_gameobject_template.sql index ab05bf43b86..d50c4ad8d1c 100644 --- a/sql/updates/world/2012_04_05_00_world_gameobject_template.sql +++ b/sql/updates/world/2012_04_05_00_world_gameobject_template.sql @@ -7,7 +7,7 @@ UPDATE `gameobject_template` SET `questItem1`=30527, `questItem2`=30524, `questI -- UPDATE `gameobject_template` SET `type`=5, `data3`=0, `data5`=0 WHERE `entry`=188187; -- Snow Pile UPDATE `gameobject_template` SET `size`=0.45 WHERE `entry`=190169; -- Tiger Lily UPDATE `gameobject_template` SET `unk1`='' WHERE `entry`=190549; -- The Zephyr -UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=191300; -- Fire +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=191300; -- Fire UPDATE `gameobject_template` SET `displayId`=7836 WHERE `entry`=196485; -- Saronite Rock -- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126337; -- 126337 -- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126338; -- 126338 -- cgit v1.2.3 From 9ae22e06f658f91b3064a2ac3f5dec9d2bde662a Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 5 Apr 2012 12:46:51 -0400 Subject: Core/Spells: Fix unrelenting assault not proccing aura when overpower is used while target is casting. Closes #5965 --- .../2012_04_05_00_world_spell_script_names.sql | 6 +++ src/server/scripts/Spells/spell_warrior.cpp | 46 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 sql/updates/world/2012_04_05_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_05_00_world_spell_script_names.sql b/sql/updates/world/2012_04_05_00_world_spell_script_names.sql new file mode 100644 index 00000000000..43f6760e8d6 --- /dev/null +++ b/sql/updates/world/2012_04_05_00_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` in (7384,7887,11584,11585); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(7384, 'spell_warr_overpower'), +(7887, 'spell_warr_overpower'), +(11584, 'spell_warr_overpower'), +(11585, 'spell_warr_overpower'); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 1084398c37d..c87c2e05289 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -413,6 +413,51 @@ class spell_warr_bloodthirst : public SpellScriptLoader } }; +enum Overpower +{ + SPELL_UNRELENTING_ASSAULT_RANK_1 = 46859, + SPELL_UNRELENTING_ASSAULT_RANK_2 = 46860, + SPELL_UNRELENTING_ASSAULT_TRIGGER_1 = 64849, + SPELL_UNRELENTING_ASSAULT_TRIGGER_2 = 64850, +}; + +class spell_warr_overpower : public SpellScriptLoader +{ +public: + spell_warr_overpower() : SpellScriptLoader("spell_warr_overpower") { } + + class spell_warr_overpower_SpellScript : public SpellScript + { + PrepareSpellScript(spell_warr_overpower_SpellScript); + + void HandleEffect(SpellEffIndex /* effIndex */) + { + uint32 spellId = 0; + if (GetCaster()->HasAura(SPELL_UNRELENTING_ASSAULT_RANK_1)) + spellId = SPELL_UNRELENTING_ASSAULT_TRIGGER_1; + else if (GetCaster()->HasAura(SPELL_UNRELENTING_ASSAULT_RANK_2)) + spellId = SPELL_UNRELENTING_ASSAULT_TRIGGER_2; + + if (!spellId) + return; + + Unit* target = GetHitUnit(); + if (target->HasUnitState(UNIT_STATE_CASTING)) + GetCaster()->CastSpell(target, spellId, true); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_warr_overpower_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_warr_overpower_SpellScript(); + } +}; + void AddSC_warrior_spell_scripts() { new spell_warr_last_stand(); @@ -424,4 +469,5 @@ void AddSC_warrior_spell_scripts() new spell_warr_execute(); new spell_warr_concussion_blow(); new spell_warr_bloodthirst(); + new spell_warr_overpower(); } -- cgit v1.2.3 From 4126e76862b3bfa2a1ac790af09d7e0e74318fc0 Mon Sep 17 00:00:00 2001 From: Subv Date: Thu, 5 Apr 2012 12:07:44 -0500 Subject: SQL/Spells: Fixed Libram of Veracity proc Closes #6022 Signed-off-by: Subv --- sql/updates/world/2012_04_05_01_world_spell_proc_event.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_05_01_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql b/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql new file mode 100644 index 00000000000..076f97b8736 --- /dev/null +++ b/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql @@ -0,0 +1,2 @@ +UPDATE `spell_proc_event` SET `SpellFamilyMask0`=0x80000000, `SpellFamilyMask1`=0 WHERE `entry`=67363; -- Fixes Libram of Veracity proc + -- cgit v1.2.3 From 7e793575be1748e244382225b23731de8b771e00 Mon Sep 17 00:00:00 2001 From: cookta2012 Date: Thu, 5 Apr 2012 17:43:06 -0500 Subject: Moving a commands around eliminating a unnecessary file, and porting the "demorph" command * moved the "wpgps" command into the cs_debug.cpp because it seems more fitting * organized the "modify speed" commands into a table of their own * moved the "gps" command into the cs_misc.cpp --- sql/updates/world/2012_04_04_00_world_command.sql | 10 ++ src/server/game/Chat/Chat.cpp | 1 - src/server/game/Chat/Commands/Level2.cpp | 16 --- src/server/game/Scripting/ScriptLoader.cpp | 2 - src/server/scripts/Commands/CMakeLists.txt | 1 - src/server/scripts/Commands/cs_debug.cpp | 11 ++ src/server/scripts/Commands/cs_gps.cpp | 144 ---------------------- src/server/scripts/Commands/cs_misc.cpp | 90 +++++++++++++- src/server/scripts/Commands/cs_modify.cpp | 40 ++++-- 9 files changed, 141 insertions(+), 174 deletions(-) create mode 100644 sql/updates/world/2012_04_04_00_world_command.sql delete mode 100644 src/server/scripts/Commands/cs_gps.cpp (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_04_00_world_command.sql b/sql/updates/world/2012_04_04_00_world_command.sql new file mode 100644 index 00000000000..9adb3cff1d9 --- /dev/null +++ b/sql/updates/world/2012_04_04_00_world_command.sql @@ -0,0 +1,10 @@ +DELETE FROM `command` WHERE `name` IN ('modify tp','modify bwalk','modify swim','modify fly','modify arena','modify aspeed','modify morph'); +INSERT INTO `command` (`name`, `security`, `help`) VALUES ('modify speed all', 1, 'Syntax: .modify aspeed #rate\r\n\r\nModify all speeds -run,swim,run back,swim back- of the selected player to "normalbase speed for this move type"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed backwalk', 1, 'Syntax: .modify speed backwalk #rate\r\n\r\nModify the speed of the selected player while running backwards to "normal walk back speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed fly', 1, '.modify speed fly #rate\nModify the flying speed of the selected player to "normal flying speed"*rate. If no player is selected, modify your speed.\n #rate may range from 0.1 to 50.'), +('modify speed swim', 1, 'Syntax: .modify speed swim #rate\r\n\r\nModify the swim speed of the selected player to "normal swim speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed walk', 1, 'Syntax: .modify speed bwalk #rate\r\n\r\nModify the speed of the selected player while running to "normal walk speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify talentpoints', 1, 'Syntax: .modify talentpoints #amount\r\n\r\nSet free talent points for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.'), +('morph', 2, 'Syntax: .morph #displayid\r\n\r\nChange your current model id to #displayid.'), +('modify arenapoints', 1, 'Syntax: .modify arenapoints #value\r\nAdd $amount arena points to the selected player.'); +UPDATE `command` SET `help`='Syntax: .modify speed $speedtype #rate\r\n\r\nModify the running speed of the selected player to "normal base run speed"= 1. If no player is selected, modify your speed.\r\n\r\n$speedtypes may be fly, all, walk, backwalk, or swim.\r\n\r\n #rate may range from 0.1 to 50.' WHERE `name`='modify speed' LIMIT 1; \ No newline at end of file diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 7a4c17d1c5e..48bb4c27ef8 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -359,7 +359,6 @@ ChatCommand* ChatHandler::getCommandTable() { "summon", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleSummonCommand>, "", NULL }, { "groupsummon", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleGroupSummonCommand>, "", NULL }, { "commands", SEC_PLAYER, true, OldHandler<&ChatHandler::HandleCommandsCommand>, "", NULL }, - { "demorph", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleDeMorphCommand>, "", NULL }, { "die", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleDieCommand>, "", NULL }, { "revive", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleReviveCommand>, "", NULL }, { "dismount", SEC_PLAYER, false, OldHandler<&ChatHandler::HandleDismountCommand>, "", NULL }, diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index cc638193b5a..52bdcd15163 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -205,22 +205,6 @@ bool ChatHandler::HandleItemMoveCommand(const char* args) return true; } -//demorph player or unit -bool ChatHandler::HandleDeMorphCommand(const char* /*args*/) -{ - Unit* target = getSelectedUnit(); - if (!target) - target = m_session->GetPlayer(); - - // check online security - else if (target->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)target, 0)) - return false; - - target->DeMorph(); - - return true; -} - //kick player bool ChatHandler::HandleKickPlayerCommand(const char *args) { diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 76c3f1c073c..8e95f1a05cd 100755 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -61,7 +61,6 @@ void AddSC_reload_commandscript(); void AddSC_tele_commandscript(); void AddSC_titles_commandscript(); void AddSC_wp_commandscript(); -void AddSC_gps_commandscript(); #ifdef SCRIPTS //world @@ -663,7 +662,6 @@ void AddCommandScripts() AddSC_tele_commandscript(); AddSC_titles_commandscript(); AddSC_wp_commandscript(); - AddSC_gps_commandscript(); } void AddWorldScripts() diff --git a/src/server/scripts/Commands/CMakeLists.txt b/src/server/scripts/Commands/CMakeLists.txt index d14e71aac4a..86fe984e197 100644 --- a/src/server/scripts/Commands/CMakeLists.txt +++ b/src/server/scripts/Commands/CMakeLists.txt @@ -17,7 +17,6 @@ set(scripts_STAT_SRCS Commands/cs_gm.cpp Commands/cs_go.cpp Commands/cs_gobject.cpp - Commands/cs_gps.cpp Commands/cs_honor.cpp Commands/cs_learn.cpp Commands/cs_misc.cpp diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 679bb450800..c7bcde01e9b 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -95,6 +95,7 @@ public: static ChatCommand commandTable[] = { { "debug", SEC_MODERATOR, true, NULL, "", debugCommandTable }, + { "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", NULL }, { NULL, SEC_PLAYER, false, NULL, "", NULL } }; return commandTable; @@ -1319,6 +1320,16 @@ public: return true; } + + static bool HandleWPGPSCommand(ChatHandler* handler, char const* /*args*/) + { + Player* player = handler->GetSession()->GetPlayer(); + + sLog->outSQLDev("(@PATH, XX, %.3f, %.3f, %.5f, 0,0, 0,100, 0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); + + handler->PSendSysMessage("Waypoint SQL written to SQL Developer log"); + return true; + } }; void AddSC_debug_commandscript() diff --git a/src/server/scripts/Commands/cs_gps.cpp b/src/server/scripts/Commands/cs_gps.cpp deleted file mode 100644 index 59e2ec90905..00000000000 --- a/src/server/scripts/Commands/cs_gps.cpp +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (C) 2008-2012 TrinityCore - * - * 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/* ScriptData -Name: gps_commandscript -%Complete: 100 -Comment: GPS/WPGPS commands -Category: commandscripts -EndScriptData */ - -#include "ObjectAccessor.h" -#include "ScriptMgr.h" -#include "Chat.h" -#include "CellImpl.h" - -class gps_commandscript : public CommandScript -{ -public: - gps_commandscript() : CommandScript("gps_commandscript") { } - - ChatCommand* GetCommands() const - { - static ChatCommand commandTable[] = - { - { "gps", SEC_ADMINISTRATOR, false, &HandleGPSCommand, "", NULL }, - { "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } - }; - return commandTable; - } - - static bool HandleGPSCommand(ChatHandler* handler, char const* args) - { - WorldObject* object = NULL; - if (*args) - { - uint64 guid = handler->extractGuidFromLink((char*)args); - if (guid) - object = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*handler->GetSession()->GetPlayer(), guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT); - - if (!object) - { - handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); - handler->SetSentErrorMessage(true); - return false; - } - } - else - { - object = handler->getSelectedUnit(); - - if (!object) - { - handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); - handler->SetSentErrorMessage(true); - return false; - } - } - - CellCoord cellCoord = Trinity::ComputeCellCoord(object->GetPositionX(), object->GetPositionY()); - Cell cell(cellCoord); - - uint32 zoneId, areaId; - object->GetZoneAndAreaId(zoneId, areaId); - - MapEntry const* mapEntry = sMapStore.LookupEntry(object->GetMapId()); - AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zoneId); - AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(areaId); - - float zoneX = object->GetPositionX(); - float zoneY = object->GetPositionY(); - - Map2ZoneCoordinates(zoneX, zoneY, zoneId); - - Map const* map = object->GetMap(); - float groundZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), MAX_HEIGHT); - float floorZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), object->GetPositionZ()); - - GridCoord gridCoord = Trinity::ComputeGridCoord(object->GetPositionX(), object->GetPositionY()); - - // 63? WHY? - int gridX = 63 - gridCoord.x_coord; - int gridY = 63 - gridCoord.y_coord; - - uint32 haveMap = Map::ExistMap(object->GetMapId(), gridX, gridY) ? 1 : 0; - uint32 haveVMap = Map::ExistVMap(object->GetMapId(), gridX, gridY) ? 1 : 0; - - if (haveVMap) - { - if (map->IsOutdoors(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ())) - handler->PSendSysMessage("You are outdoors"); - else - handler->PSendSysMessage("You are indoors"); - } - else - handler->PSendSysMessage("no VMAP available for area info"); - - handler->PSendSysMessage(LANG_MAP_POSITION, - object->GetMapId(), (mapEntry ? mapEntry->name[handler->GetSessionDbcLocale()] : ""), - zoneId, (zoneEntry ? zoneEntry->area_name[handler->GetSessionDbcLocale()] : ""), - areaId, (areaEntry ? areaEntry->area_name[handler->GetSessionDbcLocale()] : ""), - object->GetPhaseMask(), - object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation(), - cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(), - zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap); - - LiquidData liquidStatus; - ZLiquidStatus status = map->getLiquidStatus(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), MAP_ALL_LIQUIDS, &liquidStatus); - - if (status) - handler->PSendSysMessage(LANG_LIQUID_STATUS, liquidStatus.level, liquidStatus.depth_level, liquidStatus.entry, liquidStatus.type_flags, status); - - return true; - } - - static bool HandleWPGPSCommand(ChatHandler* handler, char const* /*args*/) - { - Player* player = handler->GetSession()->GetPlayer(); - - sLog->outSQLDev("(@PATH, XX, %.3f, %.3f, %.5f, 0,0, 0,100, 0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); - - handler->PSendSysMessage("Waypoint SQL written to SQL Developer log"); - return true; - } -}; - -void AddSC_gps_commandscript() -{ - new gps_commandscript(); -} diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 5f0434e5c55..7c431566f52 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -17,6 +17,9 @@ #include "ScriptPCH.h" #include "Chat.h" +#include "ObjectAccessor.h" +#include "ScriptMgr.h" +#include "CellImpl.h" class misc_commandscript : public CommandScript { @@ -27,7 +30,8 @@ public: { static ChatCommand commandTable[] = { - { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL }, + { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL }, + { "gps", SEC_ADMINISTRATOR, false, &HandleGPSCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; return commandTable; @@ -64,6 +68,90 @@ public: handler->SetSentErrorMessage(true); return false; } + + static bool HandleGPSCommand(ChatHandler* handler, char const* args) + { + WorldObject* object = NULL; + if (*args) + { + uint64 guid = handler->extractGuidFromLink((char*)args); + if (guid) + object = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*handler->GetSession()->GetPlayer(), guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT); + + if (!object) + { + handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); + handler->SetSentErrorMessage(true); + return false; + } + } + else + { + object = handler->getSelectedUnit(); + + if (!object) + { + handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); + handler->SetSentErrorMessage(true); + return false; + } + } + + CellCoord cellCoord = Trinity::ComputeCellCoord(object->GetPositionX(), object->GetPositionY()); + Cell cell(cellCoord); + + uint32 zoneId, areaId; + object->GetZoneAndAreaId(zoneId, areaId); + + MapEntry const* mapEntry = sMapStore.LookupEntry(object->GetMapId()); + AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zoneId); + AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(areaId); + + float zoneX = object->GetPositionX(); + float zoneY = object->GetPositionY(); + + Map2ZoneCoordinates(zoneX, zoneY, zoneId); + + Map const* map = object->GetMap(); + float groundZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), MAX_HEIGHT); + float floorZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), object->GetPositionZ()); + + GridCoord gridCoord = Trinity::ComputeGridCoord(object->GetPositionX(), object->GetPositionY()); + + // 63? WHY? + int gridX = 63 - gridCoord.x_coord; + int gridY = 63 - gridCoord.y_coord; + + uint32 haveMap = Map::ExistMap(object->GetMapId(), gridX, gridY) ? 1 : 0; + uint32 haveVMap = Map::ExistVMap(object->GetMapId(), gridX, gridY) ? 1 : 0; + + if (haveVMap) + { + if (map->IsOutdoors(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ())) + handler->PSendSysMessage("You are outdoors"); + else + handler->PSendSysMessage("You are indoors"); + } + else + handler->PSendSysMessage("no VMAP available for area info"); + + handler->PSendSysMessage(LANG_MAP_POSITION, + object->GetMapId(), (mapEntry ? mapEntry->name[handler->GetSessionDbcLocale()] : ""), + zoneId, (zoneEntry ? zoneEntry->area_name[handler->GetSessionDbcLocale()] : ""), + areaId, (areaEntry ? areaEntry->area_name[handler->GetSessionDbcLocale()] : ""), + object->GetPhaseMask(), + object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation(), + cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(), + zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap); + + LiquidData liquidStatus; + ZLiquidStatus status = map->getLiquidStatus(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), MAP_ALL_LIQUIDS, &liquidStatus); + + if (status) + handler->PSendSysMessage(LANG_LIQUID_STATUS, liquidStatus.level, liquidStatus.depth_level, liquidStatus.entry, liquidStatus.type_flags, status); + + return true; + } }; void AddSC_misc_commandscript() diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 32ee96dacfe..f62c434e2e5 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -33,6 +33,16 @@ public: ChatCommand* GetCommands() const { + static ChatCommand modifyspeedCommandTable[] = + { + { "fly", SEC_MODERATOR, false, &HandleModifyFlyCommand, "", NULL }, + { "all", SEC_MODERATOR, false, &HandleModifyASpeedCommand, "", NULL }, + { "walk", SEC_MODERATOR, false, &HandleModifySpeedCommand, "", NULL }, + { "backwalk", SEC_MODERATOR, false, &HandleModifyBWalkCommand, "", NULL }, + { "swim", SEC_MODERATOR, false, &HandleModifySwimCommand, "", NULL }, + { "", SEC_MODERATOR, false, &HandleModifyASpeedCommand, "", NULL }, + { NULL, 0, false, NULL, "", NULL } + }; static ChatCommand modifyCommandTable[] = { { "hp", SEC_MODERATOR, false, &HandleModifyHPCommand, "", NULL }, @@ -41,29 +51,26 @@ public: { "runicpower", SEC_MODERATOR, false, &HandleModifyRunicPowerCommand, "", NULL }, { "energy", SEC_MODERATOR, false, &HandleModifyEnergyCommand, "", NULL }, { "money", SEC_MODERATOR, false, &HandleModifyMoneyCommand, "", NULL }, - { "speed", SEC_MODERATOR, false, &HandleModifySpeedCommand, "", NULL }, - { "swim", SEC_MODERATOR, false, &HandleModifySwimCommand, "", NULL }, { "scale", SEC_MODERATOR, false, &HandleModifyScaleCommand, "", NULL }, { "bit", SEC_MODERATOR, false, &HandleModifyBitCommand, "", NULL }, - { "bwalk", SEC_MODERATOR, false, &HandleModifyBWalkCommand, "", NULL }, - { "fly", SEC_MODERATOR, false, &HandleModifyFlyCommand, "", NULL }, - { "aspeed", SEC_MODERATOR, false, &HandleModifyASpeedCommand, "", NULL }, { "faction", SEC_MODERATOR, false, &HandleModifyFactionCommand, "", NULL }, { "spell", SEC_MODERATOR, false, &HandleModifySpellCommand, "", NULL }, - { "tp", SEC_MODERATOR, false, &HandleModifyTalentCommand, "", NULL }, + { "talentpoints", SEC_MODERATOR, false, &HandleModifyTalentCommand, "", NULL }, { "mount", SEC_MODERATOR, false, &HandleModifyMountCommand, "", NULL }, { "honor", SEC_MODERATOR, false, &HandleModifyHonorCommand, "", NULL }, - { "rep", SEC_GAMEMASTER, false, &HandleModifyRepCommand, "", NULL }, - { "arena", SEC_MODERATOR, false, &HandleModifyArenaCommand, "", NULL }, + { "reputation", SEC_GAMEMASTER, false, &HandleModifyRepCommand, "", NULL }, + { "arenapoints", SEC_MODERATOR, false, &HandleModifyArenaCommand, "", NULL }, { "drunk", SEC_MODERATOR, false, &HandleModifyDrunkCommand, "", NULL }, { "standstate", SEC_GAMEMASTER, false, &HandleModifyStandStateCommand, "", NULL }, - { "morph", SEC_GAMEMASTER, false, &HandleModifyMorphCommand, "", NULL }, { "phase", SEC_ADMINISTRATOR, false, &HandleModifyPhaseCommand, "", NULL }, { "gender", SEC_GAMEMASTER, false, &HandleModifyGenderCommand, "", NULL }, + { "speed", SEC_MODERATOR, false, NULL, "", modifyspeedCommandTable }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand commandTable[] = { + { "morph", SEC_GAMEMASTER, false, &HandleModifyMorphCommand, "", NULL }, + { "demorph", SEC_GAMEMASTER, false, &HandleDeMorphCommand, "", NULL }, { "modify", SEC_MODERATOR, false, NULL, "", modifyCommandTable }, { NULL, 0, false, NULL, "", NULL } }; @@ -1374,6 +1381,21 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOUR_GENDER_CHANGED, gender_full, handler->GetNameLink().c_str()); + return true; + } +//demorph player or unit + static bool HandleDeMorphCommand(ChatHandler* handler, const char* /*args*/) + { + Unit* target = handler->getSelectedUnit(); + if (!target) + target = handler->GetSession()->GetPlayer(); + + // check online security + else if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer(), 0)) + return false; + + target->DeMorph(); + return true; } }; -- cgit v1.2.3 From e2cfef4a1abe9cdfee889cb75ed0685870980249 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 6 Apr 2012 16:00:05 +0100 Subject: DB/Spells: Fix DK T7 4p bonus for Death Strike Closes #6059 --- sql/updates/world/2012_04_06_00_world_spell_proc_event.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_04_06_00_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql b/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql new file mode 100644 index 00000000000..0fba3bb46d6 --- /dev/null +++ b/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql @@ -0,0 +1 @@ +UPDATE `spell_proc_event` SET `SpellFamilyMask0`=0x10 WHERE `entry`=60132; -- Oblit/Scourge Strike Runic Power Up (T7 4s) -- cgit v1.2.3 From d546a531c310312bd8b5406624f9facdb2ed6b88 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 6 Apr 2012 18:49:40 +0100 Subject: Core&DB/Spells: Fix DK T8 4p bonus - Added missing spell to DB - Corrected DBC data that is, very likely, wrong Closes #6062 --- sql/updates/world/2012_04_06_01_world_spell_dbc.sql | 3 +++ src/server/game/Spells/SpellMgr.cpp | 3 +++ src/server/shared/Utilities/Util.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_04_06_01_world_spell_dbc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_06_01_world_spell_dbc.sql b/sql/updates/world/2012_04_06_01_world_spell_dbc.sql new file mode 100644 index 00000000000..c0dc38ebf83 --- /dev/null +++ b/sql/updates/world/2012_04_06_01_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=64748; -- Item - Death Knight T8 Tank 4P Bonus +INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(64748,1,0,384,0,0,0,0,131080,0,0,0,0,0,1,0,0,101,0,0,80,80,28,1,0,-1,0,0,6,0,0,1,0,1,'0','0','0',-11,0,-11,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16777829,0,0,0,15,0,0,0,0,0,0,'1','1','1',0,32,'Item - Death Knight T8 Tank 4P Bonus'); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 895dc9ab4b7..a7fdb04e7b7 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3238,6 +3238,9 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->EffectDieSides[0] = 0; // was 1, that should probably mean seat 0, but instead it's treated as spell 1 spellInfo->EffectBasePoints[0] = 52391; // Ride Vehicle (forces seat 0) break; + case 64745: + spellInfo->EffectBasePoints[0] = 100; // 100% chance of procc'ing, not -10% (chance calculated in PrepareTriggersExecutedOnHit) + break; case 19970: // Entangling Roots (Rank 6) -- Nature's Grasp Proc case 19971: // Entangling Roots (Rank 5) -- Nature's Grasp Proc case 19972: // Entangling Roots (Rank 4) -- Nature's Grasp Proc diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index 4c2c1936993..4434ed36645 100755 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -73,7 +73,7 @@ inline uint32 secsToTimeBitFields(time_t secs) double rand_norm(void); /* Return a random double from 0.0 to 99.9999999999999. Floats support only 7 valid decimal digits. - * A double supports up to 15 valid decimal digits and is used internaly (RAND32_MAX has 10 digits). + * A double supports up to 15 valid decimal digits and is used internally (RAND32_MAX has 10 digits). * With an FPU, there is usually no difference in performance between float and double. */ double rand_chance(void); -- cgit v1.2.3 From bc3ea0d1f6a7f9f402cbec33d203d1cdd7ca9600 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 6 Apr 2012 19:17:36 +0100 Subject: DB/GOs: Add (custom) template for spell focus GO required by spell 70477 Thanks Altair, I guess.. --- sql/updates/world/2012_04_06_02_world_gameobject_template.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_06_02_world_gameobject_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_06_02_world_gameobject_template.sql b/sql/updates/world/2012_04_06_02_world_gameobject_template.sql new file mode 100644 index 00000000000..5089579998d --- /dev/null +++ b/sql/updates/world/2012_04_06_02_world_gameobject_template.sql @@ -0,0 +1,4 @@ +-- GO required by spell 70477 - Cleanse Quel'Delar +DELETE FROM `gameobject_template` WHERE `entry`=300246; +INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `faction`, `flags`, `size`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `data0`, `data1`, `data2`, `data3`, `data4`, `data5`, `data6`, `data7`, `data8`, `data9`, `data10`, `data11`, `data12`, `data13`, `data14`, `data15`, `data16`, `data17`, `data18`, `data19`, `data20`, `data21`, `data22`, `data23`, `AIName`, `ScriptName`, `WDBVerified`) VALUES +(300246, 8, 0, 'TEMP Sunwell', '', '', '', 0, 0, 1, 0, 0, 0, 0, 0, 0, 1641, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', 1); -- cgit v1.2.3 From a0744978804f7e77b61c683712bacb1cd632ed2c Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 6 Apr 2012 19:33:32 +0100 Subject: Core&DB/Spells: Fix Warr T8 4p bonus - Added missing spell to DB - Corrected DBC data that is, very likely, wrong Closes #2386 --- sql/updates/world/2012_04_06_03_world_spell_dbc.sql | 3 +++ src/server/game/Spells/SpellMgr.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_04_06_03_world_spell_dbc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_06_03_world_spell_dbc.sql b/sql/updates/world/2012_04_06_03_world_spell_dbc.sql new file mode 100644 index 00000000000..90ac4ac0f51 --- /dev/null +++ b/sql/updates/world/2012_04_06_03_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=64934; -- Item - Warrior T8 Protection 4P Bonus +INSERT INTO `spell_dbc`(`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(64934,1,0,384,0,0,0,0,131080,0,0,0,0,0,1,0,0,101,0,0,80,80,28,1,0,-1,0,0,6,0,0,1,0,1,'0','0','0',-21,0,-11,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16777829,0,0,0,4,0,0,0,0,0,0,'1','1','1',0,32, 'Item - Warrior T8 Protection 4P Bonus'); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index a7fdb04e7b7..cd51b8f2919 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3238,7 +3238,8 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->EffectDieSides[0] = 0; // was 1, that should probably mean seat 0, but instead it's treated as spell 1 spellInfo->EffectBasePoints[0] = 52391; // Ride Vehicle (forces seat 0) break; - case 64745: + case 64745: // Item - Death Knight T8 Tank 4P Bonus + case 64936: // Item - Warrior T8 Protection 4P Bonus spellInfo->EffectBasePoints[0] = 100; // 100% chance of procc'ing, not -10% (chance calculated in PrepareTriggersExecutedOnHit) break; case 19970: // Entangling Roots (Rank 6) -- Nature's Grasp Proc -- cgit v1.2.3 From 7dfebf57fc21fb41d0e70a8853d8359a42d90add Mon Sep 17 00:00:00 2001 From: Helias Date: Sat, 7 Apr 2012 15:10:04 +0100 Subject: DB/GOs: Add missing page_text data Data from UDB Closes #6074 --- .../world/2012_04_06_04_world_page_text.sql | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 sql/updates/world/2012_04_06_04_world_page_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_06_04_world_page_text.sql b/sql/updates/world/2012_04_06_04_world_page_text.sql new file mode 100644 index 00000000000..97c0d9afe2d --- /dev/null +++ b/sql/updates/world/2012_04_06_04_world_page_text.sql @@ -0,0 +1,25 @@ +DELETE FROM `page_text` WHERE entry IN (2177,2295,2296,2297,2301,2302,2303,2308,2309,3036,3045,3046,3047,3049,3050,3051,3052,3053,3378,3544,3563,3564,3565); +INSERT INTO `page_text` (`entry`, `text`, `next_page`) VALUES +(2177, 'Valea Twinblades \nWarrior of the Scarlet Crusade\nCitizen of Alterac \nLast seen deep in the Eastern Plaguelands', 0), +(2295, 'Before the Age of Memory, the gentle Earthmother breathed upon the golden mists of dawn. Where the amber clouds came to rest, there were endless fields of flowing wheat and barley. This was the basin of her works - the great basket of life and hope.', 2296), +(2296, 'The Earthmother\'s eyes shone down upon the lands she had breathed into creation. Her right eye, An\'she (the sun), gave warmth and light to the land. Her left eye, Mu\'sha (the moon), gave peace and sleep to the stirring creatures of the dawning. Such was the power of her gaze that the Earthmother closed one dreaming eye for every turning of the sky. Thus, her loving gaze turned day into night for the first dawning of the world. $B', 2297), +(2297, 'While the right eye shone down upon the golden dawn, the Earthmother\'s gentle hands spread out across the golden plains. Wherever the shadow of her arms passed, a noble people arose from the rich soil. The Shu\'halo (the tauren) arose to give thanks and prayer to their loving mother. There, in the endless fields of dawn, the children of the earth swore themselves to her grace and vowed to bless her name until the final darkening of the world.', 0), +(2301, 'Into the brave hearts of her pure children, the Earthmother placed the love of the hunt. For the creatures of the first dawn were savage and fierce. They hid from the Earthmother, finding solace in the shadows and the wild places of the land. The Shu\'halo hunted these beasts wherever they could be found and tamed them with the Earthmother\'s blessing. ', 2302), +(2302, 'One great spirit eluded them, however. Apa\'ro (known as Malorne to the night elves), was a proud stag of snow white fur. His antlers scraped the roof of the heavens and his mighty hooves stamped out the deep places of the world. The Shu\'halo hunted Apa\'ro to the corners of the dawning world - and closed in to snare the proud stag.', 2303), +(2303, 'Seeking to escape, the great stag leapt into the sky. Yet, as his escape seemed assured, his mighty antlers tangled in the stars which held him fast. Though he kicked and struggled, Apa\'ro could not loose himself from the heavens. It was then that Mu\'sha found him as she chased her brother, An\'she, towards the dawn. Mu\'sha saw the mighty stag as he struggled and fell in love with him immediately. ', 2304), +(2308, 'As the mists of dawn faded and the Age of Memory advanced, the demigod, Cenarius, went his own way through the fields of the world. The Shu\'halo (tauren) were sorrowful at his passing and forgot much of the druidism he had taught them. As the generations passed, they forgot how to speak with the trees and the wild things of the land. The dark whispers from the deeps of the world drifted up to their ears once again.', 2309), +(2309, 'Though the children of the earth closed out the evil whisperings, a terrible curse befell their roaming tribes. Out of the black lands of the west came a horde of murderous creatures - the centaur. Cannibals and ravagers, the centaur fell upon the Shu\'halo like a plague. Though the braves and hunters fought with the Earthmother\'s blessing in their hearts, the centaur could not be defeated.', 2310), +(3544, 'You have found the wreckage of a mysterious object. Beyond the flames, you are able to make out an insignia marked "M:1815212085". You wonder what world this object must be from...', 0), +(3378, 'INVINCIBLE$B$BBeloved steed of Prince Arthas Menethil$B$BLoyal and great of heart in life, may you find peace in death.$B$BPure streams and green pastures, devoted friend.', 0), +(3565, 'Gritting his teeth, Marcus gestured as light flashed over him, restoring his strength.$B$BTavi stared anxiously as he rose to his full height, engulfing her in his shadow. He thrust his hand forward, sending a wave of righteous force through her. Eyes rolled back as she wavered for several seconds before regaining consciousness.$B$B"I\'ve recently taken the path of... retribution."$B$BThe mischievous smirk returned to her face, "Well then, this is going to be fun."$B$B', 0), +(3564, 'Marcus took both her hands in one of his as he reassured her, "It\'s fine. What is your specialization?"$B$BHer head snapped up, eyes burning with renewed life as shadowy energy channeled through her hands into Marcus, dropping him to his knees in agony.$B$B"Affliction, actually."$B', 3565), +(3563, '"Interested in some more company?" she purred as her hands weaved through a complex summoning ritual, stopping only when she felt the warmth of a new presence behind her.$B$BAll color drained from Marcus\'s face as he struggled to protest. "I... I don\'t think that\'s appropriate."$B$BConfused, Tavi turned to see what was wrong. A hideous fel hound stood ready, drooling onto the floor as it stared intently at the half-armored paladin.$B$B"No! No that\'s not what I meant." she stammered as she dispelled the hungry demon. "I\'m sorry, that\'s not really my specialization...."', 3564), +(3045, 'First Watch, Eight Bells$BWatches changed. All is well.', 3046), +(3046, 'Middle Watch, One Bell$BCedric found attempting to break into Captain\'s wine cabinet. Disciplined.', 3047), +(3047, 'Middle Watch, Two Bells$BCedric climbed rigging, became tangled and fell. Attended by ship\'s surgeon. Sent below to sober up.', 3049), +(3049, 'Middle Watch, Four Bells$BBottle of rum found in Cedric\'s pants. Disciplined.', 3050), +(3050, 'Middle Watch, Five Bells$BCedric\'s clothes found. Cedric found separately. Cedric disciplined.', 3051), +(3051, 'Middle Watch, Six Bells$BCedric singing loudly. Woke Captain. Cedric disciplined by Captain.', 3052), +(3052, 'Middle Watch, Eight Bells$BWatches changed. All quiet. Two men sent to locate Cedric.$B', 3053), +(3053, 'Morning Watch, One Bell$BFire in Captain\'s quarters. All hands roused. Throwing powder overboard. ', 0), +(3036, 'The mighty creature\'s maw opened wide, tossing bolts of icy water toward our vessel. Those terrible jaws clamped down upon the bow of our ship, tearing it from the hull. Sailors and cargo were thrown violently into the sea as the remnants of the ship disappeared beneath the waves.$B$BThe last thing I remember was flying from the broken hull, hitting the inky waters, and plunging beneath the waves. The world went dark and I thought for certain I\'d drawn my last breath. When I awoke in Theramore\'s infirmary, I knew someone had to tell our story.', 0); -- cgit v1.2.3 From c2c8b62282efda6f1732ed1aff4e75e273fba635 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 7 Apr 2012 17:00:05 +0200 Subject: DB/Spawns: Added missing gameobject at Majordomo Executus area (damage on pile of coal) --- sql/updates/world/2012_04_07_00_world_gameobject.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_04_07_00_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_07_00_world_gameobject.sql b/sql/updates/world/2012_04_07_00_world_gameobject.sql new file mode 100644 index 00000000000..c63fc753d32 --- /dev/null +++ b/sql/updates/world/2012_04_07_00_world_gameobject.sql @@ -0,0 +1,5 @@ +UPDATE `gameobject_template` SET `faction`=54 WHERE `entry`=178164; +SET @GUID := 247; +DELETE FROM `gameobject` WHERE `guid`=@GUID; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,178164,409,1,1,736.6528,-1176.32,-118.0967,-0.6806787,0,0,0,1,120,255,1); -- Hot Coal, damage -- cgit v1.2.3 From 3d83f663f659ddf1d6894391dcfe50d4803a987f Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 7 Apr 2012 19:12:14 +0100 Subject: Core/Tickets: Add report time and current latency to lag_reports table It's a tiny bit more useful now. --- sql/updates/characters/2012_04_07_00_characters_lag_reports.sql | 2 ++ src/server/game/Handlers/TicketHandler.cpp | 2 ++ src/server/shared/Database/Implementation/CharacterDatabase.cpp | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 sql/updates/characters/2012_04_07_00_characters_lag_reports.sql (limited to 'sql/updates') diff --git a/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql b/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql new file mode 100644 index 00000000000..151ace1c976 --- /dev/null +++ b/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql @@ -0,0 +1,2 @@ +ALTER TABLE `lag_reports` ADD `latency` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `lag_reports` ADD `createTime` int(10) unsigned NOT NULL DEFAULT '0'; diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp index 9c4eba67426..d6675188f6e 100755 --- a/src/server/game/Handlers/TicketHandler.cpp +++ b/src/server/game/Handlers/TicketHandler.cpp @@ -176,6 +176,8 @@ void WorldSession::HandleReportLag(WorldPacket& recv_data) stmt->setFloat (3, x); stmt->setFloat (4, y); stmt->setFloat (5, z); + stmt->setUInt32(6, GetLatency()); + stmt->setUInt32(7, time(NULL)); CharacterDatabase.Execute(stmt); } diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 97207410159..a267a8b9d6d 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -335,7 +335,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() // GM Survey/subsurvey/lag report PREPARE_STATEMENT(CHAR_INS_GM_SURVEY, "INSERT INTO gm_surveys (guid, surveyId, mainSurvey, overallComment, createTime) VALUES (?, ?, ?, ?, UNIX_TIMESTAMP(NOW()))", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_INS_GM_SUBSURVEY, "INSERT INTO gm_subsurveys (surveyId, subsurveyId, rank, comment) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_INS_LAG_REPORT, "INSERT INTO lag_reports (guid, lagType, mapId, posX, posY, posZ) VALUES (?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_INS_LAG_REPORT, "INSERT INTO lag_reports (guid, lagType, mapId, posX, posY, posZ, latency, createTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) // For loading and deleting expired auctions at startup PREPARE_STATEMENT(CHAR_SEL_EXPIRED_AUCTIONS, "SELECT id, auctioneerguid, itemguid, itemEntry, itemowner, buyoutprice, time, buyguid, lastbid, startbid, deposit FROM auctionhouse ah INNER JOIN item_instance ii ON ii.guid = ah.itemguid WHERE ah.time <= ?", CONNECTION_SYNCH) -- cgit v1.2.3 From 59493a7f713cbe5b40aee3766a34e1a786470941 Mon Sep 17 00:00:00 2001 From: Vincent-Core Date: Sat, 7 Apr 2012 21:08:17 +0200 Subject: Db/GameEvent: Fix start_time for Noblegarden and Children's Week --- sql/updates/world/2012_04_07_01_world_game_event.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_07_01_world_game_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_07_01_world_game_event.sql b/sql/updates/world/2012_04_07_01_world_game_event.sql new file mode 100644 index 00000000000..7b74a90b49d --- /dev/null +++ b/sql/updates/world/2012_04_07_01_world_game_event.sql @@ -0,0 +1,2 @@ +UPDATE `game_event` SET `start_time` = '2012-04-08 00:01:00' WHERE `eventEntry` =9; -- Noblegarden +UPDATE `game_event` SET `start_time` = '2012-04-29 00:01:00' WHERE `eventEntry` =10; -- Children's Week -- cgit v1.2.3 From f17b990f6851279f1ed0b4d1afbd2b307c9c7d89 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 7 Apr 2012 16:58:56 -0500 Subject: Core/Spells: Fixed rogue T10 2P and 4P bonuses Closes #422 Signed-off-by: Subv --- .../world/2012_04_07_02_world_spell_proc_event.sql | 1 + src/server/game/Entities/Unit/Unit.cpp | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 sql/updates/world/2012_04_07_02_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql b/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql new file mode 100644 index 00000000000..62ef49bc657 --- /dev/null +++ b/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql @@ -0,0 +1 @@ +UPDATE `spell_proc_event` SET `procFlags`=0 WHERE `entry`=70805; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 431fc39d55b..cf14bb02ed9 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8672,6 +8672,26 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg } break; } + case SPELLFAMILY_ROGUE: + { + switch (auraSpellInfo->Id) + { + // Rogue T10 2P bonus, should only proc on caster + case 70805: + { + if (victim != this) + return false; + break; + } + // Rogue T10 4P bonus, should proc on victim + case 70803: + { + target = victim; + break; + } + } + break; + } default: break; } -- cgit v1.2.3 From 56766949fa4dcfec793351a011381e5708145c8f Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 8 Apr 2012 12:14:04 +0200 Subject: Scripts/Icecrown Citaldel * Timer improvements after air phase for Sindragosa * Added landing animation after air phase * Unchained Magic affects 6 targets on 25 man mode * --- .../2012_04_08_00_world_spell_script_names.sql | 3 ++ .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 43 +++++++++++++++++----- 2 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 sql/updates/world/2012_04_08_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_08_00_world_spell_script_names.sql b/sql/updates/world/2012_04_08_00_world_spell_script_names.sql new file mode 100644 index 00000000000..ca97f419e11 --- /dev/null +++ b/sql/updates/world/2012_04_08_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb_dummy'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(69712,'spell_sindragosa_ice_tomb_dummy'); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 6bf94eeaed2..843966e5b1f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -99,6 +99,8 @@ enum Events EVENT_LAND = 12, EVENT_AIR_MOVEMENT = 21, EVENT_THIRD_PHASE_CHECK = 22, + EVENT_AIR_MOVEMENT_FAR = 23, + EVENT_LAND_GROUND = 24, // Spinestalker EVENT_BELLOWING_ROAR = 13, @@ -134,6 +136,8 @@ enum MovementPoints POINT_AIR_PHASE = 3, POINT_TAKEOFF = 4, POINT_LAND = 5, + POINT_AIR_PHASE_FAR = 6, + POINT_LAND_GROUND = 7, }; enum Shadowmourne @@ -153,6 +157,8 @@ Position const SindragosaSpawnPos = {4818.700f, 2483.710f, 287.0650f, 3.089233f Position const SindragosaFlyPos = {4475.190f, 2484.570f, 234.8510f, 3.141593f}; Position const SindragosaLandPos = {4419.190f, 2484.570f, 203.3848f, 3.141593f}; Position const SindragosaAirPos = {4475.990f, 2484.430f, 247.9340f, 3.141593f}; +Position const SindragosaAirPosFar = {4525.600f, 2485.150f, 245.0820f, 3.141593f}; +Position const SindragosaFlyInPos = {4419.190f, 2484.360f, 232.5150f, 3.141593f}; class FrostwyrmLandEvent : public BasicEvent { @@ -311,16 +317,24 @@ class boss_sindragosa : public CreatureScript break; case POINT_AIR_PHASE: me->CastCustomSpell(SPELL_ICE_TOMB_TARGET, SPELLVALUE_MAX_TARGETS, RAID_MODE(2, 5, 2, 6), NULL); - events.ScheduleEvent(EVENT_FROST_BOMB, 8000); + me->SetFacingTo(float(M_PI)); + events.ScheduleEvent(EVENT_AIR_MOVEMENT_FAR, 1); + events.ScheduleEvent(EVENT_FROST_BOMB, 9000); + break; + case POINT_AIR_PHASE_FAR: + me->SetFacingTo(float(M_PI)); + events.ScheduleEvent(EVENT_LAND, 30000); break; case POINT_LAND: + events.ScheduleEvent(EVENT_LAND_GROUND, 1); + break; + case POINT_LAND_GROUND: me->SetCanFly(false); me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetReactState(REACT_DEFENSIVE); if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); - DoStartMovement(me->getVictim()); _isInAirPhase = false; // trigger Asphyxiation summons.DoAction(NPC_ICE_TOMB, ACTION_TRIGGER_ASPHYXIATION); @@ -442,7 +456,6 @@ class boss_sindragosa : public CreatureScript break; case EVENT_ICY_GRIP: DoCast(me, SPELL_ICY_GRIP); - events.ScheduleEvent(EVENT_ICY_GRIP, urand(70000, 75000), EVENT_GROUP_LAND_PHASE); events.ScheduleEvent(EVENT_BLISTERING_COLD, 1000, EVENT_GROUP_LAND_PHASE); break; case EVENT_BLISTERING_COLD: @@ -461,19 +474,21 @@ class boss_sindragosa : public CreatureScript me->SetDisableGravity(true); me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetReactState(REACT_PASSIVE); + me->AttackStop(); Position pos; pos.Relocate(me); pos.m_positionZ += 17.0f; me->GetMotionMaster()->MoveTakeoff(POINT_TAKEOFF, pos, 8.30078125f); - events.DelayEvents(45000, EVENT_GROUP_LAND_PHASE); + events.CancelEventGroup(EVENT_GROUP_LAND_PHASE); events.ScheduleEvent(EVENT_AIR_PHASE, 110000); - events.RescheduleEvent(EVENT_UNCHAINED_MAGIC, urand(55000, 60000), EVENT_GROUP_LAND_PHASE); - events.ScheduleEvent(EVENT_LAND, 45000); break; } case EVENT_AIR_MOVEMENT: me->GetMotionMaster()->MovePoint(POINT_AIR_PHASE, SindragosaAirPos); break; + case EVENT_AIR_MOVEMENT_FAR: + me->GetMotionMaster()->MovePoint(POINT_AIR_PHASE_FAR, SindragosaAirPosFar); + break; case EVENT_ICE_TOMB: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_ICE_TOMB_UNTARGETABLE)) { @@ -490,15 +505,23 @@ class boss_sindragosa : public CreatureScript destZ = 205.0f; // random number close to ground, get exact in next call me->UpdateGroundPositionZ(destX, destY, destZ); me->CastSpell(destX, destY, destZ, SPELL_FROST_BOMB_TRIGGER, false); - events.ScheduleEvent(EVENT_FROST_BOMB, urand(5000, 10000)); + events.ScheduleEvent(EVENT_FROST_BOMB, urand(6000, 8000)); break; } case EVENT_LAND: { events.CancelEvent(EVENT_FROST_BOMB); - me->GetMotionMaster()->MovePoint(POINT_LAND, SindragosaLandPos); + me->GetMotionMaster()->MovePoint(POINT_LAND, SindragosaFlyInPos); break; } + case EVENT_LAND_GROUND: + events.ScheduleEvent(EVENT_CLEAVE, urand(13000, 15000), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_TAIL_SMASH, urand(19000, 23000), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_FROST_BREATH, urand(10000, 15000), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, urand(12000, 17000), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_ICY_GRIP, urand(35000, 40000), EVENT_GROUP_LAND_PHASE); + me->GetMotionMaster()->MoveLand(POINT_LAND_GROUND, SindragosaLandPos, 0.0f); + break; case EVENT_THIRD_PHASE_CHECK: { if (!_isInAirPhase) @@ -1071,8 +1094,8 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader void FilterTargets(std::list& unitList) { - unitList.remove_if (UnchainedMagicTargetSelector()); - uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 5 : 2); + unitList.remove_if(UnchainedMagicTargetSelector()); + uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 2); if (unitList.size() > maxSize) Trinity::RandomResizeList(unitList, maxSize); } -- cgit v1.2.3 From 01fc695bad2ce0da12feb04e7df5b07c09144869 Mon Sep 17 00:00:00 2001 From: Discover- Date: Sun, 8 Apr 2012 13:18:58 +0200 Subject: Database/Misc: Template updates for Gymer. Author: Faq Closes #6089 --- sql/updates/world/2012_04_08_00_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_08_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_08_00_world_creature_template.sql b/sql/updates/world/2012_04_08_00_world_creature_template.sql new file mode 100644 index 00000000000..c6665729b75 --- /dev/null +++ b/sql/updates/world/2012_04_08_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Gymer +UPDATE `creature_template` SET `unit_class`=4,`spell1`=55426,`spell2`=55429,`spell3`=55516,`spell4`=55421,`VehicleId`=205 WHERE `entry`=29884; -- cgit v1.2.3 From 5e485cba769d3b640d56a00ea179a8ee0090febc Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 8 Apr 2012 15:15:16 +0200 Subject: Scripts/Icecrown Citadel: Fixed Mystic Buffet applying on targets hidden behind Ice Tombs --- .../2012_04_08_00_world_creature_template.sql | 2 -- .../2012_04_08_01_world_creature_template.sql | 2 ++ .../2012_04_08_02_world_spell_script_names.sql | 6 ++++ .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 41 ++++++++++++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) delete mode 100644 sql/updates/world/2012_04_08_00_world_creature_template.sql create mode 100644 sql/updates/world/2012_04_08_01_world_creature_template.sql create mode 100644 sql/updates/world/2012_04_08_02_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_08_00_world_creature_template.sql b/sql/updates/world/2012_04_08_00_world_creature_template.sql deleted file mode 100644 index c6665729b75..00000000000 --- a/sql/updates/world/2012_04_08_00_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Gymer -UPDATE `creature_template` SET `unit_class`=4,`spell1`=55426,`spell2`=55429,`spell3`=55516,`spell4`=55421,`VehicleId`=205 WHERE `entry`=29884; diff --git a/sql/updates/world/2012_04_08_01_world_creature_template.sql b/sql/updates/world/2012_04_08_01_world_creature_template.sql new file mode 100644 index 00000000000..c6665729b75 --- /dev/null +++ b/sql/updates/world/2012_04_08_01_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Gymer +UPDATE `creature_template` SET `unit_class`=4,`spell1`=55426,`spell2`=55429,`spell3`=55516,`spell4`=55421,`VehicleId`=205 WHERE `entry`=29884; diff --git a/sql/updates/world/2012_04_08_02_world_spell_script_names.sql b/sql/updates/world/2012_04_08_02_world_spell_script_names.sql new file mode 100644 index 00000000000..dd23c9ef560 --- /dev/null +++ b/sql/updates/world/2012_04_08_02_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_mystic_buffet'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(70127,'spell_sindragosa_mystic_buffet'), +(72528,'spell_sindragosa_mystic_buffet'), +(72529,'spell_sindragosa_mystic_buffet'), +(72530,'spell_sindragosa_mystic_buffet'); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 843966e5b1f..514bd112894 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1280,6 +1280,46 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader } }; +class MysticBuffetTargetFilter +{ + public: + explicit MysticBuffetTargetFilter(Unit* caster) : _caster(caster) { } + + bool operator()(Unit* unit) + { + return !unit->IsWithinLOSInMap(_caster); + } + + private: + Unit* _caster; +}; + +class spell_sindragosa_mystic_buffet : public SpellScriptLoader +{ + public: + spell_sindragosa_mystic_buffet() : SpellScriptLoader("spell_sindragosa_mystic_buffet") { } + + class spell_sindragosa_mystic_buffet_SpellScript : public SpellScript + { + PrepareSpellScript(spell_sindragosa_mystic_buffet_SpellScript); + + void FilterTargets(std::list& unitList) + { + unitList.remove_if(MysticBuffetTargetFilter(GetCaster())); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_sindragosa_mystic_buffet_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_sindragosa_mystic_buffet_SpellScript(); + } +}; + class spell_rimefang_icy_blast : public SpellScriptLoader { public: @@ -1505,6 +1545,7 @@ void AddSC_boss_sindragosa() new spell_sindragosa_frost_beacon(); new spell_sindragosa_ice_tomb(); new spell_sindragosa_icy_grip(); + new spell_sindragosa_mystic_buffet(); new spell_rimefang_icy_blast(); new spell_frostwarden_handler_order_whelp(); new spell_frostwarden_handler_focus_fire(); -- cgit v1.2.3 From 1922314858dee5be395a3eb2307e37cda8e094f2 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 8 Apr 2012 15:24:13 +0100 Subject: DB/Spells: Add a missing spell (Blessed Life) to spell_dbc Made with love, for Subv. --- sql/updates/world/2012_04_08_02_world_spell_dbc.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_04_08_02_world_spell_dbc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_08_02_world_spell_dbc.sql b/sql/updates/world/2012_04_08_02_world_spell_dbc.sql new file mode 100644 index 00000000000..5775428668d --- /dev/null +++ b/sql/updates/world/2012_04_08_02_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=31934; -- Blessed Life +INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(31934,0,0,384,0,0,0,0,0,0,0,131072,0,0,1,0,1048576,100,1,0,0,0,21,1,0,-1,0,0,6,0,0,1,0,0,'0','0','0',-51,0,0,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',127,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,'1','0','0',0,0,'Blessed Life'); -- cgit v1.2.3 From e309c4fe1b4d141dc49faef307c443aa7c595580 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 8 Apr 2012 18:56:36 -0500 Subject: Core/Spells: Fixed Riptide bonus on Chain Heal closes #1152 Signed-off-by: Subv --- .../2012_04_08_03_world_spell_script_names.sql | 3 ++ src/server/game/Spells/SpellEffects.cpp | 11 ------ src/server/scripts/Spells/spell_shaman.cpp | 46 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 sql/updates/world/2012_04_08_03_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_08_03_world_spell_script_names.sql b/sql/updates/world/2012_04_08_03_world_spell_script_names.sql new file mode 100644 index 00000000000..744a8bad10d --- /dev/null +++ b/sql/updates/world/2012_04_08_03_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=-1064; +INSERT INTO `spell_script_names` VALUES +(-1064, 'spell_sha_chain_heal'); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 97e75a0c6db..4e05c9fdac2 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1614,17 +1614,6 @@ void Spell::EffectHeal(SpellEffIndex /*effIndex*/) // Lifebloom - final heal coef multiplied by original DoT stack else if (m_spellInfo->Id == 33778) addhealth = caster->SpellHealingBonus(unitTarget, m_spellInfo, addhealth, HEAL, m_spellValue->EffectBasePoints[1]); - // Riptide - increase healing done by Chain Heal - else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags[0] & 0x100) - { - addhealth = caster->SpellHealingBonus(unitTarget, m_spellInfo, addhealth, HEAL); - if (AuraEffect* aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_SHAMAN, 0, 0, 0x10, m_originalCasterGUID)) - { - addhealth = int32(addhealth * 1.25f); - // consume aura - unitTarget->RemoveAura(aurEff->GetBase()); - } - } // Death Pact - return pct of max health to caster else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] & 0x00080000) addhealth = caster->SpellHealingBonus(unitTarget, m_spellInfo, int32(caster->CountPctFromMaxHealth(damage)), HEAL); diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 96ee7a18429..5b5a48f33af 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -542,6 +542,51 @@ class spell_sha_lava_lash : public SpellScriptLoader } }; +// 1064 Chain Heal +class spell_sha_chain_heal : public SpellScriptLoader +{ + public: + spell_sha_chain_heal() : SpellScriptLoader("spell_sha_chain_heal") { } + + class spell_sha_chain_heal_SpellScript : public SpellScript + { + PrepareSpellScript(spell_sha_chain_heal_SpellScript); + + void HandleHeal(SpellEffIndex /*effIndex*/) + { + if (firstHeal) + { + // Check if the target has Riptide + if (AuraEffect* aurEff = GetHitUnit()->GetAuraEffect(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_SHAMAN, 0, 0, 0x10, GetCaster()->GetGUID())) + { + riptide = true; + // Consume it + GetHitUnit()->RemoveAura(aurEff->GetBase()); + } + firstHeal = false; + } + // Riptide increases the Chain Heal effect by 25% + if (riptide) + SetHitHeal(GetHitHeal() * 1.25f); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + firstHeal = true; + riptide = false; + } + + bool firstHeal; + bool riptide; + + }; + + SpellScript* GetSpellScript() const + { + return new spell_sha_chain_heal_SpellScript(); + } +}; void AddSC_shaman_spell_scripts() { @@ -556,4 +601,5 @@ void AddSC_shaman_spell_scripts() new spell_sha_healing_stream_totem(); new spell_sha_mana_spring_totem(); new spell_sha_lava_lash(); + new spell_sha_chain_heal(); } -- cgit v1.2.3 From 490809147baae2364e845614a989847088da9a92 Mon Sep 17 00:00:00 2001 From: Jildor Date: Wed, 11 Apr 2012 18:07:29 +0200 Subject: DB/Spells: Fix Honor Among Thieves proc --- sql/updates/world/2012_04_11_00_world_spell_proc_event.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_11_00_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_11_00_world_spell_proc_event.sql b/sql/updates/world/2012_04_11_00_world_spell_proc_event.sql new file mode 100644 index 00000000000..e5dfbeb0e66 --- /dev/null +++ b/sql/updates/world/2012_04_11_00_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +-- Honor Among Thieves proc +UPDATE `spell_proc_event` SET `CustomChance`=33 WHERE `entry`=51698; -- Rank 1 +UPDATE `spell_proc_event` SET `CustomChance`=66 WHERE `entry`=51700; -- Rank 2 +UPDATE `spell_proc_event` SET `CustomChance`=100 WHERE `entry`=51701; -- Rank 3 -- cgit v1.2.3 From f60e9a4f8470ad1aee888795a54bf40b8ad0ae98 Mon Sep 17 00:00:00 2001 From: kaelima Date: Thu, 12 Apr 2012 01:11:12 +0200 Subject: DB/Creature: Use proper model for Celestial Steed - fixes some animations Closes #6166 --- sql/updates/world/2012_04_12_00_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_12_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_12_00_world_creature_template.sql b/sql/updates/world/2012_04_12_00_world_creature_template.sql new file mode 100644 index 00000000000..ef4596939f5 --- /dev/null +++ b/sql/updates/world/2012_04_12_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Update proper modelid for Celestial Steed (31957 is wrong) +UPDATE `creature_template` SET `modelid1`=31958,`modelid2`=0 WHERE `entry`=40625; -- cgit v1.2.3 From 636d553aa83106e57efae5bef0d20d5ed31e98c3 Mon Sep 17 00:00:00 2001 From: kaelima Date: Thu, 12 Apr 2012 01:32:56 +0200 Subject: DB/WDB: Remove temp entry 68686 and replace with existing wdbverified (doesnt really fix anything, just for the sake of using proper entries) --- sql/updates/world/2012_04_12_01_world_creature_template.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_04_12_01_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_12_01_world_creature_template.sql b/sql/updates/world/2012_04_12_01_world_creature_template.sql new file mode 100644 index 00000000000..bfe7b698ae9 --- /dev/null +++ b/sql/updates/world/2012_04_12_01_world_creature_template.sql @@ -0,0 +1,6 @@ +UPDATE `creature_template` SET `WDBVerified`=12340 WHERE `entry`=40624; -- Verified + +-- Remove temp entry 68686 and replace with wdb verified 38686 +UPDATE `creature_template` SET `difficulty_entry_3`=38686 WHERE `entry`=36950; +UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`exp`=2,`faction_A`=84,`faction_H`=84,`mindmg`=488,`maxdmg`=642,`attackpower`=782,`unit_flags`=32832,`dynamicflags`=8,`minrangedmg`=363,`maxrangedmg`=521,`rangedattackpower`=121 WHERE `entry`=38686; +DELETE FROM `creature_template` WHERE `entry`=68686; -- cgit v1.2.3 From 40309110acae2e621db67dc221fb03a145cf84a0 Mon Sep 17 00:00:00 2001 From: tobmaps Date: Thu, 12 Apr 2012 01:50:09 +0200 Subject: DB/Spell Bonus Data: - Set 0 values for some spells that should never scale with spell power. If some have been left out please report an issue. - Set 20% ap coefficient for Howling Blast Closes #6163 Closes #4166 Closes #436 --- .../world/2012_04_12_02_world_spell_bonus_data.sql | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql b/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql new file mode 100644 index 00000000000..a6386c4285d --- /dev/null +++ b/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql @@ -0,0 +1,29 @@ +-- Druid +UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (779,1822,60089); +DELETE FROM `spell_bonus_data` WHERE `entry` IN (1079,9007,22568); +INSERT INTO `spell_bonus_data` VALUES +(1079,0,0,-1,-1, 'Druid - Rip'), +(9007,0,0,-1,-1, 'Druid - Pounce Bleed'), +(22568,0,0,-1,-1, 'Druid - Ferocious Bite'); + +-- Hunter +UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (3044,3674,53352,13812,13797,1978,42243); +UPDATE `spell_bonus_data` SET `ap_dot_bonus`=0.1 WHERE `entry`=13812; +DELETE FROM `spell_bonus_data` WHERE `entry` IN (24131,53353); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(24131,0,0,-1,-1, 'Hunter - Wyvern Sting (triggered)'), +(53353,0,0,-1,-1, 'Hunter - Chimera Shot (Serpent)'); +DELETE FROM `spell_ranks` WHERE `first_spell_id`=24131; +INSERT INTO `spell_ranks` VALUES +(24131,24131,1), +(24131,24134,2), +(24131,24135,3), +(24131,27069,4), +(24131,49009,5), +(24131,49010,6); + +-- Rogue +UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (2818,2819,11353,11354,25349,26968,27187,57969,57970); + +-- Howling blast +UPDATE `spell_bonus_data` SET `ap_bonus`=0.2 WHERE `entry`=49184; -- cgit v1.2.3 From 2b2ebfaac0c3250954745e1d993f2b4fbcf5c7ed Mon Sep 17 00:00:00 2001 From: kaelima Date: Thu, 12 Apr 2012 02:12:07 +0200 Subject: DB/Spell Bonus Data: Fix more spell power stacking exploits (items & enchants) Thanks Hitplusone, amort and SignFinder for the list Closes #1701 --- sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql | 2 +- sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql b/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql index a6386c4285d..db35f5d97ee 100644 --- a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql +++ b/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql @@ -1,7 +1,7 @@ -- Druid UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (779,1822,60089); DELETE FROM `spell_bonus_data` WHERE `entry` IN (1079,9007,22568); -INSERT INTO `spell_bonus_data` VALUES +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES (1079,0,0,-1,-1, 'Druid - Rip'), (9007,0,0,-1,-1, 'Druid - Pounce Bleed'), (22568,0,0,-1,-1, 'Druid - Ferocious Bite'); diff --git a/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql b/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql new file mode 100644 index 00000000000..d2262e52e98 --- /dev/null +++ b/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql @@ -0,0 +1,8 @@ +-- Fixes some spell power stacking exploits +DELETE FROM `spell_bonus_data` WHERE `entry` IN (44525,18798,16614,7712,13897); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(44525,0,0,-1,-1, 'Enchant Weapon - Icebreaker'), +(18798,0,0,-1,-1, 'Item - Freezing Band'), +(16614,0,0,-1,-1, 'Item - Storm Gauntlets'), +(7712,0,0,-1,-1, 'Item - Fiery Retributer | Blazefury Medallion'), +(13897,0,0,-1,-1, 'Enchant Weapon - Fiery Weapon'); -- cgit v1.2.3 From bdaf5e134174ea72ddab0f696b15608d78774384 Mon Sep 17 00:00:00 2001 From: kaelima Date: Thu, 12 Apr 2012 08:05:22 +0200 Subject: DB/Creature: Fix the fly/land animations for Invincible --- sql/updates/world/2012_04_12_04_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_12_04_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_12_04_world_creature_template.sql b/sql/updates/world/2012_04_12_04_world_creature_template.sql new file mode 100644 index 00000000000..35664ec5198 --- /dev/null +++ b/sql/updates/world/2012_04_12_04_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Update modelid for Invincible (with not bugged animation) +UPDATE `creature_template` SET `modelid1`=31007,`modelid2`=0,`WDBVerified`=-12340 WHERE `entry`=38545; -- cgit v1.2.3 From 4daafd0c938f52de7184ea72d47ed8a0db960efb Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 12 Apr 2012 13:29:22 +0200 Subject: Forgot to stage SQL from my previous commit. (.hover command) --- sql/updates/world/2012_04_12_05_world_command.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_12_05_world_command.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_12_05_world_command.sql b/sql/updates/world/2012_04_12_05_world_command.sql new file mode 100644 index 00000000000..8eb87155cb2 --- /dev/null +++ b/sql/updates/world/2012_04_12_05_world_command.sql @@ -0,0 +1,2 @@ +DELETE FROM `trinity_string` WHERE `entry` IN(555,556); +DELETE FROM `command` WHERE `name`='hover'; -- cgit v1.2.3 From 397d84488343c1c32e2253e9f51c6deedcb24e9b Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 13 Apr 2012 16:18:30 +0100 Subject: DB/SAI: Revert some mistakes in SAI db data (target_types were added to action_param6; contiguous fields) Please, don't do this error. --- sql/updates/world/2012_04_13_00_world_sai.sql | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 sql/updates/world/2012_04_13_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_13_00_world_sai.sql b/sql/updates/world/2012_04_13_00_world_sai.sql new file mode 100644 index 00000000000..0fd4bdddd9b --- /dev/null +++ b/sql/updates/world/2012_04_13_00_world_sai.sql @@ -0,0 +1,25 @@ +UPDATE `smart_scripts` SET `target_type`=`action_param6` WHERE +(`entryorguid`=369200 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=369201 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=4) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=2) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=1) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=911700 AND `source_type`=9 AND `id`=3); + +UPDATE `smart_scripts` SET `action_param6`=0 WHERE +(`entryorguid`=369200 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=369201 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=4) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=2) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=1) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=911700 AND `source_type`=9 AND `id`=3); -- cgit v1.2.3 From c1ba60d68cdb1f3acf97a2b94fe336b35cf4c777 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 13 Apr 2012 12:41:36 -0400 Subject: DB: various db fixes from patches. authors are mentioned above the patches. closes #2169, closes #3344, closes #4162, closes #3530, closes #5982, closes #5849, closes #6098, closes #5569, closes #5493, closes #5510, closes #5470, closes #5408, closes #5406, closes #4875, closes #5457, closes #4467, closes #4043, closes #3899, closes #3859, closes #3518. signed off by nayd --- sql/updates/world/2012_04_13_01_world_misc.sql | 219 +++++++++++++++++++++++++ 1 file changed, 219 insertions(+) create mode 100644 sql/updates/world/2012_04_13_01_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_13_01_world_misc.sql b/sql/updates/world/2012_04_13_01_world_misc.sql new file mode 100644 index 00000000000..fbcae4f3756 --- /dev/null +++ b/sql/updates/world/2012_04_13_01_world_misc.sql @@ -0,0 +1,219 @@ +-- Gnomish Playback Device (item 52709) Targeting condition -- by norfik closes #2169 +DELETE FROM `conditions` WHERE `SourceEntry`=74222 AND `ConditionValue1` IN (1268, 7955, 6119); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 74222, 1, 19, 1268, 0, 0, 63, '', 'Gnomish Playback Device on Ozzie Togglevolt'), +(17, 0, 74222, 2, 19, 7955, 0, 0, 63, '', 'Gnomish Playback Device on Milli Featherwhistle'), +(17, 0, 74222, 3, 19, 6119, 0, 0, 63, '', 'Gnomish Playback Device on Tog Rustsprocket'); + +-- fix revenge ap coeff -- by ric101 closes #3344 +UPDATE spell_bonus_data SET ap_bonus = 0.310 WHERE entry = 6572; + +-- fix life seed sp coeff -- by warpten closes #4162 +DELETE FROM `spell_bonus_data` WHERE `entry`=48503; +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(48503,0,0,0,0, 'Druid - Living Seed Heal'); + +-- fix glyph of shadowflame proc only allow on damage. by kandera closes #3530 +UPDATE `spell_proc_event` SET `procEx` = procEx|262144 WHERE`entry` = 63310; -- Glyph of shadowflame fix + +-- Disable deprecated quests /in 2.4/ from Midsummer Festival - The Festival of Fire {A/H} by trista closes #5982 +DELETE FROM `Disables` WHERE `sourceType` = 1 AND `entry` in (9367,9368); +INSERT INTO `Disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,9367,0,0,0,'Disable quest The Festival of Fire {A}/Deprecated after 2.4 Midsummer Festival revamp/'), +(1,9368,0,0,0,'Disable quest The Festival of Fire {H}/Deprecated after 2.4 Midsummer Festival revamp/'); + +-- fix gameobject spawn for just maces sign -- by mrsmite closes #5849 +DELETE FROM `gameobject` WHERE `guid` = 10714; +UPDATE `gameobject` SET `guid` = 10714 WHERE `guid` = 61895 AND `id` = 2157; + +-- update npc texts. by helias closes #6098 +DELETE FROM `npc_text` WHERE `ID` IN (10719,10782,10783,10787,10788,2838,9072,9110,10310,13293,13641,14089,15077,15155,15240,15412,15866,15873,15877,8663,8244,8254,8255,8282,8291,8296,8298,11093,3464,4776,4713,12130,13002,9984,12977,12978,10918,10999,10986,10991); +INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `lang0`, `prob0`, `em0_0`, `em0_1`, `em0_2`, `em0_3`, `em0_4`, `em0_5`) VALUES +(10719, '$B$BWorry not, child. Look in your pack and you will find it once more.', NULL, 0, 1, 0, 0, 0, 0, 0, 0), +(10782, 'Sayoc, da ugly orc here, teach you daggers. You want teaching in other places, you talk to Ileda in da Farstrider Square of Silvermoon or Archibald in the War Quarter of Undercity, hokay?', 'Sayoc, da ugly orc here, teach you daggers. You want teaching in other places, you talk to Ileda in da Farstrider Square of Silvermoon or Archibald in the War Quarter of Undercity, hokay?', 1, 1, 0, 0, 0, 0, 0, 0), +(10783, 'You want to punch things, yah? Talk to Sayoc right here. He teach you.', 'You want to punch things, yah? Talk to Sayoc right here. He teach you.', 1, 1, 0, 0, 0, 0, 0, 0), +(10787, 'Ileda of da blood elves, in Farstrider Square of Silvermoon, train her students in both one and two-handed swords. Archibald, da Undercity"s weapon master, also train you, mon. He in da War Quarter.', 'Ileda of da blood elves, in Farstrider Square of Silvermoon, train her students in both one and two-handed swords. Archibald, da Undercity"s weapon master, also train you, mon. He in da War Quarter.', 1, 1, 0, 0, 0, 0, 0, 0), +(10788, 'Hanashi here knows staves. If you want a sturdier instructor, go to Thunder Bluff. Ansekhwa will teach you on the lower central rise there.', '', 1, 1, 0, 0, 0, 0, 0, 0), +(2838, '', 'Sure thing, $N. Here"s another for you.', 0, 1, 0, 0, 0, 0, 0, 0), +(9072, 'A search of the corpse"s clothing and equipment reveals the insignia you need, undamaged by the battle and foul environment.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(9110, 'Say, you happen to see that arch in the lake to the west? I wonder where that goes? I should go divin" over there.', '', 0, 1, 0, 1, 0, 0, 0, 0), +(10310, 'You must be exalted with the blood elves before I will teach you a riding skill, $c.', '', 1, 1, 0, 1, 0, 0, 0, 0), +(13293, 'Please hurry, $N. I am in a great deal of pain and time is running out.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(13641, '', '', 0, 1, 0, 0, 0, 0, 0, 0), +(14089, 'I"ve got a lead on Norgannon"s keystone, which guards access to Ulduar"s archives, but the Titans divided it into two pieces and secreted them away.$B$BOne of the pieces, the keystone"s shell, is held within the Inventor"s Library on the northern coast, south of Ulduar itself. The first thing you"ll need to do is retrieve the fragments of an access disk from the library"s guardians.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15077, 'There you are! I was beginning to think that the Sunreavers had intercepted you. Are you ready to deliver the tome to our representatives in Icecrown?', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15155, 'These appear to be the remains of Thalorien Dawnseeker, the last wielder of Quel"Delar.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15240, 'I will escort you into the Sunwell when you"re ready.', 'I will escort you into the Sunwell when you"re ready.', 0, 1, 0, 0, 0, 0, 0, 0), +(15412, 'We got the final barrier blockin" entry to Frostwing Halls down, $g lad:lass;. Only Sindragosa stands between the Lich King and divine retribution! What are ye waitin" for?!', '', 0, 1, 0, 5, 0, 0, 0, 0), +(15866, 'De Darkspears have a home again! An" we couldn"t have done it wit"out ya helpin", $N. Now, we celebrate!', '', 0, 1, 0, 1, 0, 1, 0, 0), +(15873, 'Vol"jin told me ta keep hittin" da drum till he gets back. If ya be waitin" for him, he"d be back soon to take back da Isles.$B$BJust wait here and enjoy da music!', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15877, 'We require da help of allies on da islands.$B$BZen"tabra has been watching over da animals of de Islands for some time now. We"d need her help and da help of da animal creatures.$B$BBwonsamdi is a powerful loa dat controls de spirits of de dead on da islands. His blessing is crucial for our attack.$B$BOnce our allies have joined us, Zalazane and his army of mind-controlled trolls will have no chance! Then, da Echo Isles will be de Darkspears!', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8663, 'Thank you for delivering that list! My leg is almost recovered enough that I"ll be able to walk back to the crash site.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8244, 'We"ve been so wrapped up in this war, some of us forgot to make time for love.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8254, 'You work with machines for so long, sometimes you forget about real hearts.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8255, '', 'When you have lived as long as I, it becomes easy to forget about love for years. It is always good to be reminded.', 0, 1, 0, 0, 0, 0, 0, 0), +(8282, '', 'You look like you"ve had your heart broken. Come back when you"re not so sad.', 0, 1, 0, 25, 0, 153, 0, 0), +(8291, 'What, you don"t have a token to give me? Don"t you love me?', '', 0, 1, 0, 18, 0, 0, 0, 0), +(8296, 'It looks like you"ve already found love. You can give me a love token, but I"m not giving you anything nice. I"m waiting for someone special.', 'It looks like you"ve already found love. You can give me a love token, but I"m not giving you anything nice. I"m waiting for someone special.', 0, 1, 0, 1, 0, 0, 0, 0), +(8298, 'I"d like you better if you would apply some perfume.', 'I"d like you better if you would apply some perfume.', 0, 1, 0, 24, 0, 0, 0, 0), +(11093, 'Let"s get out of here!', '', 0, 1, 0, 5, 0, 0, 0, 0), +(3464, '', 'You do fine work, but it"s a bit rough around the edges. Don"t worry about it, it will come with practice. Speaking of which, how about we see what you"ve been working on?', 7, 1, 0, 0, 0, 0, 0, 0), +(4776, 'The battle is over, and the people of Darrowshire are saved.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(4713, 'The Nightmare is finally over! Darrowshire, forgive me!', '', 0, 1, 0, 15, 0, 0, 0, 0), +(12130, '', '', 0, 1, 0, 0, 0, 0, 0, 0), +(13002, 'There ya go, mon. Try ta be more careful with this one, won"t ya?$b$bNow head down ta Drak"Zin Ruins and drink it near the pedestal!', NULL, 0, 1, 0, 0, 0, 0, 0, 0), +(9984, 'What are ye doin" here?! Get yer chatty self ta Alterac Vallery, where ye"re needed!', '', 7, 1, 1, 5, 0, 0, 0, 0), +(12977, 'Blight, Blight, Blight... that"s all I hear about around here. I miss the diversity!$b$bHere, here. You have pets, yes? Of course you do. Of course. Little pets. I have a mixture for them. It will make them ca-- ah, clever and strong creatures, yes. Yes. ', '', 1, 1, 396, 5, 0, 0, 0, 0), +(12978, 'Careful with it. It"s unstable and loses its potency quickly. Use it soon! And... preferably within eyesight, yes...', '', 1, 1, 5, 0, 0, 0, 0, 0), +(10918, 'The boy"s too stupid still to say it -- not enough crystal exposure yet -- but, he"s thankful for what you did in getting him those flasks.$B$BNow, only nine more sons to go. Gah!$B$B$B$BWant to take one of them off of our hands? We"ll sell him to you cheap.', '', 0, 1, 0, 1, 0, 5, 0, 6), +(10999, 'Friend! It"s been too long. What can we get for you?', '', 0, 1, 1, 1, 0, 0, 0, 0), +(10986, 'Our drinks should quench even the mightiest of thirsts.', '', 0, 1, 1, 396, 0, 0, 0, 0), +(10991, 'What can I say, $N? Yer the finest o" the Sha"tari Skyguard!$B$BJust don"t be lettin" that go ta yer head. I can still teach ya a thing or two, $G lad : lass;!$B$B', '', 0, 0, 0, 0, 0, 0, 0, 0); + +-- Fix Kor'kron War Rider flying by trista closes #5569 +UPDATE `creature_template` SET `inhabittype`=5,`speed_walk`=1, `speed_run`=1 WHERE `entry`=26813; + +-- Gretta the Arbiter (Storm Peaks, Brunhilldar) by mweinelt closes #5493 +-- Daily Quest Pooling +-- Source: http://www.wowwiki.com/Gretta_the_Arbiter +SET @pool_id := 354; + +DELETE FROM `pool_template` WHERE `entry` = @pool_id; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES +(@pool_id, 1, 'Gretta the Arbiter - Daily Quests'); + +DELETE FROM `pool_quest` WHERE `entry` IN (13424, 13423, 13422, 13425); +INSERT INTO `pool_quest` (`entry`, `pool_entry`, `description`) VALUES +(13424, @pool_id, 'Back to the Pit'), +(13423, @pool_id, 'Defending Your Title'), +(13422, @pool_id, 'Maintaining Discipline'), +(13425, @pool_id, 'The Aberrations Must Die'); + +-- Pathing for Arzeth the Merciless Entry: 19354 by kiperr closes #5510 +SET @NPC := 69051; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-617.6182,`position_y`=4800.323,`position_z`=38.53064 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-546.5514,4799.893,33.83914,0,0,0,100,0), +(@PATH,2,-512.5808,4799.929,32.09928,0,0,0,100,0), +(@PATH,3,-480.9247,4799.97,28.25657,0,0,0,100,0), +(@PATH,4,-512.6269,4799.873,32.09928,0,0,0,100,0), +(@PATH,5,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,6,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,7,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,8,-617.6182,4800.323,38.53064,0,0,0,100,0), +(@PATH,9,-659.4124,4799.819,49.09505,0,0,0,100,0), +(@PATH,10,-582.4199,4800.242,34.97715,0,0,0,100,0), +(@PATH,11,-546.5514,4799.893,33.83914,0,0,0,100,0), +(@PATH,12,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,13,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,14,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,15,-617.6182,4800.323,38.53064,0,0,0,100,0), +(@PATH,16,-659.4124,4799.819,49.09505,0,0,0,100,0), +(@PATH,17,-512.5808,4799.929,32.09928,0,0,0,100,0), +(@PATH,18,-480.9247,4799.97,28.25657,0,0,0,100,0), +(@PATH,19,-512.6269,4799.873,32.09928,0,0,0,100,0), +(@PATH,20,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,21,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,22,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,23,-617.6182,4800.323,38.53064,0,0,0,100,0), +(@PATH,24,-659.4124,4799.819,49.09505,0,0,0,100,0), +(@PATH,25,-582.4199,4800.242,34.97715,0,0,0,100,0), +(@PATH,26,-512.6269,4799.873,32.09928,0,0,0,100,0), +(@PATH,27,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,28,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,29,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,30,-617.6182,4800.323,38.53064,0,0,0,100,0); + +-- Dark Portal - corrects the entry position and orientation by cdawg closes #5470 +UPDATE `areatrigger_teleport` SET `target_position_x`=-248.149292, `target_position_y`=921.874953, `target_position_z`=84.388448, `target_orientation`=1.584155 WHERE `id`=4354; + +-- Add pamphlets to mail loot by gecko32 closes #5408 +DELETE FROM `mail_loot_template` WHERE `entry` BETWEEN 224 AND 233; +INSERT INTO `mail_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(224, 46875, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Elwynn Forest +(225, 46876, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Darnassus +(226, 46877, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Dun Morogh drawf +(227, 46879, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Azuremyst Isle +(228, 46878, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Dun Morogh gnome +(229, 46884, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Mulgore +(230, 46883, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Durator +(231, 46880, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Orgrimmar +(232, 46882, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Eversong Woods +(233, 46881, 100, 1, 0, 1, 1); -- Riding Training Pamphlet Tirisfal Glades + +-- fix coordinates for cannoneer whessan by mosoo closes #5406 +UPDATE `creature` SET `position_x`=-2093.53, `position_y`=-3496.47, `position_z`=130.084, `orientation`=3.008 WHERE `id`=3455 LIMIT 1; + +-- fix quest requirement for the last of her kind by shlomi 1515 closes #4875 +UPDATE `quest_template` SET `PrevQuestID` = 12900 WHERE `id` = 12983; + +-- Add rep reward to ICC25 Trash by gecko32 closes #5457 +DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (37655,38031,38057,38058,38059,38061,38062,38063,38064,38072,38073,38074,38075,38076,38098,38099,38100,38101,38102,38103,38105,38108,38110,38126,38130,38131,38132,38133,38139,38151,38219,38220,38418,38445,38446,38479,38480,38481); +INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES +(37655, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Decaying colossus +(38031, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Deathbound Ward +(38057, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Servant of the throne +(38058, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Nerub'ar Broodkeeper +(38059, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ancient Skeletal Soldier +(38061, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- The Damned +(38062, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Plague Scientist +(38063, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Vengeful Fleshreaper +(38064, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Stinky +(38072, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Attedent +(38073, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Disciple +(38074, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Deathspeacker High Preist +(38075, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Servant +(38076, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Zealot +(38098, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Advisor +(38099, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Archmage +(38100, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Blood Knight +(38101, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Lieutenant +(38102, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Commander +(38103, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Precious +(38105, 1156, 0, 7, 0, 2, 0, 0, 0, 0), -- Plagued Zombie +(38108, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Blighted Abomination +(38110, 1156, 0, 7, 0, 30, 0, 0, 0, 0), -- Pustulating Horror +(38126, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Frostbinder +(38130, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Deathbringer +(38131, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Huntress +(38132, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Battle-Maiden +(38133, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Warlord +(38139, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frostwarden Handler +(38151, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frostwing Whelp +(38219, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Spinestalker +(38220, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Rimefang +(38418, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Val'kyr Herald +(38445, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Spire Minion +(38446, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frenzied Abomination +(38479, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Tactician +(38480, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Noble +(38481, 1156, 0, 7, 0, 15, 0, 0, 0, 0); -- Spire Gargoyle + +-- fix procs by warpten closes #4467 for +-- Needle-Encrusted Scorpion +DELETE FROM `spell_proc_event` WHERE `entry`=71404; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(71404,0,0,0,0,0,0,2,0,0,50); + +-- Black Magic +DELETE FROM `spell_proc_event` WHERE `entry`=59630; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(59630,0,0,0,0,0,0,0,0,0,35); + +-- Environment Creature Hight Update by shlomi1515 closes #4043 +UPDATE `creature` SET `position_z`=558.210022 WHERE `guid` IN (85141,85143,85154,85153,85142,85151,85152,85150); +UPDATE `creature` SET `position_z`=586.302 WHERE `guid` IN (85145,85144,85146); +UPDATE `creature` SET `position_z`=586.263 WHERE `guid` IN (85147,85148,85149); + +-- fix winterskorn raider not landing by nayd closes #3899 +UPDATE `creature_template` SET `InhabitType`=`InhabitType`|1 WHERE `entry`=23665; + +-- fix head of onyxia's loot closes by kandera #3851 +UPDATE `item_template` SET `flags` = flags|4096 WHERE `entry` IN (18422,18423,49644,49643); + +-- fix visual for plagued dragonsflayer tribesman by shlomi1515 closes #3518 +DELETE FROM `creature_addon` WHERE `guid` = 97540; -- cgit v1.2.3 From 3f796d4f9fba311c05da0bef430420524d8b5921 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 13 Apr 2012 13:07:17 -0400 Subject: SQL: fix a few mistakes in a previous commit --- sql/updates/world/2012_04_13_01_world_misc.sql | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_13_01_world_misc.sql b/sql/updates/world/2012_04_13_01_world_misc.sql index fbcae4f3756..e4d04449a3f 100644 --- a/sql/updates/world/2012_04_13_01_world_misc.sql +++ b/sql/updates/world/2012_04_13_01_world_misc.sql @@ -1,12 +1,12 @@ -- Gnomish Playback Device (item 52709) Targeting condition -- by norfik closes #2169 -DELETE FROM `conditions` WHERE `SourceEntry`=74222 AND `ConditionValue1` IN (1268, 7955, 6119); +DELETE FROM `conditions` WHERE `SourceEntry`=74222 AND `ConditionValue2` IN (1268, 7955, 6119); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES -(17, 0, 74222, 1, 19, 1268, 0, 0, 63, '', 'Gnomish Playback Device on Ozzie Togglevolt'), -(17, 0, 74222, 2, 19, 7955, 0, 0, 63, '', 'Gnomish Playback Device on Milli Featherwhistle'), -(17, 0, 74222, 3, 19, 6119, 0, 0, 63, '', 'Gnomish Playback Device on Tog Rustsprocket'); +(17, 0, 74222, 1, 31, 3, 1268, 0, 63, '', 'Gnomish Playback Device on Ozzie Togglevolt'), +(17, 0, 74222, 2, 31, 3, 7955, 0, 63, '', 'Gnomish Playback Device on Milli Featherwhistle'), +(17, 0, 74222, 3, 31, 3, 6119, 0, 63, '', 'Gnomish Playback Device on Tog Rustsprocket'); -- fix revenge ap coeff -- by ric101 closes #3344 -UPDATE spell_bonus_data SET ap_bonus = 0.310 WHERE entry = 6572; +UPDATE `spell_bonus_data` SET `ap_bonus` = 0.310 WHERE `entry` = 6572; -- fix life seed sp coeff -- by warpten closes #4162 DELETE FROM `spell_bonus_data` WHERE `entry`=48503; @@ -17,8 +17,8 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus` UPDATE `spell_proc_event` SET `procEx` = procEx|262144 WHERE`entry` = 63310; -- Glyph of shadowflame fix -- Disable deprecated quests /in 2.4/ from Midsummer Festival - The Festival of Fire {A/H} by trista closes #5982 -DELETE FROM `Disables` WHERE `sourceType` = 1 AND `entry` in (9367,9368); -INSERT INTO `Disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (9367,9368); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES (1,9367,0,0,0,'Disable quest The Festival of Fire {A}/Deprecated after 2.4 Midsummer Festival revamp/'), (1,9368,0,0,0,'Disable quest The Festival of Fire {H}/Deprecated after 2.4 Midsummer Festival revamp/'); -- cgit v1.2.3 From c055a8617d4011395d7c2bfe39a8b475e65c5955 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 13 Apr 2012 19:53:42 +0200 Subject: Scripts/Icecrown Citadel * Fixed Professor Putricide Tear Gas stunning himself * Fixed visual of Unstable Experiment * Fixed oozes not picking new targets after hitting old * Fixed Gas Cloud not using melee attack * Removed ooze summon position hack Closes #4301 Closes #2726 Closes #5119 Closes #4464 Closes #2874 Closes #4407 Closes #2421 Closes #4899 --- sql/updates/world/2012_04_13_02_world_misc.sql | 18 +++ src/server/game/Entities/Unit/Unit.cpp | 9 +- src/server/game/Spells/SpellMgr.cpp | 6 +- .../IcecrownCitadel/boss_professor_putricide.cpp | 158 ++++++++++++++------- src/server/shared/Database/DatabaseWorkerPool.h | 4 +- 5 files changed, 128 insertions(+), 67 deletions(-) create mode 100644 sql/updates/world/2012_04_13_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_13_02_world_misc.sql b/sql/updates/world/2012_04_13_02_world_misc.sql new file mode 100644 index 00000000000..7c71af78cd7 --- /dev/null +++ b/sql/updates/world/2012_04_13_02_world_misc.sql @@ -0,0 +1,18 @@ +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (38308,38309,37824); -- Professor Putricide triggers +UPDATE `creature_template` SET `ScriptName`='npc_gas_cloud' WHERE `entry`=37562; -- Gas Cloud +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_putricide_ooze_summon'; +DELETE FROM `spell_target_position` WHERE `id` IN (71413,71414); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(71414,631,4335.00,3206.75,389.399,0), +(71413,631,4380.43,3206.55,389.398,0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (71615,71618,71412,71415); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(13,4,71615,31,3,37690,'Putricide - Tear Gas on Slime Puddle'), +(13,1,71618,31,3,37562,'Putricide - Tear Gas on Gas Cloud'), +(13,2,71618,31,3,37697,'Putricide - Tear Gas on Volatile Ooze'), +(13,4,71618,31,3,38159,'Putricide - Tear Gas on Choking Gas Bomb'); + +UPDATE `spell_script_names` SET `ScriptName`='spell_putricide_clear_aura_effect_value' WHERE `ScriptName`='spell_putricide_clear_mutated_plague'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(71620,'spell_putricide_clear_aura_effect_value'); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 8ecd22ec629..0550e7bbfda 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7396,8 +7396,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere if (GetTypeId() != TYPEID_PLAYER || !victim || !victim->isAlive() || !castItem || !castItem->IsEquipped()) return false; - Player* player = ToPlayer(); - WeaponAttackType attType = WeaponAttackType(player->GetAttackBySlot(castItem->GetSlot())); + WeaponAttackType attType = WeaponAttackType(Player::GetAttackBySlot(castItem->GetSlot())); if ((attType != BASE_ATTACK && attType != OFF_ATTACK) || (attType == BASE_ATTACK && procFlag & PROC_FLAG_DONE_OFFHAND_ATTACK) || (attType == OFF_ATTACK && procFlag & PROC_FLAG_DONE_MAINHAND_ATTACK)) @@ -7985,11 +7984,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp for (uint8 i = 1; i < stack; ++i) dmg += mod * stack; if (Unit* caster = triggeredByAura->GetCaster()) - { caster->CastCustomSpell(70701, SPELLVALUE_BASE_POINT0, dmg); - if (Creature* creature = caster->ToCreature()) - creature->DespawnOrUnsummon(1); - } break; } // Ball of Flames Proc @@ -17576,7 +17571,7 @@ bool Unit::SetWalk(bool enable) return true; } -bool Unit::SetDisableGravity(bool disable, bool packetOnly /*= false*/) +bool Unit::SetDisableGravity(bool disable, bool /*packetOnly = false*/) { if (disable == IsLevitating()) return false; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 80ed1972a5d..05431ef0a16 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3347,9 +3347,9 @@ void SpellMgr::LoadDbcDataCorrections() case 70460: // Coldflame Jets (Traps after Saurfang) spellInfo->DurationIndex = 1; // 10 seconds break; - case 71413: // Green Ooze Summon (Professor Putricide) - case 71414: // Orange Ooze Summon (Professor Putricide) - spellInfo->EffectImplicitTargetA[0] = TARGET_DEST_DEST; + case 71412: // Green Ooze Summon (Professor Putricide) + case 71415: // Orange Ooze Summon (Professor Putricide) + spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_TARGET_ANY; break; case 71159: // Awaken Plagued Zombies spellInfo->DurationIndex = 21; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 541e52fb922..273f2a20b4b 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -64,6 +64,9 @@ enum Spells SPELL_MALLEABLE_GOO = 70852, SPELL_UNSTABLE_EXPERIMENT = 70351, SPELL_TEAR_GAS = 71617, // phase transition + SPELL_TEAR_GAS_CREATURE = 71618, + SPELL_TEAR_GAS_CANCEL = 71620, + SPELL_TEAR_GAS_PERIODIC_TRIGGER = 73170, SPELL_CREATE_CONCOCTION = 71621, SPELL_GUZZLE_POTIONS = 71893, SPELL_OOZE_TANK_PROTECTION = 71770, // protects the tank @@ -86,6 +89,7 @@ enum Spells SPELL_GASEOUS_BLOAT_PROC = 70215, SPELL_GASEOUS_BLOAT = 70672, SPELL_GASEOUS_BLOAT_PROTECTION = 70812, + SPELL_EXPUNGED_GAS = 70701, // Volatile Ooze SPELL_OOZE_ERUPTION = 70492, @@ -595,13 +599,15 @@ class boss_professor_putricide : public CreatureScript break; case EVENT_TEAR_GAS: me->GetMotionMaster()->MovePoint(POINT_TABLE, tablePos); + DoCast(me, SPELL_TEAR_GAS_PERIODIC_TRIGGER, true); break; case EVENT_RESUME_ATTACK: me->SetReactState(REACT_DEFENSIVE); AttackStart(me->getVictim()); // remove Tear Gas + me->RemoveAurasDueToSpell(SPELL_TEAR_GAS_PERIODIC_TRIGGER); instance->DoRemoveAurasDueToSpellOnPlayers(71615); - instance->DoRemoveAurasDueToSpellOnPlayers(71618); + DoCastAOE(SPELL_TEAR_GAS_CANCEL); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_GAS_VARIABLE); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_OOZE_VARIABLE); break; @@ -699,27 +705,36 @@ class npc_volatile_ooze : public CreatureScript public: npc_volatile_ooze() : CreatureScript("npc_volatile_ooze") { } - struct npc_volatile_oozeAI : public ScriptedAI + struct npc_putricide_oozeAI : public ScriptedAI { - npc_volatile_oozeAI(Creature* creature) : ScriptedAI(creature) + npc_putricide_oozeAI(Creature* creature) : ScriptedAI(creature) { _newTargetSelectTimer = 0; } void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) { - if (!_newTargetSelectTimer && sSpellMgr->GetSpellDifficultyId(spell->Id) == sSpellMgr->GetSpellDifficultyId(SPELL_OOZE_ERUPTION)) + if (!_newTargetSelectTimer && spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_OOZE_ERUPTION, me)) + _newTargetSelectTimer = 1000; + } + + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (spell->Id == SPELL_TEAR_GAS_CREATURE) _newTargetSelectTimer = 1000; } void UpdateAI(uint32 const diff) { - if (!UpdateVictim()) + if (!UpdateVictim() && !_newTargetSelectTimer) return; if (!_newTargetSelectTimer) return; + if (me->HasAura(SPELL_TEAR_GAS_CREATURE)) + return; + if (_newTargetSelectTimer <= diff) { _newTargetSelectTimer = 0; @@ -730,13 +745,68 @@ class npc_volatile_ooze : public CreatureScript } private: - // no need to use EventMap for just one event uint32 _newTargetSelectTimer; }; CreatureAI* GetAI(Creature* creature) const { - return GetIcecrownCitadelAI(creature); + return GetIcecrownCitadelAI(creature); + } +}; + +class npc_gas_cloud : public CreatureScript +{ + public: + npc_gas_cloud() : CreatureScript("npc_gas_cloud") { } + + struct npc_gas_cloudAI : public ScriptedAI + { + npc_gas_cloudAI(Creature* creature) : ScriptedAI(creature) + { + _newTargetSelectTimer = 0; + } + + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + { + if (!_newTargetSelectTimer && spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_EXPUNGED_GAS, me)) + _newTargetSelectTimer = 1000; + } + + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (spell->Id == SPELL_TEAR_GAS_CREATURE) + _newTargetSelectTimer = 1000; + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim() && !_newTargetSelectTimer) + return; + + DoMeleeAttackIfReady(); + + if (!_newTargetSelectTimer) + return; + + if (me->HasAura(SPELL_TEAR_GAS_CREATURE)) + return; + + if (_newTargetSelectTimer <= diff) + { + _newTargetSelectTimer = 0; + me->CastCustomSpell(SPELL_GASEOUS_BLOAT, SPELLVALUE_AURA_STACK, 10, me, false); + } + else + _newTargetSelectTimer -= diff; + } + + private: + uint32 _newTargetSelectTimer; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI(creature); } }; @@ -755,8 +825,8 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader if (Unit* caster = GetCaster()) { target->RemoveAuraFromStack(GetSpellInfo()->Id, GetCasterGUID()); - if (!target->HasAura(GetId())&& caster->GetTypeId() == TYPEID_UNIT) - caster->ToCreature()->DespawnOrUnsummon(); + if (!target->HasAura(GetId())) + caster->CastCustomSpell(SPELL_GASEOUS_BLOAT, SPELLVALUE_AURA_STACK, 10, caster, false); } } @@ -823,7 +893,19 @@ class spell_putricide_ooze_channel : public SpellScriptLoader void StartAttack() { GetCaster()->ClearUnitState(UNIT_STATE_CASTING); + GetCaster()->DeleteThreatList(); GetCaster()->ToCreature()->AI()->AttackStart(GetHitUnit()); + GetCaster()->AddThreat(GetHitUnit(), 500000000.0f); // value seen in sniff + } + + // temporary, until SelectTarget are not called on empty lists + void CheckTarget() + { + if (_target) + return; + + FinishCast(SPELL_FAILED_NO_VALID_TARGETS); + GetCaster()->ToCreature()->DespawnOrUnsummon(1); // despawn next update } void Register() @@ -832,6 +914,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader OnUnitTargetSelect += SpellUnitTargetFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnUnitTargetSelect += SpellUnitTargetFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); AfterHit += SpellHitFn(spell_putricide_ooze_channel_SpellScript::StartAttack); + OnCast += SpellCastFn(spell_putricide_ooze_channel_SpellScript::CheckTarget); } Unit* _target; @@ -931,13 +1014,13 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader uint32 stage = GetCaster()->ToCreature()->AI()->GetData(DATA_EXPERIMENT_STAGE); Creature* target = NULL; std::list creList; - GetCreatureListWithEntryInGrid(creList, GetCaster(), NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER, 100.0f); + GetCreatureListWithEntryInGrid(creList, GetCaster(), NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER, 200.0f); // 2 of them are spawned at green place - weird trick blizz for (std::list::iterator itr = creList.begin(); itr != creList.end(); ++itr) { target = *itr; std::list tmp; - GetCreatureListWithEntryInGrid(tmp, target, NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER, 1.0f); + GetCreatureListWithEntryInGrid(tmp, target, NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER, 10.0f); if ((!stage && tmp.size() > 1) || (stage && tmp.size() == 1)) break; } @@ -957,42 +1040,6 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader } }; -class spell_putricide_ooze_summon : public SpellScriptLoader -{ - public: - spell_putricide_ooze_summon() : SpellScriptLoader("spell_putricide_ooze_summon") { } - - class spell_putricide_ooze_summon_AuraScript : public AuraScript - { - PrepareAuraScript(spell_putricide_ooze_summon_AuraScript); - - void HandleTriggerSpell(AuraEffect const* aurEff) - { - PreventDefaultAction(); - if (Unit* caster = GetCaster()) - { - uint32 triggerSpellId = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell; - float x, y, z; - GetTarget()->GetPosition(x, y, z); - z = GetTarget()->GetMap()->GetHeight(GetTarget()->GetPhaseMask(), x, y, z, true, 25.0f); - x += 10.0f * cosf(caster->GetOrientation()); - y += 10.0f * sinf(caster->GetOrientation()); - caster->CastSpell(x, y, z, triggerSpellId, true, NULL, NULL, GetCasterGUID()); - } - } - - void Register() - { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_putricide_ooze_summon_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - } - }; - - AuraScript* GetAuraScript() const - { - return new spell_putricide_ooze_summon_AuraScript(); - } -}; - class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader { public: @@ -1455,14 +1502,15 @@ class spell_putricide_regurgitated_ooze : public SpellScriptLoader } }; -class spell_putricide_clear_mutated_plague : public SpellScriptLoader +// Removes aura with id stored in effect value +class spell_putricide_clear_aura_effect_value : public SpellScriptLoader { public: - spell_putricide_clear_mutated_plague() : SpellScriptLoader("spell_putricide_clear_mutated_plague") { } + spell_putricide_clear_aura_effect_value() : SpellScriptLoader("spell_putricide_clear_aura_effect_value") { } - class spell_putricide_clear_mutated_plague_SpellScript : public SpellScript + class spell_putricide_clear_aura_effect_value_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_clear_mutated_plague_SpellScript); + PrepareSpellScript(spell_putricide_clear_aura_effect_value_SpellScript); void HandleScript(SpellEffIndex effIndex) { @@ -1473,13 +1521,13 @@ class spell_putricide_clear_mutated_plague : public SpellScriptLoader void Register() { - OnEffectHitTarget += SpellEffectFn(spell_putricide_clear_mutated_plague_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_putricide_clear_aura_effect_value_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; SpellScript* GetSpellScript() const { - return new spell_putricide_clear_mutated_plague_SpellScript(); + return new spell_putricide_clear_aura_effect_value_SpellScript(); } }; @@ -1518,12 +1566,12 @@ void AddSC_boss_professor_putricide() { new boss_professor_putricide(); new npc_volatile_ooze(); + new npc_gas_cloud(); new spell_putricide_gaseous_bloat(); new spell_putricide_ooze_channel(); new spell_putricide_slime_puddle(); new spell_putricide_slime_puddle_aura(); new spell_putricide_unstable_experiment(); - new spell_putricide_ooze_summon(); new spell_putricide_ooze_eruption_searcher(); new spell_putricide_choking_gas_bomb(); new spell_putricide_unbound_plague(); @@ -1534,6 +1582,6 @@ void AddSC_boss_professor_putricide() new spell_putricide_mutated_transformation(); new spell_putricide_mutated_transformation_dmg(); new spell_putricide_regurgitated_ooze(); - new spell_putricide_clear_mutated_plague(); + new spell_putricide_clear_aura_effect_value(); new spell_stinky_precious_decimate(); } diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index 8b69accfc23..314d196cc06 100755 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -102,7 +102,7 @@ class DatabaseWorkerPool //! Shuts down delaythreads for this connection pool by underlying deactivate(). //! The next dequeue attempt in the worker thread tasks will result in an error, - //! ultimately ending the worker thread task. + //! ultimately ending the worker thread task. _queue->queue()->close(); for (uint8 i = 0; i < _connectionCount[IDX_ASYNC]; ++i) @@ -114,7 +114,7 @@ class DatabaseWorkerPool t->Close(); //! Closes the actualy MySQL connection. } - sLog->outSQLDriver("Asynchronous connections on DatabasePool '%s' terminated. Proceeding with synchronous connections.", + sLog->outSQLDriver("Asynchronous connections on DatabasePool '%s' terminated. Proceeding with synchronous connections.", GetDatabaseName()); //! Shut down the synchronous connections -- cgit v1.2.3 From a28742bffeca3764468b3f307a86c14e2f3e3607 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 13 Apr 2012 20:50:34 +0100 Subject: Core/BG: When starting a battleground teleport the player to start location if it goes outside of the allowed "waiting" area (for example, getting out of the "bubble" in EotS) Allowed waiting area is calculated as the distance specified in database (battleground_template.StartMaxDist) and the battleground start point for each team A distance of 0 is ignored (not used in SotA nor arenas) The values in DB might need some tweaks, open a pull request if you calculate better ones Closes #180 Initial patch and idea by Rat Also added validation (DBError log) to some fields in battleground_template table --- .../world/2012_04_13_02_world_bg_template.sql | 7 ++++ src/server/game/Battlegrounds/Battleground.cpp | 37 ++++++++++++++++++++-- src/server/game/Battlegrounds/Battleground.h | 4 +++ src/server/game/Battlegrounds/BattlegroundMgr.cpp | 28 +++++++++------- src/server/game/Battlegrounds/BattlegroundMgr.h | 1 + src/server/game/Miscellaneous/SharedDefines.h | 28 ++++++++-------- 6 files changed, 77 insertions(+), 28 deletions(-) create mode 100644 sql/updates/world/2012_04_13_02_world_bg_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_13_02_world_bg_template.sql b/sql/updates/world/2012_04_13_02_world_bg_template.sql new file mode 100644 index 00000000000..a426d7c6831 --- /dev/null +++ b/sql/updates/world/2012_04_13_02_world_bg_template.sql @@ -0,0 +1,7 @@ +ALTER TABLE `battleground_template` ADD `StartMaxDist` float NOT NULL DEFAULT 0 AFTER `HordeStartO`; + +UPDATE `battleground_template` SET `StartMaxDist`=200 WHERE `id`=30; -- IC +UPDATE `battleground_template` SET `StartMaxDist`=100 WHERE `id`=1; -- AV +UPDATE `battleground_template` SET `StartMaxDist`=75 WHERE `id` IN (2,3,7); -- WSG, AB, EotS + +UPDATE `battleground_template` SET `MinLvl`=1 WHERE `id`=32; diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index d6bfde021e7..d3348fd21d1 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -144,6 +144,7 @@ Battleground::Battleground() m_Winner = 2; m_StartTime = 0; m_ResetStatTimer = 0; + m_ValidStartPositionTimer = 0; m_Events = 0; m_IsRated = false; m_BuffChange = false; @@ -177,6 +178,8 @@ Battleground::Battleground() m_ArenaTeamIds[BG_TEAM_ALLIANCE] = 0; m_ArenaTeamIds[BG_TEAM_HORDE] = 0; + m_StartMaxDist = 0.0f; + m_ArenaTeamRatingChanges[BG_TEAM_ALLIANCE] = 0; m_ArenaTeamRatingChanges[BG_TEAM_HORDE] = 0; @@ -291,6 +294,7 @@ void Battleground::Update(uint32 diff) // Update start time and reset stats timer m_StartTime += diff; m_ResetStatTimer += diff; + m_ValidStartPositionTimer += diff; PostUpdateImpl(diff); } @@ -453,19 +457,19 @@ inline void Battleground::_ProcessJoin(uint32 diff) // First start warning - 2 or 1 minute SendMessageToAll(StartMessageIds[BG_STARTING_EVENT_FIRST], CHAT_MSG_BG_SYSTEM_NEUTRAL); } - // After 1 minute or 30 seconds, warning is signalled + // After 1 minute or 30 seconds, warning is signaled else if (GetStartDelayTime() <= StartDelayTimes[BG_STARTING_EVENT_SECOND] && !(m_Events & BG_STARTING_EVENT_2)) { m_Events |= BG_STARTING_EVENT_2; SendMessageToAll(StartMessageIds[BG_STARTING_EVENT_SECOND], CHAT_MSG_BG_SYSTEM_NEUTRAL); } - // After 30 or 15 seconds, warning is signalled + // After 30 or 15 seconds, warning is signaled else if (GetStartDelayTime() <= StartDelayTimes[BG_STARTING_EVENT_THIRD] && !(m_Events & BG_STARTING_EVENT_3)) { m_Events |= BG_STARTING_EVENT_3; SendMessageToAll(StartMessageIds[BG_STARTING_EVENT_THIRD], CHAT_MSG_BG_SYSTEM_NEUTRAL); } - // Delay expired (atfer 2 or 1 minute) + // Delay expired (after 2 or 1 minute) else if (GetStartDelayTime() <= 0 && !(m_Events & BG_STARTING_EVENT_4)) { m_Events |= BG_STARTING_EVENT_4; @@ -526,6 +530,33 @@ inline void Battleground::_ProcessJoin(uint32 diff) sWorld->SendWorldText(LANG_BG_STARTED_ANNOUNCE_WORLD, GetName(), GetMinLevel(), GetMaxLevel()); } } + + // Find if the player left our start zone; if so, teleport it back + if (m_ValidStartPositionTimer > 1000) + { + m_ValidStartPositionTimer = 0; + float maxDist = GetStartMaxDist(); + if (maxDist > 0.0f) + { + for (BattlegroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr) + { + if (Player *plr = ObjectAccessor::FindPlayer(itr->first)) + { + float x, y, z, o; + uint32 team = plr->GetBGTeam(); + GetTeamStartLoc(team, x, y, z, o); + + float dist = plr->GetDistance(x, y, z); + + if (dist >= maxDist) + { + sLog->outError("BATTLEGROUND: Sending %s back to start location (possible exploit)", plr->GetName()); + plr->TeleportTo(GetMapId(), x, y, z, o); + } + } + } + } + } } inline void Battleground::_ProcessLeave(uint32 diff) diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 32f6ebc92de..01dfbb23033 100755 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -443,6 +443,8 @@ class Battleground Z = m_TeamStartLocZ[idx]; O = m_TeamStartLocO[idx]; } + void SetStartMaxDist(float startMaxDist) { m_StartMaxDist = startMaxDist; } + float GetStartMaxDist() const { return m_StartMaxDist; } // Packet Transfer // method that should fill worldpacket with actual world states (not yet implemented for all battlegrounds!) @@ -617,6 +619,7 @@ class Battleground uint32 m_ClientInstanceID; // the instance-id which is sent to the client and without any other internal use uint32 m_StartTime; uint32 m_ResetStatTimer; + uint32 m_ValidStartPositionTimer; int32 m_EndTime; // it is set to 120000 when bg is ending and it decreases itself uint32 m_LastResurrectTime; BattlegroundBracketId m_BracketId; @@ -698,6 +701,7 @@ class Battleground float m_TeamStartLocY[BG_TEAMS_COUNT]; float m_TeamStartLocZ[BG_TEAMS_COUNT]; float m_TeamStartLocO[BG_TEAMS_COUNT]; + float m_StartMaxDist; uint32 ScriptId; }; #endif diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index e1b99cbdcb9..a106f11ae82 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -660,6 +660,7 @@ uint32 BattlegroundMgr::CreateBattleground(CreateBattlegroundData& data) bg->SetName(data.BattlegroundName); bg->SetTeamStartLoc(ALLIANCE, data.Team1StartLocX, data.Team1StartLocY, data.Team1StartLocZ, data.Team1StartLocO); bg->SetTeamStartLoc(HORDE, data.Team2StartLocX, data.Team2StartLocY, data.Team2StartLocZ, data.Team2StartLocO); + bg->SetStartMaxDist(data.StartMaxDist); bg->SetLevelRange(data.LevelMin, data.LevelMax); bg->SetScriptId(data.scriptId); @@ -677,8 +678,8 @@ void BattlegroundMgr::CreateInitialBattlegrounds() uint8 selectionWeight; BattlemasterListEntry const* bl; - // 0 1 2 3 4 5 6 7 8 9 10 - QueryResult result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO, Weight, ScriptName FROM battleground_template"); + // 0 1 2 3 4 5 6 7 8 9 10 11 + QueryResult result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO, StartMaxDist, Weight, ScriptName FROM battleground_template"); if (!result) { @@ -712,17 +713,20 @@ void BattlegroundMgr::CreateInitialBattlegrounds() data.MaxPlayersPerTeam = fields[2].GetUInt16(); data.LevelMin = fields[3].GetUInt8(); data.LevelMax = fields[4].GetUInt8(); - //check values from DB - if (data.MaxPlayersPerTeam == 0 || data.MinPlayersPerTeam == 0 || data.MinPlayersPerTeam > data.MaxPlayersPerTeam) + + // check values from DB + if (data.MaxPlayersPerTeam == 0 || data.MinPlayersPerTeam > data.MaxPlayersPerTeam) { - data.MinPlayersPerTeam = 0; // by default now expected strong full bg requirement - data.MaxPlayersPerTeam = 40; + sLog->outErrorDb("Table `battleground_template` for id %u has bad values for MinPlayersPerTeam (%u) and MaxPlayersPerTeam(%u)", + data.bgTypeId, data.MinPlayersPerTeam, data.MaxPlayersPerTeam); + continue; } + if (data.LevelMin == 0 || data.LevelMax == 0 || data.LevelMin > data.LevelMax) { - //TO-DO: FIX ME - data.LevelMin = 0;//bl->minlvl; - data.LevelMax = 80;//bl->maxlvl; + sLog->outErrorDb("Table `battleground_template` for id %u has bad values for LevelMin (%u) and LevelMax(%u)", + data.bgTypeId, data.LevelMin, data.LevelMax); + continue; } startId = fields[5].GetUInt32(); @@ -767,8 +771,10 @@ void BattlegroundMgr::CreateInitialBattlegrounds() continue; } - selectionWeight = fields[9].GetUInt8(); - data.scriptId = sObjectMgr->GetScriptId(fields[10].GetCString()); + data.StartMaxDist = fields[9].GetFloat(); + + selectionWeight = fields[10].GetUInt8(); + data.scriptId = sObjectMgr->GetScriptId(fields[11].GetCString()); data.BattlegroundName = bl->name[sWorld->GetDefaultDbcLocale()]; data.MapID = bl->mapid[0]; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index 88559d07993..7afb83da0a6 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -50,6 +50,7 @@ struct CreateBattlegroundData float Team2StartLocY; float Team2StartLocZ; float Team2StartLocO; + float StartMaxDist; uint32 scriptId; }; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 22f0ea35413..0386e6b4214 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -3294,20 +3294,20 @@ enum BanReturn // indexes of BattlemasterList.dbc enum BattlegroundTypeId { - BATTLEGROUND_TYPE_NONE = 0, - BATTLEGROUND_AV = 1, - BATTLEGROUND_WS = 2, - BATTLEGROUND_AB = 3, - BATTLEGROUND_NA = 4, - BATTLEGROUND_BE = 5, - BATTLEGROUND_AA = 6, - BATTLEGROUND_EY = 7, - BATTLEGROUND_RL = 8, - BATTLEGROUND_SA = 9, - BATTLEGROUND_DS = 10, - BATTLEGROUND_RV = 11, - BATTLEGROUND_IC = 30, - BATTLEGROUND_RB = 32 + BATTLEGROUND_TYPE_NONE = 0, // None + BATTLEGROUND_AV = 1, // Alterac Valley + BATTLEGROUND_WS = 2, // Warsong Gulch + BATTLEGROUND_AB = 3, // Arathi Basin + BATTLEGROUND_NA = 4, // Nagrand Arena + BATTLEGROUND_BE = 5, // Blade's Edge Arena + BATTLEGROUND_AA = 6, // All Arenas + BATTLEGROUND_EY = 7, // Eye of the Storm + BATTLEGROUND_RL = 8, // Ruins of Lordaernon + BATTLEGROUND_SA = 9, // Strand of the Ancients + BATTLEGROUND_DS = 10, // Dalaran Sewers + BATTLEGROUND_RV = 11, // Ring of Valor + BATTLEGROUND_IC = 30, // Isle of Conquest + BATTLEGROUND_RB = 32 // Random Battleground }; #define MAX_BATTLEGROUND_TYPE_ID 33 -- cgit v1.2.3 From eeb237f55d5d6e1e5d654de1dccc8a6ba2313b64 Mon Sep 17 00:00:00 2001 From: Subv Date: Fri, 13 Apr 2012 19:33:20 -0500 Subject: Core/Spells: Add 45 seconds proc cooldown to Blackened Naaru Silver. Closes #1509 Signed-off-by: Subv --- sql/updates/world/2012_04_13_03_world_spell_proc_event.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_13_03_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_13_03_world_spell_proc_event.sql b/sql/updates/world/2012_04_13_03_world_spell_proc_event.sql new file mode 100644 index 00000000000..3ea68187687 --- /dev/null +++ b/sql/updates/world/2012_04_13_03_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +-- Blackened Naaru Silver proc cooldown +DELETE FROM `spell_proc_event` WHERE `entry`=45355; +INSERT INTO `spell_proc_event`(`entry`,`schoolmask`,`spellfamilyname`,`spellfamilymask0`,`spellfamilymask1`,`spellfamilymask2`,`procflags`,`procex`,`ppmrate`,`customchance`,`cooldown`) VALUES +(45355,0,0,0,0,0,0,0,0,0,45); \ No newline at end of file -- cgit v1.2.3 From f51b62979f79fb9a404faad7b719d51a69358ae7 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 14 Apr 2012 11:15:12 +0200 Subject: SQL: Renamed files to match the order they were commited in. --- sql/updates/world/2012_04_13_02_world_bg_template.sql | 7 ------- sql/updates/world/2012_04_13_03_world_bg_template.sql | 7 +++++++ sql/updates/world/2012_04_13_03_world_spell_proc_event.sql | 4 ---- sql/updates/world/2012_04_13_04_world_spell_proc_event.sql | 4 ++++ 4 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 sql/updates/world/2012_04_13_02_world_bg_template.sql create mode 100644 sql/updates/world/2012_04_13_03_world_bg_template.sql delete mode 100644 sql/updates/world/2012_04_13_03_world_spell_proc_event.sql create mode 100644 sql/updates/world/2012_04_13_04_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_13_02_world_bg_template.sql b/sql/updates/world/2012_04_13_02_world_bg_template.sql deleted file mode 100644 index a426d7c6831..00000000000 --- a/sql/updates/world/2012_04_13_02_world_bg_template.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE `battleground_template` ADD `StartMaxDist` float NOT NULL DEFAULT 0 AFTER `HordeStartO`; - -UPDATE `battleground_template` SET `StartMaxDist`=200 WHERE `id`=30; -- IC -UPDATE `battleground_template` SET `StartMaxDist`=100 WHERE `id`=1; -- AV -UPDATE `battleground_template` SET `StartMaxDist`=75 WHERE `id` IN (2,3,7); -- WSG, AB, EotS - -UPDATE `battleground_template` SET `MinLvl`=1 WHERE `id`=32; diff --git a/sql/updates/world/2012_04_13_03_world_bg_template.sql b/sql/updates/world/2012_04_13_03_world_bg_template.sql new file mode 100644 index 00000000000..a426d7c6831 --- /dev/null +++ b/sql/updates/world/2012_04_13_03_world_bg_template.sql @@ -0,0 +1,7 @@ +ALTER TABLE `battleground_template` ADD `StartMaxDist` float NOT NULL DEFAULT 0 AFTER `HordeStartO`; + +UPDATE `battleground_template` SET `StartMaxDist`=200 WHERE `id`=30; -- IC +UPDATE `battleground_template` SET `StartMaxDist`=100 WHERE `id`=1; -- AV +UPDATE `battleground_template` SET `StartMaxDist`=75 WHERE `id` IN (2,3,7); -- WSG, AB, EotS + +UPDATE `battleground_template` SET `MinLvl`=1 WHERE `id`=32; diff --git a/sql/updates/world/2012_04_13_03_world_spell_proc_event.sql b/sql/updates/world/2012_04_13_03_world_spell_proc_event.sql deleted file mode 100644 index 3ea68187687..00000000000 --- a/sql/updates/world/2012_04_13_03_world_spell_proc_event.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Blackened Naaru Silver proc cooldown -DELETE FROM `spell_proc_event` WHERE `entry`=45355; -INSERT INTO `spell_proc_event`(`entry`,`schoolmask`,`spellfamilyname`,`spellfamilymask0`,`spellfamilymask1`,`spellfamilymask2`,`procflags`,`procex`,`ppmrate`,`customchance`,`cooldown`) VALUES -(45355,0,0,0,0,0,0,0,0,0,45); \ No newline at end of file diff --git a/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql b/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql new file mode 100644 index 00000000000..3ea68187687 --- /dev/null +++ b/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +-- Blackened Naaru Silver proc cooldown +DELETE FROM `spell_proc_event` WHERE `entry`=45355; +INSERT INTO `spell_proc_event`(`entry`,`schoolmask`,`spellfamilyname`,`spellfamilymask0`,`spellfamilymask1`,`spellfamilymask2`,`procflags`,`procex`,`ppmrate`,`customchance`,`cooldown`) VALUES +(45355,0,0,0,0,0,0,0,0,0,45); \ No newline at end of file -- cgit v1.2.3 From efdf2ede304a27461b3a901a59e0510721082849 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 14 Apr 2012 14:45:32 +0200 Subject: DB/Loot: add Bogblossom to Bogblossom object, thx Helias Closes #5922 --- sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql b/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..dea4b771068 --- /dev/null +++ b/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql @@ -0,0 +1,3 @@ +-- Add Bogblossom to this Bogblossom object for the druid quest (other one already contains it) +DELETE FROM `gameobject_loot_template` WHERE (`entry`=10961) AND (`item`=31950); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES (10961,31950,-100,0,0,1,1); -- cgit v1.2.3 From ca6c8845b22c7009e9b096369ed62670e05a9ba1 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 14 Apr 2012 15:30:40 +0200 Subject: DB/Loot: Add some missing loot definitions to prevent some startup errors --- .../world/2012_04_14_01_world_gameobject_loot_template.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql b/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..a3dd0c39865 --- /dev/null +++ b/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql @@ -0,0 +1,11 @@ +-- Add missing gameobject_loot_templates to prevent startup errors +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (3458,3459,3460,3461,15920,16841,26878,27725); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(3458,4594,100,0,0,1,1), -- Rockscale Cod on Feast Fish +(3459,3771,100,0,0,1,1), -- Wild Hog Shank On Feast Boar +(3460,4538,100,0,0,1,1), -- Snapvine Watermelon on Feast Fruit +(3461,1708,100,0,0,1,1), -- Sweet Nectar on Feast Goblet +(15920,17822,-100,0,0,1,1), -- Weird Map on weird object +(16841,18950,-100,0,0,1,1), -- Chambermaid Pillaclenchers Pillow on Pillaclencher's Ornate Pillow +(26878,45062,100,0,0,1,1), -- Dusty Journal on Dusty Journal (different ID) +(27725,49648,100,0,0,1,1); -- Borrowed Tabard on Clean Laundry (might need condition!) -- cgit v1.2.3 From ab8e69873c23ca48f981930d443509225792a070 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 14 Apr 2012 10:17:21 -0500 Subject: Core/Spells: Fixed Bloodworm's heal effect and damage Closes #1808 Thanks @A-Metaphysical-Drama for the damage part Signed-off-by: Subv --- sql/updates/world/2012_04_14_02_world_creature_template_addon.sql | 3 +++ src/server/game/Entities/Pet/Pet.cpp | 7 +++++++ src/server/game/Entities/Unit/StatSystem.cpp | 2 ++ 3 files changed, 12 insertions(+) create mode 100644 sql/updates/world/2012_04_14_02_world_creature_template_addon.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql b/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql new file mode 100644 index 00000000000..6aaa7da383e --- /dev/null +++ b/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql @@ -0,0 +1,3 @@ +UPDATE `creature_template_addon` SET `auras`='50453' WHERE `entry`=28017; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=28017; +UPDATE `creature_template` SET `ainame` = '' WHERE `entry`=28017; \ No newline at end of file diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index fcb89e33dc1..586f09bd79c 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1041,6 +1041,13 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4))); break; } + case 28017: // Bloodworms + { + SetCreateHealth(4 * petlevel); + SetBonusDamage(int32(m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * 0.006f)); + SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel - 30 - (petlevel / 4))); + SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel - 30 + (petlevel / 4))); + } } break; } diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 69771129ac9..2da1c1b88cb 100755 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -1068,6 +1068,7 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType) #define ENTRY_TREANT 1964 #define ENTRY_FIRE_ELEMENTAL 15438 #define ENTRY_GHOUL 26125 +#define ENTRY_BLOODWORM 28017 bool Guardian::UpdateStats(Stats stat) { @@ -1229,6 +1230,7 @@ void Guardian::UpdateMaxHealth() case ENTRY_SUCCUBUS: multiplicator = 9.1f; break; case ENTRY_FELHUNTER: multiplicator = 9.5f; break; case ENTRY_FELGUARD: multiplicator = 11.0f; break; + case ENTRY_BLOODWORM: multiplicator = 1.0f; break; default: multiplicator = 10.0f; break; } -- cgit v1.2.3 From b7a9db16d6051889d3a6fb38d10db5e8a672b7ed Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 14 Apr 2012 11:14:38 -0500 Subject: Spells/Bonus: Fixed spell power bonus of Lava Burst, taken from DrDamage and verified Closes #1819 --- sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql b/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql new file mode 100644 index 00000000000..ee081c17078 --- /dev/null +++ b/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql @@ -0,0 +1 @@ +UPDATE `spell_bonus_data` SET `direct_bonus`=0.8930 WHERE `entry`=51505; -- cgit v1.2.3 From 06278fe7fb2698fa3ff62eec3e84baebcb62a4ce Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 14 Apr 2012 12:01:07 -0500 Subject: Spells/Procs: Fixed Sacred Shield 6 seconds internal cooldown. Thanks @Warpten P.D.: You were using the wrong spellid Closes #1711 --- sql/updates/world/2012_04_14_04_world_spell_proc_event.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_04_14_04_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql b/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql new file mode 100644 index 00000000000..78a869e655a --- /dev/null +++ b/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_proc_event` WHERE `entry`=53601; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(53601, 0, 0, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0, 0, 6); -- cgit v1.2.3 From 3d8aaabaf3f4c627a583ff8c5a611a7b02400931 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 14 Apr 2012 20:03:47 -0500 Subject: Core/Spells: Do not proc spells with PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_(NEG|POS) if there is no target, reimplemented Storm, Earth and Fire talent in another way Closes #3367 Closes #2424 If you find more spells that are broken because of this, please notify us Signed-off-by: Subv --- .../world/2012_04_14_05_world_spell_proc_event.sql | 1 + src/server/game/Entities/Unit/Unit.cpp | 14 ---------- src/server/game/Spells/Spell.cpp | 30 ---------------------- src/server/scripts/Spells/spell_shaman.cpp | 19 ++++++++++++++ 4 files changed, 20 insertions(+), 44 deletions(-) create mode 100644 sql/updates/world/2012_04_14_05_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql b/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql new file mode 100644 index 00000000000..8cb2b1d3d2b --- /dev/null +++ b/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql @@ -0,0 +1 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (51486,51485,51483); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 200f1b42ca7..4da56b72017 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7356,20 +7356,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere triggered_spell_id = 63685; break; } - // Storm, Earth and Fire - if (dummySpell->SpellIconID == 3063) - { - // Earthbind Totem summon only - if (procSpell->Id != 2484) - return false; - - float chance = (float)triggerAmount; - if (!roll_chance_f(chance)) - return false; - - triggered_spell_id = 64695; - break; - } // Ancestral Awakening if (dummySpell->SpellIconID == 3065) { diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index af3f53e2369..df2b9c35320 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3427,36 +3427,6 @@ void Spell::_handle_immediate_phase() // process items for (std::list::iterator ihit= m_UniqueItemInfo.begin(); ihit != m_UniqueItemInfo.end(); ++ihit) DoAllEffectOnTarget(&(*ihit)); - - if (!m_originalCaster) - return; - // Handle procs on cast - // TODO: finish new proc system:P - if (m_UniqueTargetInfo.empty()) - { - uint32 procAttacker = m_procAttacker; - if (!procAttacker) - { - bool positive = m_spellInfo->IsPositive(); - switch (m_spellInfo->DmgClass) - { - case SPELL_DAMAGE_CLASS_MAGIC: - if (positive) - procAttacker |= PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_POS; - else - procAttacker |= PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG; - break; - case SPELL_DAMAGE_CLASS_NONE: - if (positive) - procAttacker |= PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_POS; - else - procAttacker |= PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_NEG; - break; - } - } - // Proc damage for spells which have only dest targets (2484 should proc 51486 for example) - m_originalCaster->ProcDamageAndSpell(NULL, procAttacker, 0, m_procEx | PROC_EX_NORMAL_HIT, 0, BASE_ATTACK, m_spellInfo, m_triggeredByAuraSpell); - } } void Spell::_handle_finish_phase() diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 1a0f4576fea..84e3bd8d604 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -35,6 +35,9 @@ enum ShamanSpells SHAMAN_SPELL_FIRE_NOVA_TRIGGERED_R1 = 8349, SHAMAN_SPELL_SATED = 57724, SHAMAN_SPELL_EXHAUSTION = 57723, + + SHAMAN_SPELL_STORM_EARTH_AND_FIRE = 51483, + EARTHBIND_TOTEM_SPELL_EARTHGRAB = 64695, // For Earthen Power SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM = 6474, @@ -221,9 +224,25 @@ class spell_sha_earthbind_totem : public SpellScriptLoader caster->CastSpell(caster, SHAMAN_TOTEM_SPELL_EARTHEN_POWER, true, NULL, aurEff); } + void Apply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (!GetCaster()) + return; + Player* owner = GetCaster()->GetCharmerOrOwnerPlayerOrPlayerItself(); + if (!owner) + return; + // Storm, Earth and Fire + if (AuraEffect* aurEff = owner->GetAuraEffectOfRankedSpell(SHAMAN_SPELL_STORM_EARTH_AND_FIRE, EFFECT_1)) + { + if (roll_chance_i(aurEff->GetAmount())) + GetCaster()->CastSpell(GetCaster(), EARTHBIND_TOTEM_SPELL_EARTHGRAB, false); + } + } + void Register() { OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_earthbind_totem_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectApply += AuraEffectApplyFn(spell_sha_earthbind_totem_AuraScript::Apply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; -- cgit v1.2.3 From bcffd87950c15ed0c1f8cf6003ae21f72b809f5e Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 16 Apr 2012 15:50:01 +0200 Subject: [DB/GameEvent] Add missing Game Event - Pilgrim's Bounty --- sql/updates/world/2012_04_16_00_world_game_event.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_16_00_world_game_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_16_00_world_game_event.sql b/sql/updates/world/2012_04_16_00_world_game_event.sql new file mode 100644 index 00000000000..1dc3fe3ad91 --- /dev/null +++ b/sql/updates/world/2012_04_16_00_world_game_event.sql @@ -0,0 +1,4 @@ +SET @Event = 26; -- Pilgrim's Bounty +DELETE FROM `game_event` WHERE `eventEntry`=@Event; +INSERT INTO `game_event` (`eventEntry`,`start_time`,`end_time`,`occurence`,`length`,`holiday`,`description`,`world_event`) VALUES +(@Event,'2012-11-18 01:00:00','2020-12-31 05:00:00',525600,10020,404,'Pilgrim\'s Bounty',0); -- cgit v1.2.3 From 5dd561dcacfaf16bdbdd3932a40a94a7cd85a633 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Tue, 17 Apr 2012 19:55:32 +0200 Subject: DB/Creatures: Add missing northrend rare elite mobs: Arcturis and Skoll Closes #1324 --- sql/updates/world/2012_04_17_00_world_creature.sql | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 sql/updates/world/2012_04_17_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_17_00_world_creature.sql b/sql/updates/world/2012_04_17_00_world_creature.sql new file mode 100644 index 00000000000..ebf0fb42a59 --- /dev/null +++ b/sql/updates/world/2012_04_17_00_world_creature.sql @@ -0,0 +1,28 @@ +SET @GUID1 := 41781; +SET @GUID2 := 41783; + +DELETE FROM creature WHERE guid IN (@GUID1,@GUID2); +INSERT INTO `creature` +(`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`) +VALUES +(@GUID1 ,38453,571,1,1,3561.821,-2736.367,136.0317,0), -- Arcturis in Grizzly Hills +(@GUID2,35189,571,1,1,7101.845,-1443.734,924.2609,0.178631); -- Skoll in The Storm Peaks + +UPDATE `creature_template` SET `faction_A` = 190, `faction_H`=190 WHERE `entry` IN (38453,35189); + +SET @NPC= @GUID1*10; +-- Add pathing for Arcturis +DELETE FROM `creature_addon` WHERE `guid` = @GUID1; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@GUID1,@NPC,0,0,0,0,''); -- Add path for Acturis +-- Add waypoint data for the path: +DELETE FROM `waypoint_data` WHERE `id`=@NPC; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES +(@NPC,1,3563.499,-2737.698,137.1898), +(@NPC,2,3565.249,-2738.698,138.4398), +(@NPC,3,3566.749,-2739.948,139.9398), +(@NPC,4,3568.249,-2740.698,140.6898), +(@NPC,5,3567.839,-2741.380,141.9256), +(@NPC,6,3569.999,-2741.948,142.1898), +(@NPC,7,3570.749,-2742.448,143.1898), +(@NPC,8,3572.676,-2743.528,144.8479); -- cgit v1.2.3 From d97f9c37bb437481241bab4b5268170a792751d3 Mon Sep 17 00:00:00 2001 From: kaelima Date: Wed, 18 Apr 2012 02:43:00 +0200 Subject: DB/Creature: Set correct spellclick spell and ability spell for Valkyrion Harpoon Gun --- sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql b/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql new file mode 100644 index 00000000000..3bad860290b --- /dev/null +++ b/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql @@ -0,0 +1,2 @@ +UPDATE `npc_spellclick_spells` SET `spell_id`=57053 WHERE `npc_entry`=30066 AND `spell_id`=56678; +UPDATE `creature_template` SET `spell1`=55812 WHERE `entry`=30066; -- cgit v1.2.3 From ceac8959e336ae4ff7033282a1992ca7a285798d Mon Sep 17 00:00:00 2001 From: elecyb Date: Tue, 17 Apr 2012 22:16:24 -0300 Subject: Core/Warden: Documented more warden checks --- sql/updates/world/2012_04_17_00_world_warden_checks.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2012_04_17_00_world_warden_checks.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_17_00_world_warden_checks.sql b/sql/updates/world/2012_04_17_00_world_warden_checks.sql new file mode 100644 index 00000000000..74539f99fb3 --- /dev/null +++ b/sql/updates/world/2012_04_17_00_world_warden_checks.sql @@ -0,0 +1,8 @@ +UPDATE `warden_checks` SET `comment`='Swimming_FallCalc - movement state' WHERE `id`=15; +UPDATE `warden_checks` SET `comment`='CreateMovementStatus' WHERE `id`=72; +UPDATE `warden_checks` SET `comment`='OnStartSwim OnSplineStartSwim - movement state' WHERE `id`=170; +UPDATE `warden_checks` SET `comment`='DefaultServerLogin - account name' WHERE `id`=198; +UPDATE `warden_checks` SET `comment`='Login Checksum - authentication process' WHERE `id`=320; +UPDATE `warden_checks` SET `comment`='CalcFallStartElevation - (some kind of wall climb)' WHERE `id`=329; +UPDATE `warden_checks` SET `comment`='Code injection at 0x40100A' WHERE `id`=381; +UPDATE `warden_checks` SET `comment`='Login State - (May be false positive)' WHERE `id`=437; -- cgit v1.2.3 From 35024272d2967231b64b4cbaf983ece6216cd1e3 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 18 Apr 2012 09:22:24 +0200 Subject: DB/Creature: Update spawntime for Arcturis & Skoll --- sql/updates/world/2012_04_18_01_world_creature.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_04_18_01_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_01_world_creature.sql b/sql/updates/world/2012_04_18_01_world_creature.sql new file mode 100644 index 00000000000..e2d6bdac95b --- /dev/null +++ b/sql/updates/world/2012_04_18_01_world_creature.sql @@ -0,0 +1 @@ +UPDATE `creature` SET `spawntimesecs`=39600 WHERE `guid` IN (41781,41783); -- Set the spawntime to 11 hours for Arcturis & Skoll -- cgit v1.2.3 From 1be4027a9082c4cd746849697d8409077907348b Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 18 Apr 2012 11:10:39 +0200 Subject: DB/Loot: Keepers of Ulduar loot. BEWARE: chest-assignments has been GUESSED in some cases. Script-updates will prove this either wrong or right. MIGHT NOT WORK UNTILL SCRIPTS GET FIXED --- ...2012_04_18_02_world_reference_loot_template.sql | 377 +++++++++++++++++++++ 1 file changed, 377 insertions(+) create mode 100644 sql/updates/world/2012_04_18_02_world_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql b/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql new file mode 100644 index 00000000000..4ed922060d9 --- /dev/null +++ b/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql @@ -0,0 +1,377 @@ +-- ---------------------- +-- -- Various Cleanups -- +-- ---------------------- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=10 AND `SourceGroup`=34105; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceGroup` IN (27081,27085,27073,26963,26955); +DELETE FROM `reference_loot_template` WHERE `entry` IN (12020,12021,12022,34105,34125,34126,34127,34128,34129,34130); +DELETE FROM `gameobject_loot_template` WHERE `entry`=10961; -- Bad Bogblossom fix was bad +UPDATE `gameobject_template` SET `data1`=26956 WHERE `entry`=194315; +-- ------------------------------- +-- -- Variables and definitions -- +-- ------------------------------- +-- Freya 10 man +SET @Freya10k0ID := 194324; -- Freyas Gift 10man ALL elders alive +SET @Freya10k1ID := 194326; -- Freyas Gift 10man killed 1 elder +SET @Freya10k2ID := 194328; -- Freyas Gift 10man killed 2 elder +SET @Freya10k3ID := 194330; -- Freyas Gift 10man killed 3 elder +-- Freya 25 man +SET @Freya25k0ID := 194325; -- Freyas Gift 25man ALL elders alive +SET @Freya25k1ID := 194327; -- Freyas Gift 25man killed 1 elder +SET @Freya25k2ID := 194329; -- Freyas Gift 25man killed 2 elder +SET @Freya25k3ID := 194331; -- Freyas Gift 25man killed 3 elder +-- Hodir +SET @Hodir10nID := 194307; -- Cache of Winter 10man +SET @Hodir10hID := 194200; -- Rare Cache of Winter 10man +SET @Hodir25nID := 194308; -- Cache of Winter 25man +SET @Hodir25hID := 194201; -- Rare Cache of Winter 25man +-- Mimiron +SET @Mimiron10nID := 194789; -- Cache of Innovations 10man +SET @Mimiron25nID := 194956; -- Cache of Innovations 25man +SET @Mimiron10hID := 194957; -- Cache of Innovation 10 man Hardmode +SET @Mimiron25hID := 194958; -- Cache of Innovation 25 man Hardmode +-- Thorim +SET @Thorim10nID := 194312; -- Cache of Storms 10man +SET @Thorim10hID := 194313; -- Cache of Storms 10 man Hardmode +SET @Thorim25nID := 194314; -- Cache of Storms 25man +SET @Thorim25hID := 194315; -- Cache of Storms 25 man Hardmode + +-- Use procedure to get Lootid from data1 field and assign it to a variable +-- Freya 10 +CALL `sp_get_go_lootid`(@Freya10k0ID,@Freya10k0); +CALL `sp_get_go_lootid`(@Freya10k1ID,@Freya10k1); +CALL `sp_get_go_lootid`(@Freya10k2ID,@Freya10k2); +CALL `sp_get_go_lootid`(@Freya10k3ID,@Freya10k3); +-- Freya 25 +CALL `sp_get_go_lootid`(@Freya25k0ID,@Freya25k0); +CALL `sp_get_go_lootid`(@Freya25k1ID,@Freya25k1); +CALL `sp_get_go_lootid`(@Freya25k2ID,@Freya25k2); +CALL `sp_get_go_lootid`(@Freya25k3ID,@Freya25k3); +-- Hodir 10 +CALL `sp_get_go_lootid`(@Hodir10nID,@Hodir10n); +CALL `sp_get_go_lootid`(@Hodir10hID,@Hodir10h); +-- Hodir 25 +CALL `sp_get_go_lootid`(@Hodir25nID,@Hodir25n); +CALL `sp_get_go_lootid`(@Hodir25hID,@Hodir25h); +-- Mimiron +CALL `sp_get_go_lootid`(@Mimiron10nID,@Mimiron10n); +CALL `sp_get_go_lootid`(@Mimiron10hID,@Mimiron10h); +CALL `sp_get_go_lootid`(@Mimiron25nID,@Mimiron25n); +CALL `sp_get_go_lootid`(@Mimiron25hID,@Mimiron25h); +-- Thorim +CALL `sp_get_go_lootid`(@Thorim10nID,@Thorim10n); +CALL `sp_get_go_lootid`(@Thorim10hID,@Thorim10h); +CALL `sp_get_go_lootid`(@Thorim25nID,@Thorim25n); +CALL `sp_get_go_lootid`(@Thorim25hID,@Thorim25h); +-- Set References +SET @Freya10Ref := 34365; +SET @Freya25Ref := @Freya10Ref+1; +SET @Hodir10Ref := @Freya10Ref+2; +SET @Hodir25Ref := @Freya10Ref+3; +SET @Mimiron10Ref := @Freya10Ref+4; +SET @Mimiron25Ref := @Freya10Ref+5; +SET @Thorim10Ref := @Freya10Ref+6; +SET @Thorim25Ref := @Freya10Ref+7; +SET @HandToken := 12026; +SET @LegToken := @HandToken+1; +SET @LegsToken := @HandToken+2; +SET @ChestToken := @HandToken+3; +SET @HeadToken := @HandToken+4; +SET @GloveToken := @HandToken+5; +SET @ShoulderToken := @HandToken+6; +SET @HelmToken := @HandToken+7; +SET @Recipe := 34154; +-- ------------------------- +-- -- Reference Templates -- +-- ------------------------- +-- Delete previous templates if existing +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Freya10Ref AND @Freya10Ref+7; +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @HandToken AND @HandToken+7; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Freya 10 man +(@Freya10Ref,45934,0,1,1,1,1), -- Unraveling Reach +(@Freya10Ref,45935,0,1,1,1,1), -- Ironbark Faceguard +(@Freya10Ref,45941,0,1,1,1,1), -- Chestguard of the Lasher +(@Freya10Ref,45936,0,1,1,1,1), -- Legplates of Flourishing Resolve +(@Freya10Ref,45940,0,1,1,1,1), -- Tunic of the Limber Stalker +-- Freya 25 man +(@Freya25Ref,45483,0,1,1,1,1), -- Boots of the Servant +(@Freya25Ref,45482,0,1,1,1,1), -- Leggings of the Lifetender +(@Freya25Ref,45481,0,1,1,1,1), -- Gauntlets of Ruthless Reprisal +(@Freya25Ref,45480,0,1,1,1,1), -- Nymph Heart Charm +(@Freya25Ref,45479,0,1,1,1,1), -- The Lifebinder +-- Freya Tokens +(@HandToken,45644,0,1,1,1,1), -- Gloves of the Wayward Conqueror +(@HandToken,45645,0,1,1,1,1), -- Gloves of the Wayward Protector +(@HandToken,45646,0,1,1,1,1), -- Gloves of the Wayward Vanquisher +(@LegToken,45653,0,1,1,1,1), -- Legplates of the Wayward Conqueror +(@LegToken,45654,0,1,1,1,1), -- Legplates of the Wayward Protector +(@LegToken,45655,0,1,1,1,1), -- Legplates of the Wayward Vanquisher +-- Hodir 10 man +(@Hodir10Ref,45874,0,1,1,1,1), -- Signet of Winter +(@Hodir10Ref,45458,0,1,1,1,1), -- Stormedge +(@Hodir10Ref,45873,0,1,1,1,1), -- Winter's Frigid Embrace +(@Hodir10Ref,45872,0,1,1,1,1), -- Avalanche +(@Hodir10Ref,45454,0,1,1,1,1), -- Cowl of Icy Breaths +-- Hodir 25 man +(@Hodir25Ref,45452,0,1,1,1,1), -- Frostplate Greaves +(@Hodir25Ref,45454,0,1,1,1,1), -- Frost-Bound Chain Bracers +(@Hodir25Ref,45453,0,1,1,1,1), -- Winter's Icy Embrace +(@Hodir25Ref,45450,0,1,1,1,1), -- Northern Barrier +(@Hodir25Ref,45451,0,1,1,1,1), -- Frozen Loop +-- Hodir Tokens +(@LegsToken,45650,0,1,1,1,1), -- Leggings of the Wayward Conqueror +(@LegsToken,45651,0,1,1,1,1), -- Leggings of the Wayward Protector +(@LegsToken,45652,0,1,1,1,1), -- Leggings of the Wayward Vanquisher +(@ChestToken,45632,0,1,1,1,1), -- Breastplate of the Wayward Conqueror +(@ChestToken,45633,0,1,1,1,1), -- Breastplate of the Wayward Protector +(@ChestToken,45634,0,1,1,1,1), -- Breastplate of the Wayward Vanquisher +-- Mimiron 10 man +(@Mimiron10Ref,45974,0,1,1,1,1), -- Shoulderguards of Assimilation +(@Mimiron10Ref,45976,0,1,1,1,1), -- Static Charge Handwraps +(@Mimiron10Ref,45972,0,1,1,1,1), -- Pulse Baton +(@Mimiron10Ref,45973,0,1,1,1,1), -- Stylish Power Cape +(@Mimiron10Ref,45975,0,1,1,1,1), -- Cable of the Metrognome +-- Mimiron 25 man +(@Mimiron25Ref,45492,0,1,1,1,1), -- Malleable Steelweave Mantle +(@Mimiron25Ref,45493,0,1,1,1,1), -- Asimov's Drape +(@Mimiron25Ref,45490,0,1,1,1,1), -- Pandora's Plea +(@Mimiron25Ref,45491,0,1,1,1,1), -- Waistguard of the Creator +(@Mimiron25Ref,45489,0,1,1,1,1), -- Insanity's Grip +-- Mimiron Tokens +(@HeadToken,45647,0,1,1,1,1), -- Helm of the Wayward Conqueror +(@HeadToken,45648,0,1,1,1,1), -- Helm of the Wayward Protector +(@HeadToken,45649,0,1,1,1,1), -- Helm of the Wayward Vanquisher +(@GloveToken,45641,0,1,1,1,1), -- Gauntlets of the Wayward Conqueror +(@GloveToken,45642,0,1,1,1,1), -- Gauntlets of the Wayward Protector +(@GloveToken,45643,0,1,1,1,1), -- Gauntlets of the Wayward Vanquisher +-- Thorim 10 man +(@Thorim10Ref,45927,0,1,1,1,1), -- Handwraps of Resonance +(@Thorim10Ref,45894,0,1,1,1,1), -- Leggings of Unstable Discharge +(@Thorim10Ref,45895,0,1,1,1,1), -- Belt of the Blood Pit +(@Thorim10Ref,45893,0,1,1,1,1), -- Guise of the Midgard Serpent +(@Thorim10Ref,45892,0,1,1,1,1), -- Legacy of Thunder +-- Throim 25 man +(@Thorim25Ref,45468,0,1,1,1,1), -- Leggings of Lost Love +(@Thorim25Ref,45466,0,1,1,1,1), -- Scale of Fates +(@Thorim25Ref,45467,0,1,1,1,1), -- Belt of the Betrayed +(@Thorim25Ref,45469,0,1,1,1,1), -- Sif's Promise +(@Thorim25Ref,45463,0,1,1,1,1), -- Vulmir, the Northern Tempest +-- Thorim Tokens +(@ShoulderToken,45659,0,1,1,1,1), -- Spaulders of the Wayward Conqueror +(@ShoulderToken,45660,0,1,1,1,1), -- Spaulders of the Wayward Protector +(@ShoulderToken,45661,0,1,1,1,1), -- Spaulders of the Wayward Vanquisher +(@HelmToken,45638,0,1,1,1,1), -- Crown of the Wayward Conqueror +(@HelmToken,45639,0,1,1,1,1), -- Crown of the Wayward Protector +(@HelmToken,45640,0,1,1,1,1); -- Crown of the Wayward Vanquisher +-- ------------------------------- +-- -- Gameobject Loot Templates -- +-- ------------------------------- +-- Delete previous templates if existing +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Freya10k3,@Freya10k2,@Freya10k1,@Freya10k0,@Freya25k3,@Freya25k2,@Freya25k1,@Freya25k0,@Hodir10n,@Hodir10h,@Hodir25n,@Hodir25h,@Mimiron10n,@Mimiron10h,@Mimiron25n,@Mimiron25h,@Thorim10n,@Thorim10h,@Thorim25n,@Thorim25h); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------ +-- -- Freya 10 man -- +-- ------------------ +-- Normal Mode: +(@Freya10k3,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k3,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k3,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k3,47241,100,1,0,1,1), -- 1x Emblem of Triumph +-- Hard Mode: 1 elder alive +(@Freya10k2,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k2,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k2,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k2,47241,100,1,0,2,2), -- 2x Emblem of Triumph +(@Freya10k2,45087,100,1,0,1,1), -- Runed Orb +(@Freya10k2,3,100,1,0,-34349,1), -- 1x Emblem of Triumph for Alive Elders +-- Hard Mode: 2 elders alive +(@Freya10k1,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k1,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k1,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k1,47241,100,1,0,3,3), -- 3x Emblem of Triumph +(@Freya10k1,45087,100,1,0,1,1), -- Runed Orb +(@Freya10k1,3,100,1,0,-@Recipe,1), -- 1 from Recipe +(@Freya10k1,4,100,1,0,-34349,2), -- 2x Emblem of Triumph for Alive Elders +-- Hard Mode: 3 elders alive +(@Freya10k0,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k0,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k0,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k0,47241,100,1,0,3,3), -- 3x Emblem of Triumph (self) +(@Freya10k0,45087,100,1,0,1,1), -- Runed Orb +(@Freya10k0,3,100,1,0,-@Recipe,1), -- 1 from Recipe +(@Freya10k0,45788,-100,1,0,1,1), -- Freya's Sigil 10 man QUEST ONLY +(@Freya10k0,4,100,1,0,-34349,1), -- 3x Emblem of Triumph for Alive Elders +-- 1 from Hardmode items: +(@Freya10k0,45943,0,1,1,1,1), -- Gloves of Whispering Winds +(@Freya10k0,45946,0,1,1,1,1), -- Fire Orchid Signet +(@Freya10k0,45945,0,1,1,1,1), -- Seed of Budding Carnage +(@Freya10k0,45947,0,1,1,1,1), -- Serilas, Blood Blade of Invar One-Arm +(@Freya10k0,45294,0,1,1,1,1), -- Petrified Ivy Sprig +-- ------------------ +-- -- Freya 25 man -- +-- ------------------ +-- Normal Mode: +(@Freya25k3,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k3,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k3,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Freya25k3,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k3,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k3,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Freya25k3,45083,5,1,0,1,1), -- Fragment of Val'anyr +-- Hard Mode: 1 elder alive +(@Freya25k2,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k2,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k2,47241,100,1,0,2,2), -- 2x Emblem of Triumph +(@Freya25k2,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k2,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k2,4,10,1,0,-34350,1), -- Chance on Runed Orb +(@Freya25k2,45087,100,1,0,2,2), -- 2x Runed Orb +(@Freya25k2,45083,7,1,0,1,1), -- Fragment of Val'anyr +(@Freya25k2,5,100,1,0,-34349,1), -- 1x Emblem of Triumph for Alive Elder +-- Hard Mode: 2 elders alive +(@Freya25k1,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k1,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k1,47241,100,1,0,3,3), -- 3x Emblem of Triumph +(@Freya25k1,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k1,3,10,1,0,-34350,1), -- Chance on Runed Orb +(@Freya25k1,45087,100,1,0,2,2), -- 2x Runed Orb +(@Freya25k1,4,100,1,0,-@Recipe,1), -- Recipe +(@Freya25k1,5,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k1,45083,9,1,0,1,1), -- Fragment of Val'anyr +(@Freya25k1,6,100,1,0,-34349,2), -- 2x Emblem of Triumph for Alive Elder +-- Hard Mode: 3 elders alive +(@Freya25k0,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k0,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k0,47241,100,1,0,3,3), -- 3x Emblem of Triumph +(@Freya25k0,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k0,3,10,1,0,-34350,1), -- Chance on Runed Orb +(@Freya25k0,45087,100,1,0,2,2), -- 2x Runed Orb +(@Freya25k0,4,100,1,0,-@Recipe,1), -- Recipe +(@Freya25k0,5,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k0,45814,-100,1,0,1,1), -- Freya's Sigil 25 man QUEST ONLY +(@Freya25k0,45083,20,1,0,1,1), -- Fragment of Val'anyr +(@Freya25k2,6,100,1,0,-34349,3), -- 3x Emblem of Triumph for Alive Elder +-- 1 from Hardmode items +(@Freya25k0,45484,0,1,1,1,1), -- Bladetwister +(@Freya25k0,45486,0,1,1,1,1), -- Drape of the Sullen Goddess +(@Freya25k0,45487,0,1,1,1,1), -- Handguards of Revitalization +(@Freya25k0,45488,0,1,1,1,1), -- Leggings of the Enslaved Idol +(@Freya25k0,45613,0,1,1,1,1), -- Dreambinder +(@Freya25k0,45485,0,1,1,1,1), -- Bronze Pendant of the Vanir +-- ------------------ +-- -- Hodir 10 man -- +-- ------------------ +(@Hodir10n,1,100,1,0,-@Hodir10Ref,1), -- 1x Normal Loot Item +(@Hodir10n,2,100,1,0,-@LegsToken,1), -- 1x Token +(@Hodir10n,47241,100,1,0,1,1), -- Emblem of Triumph +-- Hard mode: +(@Hodir10h,1,100,1,0,-@Hodir10Ref,1), -- 1x Normal Loot Item +(@Hodir10h,2,100,1,0,-@LegsToken,1), -- 1x Token +(@Hodir10h,47241,100,1,0,1,1), -- Emblem of Triumph +(@Hodir10h,45786,-100,1,0,1,1), -- Hodir's Sigil +-- 1 from Hardmode items +(@Hodir10h,45887,0,1,1,1,1), -- Ice Layered Barrier +(@Hodir10h,45888,0,1,1,1,1), -- Bitter Cold Armguards +(@Hodir10h,45886,0,1,1,1,1), -- Icecore Staff +(@Hodir10h,45876,0,1,1,1,1), -- Shiver +(@Hodir10h,45877,0,1,1,1,1), -- The Boreal Guard +-- ------------------ +-- -- Hodir 25 man -- +-- ------------------ +(@Hodir25n,1,100,1,0,-@Hodir25Ref,1), -- 1x Normal Loot Item +(@Hodir25n,2,100,1,0,-@ChestToken,1), -- 1x Token +(@Hodir25n,47241,100,1,0,1,1), -- Emblem of Triumph +(@Hodir25n,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Hodir25n,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Hodir25n,45083,10,1,0,1,1), -- Fragment of Val'anyr +-- Hard mode: +(@Hodir25h,1,100,1,0,-@Hodir25Ref,1), -- 1x Normal Loot Item +(@Hodir25h,2,100,1,0,-@ChestToken,2), -- 2x Token +(@Hodir25h,47241,100,1,0,1,1), -- Emblem of Triumph +(@Hodir25h,45815,-100,1,0,1,1), -- Hodir's Sigil +(@Hodir25h,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Hodir25h,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Hodir25h,45083,20,1,0,1,1), -- Fragment of Val'anyr +-- -------------------- +-- -- Mimiron 10 man -- +-- -------------------- +(@Mimiron10n,1,100,1,0,-@Mimiron10Ref,1), -- 1x Normal Loot Item +(@Mimiron10n,2,100,1,0,-@HeadToken,1), -- 1x Token +(@Mimiron10n,47241,100,1,0,1,1), -- 1x Emblem of Triumph +-- Hardmode 10 man +(@Mimiron10h,1,100,1,0,-@Mimiron10Ref,1), -- 1x Normal Loot Item +(@Mimiron10h,2,100,1,0,-@HeadToken,1), -- 1x Token +(@Mimiron10h,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Mimiron10h,45787,-100,1,0,1,1), -- Mimiron's Sigel (QUEST ONLY, HARDMODE ONLY) +-- 1 from Hardmode items +(@Mimiron10h,45989,0,1,1,1,1), -- Tempered Mercury Greaves +(@Mimiron10h,45982,0,1,1,1,1), -- Fused Alloy Legplates +(@Mimiron10h,45993,0,1,1,1,1), -- Mimiron's Flight Goggles +(@Mimiron10h,45988,0,1,1,1,1), -- Greaves of the Iron Army +(@Mimiron10h,45990,0,1,1,1,1), -- Fusion Blade +-- -------------------- +-- -- Mimiron 25 man -- +-- -------------------- +(@Mimiron25n,1,100,1,0,-@Mimiron25Ref,1), -- 1x Normal Loot Item +(@Mimiron25n,2,100,1,0,-@GloveToken,2), -- 2x Token +(@Mimiron25n,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Mimiron25n,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Mimiron25n,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Mimiron25n,45083,8,1,0,1,1), -- Fragment of Val'anyr Normal +-- Hard Mode 25 man +(@Mimiron25h,1,100,1,0,-@Mimiron25Ref,1), -- 1x Normal Loot Item +(@Mimiron25h,2,100,1,0,-@GloveToken,2), -- 2x Token +(@Mimiron25h,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Mimiron25h,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Mimiron25h,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Mimiron25h,45816,-100,1,0,1,1), -- Mimiron's Sigel (QUEST ONLY, HARDMODE ONLY) +(@Mimiron25h,45083,18,1,0,1,1), -- Fragment of Val'anyr Hardmode +-- 1 from Hardmode items +(@Mimiron25h,45496,0,1,1,1,1), -- Titanskin Cloak +(@Mimiron25h,45494,0,1,1,1,1), -- Delirium's Touch +(@Mimiron25h,45663,0,1,1,1,1), -- Armbands of Bedlam +(@Mimiron25h,45620,0,1,1,1,1), -- Starshard Edge +(@Mimiron25h,45495,0,1,1,1,1), -- Conductive Seal +(@Mimiron25h,45497,0,1,1,1,1), -- Crown of Luminescence +-- ------------------- +-- -- Thorim 10 man -- +-- ------------------- +(@Thorim10n,1,100,1,0,-@Thorim10Ref,1), -- 1x Normal Loot Item +(@Thorim10n,2,100,1,0,-@ShoulderToken,1), -- 1x Token +(@Thorim10n,47241,100,1,0,1,1), -- 1x Emblem of Triumph +-- Hardmode 10 man +(@Thorim10h,1,100,1,0,-@Thorim10Ref,1), -- 1x Normal Loot Item +(@Thorim10h,2,100,1,0,-@ShoulderToken,1), -- 1x Token +(@Thorim10h,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Thorim10h,45784,-100,2,0,1,1), -- Thorim's Sigil (QUEST ONLY, HARDMODE ONLY) +-- 1 from Hardmode items +(@Thorim10h,45933,0,2,1,1,1), -- Pendant of the Shallow Grave +(@Thorim10h,45929,0,2,1,1,1), -- Sif's Remembrance +(@Thorim10h,45928,0,2,1,1,1), -- Gauntlets of the Thunder God +(@Thorim10h,45931,0,2,1,1,1), -- Mjolnir Runestone +(@Thorim10h,45930,0,2,1,1,1), -- Combatant's Bootblade +-- ------------------- +-- -- Thorim 25 man -- +-- ------------------- +(@Thorim25n,1,100,3,0,-@Thorim25Ref,1), -- 1x Normal Loot Item +(@Thorim25n,2,100,3,0,-@HelmToken,2), -- 2x Token +(@Thorim25n,47241,100,3,0,1,1), -- 1x Emblem of Triumph +(@Thorim25n,3,10,3,0,-@Recipe,1), -- Chance on Recipe +(@Thorim25n,45087,10,3,0,1,1), -- Chance on Runed Orb +(@Thorim25n,45083,8,1,0,1,1), -- Fragment of Val'anyr Normal +-- Hardmode 25 man +(@Thorim25h,1,100,3,0,-@Thorim25Ref,1), -- 1x Normal Loot Item +(@Thorim25h,2,100,3,0,-@HelmToken,2), -- 2x Token +(@Thorim25h,47241,100,3,0,1,1), -- 1x Emblem of Triumph +(@Thorim25h,3,10,3,0,-@Recipe,1), -- Chance on Recipe +(@Thorim25h,45087,10,3,0,1,1), -- Chance on Runed Orb +(@Thorim25h,45817,-100,1,0,1,1), -- Thorim's Sigil (QUEST ONLY, HARDMODE ONLY) +(@Thorim25h,45083,18,1,0,1,1), -- Fragment of Val'anyr Hardmode +-- 1 from Hardmode items +(@Thorim25h,45471,0,1,1,1,1), -- Fate's Clutch +(@Thorim25h,45570,0,1,1,1,1), -- Skyforge Crossbow +(@Thorim25h,45472,0,1,1,1,1), -- Warhelm of the Champion +(@Thorim25h,45474,0,1,1,1,1), -- Pauldrons of the Combatant +(@Thorim25h,45470,0,1,1,1,1), -- Wisdom's Hold +(@Thorim25h,45473,0,1,1,1,1); -- Embrace of the Gladiator + -- cgit v1.2.3 From d157f4f8045861beec5ec056a4925e6060a01ccd Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 18 Apr 2012 16:42:32 +0200 Subject: DB/Loot: Increase dropchance for Venture Co. Explosives Closes #6243 --- sql/updates/world/2012_04_18_03_world_creature_loot_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_18_03_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql b/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql new file mode 100644 index 00000000000..5ad26809cdf --- /dev/null +++ b/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql @@ -0,0 +1,2 @@ +-- Increase dropchance for Venture Co. Explosives +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-10 WHERE `entry` IN(28123,28124) AND `item`=39651; -- cgit v1.2.3 From 5a37d68d5e96ac63a0e6fd1514627cdf0813d570 Mon Sep 17 00:00:00 2001 From: Helias Date: Wed, 18 Apr 2012 16:49:59 +0200 Subject: DB/Loot: Add some missing Pickpocket loot templates for Northrend creatures ohi Closes #6039 --- ..._04_18_04_world_pickpocketing_loot_template.sql | 501 +++++++++++++++++++++ 1 file changed, 501 insertions(+) create mode 100644 sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql b/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql new file mode 100644 index 00000000000..ab1c562f7dd --- /dev/null +++ b/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql @@ -0,0 +1,501 @@ +-- implement missing Northrend pickpocket loot +-- reference IDs +SET @NEWREF0 := 10026; +SET @NEWREF1 := @NEWREF0+1; +SET @NEWREF2 := @NEWREF0+2; +SET @NEWREF3 := @NEWREF0+3; +SET @NEWREF4 := @NEWREF0+4; +SET @NEWREF5 := @NEWREF0+5; +SET @NEWREF6 := @NEWREF0+6; +SET @NEWREF7 := @NEWREF0+7; +SET @NEWREF8 := @NEWREF0+8; +SET @NEWREF9 := @NEWREF0+9; +-- new references +DELETE FROM `reference_loot_template` WHERE entry IN (@NEWREF0, @NEWREF1, @NEWREF2, @NEWREF3, @NEWREF4, @NEWREF5, @NEWREF6, @NEWREF7, @NEWREF8, @NEWREF9); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`mincountOrRef`,`maxcount`) VALUES +(@NEWREF0,33447,25,1,1),-- Runic Healing Potion +(@NEWREF0,35953,30,1,1),-- Mead Basted Caribou +(@NEWREF0,38260,50,1,1),-- Empty Tobacco Pouch +(@NEWREF0,43575,80,1,1),-- Reinforced Junkbox +(@NEWREF1,36862,4,1,1),-- Wrogn Troll Dice +(@NEWREF1,40202,20,1,1),-- Sizzling Grizzly Flank +(@NEWREF2,33452,30,1,1),-- Honey-Spiced Lichen +(@NEWREF2,38269,35,1,1),-- Soggy Handkerchief +(@NEWREF3,33454,15,1,1),-- Salted Venison +(@NEWREF3,38261,13,1,1),-- Ben House Key +(@NEWREF4,38263,19,1,1),-- Too-Small Amband +(@NEWREF4,38264,18,1,1),-- A Very Pretty Rock +(@NEWREF5,29448,9,1,1),-- Mag'har Mild Cheese +(@NEWREF5,29450,13,1,1),-- Telaari Grapes +(@NEWREF5,37467,40,1,1),-- A Steamy Romance Novel: Forbidden Love +(@NEWREF6,35947,25,1,1),-- Sparkling Frostcap +(@NEWREF6,38269,40,1,1),-- Soggy Handkerchief +(@NEWREF7,33447,25,1,1),-- Runic Healing Potion +(@NEWREF7,35947,25,1,1),-- Sparkling Frostcap +(@NEWREF7,38269,40,1,1),-- Soggy Handkerchief +(@NEWREF7,43575,80,1,1),-- Reinforced Junkbox +(@NEWREF8,35948,11,1,1),-- Savory Snowplum +(@NEWREF8,35950,9,1,1),-- Sweet Potato Bread +(@NEWREF8,35952,8,1,1),-- Briny Hardcheese +(@NEWREF9,33447,25,1,1),-- Runic Healing Potion +(@NEWREF9,38260,50,1,1),-- Empty Tobacco Pouch +(@NEWREF9,43575,80,1,1); -- Reinforced Junkbox +-- implement pickpokect loot +UPDATE `creature_template` SET `pickpocketloot`=entry WHERE `entry` IN (25800,23667,23674,23760,23796,23865,23875,23963,24069,24262,24400,24460,25351,25427,25428,25429,25430,25601,25801,26073,26202,26334,26413,26447,26480,26481,26620,26621,26624,26626,26635,26636,26637,26639,26658,26681,26696,26727,26729,26800,26802,26836,26948,27105,27210,27211,/**/27234,27235,27247,27278,27289,27334,27342,27431,27533,27580,27639,27640,27699,27800,27859,27860,27961,27964,27965,28494,28496,28565,28803,28837,28838,28848,28961,28965,29369,29407,29553,29554,29656,29793,29820,29822,29836,29874,29875,29885,29920,30283,30319,30856,30868,31396,31554,32263); +UPDATE `creature_template` SET `pickpocketloot`=25430 WHERE `entry` IN (23654,23656,23663,23665,25434,26728,26827,26926,27554,32572); +UPDATE `creature_template` SET `pickpocketloot`=26481 WHERE `entry` IN (23662,23940,24016,24161,26493,26655,27007,27009); +UPDATE `creature_template` SET `pickpocketloot`=25351 WHERE `entry` IN (23993,24540,25224,25383,26343,26492,26891,26946,27224,27226,27283,27360,27552,27799,27823,27826,28564,28750); +UPDATE `creature_template` SET `pickpocketloot`=27533 WHERE `entry` IN (26555,26669,26670,26694,26830,27871,28022,28108,28242,28268,28419,29123,29133,29722,29738,30701,30894,30922,30949,31139,31150,31779,31847,32278,32505); +UPDATE `creature_template` SET `pickpocketloot`=30319 WHERE `entry` IN (30111,30179); +DELETE FROM `pickpocketing_loot_template` WHERE entry IN (25800,23656,23662,23663,23665,23667,23674,23760,23796,23865,23875,23940,23963,23993,24016,24069,24161,24262,24400,24460,24540,25224,25351,25383,25427,25428,25429,25430,25434,25601,25801,26073,26202,26334,26343,26413,26447,26480,26481,26492,26493,26555,26620,26621,26624,26626,26635,26636,26637,26639,26655,26658,26669,26670,26681,26694,26696,26727,26728,26729,26800,26802,26827,26830,26836,26891,26926,26946,26948,27007,27009,27105,27210,27211,27224,27226,27234,27235,27247,27278,27283,27289,27334,27342,27360,27431,27533,27552,27554,27580,27639,27640,27699,27799,27800,27823,27826,27859,27860,27871,27961,27964,27965,28022,28108,28242,28268,28419,28494,28496,28564,28565,28750,28803,28837,28838,28848,28961,28965,29123,29133,29369,29407,29553,29554,29656,29722,29738,29793,29820,29822,29836,29874,29875,29885,29920,30111,30179,30283,30319,30701,30856,30868,30894,30922,30949,31139,31150,31396,31554,31779,31847,32263,32278,32505,32572); +INSERT INTO `pickpocketing_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Plague Walker +(30283,43575,100,0,1,1),-- Reinforced Junkbox +(30283,0,100,0,-@NEWREF6,1), +-- Twilight Darkcaster +(30319,0,100,0,-@NEWREF0,1), +(30319,33449,11,0,1,1),-- Crusty Flatbread +(30319,1,100,0,-@NEWREF1,1), +(30319,2,100,0,-@NEWREF3,1), +-- High Priest Talet-Kha +(26073,43575,58,0,1,1),-- Reinforced Junkbox +(26073,0,100,0,-@NEWREF5,1), +(26073,33449,8,0,1,1),-- Crusty Flatbread +(26073,33447,8,0,1,1),-- Runic Healing Potion +-- Nedar, Lord of Rhinos +(25801,0,100,0,-@NEWREF5,1), +(25801,33447,6,0,1,1),-- Runic Healing Potion +(25801,38261,6,0,1,1),-- Bent House Key +-- Clam Master K +(25800,43575,47,0,1,1),-- Reinforced Junkbox +(25800,0,100,0,-@NEWREF5,1), +(25800,38261,15,0,1,1),-- Bent House Key +(25800,33449,5,0,1,1),-- Crusty Flatbread +(25800,33447,5,0,1,1),-- Runic Healing Potion +-- Magmothregar +(25430,0,100,0,-@NEWREF3,1), +(25430,1,100,0,-@NEWREF9,1), +(25430,33449,7,0,1,1),-- Crusty Flatbread +(25430,36862,4,0,1,1),-- Wrogn Troll Dice +-- Kaganishu +(25427,43575,43,0,1,1),-- Reinforced Junkbox +(25427,33454,35,0,1,1),-- Salted Venison +(25427,0,100,0,-@NEWREF4,1), +(25427,33447,8,0,1,1),-- Runic Healing Potion +-- Prince Valanar +(25601,43575,43,0,1,1),-- Reinforced Junkbox +(25601,37467,39,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(25601,33447,9,0,1,1),-- Runic Healing Potion +(25601,38261,9,0,1,1),-- Bent House Key +(25601,33449,4,0,1,1),-- Crusty Flatbread +(25601,29450,4,0,1,1),-- Telaari Grapes +-- Ghostly Sage +(25351,43575,42,0,1,1),-- Reinforced Junkbox +(25351,0,100,0,-@NEWREF2,1), +(25351,33447,10,0,1,1),-- Runic Healing Potion +-- Luthion the Vile +(27860,43575,42,0,1,1),-- Reinforced Junkbox +(27860,0,100,0,-@NEWREF5,1), +(27860,38261,13,0,1,1),-- Bent House Key +(27860,33449,6,0,1,1),-- Crusty Flatbread +(27860,33447,6,0,1,1),-- Runic Healing Potion +-- Reckless Scavenger +(26658,0,100,0,-@NEWREF2,1), +(26658,43575,40,0,1,1),-- Reinforced Junkbox +-- Ziggurat Defender +(26202,43575,40,0,1,1),-- Reinforced Junkbox +(26202,0,100,0,-@NEWREF2,1), +(26202,33447,7,0,1,1),-- Runic Healing Potion +(26202,29569,3,0,1,1),-- Strong Junkbox +-- Magmoth Forager +(25429,43575,39,0,1,1),-- Reinforced Junkbox +(25429,33454,27,0,1,1),-- Salted Venison +(25429,0,100,0,-@NEWREF4,1), +(25429,33447,10,0,1,1),-- Runic Healing Potion +(25429,38266,0.5,0,1,1),-- Rotund Relic +-- Magmoth Shaman +(25428,43575,39,0,1,1),-- Reinforced Junkbox +(25428,33454,28,0,1,1),-- Salted Venison +(25428,0,100,0,-@NEWREF4,1), +(25428,33447,9,0,1,1),-- Runic Healing Potion +(25428,38266,0.5,0,1,1),-- Rotund Relic +-- Vanthryn the Merciless +(27859,43575,39,0,1,1),-- Reinforced Junkbox +(27859,0,100,0,-@NEWREF5,1), +(27859,33449,12,0,1,1),-- Crusty Flatbread +(27859,38261,12,0,1,1),-- Bent House Key +(27859,33447,3,0,1,1),-- Runic Healing Potion +-- Unbound Corrupter +(30868,43575,47,0,1,1),-- Reinforced Junkbox +(30868,40202,18,0,1,1),-- Sizzling Grizzly Flank +(30868,33447,16,0,1,1),-- Runic Healing Potion +(30868,0,100,0,-@NEWREF4,1), +-- Unbound Trickster +(30856,43575,38,0,1,1),-- Reinforced Junkbox +(30856,0,100,0,-@NEWREF4,1), +(30856,33447,19,0,1,1),-- Runic Healing Potion +(30856,40202,14,0,1,1),-- Sizzling Grizzly Flank +-- Kreug Oathbreaker +(27105,43575,63,0,1,1),-- Reinforced Junkbox +(27105,33447,25,0,1,1),-- Runic Healing Potion +(27105,38269,13,0,1,1),-- Soggy Handkerchief +-- Lead Cannoneer Zierhut +(27235,43575,53,0,1,1),-- Reinforced Junkbox +(27235,0,100,0,-@NEWREF5,1), +(27235,33447,8,0,1,1),-- Runic Healing Potion +(27235,38261,8,0,1,1),-- Bent House Key +-- Devout Bodyguard +(27247,43575,50,0,1,1),-- Reinforced Junkbox +(27247,37467,42,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27247,33447,8,0,1,1),-- Runic Healing Potion +(27247,29450,8,0,1,1),-- Telaari Grapes +(27247,38261,8,0,1,1),-- Bent House Key +-- Magnataur Alpha +(26481,0,100,0,-@NEWREF9,1), +(26481,1,100,0,-@NEWREF3,1), +(26481,33449,5,0,1,1),-- Crusty Flatbread +-- High General Abbendis +(27210,43575,48,0,1,1),-- Reinforced Junkbox +(27210,0,100,0,-@NEWREF5,1), +(27210,33449,10,0,1,1),-- Crusty Flatbread +(27210,33447,10,0,1,1),-- Runic Healing Potion +(27210,38261,8,0,1,1),-- Bent House Key +-- Anub'ar Dreadweaver +(26413,43575,44,0,1,1),-- Reinforced Junkbox +(26413,43576,22,0,1,1),-- Chitin Polish +(26413,33452,11,0,1,1),-- Honey-Spiced Lichen +(26413,33447,11,0,1,1),-- Runic Healing Potion +(26413,43577,11,0,1,1),-- Carapace Cleanser +-- Naxxramas Necrolord +(27289,33452,44,0,1,1),-- Honey-Spiced Lichen +(27289,43575,44,0,1,1),-- Reinforced Junkbox +(27289,33447,11,0,1,1),-- Runic Healing Potion +-- Onslaught Commander Iustus +(27334,37467,50,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27334,43575,44,0,1,1),-- Reinforced Junkbox +(27334,29448,13,0,1,1),-- Mag'har Mild Cheese +(27334,38261,6,0,1,1),-- Bent House Key +-- Blacksmith Goodman +(27234,43575,41,0,1,1),-- Reinforced Junkbox +(27234,0,100,0,-@NEWREF5,1), +(27234,38261,13,0,1,1),-- Bent House Key +(27234,33447,9,0,1,1),-- Runic Healing Potion +(27234,33449,7,0,1,1),-- Crusty Flatbread +-- Magnataur Youngling +(26480,33449,19,0,1,1),-- Crusty Flatbread +(26480,0,100,0,-@NEWREF3,1), +(26480,1,100,0,-@NEWREF9,1), +-- Bloodpaw Warrior +(27342,43575,40,0,1,1),-- Reinforced Junkbox +(27342,33454,26,0,1,1),-- Salted Venison +(27342,0,100,0,-@NEWREF4,1), +(27342,33447,11,0,1,1),-- Runic Healing Potion +(27342,38266,0.6,0,1,1),-- Rotund Relic +-- Frigid Geist +(27533,0,100,0,-@NEWREF7,1), +-- Snowplain Zealot +(27278,43575,40,0,1,1),-- Reinforced Junkbox +(27278,33454,22,0,1,1),-- Salted Venison +(27278,0,100,0,-@NEWREF4,1), +(27278,33447,12,0,1,1),-- Runic Healing Potion +(27278,38266,0.3,0,1,1),-- Rotund Relic +-- Hulking Atrocity +(26948,43575,39,0,1,1),-- Reinforced Junkbox +(26948,0,100,0,-@NEWREF2,1), +(26948,33447,9,0,1,1),-- Runic Healing Potion +(26948,29569,0.3,0,1,1),-- Strong Junkbox +(26948,38268,0.3,0,1,1),-- Spare Hand +-- Onslaught Executioner +(27211,43575,39,0,1,1),-- Reinforced Junkbox +(27211,0,100,0,-@NEWREF5,1), +(27211,33449,12,0,1,1),-- Crusty Flatbread +(27211,38261,11,0,1,1),-- Bent House Key +(27211,33447,5,0,1,1),-- Runic Healing Potion +-- Gigantaur +(26836,0,100,0,-@NEWREF9,1), +(26836,1,100,0,-@NEWREF3,1), +(26836,33449,12,0,1,1),-- Crusty Flatbread +-- Leprous Servant +(27800,43575,38,0,1,1),-- Reinforced Junkbox +(27800,0,100,0,-@NEWREF2,1), +(27800,33447,7,0,1,1),-- Runic Healing Potion +(27800,38268,2,0,1,1),-- Spare Hand +-- Wretched Belcher +(26624,43575,100,0,1,1),-- Reinforced Junkbox +(26624,0,100,0,-@NEWREF2,1), +(26624,33447,25,0,1,1),-- Runic Healing Potion +(26624,35947,25,0,1,1),-- Sparkling Frostcap +-- Drakkari Commander +(27431,43575,90,0,1,1),-- Reinforced Junkbox +(27431,0,100,0,-@NEWREF2,1), +(27431,33447,26,0,1,1),-- Runic Healing Potion +(27431,35947,10,0,1,1),-- Sparkling Frostcap +-- Drakkari Guardian +(26620,0,100,0,-@NEWREF0,1), +(26620,33454,17,0,1,1),-- Salted Venison +(26620,33449,9,0,1,1),-- Crusty Flatbread +(26620,38261,9,0,1,1),-- Bent House Key +(26620,1,100,0,-@NEWREF1,1), +-- Risen Drakkari Soulmage +(26636,43575,85,0,1,1),-- Reinforced Junkbox +(26636,0,100,0,-@NEWREF2,1), +(26636,35947,21,0,1,1),-- Sparkling Frostcap +(26636,33447,16,0,1,1),-- Runic Healing Potion +-- Ghoul Tormentor +(26621,43575,81,0,1,1),-- Reinforced Junkbox +(26621,0,100,0,-@NEWREF2,1), +(26621,35947,24,0,1,1),-- Sparkling Frostcap +(26621,33447,14,0,1,1),-- Runic Healing Potion +-- Risen Drakkari Warrior +(26635,43575,71,0,1,1),-- Reinforced Junkbox +(26635,0,100,0,-@NEWREF2,1), +(26635,33447,29,0,1,1),-- Runic Healing Potion +(26635,35947,18,0,1,1),-- Sparkling Frostcap +(26635,38268,0.8,0,1,1),-- Spare Hand +-- Risen Drakkari Handler +(26637,0,100,0,-@NEWREF2,1), +(26637,43575,67,0,1,1),-- Reinforced Junkbox +(26637,33447,30,0,1,1),-- Runic Healing Potion +(26637,35947,18,0,1,1),-- Sparkling Frostcap +-- Scourge Reanimator +(26626,0,100,0,-@NEWREF2,1), +(26626,43575,67,0,1,1),-- Reinforced Junkbox +(26626,33447,21,0,1,1),-- Runic Healing Potion +(26626,35947,21,0,1,1),-- Sparkling Frostcap +-- Drakkari Shaman +(26639,0,100,0,-@NEWREF0,1), +(26639,33449,18,0,1,1),-- Crusty Flatbread +(26639,1,100,0,-@NEWREF3,1), +(26639,40202,11,0,1,1),-- Sizzling Grizzly Flank +-- Selas +(27580,43575,50,0,1,1),-- Reinforced Junkbox +(27580,0,100,0,-@NEWREF3,1), +(27580,38260,20,0,1,1),-- Empty Tobacco Pouch +-- Forgemaster Damrath +(26334,43575,48,0,1,1),-- Reinforced Junkbox +(26334,0,100,0,-@NEWREF5,1), +(26334,33447,9,0,1,1),-- Runic Healing Potion +(26334,38261,9,0,1,1),-- Bent House Key +-- Grumbald One-Eye +(26681,43575,39,0,1,1),-- Reinforced Junkbox +(26681,33454,28,0,1,1),-- Salted Venison +(26681,0,100,0,-@NEWREF4,1), +(26681,33447,9,0,1,1),-- Runic Healing Potion +-- Drakkari Shaman +(26447,0,100,0,-@NEWREF9,1), +(26447,1,100,0,-@NEWREF3,1), +(26447,33449,10,0,1,1),-- Crusty Flatbread +(26447,35799,0.2,0,1,1),-- Frozen Mojo +(26447,36862,0.2,0,1,1),-- Wrogn Troll Dice +-- Drakkari God Hunter +(29820,0,100,0,-@NEWREF0,1), +(29820,1,100,0,-@NEWREF1,1), +-- Drakkari Battle Rider +(29836,0,100,0,-@NEWREF0,1), +(29836,40202,18,0,1,1),-- Sizzling Grizzly Flank +-- Ruins Dweller +(29920,43575,71,0,1,1),-- Reinforced Junkbox +(29920,37452,69,0,1,1),-- Fatty Bluefin +(29920,38274,58,0,1,1),-- Large Snail Shell +(29920,38273,35,0,1,1),-- Brain Coral +(29920,33447,16,0,1,1),-- Runic Healing Potion +-- Drakkari Fire Weaver +(29822,0,100,0,-@NEWREF0,1), +(29822,40202,24,0,1,1),-- Sizzling Grizzly Flank +-- Drakkari Inciter +(29874,0,100,0,-@NEWREF0,1), +(29874,36862,16,0,1,1),-- Wrogn Troll Dice +(29874,40202,12,0,1,1),-- Sizzling Grizzly Flank +-- Titanium Siegebreaker +(28961,0,100,0,-@NEWREF0,1), +(28961,40202,35,0,1,1),-- Sizzling Grizzly Flank +-- Stormforged Sentinel +(28837,0,100,0,-@NEWREF0,1), +(28837,40202,16,0,1,1),-- Sizzling Grizzly Flank +-- Titanium Thunderer +(28965,0,100,0,-@NEWREF0,1), +(28965,40202,44,0,1,1),-- Sizzling Grizzly Flank +-- Titanium Vanguard +(28838,0,100,0,-@NEWREF0,1), +(28838,40202,27,0,1,1),-- Sizzling Grizzly Flank +-- Dark Rune Scholar +(27964,0,100,0,-@NEWREF9,1), +(27964,1,100,0,-@NEWREF1,1), +-- Dark Rune Worker +(27961,0,100,0,-@NEWREF0,1), +(27961,40202,29,0,1,1),-- Sizzling Grizzly Flank +(27961,36862,4,0,1,1),-- Wrogn Troll Dice +-- Dark Rune Shaper +(27965,0,100,0,-@NEWREF0,1), +(27965,40202,28,0,1,1),-- Sizzling Grizzly Flank +-- Steel Gate Archaeologist +(24400,0,100,0,-@NEWREF0,1), +(24400,1,100,0,-@NEWREF5,1), +(24400,33449,7,0,1,1),-- Crusty Flatbread +(24400,38261,9,0,1,1),-- Bent House Key +-- Blacksouled Keeper +(23875,0,100,0,-@NEWREF0,1), +(23875,1,100,0,-@NEWREF3,1), +(23875,33449,14,0,1,1),-- Crusty Flatbread +-- Winterskorn Rune-Seer +(23667,0,100,0,-@NEWREF0,1), +(23667,33449,7,0,1,1),-- Crusty Flatbread +(23667,33454,7,0,1,1),-- Salted Venison +-- Sergeant Lorric +(23963,43575,45,0,1,1),-- Reinforced Junkbox +(23963,0,100,0,-@NEWREF5,1), +(23963,33447,13,0,1,1),-- Runic Healing Potion +(23963,38261,11,0,1,1),-- Bent House Key +(23963,33449,7,0,1,1),-- Crusty Flatbread +-- Gjalerhorn Scavenger +(27699,0,100,0,-@NEWREF4,1), +(27699,43575,43,0,1,1),-- Reinforced Junkbox +(27699,33454,22,0,1,1),-- Salted Venison +(27699,33447,7,0,1,1),-- Runic Healing Potion +(27699,29569,0.8,0,1,1),-- Strong Junkbox +-- Iron Rune Binder +(23796,0,100,0,-@NEWREF5,1), +(23796,43575,42,0,1,1),-- Reinforced Junkbox +(23796,38261,12,0,1,1),-- Bent House Key +(23796,33449,11,0,1,1),-- Crusty Flatbread +(23796,33447,9,0,1,1),-- Runic Healing Potion +(23796,29569,0.5,0,1,1),-- Strong Junkbox +-- Forsaken Plaguebringer +(23760,0,100,0,-@NEWREF2,1), +(23760,43575,41,0,1,1),-- Reinforced Junkbox +(23760,33447,10,0,1,1),-- Runic Healing Potion +(23760,38268,0.3,0,1,1),-- Spare Hand +-- Chillmere Tidehunter +(24460,43575,40,0,1,1),-- Reinforced Junkbox +(24460,38274,33,0,1,1),-- Large Snail Shell +(24460,37452,18,0,1,1),-- Fatty Bluefin +(24460,38273,15,0,1,1),-- Brain Coral +(24460,33447,7,0,1,1),-- Runic Healing Potion +-- Vrykul Soul +(24262,0,100,0,-@NEWREF2,1), +(24262,43575,40,0,1,1),-- Reinforced Junkbox +(24262,33447,3,0,1,1),-- Runic Healing Potion +-- Iron Rune Sage +(23674,0,100,0,-@NEWREF5,1), +(23674,43575,39,0,1,1),-- Reinforced Junkbox +(23674,38261,13,0,1,1),-- Bent House Key +(23674,33449,9,0,1,1),-- Crusty Flatbread +(23674,33447,6,0,1,1),-- Runic Healing Potion +-- Vengeance Bringer +(23865,43575,39,0,1,1),-- Reinforced Junkbox +(23865,0,100,0,-@NEWREF2,1), +-- Restless Lookout +(31554,43575,80,0,1,1),-- Reinforced Junkbox +(31554,35947,40,0,1,1),-- Sparkling Frostcap +-- Val'kyr Taskmistress +(31396,43575,56,0,1,1),-- Reinforced Junkbox +(31396,35947,38,0,1,1),-- Sparkling Frostcap +(31396,33447,15,0,1,1),-- Runic Healing Potion +-- Overseer Veraj +(32263,43575,42,0,1,1),-- Reinforced Junkbox +(32263,37467,28,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(32263,38261,15,0,1,1),-- Bent House Key +(32263,33447,13,0,1,1),-- Runic Healing Potion +(32263,0,100,0,-@NEWREF8,1), +-- Steward +(26729,0,100,0,-@NEWREF0,1), +(26729,1,100,0,-@NEWREF3,1), +(26729,33449,31,0,1,1),-- Crusty Flatbread +(26729,29569,0.5,0,1,1),-- Strong Junkbox +-- Alliance Berserker +(26800,43575,62,0,1,1),-- Reinforced Junkbox +(26800,33449,19,0,1,1),-- Crusty Flatbread +(26800,38261,16,0,1,1),-- Bent House Key +(26800,33447,10,0,1,1),-- Runic Healing Potion +(26800,0,100,0,-@NEWREF5,1), +-- Alliance Ranger +(26802,0,100,0,-@NEWREF5,1), +(26802,43575,60,0,1,1),-- Reinforced Junkbox +(26802,38261,34,0,1,1),-- Bent House Key +(26802,33449,24,0,1,1),-- Crusty Flatbread +(26802,33447,12,0,1,1),-- Runic Healing Potion +-- Mage Hunter Ascendant +(26727,0,100,0,-@NEWREF0,1), +(26727,1,100,0,-@NEWREF3,1), +(26727,33449,29,0,1,1),-- Crusty Flatbread +-- Ring-Lord Sorceress +(27639,43575,87,0,1,1),-- Reinforced Junkbox +(27639,37467,46,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27639,38261,28,0,1,1),-- Bent House Key +(27639,33447,19,0,1,1),-- Runic Healing Potion +(27639,0,100,0,-@NEWREF8,1), +(27639,36863,1.6,0,1,1),-- Decahedral Dwarven Dice +-- Ring-Lord Conjurer +(27640,37467,67,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27640,43575,64,0,1,1),-- Reinforced Junkbox +(27640,33447,30,0,1,1),-- Runic Healing Potion +(27640,38261,26,0,1,1),-- Bent House Key +(27640,0,100,0,-@NEWREF8,1), +-- Mildred the Cruel +(29885,0,100,0,-@NEWREF0,1), +(29885,40202,13,0,1,1),-- Sizzling Grizzly Flank +-- Snowblind Devotee +(29407,43575,42,0,1,1),-- Reinforced Junkbox +(29407,40202,29,0,1,1),-- Sizzling Grizzly Flank +(29407,0,100,0,-@NEWREF4,1), +(29407,33447,12,0,1,1),-- Runic Healing Potion +-- Snowblind Devotee +(29554,43575,43,0,1,1),-- Reinforced Junkbox +(29554,40202,27,0,1,1),-- Sizzling Grizzly Flank +(29554,0,100,0,-@NEWREF4,1), +(29554,33447,12,0,1,1),-- Runic Healing Potion +(29554,38266,0.2,0,1,1),-- Rotund Relic +-- Frostfeather Witch +(29793,43575,40,0,1,1),-- Reinforced Junkbox +(29793,40202,21,0,1,1),-- Sizzling Grizzly Flank +(29793,0,100,0,-@NEWREF4,1), +(29793,33447,16,0,1,1),-- Runic Healing Potion +-- Icemane Yeti +(29875,43575,39,0,1,1),-- Reinforced Junkbox +(29875,40202,23,0,1,1),-- Sizzling Grizzly Flank +(29875,0,100,0,-@NEWREF4,1), +(29875,33447,15,0,1,1),-- Runic Healing Potion +(29875,38266,0.3,0,1,1),-- Rotund Relic +-- Garm Watcher +(29553,0,100,0,-@NEWREF0,1), +(29553,1,100,0,-@NEWREF1,1), +(29553,24231,0.3,0,2,2),-- Coarse Snuff +-- Stormforged Taskmaster +(29369,43575,38,0,1,1),-- Reinforced Junkbox +(29369,37467,34,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(29369,33447,13,0,1,1),-- Runic Healing Potion +(29369,38261,6,0,1,1),-- Bent House Key +(29369,0,100,0,-@NEWREF8,1), +-- Dragonflayer Bonecrusher +(24069,0,100,0,-@NEWREF0,1), +(24069,1,100,0,-@NEWREF1,1), +(24069,29569,47,0,1,1),-- Strong Junkbox +(24069,29570,34,0,1,1),-- A Gnome Effigy +(24069,27855,22,0,1,1),-- Mag'har Grainbread +(24069,27854,19,0,1,1),-- Smoked Talbuk Venison +(24069,22829,10,0,1,1),-- Super Healing Potion +(24069,23438,1.2,0,1,1),-- Star of Elune +-- Ymirjar Berserker +(26696,0,100,0,-@NEWREF7,1), +(26696,29569,1.1,0,1,1),-- Strong Junkbox +-- Kutube'sa +(28494,0,100,0,-@NEWREF0,1), +(28494,1,100,0,-@NEWREF1,1), +-- Chulo the Mad +(28496,0,100,0,-@NEWREF0,1), +(28496,40202,6,0,1,1),-- Sizzling Grizzly Flank +-- Drakuru's Guard +(28803,43575,50,0,1,1),-- Reinforced Junkbox +(28803,33447,33,0,1,1),-- Runic Healing Potion +(28803,38269,17,0,1,1),-- Soggy Handkerchief +-- Prophet of Har'koa +(28848,0,100,0,-@NEWREF0,1), +(28848,40202,3,0,1,1),-- Sizzling Grizzly Flank +-- Decaying Ghoul +(28565,0,100,0,-@NEWREF7,1), +(28565,22829,0.9,0,1,1),-- Super Healing Potion +-- Drakuru Berserker +(29656,0,100,0,-@NEWREF0,1), +(29656,1,100,0,-@NEWREF3,1), +(29656,33449,11,0,1,1),-- Crusty Flatbread +(29656,29569,0.9,0,1,1); -- Strong Junkbox -- cgit v1.2.3 From 0497283c1e71620f12fb2118fa51bb3a5987a797 Mon Sep 17 00:00:00 2001 From: Moriquendu Date: Wed, 18 Apr 2012 17:00:44 +0200 Subject: DB/Conditions: Add a condition to the Lovely Charm aura Closes #5359 --- sql/updates/world/2012_04_18_05_world_conditions.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_18_05_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_05_world_conditions.sql b/sql/updates/world/2012_04_18_05_world_conditions.sql new file mode 100644 index 00000000000..ecf80f270a3 --- /dev/null +++ b/sql/updates/world/2012_04_18_05_world_conditions.sql @@ -0,0 +1,4 @@ +-- Add condition to the Lovely Charm aura +DELETE FROM conditions WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`= 69511; +INSERT INTO conditions (SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, COMMENT) VALUES +(17,0,69511,0,12,8,0,0,0, '', 'Lovely Charm - Only during event'); -- cgit v1.2.3 From 55bfb6247fb6ff4aa7ac1f24bc1ce18de15721ed Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 18 Apr 2012 23:03:16 +0200 Subject: DB/Creature: Remove skinning loot from Blackwing Spellbinder Closes #2228 --- sql/updates/world/2012_04_18_06_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_18_06_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_06_world_creature_template.sql b/sql/updates/world/2012_04_18_06_world_creature_template.sql new file mode 100644 index 00000000000..8c167c2ffa1 --- /dev/null +++ b/sql/updates/world/2012_04_18_06_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Remove Skinning loot from Blackwing Spellbinder +UPDATE `creature_template` SET `skinloot`=0 WHERE `entry`=12457; -- cgit v1.2.3 From 189287a51bc6b29ef566a4c19c5d32bee27e4708 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 18 Apr 2012 23:08:06 +0200 Subject: DB/Loot: Set correct area/zone for Dalaran Underbelly Closes #2115 --- sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql b/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql new file mode 100644 index 00000000000..6c39cc95b48 --- /dev/null +++ b/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql @@ -0,0 +1,2 @@ +-- update wrong area. +UPDATE `fishing_loot_template` SET `entry`=4560 WHERE `entry`=4395 AND `item`=11026; -- cgit v1.2.3 From ccb211374e10d2506d6af24a05378823ac240032 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Thu, 19 Apr 2012 00:02:27 +0200 Subject: DB/Loot: Add loot for some Hrothgar's Landing creatures Closes #1813 --- .../2012_04_18_08_world_creature_loot_template.sql | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 sql/updates/world/2012_04_18_08_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql b/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql new file mode 100644 index 00000000000..4b00685ed55 --- /dev/null +++ b/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql @@ -0,0 +1,22 @@ +-- Add loot for Hrothgar's Landing +DELETE FROM `creature_loot_template` WHERE `entry` IN (34980,34838,34839,34965); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- AURIAYA 10-man +-- Drottinn Hrothgar - http://old.wowhead.com/npc=34980 +(34980,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg +-- Kvaldir Reaver +(34838,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg +(34838,49676,5,1,0,1,1), -- Kvaldir Attack Plans +(34838,33470,35,1,0,1,4), -- 1-4x Frostweave Cloth +(34838,1,10,1,0,-24727,1), -- 1 of Northrend scrolls +(34838,2,10,1,0,-26002,1), -- Northrend Grey Item Reference1 +(34838,3,2,1,0,-35080,1), -- Northrend Green Item Reference +-- Kvaldir Mist Binder +(34839,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg +(34839,49676,5,1,0,1,1), -- Kvaldir Attack Plans +(34839,33470,35,1,0,1,4), -- 1-4x Frostweave Cloth +(34839,1,10,1,0,-24727,1), -- 1 of Northrend scrolls +(34839,2,10,1,0,-26002,1), -- Northrend Grey Item Reference1 +(34839,3, 2,1,0,-35080,1), -- Northrend Green Item Reference +-- Mistcaller Yngvar +(34965,46859,-100,1,0,1,1); -- Stolen Tallstrider Leg -- cgit v1.2.3 From 584161bc6db7fd150f857eddefad54cd2c4ad9f2 Mon Sep 17 00:00:00 2001 From: Gecko32 Date: Thu, 19 Apr 2012 10:38:14 +0200 Subject: DB/Loot: Add missing loot templates for some creatures in naxx25 remove scraps from naxx10 Closes # 2776 --- sql/updates/world/2012_04_19_00_world_creature_template.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_04_19_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_19_00_world_creature_template.sql b/sql/updates/world/2012_04_19_00_world_creature_template.sql new file mode 100644 index 00000000000..e9abd40095e --- /dev/null +++ b/sql/updates/world/2012_04_19_00_world_creature_template.sql @@ -0,0 +1,7 @@ +-- update Plague Slime & Marauding Geist to naxx25 trash lootid +UPDATE `creature_template` SET `lootid`=100005 WHERE `entry` IN(29575,30424); +-- update Plague Slime & Marauding Geist to naxx10 trash lootid +UPDATE `creature_template` SET `lootid`=100003 WHERE `entry` IN(16243,30083); +DELETE FROM `creature_loot_template` WHERE `entry` IN(30424,29575,16243,30083); +-- Remove scraps for naxx10 from creature creature_loot_template +DELETE FROM `creature_loot_template` WHERE `item` IN (22373,22374,22375,22376); -- cgit v1.2.3 From 190b5e261584594ccfa3f9536db1da4363a79a52 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Thu, 19 Apr 2012 14:51:32 +0200 Subject: DB/Loot: Add more pickpocketing loot templates for Northrend. Special thx for Gecko32 to do the prework Closes #5106 --- ..._04_19_01_world_pickpocketing_loot_template.sql | 202 +++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql b/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql new file mode 100644 index 00000000000..997b16ff65d --- /dev/null +++ b/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql @@ -0,0 +1,202 @@ +-- Fix to add pickpocketing loot for humoniods in borean tundra +SET @GORLOCREF := 25100; +SET @BERYLREF := @GORLOCREF+1; +SET @BLOODREF := @GORLOCREF+2; +SET @CHIEFREF := @GORLOCREF+3; +SET @CULTREF := @GORLOCREF+4; +SET @KVALDIRREF := @GORLOCREF+5; +SET @CLAXREF := @GORLOCREF+6; +SET @MAGMOTHREF := @GORLOCREF+7; +-- Create reference templates +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GORLOCREF AND @GORLOCREF+7; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@GORLOCREF,29576,57,1,0,1,1), -- Shark Bait +(@GORLOCREF,29569,30,1,0,1,1), -- Strong Junkbox +(@GORLOCREF,27858,8,1,0,1,1), -- Sunspring Carp +(@GORLOCREF,22829,3,1,0,1,1), -- Super Healing Potion +(@GORLOCREF,23436,0.5,1,0,1,1), -- Living Ruby +(@GORLOCREF,23437,0.5,1,0,1,1), -- Talasite +(@GORLOCREF,23440,0.5,1,0,1,1), -- Dawnstone +(@GORLOCREF,23438,0.5,1,0,1,1), -- Star of Elune +(@GORLOCREF,23439,0.5,1,0,1,1), -- Noble Topaz +-- -------------------------------------------------- +(@BERYLREF,37467,32.5,1,0,1,1), -- A Steamy Romance Novel: Forbidden Love +(@BERYLREF,43575,31,1,0,1,1), -- Reinforced Junkbox +(@BERYLREF,38261,10,1,0,1,1), -- Bent House Key +(@BERYLREF,29448,7,1,0,1,1), -- Mag'har Mild Cheese +(@BERYLREF,29450,7,1,0,1,1), -- Telaari Grapes +(@BERYLREF,33447,6,1,0,1,1), -- Runic Healing Potion +(@BERYLREF,33449,6,1,0,1,1), -- Crusty Flatbread +(@BERYLREF,36863,0.5,1,0,1,1), -- Decahedral Dwarven Dice +-- -------------------------------------------------- +(@BLOODREF,29572,37,1,0,1,1), -- Aboriginal Carvings +(@BLOODREF,29569,33,1,0,1,1), -- Strong Junkbox +(@BLOODREF,8952,20,1,0,1,1), -- Roasted Quail +(@BLOODREF,22829,8,1,0,1,1), -- Super Healing Potion +(@BLOODREF,23438,0.5,1,0,1,1), -- Star of Elune +(@BLOODREF,23436,0.5,1,0,1,1), -- Living Ruby +(@BLOODREF,23441,0.5,1,0,1,1), -- Nightseye +(@BLOODREF,23437,0.5,1,0,1,1), -- Talasite +(@BLOODREF,23440,0.5,1,0,1,1), -- Dawnstone +-- -------------------------------------------------- +(@CHIEFREF,29569,50,1,0,1,1), -- Strong Junkbox +(@CHIEFREF,27858,20,1,0,1,1), -- Sunspring Carp +(@CHIEFREF,29576,20,1,0,1,1), -- Shark Bait +(@CHIEFREF,22829,10,1,0,1,1), -- Super Healing Potion +-- -------------------------------------------------- +(@CULTREF,29569,40,1,0,1,1), -- Strong Junkbox +(@CULTREF,29571,37,1,0,1,1), -- A Steamy Romance Novel +(@CULTREF,30458,8,1,0,1,1), -- Stromgarde Muenster +(@CULTREF,27855,7,1,0,1,1), -- Mag'har Grainbread +(@CULTREF,27856,6,1,0,1,1), -- Skethyl Berries +(@CULTREF,22829,2,1,0,1,1), -- Super Healing Potion +(@CULTREF,36863,0.5,1,0,1,1), -- Decahedral Dwarven Dice +-- -------------------------------------------------- +(@KVALDIRREF,29569,39,1,0,1,1), -- Strong Junkbox +(@KVALDIRREF,29570,28,1,0,1,1), -- A Gnome Effigy +(@KVALDIRREF,27855,12,1,0,1,1), -- Mag'har Grainbread +(@KVALDIRREF,27854,12,1,0,1,1), -- Smoked Talbuk Venison +(@KVALDIRREF,22829,7,1,0,1,1), -- Super Healing Potion +(@KVALDIRREF,23436,0.5,1,0,1,1), -- Living Ruby +(@KVALDIRREF,23441,0.5,1,0,1,1), -- Nightseye +(@KVALDIRREF,23440,0.5,1,0,1,1), -- Dawnstone +(@KVALDIRREF,23439,0.5,1,0,1,1), -- Noble Topaz +(@KVALDIRREF,23437,0.5,1,0,1,1), -- Talasite +-- -------------------------------------------------- +(@CLAXREF,43575,28,1,0,1,1), -- Reinforced Junkbox +(@CLAXREF,38273,26,1,0,1,1), -- Brain Coral +(@CLAXREF,38274,23,1,0,1,1), -- Large Snail Shell +(@CLAXREF,37452,17,1,0,1,1), -- Fatty Bluefin +(@CLAXREF,33447,6,1,0,1,1), -- Runic Healing Potion +-- -------------------------------------------------- +(@MAGMOTHREF,38260,33,1,0,1,1), -- Empty Tobacco Pouch +(@MAGMOTHREF,38261,21,1,0,1,1), -- Bent House Key +(@MAGMOTHREF,33449,16,1,0,1,1), -- Crusty Flatbread +(@MAGMOTHREF,43575,16,1,0,1,1), -- Reinforced Junkbox +(@MAGMOTHREF,33454,9,1,0,1,1), -- Salted Venison +(@MAGMOTHREF,33447,5,1,0,1,1), -- Runic Healing Potion +(@MAGMOTHREF,36862,1,1,0,1,1); -- Worn Troll Dice +-- ------------------- +-- -- NPC Variables -- +-- ------------------- +SET @NPC := 25686; +SET @NPC1 := 25700; +SET @NPC2 := 25687; +SET @NPC3 := 25685; +SET @NPC4 := 25449; +SET @NPC5 := 25316; +SET @NPC6 := 25353; +SET @NPC7 := 25719; +SET @NPC8 := 25804; +SET @NPC9 := 25392; +SET @NPC10 := 25651; +SET @NPC11 := 25836; +SET @NPC12 := 25979; +SET @NPC13 := 25806; +SET @NPC14 := 25720; +SET @NPC15 := 25803; +SET @NPC16 := 25880; +SET @NPC17 := 25618; +SET @NPC18 := 25839; +SET @NPC19 := 25470; +SET @NPC20 := 24567; +SET @NPC21 := 25467; +SET @NPC22 := 25468; +SET @NPC23 := 25501; +SET @NPC24 := 25726; +SET @NPC25 := 25701; +SET @NPC26 := 25725; +SET @NPC27 := 25699; +SET @NPC28 := 24576; +SET @NPC29 := 25605; +SET @NPC30 := 25609; +SET @NPC31 := 25378; +SET @NPC32 := 25843; +SET @NPC33 := 25496; +SET @NPC34 := 25479; +SET @NPC35 := 25760; +SET @NPC36 := 26266; +SET @NPC37 := 26451; +SET @NPC38 := 25521; +SET @NPC39 := 25613; +SET @NPC40 := 25522; +SET @NPC41 := 25520; +SET @NPC42 := 25209; +SET @NPC43 := 25210; +SET @NPC44 := 25216; +SET @NPC45 := 25215; +SET @NPC46 := 25217; +SET @NPC47 := 25789; +SET @NPC48 := 24469; +SET @NPC49 := 25432; +SET @NPC50 := 25433; +SET @NPC51 := 25615; +SET @NPC52 := 25523; +-- ---------------------- +-- -- Assign the loots -- +-- ---------------------- +UPDATE `creature_template` SET `pickpocketloot`=`entry` WHERE `entry` IN (@NPC,@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6,@NPC7,@NPC8,@NPC9,@NPC10,@NPC11,@NPC12,@NPC13,@NPC14,@NPC15,@NPC16,@NPC17,@NPC18,@NPC19,@NPC20,@NPC21,@NPC22,@NPC23,@NPC24,@NPC25,@NPC26,@NPC27,@NPC28,@NPC29,@NPC30,@NPC31,@NPC32,@NPC33,@NPC34,@NPC35,@NPC36,@NPC37,@NPC38,@NPC39,@NPC40,@NPC41,@NPC42,@NPC43,@NPC44,@NPC45,@NPC46,@NPC47,@NPC48,@NPC49,@NPC50,@NPC51,@NPC52); +DELETE FROM `pickpocketing_loot_template` WHERE `entry` IN (@NPC,@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6,@NPC7,@NPC8,@NPC9,@NPC10,@NPC11,@NPC12,@NPC13,@NPC14,@NPC15,@NPC16,@NPC17,@NPC18,@NPC19,@NPC20,@NPC21,@NPC22,@NPC23,@NPC24,@NPC25,@NPC26,@NPC27,@NPC28,@NPC29,@NPC30,@NPC31,@NPC32,@NPC33,@NPC34,@NPC35,@NPC36,@NPC37,@NPC38,@NPC39,@NPC40,@NPC41,@NPC42,@NPC43,@NPC44,@NPC45,@NPC46,@NPC47,@NPC48,@NPC49,@NPC50,@NPC51,@NPC52); +INSERT INTO `pickpocketing_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ----------------------------------------------------------------------------------------------- +(@NPC,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Gibberer +(@NPC1,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Hunter +(@NPC2,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Steam Belcher +(@NPC3,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Waddler +-- ----------------------------------------------------------------------------------------------- +(@NPC4,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Reclaimer +(@NPC5,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Sorcerer +(@NPC6,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Treasure Hunter +(@NPC7,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Coldarra Spellbinder +(@NPC8,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Harold Lane +(@NPC9,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on High Priest Andorath +(@NPC10,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Cultist Necrolyte +(@NPC11,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Diver +(@NPC12,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Hunter +(@NPC13,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Poacher +(@NPC14,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Inquisitor Caleras +(@NPC15,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Karen "I Don't Caribou" the Culler +(@NPC16,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Minion of Kaw +(@NPC17,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Varidus the Flenser +(@NPC18,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Northsea Mercenary +-- ----------------------------------------------------------------------------------------------- +(@NPC19,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Firestarter +(@NPC20,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Den Vermin +(@NPC21,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Harvester +(@NPC22,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Roaster +(@NPC23,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Gammoth Tender +-- ----------------------------------------------------------------------------------------------- +(@NPC24,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Chieftain Burblegobble +(@NPC25,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Gorloc Dredger +(@NPC26,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Chieftain GurgleBoggle +(@NPC27,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Gorloc Mud Splasher +(@NPC28,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Riplash Myrmidon +-- ----------------------------------------------------------------------------------------------- +(@NPC29,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on Clandestine Cultist +(@NPC30,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on En'kilah Necrolord +(@NPC31,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on En'kilah Necromancer +(@NPC32,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on Northsea Thug +-- ----------------------------------------------------------------------------------------------- +(@NPC33,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Mist Lord +(@NPC34,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Mistweaver +(@NPC35,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Raider +(@NPC36,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Heigarr the Horrible +(@NPC37,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Ragnar Drakkarlund +(@NPC37,35774,-100,1,0,1,1), -- Trident of Naz'jan on Ragnar Drakkarlund +(@NPC38,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Longboatsman +(@NPC39,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Mistweaver +(@NPC40,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Raider +(@NPC41,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Runecaster +-- ----------------------------------------------------------------------------------------------- +(@NPC42,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Claximus +(@NPC43,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Keymaster Urmgrgl +(@NPC44,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Oracle +(@NPC45,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Shorestriker +(@NPC46,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Warrior +-- ----------------------------------------------------------------------------------------------- +(@NPC47,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth2 ref loot template on Gammothra the Tormentor +(@NPC48,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Magnataur Huntress +(@NPC49,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Mate of Magmothregar +(@NPC50,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Offspring of Magmothregar +(@NPC51,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Plagued Magnataur +(@NPC52,1,100,1,0,-@MAGMOTHREF,1); -- Magmoth ref loot template on Skadir Mariner -- cgit v1.2.3 From 9231f04d0f6292e916eb043bdc2e413d8fd8769f Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Thu, 19 Apr 2012 14:56:09 +0200 Subject: DB/Loot: remove unused templates --- sql/updates/world/2012_04_19_02_world_creature_loot_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_19_02_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql b/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..336cd61c0eb --- /dev/null +++ b/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql @@ -0,0 +1,2 @@ +-- fix DB-error on startup +DELETE FROM `creature_loot_template` WHERE `entry` IN (34965,34980); -- cgit v1.2.3 From 3c2dd7c5edf7eaee1a7314e390aa2f51f3310687 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Apr 2012 23:19:27 +0200 Subject: Scripts/Ulduar: Algalon the Observer --- .../world/2012_04_19_03_world_instance_ulduar.sql | 174 +++ src/server/game/Entities/Creature/Creature.cpp | 6 +- src/server/game/Entities/Player/Player.cpp | 13 + src/server/game/Scripting/ScriptLoader.cpp | 2 + src/server/game/Spells/SpellMgr.cpp | 13 + src/server/game/Spells/SpellScript.cpp | 2 +- src/server/game/Spells/SpellScript.h | 2 +- src/server/scripts/CMakeLists.txt | 1 + src/server/scripts/Northrend/CMakeLists.txt | 2 +- .../Northrend/Ulduar/Ulduar/boss_algalon.cpp | 376 ------ .../Ulduar/Ulduar/boss_algalon_the_observer.cpp | 1374 ++++++++++++++++++++ .../Northrend/Ulduar/Ulduar/instance_ulduar.cpp | 270 +++- .../scripts/Northrend/Ulduar/Ulduar/ulduar.h | 229 ++-- 13 files changed, 1981 insertions(+), 483 deletions(-) create mode 100644 sql/updates/world/2012_04_19_03_world_instance_ulduar.sql delete mode 100644 src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql b/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql new file mode 100644 index 00000000000..a39ed9c01d5 --- /dev/null +++ b/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql @@ -0,0 +1,174 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1603019 AND -1603000; +UPDATE `creature_template` SET `ScriptName`='' WHERE `ScriptName` IN ('boss_algalon','mob_collapsing_star'); + +-- Difficulty linking +UPDATE `creature_template` SET `difficulty_entry_1`=34296 WHERE `entry`=32953; -- Black Hole + +UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`faction_A`=35,`faction_H`=35,`unit_flags`=0x8300,`equipment_id`=2478 WHERE `entry`=34064; -- Brann Bronzebeard +UPDATE `creature_template` SET `speed_walk`=4,`speed_run`=2.14286,`exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=190,`faction_H`=190,`unit_flags`=0x8100,`BaseAttackTime`=1000,`equipment_id`=2479 WHERE `entry` IN (32871,33070); -- Algalon the Observer +UPDATE `creature_template` SET `faction_A`=190,`faction_H`=190,`exp`=2,`minlevel`=83,`maxlevel`=83,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry`=34246; -- Azeroth +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33086; -- Algalon Stalker +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2008000,`speed_run`=1,`equipment_id`=2480,`InhabitType`=4 WHERE `entry` IN (33052,33116); -- Living Constellation +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`speed_run`=1,`RegenHealth`=0 WHERE `entry` IN (32955,34215); -- Collapsing Star +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=80,`maxlevel`=80,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry` IN (32953,34296); -- Black Hole +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`minlevel`=81,`maxlevel`=81,`unit_flags`=0x8000,`speed_walk`=4,`speed_run`=1.42857,`InhabitType`=4 WHERE `entry` IN(33089,34097,34221,34222); -- Dark Matter +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`flags_extra`=0x80 WHERE `entry`=34100; -- Algalon Void Zone Visual Stalker +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry`=34099; -- Worm Hole +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33104; -- Algalon Stalker Asteroid Target 01 +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33105; -- Algalon Stalker Asteroid Target 02 + +UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=9,`gender`=0 WHERE `modelid`=28641; -- Algalon the Observer +UPDATE `creature_model_info` SET `bounding_radius`=0.02,`combat_reach`=0.2,`gender`=2 WHERE `modelid`=29133; -- Azeroth +UPDATE `creature_model_info` SET `bounding_radius`=0.62,`combat_reach`=0,`gender`=2 WHERE `modelid`=28741; -- Living Constellation +UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28988; -- Collapsing Star +UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28460; -- Black Hole + +UPDATE `gameobject_template` SET `faction`=114,`flags`=32 WHERE `entry`=194910; -- Doodad_UL_SigilDoor_03 +UPDATE `gameobject_template` SET `data0`=579 WHERE `entry`=194628; -- Celestial Planetarium Access + +UPDATE `creature_template` SET `ScriptName`='boss_algalon_the_observer' WHERE `entry`=32871; -- Algalon the Observer +UPDATE `creature_template` SET `ScriptName`='npc_living_constellation' WHERE `entry`=33052; -- Living Constellation +UPDATE `creature_template` SET `ScriptName`='npc_collapsing_star' WHERE `entry`=32955; -- Collapsing Star +UPDATE `creature_template` SET `ScriptName`='npc_brann_bronzebeard_algalon' WHERE `entry`=34064; -- Brann Bronzebeard +UPDATE `gameobject_template` SET `ScriptName`='go_celestial_planetarium_access' WHERE `entry` IN (194628,194752); -- Celestial Planetarium Access +UPDATE `creature_template` SET `AIName`='NullCreatureAI' WHERE `entry` IN (32953,34099); -- Black Hole + +DELETE FROM `creature` WHERE `guid` IN (41781,41783,41790,41811,41812,41814,41819,41820,41821,41822,41823,41875); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES +(41781,33086,603,3,1,1627.400,-339.4133,417.4044,1.378810,7200,0,0), -- Algalon Stalker +(41783,33086,603,3,1,1622.681,-344.2576,417.3955,1.378810,7200,0,0), -- Algalon Stalker +(41790,33086,603,3,1,1629.984,-271.4798,417.4045,4.782202,7200,0,0), -- Algalon Stalker +(41811,33086,603,3,1,1630.005,-345.5189,417.3955,1.378810,7200,0,0), -- Algalon Stalker +(41812,33089,603,3,16,1622.451,-321.1563,417.6188,4.677482,7200,20,1), -- Dark Matter +(41814,33089,603,3,16,1649.438,-319.8127,418.3941,1.082104,7200,20,1), -- Dark Matter +(41819,33089,603,3,16,1615.060,-291.6816,417.7796,3.490659,7200,20,1), -- Dark Matter +(41820,33089,603,3,16,1647.005,-288.6790,417.3955,3.490659,7200,20,1), -- Dark Matter +(41821,33089,603,3,16,1622.451,-321.1563,417.6188,4.677482,7200,20,1), -- Dark Matter +(41822,33089,603,3,16,1649.438,-319.8127,418.3941,1.082104,7200,20,1), -- Dark Matter +(41823,33089,603,3,16,1615.060,-291.6816,417.7796,3.490659,7200,20,1), -- Dark Matter +(41875,33089,603,3,16,1647.005,-288.6790,417.3955,3.490659,7200,20,1); -- Dark Matter + +SET @OGUID := 252; +DELETE FROM `gameobject` WHERE `id` IN (194767,194910,194911,194715,194716,194148,194253,194628,194752,194821,194822); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@OGUID+00,194767,603,3,17,1632.024,-182.9211,427.6681,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_SigilDoor_01 +(@OGUID+04,194911,603,3,17,1632.024,-182.9211,408.4224,3.141593,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_SigilDoor_02 +(@OGUID+10,194910,603,3,17,1632.053,-266.1495,438.5608,0.000000,0,0,8.742278E-08,1, 604800,255,0), -- Doodad_UL_SigilDoor_03 +(@OGUID+12,194715,603,3,17,1632.053,-307.6541,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,0), -- Doodad_UL_UniverseFloor_01 +(@OGUID+19,194716,603,3,17,1632.251,-307.5483,416.2641,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_UniverseFloor_02 +(@OGUID+22,194148,603,3,17,1632.053,-307.6541,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_UniverseGlobe01 +(@OGUID+24,194253,603,3,17,1631.908,-246.4970,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_Ulduar_Trapdoor_03 +(@OGUID+29,194628,603,1, 1,1646.182,-174.6881,427.2536,1.553341,0,0,0.000000E-00,1, 604800,255,1), -- Celestial Planetarium Access +(@OGUID+33,194752,603,2, 1,1646.182,-174.6881,427.2536,1.553341,0,0,0.000000E-00,1, 604800,255,1), -- Celestial Planetarium Access +(@OGUID+37,194821,603,1, 1,1632.099,-306.5609,417.3210,4.694937,0,0,0.000000E-00,1,-604800,255,1), -- Gift of the Observer (10 man) +(@OGUID+46,194822,603,2, 1,1632.099,-306.5609,417.3210,4.694937,0,0,0.000000E-00,1,-604800,255,1); -- Gift of the Observer (25 man) + +DELETE FROM `creature_equip_template` WHERE `entry` IN (2478,2479,2480); +INSERT INTO `creature_equip_template` (`entry`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(2478,1903,25972,0), +(2479,45985,45985,0), +(2480,44952,0,0); + +DELETE FROM `creature_template_addon` WHERE `entry` IN (32871,33070,33052,33116,33089,34221,34097,34222,33105); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES +(32871,0,0x0000000,0x0,NULL), -- Algalon the Observer +(33070,0,0x0000000,0x0,NULL), -- Algalon the Observer +(33052,0,0x3000000,0x1,NULL), -- Living Constellation +(33116,0,0x3000000,0x1,NULL), -- Living Constellation +(33089,0,0x3000000,0x1,NULL), -- Dark Matter +(34221,0,0x3000000,0x1,NULL), -- Dark Matter +(34097,0,0x3000000,0x1,NULL), -- Unleashed Dark Matter +(34222,0,0x3000000,0x1,NULL), -- Unleashed Dark Matter +(33105,0,0x3000000,0x1,NULL); -- Algalon Stalker Asteroid Target 02 + +DELETE FROM `creature_text` WHERE `entry` IN (32871,34064); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`sound`,`emote`,`comment`) VALUES +(34064,0,0,'We did it, lads! We got here before Algalon''s arrival. Maybe we can rig the systems to interfere with his analysis--',14,15824,0,'Brann Bronzebeard - SAY_BRANN_ALGALON_INTRO_1'), +(34064,1,0,'I''ll head back to the Archivum and see if I can jam his signal. I might be able to buy us some time while you take care of him.',12,15825,0,'Brann Bronzebeard - SAY_BRANN_ALGALON_INTRO_2'), +(34064,2,0,'I know just the place. Will you be all right?',14,15823,6,'Brann Bronzebeard - SAY_BRANN_ALGALON_OUTRO'), +(32871,0,0,'Translocation complete. Commencing planetary analysis of Azeroth.',12,15405,0,'Algalon the Observer - SAY_ALGALON_INTRO_1'), +(32871,1,0,'Stand back, mortals. I''m not here to fight you.',12,15406,0,'Algalon the Observer - SAY_ALGALON_INTRO_2'), +(32871,2,0,'It is in the universe''s best interest to re-originate this planet should my analysis find systemic corruption. Do not interfere.',12,15407,0,'Algalon the Observer - SAY_ALGALON_INTRO_3'), +(32871,3,0,'Your actions are illogical. All possible results for this encounter have been calculated. The Pantheon will receive the Observer''s message regardless of outcome.',14,15386,0,'Algalon the Observer - SAY_ALGALON_START_TIMER'), +(32871,4,0,'See your world through my eyes: A universe so vast as to be immeasurable - incomprehensible even to your greatest minds.',14,15390,1,'Algalon the Observer - SAY_ALGALON_AGGRO'), +(32871,5,0,'The stars come to my aid!',14,15392,0,'Algalon the Observer - SAY_ALGALON_COLLAPSING_STAR'), +(32871,6,0,'%s begins to Summon Collapsing Stars!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_COLLAPSING_STAR'), +(32871,7,0,'Witness the fury of the cosmos!',14,15396,0,'Algalon the Observer - SAY_ALGALONG_BIG_BANG'), +(32871,8,0,'%s begins to cast Big Bang!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_BIG_BANG'), +(32871,9,0,'You are out of time.',14,15394,0,'Algalon the Observer - SAY_ALGALON_ASCEND'), +(32871,10,0,'%s begins to cast Cosmic Smash!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_COSMIC_SMASH'), +(32871,11,0,'Behold the tools of creation!',14,15397,0,'Algalon the Observer - SAY_ALGALON_PHASE_TWO'), +(32871,12,0,'I have seen worlds bathed in the Makers'' flames, their denizens fading without as much as a whimper. Entire planetary systems born and razed in the time that it takes your mortal hearts to beat once. Yet all throughout, my own heart devoid of emotion... of empathy. I. Have. Felt. Nothing. A million-million lives wasted. Had they all held within them your tenacity? Had they all loved life as you do?',14,15393,1,'Algalon the Observer - SAY_ALGALON_OUTRO_1'), +(32871,13,0,'Perhaps it is your imperfections... that which grants you free will... that allows you to persevere against all cosmically calculated odds. You prevail where the Titan''s own perfect creations have failed.',14,15401,1,'Algalon the Observer - SAY_ALGALON_OUTRO_2'), +(32871,14,0,'I''ve rearranged the reply code - your planet will be spared. I cannot be certain of my own calculations anymore.',14,15402,1,'Algalon the Observer - SAY_ALGALON_OUTRO_3'), +(32871,15,0,'I lack the strength to transmit the signal. You must... hurry... find a place of power... close to the skies.',14,15403,1,'Algalon the Observer - SAY_ALGALON_OUTRO_4'), +(32871,16,0,'Do not worry about my fate, Bronzen. If the signal is not transmitted in time, re-origination will proceed regardless. Save... your world...',14,15404,1,'Algalon the Observer - SAY_ALGALON_OUTRO_5'), +(32871,17,0,'Analysis complete. There is partial corruption in the planet''s life-support systems as well as complete corruption in most of the planet''s defense mechanisms.',12,15398,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_1'), +(32871,18,0,'Begin uplink: Reply Code: ''Omega''. Planetary re-origination requested.',12,15399,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_2'), +(32871,19,0,'Farewell, mortals. Your bravery is admirable, for such flawed creatures.',12,15400,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_3'), +(32871,20,0,'Loss of life unavoidable.',14,15387,0,'Algalon the Observer - SAY_ALGALON_KILL'), +(32871,20,1,'I do what I must.',14,15388,0,'Algalon the Observer - SAY_ALGALON_KILL'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (64996,62266,65509,62304,64597); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(13,1,64996,31,3,34246,'Algalon the Observer - Reorigination on Azeroth'), +(13,1,62266,31,3,33052,'Algalon Stalker - target Living Constellation'), +(13,1,65509,31,3,33052,'Black Hole - target Living Constellation'), +(13,1,62304,31,3,33104,'Cosmic Smash - target trigger'), +(13,1,64597,31,3,33104,'Cosmic Smash - target trigger'); + +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_phase_punch'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_arcane_barrage'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_trigger_3_adds'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_collapse'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_big_bang'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_remove_phase'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_cosmic_smash'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_cosmic_smash_damage'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_supermassive_fail'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(64412,'spell_algalon_phase_punch'), +(64599,'spell_algalon_arcane_barrage'), +(64607,'spell_algalon_arcane_barrage'), +(62266,'spell_algalon_trigger_3_adds'), +(62018,'spell_algalon_collapse'), +(64443,'spell_algalon_big_bang'), +(64584,'spell_algalon_big_bang'), +(64445,'spell_algalon_remove_phase'), +(62295,'spell_algalon_cosmic_smash'), +(62311,'spell_algalon_cosmic_smash_damage'), +(64596,'spell_algalon_cosmic_smash_damage'), +(65311,'spell_algalon_supermassive_fail'); + +SET @DIFF_ID := 3262; +DELETE FROM `spelldifficulty_dbc` WHERE `id` BETWEEN @DIFF_ID AND @DIFF_ID+5; +INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`) VALUES +(@DIFF_ID+0,64395,64592), +(@DIFF_ID+1,64599,64607), +(@DIFF_ID+2,64443,64584), +(@DIFF_ID+3,64122,65108), +(@DIFF_ID+4,62301,64598), +(@DIFF_ID+5,62304,64597); + +UPDATE `instance_encounters` SET `creditType`=1,`creditEntry`=65184 WHERE `entry` IN (757,771); -- Algalon the Observer + +DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (10565,10566,10678,9990,9991,10567,10569,10698,10780,10781,10782,10783,10568,10570); +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10565,10566,10678,9990,9991,10567,10569,10698,10780,10781,10782,10783,10568,10570); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +(10565,12,0,0,''), -- Algalon the Observer kills (Ulduar 10 player) +(10566,12,1,0,''), -- Algalon the Observer kills (Ulduar 25 player) +(10678,12,0,0,''), -- Herald of the Titans +(10678,18,0,0,''), -- Herald of the Titans +(9990,12,0,0,''), -- Lich King 10-player bosses killed +(9991,12,1,0,''), -- Lich King 25-player bosses killed +(10567,12,0,0,''), -- Observed (10 player) +(10569,12,1,0,''), -- Observed (25 player) +(10698,12,1,0,''), -- Realm First! Celestial Defender +(10780,12,0,0,''), -- Supermassive (10 player) +(10781,12,0,0,''), -- Supermassive (10 player) +(10782,12,1,0,''), -- Supermassive (25 player) +(10783,12,1,0,''), -- Supermassive (25 player) +(10568,11,0,0,'achievement_he_feeds_on_your_tears'), -- He Feeds On Your Tears (10 player) +(10568,12,0,0,''), -- He Feeds On Your Tears (10 player) +(10570,11,0,0,'achievement_he_feeds_on_your_tears'), -- He Feeds On Your Tears (25 player) +(10570,12,1,0,''); -- He Feeds On Your Tears (25 player) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index a7b57c7323c..ed89041ff66 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -796,10 +796,12 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, //! Need to be called after LoadCreaturesAddon - MOVEMENTFLAG_HOVER is set there if (HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) + { z += GetFloatValue(UNIT_FIELD_HOVERHEIGHT); - //! Relocate again with updated Z coord - Relocate(x, y, z, ang); + //! Relocate again with updated Z coord + Relocate(x, y, z, ang); + } uint32 displayID = GetNativeDisplayId(); CreatureModelInfo const* minfo = sObjectMgr->GetCreatureModelRandomGender(&displayID); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 141902fbbdc..7c70fe9358e 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9217,6 +9217,9 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid) case 4100: // The Culling of Stratholme NumberOfFields = 13; break; + case 4273: // Ulduar + NumberOfFields = 10; + break; default: NumberOfFields = 12; break; @@ -9761,6 +9764,16 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid) data << uint32(3932) << uint32(0); // 13 WORLDSTATE_TIME_GUARDIAN_SHOW } break; + // Ulduar + case 4273: + if (instance && mapid == 603) + instance->FillInitialWorldStates(data); + else + { + data << uint32(4132) << uint32(0); // 9 WORLDSTATE_SHOW_CRATES + data << uint32(4131) << uint32(0); // 10 WORLDSTATE_CRATES_REVEALED + } + break; default: data << uint32(0x914) << uint32(0x0); // 7 data << uint32(0x913) << uint32(0x0); // 8 diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 76c3f1c073c..476b0082617 100755 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -425,6 +425,7 @@ void AddSC_ulduar_teleporter(); void AddSC_boss_mimiron(); void AddSC_boss_hodir(); void AddSC_boss_freya(); +void AddSC_boss_algalon_the_observer(); void AddSC_instance_ulduar(); void AddSC_boss_keleseth(); //Utgarde Keep void AddSC_boss_skarvald_dalronn(); @@ -1129,6 +1130,7 @@ void AddNorthrendScripts() AddSC_boss_mimiron(); AddSC_boss_hodir(); AddSC_boss_freya(); + AddSC_boss_algalon_the_observer(); AddSC_instance_ulduar(); AddSC_boss_keleseth(); //Utgarde Keep AddSC_boss_skarvald_dalronn(); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 05431ef0a16..3de87790be9 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3298,6 +3298,19 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_NEARBY_ENTRY; spellInfo->EffectImplicitTargetB[2] = TARGET_UNIT_NEARBY_ENTRY; break; + case 62301: // Cosmic Smash (Algalon the Observer) + spellInfo->MaxAffectedTargets = 1; + break; + case 64598: // Cosmic Smash (Algalon the Observer) + spellInfo->MaxAffectedTargets = 3; + break; + case 62293: // Cosmic Smash (Algalon the Observer) + spellInfo->EffectImplicitTargetB[0] = TARGET_DEST_CASTER; + break; + case 62311: // Cosmic Smash (Algalon the Observer) + case 64596: // Cosmic Smash (Algalon the Observer) + spellInfo->rangeIndex = 6; // 100yd + break; // ENDOF ULDUAR SPELLS // // TRIAL OF THE CRUSADER SPELLS diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index df1640df1b7..44a2dd4dedb 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -403,7 +403,7 @@ GameObject* SpellScript::GetHitGObj() return m_spell->gameObjTarget; } -WorldLocation const* SpellScript::GetHitDest() +WorldLocation* SpellScript::GetHitDest() { if (!IsInEffectHook()) { diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index e84a56c8dbb..26393040a1e 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -325,7 +325,7 @@ class SpellScript : public _SpellScript // returns: target of current effect if it was GameObject otherwise NULL GameObject* GetHitGObj(); // returns: destination of current effect - WorldLocation const* GetHitDest(); + WorldLocation* GetHitDest(); // setter/getter for for damage done by spell to target of spell hit // returns damage calculated before hit, and real dmg done after hit int32 GetHitDamage(); diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index f0136b065e8..792fdeb3e7b 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -119,6 +119,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Maps ${CMAKE_SOURCE_DIR}/src/server/game/Movement ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators + ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Spline ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt index 31aa924365d..3502e7fb104 100644 --- a/src/server/scripts/Northrend/CMakeLists.txt +++ b/src/server/scripts/Northrend/CMakeLists.txt @@ -22,7 +22,7 @@ set(scripts_STAT_SRCS Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp Northrend/Ulduar/Ulduar/boss_thorim.cpp Northrend/Ulduar/Ulduar/boss_ignis.cpp - Northrend/Ulduar/Ulduar/boss_algalon.cpp + Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp Northrend/Ulduar/Ulduar/instance_ulduar.cpp Northrend/Ulduar/Ulduar/boss_auriaya.cpp Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp deleted file mode 100644 index 2dd13e7ce07..00000000000 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp +++ /dev/null @@ -1,376 +0,0 @@ -/* - * Copyright (C) 2008-2012 TrinityCore - * - * 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ulduar.h" - -#define GAMEOBJECT_GIVE_OF_THE_OBSERVER 194821 - -enum Spells -{ - SPELL_ASCEND = 64487, - SPELL_BERSERK = 47008, - SPELL_BIG_BANG = 64443, - H_SPELL_BIG_BANG = 64584, - SPELL_COSMIC_SMASH = 62301, - H_SPELL_COSMIC_SMASH = 64598, - SPELL_PHASE_PUNCH = 64412, - SPELL_QUANTUM_STRIKE = 64395, - H_SPELL_QUANTUM_STRIKE = 64592, - SPELL_BLACK_HOLE_EXPLOSION = 64122, - SPELL_ARCANE_BARAGE = 64599, - H_SPELL_ARCANE_BARAGE = 64607 -}; - -enum Creatures -{ - CREATURE_COLLAPSING_STAR = 32955, - CREATURE_BLACK_HOLE = 32953, - CREATURE_LIVING_CONSTELLATION = 33052, - CREATURE_DARK_MATTER = 33089 -}; - -enum Yells -{ - SAY_AGGRO = -1603000, - SAY_SLAY_1 = -1603001, - SAY_SLAY_2 = -1603002, - SAY_ENGADED_FOR_FIRTS_TIME = -1603003, - SAY_PHASE_2 = -1603004, - SAY_SUMMON_COLLAPSING_STAR = -1603005, - SAY_DEATH_1 = -1603006, - SAY_DEATH_2 = -1603007, - SAY_DEATH_3 = -1603008, - SAY_DEATH_4 = -1603009, - SAY_DEATH_5 = -1603010, - SAY_BERSERK = -1603011, - SAY_BIG_BANG_1 = -1603012, - SAY_BIG_BANG_2 = -1603013, - SAY_TIMER_1 = -1603014, - SAY_TIMER_2 = -1603015, - SAY_TIMER_3 = -1603016, - SAY_SUMMON_1 = -1603017, - SAY_SUMMON_2 = -1603018, - SAY_SUMMON_3 = -1603019, -}; - -class boss_algalon : public CreatureScript -{ -public: - boss_algalon() : CreatureScript("boss_algalon") { } - - CreatureAI* GetAI(Creature* creature) const - { - return GetUlduarAI(creature); - } - - struct boss_algalonAI : public ScriptedAI - { - boss_algalonAI(Creature* creature) : ScriptedAI(creature) - { - instance = creature->GetInstanceScript(); - Summon = false; // not in reset. intro speech done only once. - } - - InstanceScript* instance; - - std::list m_lCollapsingStarGUIDList; - - uint32 Phase; - uint32 Ascend_Timer; - uint32 Berserk_Timer; - uint32 BigBang_Timer; - uint32 CosmicSmash_Timer; - uint32 PhasePunch_Timer; - uint32 QuantumStrike_Timer; - uint32 CollapsingStar_Timer; - uint32 uiPhase_timer; - uint32 uiStep; - - uint64 BlackHoleGUID; - - bool Enrage; - bool Summon; - - void EnterCombat(Unit* who) - { - if (Summon) - { - DoScriptText(SAY_AGGRO, me); - me->InterruptSpell(CURRENT_CHANNELED_SPELL); - DoZoneInCombat(who->ToCreature()); - } - else - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetReactState(REACT_PASSIVE); - uiStep = 1; - } - - if (instance) - instance->SetData(BOSS_ALGALON, IN_PROGRESS); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); - } - - void Reset() - { - Phase = 1; - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (instance) - instance->SetData(BOSS_ALGALON, NOT_STARTED); - - BlackHoleGUID = 0; - - uiPhase_timer = 0; - Ascend_Timer = 480000; //8 minutes - QuantumStrike_Timer = urand(4000, 14000); - Berserk_Timer = 360000; //6 minutes - CollapsingStar_Timer = urand(15000, 20000); //Spawns between 15 to 20 seconds - BigBang_Timer = 90000; - PhasePunch_Timer = 8000; - CosmicSmash_Timer = urand(30000, 60000); - Enrage = false; - } - - void JumpToNextStep(uint32 uiTimer) - { - uiPhase_timer = uiTimer; - ++uiStep; - } - - void DespawnCollapsingStar() - { - if (m_lCollapsingStarGUIDList.empty()) - return; - - for (std::list::const_iterator itr = m_lCollapsingStarGUIDList.begin(); itr != m_lCollapsingStarGUIDList.end(); ++itr) - { - if (Creature* temp = Unit::GetCreature(*me, *itr)) - { - if (temp->isAlive()) - temp->DespawnOrUnsummon(); - } - } - m_lCollapsingStarGUIDList.clear(); - } - - void JustSummoned(Creature* summoned) - { - if (summoned->GetEntry() == CREATURE_COLLAPSING_STAR) - { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (me->getVictim()) - summoned->AI()->AttackStart(target ? target : me->getVictim()); - m_lCollapsingStarGUIDList.push_back(summoned->GetGUID()); - } - } - - void SummonCollapsingStar(Unit* target) - { - DoScriptText(SAY_SUMMON_COLLAPSING_STAR, me); - me->SummonCreature(CREATURE_COLLAPSING_STAR, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 100000); - me->SummonCreature(CREATURE_BLACK_HOLE, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (Phase == 1 && HealthBelowPct(20)) - { - Phase = 2; - DoScriptText(SAY_PHASE_2, me); - } - - if (HealthBelowPct(2)) - { - me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f, 417.321381f, 0, 0, 0, 0, 0, 0); - - // All of them. or random? - DoScriptText(SAY_DEATH_1, me); - DoScriptText(SAY_DEATH_2, me); - DoScriptText(SAY_DEATH_3, me); - DoScriptText(SAY_DEATH_4, me); - DoScriptText(SAY_DEATH_5, me); - - me->DisappearAndDie(); - - if (instance) - instance->SetData(BOSS_ALGALON, DONE); - - return; - } - - if (Phase == 1) - { - if (!Summon) - { - if (uiPhase_timer <= diff) - { - switch (uiStep) - { - case 1: - DoScriptText(SAY_SUMMON_1, me); - JumpToNextStep(3000); - break; - case 2: - DoScriptText(SAY_SUMMON_2, me); - JumpToNextStep(3000); - break; - case 3: - DoScriptText(SAY_SUMMON_3, me); - JumpToNextStep(3000); - break; - case 4: - DoScriptText(SAY_ENGADED_FOR_FIRTS_TIME, me); - JumpToNextStep(3000); - break; - case 5: - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetReactState(REACT_AGGRESSIVE); - Summon = true; - break; - } - } else uiPhase_timer -= diff; - - return; - } - - if (QuantumStrike_Timer <= diff) - { - DoCast(me->getVictim(), RAID_MODE(SPELL_QUANTUM_STRIKE, H_SPELL_QUANTUM_STRIKE), true); - - QuantumStrike_Timer = urand(4000, 14000); - } else QuantumStrike_Timer -= diff; - - if (BigBang_Timer <= diff) - { - DoScriptText(RAND(SAY_BIG_BANG_1, SAY_BIG_BANG_2), me); - DoCast(me->getVictim(), RAID_MODE(SPELL_BIG_BANG, H_SPELL_BIG_BANG), true); - - BigBang_Timer = 90000; - } else BigBang_Timer -= diff; - - if (Ascend_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ASCEND, true); - - Ascend_Timer = 480000; - } else Ascend_Timer -= diff; - - if (PhasePunch_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_PHASE_PUNCH, true); - - PhasePunch_Timer = 8000; - } else PhasePunch_Timer -= diff; - - if (CosmicSmash_Timer <= diff) - { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), RAID_MODE(SPELL_COSMIC_SMASH, H_SPELL_COSMIC_SMASH), true); - - CosmicSmash_Timer = urand(30000, 60000); - } else CosmicSmash_Timer -= diff; - - if (Berserk_Timer <= diff) - { - DoScriptText(SAY_BERSERK, me); - DoCast(me->getVictim(), SPELL_BERSERK, true); - - Berserk_Timer = 360000; - } else Berserk_Timer -= diff; - - DoMeleeAttackIfReady(); - - EnterEvadeIfOutOfCombatArea(diff); - } - - if (Phase == 2) - { - if (Enrage) - { - if (Ascend_Timer <= diff) - { - DoCast(me, SPELL_ASCEND); - DoScriptText(SAY_BERSERK, me); - Ascend_Timer = urand(360000, 365000); - Enrage = false; - } else Ascend_Timer -= diff; - } - } - - DoMeleeAttackIfReady(); - } - }; - -}; - -//Collapsing Star -class mob_collapsing_star : public CreatureScript -{ -public: - mob_collapsing_star() : CreatureScript("mob_collapsing_star") { } - - CreatureAI* GetAI(Creature* creature) const - { - return new mob_collapsing_starAI(creature); - } - - struct mob_collapsing_starAI : public ScriptedAI - { - mob_collapsing_starAI(Creature* creature) : ScriptedAI(creature) - { - instance = creature->GetInstanceScript(); - } - - InstanceScript* instance; - - uint32 BlackHoleExplosion_Timer; - - void Reset() - { - BlackHoleExplosion_Timer = 0; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (BlackHoleExplosion_Timer <= diff) - { - me->CastSpell(me, SPELL_BLACK_HOLE_EXPLOSION, false); - BlackHoleExplosion_Timer = 0; - } else BlackHoleExplosion_Timer -= diff; - } - }; - -}; - -void AddSC_boss_Algalon() -{ - new boss_algalon(); - new mob_collapsing_star(); -} diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp new file mode 100644 index 00000000000..4465fc08792 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -0,0 +1,1374 @@ +/* + * Copyright (C) 2008-2012 TrinityCore + * + * 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 + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "ObjectMgr.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "GameObjectAI.h" +#include "MapManager.h" +#include "MoveSplineInit.h" +#include "ulduar.h" + +enum Texts +{ + SAY_BRANN_ALGALON_INTRO_1 = 0, + SAY_BRANN_ALGALON_INTRO_2 = 1, + SAY_BRANN_ALGALON_OUTRO = 2, + + SAY_ALGALON_INTRO_1 = 0, + SAY_ALGALON_INTRO_2 = 1, + SAY_ALGALON_INTRO_3 = 2, + SAY_ALGALON_START_TIMER = 3, + SAY_ALGALON_AGGRO = 4, + SAY_ALGALON_COLLAPSING_STAR = 5, + EMOTE_ALGALON_COLLAPSING_STAR = 6, + SAY_ALGALON_BIG_BANG = 7, + EMOTE_ALGALON_BIG_BANG = 8, + SAY_ALGALON_ASCEND = 9, + EMOTE_ALGALON_COSMIC_SMASH = 10, + SAY_ALGALON_PHASE_TWO = 11, + SAY_ALGALON_OUTRO_1 = 12, + SAY_ALGALON_OUTRO_2 = 13, + SAY_ALGALON_OUTRO_3 = 14, + SAY_ALGALON_OUTRO_4 = 15, + SAY_ALGALON_OUTRO_5 = 16, + SAY_ALGALON_DESPAWN_1 = 17, + SAY_ALGALON_DESPAWN_2 = 18, + SAY_ALGALON_DESPAWN_3 = 19, + SAY_ALGALON_KILL = 20, +}; + +enum Spells +{ + // Algalon the Observer + SPELL_ARRIVAL = 64997, + SPELL_RIDE_THE_LIGHTNING = 64986, + SPELL_SUMMON_AZEROTH = 64994, + SPELL_REORIGINATION = 64996, + SPELL_SUPERMASSIVE_FAIL = 65311, + SPELL_QUANTUM_STRIKE = 64395, + SPELL_PHASE_PUNCH = 64412, + SPELL_BIG_BANG = 64443, + SPELL_ASCEND_TO_THE_HEAVENS = 64487, + SPELL_COSMIC_SMASH = 62301, + SPELL_COSMIC_SMASH_TRIGGERED = 62304, + SPELL_COSMIC_SMASH_VISUAL_STATE = 62300, + SPELL_SELF_STUN = 65256, + SPELL_KILL_CREDIT = 65184, + SPELL_TELEPORT = 62940, + + // Algalon Stalker + SPELL_TRIGGER_3_ADDS = 62266, // Triggers Living Constellation + + // Living Constellation + SPELL_ARCANE_BARRAGE = 64599, + + // Collapsing Star + SPELL_COLLAPSE = 62018, + SPELL_BLACK_HOLE_SPAWN_VISUAL = 62003, + SPELL_SUMMON_BLACK_HOLE = 62189, + + // Black Hole + SPELL_BLACK_HOLE_TRIGGER = 62185, + SPELL_CONSTELLATION_PHASE_TRIGGER = 65508, + SPELL_CONSTELLATION_PHASE_EFFECT = 65509, + SPELL_BLACK_HOLE_EXPLOSION = 64122, + SPELL_SUMMON_VOID_ZONE_VISUAL = 64470, + SPELL_VOID_ZONE_VISUAL = 64469, + SPELL_BLACK_HOLE_CREDIT = 65312, + + // Worm Hole + SPELL_WORM_HOLE_TRIGGER = 65251, + SPELL_SUMMON_UNLEASHED_DARK_MATTER = 64450, +}; + +uint32 const PhasePunchAlphaId[5] = {64435, 64434, 64428, 64421, 64417}; + +enum Events +{ + // Celestial Planetarium Access + EVENT_DESPAWN_CONSOLE = 1, + + // Brann Bronzebeard + EVENT_BRANN_MOVE_INTRO = 2, + EVENT_SUMMON_ALGALON = 3, + EVENT_BRANN_OUTRO_1 = 4, + EVENT_BRANN_OUTRO_2 = 5, + + // Algalon the Observer + EVENT_INTRO_1 = 6, + EVENT_INTRO_2 = 7, + EVENT_INTRO_3 = 8, + EVENT_INTRO_FINISH = 9, + EVENT_START_COMBAT = 10, + EVENT_INTRO_TIMER_DONE = 11, + EVENT_QUANTUM_STRIKE = 12, + EVENT_PHASE_PUNCH = 13, + EVENT_SUMMON_COLLAPSING_STAR = 14, + EVENT_BIG_BANG = 15, + EVENT_RESUME_UPDATING = 16, + EVENT_ASCEND_TO_THE_HEAVENS = 17, + EVENT_EVADE = 18, + EVENT_COSMIC_SMASH = 19, + EVENT_UNLOCK_YELL = 20, + EVENT_OUTRO_START = 21, + EVENT_OUTRO_1 = 22, + EVENT_OUTRO_2 = 23, + EVENT_OUTRO_3 = 24, + EVENT_OUTRO_4 = 25, + EVENT_OUTRO_5 = 26, + EVENT_OUTRO_6 = 27, + EVENT_OUTRO_7 = 28, + EVENT_OUTRO_8 = 29, + EVENT_OUTRO_9 = 30, + EVENT_OUTRO_10 = 31, + EVENT_OUTRO_11 = 32, + EVENT_OUTRO_12 = 33, + EVENT_OUTRO_13 = 34, + EVENT_OUTRO_14 = 35, + EVENT_DESPAWN_ALGALON_1 = 36, + EVENT_DESPAWN_ALGALON_2 = 37, + EVENT_DESPAWN_ALGALON_3 = 38, + + // Living Constellation + EVENT_ARCANE_BARRAGE = 39, +}; + +enum Actions +{ + ACTION_START_INTRO = 0, + ACTION_FINISH_INTRO = 1, + ACTION_ACTIVATE_STAR = 2, + ACTION_BIG_BANG = 3, + ACTION_ASCEND = 4, + ACTION_OUTRO = 5, +}; + +enum Points +{ + POINT_BRANN_INTRO = 0, + MAX_BRANN_WAYPOINTS_INTRO = 10, + POINT_BRANN_OUTRO = 10, + POINT_BRANN_OUTRO_END = 11, + + POINT_ALGALON_LAND = 1, + POINT_ALGALON_OUTRO = 2, +}; + +enum EncounterPhases +{ + PHASE_NORMAL = 0, + PHASE_ROLE_PLAY = 1, + PHASE_BIG_BANG = 2, + + PHASE_MASK_NO_UPDATE = (1 << PHASE_ROLE_PLAY) | (1 << PHASE_BIG_BANG), + PHASE_MASK_NO_CAST_CHECK = 1 << PHASE_ROLE_PLAY, +}; + +enum AchievmentInfo +{ + EVENT_ID_SUPERMASSIVE_START = 21697, + DATA_HAS_FED_ON_TEARS = 30043005, +}; + + +Position const BrannIntroSpawnPos = {1676.277f, -162.5308f, 427.3326f, 3.235537f}; +Position const BrannIntroWaypoint[MAX_BRANN_WAYPOINTS_INTRO] = +{ + {1642.482f, -164.0812f, 427.2602f, 0.0f}, + {1635.000f, -169.5145f, 427.2523f, 0.0f}, + {1632.814f, -173.9334f, 427.2621f, 0.0f}, + {1632.676f, -190.5927f, 425.8831f, 0.0f}, + {1631.497f, -214.2221f, 418.1152f, 0.0f}, + {1624.717f, -224.6876f, 418.1152f, 0.0f}, + {1631.497f, -214.2221f, 418.1152f, 0.0f}, + {1632.676f, -190.5927f, 425.8831f, 0.0f}, + {1632.814f, -173.9334f, 427.2621f, 0.0f}, + {1635.000f, -169.5145f, 427.2523f, 0.0f}, +}; +Position const AlgalonSummonPos = {1632.531f, -304.8516f, 450.1123f, 1.530165f}; +Position const AlgalonLandPos = {1632.668f, -302.7656f, 417.3211f, 1.530165f}; + +#define LIVING_CONSTELLATION_COUNT 11 +Position const ConstellationPos[LIVING_CONSTELLATION_COUNT] = +{ + {1625.208f, -267.2771f, 446.4296f, 5.044002f}, + {1658.279f, -262.5490f, 441.9073f, 4.188790f}, + {1678.677f, -276.3280f, 427.7531f, 3.979351f}, + {1593.389f, -299.4325f, 432.4636f, 6.073746f}, + {1685.613f, -300.1219f, 443.2366f, 3.385939f}, + {1591.706f, -263.8201f, 441.4153f, 5.253441f}, + {1668.317f, -324.7676f, 457.9394f, 3.211406f}, + {1592.242f, -325.5323f, 446.9508f, 0.226893f}, + {1635.821f, -363.3442f, 424.3459f, 1.466077f}, + {1672.188f, -357.2484f, 436.7337f, 2.338741f}, + {1615.800f, -348.0065f, 442.9586f, 1.134464f}, +}; + +#define COLLAPSING_STAR_COUNT 4 +Position const CollapsingStarPos[COLLAPSING_STAR_COUNT] = +{ + {1649.438f, -319.8127f, 418.3941f, 1.082104f}, + {1647.005f, -288.6790f, 417.3955f, 3.490659f}, + {1622.451f, -321.1563f, 417.6188f, 4.677482f}, + {1615.060f, -291.6816f, 417.7796f, 3.490659f}, +}; +Position const AlgalonOutroPos = {1633.64f, -317.78f, 417.3211f, 0.0f}; +Position const BrannOutroPos[3] = +{ + {1632.023f, -243.7434f, 417.9118f, 0.0f}, + {1631.986f, -297.7831f, 417.3210f, 0.0f}, + {1633.832f, -216.2948f, 417.0463f, 0.0f}, +}; + +class ActivateLivingConstellation : public BasicEvent +{ + public: + ActivateLivingConstellation(Unit* owner) : _owner(owner), _instance(owner->GetInstanceScript()) + { + } + + bool Execute(uint64 execTime, uint32 /*diff*/) + { + if (!_instance || _instance->GetBossState(BOSS_ALGALON) != IN_PROGRESS) + return true; // delete event + + _owner->CastSpell((Unit*)NULL, SPELL_TRIGGER_3_ADDS, TRIGGERED_FULL_MASK); + _owner->m_Events.AddEvent(this, execTime + urand(45000, 50000)); + return false; + } + + private: + Unit* _owner; + InstanceScript* _instance; +}; + +class CosmicSmashDamageEvent : public BasicEvent +{ + public: + CosmicSmashDamageEvent(Unit* caster) : _caster(caster) + { + } + + bool Execute(uint64 /*execTime*/, uint32 /*diff*/) + { + _caster->CastSpell((Unit*)NULL, SPELL_COSMIC_SMASH_TRIGGERED, TRIGGERED_FULL_MASK); + return true; + } + + private: + Unit* _caster; +}; + +class SummonUnleashedDarkMatter : public BasicEvent +{ + public: + SummonUnleashedDarkMatter(Unit* caster) : _caster(caster) + { + } + + bool Execute(uint64 execTime, uint32 /*diff*/) + { + _caster->CastSpell((Unit*)NULL, SPELL_SUMMON_UNLEASHED_DARK_MATTER, TRIGGERED_FULL_MASK); + _caster->m_Events.AddEvent(this, execTime + 30000); + return false; + } + + private: + Unit* _caster; +}; + +class boss_algalon_the_observer : public CreatureScript +{ + public: + boss_algalon_the_observer() : CreatureScript("boss_algalon_the_observer") {} + + struct boss_algalon_the_observerAI : public BossAI + { + boss_algalon_the_observerAI(Creature* creature) : BossAI(creature, BOSS_ALGALON) + { + _firstPull = true; + _fedOnTears = false; + } + + void Reset() + { + _Reset(); + me->SetReactState(REACT_PASSIVE); + _phaseTwo = false; + _fightWon = false; + _hasYelled = false; + } + + void KilledUnit(Unit* victim) + { + if (victim->GetTypeId() == TYPEID_UNIT) + { + _fedOnTears = true; + if (!_hasYelled) + { + _hasYelled = true; + events.ScheduleEvent(EVENT_UNLOCK_YELL, 1000); + Talk(SAY_ALGALON_KILL); + } + } + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_START_INTRO: + { + me->SetFlag(UNIT_FIELD_FLAGS_2, 0x20); + me->SetDisableGravity(true); + DoCast(me, SPELL_ARRIVAL, true); + DoCast(me, SPELL_RIDE_THE_LIGHTNING, true); + me->GetMotionMaster()->MovePoint(POINT_ALGALON_LAND, AlgalonLandPos); + me->SetHomePosition(AlgalonLandPos); + Movement::MoveSplineInit init(*me); + init.MoveTo(AlgalonLandPos.GetPositionX(), AlgalonLandPos.GetPositionY(), AlgalonLandPos.GetPositionZ()); + init.SetOrientationFixed(true); + init.Launch(); + events.Reset(); + events.SetPhase(PHASE_ROLE_PLAY); + events.ScheduleEvent(EVENT_INTRO_1, 5000, 0, PHASE_ROLE_PLAY); + events.ScheduleEvent(EVENT_INTRO_2, 15000, 0, PHASE_ROLE_PLAY); + events.ScheduleEvent(EVENT_INTRO_3, 23000, 0, PHASE_ROLE_PLAY); + events.ScheduleEvent(EVENT_INTRO_FINISH, 36000, 0, PHASE_ROLE_PLAY); + break; + } + case ACTION_ASCEND: + events.SetPhase(PHASE_BIG_BANG); + events.CancelEvent(EVENT_RESUME_UPDATING); + events.ScheduleEvent(EVENT_ASCEND_TO_THE_HEAVENS, 1500); + break; + case EVENT_DESPAWN_ALGALON: + events.Reset(); + events.SetPhase(PHASE_ROLE_PLAY); + events.ScheduleEvent(EVENT_ASCEND_TO_THE_HEAVENS, 1); + events.ScheduleEvent(EVENT_DESPAWN_ALGALON_1, 5000); + events.ScheduleEvent(EVENT_DESPAWN_ALGALON_2, 17000); + events.ScheduleEvent(EVENT_DESPAWN_ALGALON_3, 26000); + me->DespawnOrUnsummon(34000); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_NPC); + break; + case ACTION_INIT_ALGALON: + _firstPull = false; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); + break;; + } + } + + uint32 GetData(uint32 type) + { + return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1; + } + + void EnterCombat(Unit* /*target*/) + { + uint32 introDelay = 0; + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_NPC); + events.Reset(); + events.SetPhase(PHASE_ROLE_PLAY); + + if (!_firstPull) + { + Talk(SAY_ALGALON_AGGRO); + _EnterCombat(); + introDelay = 8000; + } + else + { + _firstPull = false; + Talk(SAY_ALGALON_START_TIMER); + if (Creature* brann = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRANN_BRONZEBEARD_ALG))) + brann->AI()->DoAction(ACTION_FINISH_INTRO); + + me->setActive(true); + DoZoneInCombat(); + introDelay = 26000; + summons.DespawnEntry(NPC_AZEROTH); + instance->SetData(EVENT_DESPAWN_ALGALON, 0); + events.ScheduleEvent(EVENT_START_COMBAT, 18000); + } + + events.ScheduleEvent(EVENT_INTRO_TIMER_DONE, introDelay); + events.ScheduleEvent(EVENT_QUANTUM_STRIKE, 3500 + introDelay); + events.ScheduleEvent(EVENT_PHASE_PUNCH, 15500 + introDelay); + events.ScheduleEvent(EVENT_SUMMON_COLLAPSING_STAR, 18000 + introDelay); + events.ScheduleEvent(EVENT_BIG_BANG, 90000 + introDelay); + events.ScheduleEvent(EVENT_ASCEND_TO_THE_HEAVENS, 360000 + introDelay); + events.ScheduleEvent(EVENT_COSMIC_SMASH, 25000 + introDelay); + + std::list stalkers; + me->GetCreatureListWithEntryInGrid(stalkers, NPC_ALGALON_STALKER, 200.0f); + for (std::list::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr) + (*itr)->m_Events.KillAllEvents(true); + } + + void MovementInform(uint32 movementType, uint32 pointId) + { + if (movementType != POINT_MOTION_TYPE) + return; + + if (pointId == POINT_ALGALON_LAND) + me->SetDisableGravity(false); + else if (pointId == POINT_ALGALON_OUTRO) + { + me->SetFacingTo(1.605703f); + events.ScheduleEvent(EVENT_OUTRO_3, 1200); + events.ScheduleEvent(EVENT_OUTRO_4, 2400); + events.ScheduleEvent(EVENT_OUTRO_5, 8500); + events.ScheduleEvent(EVENT_OUTRO_6, 15500); + events.ScheduleEvent(EVENT_OUTRO_7, 55500); + events.ScheduleEvent(EVENT_OUTRO_8, 73500); + events.ScheduleEvent(EVENT_OUTRO_9, 85500); + events.ScheduleEvent(EVENT_OUTRO_10, 108500); + events.ScheduleEvent(EVENT_OUTRO_11, 123500); + } + } + + void JustSummoned(Creature* summon) + { + summons.Summon(summon); + switch (summon->GetEntry()) + { + case NPC_AZEROTH: + DoCastAOE(SPELL_REORIGINATION, true); + break; + case NPC_COLLAPSING_STAR: + summon->SetReactState(REACT_PASSIVE); + summon->GetMotionMaster()->MoveRandom(20.0f); + summon->CastSpell(summon, SPELL_COLLAPSE, TRIGGERED_FULL_MASK); + break; + case NPC_BLACK_HOLE: + summon->SetReactState(REACT_PASSIVE); + summon->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_TRIGGER, TRIGGERED_FULL_MASK); + summon->CastSpell(summon, SPELL_CONSTELLATION_PHASE_TRIGGER, TRIGGERED_FULL_MASK); + summon->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_EXPLOSION); + summon->CastSpell(summon, SPELL_SUMMON_VOID_ZONE_VISUAL, TRIGGERED_FULL_MASK); + break; + case NPC_ALGALON_VOID_ZONE_VISUAL_STALKER: + summon->CastSpell(summon, SPELL_VOID_ZONE_VISUAL, TRIGGERED_FULL_MASK); + break; + case NPC_ALGALON_STALKER_ASTEROID_TARGET_01: + summon->CastSpell(summon, SPELL_COSMIC_SMASH_VISUAL_STATE, TRIGGERED_FULL_MASK); + break; + case NPC_ALGALON_STALKER_ASTEROID_TARGET_02: + summon->m_Events.AddEvent(new CosmicSmashDamageEvent(summon), summon->m_Events.CalculateTime(3250)); + break; + case NPC_WORM_HOLE: + summon->SetReactState(REACT_PASSIVE); + summon->CastSpell(summon, SPELL_WORM_HOLE_TRIGGER, TRIGGERED_FULL_MASK); + summon->CastSpell(summon, SPELL_SUMMON_VOID_ZONE_VISUAL, TRIGGERED_FULL_MASK); + break; + case NPC_UNLEASHED_DARK_MATTER: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (summon->Attack(target, true)) + summon->GetMotionMaster()->MoveChase(target); + break; + } + } + + void EnterEvadeMode() + { + instance->SetBossState(BOSS_ALGALON, FAIL); + BossAI::EnterEvadeMode(); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); + me->SetSheath(SHEATH_STATE_UNARMED); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (_fightWon) + { + damage = 0; + return; + } + + if (!_phaseTwo && me->HealthBelowPctDamaged(20, damage)) + { + _phaseTwo = true; + Talk(SAY_ALGALON_PHASE_TWO); + summons.DespawnEntry(NPC_LIVING_CONSTELLATION); + summons.DespawnEntry(NPC_COLLAPSING_STAR); + summons.DespawnEntry(NPC_BLACK_HOLE); + summons.DespawnEntry(NPC_ALGALON_VOID_ZONE_VISUAL_STALKER); + events.CancelEvent(EVENT_SUMMON_COLLAPSING_STAR); + std::list stalkers; + me->GetCreatureListWithEntryInGrid(stalkers, NPC_ALGALON_STALKER, 200.0f); + for (std::list::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr) + (*itr)->m_Events.KillAllEvents(true); + for (uint32 i = 0; i < COLLAPSING_STAR_COUNT; ++i) + if (Creature* wormHole = DoSummon(NPC_WORM_HOLE, CollapsingStarPos[i], TEMPSUMMON_MANUAL_DESPAWN)) + wormHole->m_Events.AddEvent(new SummonUnleashedDarkMatter(wormHole), wormHole->m_Events.CalculateTime(i >= 2 ? 8000 : 6000)); + } + else if ((int32(me->GetHealth()) - int32(damage)) < CalculatePctF(int32(me->GetMaxHealth()), 2.5f) && !_fightWon) + { + _fightWon = true; + damage = 0; + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + me->setFaction(35); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + DoCast(me, SPELL_SELF_STUN); + events.Reset(); + summons.DespawnAll(); + events.SetPhase(PHASE_ROLE_PLAY); + events.ScheduleEvent(EVENT_OUTRO_START, 1500); + events.ScheduleEvent(EVENT_OUTRO_1, 7200); + events.ScheduleEvent(EVENT_OUTRO_2, 8700); + } + } + + void UpdateAI(uint32 const diff) + { + if ((!(events.GetPhaseMask() & PHASE_MASK_NO_UPDATE) && !UpdateVictim()) || !CheckInRoom()) + return; + + events.Update(diff); + + if (!(events.GetPhaseMask() & PHASE_MASK_NO_CAST_CHECK)) + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_INTRO_1: + me->RemoveAurasDueToSpell(SPELL_RIDE_THE_LIGHTNING); + Talk(SAY_ALGALON_INTRO_1); + break; + case EVENT_INTRO_2: + DoCastAOE(SPELL_SUMMON_AZEROTH, true); + Talk(SAY_ALGALON_INTRO_2); + break; + case EVENT_INTRO_3: + Talk(SAY_ALGALON_INTRO_3); + break; + case EVENT_INTRO_FINISH: + events.Reset(); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); + break; + case EVENT_START_COMBAT: + instance->SetBossState(BOSS_ALGALON, IN_PROGRESS); + break; + case EVENT_INTRO_TIMER_DONE: + { + events.SetPhase(PHASE_NORMAL); + me->SetSheath(SHEATH_STATE_MELEE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_NPC); + me->SetReactState(REACT_DEFENSIVE); + DoCastAOE(SPELL_SUPERMASSIVE_FAIL, true); + //! Workaround for Creature::_IsTargetAcceptable returning false + //! for creatures that start combat in REACT_PASSIVE and UNIT_FLAG_NOT_SELECTABLE + //! causing them to immediately evade + if (!me->getThreatManager().isThreatListEmpty()) + AttackStart(me->getThreatManager().getHostilTarget()); + for (uint32 i = 0; i < LIVING_CONSTELLATION_COUNT; ++i) + if (Creature* summon = DoSummon(NPC_LIVING_CONSTELLATION, ConstellationPos[i], 0, TEMPSUMMON_DEAD_DESPAWN)) + summon->SetReactState(REACT_PASSIVE); + + std::list stalkers; + me->GetCreatureListWithEntryInGrid(stalkers, NPC_ALGALON_STALKER, 200.0f); + if (!stalkers.empty()) + { + Unit* stalker = Trinity::Containers::SelectRandomContainerElement(stalkers); + stalker->m_Events.AddEvent(new ActivateLivingConstellation(stalker), stalker->m_Events.CalculateTime(urand(45000, 50000))); + } + break; + } + case EVENT_QUANTUM_STRIKE: + DoCastVictim(SPELL_QUANTUM_STRIKE); + events.ScheduleEvent(EVENT_QUANTUM_STRIKE, urand(3000, 5000)); + break; + case EVENT_PHASE_PUNCH: + DoCastVictim(SPELL_PHASE_PUNCH); + events.ScheduleEvent(EVENT_PHASE_PUNCH, 15500); + break; + case EVENT_SUMMON_COLLAPSING_STAR: + Talk(SAY_ALGALON_COLLAPSING_STAR); + Talk(EMOTE_ALGALON_COLLAPSING_STAR); + for (uint32 i = 0; i < COLLAPSING_STAR_COUNT; ++i) + me->SummonCreature(NPC_COLLAPSING_STAR, CollapsingStarPos[i], TEMPSUMMON_CORPSE_DESPAWN); + events.ScheduleEvent(EVENT_SUMMON_COLLAPSING_STAR, 60000); + break; + case EVENT_BIG_BANG: + { + Talk(SAY_ALGALON_BIG_BANG); + Talk(EMOTE_ALGALON_BIG_BANG); + events.SetPhase(PHASE_BIG_BANG); + std::list constellations; + me->GetCreatureListWithEntryInGrid(constellations, NPC_LIVING_CONSTELLATION, 200.0f); + for (std::list::iterator itr = constellations.begin(); itr != constellations.end(); ++itr) + (*itr)->AI()->DoAction(ACTION_BIG_BANG); + DoCastAOE(SPELL_BIG_BANG); + events.ScheduleEvent(EVENT_BIG_BANG, 90500); + events.ScheduleEvent(EVENT_RESUME_UPDATING, 9500); + break; + } + case EVENT_RESUME_UPDATING: + events.SetPhase(0); + break; + case EVENT_ASCEND_TO_THE_HEAVENS: + Talk(SAY_ALGALON_ASCEND); + DoCastAOE(SPELL_ASCEND_TO_THE_HEAVENS); + events.ScheduleEvent(EVENT_EVADE, 2500); + break; + case EVENT_EVADE: + EnterEvadeMode(); + break; + case EVENT_COSMIC_SMASH: + Talk(EMOTE_ALGALON_COSMIC_SMASH); + DoCastAOE(SPELL_COSMIC_SMASH); + events.ScheduleEvent(EVENT_COSMIC_SMASH, 25500); + break; + case EVENT_UNLOCK_YELL: + _hasYelled = false; + break; + case EVENT_OUTRO_START: + instance->SetBossState(BOSS_ALGALON, DONE); + break; + case EVENT_OUTRO_1: + me->RemoveAllAuras(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_RENAME); + break; + case EVENT_OUTRO_2: + _EnterEvadeMode(); + me->AddUnitState(UNIT_STATE_EVADE); + me->GetMotionMaster()->MovePoint(POINT_ALGALON_OUTRO, AlgalonOutroPos); + break; + case EVENT_OUTRO_3: + DoCastAOE(SPELL_KILL_CREDIT); + break; + case EVENT_OUTRO_4: + DoCastAOE(SPELL_SUPERMASSIVE_FAIL); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + break; + case EVENT_OUTRO_5: + if (Creature* brann = DoSummon(NPC_BRANN_BRONZBEARD_ALG, BrannOutroPos[0], 131500, TEMPSUMMON_TIMED_DESPAWN)) + brann->AI()->DoAction(ACTION_OUTRO); + break; + case EVENT_OUTRO_6: + Talk(SAY_ALGALON_OUTRO_1); + me->SetStandState(UNIT_STAND_STATE_KNEEL); + break; + case EVENT_OUTRO_7: + Talk(SAY_ALGALON_OUTRO_2); + break; + case EVENT_OUTRO_8: + Talk(SAY_ALGALON_OUTRO_3); + break; + case EVENT_OUTRO_9: + Talk(SAY_ALGALON_OUTRO_4); + break; + case EVENT_OUTRO_10: + Talk(SAY_ALGALON_OUTRO_5); + break; + case EVENT_OUTRO_11: + me->SetStandState(UNIT_STAND_STATE_STAND); + DoCast(me, SPELL_TELEPORT); + me->DespawnOrUnsummon(1500); + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + bool _firstPull; + bool _fedOnTears; + bool _phaseTwo; + bool _fightWon; + bool _hasYelled; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetUlduarAI(creature); + } +}; + +class npc_living_constellation : public CreatureScript +{ + public: + npc_living_constellation() : CreatureScript("npc_living_constellation") { } + + struct npc_living_constellationAI : public CreatureAI + { + npc_living_constellationAI(Creature* creature) : CreatureAI(creature) + { + } + + void Reset() + { + _events.Reset(); + _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 2500); + _isActive = false; + } + + uint32 GetData(uint32 /*type*/) + { + return _isActive ? 1 : 0; + } + + void DoAction(int32 const action) + { + if (action != ACTION_ACTIVATE_STAR) + return; + + switch (action) + { + case ACTION_ACTIVATE_STAR: + if (Creature* algalon = me->FindNearestCreature(NPC_ALGALON, 200.0f)) + { + if (Unit* target = algalon->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(algalon))) + { + me->SetReactState(REACT_AGGRESSIVE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + AttackStart(target); + DoZoneInCombat(); + _isActive = true; + } + } + break; + case ACTION_BIG_BANG: + _events.SetPhase(PHASE_BIG_BANG); + _events.DelayEvents(9500); + _events.ScheduleEvent(EVENT_RESUME_UPDATING, 9500); + break; + } + } + + void SpellHit(Unit* caster, SpellInfo const* spell) + { + if (spell->Id != SPELL_CONSTELLATION_PHASE_EFFECT || caster->GetTypeId() != TYPEID_UNIT) + return; + + me->DespawnOrUnsummon(1); + if (InstanceScript* instance = me->GetInstanceScript()) + instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_ID_SUPERMASSIVE_START); + caster->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_CREDIT, TRIGGERED_FULL_MASK); + caster->ToCreature()->DespawnOrUnsummon(1); + } + + void UpdateAI(uint32 const diff) + { + if (!(_events.GetPhaseMask() & PHASE_MASK_NO_UPDATE) && !UpdateVictim()) + return; + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_ARCANE_BARRAGE: + DoCastAOE(SPELL_ARCANE_BARRAGE); + _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 2500); + break; + case EVENT_RESUME_UPDATING: + _events.SetPhase(0); + break; + } + } + } + + private: + EventMap _events; + bool _isActive; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetUlduarAI(creature); + } +}; + +class npc_collapsing_star : public CreatureScript +{ + public: + npc_collapsing_star() : CreatureScript("npc_collapsing_star") { } + + struct npc_collapsing_starAI : public PassiveAI + { + npc_collapsing_starAI(Creature* creature) : PassiveAI(creature) + { + _dying = false; + } + + void JustSummoned(Creature* summon) + { + if (summon->GetEntry() != NPC_BLACK_HOLE) + return; + + if (TempSummon* summ = me->ToTempSummon()) + if (Creature* algalon = ObjectAccessor::GetCreature(*me, summ->GetSummonerGUID())) + algalon->AI()->JustSummoned(summon); + + me->DespawnOrUnsummon(1); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (_dying) + { + damage = 0; + return; + } + + if (damage >= me->GetHealth()) + { + _dying = true; + damage = 0; + DoCast(me, SPELL_BLACK_HOLE_SPAWN_VISUAL, true); + DoCast(me, SPELL_SUMMON_BLACK_HOLE, true); + } + } + + bool _dying; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetUlduarAI(creature); + } +}; + +class npc_brann_bronzebeard_algalon : public CreatureScript +{ + public: + npc_brann_bronzebeard_algalon() : CreatureScript("npc_brann_bronzebeard_algalon") { } + + struct npc_brann_bronzebeard_algalonAI : public CreatureAI + { + npc_brann_bronzebeard_algalonAI(Creature* creature) : CreatureAI(creature) + { + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_START_INTRO: + _currentPoint = 0; + _events.Reset(); + me->SetWalk(false); + _events.ScheduleEvent(EVENT_BRANN_MOVE_INTRO, 1); + break; + case ACTION_FINISH_INTRO: + Talk(SAY_BRANN_ALGALON_INTRO_2); + _events.ScheduleEvent(EVENT_BRANN_MOVE_INTRO, 1); + break; + case ACTION_OUTRO: + me->GetMotionMaster()->MovePoint(POINT_BRANN_OUTRO, BrannOutroPos[1]); + _events.ScheduleEvent(EVENT_BRANN_OUTRO_1, 89500); + _events.ScheduleEvent(EVENT_BRANN_OUTRO_2, 116500); + break; + } + } + + void MovementInform(uint32 movementType, uint32 pointId) + { + if (movementType != POINT_MOTION_TYPE) + return; + + uint32 delay = 1; + _currentPoint = pointId + 1; + switch (pointId) + { + case 2: + delay = 8000; + me->SetWalk(true); + break; + case 5: + me->SetWalk(false); + Talk(SAY_BRANN_ALGALON_INTRO_1); + _events.ScheduleEvent(EVENT_SUMMON_ALGALON, 7500); + return; + case 9: + me->DespawnOrUnsummon(1); + return; + case POINT_BRANN_OUTRO: + case POINT_BRANN_OUTRO_END: + return; + } + + _events.ScheduleEvent(EVENT_BRANN_MOVE_INTRO, delay); + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + + if (_events.Empty()) + return; + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_BRANN_MOVE_INTRO: + if (_currentPoint < MAX_BRANN_WAYPOINTS_INTRO) + me->GetMotionMaster()->MovePoint(_currentPoint, BrannIntroWaypoint[_currentPoint]); + break; + case EVENT_SUMMON_ALGALON: + if (Creature* algalon = me->GetMap()->SummonCreature(NPC_ALGALON, AlgalonSummonPos)) + algalon->AI()->DoAction(ACTION_START_INTRO); + break; + case EVENT_BRANN_OUTRO_1: + Talk(SAY_BRANN_ALGALON_OUTRO); + break; + case EVENT_BRANN_OUTRO_2: + me->GetMotionMaster()->MovePoint(POINT_BRANN_OUTRO_END, BrannOutroPos[2]); + break; + } + } + } + + private: + EventMap _events; + uint32 _currentPoint; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetUlduarAI(creature); + } +}; + +class go_celestial_planetarium_access : public GameObjectScript +{ + public: + go_celestial_planetarium_access() : GameObjectScript("go_celestial_planetarium_access") {} + + struct go_celestial_planetarium_accessAI : public GameObjectAI + { + go_celestial_planetarium_accessAI(GameObject* go) : GameObjectAI(go) + { + } + + bool GossipHello(Player* player) + { + bool hasKey = true; + if (LockEntry const* lock = sLockStore.LookupEntry(go->GetGOInfo()->goober.lockId)) + { + hasKey = false; + for (uint32 i = 0; i < MAX_LOCK_CASE; ++i) + { + if (!lock->Index[i]) + continue; + + if (player->HasItemCount(lock->Index[i], 1)) + { + hasKey = true; + break; + } + } + } + + if (!hasKey) + return false; + + // Start Algalon event + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + _events.ScheduleEvent(EVENT_DESPAWN_CONSOLE, 5000); + if (Creature* brann = go->SummonCreature(NPC_BRANN_BRONZBEARD_ALG, BrannIntroSpawnPos)) + brann->AI()->DoAction(ACTION_START_INTRO); + + if (InstanceScript* instance = go->GetInstanceScript()) + { + instance->SetData(DATA_ALGALON_SUMMON_STATE, 1); + if (GameObject* sigil = ObjectAccessor::GetGameObject(*go, instance->GetData64(DATA_SIGILDOOR_01))) + sigil->SetGoState(GO_STATE_ACTIVE); + + if (GameObject* sigil = ObjectAccessor::GetGameObject(*go, instance->GetData64(DATA_SIGILDOOR_02))) + sigil->SetGoState(GO_STATE_ACTIVE); + } + + return false; + } + + void UpdateAI(uint32 diff) + { + if (_events.Empty()) + return; + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_DESPAWN_CONSOLE: + go->Delete(); + break; + } + } + } + + EventMap _events; + }; + + GameObjectAI* GetAI(GameObject* go) const + { + return GetUlduarAI(go); + } +}; + +class spell_algalon_phase_punch : public SpellScriptLoader +{ + public: + spell_algalon_phase_punch() : SpellScriptLoader("spell_algalon_phase_punch") { } + + class spell_algalon_phase_punch_AuraScript : public AuraScript + { + PrepareAuraScript(spell_algalon_phase_punch_AuraScript); + + void HandlePeriodic(AuraEffect const* aurEff) + { + PreventDefaultAction(); + if (GetStackAmount() != 1) + GetTarget()->RemoveAurasDueToSpell(PhasePunchAlphaId[GetStackAmount() - 2]); + GetTarget()->CastSpell(GetTarget(), PhasePunchAlphaId[GetStackAmount() - 1], TRIGGERED_FULL_MASK); + if (GetStackAmount() == 5) + Remove(AURA_REMOVE_BY_DEFAULT); + } + + void OnRemove(AuraEffect const*, AuraEffectHandleModes) + { + if (GetStackAmount() != 5) + GetTarget()->RemoveAurasDueToSpell(PhasePunchAlphaId[GetStackAmount() - 1]); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_phase_punch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectRemove += AuraEffectRemoveFn(spell_algalon_phase_punch_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_algalon_phase_punch_AuraScript(); + } +}; + +class NotVictimFilter +{ + public: + NotVictimFilter(Unit* caster) : _victim(caster->getVictim()) + { + } + + bool operator()(Unit* target) + { + return target != _victim; + } + + private: + Unit* _victim; +}; + +class spell_algalon_arcane_barrage : public SpellScriptLoader +{ + public: + spell_algalon_arcane_barrage() : SpellScriptLoader("spell_algalon_arcane_barrage") { } + + class spell_algalon_arcane_barrage_SpellScript : public SpellScript + { + PrepareSpellScript(spell_algalon_arcane_barrage_SpellScript); + + void SelectTarget(std::list& targets) + { + targets.remove_if(NotVictimFilter(GetCaster())); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_algalon_arcane_barrage_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_algalon_arcane_barrage_SpellScript(); + } +}; + +class ActiveConstellationFilter +{ + public: + bool operator()(Unit* target) const + { + return target->GetAI()->GetData(0); + } +}; + +class spell_algalon_trigger_3_adds : public SpellScriptLoader +{ + public: + spell_algalon_trigger_3_adds() : SpellScriptLoader("spell_algalon_trigger_3_adds") { } + + class spell_algalon_trigger_3_adds_SpellScript : public SpellScript + { + PrepareSpellScript(spell_algalon_trigger_3_adds_SpellScript); + + void SelectTarget(std::list& targets) + { + targets.remove_if(ActiveConstellationFilter()); + } + + void HandleDummy(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + Creature* target = GetHitCreature(); + if (!target) + return; + + target->AI()->DoAction(ACTION_ACTIVATE_STAR); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_algalon_trigger_3_adds_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_algalon_trigger_3_adds_SpellScript(); + } +}; + +class spell_algalon_collapse : public SpellScriptLoader +{ + public: + spell_algalon_collapse() : SpellScriptLoader("spell_algalon_collapse") { } + + class spell_algalon_collapse_AuraScript : public AuraScript + { + PrepareAuraScript(spell_algalon_collapse_AuraScript); + + void HandlePeriodic(AuraEffect const* /*aurEff*/) + { + PreventDefaultAction(); + GetTarget()->DealDamage(GetTarget(), GetTarget()->CountPctFromMaxHealth(1), NULL, NODAMAGE); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_collapse_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_algalon_collapse_AuraScript(); + } +}; + +class spell_algalon_big_bang : public SpellScriptLoader +{ + public: + spell_algalon_big_bang() : SpellScriptLoader("spell_algalon_big_bang") { } + + class spell_algalon_big_bang_SpellScript : public SpellScript + { + PrepareSpellScript(spell_algalon_big_bang_SpellScript); + + bool Load() + { + _targetCount = 0; + return true; + } + + void CountTargets(std::list& targets) + { + _targetCount = targets.size(); + } + + void CheckTargets() + { + if (!_targetCount) + GetCaster()->GetAI()->DoAction(ACTION_ASCEND); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_algalon_big_bang_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + AfterCast += SpellCastFn(spell_algalon_big_bang_SpellScript::CheckTargets); + } + + uint32 _targetCount; + }; + + SpellScript* GetSpellScript() const + { + return new spell_algalon_big_bang_SpellScript(); + } +}; + +class spell_algalon_remove_phase : public SpellScriptLoader +{ + public: + spell_algalon_remove_phase() : SpellScriptLoader("spell_algalon_remove_phase") { } + + class spell_algalon_remove_phase_AuraScript : public AuraScript + { + PrepareAuraScript(spell_algalon_remove_phase_AuraScript); + + void HandlePeriodic(AuraEffect const* /*aurEff*/) + { + PreventDefaultAction(); + GetTarget()->RemoveAurasByType(SPELL_AURA_PHASE); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_remove_phase_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_algalon_remove_phase_AuraScript(); + } +}; + +class spell_algalon_cosmic_smash : public SpellScriptLoader +{ + public: + spell_algalon_cosmic_smash() : SpellScriptLoader("spell_algalon_cosmic_smash") { } + + class spell_algalon_cosmic_smash_SpellScript : public SpellScript + { + PrepareSpellScript(spell_algalon_cosmic_smash_SpellScript); + + void ModDestHeight(SpellEffIndex /*effIndex*/) + { + Position offset = {0.0f, 0.0f, 65.0f, 0.0f}; + const_cast(GetTargetDest())->RelocateOffset(offset); + GetHitDest()->RelocateOffset(offset); + } + + void Register() + { + OnEffectLaunch += SpellEffectFn(spell_algalon_cosmic_smash_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_algalon_cosmic_smash_SpellScript(); + } +}; + +class spell_algalon_cosmic_smash_damage : public SpellScriptLoader +{ + public: + spell_algalon_cosmic_smash_damage() : SpellScriptLoader("spell_algalon_cosmic_smash_damage") { } + + class spell_algalon_cosmic_smash_damage_SpellScript : public SpellScript + { + PrepareSpellScript(spell_algalon_cosmic_smash_damage_SpellScript); + + void RecalculateDamage() + { + if (!GetTargetDest() || !GetHitUnit()) + return; + + float distance = GetHitUnit()->GetDistance2d(GetTargetDest()->GetPositionX(), GetTargetDest()->GetPositionY()); + if (distance > 6.0f) + SetHitDamage(int32(float(GetHitDamage()) / distance) * 2); + } + + void Register() + { + OnHit += SpellHitFn(spell_algalon_cosmic_smash_damage_SpellScript::RecalculateDamage); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_algalon_cosmic_smash_damage_SpellScript(); + } +}; + +class spell_algalon_supermassive_fail : public SpellScriptLoader +{ + public: + spell_algalon_supermassive_fail() : SpellScriptLoader("spell_algalon_supermassive_fail") { } + + class spell_algalon_supermassive_fail_SpellScript : public SpellScript + { + PrepareSpellScript(spell_algalon_supermassive_fail_SpellScript); + + void RecalculateDamage() + { + if (!GetHitPlayer()) + return; + + GetHitPlayer()->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, ACHIEVEMENT_CRITERIA_CONDITION_NO_SPELL_HIT, GetSpellInfo()->Id, true); + } + + void Register() + { + OnHit += SpellHitFn(spell_algalon_supermassive_fail_SpellScript::RecalculateDamage); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_algalon_supermassive_fail_SpellScript(); + } +}; + +class achievement_he_feeds_on_your_tears : public AchievementCriteriaScript +{ + public: + achievement_he_feeds_on_your_tears() : AchievementCriteriaScript("achievement_he_feeds_on_your_tears") { } + + bool OnCheck(Player* /*source*/, Unit* target) + { + return !target->GetAI()->GetData(DATA_HAS_FED_ON_TEARS); + } +}; + +void AddSC_boss_algalon_the_observer() +{ + new boss_algalon_the_observer(); + new npc_living_constellation(); + new npc_collapsing_star(); + new npc_brann_bronzebeard_algalon(); + new go_celestial_planetarium_access(); + new spell_algalon_phase_punch(); + new spell_algalon_arcane_barrage(); + new spell_algalon_trigger_3_adds(); + new spell_algalon_collapse(); + new spell_algalon_big_bang(); + new spell_algalon_remove_phase(); + new spell_algalon_cosmic_smash(); + new spell_algalon_cosmic_smash_damage(); + new spell_algalon_supermassive_fail(); + new achievement_he_feeds_on_your_tears(); +} diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 22858cf69e5..654d763ddbc 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -22,9 +22,14 @@ static DoorData const doorData[] = { - { GO_LEVIATHAN_DOOR, BOSS_LEVIATHAN, DOOR_TYPE_ROOM, BOUNDARY_S }, - { GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, - { 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }, + {GO_LEVIATHAN_DOOR, BOSS_LEVIATHAN, DOOR_TYPE_ROOM, BOUNDARY_S }, + {GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, + {GO_DOODAD_UL_SIGILDOOR_03, BOSS_ALGALON, DOOR_TYPE_ROOM, BOUNDARY_W }, + {GO_DOODAD_UL_UNIVERSEFLOOR_01, BOSS_ALGALON, DOOR_TYPE_ROOM, BOUNDARY_NONE }, + {GO_DOODAD_UL_UNIVERSEFLOOR_02, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE }, + {GO_DOODAD_UL_UNIVERSEGLOBE01, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE }, + {GO_DOODAD_UL_ULDUAR_TRAPDOOR_03, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE }, + {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }, }; class instance_ulduar : public InstanceMapScript @@ -36,7 +41,6 @@ class instance_ulduar : public InstanceMapScript { instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } - uint32 Encounter[MAX_ENCOUNTER]; std::string m_strInstData; // Creatures @@ -72,6 +76,12 @@ class instance_ulduar : public InstanceMapScript uint64 HodirDoorGUID; uint64 HodirIceDoorGUID; uint64 ArchivumDoorGUID; + uint64 AlgalonSigilDoorGUID[3]; + uint64 AlgalonFloorGUID[2]; + uint64 AlgalonUniverseGUID; + uint64 AlgalonTrapdoorGUID; + uint64 BrannBronzebeardAlgGUID; + uint64 GiftOfTheObserverGUID; // Miscellaneous uint32 TeamInInstance; @@ -111,35 +121,49 @@ class instance_ulduar : public InstanceMapScript HodirDoorGUID = 0; HodirIceDoorGUID = 0; ArchivumDoorGUID = 0; + AlgalonUniverseGUID = 0; + AlgalonTrapdoorGUID = 0; + BrannBronzebeardAlgGUID = 0; + GiftOfTheObserverGUID = 0; + _algalonTimer = 61; + _maxArmorItemLevel = 0; + _maxWeaponItemLevel = 0; TeamInInstance = 0; HodirRareCacheData = 0; ColossusData = 0; elderCount = 0; conSpeedAtory = false; Unbroken = true; + _summonAlgalon = false; - memset(Encounter, 0, sizeof(Encounter)); + memset(AlgalonSigilDoorGUID, 0, sizeof(AlgalonSigilDoorGUID)); + memset(AlgalonFloorGUID, 0, sizeof(AlgalonFloorGUID)); memset(XTToyPileGUIDs, 0, sizeof(XTToyPileGUIDs)); memset(AssemblyGUIDs, 0, sizeof(AssemblyGUIDs)); memset(RazorHarpoonGUIDs, 0, sizeof(RazorHarpoonGUIDs)); memset(KeeperGUIDs, 0, sizeof(KeeperGUIDs)); } - bool IsEncounterInProgress() const + void FillInitialWorldStates(WorldPacket& packet) { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - { - if (Encounter[i] == IN_PROGRESS) - return true; - } - - return false; + packet << uint32(WORLD_STATE_ALGALON_TIMER_ENABLED) << uint32(_algalonTimer && _algalonTimer <= 60); + packet << uint32(WORLD_STATE_ALGALON_DESPAWN_TIMER) << uint32(std::min(_algalonTimer, 60)); } void OnPlayerEnter(Player* player) { if (!TeamInInstance) TeamInInstance = player->GetTeam(); + + if (_summonAlgalon) + { + _summonAlgalon = false; + TempSummon* algalon = instance->SummonCreature(NPC_ALGALON, AlgalonLandPos); + if (_algalonTimer && _algalonTimer <= 60) + algalon->AI()->DoAction(ACTION_INIT_ALGALON); + else + algalon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); + } } void OnCreatureCreate(Creature* creature) @@ -267,9 +291,32 @@ class instance_ulduar : public InstanceMapScript if (TeamInInstance == HORDE) creature->UpdateEntry(NPC_BATTLE_PRIEST_GINA, HORDE); break; + case NPC_BRANN_BRONZBEARD_ALG: + BrannBronzebeardAlgGUID = creature->GetGUID(); + break; + //! These creatures are summoned by something else than Algalon + //! but need to be controlled/despawned by him - so they need to be + //! registered in his summon list + case NPC_ALGALON_VOID_ZONE_VISUAL_STALKER: + case NPC_ALGALON_STALKER_ASTEROID_TARGET_01: + case NPC_ALGALON_STALKER_ASTEROID_TARGET_02: + case NPC_UNLEASHED_DARK_MATTER: + if (Creature* algalon = instance->GetCreature(AlgalonGUID)) + algalon->AI()->JustSummoned(creature); + break; } + } - } + void OnCreatureRemove(Creature* creature) + { + switch (creature->GetEntry()) + { + case NPC_BRANN_BRONZBEARD_ALG: + if (BrannBronzebeardAlgGUID == creature->GetGUID()) + BrannBronzebeardAlgGUID = 0; + break; + } + } void OnGameObjectCreate(GameObject* gameObject) { @@ -340,6 +387,45 @@ class instance_ulduar : public InstanceMapScript if (GetBossState(BOSS_ASSEMBLY_OF_IRON) != DONE) HandleGameObject(ArchivumDoorGUID, false); break; + case GO_CELESTIAL_PLANETARIUM_ACCESS_10: + case GO_CELESTIAL_PLANETARIUM_ACCESS_25: + if (_algalonSummoned) + gameObject->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + break; + case GO_DOODAD_UL_SIGILDOOR_01: + AlgalonSigilDoorGUID[0] = gameObject->GetGUID(); + if (_algalonSummoned) + gameObject->SetGoState(GO_STATE_ACTIVE); + break; + case GO_DOODAD_UL_SIGILDOOR_02: + AlgalonSigilDoorGUID[1] = gameObject->GetGUID(); + if (_algalonSummoned) + gameObject->SetGoState(GO_STATE_ACTIVE); + break; + case GO_DOODAD_UL_SIGILDOOR_03: + AlgalonSigilDoorGUID[2] = gameObject->GetGUID(); + AddDoor(gameObject, true); + break; + case GO_DOODAD_UL_UNIVERSEFLOOR_01: + AlgalonFloorGUID[0] = gameObject->GetGUID(); + AddDoor(gameObject, true); + break; + case GO_DOODAD_UL_UNIVERSEFLOOR_02: + AlgalonFloorGUID[1] = gameObject->GetGUID(); + AddDoor(gameObject, true); + break; + case GO_DOODAD_UL_UNIVERSEGLOBE01: + AlgalonUniverseGUID = gameObject->GetGUID(); + AddDoor(gameObject, true); + break; + case GO_DOODAD_UL_ULDUAR_TRAPDOOR_03: + AlgalonTrapdoorGUID = gameObject->GetGUID(); + AddDoor(gameObject, true); + break; + case GO_GIFT_OF_THE_OBSERVER_10: + case GO_GIFT_OF_THE_OBSERVER_25: + GiftOfTheObserverGUID = gameObject->GetGUID(); + break; } } @@ -348,10 +434,14 @@ class instance_ulduar : public InstanceMapScript switch (gameObject->GetEntry()) { case GO_LEVIATHAN_DOOR: - AddDoor(gameObject, false); - break; case GO_XT_002_DOOR: + case GO_DOODAD_UL_SIGILDOOR_03: + case GO_DOODAD_UL_UNIVERSEFLOOR_01: + case GO_DOODAD_UL_UNIVERSEFLOOR_02: + case GO_DOODAD_UL_UNIVERSEGLOBE01: + case GO_DOODAD_UL_ULDUAR_TRAPDOOR_03: AddDoor(gameObject, false); + break; default: break; } @@ -389,6 +479,7 @@ class instance_ulduar : public InstanceMapScript // Flame Leviathan's Tower Event triggers Creature* FlameLeviathan = instance->GetCreature(LeviathanGUID); if (FlameLeviathan && FlameLeviathan->isAlive()) // No leviathan, no event triggering ;) + { switch (eventId) { case EVENT_TOWER_OF_STORM_DESTROYED: @@ -404,6 +495,7 @@ class instance_ulduar : public InstanceMapScript FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_LIFE_DESTROYED); break; } + } } @@ -464,6 +556,52 @@ class instance_ulduar : public InstanceMapScript if (GameObject* gameObject = instance->GetGameObject(ThorimChestGUID)) gameObject->SetRespawnTime(gameObject->GetRespawnDelay()); break; + case BOSS_ALGALON: + if (state == DONE) + { + _events.CancelEvent(EVENT_UPDATE_ALGALON_TIMER); + _events.CancelEvent(EVENT_DESPAWN_ALGALON); + DoUpdateWorldState(WORLD_STATE_ALGALON_TIMER_ENABLED, 0); + _algalonTimer = 61; + if (GameObject* gameObject = instance->GetGameObject(GiftOfTheObserverGUID)) + gameObject->SetRespawnTime(gameObject->GetRespawnDelay()); + // get item level (recheck weapons) + Map::PlayerList const& players = instance->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + if (Player* player = itr->getSource()) + for (uint8 slot = EQUIPMENT_SLOT_MAINHAND; slot <= EQUIPMENT_SLOT_RANGED; ++slot) + if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, slot)) + if (item->GetTemplate()->ItemLevel > _maxWeaponItemLevel) + _maxWeaponItemLevel = item->GetTemplate()->ItemLevel; + } + else if (state == IN_PROGRESS) + { + // get item level (armor cannot be swapped in combat) + Map::PlayerList const& players = instance->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + if (Player* player = itr->getSource()) + { + for (uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) + { + if (slot == EQUIPMENT_SLOT_TABARD || slot == EQUIPMENT_SLOT_BODY) + continue; + + if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, slot)) + { + if (slot >= EQUIPMENT_SLOT_MAINHAND && slot <= EQUIPMENT_SLOT_RANGED) + { + if (item->GetTemplate()->ItemLevel > _maxWeaponItemLevel) + _maxWeaponItemLevel = item->GetTemplate()->ItemLevel; + } + else if (item->GetTemplate()->ItemLevel > _maxArmorItemLevel) + _maxArmorItemLevel = item->GetTemplate()->ItemLevel; + } + } + } + } + } + break; } return true; @@ -496,6 +634,16 @@ class instance_ulduar : public InstanceMapScript case DATA_UNBROKEN: Unbroken = bool(data); break; + case EVENT_DESPAWN_ALGALON: + DoUpdateWorldState(WORLD_STATE_ALGALON_TIMER_ENABLED, 1); + DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, 60); + _algalonTimer = 60; + _events.ScheduleEvent(EVENT_DESPAWN_ALGALON, 3600000); + _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 60000); + break; + case DATA_ALGALON_SUMMON_STATE: + _algalonSummoned = true; + break; default: break; } @@ -570,6 +718,22 @@ class instance_ulduar : public InstanceMapScript return KeeperGUIDs[1]; case BOSS_STONEBARK: return KeeperGUIDs[2]; + case DATA_SIGILDOOR_01: + return AlgalonSigilDoorGUID[0]; + case DATA_SIGILDOOR_02: + return AlgalonSigilDoorGUID[1]; + case DATA_SIGILDOOR_03: + return AlgalonSigilDoorGUID[2]; + case DATA_UNIVERSE_FLOOR_01: + return AlgalonFloorGUID[0]; + case DATA_UNIVERSE_FLOOR_02: + return AlgalonFloorGUID[1]; + case DATA_UNIVERSE_GLOBE: + return AlgalonUniverseGUID; + case DATA_ALGALON_TRAPDOOR: + return AlgalonTrapdoorGUID; + case DATA_BRANN_BRONZEBEARD_ALG: + return BrannBronzebeardAlgGUID; } return 0; @@ -592,12 +756,23 @@ class instance_ulduar : public InstanceMapScript return 0; } + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* , Unit const* /* = NULL */, uint32 /* = 0 */) + { + switch (criteriaId) + { + case CRITERIA_HERALD_OF_TITANS: + return _maxArmorItemLevel <= MAX_HERALD_ARMOR_ITEMLEVEL && _maxWeaponItemLevel <= MAX_HERALD_WEAPON_ITEMLEVEL; + } + + return false; + } + std::string GetSaveData() { OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "U U " << GetBossSaveData() << GetData(DATA_COLOSSUS); + saveStream << "U U " << GetBossSaveData() << GetData(DATA_COLOSSUS) << ' ' << _algalonTimer << ' ' << (_algalonSummoned ? 1 : 0); OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); @@ -627,15 +802,68 @@ class instance_ulduar : public InstanceMapScript if (tmpState == IN_PROGRESS || tmpState > SPECIAL) tmpState = NOT_STARTED; - if (i == DATA_COLOSSUS) - SetData(i, tmpState); - else - SetBossState(i, EncounterState(tmpState)); + SetBossState(i, EncounterState(tmpState)); + } + + uint32 tempState; + loadStream >> tempState; + if (tempState == IN_PROGRESS || tempState > SPECIAL) + tempState = NOT_STARTED; + SetData(DATA_COLOSSUS, tempState); + + loadStream >> _algalonTimer; + loadStream >> tempState; + _algalonSummoned = tempState != 0; + if (_algalonSummoned && GetBossState(BOSS_ALGALON) != DONE) + { + _summonAlgalon = true; + if (_algalonTimer && _algalonTimer <= 60) + { + _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 60000); + DoUpdateWorldState(WORLD_STATE_ALGALON_TIMER_ENABLED, 1); + DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, _algalonTimer); + } } } OUT_LOAD_INST_DATA_COMPLETE; } + + void Update(uint32 diff) + { + if (_events.Empty()) + return; + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_UPDATE_ALGALON_TIMER: + SaveToDB(); + DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, --_algalonTimer); + if (_algalonTimer) + _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 60000); + else + { + DoUpdateWorldState(WORLD_STATE_ALGALON_TIMER_ENABLED, 0); + _events.CancelEvent(EVENT_UPDATE_ALGALON_TIMER); + if (Creature* algalon = instance->GetCreature(AlgalonGUID)) + algalon->AI()->DoAction(EVENT_DESPAWN_ALGALON); + } + break; + } + } + } + + private: + EventMap _events; + uint32 _algalonTimer; + bool _summonAlgalon; + bool _algalonSummoned; + uint32 _maxArmorItemLevel; + uint32 _maxWeaponItemLevel; }; InstanceScript* GetInstanceScript(InstanceMap* map) const diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index a31954b8a16..d3b4684772f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -18,9 +18,12 @@ #ifndef DEF_ULDUAR_H #define DEF_ULDUAR_H -#include "ObjectMgr.h" +#include "Creature.h" +#include "GameObject.h" #define UlduarScriptName "instance_ulduar" +extern Position const AlgalonLandPos; + enum UlduarBosses { MAX_ENCOUNTER = 20, @@ -50,98 +53,124 @@ enum UlduarBosses enum UlduarNPCs { // General - NPC_LEVIATHAN = 33113, - NPC_SALVAGED_DEMOLISHER = 33109, - NPC_SALVAGED_SIEGE_ENGINE = 33060, - NPC_IGNIS = 33118, - NPC_RAZORSCALE = 33186, - NPC_RAZORSCALE_CONTROLLER = 33233, - NPC_STEELFORGED_DEFFENDER = 33236, - NPC_EXPEDITION_COMMANDER = 33210, - NPC_XT002 = 33293, - NPC_XT_TOY_PILE = 33337, - NPC_STEELBREAKER = 32867, - NPC_MOLGEIM = 32927, - NPC_BRUNDIR = 32857, - NPC_KOLOGARN = 32930, - NPC_FOCUSED_EYEBEAM = 33632, - NPC_FOCUSED_EYEBEAM_RIGHT = 33802, - NPC_LEFT_ARM = 32933, - NPC_RIGHT_ARM = 32934, - NPC_RUBBLE = 33768, - NPC_AURIAYA = 33515, - NPC_MIMIRON = 33350, - NPC_HODIR = 32845, - NPC_THORIM = 32865, - NPC_FREYA = 32906, - NPC_VEZAX = 33271, - NPC_YOGGSARON = 33288, - NPC_ALGALON = 32871, + NPC_LEVIATHAN = 33113, + NPC_SALVAGED_DEMOLISHER = 33109, + NPC_SALVAGED_SIEGE_ENGINE = 33060, + NPC_IGNIS = 33118, + NPC_RAZORSCALE = 33186, + NPC_RAZORSCALE_CONTROLLER = 33233, + NPC_STEELFORGED_DEFFENDER = 33236, + NPC_EXPEDITION_COMMANDER = 33210, + NPC_XT002 = 33293, + NPC_XT_TOY_PILE = 33337, + NPC_STEELBREAKER = 32867, + NPC_MOLGEIM = 32927, + NPC_BRUNDIR = 32857, + NPC_KOLOGARN = 32930, + NPC_FOCUSED_EYEBEAM = 33632, + NPC_FOCUSED_EYEBEAM_RIGHT = 33802, + NPC_LEFT_ARM = 32933, + NPC_RIGHT_ARM = 32934, + NPC_RUBBLE = 33768, + NPC_AURIAYA = 33515, + NPC_MIMIRON = 33350, + NPC_HODIR = 32845, + NPC_THORIM = 32865, + NPC_FREYA = 32906, + NPC_VEZAX = 33271, + NPC_YOGGSARON = 33288, + NPC_ALGALON = 32871, // Mimiron - NPC_LEVIATHAN_MKII = 33432, - NPC_VX_001 = 33651, - NPC_AERIAL_COMMAND_UNIT = 33670, + NPC_LEVIATHAN_MKII = 33432, + NPC_VX_001 = 33651, + NPC_AERIAL_COMMAND_UNIT = 33670, // Freya's Keepers - NPC_IRONBRANCH = 32913, - NPC_BRIGHTLEAF = 32915, - NPC_STONEBARK = 32914, + NPC_IRONBRANCH = 32913, + NPC_BRIGHTLEAF = 32915, + NPC_STONEBARK = 32914, // Hodir's Helper NPCs - NPC_TOR_GREYCLOUD = 32941, - NPC_KAR_GREYCLOUD = 33333, - NPC_EIVI_NIGHTFEATHER = 33325, - NPC_ELLIE_NIGHTFEATHER = 32901, - NPC_SPIRITWALKER_TARA = 33332, - NPC_SPIRITWALKER_YONA = 32950, - NPC_ELEMENTALIST_MAHFUUN = 33328, - NPC_ELEMENTALIST_AVUUN = 32900, - NPC_AMIRA_BLAZEWEAVER = 33331, - NPC_VEESHA_BLAZEWEAVER = 32946, - NPC_MISSY_FLAMECUFFS = 32893, - NPC_SISSY_FLAMECUFFS = 33327, - NPC_BATTLE_PRIEST_ELIZA = 32948, - NPC_BATTLE_PRIEST_GINA = 33330, - NPC_FIELD_MEDIC_PENNY = 32897, - NPC_FIELD_MEDIC_JESSI = 33326, + NPC_TOR_GREYCLOUD = 32941, + NPC_KAR_GREYCLOUD = 33333, + NPC_EIVI_NIGHTFEATHER = 33325, + NPC_ELLIE_NIGHTFEATHER = 32901, + NPC_SPIRITWALKER_TARA = 33332, + NPC_SPIRITWALKER_YONA = 32950, + NPC_ELEMENTALIST_MAHFUUN = 33328, + NPC_ELEMENTALIST_AVUUN = 32900, + NPC_AMIRA_BLAZEWEAVER = 33331, + NPC_VEESHA_BLAZEWEAVER = 32946, + NPC_MISSY_FLAMECUFFS = 32893, + NPC_SISSY_FLAMECUFFS = 33327, + NPC_BATTLE_PRIEST_ELIZA = 32948, + NPC_BATTLE_PRIEST_GINA = 33330, + NPC_FIELD_MEDIC_PENNY = 32897, + NPC_FIELD_MEDIC_JESSI = 33326, // Freya's trash NPCs - NPC_CORRUPTED_SERVITOR = 33354, - NPC_MISGUIDED_NYMPH = 33355, - NPC_GUARDIAN_LASHER = 33430, - NPC_FOREST_SWARMER = 33431, - NPC_MANGROVE_ENT = 33525, - NPC_IRONROOT_LASHER = 33526, - NPC_NATURES_BLADE = 33527, - NPC_GUARDIAN_OF_LIFE = 33528, + NPC_CORRUPTED_SERVITOR = 33354, + NPC_MISGUIDED_NYMPH = 33355, + NPC_GUARDIAN_LASHER = 33430, + NPC_FOREST_SWARMER = 33431, + NPC_MANGROVE_ENT = 33525, + NPC_IRONROOT_LASHER = 33526, + NPC_NATURES_BLADE = 33527, + NPC_GUARDIAN_OF_LIFE = 33528, + + // Algalon the Observer + NPC_BRANN_BRONZBEARD_ALG = 34064, + NPC_AZEROTH = 34246, + NPC_LIVING_CONSTELLATION = 33052, + NPC_ALGALON_STALKER = 33086, + NPC_COLLAPSING_STAR = 32955, + NPC_BLACK_HOLE = 32953, + NPC_WORM_HOLE = 34099, + NPC_ALGALON_VOID_ZONE_VISUAL_STALKER = 34100, + NPC_ALGALON_STALKER_ASTEROID_TARGET_01 = 33104, + NPC_ALGALON_STALKER_ASTEROID_TARGET_02 = 33105, + NPC_UNLEASHED_DARK_MATTER = 34097, }; enum UlduarGameObjects { - GO_KOLOGARN_CHEST_HERO = 195047, - GO_KOLOGARN_CHEST = 195046, - GO_KOLOGARN_BRIDGE = 194232, - GO_KOLOGARN_DOOR = 194553, - GO_THORIM_CHEST_HERO = 194315, - GO_THORIM_CHEST = 194314, - GO_HODIR_RARE_CACHE_OF_WINTER = 194200, - GO_HODIR_RARE_CACHE_OF_WINTER_HERO = 194201, - GO_HODIR_CHEST_HERO = 194308, - GO_HODIR_CHEST = 194307, - GO_LEVIATHAN_DOOR = 194905, - GO_LEVIATHAN_GATE = 194630, - GO_XT_002_DOOR = 194631, - GO_VEZAX_DOOR = 194750, - GO_MOLE_MACHINE = 194316, - GO_RAZOR_HARPOON_1 = 194542, - GO_RAZOR_HARPOON_2 = 194541, - GO_RAZOR_HARPOON_3 = 194543, - GO_RAZOR_HARPOON_4 = 194519, - GO_RAZOR_BROKEN_HARPOON = 194565, - GO_HODIR_DOOR = 194634, - GO_HODIR_ICE_DOOR = 194441, - GO_ARCHIVUM_DOOR = 194556, + GO_KOLOGARN_CHEST_HERO = 195047, + GO_KOLOGARN_CHEST = 195046, + GO_KOLOGARN_BRIDGE = 194232, + GO_KOLOGARN_DOOR = 194553, + GO_THORIM_CHEST_HERO = 194315, + GO_THORIM_CHEST = 194314, + GO_HODIR_RARE_CACHE_OF_WINTER = 194200, + GO_HODIR_RARE_CACHE_OF_WINTER_HERO = 194201, + GO_HODIR_CHEST_HERO = 194308, + GO_HODIR_CHEST = 194307, + GO_LEVIATHAN_DOOR = 194905, + GO_LEVIATHAN_GATE = 194630, + GO_XT_002_DOOR = 194631, + GO_VEZAX_DOOR = 194750, + GO_MOLE_MACHINE = 194316, + GO_RAZOR_HARPOON_1 = 194542, + GO_RAZOR_HARPOON_2 = 194541, + GO_RAZOR_HARPOON_3 = 194543, + GO_RAZOR_HARPOON_4 = 194519, + GO_RAZOR_BROKEN_HARPOON = 194565, + GO_HODIR_DOOR = 194634, + GO_HODIR_ICE_DOOR = 194441, + GO_ARCHIVUM_DOOR = 194556, + + // Algalon the Observer + GO_CELESTIAL_PLANETARIUM_ACCESS_10 = 194628, + GO_CELESTIAL_PLANETARIUM_ACCESS_25 = 194752, + GO_DOODAD_UL_SIGILDOOR_01 = 194767, + GO_DOODAD_UL_SIGILDOOR_02 = 194911, + GO_DOODAD_UL_SIGILDOOR_03 = 194910, + GO_DOODAD_UL_UNIVERSEFLOOR_01 = 194715, + GO_DOODAD_UL_UNIVERSEFLOOR_02 = 194716, + GO_DOODAD_UL_UNIVERSEGLOBE01 = 194148, + GO_DOODAD_UL_ULDUAR_TRAPDOOR_03 = 194253, + GO_GIFT_OF_THE_OBSERVER_10 = 194821, + GO_GIFT_OF_THE_OBSERVER_25 = 194822, }; enum LeviathanData @@ -161,6 +190,7 @@ enum UlduarAchievementCriteriaIds { CRITERIA_CON_SPEED_ATORY = 21597, CRITERIA_DISARMED = 21687, + CRITERIA_HERALD_OF_TITANS = 10678, }; enum UlduarData @@ -180,12 +210,38 @@ enum UlduarData // Hodir DATA_HODIR_RARE_CACHE, + + // Algalon the Observer + DATA_ALGALON_SUMMON_STATE, + DATA_SIGILDOOR_01, + DATA_SIGILDOOR_02, + DATA_SIGILDOOR_03, + DATA_UNIVERSE_FLOOR_01, + DATA_UNIVERSE_FLOOR_02, + DATA_UNIVERSE_GLOBE, + DATA_ALGALON_TRAPDOOR, + DATA_BRANN_BRONZEBEARD_ALG, +}; + +enum UlduarWorldStates +{ + WORLD_STATE_ALGALON_DESPAWN_TIMER = 4131, + WORLD_STATE_ALGALON_TIMER_ENABLED = 4132, }; enum UlduarAchievementData { // FL Achievement boolean DATA_UNBROKEN = 29052906, // 2905, 2906 are achievement IDs, + MAX_HERALD_ARMOR_ITEMLEVEL = 226, + MAX_HERALD_WEAPON_ITEMLEVEL = 232, +}; + +enum UlduarEvents +{ + EVENT_DESPAWN_ALGALON = 1, + EVENT_UPDATE_ALGALON_TIMER = 2, + ACTION_INIT_ALGALON = 6, }; template @@ -199,6 +255,17 @@ CreatureAI* GetUlduarAI(Creature* creature) return NULL; } +template +GameObjectAI* GetUlduarAI(GameObject* go) +{ + if (InstanceMap* instance = go->GetMap()->ToInstanceMap()) + if (instance->GetInstanceScript()) + if (instance->GetScriptId() == sObjectMgr->GetScriptId(UlduarScriptName)) + return new AI(go); + + return NULL; +} + class PlayerOrPetCheck { public: -- cgit v1.2.3 From 5b7e4b093b4b4fbc6943a09b459785a873cc1bea Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 20 Apr 2012 13:36:23 +0200 Subject: DB/Loot: Adjust the mechanic for Argent Crusade Trophy's to prevent issues after looting Closes #2993 --- .../2012_04_20_00_world_gameobject_loot_template.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql b/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..47a22d519d0 --- /dev/null +++ b/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql @@ -0,0 +1,15 @@ +SET @Ref := 12002; +DELETE FROM `reference_loot_template` WHERE `entry`=@Ref; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Ref,47242,100,1,0,1,1); +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (195668,195667,195666,195665,195672,195671,195670,195669) AND `item`=47242; +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (195668,195667,195666,195665,195672,195671,195670,195669) AND `mincountOrRef` = -@Ref; +INSERT INTO gameobject_loot_template (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(195665,5,100,1,0,-@Ref,4), -- 10 man,50 attempts +(195666,3,100,1,0,-@Ref,4), -- 10 man,45+ attempts +(195667,3,100,1,0,-@Ref,2), -- 10 man,25+ attempts +(195668,1,100,1,0,-@Ref,2), -- 10 man,0+ attempts +(195669,6,100,1,0,-@Ref,4), -- 25 man,50 attempts +(195670,4,100,1,0,-@Ref,4), -- 25 man,45+ attempts +(195671,4,100,1,0,-@Ref,2), -- 25 man,25+ attempts +(195672,2,100,1,0,-@Ref,2); -- 25 man,0+ attempts -- cgit v1.2.3 From b39b8e1fe435576a71e1477ed985260012062321 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 20 Apr 2012 14:43:07 +0200 Subject: DB/Loot: Add items to Cache of the Ley Guardian Closes #2691 --- sql/updates/world/2012_04_20_01_world_item_loot_template.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/2012_04_20_01_world_item_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_20_01_world_item_loot_template.sql b/sql/updates/world/2012_04_20_01_world_item_loot_template.sql new file mode 100644 index 00000000000..af52ade0b25 --- /dev/null +++ b/sql/updates/world/2012_04_20_01_world_item_loot_template.sql @@ -0,0 +1,10 @@ +SET @Bag := 52676; +DELETE FROM `item_loot_template` WHERE `entry`=@Bag; +INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Bag,36933,0,1,1,1,3),-- Forest Emerald +(@Bag,36918,0,1,1,1,3),-- Scarlet Ruby +(@Bag,36921,0,1,1,1,3),-- Autumn's Glow +(@Bag,36930,0,1,1,1,3),-- Monarch Topaz +(@Bag,36924,0,1,1,1,3),-- Sky Sapphire +(@Bag,36927,0,1,1,1,3),-- Twilight Opal +(@Bag,43953,5,1,0,1,1); -- Reins of the Blue Drake -- cgit v1.2.3 From d0fa53c087ea56e44fc1b9da498a27c20e45a385 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 20 Apr 2012 14:50:22 +0200 Subject: DB/Loot: Add Recipe Mighty Arcane Protection Potion to Cult Researcher and Frostbrood Spawn Closes #2385 --- sql/updates/world/2012_04_20_02_world_creature_loot_template.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_20_02_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql b/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..09b5beee75c --- /dev/null +++ b/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql @@ -0,0 +1,4 @@ +DELETE FROM `creature_loot_template` WHERE `entry` IN (31702,32297) AND `item`=44564; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(31702,44564,0.5,1,0,1,1), -- Recipe: Mighty Arcane Protection Potion on Frostbrood Spawn +(32297,44564,0.5,1,0,1,1); -- Recipe: Mighty Arcane Protection Potion on Cult Researcher -- cgit v1.2.3 From da9554b6a14a2e567eff943d924ad02c8cc4d01a Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 20 Apr 2012 20:06:24 +0200 Subject: DB/Loot: Add Formula: Enchant Gloves - Angler in some lootscheme's Closes #4602 --- sql/updates/world/2012_04_20_03_world_creature_loot_template.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_04_20_03_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql b/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql new file mode 100644 index 00000000000..a0b586ee0d9 --- /dev/null +++ b/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql @@ -0,0 +1,7 @@ +SET @ITEM := 50406; -- Formula: Enchant Gloves - Angler +UPDATE `creature_template` SET `lootid` = `entry` WHERE `entry` IN(26343,26344,26336); +DELETE FROM `creature_loot_template` WHERE `item`=@ITEM; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(26343, @ITEM, 1.1, 1, 0, 1, 1), -- Indu'Le Fisherman +(26336, @ITEM, 0.9, 1, 0, 1, 1), -- Indu'Le Mystic +(26344, @ITEM, 1, 1, 0, 1, 1); -- Indu'Le Warrior -- cgit v1.2.3 From b3f0c7fbcfdce2fb825269c368838a49e9f879df Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 20 Apr 2012 20:19:49 +0200 Subject: DB/Loot: increase dropchance for Grimescale Murloc Head Closes #4161 --- sql/updates/world/2012_04_20_04_world_creature_loot_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_04_20_04_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql b/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql new file mode 100644 index 00000000000..73e01efa23e --- /dev/null +++ b/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql @@ -0,0 +1,3 @@ +-- Make Grimscale Murlocs drop their heads faster... +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-66 WHERE `item`=21757; + -- cgit v1.2.3 From a16b07188f6e57eeb17d468638a127f6237666f4 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 20 Apr 2012 23:00:17 +0200 Subject: DB/Gameobject: Fix Horrible error from UP34 --- sql/updates/world/2012_04_20_05_gameobject_template.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2012_04_20_05_gameobject_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_20_05_gameobject_template.sql b/sql/updates/world/2012_04_20_05_gameobject_template.sql new file mode 100644 index 00000000000..6fdd2be9f2f --- /dev/null +++ b/sql/updates/world/2012_04_20_05_gameobject_template.sql @@ -0,0 +1,8 @@ +-- Restore horrible mistake in UP34 from myself +UPDATE `gameobject_template` SET `data1`=27512 WHERE `entry`=195669; +UPDATE `gameobject_template` SET `data1`=27517 WHERE `entry`=195670; +UPDATE `gameobject_template` SET `data1`=27518 WHERE `entry`=195671; +-- Fix loottemplates along with it +UPDATE `gameobject_loot_template` SET `entry`=27512 WHERE `entry`=195669 +UPDATE `gameobject_loot_template` SET `entry`=27517 WHERE `entry`=195670; +UPDATE `gameobject_loot_template` SET `entry`=27518 WHERE `entry`=195671; -- cgit v1.2.3 From fb787aee5e50c152f9e4031961ec1c34153f12e5 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Fri, 20 Apr 2012 23:17:31 +0200 Subject: Commit: Typofix, this thing just haunts me... --- sql/updates/world/2012_04_20_05_gameobject_template.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_20_05_gameobject_template.sql b/sql/updates/world/2012_04_20_05_gameobject_template.sql index 6fdd2be9f2f..24400b16a5c 100644 --- a/sql/updates/world/2012_04_20_05_gameobject_template.sql +++ b/sql/updates/world/2012_04_20_05_gameobject_template.sql @@ -3,6 +3,6 @@ UPDATE `gameobject_template` SET `data1`=27512 WHERE `entry`=195669; UPDATE `gameobject_template` SET `data1`=27517 WHERE `entry`=195670; UPDATE `gameobject_template` SET `data1`=27518 WHERE `entry`=195671; -- Fix loottemplates along with it -UPDATE `gameobject_loot_template` SET `entry`=27512 WHERE `entry`=195669 +UPDATE `gameobject_loot_template` SET `entry`=27512 WHERE `entry`=195669; UPDATE `gameobject_loot_template` SET `entry`=27517 WHERE `entry`=195670; UPDATE `gameobject_loot_template` SET `entry`=27518 WHERE `entry`=195671; -- cgit v1.2.3 From 408c78dcd7311588d7ceeb0f0e98d0831b500632 Mon Sep 17 00:00:00 2001 From: Vincent-Core Date: Sat, 7 Apr 2012 12:17:21 +0200 Subject: Core/Spells * Converted percent based damage dealing spell effects to scripts * Fix Leviroth Self-Impale damage Closes #6085 Signed-off-by: Shauren --- .../2012_04_21_00_world_spell_script_names.sql | 14 ++++++++ src/server/game/Spells/SpellEffects.cpp | 17 --------- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 31 ----------------- .../scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp | 8 ++++- src/server/scripts/Spells/spell_generic.cpp | 40 ++++++++++++++++++++++ 5 files changed, 61 insertions(+), 49 deletions(-) create mode 100644 sql/updates/world/2012_04_21_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_21_00_world_spell_script_names.sql b/sql/updates/world/2012_04_21_00_world_spell_script_names.sql new file mode 100644 index 00000000000..e61ef4aec74 --- /dev/null +++ b/sql/updates/world/2012_04_21_00_world_spell_script_names.sql @@ -0,0 +1,14 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (20625,29142,35139,42393,49882,55269,56578,38441,66316,67100,67101,67102); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(20625,'spell_gen_default_count_pct_from_max_hp'), -- Ritual of Doom Sacrifice +(29142,'spell_gen_default_count_pct_from_max_hp'), -- Eyesore Blaster +(35139,'spell_gen_default_count_pct_from_max_hp'), -- Throw Boom's Doom +(42393,'spell_gen_default_count_pct_from_max_hp'), -- Brewfest - Attack Keg +(49882,'spell_gen_default_count_pct_from_max_hp'), -- Leviroth Self-Impale +(55269,'spell_gen_default_count_pct_from_max_hp'), -- Deathly Stare +(56578,'spell_gen_default_count_pct_from_max_hp'), -- Rapid-Fire Harpoon +(38441,'spell_gen_50pct_count_pct_from_max_hp'), -- Cataclysmic Bolt +(66316,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 10m +(67100,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 25m +(67101,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 10m heroic +(67102,'spell_gen_50pct_count_pct_from_max_hp'); -- Spinning Pain Spike 25m heroic diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 371d4cdc5e0..c72ccbacc3d 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -390,23 +390,6 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) if (!unitTarget->HasAura(27825)) return; break; - // Cataclysmic Bolt - case 38441: - { - damage = unitTarget->CountPctFromMaxHealth(50); - break; - } - case 20625: // Ritual of Doom Sacrifice - case 29142: // Eyesore Blaster - case 35139: // Throw Boom's Doom - case 42393: // Brewfest - Attack Keg - case 55269: // Deathly Stare - case 56578: // Rapid-Fire Harpoon - case 62775: // Tympanic Tantrum - { - damage = unitTarget->CountPctFromMaxHealth(damage); - break; - } // Gargoyle Strike case 51963: { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 6f817a6d0eb..a7328b43826 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -515,36 +515,6 @@ public: }; -class spell_spinning_pain_spike : public SpellScriptLoader -{ - public: - spell_spinning_pain_spike() : SpellScriptLoader("spell_spinning_pain_spike") {} - - class spell_spinning_pain_spike_SpellScript : public SpellScript - { - PrepareSpellScript(spell_spinning_pain_spike_SpellScript); - - void HandleScript(SpellEffIndex /*eff*/) - { - Unit* target = GetHitUnit(); - if (!target) - return; - - if (target->isAlive()) - SetHitDamage(target->CountPctFromMaxHealth(50)); - } - void Register() - { - OnEffectHitTarget += SpellEffectFn(spell_spinning_pain_spike_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - } - }; - - SpellScript* GetSpellScript() const - { - return new spell_spinning_pain_spike_SpellScript(); - } -}; - void AddSC_boss_jaraxxus() { new boss_jaraxxus(); @@ -553,5 +523,4 @@ void AddSC_boss_jaraxxus() new mob_fel_infernal(); new mob_nether_portal(); new mob_mistress_of_pain(); - new spell_spinning_pain_spike(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 727f40aef81..c7091b42c5a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -947,13 +947,19 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader void FilterTargets(std::list& unitList) { - unitList.remove_if (PlayerOrPetCheck()); + unitList.remove_if(PlayerOrPetCheck()); + } + + void RecalculateDamage() + { + SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(GetHitDamage())); } void Register() { OnUnitTargetSelect += SpellUnitTargetFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnUnitTargetSelect += SpellUnitTargetFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnHit += SpellHitFn(spell_xt002_tympanic_tantrum_SpellScript::RecalculateDamage); } }; diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 035f9ec98b2..2d431331691 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2618,6 +2618,44 @@ class spell_gen_wg_water : public SpellScriptLoader } }; +class spell_gen_count_pct_from_max_hp : public SpellScriptLoader +{ + public: + spell_gen_count_pct_from_max_hp(char const* name, int32 damagePct = 0) : SpellScriptLoader(name), _damagePct(damagePct) { } + + class spell_gen_count_pct_from_max_hp_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_count_pct_from_max_hp_SpellScript) + + public: + spell_gen_count_pct_from_max_hp_SpellScript(int32 damagePct) : SpellScript(), _damagePct(damagePct) { } + + void RecalculateDamage() + { + if (!_damagePct) + _damagePct = GetHitDamage(); + + SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(_damagePct)); + } + + void Register() + { + OnHit += SpellHitFn(spell_gen_count_pct_from_max_hp_SpellScript::RecalculateDamage); + } + + private: + int32 _damagePct; + }; + + SpellScript* GetSpellScript() const + { + return new spell_gen_count_pct_from_max_hp_SpellScript(_damagePct); + } + + private: + int32 _damagePct; +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -2669,4 +2707,6 @@ void AddSC_generic_spell_scripts() new spell_gen_chaos_blast(); new spell_gen_ds_flush_knockback(); new spell_gen_wg_water(); + new spell_gen_count_pct_from_max_hp("spell_gen_default_count_pct_from_max_hp"); + new spell_gen_count_pct_from_max_hp("spell_gen_50pct_count_pct_from_max_hp", 50); } -- cgit v1.2.3 From 98f9472715e782119807ebdf3193d3d626c87925 Mon Sep 17 00:00:00 2001 From: Xanvial Date: Sun, 22 Apr 2012 08:40:22 +0700 Subject: Convert script of npc tabard vendor to SAI and add missing tabard recovery --- sql/updates/world/2012_04_22_00_world_sai.sql | 72 +++++++++++ src/server/scripts/World/npcs_special.cpp | 167 -------------------------- 2 files changed, 72 insertions(+), 167 deletions(-) create mode 100644 sql/updates/world/2012_04_22_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_22_00_world_sai.sql b/sql/updates/world/2012_04_22_00_world_sai.sql new file mode 100644 index 00000000000..0a84b09c087 --- /dev/null +++ b/sql/updates/world/2012_04_22_00_world_sai.sql @@ -0,0 +1,72 @@ +-- SAI for Tabard Vendor Elizabeth Ross +SET @ROSS := 28776; +SET @GOSSIP := 9832; + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ROSS; + +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id`>0 AND `id`<11; +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 +(@GOSSIP, 1, 0, 'I''ve lost my Blood Knight Tabard.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 2, 0, 'I''ve lost my Tabard of the Hand.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 3, 0, 'I''ve lost my Tabard of the Protector.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 4, 0, 'I''ve lost my Green Trophy Tabard of the Illidari.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 5, 0, 'I''ve lost my Purple Trophy Tabard of the Illidari.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 6, 0, 'I''ve lost my Tabard of Summer Skies.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 7, 0, 'I''ve lost my Tabard of Summer Flames.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 8, 0, 'I''ve lost my Loremaster''s Colors.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 9, 0, 'I''ve lost my Tabard of the Explorer.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 10, 0, 'I''ve lost my Tabard of the Achiever.', 1, 1, 0, 0, 0, 0, ''); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ROSS 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 +(@ROSS, 0, 0, 0, 62, 0, 100, 0, @GOSSIP, 1, 0, 0, 11, 54974, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Blood Knight Tabard'), +(@ROSS, 0, 1, 0, 62, 0, 100, 0, @GOSSIP, 1, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 2, 0, 62, 0, 100, 0, @GOSSIP, 2, 0, 0, 11, 54976, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Hand'), +(@ROSS, 0, 3, 0, 62, 0, 100, 0, @GOSSIP, 2, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 4, 0, 62, 0, 100, 0, @GOSSIP, 3, 0, 0, 11, 55008, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Protector'), +(@ROSS, 0, 5, 0, 62, 0, 100, 0, @GOSSIP, 3, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 6, 0, 62, 0, 100, 0, @GOSSIP, 4, 0, 0, 11, 54977, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Green Trophy Tabard of the Illidari'), +(@ROSS, 0, 7, 0, 62, 0, 100, 0, @GOSSIP, 4, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 8, 0, 62, 0, 100, 0, @GOSSIP, 5, 0, 0, 11, 54982, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Purple Trophy Tabard of the Illidari'), +(@ROSS, 0, 9, 0, 62, 0, 100, 0, @GOSSIP, 5, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 10, 0, 62, 0, 100, 0, @GOSSIP, 6, 0, 0, 11, 62768, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Skies'), +(@ROSS, 0, 11, 0, 62, 0, 100, 0, @GOSSIP, 6, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 12, 0, 62, 0, 100, 0, @GOSSIP, 7, 0, 0, 11, 62769, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Flames'), +(@ROSS, 0, 13, 0, 62, 0, 100, 0, @GOSSIP, 7, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 14, 0, 62, 0, 100, 0, @GOSSIP, 8, 0, 0, 11, 58194, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Loremaster''s Colors'), +(@ROSS, 0, 15, 0, 62, 0, 100, 0, @GOSSIP, 8, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 16, 0, 62, 0, 100, 0, @GOSSIP, 9, 0, 0, 11, 58224, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Explorer'), +(@ROSS, 0, 17, 0, 62, 0, 100, 0, @GOSSIP, 9, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), +(@ROSS, 0, 18, 0, 62, 0, 100, 0, @GOSSIP, 10, 0, 0, 11, 55006, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Achiever'), +(@ROSS, 0, 19, 0, 62, 0, 100, 0, @GOSSIP, 10, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,@GOSSIP,1,0,2,25549,1,1,1,0,'','Only show gossip if player doesn''t have Blood Knight Tabard'), +(15,@GOSSIP,1,0,8,9737,0,0,0,0,'','Only show gossip if player already finished quest True Masters of Light'), +(15,@GOSSIP,2,0,2,24344,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Hand'), +(15,@GOSSIP,2,0,8,9762,0,0,0,0,'','Only show gossip if player already finished quest The Unwritten Prophecy'), +(15,@GOSSIP,3,0,2,28788,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the protector'), +(15,@GOSSIP,3,0,8,10259,0,0,0,0,'','Only show gossip if player already finished quest Into the Breach'), +(15,@GOSSIP,4,0,2,31404,1,1,1,0,'','Only show gossip if player doesn''t have Green Trophy Tabard of Illidari'), +(15,@GOSSIP,4,0,2,31405,1,1,1,0,'','Only show gossip if player doesn''t have Purple Trophy Tabard of Illidari'), +(15,@GOSSIP,4,0,2,31408,1,1,1,0,'','Only show gossip if player doesn''t have Offering of the Sha''tar'), +(15,@GOSSIP,4,0,8,10781,0,0,0,0,'','Only show gossip if player already finished quest Battle of the Crimson Watch'), +(15,@GOSSIP,5,0,2,31404,1,1,1,0,'','Only show gossip if player doesn''t have Green Trophy Tabard of Illidari'), +(15,@GOSSIP,5,0,2,31405,1,1,1,0,'','Only show gossip if player doesn''t have Purple Trophy Tabard of Illidari'), +(15,@GOSSIP,5,0,2,31408,1,1,1,0,'','Only show gossip if player doesn''t have Offering of the Sha''tar'), +(15,@GOSSIP,5,0,8,10781,0,0,0,0,'','Only show gossip if player already finished quest Battle of the Crimson Watch'), +(15,@GOSSIP,6,0,2,35279,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Skies'), +(15,@GOSSIP,6,0,2,35280,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Flames'), +(15,@GOSSIP,6,0,8,11972,0,0,0,0,'','Only show gossip if player already finished quest Shards of Ahune'), +(15,@GOSSIP,7,0,2,35279,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Skies'), +(15,@GOSSIP,7,0,2,35280,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Flames'), +(15,@GOSSIP,7,0,8,11972,0,0,0,0,'','Only show gossip if player already finished quest Shards of Ahune'), +(15,@GOSSIP,8,0,2,43300,1,1,1,0,'','Only show gossip if player doesn''t have Loremaster''s Colors'), +(15,@GOSSIP,8,0,17,1681,0,0,0,0,'','Only show gossip if player have achievement Loremaster (A)'), +(15,@GOSSIP,8,1,2,43300,1,1,1,0,'','Only show gossip if player doesn''t have Loremaster''s Colors'), +(15,@GOSSIP,8,1,17,1682,0,0,0,0,'','Only show gossip if player have achievement Loremaster (H)'), +(15,@GOSSIP,9,0,2,43348,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Explorer'), +(15,@GOSSIP,9,0,17,45,0,0,0,0,'','Only show gossip if player have achievement Explore Northrend'), +(15,@GOSSIP,10,0,2,40643,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Explorer'), +(15,@GOSSIP,10,0,17,1021,0,0,0,0,'','Only show gossip if player have achievement Twenty-Five Tabards'); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 61b997bba35..e1cfd077444 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2529,172 +2529,6 @@ public: } }; -/*###### -## npc_tabard_vendor -######*/ - -enum -{ - QUEST_TRUE_MASTERS_OF_LIGHT = 9737, - QUEST_THE_UNWRITTEN_PROPHECY = 9762, - QUEST_INTO_THE_BREACH = 10259, - QUEST_BATTLE_OF_THE_CRIMSON_WATCH = 10781, - QUEST_SHARDS_OF_AHUNE = 11972, - - ACHIEVEMENT_EXPLORE_NORTHREND = 45, - ACHIEVEMENT_TWENTYFIVE_TABARDS = 1021, - ACHIEVEMENT_THE_LOREMASTER_A = 1681, - ACHIEVEMENT_THE_LOREMASTER_H = 1682, - - ITEM_TABARD_OF_THE_HAND = 24344, - ITEM_TABARD_OF_THE_BLOOD_KNIGHT = 25549, - ITEM_TABARD_OF_THE_PROTECTOR = 28788, - ITEM_OFFERING_OF_THE_SHATAR = 31408, - ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI = 31404, - ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI = 31405, - ITEM_TABARD_OF_THE_SUMMER_SKIES = 35279, - ITEM_TABARD_OF_THE_SUMMER_FLAMES = 35280, - ITEM_TABARD_OF_THE_ACHIEVER = 40643, - ITEM_LOREMASTERS_COLORS = 43300, - ITEM_TABARD_OF_THE_EXPLORER = 43348, - - SPELL_TABARD_OF_THE_BLOOD_KNIGHT = 54974, - SPELL_TABARD_OF_THE_HAND = 54976, - SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI = 54977, - SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI = 54982, - SPELL_TABARD_OF_THE_ACHIEVER = 55006, - SPELL_TABARD_OF_THE_PROTECTOR = 55008, - SPELL_LOREMASTERS_COLORS = 58194, - SPELL_TABARD_OF_THE_EXPLORER = 58224, - SPELL_TABARD_OF_SUMMER_SKIES = 62768, - SPELL_TABARD_OF_SUMMER_FLAMES = 62769 -}; - -#define GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT "I've lost my Tabard of Blood Knight." -#define GOSSIP_LOST_TABARD_OF_THE_HAND "I've lost my Tabard of the Hand." -#define GOSSIP_LOST_TABARD_OF_THE_PROTECTOR "I've lost my Tabard of the Protector." -#define GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI "I've lost my Green Trophy Tabard of the Illidari." -#define GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI "I've lost my Purple Trophy Tabard of the Illidari." -#define GOSSIP_LOST_TABARD_OF_SUMMER_SKIES "I've lost my Tabard of Summer Skies." -#define GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES "I've lost my Tabard of Summer Flames." -#define GOSSIP_LOST_LOREMASTERS_COLORS "I've lost my Loremaster's Colors." -#define GOSSIP_LOST_TABARD_OF_THE_EXPLORER "I've lost my Tabard of the Explorer." -#define GOSSIP_LOST_TABARD_OF_THE_ACHIEVER "I've lost my Tabard of the Achiever." - -class npc_tabard_vendor : public CreatureScript -{ -public: - npc_tabard_vendor() : CreatureScript("npc_tabard_vendor") { } - - bool OnGossipHello(Player* player, Creature* creature) - { - bool lostBloodKnight = false; - bool lostHand = false; - bool lostProtector = false; - bool lostIllidari = false; - bool lostSummer = false; - - //Tabard of the Blood Knight - if (player->GetQuestRewardStatus(QUEST_TRUE_MASTERS_OF_LIGHT) && !player->HasItemCount(ITEM_TABARD_OF_THE_BLOOD_KNIGHT, 1, true)) - lostBloodKnight = true; - - //Tabard of the Hand - if (player->GetQuestRewardStatus(QUEST_THE_UNWRITTEN_PROPHECY) && !player->HasItemCount(ITEM_TABARD_OF_THE_HAND, 1, true)) - lostHand = true; - - //Tabard of the Protector - if (player->GetQuestRewardStatus(QUEST_INTO_THE_BREACH) && !player->HasItemCount(ITEM_TABARD_OF_THE_PROTECTOR, 1, true)) - lostProtector = true; - - //Green Trophy Tabard of the Illidari - //Purple Trophy Tabard of the Illidari - if (player->GetQuestRewardStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) && - (!player->HasItemCount(ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) && - !player->HasItemCount(ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) && - !player->HasItemCount(ITEM_OFFERING_OF_THE_SHATAR, 1, true))) - lostIllidari = true; - - //Tabard of Summer Skies - //Tabard of Summer Flames - if (player->GetQuestRewardStatus(QUEST_SHARDS_OF_AHUNE) && - !player->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_SKIES, 1, true) && - !player->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_FLAMES, 1, true)) - lostSummer = true; - - if (lostBloodKnight || lostHand || lostProtector || lostIllidari || lostSummer) - { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - - if (lostBloodKnight) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - - if (lostHand) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_HAND, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - - if (lostProtector) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_PROTECTOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - - if (lostIllidari) - { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - } - - if (lostSummer) - { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_SKIES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - } - - player->SEND_GOSSIP_MENU(13583, creature->GetGUID()); - } - else - player->GetSession()->SendListInventory(creature->GetGUID()); - - return true; - } - - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) - { - player->PlayerTalkClass->ClearMenus(); - switch (action) - { - case GOSSIP_ACTION_TRADE: - player->GetSession()->SendListInventory(creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF + 1: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_TABARD_OF_THE_BLOOD_KNIGHT, false); - break; - case GOSSIP_ACTION_INFO_DEF + 2: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_TABARD_OF_THE_HAND, false); - break; - case GOSSIP_ACTION_INFO_DEF + 3: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_TABARD_OF_THE_PROTECTOR, false); - break; - case GOSSIP_ACTION_INFO_DEF + 4: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, false); - break; - case GOSSIP_ACTION_INFO_DEF + 5: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, false); - break; - case GOSSIP_ACTION_INFO_DEF + 6: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_TABARD_OF_SUMMER_SKIES, false); - break; - case GOSSIP_ACTION_INFO_DEF + 7: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_TABARD_OF_SUMMER_FLAMES, false); - break; - } - return true; - } -}; - /*###### ## npc_experience ######*/ @@ -3158,7 +2992,6 @@ void AddSC_npcs_special() new npc_wormhole(); new npc_pet_trainer(); new npc_locksmith(); - new npc_tabard_vendor(); new npc_experience(); new npc_fire_elemental(); new npc_earth_elemental(); -- cgit v1.2.3 From 8cf7d9185725b14b31f35c73f167a665edce543f Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Sun, 22 Apr 2012 13:58:22 +0300 Subject: Core/DB: Quest The Emissary. Fix condition in item spell(usable only when npc is above 95% hp). Added correct faction,unit_flags and emote to Leviroth. --- sql/updates/world/2012_04_05_00_world_creature_misc.sql | 5 +++++ src/server/scripts/Spells/spell_item.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_04_05_00_world_creature_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_05_00_world_creature_misc.sql b/sql/updates/world/2012_04_05_00_world_creature_misc.sql new file mode 100644 index 00000000000..ae35b3fba5d --- /dev/null +++ b/sql/updates/world/2012_04_05_00_world_creature_misc.sql @@ -0,0 +1,5 @@ +UPDATE `creature_template` SET `faction_A`=1914,`faction_H`=1914,`unit_flags`=33024 WHERE `entry`=26452; + +DELETE FROM `creature_template_addon` WHERE `entry`=26452; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(26452,0,0,0,1,383,''); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 666477e68e7..80520f44c3e 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1535,7 +1535,7 @@ class spell_item_impale_leviroth : public SpellScriptLoader void HandleDummy(SpellEffIndex /* effIndex */) { if (Unit* target = GetHitCreature()) - if (target->GetEntry() == NPC_LEVIROTH && target->HealthBelowPct(95)) + if (target->GetEntry() == NPC_LEVIROTH && !target->HealthBelowPct(95)) target->CastSpell(target, SPELL_LEVIROTH_SELF_IMPALE, true); } -- cgit v1.2.3 From 8d5660a0bf8b64c2578f5bcbb3ba34fb76fceab4 Mon Sep 17 00:00:00 2001 From: Xanvial Date: Sun, 22 Apr 2012 19:02:20 +0700 Subject: Use SMART_EVENT_LINK to close gossip --- sql/updates/world/2012_04_22_00_world_sai.sql | 31 ++++++++++----------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_22_00_world_sai.sql b/sql/updates/world/2012_04_22_00_world_sai.sql index 0a84b09c087..f223883c8a7 100644 --- a/sql/updates/world/2012_04_22_00_world_sai.sql +++ b/sql/updates/world/2012_04_22_00_world_sai.sql @@ -19,26 +19,17 @@ INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, DELETE FROM `smart_scripts` WHERE `entryorguid`=@ROSS 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 -(@ROSS, 0, 0, 0, 62, 0, 100, 0, @GOSSIP, 1, 0, 0, 11, 54974, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Blood Knight Tabard'), -(@ROSS, 0, 1, 0, 62, 0, 100, 0, @GOSSIP, 1, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 2, 0, 62, 0, 100, 0, @GOSSIP, 2, 0, 0, 11, 54976, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Hand'), -(@ROSS, 0, 3, 0, 62, 0, 100, 0, @GOSSIP, 2, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 4, 0, 62, 0, 100, 0, @GOSSIP, 3, 0, 0, 11, 55008, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Protector'), -(@ROSS, 0, 5, 0, 62, 0, 100, 0, @GOSSIP, 3, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 6, 0, 62, 0, 100, 0, @GOSSIP, 4, 0, 0, 11, 54977, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Green Trophy Tabard of the Illidari'), -(@ROSS, 0, 7, 0, 62, 0, 100, 0, @GOSSIP, 4, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 8, 0, 62, 0, 100, 0, @GOSSIP, 5, 0, 0, 11, 54982, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Purple Trophy Tabard of the Illidari'), -(@ROSS, 0, 9, 0, 62, 0, 100, 0, @GOSSIP, 5, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 10, 0, 62, 0, 100, 0, @GOSSIP, 6, 0, 0, 11, 62768, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Skies'), -(@ROSS, 0, 11, 0, 62, 0, 100, 0, @GOSSIP, 6, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 12, 0, 62, 0, 100, 0, @GOSSIP, 7, 0, 0, 11, 62769, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Flames'), -(@ROSS, 0, 13, 0, 62, 0, 100, 0, @GOSSIP, 7, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 14, 0, 62, 0, 100, 0, @GOSSIP, 8, 0, 0, 11, 58194, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Loremaster''s Colors'), -(@ROSS, 0, 15, 0, 62, 0, 100, 0, @GOSSIP, 8, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 16, 0, 62, 0, 100, 0, @GOSSIP, 9, 0, 0, 11, 58224, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Explorer'), -(@ROSS, 0, 17, 0, 62, 0, 100, 0, @GOSSIP, 9, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'), -(@ROSS, 0, 18, 0, 62, 0, 100, 0, @GOSSIP, 10, 0, 0, 11, 55006, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Achiever'), -(@ROSS, 0, 19, 0, 62, 0, 100, 0, @GOSSIP, 10, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'); +(@ROSS, 0, 0, 10, 62, 0, 100, 0, @GOSSIP, 1, 0, 0, 11, 54974, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Blood Knight Tabard'), +(@ROSS, 0, 1, 10, 62, 0, 100, 0, @GOSSIP, 2, 0, 0, 11, 54976, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Hand'), +(@ROSS, 0, 2, 10, 62, 0, 100, 0, @GOSSIP, 3, 0, 0, 11, 55008, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Protector'), +(@ROSS, 0, 3, 10, 62, 0, 100, 0, @GOSSIP, 4, 0, 0, 11, 54977, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Green Trophy Tabard of the Illidari'), +(@ROSS, 0, 4, 10, 62, 0, 100, 0, @GOSSIP, 5, 0, 0, 11, 54982, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Purple Trophy Tabard of the Illidari'), +(@ROSS, 0, 5, 10, 62, 0, 100, 0, @GOSSIP, 6, 0, 0, 11, 62768, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Skies'), +(@ROSS, 0, 6, 10, 62, 0, 100, 0, @GOSSIP, 7, 0, 0, 11, 62769, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Flames'), +(@ROSS, 0, 7, 10, 62, 0, 100, 0, @GOSSIP, 8, 0, 0, 11, 58194, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Loremaster''s Colors'), +(@ROSS, 0, 8, 10, 62, 0, 100, 0, @GOSSIP, 9, 0, 0, 11, 58224, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Explorer'), +(@ROSS, 0, 9, 10, 62, 0, 100, 0, @GOSSIP, 10, 0, 0, 11, 55006, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Achiever'), +(@ROSS, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'); DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -- cgit v1.2.3 From ccda7c8a408e6800a161162fa5c4014265a1125e Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 22 Apr 2012 20:29:47 +0200 Subject: Core/Shaman: Fix Earthen Power --- .../2012_04_22_01_world_spell_script_names.sql | 3 ++ src/server/scripts/Spells/spell_shaman.cpp | 56 ++++++++++++++++++---- 2 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 sql/updates/world/2012_04_22_01_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_22_01_world_spell_script_names.sql b/sql/updates/world/2012_04_22_01_world_spell_script_names.sql new file mode 100644 index 00000000000..bd4becdc3f4 --- /dev/null +++ b/sql/updates/world/2012_04_22_01_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=59566; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(59566,'spell_sha_earthen_power'); diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 84e3bd8d604..f16f663ae2d 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -215,13 +215,12 @@ class spell_sha_earthbind_totem : public SpellScriptLoader void HandleEffectPeriodic(AuraEffect const* aurEff) { - if (Unit* target = GetTarget()) - if (Unit* caster = aurEff->GetBase()->GetCaster()) - if (TempSummon* summon = caster->ToTempSummon()) - if (Unit* owner = summon->GetOwner()) - if (AuraEffect* aur = owner->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 2289, 0)) - if (roll_chance_i(aur->GetBaseAmount()) && target->HasAuraWithMechanic(1 << MECHANIC_SNARE)) - caster->CastSpell(caster, SHAMAN_TOTEM_SPELL_EARTHEN_POWER, true, NULL, aurEff); + if (!GetCaster()) + return; + if (Player* owner = GetCaster()->GetCharmerOrOwnerPlayerOrPlayerItself()) + if (AuraEffect* aur = owner->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 2289, 0)) + if (roll_chance_i(aur->GetBaseAmount())) + GetTarget()->CastSpell((Unit*)NULL, SHAMAN_TOTEM_SPELL_EARTHEN_POWER, true); } void Apply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -252,6 +251,46 @@ class spell_sha_earthbind_totem : public SpellScriptLoader } }; +class EarthenPowerTargetSelector +{ + public: + EarthenPowerTargetSelector() { } + + bool operator() (Unit* target) + { + if (!target->HasAuraWithMechanic(1 << MECHANIC_SNARE)) + return true; + + return false; + } +}; + +class spell_sha_earthen_power : public SpellScriptLoader +{ + public: + spell_sha_earthen_power() : SpellScriptLoader("spell_sha_earthen_power") { } + + class spell_sha_earthen_power_SpellScript : public SpellScript + { + PrepareSpellScript(spell_sha_earthen_power_SpellScript); + + void FilterTargets(std::list& unitList) + { + unitList.remove_if(EarthenPowerTargetSelector()); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_sha_earthen_power_SpellScript(); + } +}; + class spell_sha_bloodlust : public SpellScriptLoader { public: @@ -270,7 +309,7 @@ class spell_sha_bloodlust : public SpellScriptLoader void RemoveInvalidTargets(std::list& targets) { - targets.remove_if (Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); + targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); } void ApplyDebuff() @@ -617,6 +656,7 @@ void AddSC_shaman_spell_scripts() new spell_sha_fire_nova(); new spell_sha_mana_tide_totem(); new spell_sha_earthbind_totem(); + new spell_sha_earthen_power(); new spell_sha_bloodlust(); new spell_sha_heroism(); new spell_sha_ancestral_awakening_proc(); -- cgit v1.2.3 From a9ad4099ec99d2ba3eefc2ff393b3d32d0fcaccb Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 23 Apr 2012 18:10:18 +0200 Subject: Scripts/Icecrown Citadel * Sister Svalna will now fly and land properly * Fixed visuals in Blood Prince Council fight * Flying triggers will now fly properly --- .../world/2012_04_23_00_world_creatures.sql | 12 ++++ .../IcecrownCitadel/boss_blood_prince_council.cpp | 65 +++++++--------------- .../IcecrownCitadel/boss_professor_putricide.cpp | 2 +- .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 2 + .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 14 +++-- 5 files changed, 44 insertions(+), 51 deletions(-) create mode 100644 sql/updates/world/2012_04_23_00_world_creatures.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_00_world_creatures.sql b/sql/updates/world/2012_04_23_00_world_creatures.sql new file mode 100644 index 00000000000..3730fabf552 --- /dev/null +++ b/sql/updates/world/2012_04_23_00_world_creatures.sql @@ -0,0 +1,12 @@ +UPDATE `creature_template` SET `flags_extra`=0x82,`ModelId1`=1126,`ModelId2`=16925 WHERE `entry` IN (38008,38641,38773,38774); -- Blood Orb Controller +UPDATE `creature_template` SET `flags_extra`=0x80,`ModelId1`=19725,`ModelId2`=31095,`baseattacktime`=2000,`speed_walk`=0.8,`speed_run`=0.28571 WHERE `entry` IN (38454,38775,38776,38777); -- Kinetic Bomb +UPDATE `creature_template` SET `exp`=2,`baseattacktime`=2000,`ModelId1`=19725,`ModelId2`=21342 WHERE `entry`=38458; -- Kinetic Bomb Target +UPDATE `creature_template` SET `baseattacktime`=2000,`speed_walk`=4.4,`ModelId1`=19725,`ModelId2`=26767 WHERE `entry` IN (38332,38451); -- Ball of Flame +UPDATE `creature_template` SET `flags_extra`=0x80 WHERE `entry`=37950; -- Valithria Dreamwalker +UPDATE `creature_template` SET `InhabitType`=4 WHERE `InhabitType`&4 AND `flags_extra`&0x80; -- make flying triggers fly +UPDATE `creature_template` SET `InhabitType`=4,`HoverHeight`=12 WHERE `entry`=37126; -- Sister Svalna +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=37950; -- Valithria Dreamwalker +UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=0,`gender`=0 WHERE `modelid`=31095; -- Kinetic Bomb +UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=0 WHERE `modelid`=21342; -- Kinetic Bomb Target +UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=0 WHERE `modelid`=26767; -- Ball of Flame +UPDATE `creature_template_addon` SET `bytes1`=50331648,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=38454; -- Kinetic Bomb diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index de104a78e43..8090fc98101 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -103,6 +103,7 @@ enum Spells SPELL_UNSTABLE = 72059, SPELL_KINETIC_BOMB_VISUAL = 72054, SPELL_KINETIC_BOMB_EXPLOSION = 72052, + SPELL_KINETIC_BOMB_KNOCKBACK = 72087, // Shock Vortex SPELL_SHOCK_VORTEX_PERIODIC = 71945, @@ -443,20 +444,12 @@ class boss_prince_keleseth_icc : public CreatureScript { summons.Summon(summon); Position pos; - pos.Relocate(summon); + me->GetPosition(&pos); float maxRange = me->GetDistance2d(summon); float angle = me->GetAngle(summon); - // prevent spawning outside of room - while (!me->IsWithinLOS(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ())) - { - maxRange -= 5.0f; - if (maxRange < 5.0f) - break; - - summon->MovePosition(pos, float(rand_norm() * maxRange), angle); - } - + me->MovePositionToFirstCollision(pos, maxRange, angle); summon->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()); + summon->ToTempSummon()->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); } void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) @@ -894,6 +887,7 @@ class boss_prince_valanar_icc : public CreatureScript summon->GetPosition(x, y, z); float ground_Z = summon->GetMap()->GetHeight(summon->GetPhaseMask(), x, y, z, true, 500.0f); summon->GetMotionMaster()->MovePoint(POINT_KINETIC_BOMB_IMPACT, x, y, ground_Z); + summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); break; } case NPC_SHOCK_VORTEX: @@ -1073,7 +1067,7 @@ class npc_blood_queen_lana_thel : public CreatureScript if (_introDone) return; - if (!me->IsWithinDistInMap(who, 35.0f)) + if (!me->IsWithinDistInMap(who, 35.0f, false)) return; _introDone = true; @@ -1232,12 +1226,12 @@ class npc_kinetic_bomb : public CreatureScript void Reset() { _events.Reset(); - me->SetDisplayId(DISPLAY_KINETIC_BOMB); + me->SetWalk(true); me->CastSpell(me, SPELL_UNSTABLE, true); me->CastSpell(me, SPELL_KINETIC_BOMB_VISUAL, true); me->SetReactState(REACT_PASSIVE); - me->SetSpeed(MOVE_FLIGHT, IsHeroic() ? 0.3f : 0.15f, true); me->GetPosition(_x, _y, _groundZ); + me->DespawnOrUnsummon(60000); _groundZ = me->GetMap()->GetHeight(me->GetPhaseMask(), _x, _y, _groundZ, true, 500.0f); } @@ -1247,9 +1241,9 @@ class npc_kinetic_bomb : public CreatureScript _events.ScheduleEvent(EVENT_BOMB_DESPAWN, 1000); else if (action == ACTION_KINETIC_BOMB_JUMP) { - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveJump(_x, _y, me->GetPositionZ() + 7.0f, 1.0f, 7.0f); - _events.ScheduleEvent(EVENT_CONTINUE_FALLING, 700); + if (!me->HasAura(SPELL_KINETIC_BOMB_KNOCKBACK)) + me->GetMotionMaster()->MoveCharge(_x, _y, me->GetPositionZ() + 100.0f, me->GetSpeed(MOVE_RUN), 0); + _events.RescheduleEvent(EVENT_CONTINUE_FALLING, 3000); } } @@ -1263,10 +1257,10 @@ class npc_kinetic_bomb : public CreatureScript { case EVENT_BOMB_DESPAWN: me->SetVisible(false); + me->DespawnOrUnsummon(5000); break; case EVENT_CONTINUE_FALLING: - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(POINT_KINETIC_BOMB_IMPACT, _x, _y, _groundZ); + me->GetMotionMaster()->MoveCharge(_x, _y, _groundZ, me->GetSpeed(MOVE_WALK), POINT_KINETIC_BOMB_IMPACT); break; default: break; @@ -1329,17 +1323,16 @@ class npc_dark_nucleus : public CreatureScript void DamageTaken(Unit* attacker, uint32& /*damage*/) { - if (attacker == me) + if (attacker == me || attacker == me->getVictim()) return; - if (!_lockedTarget) - if (me->getVictim() == attacker) - _lockedTarget = true; + me->DeleteThreatList(); + me->AddThreat(attacker, 500000000.0f); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 const diff) { - if (!me->isInCombat()) + if (!UpdateVictim()) return; if (_targetAuraCheck <= diff) @@ -1355,23 +1348,6 @@ class npc_dark_nucleus : public CreatureScript } else _targetAuraCheck -= diff; - - if (!_lockedTarget) - { - if (Unit* victim = me->SelectVictim()) - { - if (me->getVictim() && me->getVictim() != victim) - { - me->getVictim()->RemoveAurasDueToSpell(SPELL_SHADOW_RESONANCE_RESIST, me->GetGUID()); - _lockedTarget = true; - } - - _lockedTarget = true; - AttackStart(victim); - DoCast(victim, SPELL_SHADOW_RESONANCE_RESIST); - me->ClearUnitState(UNIT_STATE_CASTING); - } - } } private: @@ -1525,6 +1501,7 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader Position offset = {0.0f, 0.0f, 20.0f, 0.0f}; summonPos.RelocateOffset(offset); SetTargetDest(summonPos); + GetHitDest()->RelocateOffset(offset); } void Register() @@ -1586,7 +1563,7 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScriptLoader void Register() { - AfterHit += SpellHitFn(spell_valanar_kinetic_bomb_knockback_SpellScript::KnockIntoAir); + BeforeHit += SpellHitFn(spell_valanar_kinetic_bomb_knockback_SpellScript::KnockIntoAir); } }; @@ -1663,7 +1640,7 @@ class spell_blood_council_shadow_prison_damage : public SpellScriptLoader void AddExtraDamage() { if (Aura* aur = GetHitUnit()->GetAura(GetSpellInfo()->Id)) - if (AuraEffect const* eff = aur->GetEffect(1)) + if (AuraEffect const* eff = aur->GetEffect(EFFECT_1)) SetHitDamage(GetHitDamage() + eff->GetAmount()); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 273f2a20b4b..c043cb27c7c 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -544,7 +544,7 @@ class boss_professor_putricide : public CreatureScript void UpdateAI(uint32 const diff) { - if ((!UpdateVictim() && !(events.GetPhaseMask() & PHASE_MASK_NOT_SELF)) || !CheckInRoom()) + if ((!(events.GetPhaseMask() & PHASE_MASK_NOT_SELF) && !UpdateVictim()) || !CheckInRoom()) return; events.Update(diff); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index ab924d1b543..ebf9ae02a95 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -713,6 +713,7 @@ class npc_spinestalker : public CreatureScript me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetHomePosition(SpinestalkerLandPos); + me->SetFacingTo(SpinestalkerLandPos.GetOrientation()); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -839,6 +840,7 @@ class npc_rimefang : public CreatureScript me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetHomePosition(RimefangLandPos); + me->SetFacingTo(RimefangLandPos.GetOrientation()); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index c99fde1739c..8d562a23f67 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -796,7 +796,8 @@ class boss_sister_svalna : public CreatureScript { _JustReachedHome(); me->SetReactState(REACT_PASSIVE); - me->SetCanFly(false); + me->SetDisableGravity(false); + me->SetHover(false); } void DoAction(int32 const action) @@ -838,13 +839,14 @@ class boss_sister_svalna : public CreatureScript void MovementInform(uint32 type, uint32 id) { - if (type != POINT_MOTION_TYPE || id != POINT_LAND) + if (type != EFFECT_MOTION_TYPE || id != POINT_LAND) return; _isEventInProgress = false; me->setActive(false); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - me->SetCanFly(false); + me->SetDisableGravity(false); + me->SetHover(false); } void SpellHitTarget(Unit* target, SpellInfo const* spell) @@ -1921,10 +1923,10 @@ class spell_svalna_revive_champion : public SpellScriptLoader Position pos; caster->GetPosition(&pos); caster->GetNearPosition(pos, 5.0f, 0.0f); - pos.m_positionZ = caster->GetBaseMap()->GetHeight(caster->GetPhaseMask(), pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), true, 20.0f); - pos.m_positionZ += 0.05f; + //pos.m_positionZ = caster->GetBaseMap()->GetHeight(caster->GetPhaseMask(), pos.GetPositionX(), pos.GetPositionY(), caster->GetPositionZ(), true, 50.0f); + //pos.m_positionZ += 0.05f; caster->SetHomePosition(pos); - caster->GetMotionMaster()->MovePoint(POINT_LAND, pos); + caster->GetMotionMaster()->MoveLand(POINT_LAND, pos, caster->GetSpeed(MOVE_FLIGHT)); } void Register() -- cgit v1.2.3 From b07341f998bb9305707f300f52bfce5515d555a5 Mon Sep 17 00:00:00 2001 From: Kandera Date: Mon, 23 Apr 2012 14:35:12 -0400 Subject: Core/Spells: Fix spell cast of greatmother's soulcatcher. closes #1882 --- .../world/2012_04_23_01_world_conditions.sql | 5 ++++ src/server/scripts/Spells/spell_item.cpp | 31 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 sql/updates/world/2012_04_23_01_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_01_world_conditions.sql b/sql/updates/world/2012_04_23_01_world_conditions.sql new file mode 100644 index 00000000000..c731426aa3f --- /dev/null +++ b/sql/updates/world/2012_04_23_01_world_conditions.sql @@ -0,0 +1,5 @@ +-- setup alternate conditions for spell 46488 +DELETE FROM `conditions` WHERE `SourceEntry` = 46488 AND `ElseGroup` = 1; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,46488,0,1,31,1,3,26817,0,0,0,'',''), +(13,1,46488,0,1,36,1,0,0,0,1,0,'',''); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 73a77b06408..3c5d6438275 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2021,6 +2021,37 @@ class spell_item_muisek_vessel : public SpellScriptLoader } }; +enum GreatmothersSoulcather +{ + SPELL_FORCE_CAST_SUMMON_GNOME_SOUL = 46486, +}; +class spell_item_greatmothers_soulcatcher : public SpellScriptLoader +{ +public: + spell_item_greatmothers_soulcatcher() : SpellScriptLoader("spell_item_greatmothers_soulcatcher") { } + + class spell_item_greatmothers_soulcatcher_SpellScript : public SpellScript + { + PrepareSpellScript(spell_item_greatmothers_soulcatcher_SpellScript); + + void HandleDummy(SpellEffIndex /*effIndex*/) + { + if (Unit* target = GetHitUnit()) + GetCaster()->CastSpell(GetCaster(),SPELL_FORCE_CAST_SUMMON_GNOME_SOUL); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_item_greatmothers_soulcatcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_item_greatmothers_soulcatcher_SpellScript(); + } +}; + void AddSC_item_spell_scripts() { // 23074 Arcanite Dragonling -- cgit v1.2.3 From 81ec7a6c71a9deda2f3c35fdf7eaf3788bac7cad Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Mon, 23 Apr 2012 22:06:48 +0200 Subject: DB/Loot: Rework Prospecting Loot Templates, includes grouping and referencing Closes #6275 --- ...12_04_23_02_world_prospecting_loot_template.sql | 112 +++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql b/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql new file mode 100644 index 00000000000..6ea44d92722 --- /dev/null +++ b/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql @@ -0,0 +1,112 @@ +SET @TinRef := 13000; +SET @TBC1 := @TinRef+1; +SET @TBC2 := @TinRef+2; +SET @WOTLK1 := @TinRef+3; +SET @WOTLK2 := @TinRef+4; +SET @WOTLK3 := @TinRef+5; + +SET @Copper := 2770; +SET @Tin := 2771; +SET @Iron := 2772; +SET @Mithril := 3858; +SET @Thorium := 10620; +SET @FelIron := 23424; +SET @Adamantite := 23425; +SET @Cobalt := 36909; +SET @Saronite := 36912; +SET @Titanium := 36910; + +-- Reference Loot Templates +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @TinRef AND @TinRef+5; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Stupid Tin +(@TinRef,1529,0,1,1,1,1), -- Jade +(@TinRef,3864,0,1,1,1,1), -- Citrine +(@TinRef,7909,0,1,1,1,1), -- Aquamarine +-- TBC Greens +(@TBC1,21929,0,1,1,1,2), -- Flame Spessarite +(@TBC1,23077,0,1,1,1,2), -- Blood Garnet +(@TBC1,23079,0,1,1,1,2), -- Deep Peridot +(@TBC1,23107,0,1,1,1,2), -- Shadow Draenite +(@TBC1,23112,0,1,1,1,2), -- Golden Draenite +(@TBC1,23117,0,1,1,1,2), -- Azure Moonstone +-- TBC Blues +(@TBC2,23436,0,1,1,1,1), -- Living Ruby +(@TBC2,23437,0,1,1,1,1), -- Talasite +(@TBC2,23438,0,1,1,1,1), -- Star of Elune +(@TBC2,23439,0,1,1,1,1), -- Noble Topaz +(@TBC2,23440,0,1,1,1,1), -- Dawnstone +(@TBC2,23441,0,1,1,1,1), -- Nightseye +-- WOTLK Greens +(@WOTLK1,36917,0,1,1,1,2), -- Bloodstone +(@WOTLK1,36920,0,1,1,1,2), -- Sun Crystal +(@WOTLK1,36923,0,1,1,1,2), -- Chalcedony +(@WOTLK1,36926,0,1,1,1,2), -- Shadow Crystal +(@WOTLK1,36929,0,1,1,1,2), -- Huge Citrine +(@WOTLK1,36932,0,1,1,1,2), -- Dark Jade +-- WOTLK Blues +(@WOTLK2,36918,0,1,1,1,2), -- Scarlet Ruby +(@WOTLK2,36921,0,1,1,1,2), -- Autumn's Glow +(@WOTLK2,36924,0,1,1,1,2), -- Sky Sapphire +(@WOTLK2,36927,0,1,1,1,2), -- Twilight Opal +(@WOTLK2,36930,0,1,1,1,2), -- Monarch Topaz +(@WOTLK2,36933,0,1,1,1,2), -- Forest Emerald +-- WOTLK Epics +(@WOTLK3,36919,0,1,1,1,1), -- Cardinal Ruby +(@WOTLK3,36922,0,1,1,1,1), -- King's Amber +(@WOTLK3,36925,0,1,1,1,1), -- Majestic Zircon +(@WOTLK3,36928,0,1,1,1,1), -- Dreadstone +(@WOTLK3,36931,0,1,1,1,1), -- Ametrine +(@WOTLK3,36934,0,1,1,1,1); -- Eye of Zul +-- -------------------------------------------------------- +-- Prospecting Loot Templates +DELETE FROM `prospecting_loot_template` WHERE `entry` IN (@Copper,@Tin,@Iron,@Mithril,@Thorium,@FelIron,@Adamantite,@Cobalt,@Saronite,@Titanium); +INSERT INTO `prospecting_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Copper Ore +(@Copper,774,0,1,1,1,1), -- Malachite +(@Copper,818,0,1,1,1,1), -- Tigerseye +(@Copper,1210,10,1,0,1,1), -- Shadowgem +-- Tin Ore +(@Tin,1210,0,1,1,1,2), -- Shadowgem +(@Tin,1705,0,1,1,1,2), -- Lesser Moonstone +(@Tin,1206,0,1,1,1,2), -- Moss Agate +(@Tin,1,10,1,0,-@TinRef,1), -- One Rare gem chance +-- Iron Ore +(@Iron,1529,30,1,1,1,2), -- Jade +(@Iron,1705,30,1,1,1,2), -- Lesser Moonstone +(@Iron,3864,30,1,1,1,2), -- Citrine +(@Iron,7909,5,1,1,1,1), -- Aquamarine +(@Iron,7910,5,1,1,1,1), -- Star Ruby +-- Mithril Ore +(@Mithril,3864,30,1,1,1,2), -- Citrine +(@Mithril,7909,30,1,1,1,2), -- Aquamarine +(@Mithril,7910,30,1,1,1,2), -- Star Ruby +(@Mithril,12361,2.5,1,1,1,1), -- Blue Sapphire +(@Mithril,12364,2.5,1,1,1,1), -- Huge Emerald +(@Mithril,12799,2.5,1,1,1,1), -- Large Opal +(@Mithril,12800,2.5,1,1,1,1), -- Azerothian Diamond +-- Thorium Ore +(@Thorium,7910,30,1,1,1,2), -- Star Ruby +(@Thorium,12361,15,1,1,1,2), -- Blue Sapphire +(@Thorium,12364,15,1,1,1,2), -- Huge Emerald +(@Thorium,12799,15,1,1,1,2), -- Large Opal +(@Thorium,12800,15,1,1,1,2), -- Azerothian Diamond +(@Thorium,1,10,1,1,-@TBC1,1), -- one from TBC Greens +-- Fel Iron Ore +(@FelIron,1,95,1,1,-@TBC1,1), -- One from TBC Greens +(@FelIron,2,05,1,1,-@TBC2,1), -- One from TBC Blues +-- Adamantite Ore +(@Adamantite,24243,100,1,0,1,1), -- Adamantite Powder +(@Adamantite,1,100,1,1,-@TBC1,1), -- One from TBC Greens +(@Adamantite,2, 10,1,1,-@TBC2,1), -- One from TBC Blues +-- Cobalt Ore +(@Cobalt,1,95,1,1,-@WOTLK1,1), -- One from WOTLK Greens +(@Cobalt,2,05,1,1,-@WOTLK2,1), -- One from WOTLK Blues +-- Saronite Ore +(@Saronite,1,85,1,1,-@WOTLK1,2), -- One from WOTLK Greens +(@Saronite,2,15,1,1,-@WOTLK2,1), -- One from WOTLK Blues +-- Titanium Ore +(@Titanium,46849,75,1,0,1,1), -- Titanium Powder +(@Titanium,1,75,1,1,-@WOTLK1,2), -- Two from WOTLK Greens +(@Titanium,2,25,1,1,-@WOTLK2,1), -- One from WOTLK Blues +(@Titanium,3,20,1,0,-@WOTLK3,1); -- One from WOTLK Epics -- cgit v1.2.3 From 7901e28b762396fbb74e236d184619b6594c9dfd Mon Sep 17 00:00:00 2001 From: Helias Date: Mon, 23 Apr 2012 22:13:35 +0200 Subject: DB/Loot: Add some missing skinning loot templates Closes #5972 --- .../2012_04_23_03_world_skinning_loot_template.sql | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql b/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql new file mode 100644 index 00000000000..a1aa9e070f2 --- /dev/null +++ b/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql @@ -0,0 +1,44 @@ +UPDATE `creature_template` SET `skinloot`=entry WHERE `entry` IN (30260, 32517, 27641, 28860); +UPDATE `creature_template` SET `skinloot`=70202 WHERE `entry` IN (25774,29693); +UPDATE `creature_template` SET `skinloot`=70203 WHERE `entry`=28257; +UPDATE `creature_template` SET `skinloot`=70207 WHERE `entry`=34137; +UPDATE `creature_template` SET `skinloot`=70208 WHERE `entry` IN (32572,25448,25716,25713); +UPDATE `creature_template` SET `skinloot`=70210 WHERE `entry` IN (33528,40419,26723,31134,36891); +UPDATE `creature_template` SET `skinloot`=70211 WHERE `entry` IN (28847,30206,29875,29931,28203,30432); +UPDATE `creature_template` SET `skinloot`=70212 WHERE `entry` IN (27645,32377,29838,26628,26622,32490,38453,32485,26633,32400,32361,29768,29735,26641,27644,27642,26735,26730,26722,33776,35189,26716,26672,29664,29774); +UPDATE `creature_template` SET `skinloot`=70213 WHERE `entry` IN (27483,29312); +UPDATE `creature_template` SET `skinloot`=70214 WHERE `entry` IN (37217,34564); +UPDATE `creature_template` SET `skinloot`=27641 WHERE `entry` IN (31385,34269,34270,27641,30905,30353); + +DELETE FROM `skinning_loot_template` WHERE entry IN (30260,32517,70212,70213,70214,28860,27641); +INSERT INTO `skinning_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +-- Stoic Mammoth +(30260,33568,100,0,1,3), -- Borean Leather +(30260,42542,-50,0,1,1), -- Stoic Mammoth Hide +-- Loque'nahak +(32517,33568,0,1,1,3), -- Borean Leather +(32517,44128,2,1,1,1), -- Arctic Fur +(32517,44687,100,0,1,1), -- Loque'Nahak's Pelt +-- skinloot 70212 +(70212,33568,0,1,1,3), -- Borean Leather +(70212,44128,1,1,1,1), -- Arctic Fur +-- skinloot 70213 +(70213,33568,0,1,5,12), -- Borean Leather +(70213,44128,1,1,1,1), -- Arctic Fur +-- skinloot 70214 +(70214,33568,0,1,12,16), -- Borean Leather +(70214,44128,25,1,1,1), -- Arctic Fur +-- Sartharion +(28860,33568,0,1,8,12), -- Borean Leather +(28860,38557,0,1,8,12),-- Icy Dragonscale +(28860,44128,1,1,1,1), -- Arctic Fur +-- Centrifuge Construct +(27641,41337,85,0,1,3), -- Whizzed-Out Gizmo +(27641,41338,80,0,1,3), -- Sprung Whirlygig +(27641,39690,15,0,1,3), -- Volatile Blasting Trigger +(27641,39684,8,0,1,1), -- Hair Trigger +(27641,36813,8,0,1,3), -- Sprung Sprocket +(27641,39681,8,0,2,4), -- Handful of Cobalt Bolts +(27641,49050,2,0,1,1), -- Schematic: Jeeves +(27641,39682,1,0,1,1), -- Overcharged Capacitor +(27641,39685,1,0,1,1); -- Indestructible Frame -- cgit v1.2.3 From e98dc0e8384ff86f79abe6d741d16a55ba448911 Mon Sep 17 00:00:00 2001 From: Gecko32 Date: Mon, 23 Apr 2012 22:18:42 +0200 Subject: DB/Loot: Correct Mote of Life dropchance Closes #5692 --- sql/updates/world/2012_04_23_04_world_creature_loot_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_04_23_04_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql b/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql new file mode 100644 index 00000000000..94d2b092d12 --- /dev/null +++ b/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql @@ -0,0 +1,2 @@ +-- Correct dropchance for Mote of Life, wowhead was wrong (as usual) +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=18.5307 WHERE `entry`=22307 AND `item`=22575; -- cgit v1.2.3 From ef9733e62bade33c37051c9e491222b6fdca7d4d Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Mon, 23 Apr 2012 22:22:21 +0200 Subject: DB/Loot: Correct dropchances for the Quest Kindness Closes #6301 --- sql/updates/world/2012_04_23_05_world_creature_loot_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_04_23_05_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql b/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql new file mode 100644 index 00000000000..ddf0780d362 --- /dev/null +++ b/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql @@ -0,0 +1,3 @@ +-- Update the dropchance to 100% if on quest +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=21477 AND `item`=31372; -- Rocknail Flayer Carcass +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=21478 AND `item`=31373; -- Rocknail Flayer Giblets -- cgit v1.2.3 From e1a90bc779dc7f5c7f568749bac02645288ee8d7 Mon Sep 17 00:00:00 2001 From: Kezo90 Date: Mon, 23 Apr 2012 22:29:56 +0200 Subject: DB/Spells: bonus data corrections: - Lacerate DD scale with Attack Power, - Living Bomb scales correctly, - lots of spells do not scale with Spell Power, - minor corrections around Seals and Judgements. --- .../world/2012_04_23_02_world_spell_bonus_data.sql | 102 +++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 sql/updates/world/2012_04_23_02_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_02_world_spell_bonus_data.sql b/sql/updates/world/2012_04_23_02_world_spell_bonus_data.sql new file mode 100644 index 00000000000..b7f61f407b4 --- /dev/null +++ b/sql/updates/world/2012_04_23_02_world_spell_bonus_data.sql @@ -0,0 +1,102 @@ +-- Death Knight +DELETE FROM `spell_bonus_data` WHERE `entry` IN(58621, 47632, 47633, 50444, 70890, 50526, 48982, 59754, 49184); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(58621, 0, -1, 0.08, -1, 'Death Knight - Glyph of Chains of Ice'), -- Shouldn't scale with SP. +(47632, 0, -1, 0.15, -1, 'Death Knight - Death Coil'), -- Shouldn't scale with SP. +(47633, 0, -1, 0.15, -1, 'Death Knight - Death Coil (Heal)'), -- Shouldn't scale with SP. +(50444, 0, -1, 0.105, -1, 'Death Knight - Corpse Explosion (Triggered)'), -- Shouldn't scale with SP. +(70890, 0, -1, -1, -1, 'Death Knight - Scourge Strike (Shadow)'), -- Shouldn't scale with SP. +(50526, 0, -1, -1, -1, 'Death Knight - Wandering Plague (Triggered)'), -- Shouldn't scale with SP. +(48982, 0, -1, -1, -1, 'Death Knight - Rune Tap'), -- Shouldn't scale with SP. +(59754, 0, -1, -1, -1, 'Death Knight - Glyph of Rune Tap (Triggered)'), -- Shouldn't scale with SP. +(49184, 0, -1, 0.2, -1, 'Death Knight - Howling Blast'); -- Shouldn't scale with SP. + +-- Druid +DELETE FROM `spell_bonus_data` WHERE `entry` IN(48450, 48451); -- Lifebloom Rank 2, Rank 3 +DELETE FROM `spell_bonus_data` WHERE `entry` IN(48567, 48568); -- Lacerate Rank 2, Rank 3 +DELETE FROM `spell_bonus_data` WHERE `entry` IN(33745, 9007); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(33745, 0, 0, 0.01, 0.01, 'Druid - Lacerate ($AP*0.05/number of ticks)'), -- Direct damage should scale with AP, based on DrDamage addon(3.3.5a). +(9007, -1, 0, -1, 0.03, 'Druid - Pounce Bleed (Triggered)'); -- Shouldn't scale with SP. Increase AP coefficient, based on DrDamage addon(3.3.5a) and Wowwiki.com. + +-- Hunter +DELETE FROM `spell_bonus_data` WHERE `entry` IN(56641, 42243, 3674, 19306, 1495, 63468, 136); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(56641, 0, -1, 0.1, -1, 'Hunter - Steady Shot'), -- Shouldn't scale with SP. +(42243, 0, -1, 0.0837, -1, 'Hunter - Volley (Triggered)'), -- Shouldn't scale with SP. +(3674, -1, 0, -1, 0.023, 'Hunter - Black Arrow ($RAP*0.1 / number of ticks)'), -- Shouldn't scale with SP. Increase AP coefficient, based on DrDamage addon(3.3.5a). +(19306, 0, -1, 0.2, -1, 'Hunter - Counterattack'), -- Shouldn't scale with SP. +(1495, 0, -1, 0.2, -1, 'Hunter - Mongoose Bite'), -- Shouldn't scale with SP. +(63468, -1, 0, -1, -1, 'Hunter - Piercing Shots'), -- Shouldn't scale with SP. +(136, -1, 0, -1, -1, 'Hunter - Mend Pet'); -- Shouldn't scale with SP. + +-- Mage +DELETE FROM `spell_bonus_data` WHERE `entry`=7269; -- Arcane Missiles Triggered Spell Rank 2 +DELETE FROM `spell_bonus_data` WHERE `entry` IN(133, 44614, 44457, 44461); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(133, 1, 0, -1, -1, 'Mage - Fireball'), -- DoT componenet shouldn't scale. +(44614, 0.8571, 0, -1, -1, 'Mage - Frostfire Bolt'), -- DoT componenet shouldn't scale. +(44457, -1, 0.2, -1, -1, 'Mage - Living Bomb ($SP*0.8 / number of ticks)'), -- Direct damage bonus correction. +(44461, 0.4286, -1, -1, -1, 'Mage - Living Bomb (Triggered)'); -- Direct damage bonus correction. + +-- Paladin +DELETE FROM `spell_bonus_data` WHERE `entry` IN(633, 54158, 20467, 20187, 31803, 53742, 31804, 53733); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(633, 0, -1, -1, -1, 'Paladin - Lay on Hands'), -- Shouldn't scale with SP. +(54158, 0.27, -1, 0.175, -1, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'), -- Increase coefficient, based on Wowwiki.com. +(20467, 0.14, -1, 0.115, -1, 'Paladin - Judgement of Command'), -- Decrease coefficient, based on Wowwiki.com. +(20187, 0.355, -1, 0.225, -1, 'Paladin - Judgement of Righteousness'), -- Increase coefficient, based on Wowwiki.com. +(31803, -1, 0.0132, -1, 0.0252, 'Paladin - Holy Vengeance'), -- Decrease coefficient, based on DrDamage addon(3.3.5a) and Wowwiki.com. +(53742, -1, 0.0132, -1, 0.0252, 'Paladin - Blood Corruption'), -- Decrease coefficient, based on DrDamage addon(3.3.5a) and Wowwiki.com. +(31804, 0.24, -1, 0.15, -1, 'Paladin - Judgement of Vengeance'), -- Increase coefficient, based on Wowwiki.com. +(53733, 0.24, -1, 0.15, -1, 'Paladin - Judgement of Corruption'); -- Increase coefficient, based on Wowwiki.com. + +-- Priest +DELETE FROM `spell_bonus_data` WHERE `entry` IN(52983, 52954, 58985); -- Penance Heal Rank 2, Rank 3, Rank 4 +DELETE FROM `spell_bonus_data` WHERE `entry` IN(52998, 52999, 53000); -- Penance Hurt Rank 2, Rank 3, Rank 4 +DELETE FROM `spell_bonus_data` WHERE `entry` IN(7001); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(7001, -1, 0.626, -1, -1, 'Priest - Lightwell Renew ($SP*1.878 / number of ticks)'); -- Increase coefficient, based on DrDamage addon(3.3.5a). + +-- Rogue +DELETE FROM `spell_bonus_data` WHERE `entry` IN(819, 11353, 11354, 25349, 26968, 27187, 57969, 57970); -- Deadly Poison Rank 2, Rank 3, etc. +DELETE FROM `spell_bonus_data` WHERE `entry` IN(8685, 8689, 11335, 11336, 11337, 26890, 57964, 57965); -- Instant Poison Rank 2, Rank 3, etc. +DELETE FROM `spell_bonus_data` WHERE `entry` IN(13222, 13223, 13224, 27189, 57974, 57975); -- Wound Poison Rank 2, Rank 3, etc. +DELETE FROM `spell_bonus_data` WHERE `entry` IN(32645, 2098, 703, 1776, 1943, 8680, 26688, 13218); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(32645, 0, -1, -1, -1, 'Rogue - Envenom'), -- Shouldn't scale with SP. +(2098, 0, -1, -1, -1, 'Rogue - Eviscerate'), -- Shouldn't scale with SP. +(703, -1, 0, -1, 0.07, 'Rogue - Garrote'), -- Shouldn't scale with SP. +(1776, 0, -1, 0.21, -1, 'Rogue - Gouge'), -- Shouldn't scale with SP. +(1943, -1, 0, -1, -1, 'Rogue - Rupture'), -- Shouldn't scale with SP. +(8680, 0, -1, 0.1, -1, 'Rogue - Instant Poison'), -- Shouldn't scale with SP. +(26688, 0, -1, 0, -1, 'Rogue - Anesthetic Poison'), -- Shouldn't scale with SP nor AP. +(13218, 0, -1, 0.04, -1, 'Rogue - Wound Poison'); -- Shouldn't scale with SP. + + -- Warlock Healthstones Shouldn't scale with SP. +DELETE FROM `spell_bonus_data` WHERE `entry` IN (6262, 23468, 23469, 6263, 23470, 23471, 5720, 23472, 23473, 5723, 23474, 23475, 11732, 23476, 23477, 27235, 27236, 27237, 47874, 47873, 47872, 47875, 47876, 47877); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(6262, 0, -1, 0, -1, 'Warlock - HS - Minor Healthstone (with 0/2 Improved Healthstone)'), +(23468, 0, -1, 0, -1, 'Warlock - HS - Minor Healthstone (with 1/2 Improved Healthstone)'), +(23469, 0, -1, 0, -1, 'Warlock - HS - Minor Healthstone (with 2/2 Improved Healthstone)'), +(6263, 0, -1, 0, -1, 'Warlock - HS - Lesser Healthstone (with 0/2 Improved Healthstone)'), +(23470, 0, -1, 0, -1, 'Warlock - HS - Lesser Healthstone (with 1/2 Improved Healthstone)'), +(23471, 0, -1, 0, -1, 'Warlock - HS - Lesser Healthstone (with 2/2 Improved Healthstone)'), +(5720, 0, -1, 0, -1, 'Warlock - HS - Healthstone (with 0/2 Improved Healthstone)'), +(23472, 0, -1, 0, -1, 'Warlock - HS - Healthstone (with 1/2 Improved Healthstone)'), +(23473, 0, -1, 0, -1, 'Warlock - HS - Healthstone (with 2/2 Improved Healthstone)'), +(5723, 0, -1, 0, -1, 'Warlock - HS - Greater Healthstone (with 0/2 Improved Healthstone)'), +(23474, 0, -1, 0, -1, 'Warlock - HS - Greater Healthstone (with 1/2 Improved Healthstone)'), +(23475, 0, -1, 0, -1, 'Warlock - HS - Greater Healthstone (with 2/2 Improved Healthstone)'), +(11732, 0, -1, 0, -1, 'Warlock - HS - Major Healthstone (with 0/2 Improved Healthstone)'), +(23476, 0, -1, 0, -1, 'Warlock - HS - Major Healthstone (with 1/2 Improved Healthstone)'), +(23477, 0, -1, 0, -1, 'Warlock - HS - Major Healthstone (with 2/2 Improved Healthstone)'), +(27235, 0, -1, 0, -1, 'Warlock - HS - Master Healthstone (with 0/2 Improved Healthstone)'), +(27236, 0, -1, 0, -1, 'Warlock - HS - Master Healthstone (with 1/2 Improved Healthstone)'), +(27237, 0, -1, 0, -1, 'Warlock - HS - Master Healthstone (with 2/2 Improved Healthstone)'), +(47874, 0, -1, 0, -1, 'Warlock - HS - Demonic Healthstone (with 0/2 Improved Healthstone)'), +(47873, 0, -1, 0, -1, 'Warlock - HS - Demonic Healthstone (with 1/2 Improved Healthstone)'), +(47872, 0, -1, 0, -1, 'Warlock - HS - Demonic Healthstone (with 2/2 Improved Healthstone)'), +(47875, 0, -1, 0, -1, 'Warlock - HS - Fel Healthstone (with 0/2 Improved Healthstone)'), +(47876, 0, -1, 0, -1, 'Warlock - HS - Fel Healthstone (with 1/2 Improved Healthstone)'), +(47877, 0, -1, 0, -1, 'Warlock - HS - Fel Healthstone (with 2/2 Improved Healthstone)'); -- cgit v1.2.3 From 15e2210c3056cc93cc96445042e771c97e18262b Mon Sep 17 00:00:00 2001 From: Kezo90 Date: Mon, 23 Apr 2012 22:30:59 +0200 Subject: DB/Spells: remove unneeded 'Mangle - Remover'. --- sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql b/sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql new file mode 100644 index 00000000000..48613dca725 --- /dev/null +++ b/sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql @@ -0,0 +1 @@ +DELETE FROM `spell_linked_spell` WHERE `comment`='Mangle - Remover'; -- This stacking rule became useless when written in the `spell_group` table. \ No newline at end of file -- cgit v1.2.3 From 61219cf9db08f40e53c8e91a0e90e93900e43f61 Mon Sep 17 00:00:00 2001 From: Kezo90 Date: Mon, 23 Apr 2012 22:31:39 +0200 Subject: DB/Spells: Rogue T9 2P - Should proc only from Rupture ticks. --- sql/updates/world/2012_04_23_03_world_spell_proc_event.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_04_23_03_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_03_world_spell_proc_event.sql b/sql/updates/world/2012_04_23_03_world_spell_proc_event.sql new file mode 100644 index 00000000000..dfa57b031c3 --- /dev/null +++ b/sql/updates/world/2012_04_23_03_world_spell_proc_event.sql @@ -0,0 +1,4 @@ + -- Rogue T9 2P - Should proc only from Rupture ticks. +DELETE FROM `spell_proc_event` WHERE `entry` IN(67209); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `procFlags`) VALUES +(67209, 0x01, 8, 0x100000, 0x50000); \ No newline at end of file -- cgit v1.2.3 From 125efc7dc805aebc9b3c3e7f56ea2f4c2aed109e Mon Sep 17 00:00:00 2001 From: Shocker Date: Tue, 24 Apr 2012 03:29:16 +0300 Subject: DB/SQLs: Small corrections to sql files from recent pull requests --- sql/updates/world/2012_04_04_00_world_command.sql | 10 ---------- sql/updates/world/2012_04_11_00_world_spell_proc_event.sql | 4 ---- sql/updates/world/2012_04_17_00_world_warden_checks.sql | 8 -------- sql/updates/world/2012_04_22_01_world_spell_script_names.sql | 3 --- sql/updates/world/2012_04_23_03_world_spell_proc_event.sql | 4 ---- sql/updates/world/2012_04_24_00_world_command.sql | 10 ++++++++++ sql/updates/world/2012_04_24_01_world_spell_proc_event.sql | 4 ++++ sql/updates/world/2012_04_24_02_world_warden_checks.sql | 8 ++++++++ sql/updates/world/2012_04_24_03_world_spell_script_names.sql | 4 ++++ sql/updates/world/2012_04_24_04_world_spell_proc_event.sql | 4 ++++ 10 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 sql/updates/world/2012_04_04_00_world_command.sql delete mode 100644 sql/updates/world/2012_04_11_00_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_17_00_world_warden_checks.sql delete mode 100644 sql/updates/world/2012_04_22_01_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_23_03_world_spell_proc_event.sql create mode 100644 sql/updates/world/2012_04_24_00_world_command.sql create mode 100644 sql/updates/world/2012_04_24_01_world_spell_proc_event.sql create mode 100644 sql/updates/world/2012_04_24_02_world_warden_checks.sql create mode 100644 sql/updates/world/2012_04_24_03_world_spell_script_names.sql create mode 100644 sql/updates/world/2012_04_24_04_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_04_00_world_command.sql b/sql/updates/world/2012_04_04_00_world_command.sql deleted file mode 100644 index 9adb3cff1d9..00000000000 --- a/sql/updates/world/2012_04_04_00_world_command.sql +++ /dev/null @@ -1,10 +0,0 @@ -DELETE FROM `command` WHERE `name` IN ('modify tp','modify bwalk','modify swim','modify fly','modify arena','modify aspeed','modify morph'); -INSERT INTO `command` (`name`, `security`, `help`) VALUES ('modify speed all', 1, 'Syntax: .modify aspeed #rate\r\n\r\nModify all speeds -run,swim,run back,swim back- of the selected player to "normalbase speed for this move type"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify speed backwalk', 1, 'Syntax: .modify speed backwalk #rate\r\n\r\nModify the speed of the selected player while running backwards to "normal walk back speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify speed fly', 1, '.modify speed fly #rate\nModify the flying speed of the selected player to "normal flying speed"*rate. If no player is selected, modify your speed.\n #rate may range from 0.1 to 50.'), -('modify speed swim', 1, 'Syntax: .modify speed swim #rate\r\n\r\nModify the swim speed of the selected player to "normal swim speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify speed walk', 1, 'Syntax: .modify speed bwalk #rate\r\n\r\nModify the speed of the selected player while running to "normal walk speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify talentpoints', 1, 'Syntax: .modify talentpoints #amount\r\n\r\nSet free talent points for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.'), -('morph', 2, 'Syntax: .morph #displayid\r\n\r\nChange your current model id to #displayid.'), -('modify arenapoints', 1, 'Syntax: .modify arenapoints #value\r\nAdd $amount arena points to the selected player.'); -UPDATE `command` SET `help`='Syntax: .modify speed $speedtype #rate\r\n\r\nModify the running speed of the selected player to "normal base run speed"= 1. If no player is selected, modify your speed.\r\n\r\n$speedtypes may be fly, all, walk, backwalk, or swim.\r\n\r\n #rate may range from 0.1 to 50.' WHERE `name`='modify speed' LIMIT 1; \ No newline at end of file diff --git a/sql/updates/world/2012_04_11_00_world_spell_proc_event.sql b/sql/updates/world/2012_04_11_00_world_spell_proc_event.sql deleted file mode 100644 index e5dfbeb0e66..00000000000 --- a/sql/updates/world/2012_04_11_00_world_spell_proc_event.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Honor Among Thieves proc -UPDATE `spell_proc_event` SET `CustomChance`=33 WHERE `entry`=51698; -- Rank 1 -UPDATE `spell_proc_event` SET `CustomChance`=66 WHERE `entry`=51700; -- Rank 2 -UPDATE `spell_proc_event` SET `CustomChance`=100 WHERE `entry`=51701; -- Rank 3 diff --git a/sql/updates/world/2012_04_17_00_world_warden_checks.sql b/sql/updates/world/2012_04_17_00_world_warden_checks.sql deleted file mode 100644 index 74539f99fb3..00000000000 --- a/sql/updates/world/2012_04_17_00_world_warden_checks.sql +++ /dev/null @@ -1,8 +0,0 @@ -UPDATE `warden_checks` SET `comment`='Swimming_FallCalc - movement state' WHERE `id`=15; -UPDATE `warden_checks` SET `comment`='CreateMovementStatus' WHERE `id`=72; -UPDATE `warden_checks` SET `comment`='OnStartSwim OnSplineStartSwim - movement state' WHERE `id`=170; -UPDATE `warden_checks` SET `comment`='DefaultServerLogin - account name' WHERE `id`=198; -UPDATE `warden_checks` SET `comment`='Login Checksum - authentication process' WHERE `id`=320; -UPDATE `warden_checks` SET `comment`='CalcFallStartElevation - (some kind of wall climb)' WHERE `id`=329; -UPDATE `warden_checks` SET `comment`='Code injection at 0x40100A' WHERE `id`=381; -UPDATE `warden_checks` SET `comment`='Login State - (May be false positive)' WHERE `id`=437; diff --git a/sql/updates/world/2012_04_22_01_world_spell_script_names.sql b/sql/updates/world/2012_04_22_01_world_spell_script_names.sql deleted file mode 100644 index bd4becdc3f4..00000000000 --- a/sql/updates/world/2012_04_22_01_world_spell_script_names.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id`=59566; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(59566,'spell_sha_earthen_power'); diff --git a/sql/updates/world/2012_04_23_03_world_spell_proc_event.sql b/sql/updates/world/2012_04_23_03_world_spell_proc_event.sql deleted file mode 100644 index dfa57b031c3..00000000000 --- a/sql/updates/world/2012_04_23_03_world_spell_proc_event.sql +++ /dev/null @@ -1,4 +0,0 @@ - -- Rogue T9 2P - Should proc only from Rupture ticks. -DELETE FROM `spell_proc_event` WHERE `entry` IN(67209); -INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `procFlags`) VALUES -(67209, 0x01, 8, 0x100000, 0x50000); \ No newline at end of file diff --git a/sql/updates/world/2012_04_24_00_world_command.sql b/sql/updates/world/2012_04_24_00_world_command.sql new file mode 100644 index 00000000000..25912392347 --- /dev/null +++ b/sql/updates/world/2012_04_24_00_world_command.sql @@ -0,0 +1,10 @@ +DELETE FROM `command` WHERE `name` IN ('modify tp','modify bwalk','modify swim','modify fly','modify arena','modify aspeed','modify morph'); +INSERT INTO `command` (`name`, `security`, `help`) VALUES ('modify speed all', 1, 'Syntax: .modify aspeed #rate\r\n\r\nModify all speeds -run,swim,run back,swim back- of the selected player to "normalbase speed for this move type"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed backwalk', 1, 'Syntax: .modify speed backwalk #rate\r\n\r\nModify the speed of the selected player while running backwards to "normal walk back speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed fly', 1, '.modify speed fly #rate\nModify the flying speed of the selected player to "normal flying speed"*rate. If no player is selected, modify your speed.\n #rate may range from 0.1 to 50.'), +('modify speed swim', 1, 'Syntax: .modify speed swim #rate\r\n\r\nModify the swim speed of the selected player to "normal swim speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed walk', 1, 'Syntax: .modify speed bwalk #rate\r\n\r\nModify the speed of the selected player while running to "normal walk speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify talentpoints', 1, 'Syntax: .modify talentpoints #amount\r\n\r\nSet free talent points for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.'), +('morph', 2, 'Syntax: .morph #displayid\r\n\r\nChange your current model id to #displayid.'), +('modify arenapoints', 1, 'Syntax: .modify arenapoints #value\r\nAdd $amount arena points to the selected player.'); +UPDATE `command` SET `help`='Syntax: .modify speed $speedtype #rate\r\n\r\nModify the running speed of the selected player to "normal base run speed"= 1. If no player is selected, modify your speed.\r\n\r\n$speedtypes may be fly, all, walk, backwalk, or swim.\r\n\r\n #rate may range from 0.1 to 50.' WHERE `name`='modify speed' LIMIT 1; diff --git a/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql b/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql new file mode 100644 index 00000000000..6e997931bb5 --- /dev/null +++ b/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +-- Honor Among Thieves proc chance +UPDATE `spell_proc_event` SET `CustomChance`=33 WHERE `entry`=51698; -- Rank 1 +UPDATE `spell_proc_event` SET `CustomChance`=66 WHERE `entry`=51700; -- Rank 2 +UPDATE `spell_proc_event` SET `CustomChance`=100 WHERE `entry`=51701; -- Rank 3 diff --git a/sql/updates/world/2012_04_24_02_world_warden_checks.sql b/sql/updates/world/2012_04_24_02_world_warden_checks.sql new file mode 100644 index 00000000000..74539f99fb3 --- /dev/null +++ b/sql/updates/world/2012_04_24_02_world_warden_checks.sql @@ -0,0 +1,8 @@ +UPDATE `warden_checks` SET `comment`='Swimming_FallCalc - movement state' WHERE `id`=15; +UPDATE `warden_checks` SET `comment`='CreateMovementStatus' WHERE `id`=72; +UPDATE `warden_checks` SET `comment`='OnStartSwim OnSplineStartSwim - movement state' WHERE `id`=170; +UPDATE `warden_checks` SET `comment`='DefaultServerLogin - account name' WHERE `id`=198; +UPDATE `warden_checks` SET `comment`='Login Checksum - authentication process' WHERE `id`=320; +UPDATE `warden_checks` SET `comment`='CalcFallStartElevation - (some kind of wall climb)' WHERE `id`=329; +UPDATE `warden_checks` SET `comment`='Code injection at 0x40100A' WHERE `id`=381; +UPDATE `warden_checks` SET `comment`='Login State - (May be false positive)' WHERE `id`=437; diff --git a/sql/updates/world/2012_04_24_03_world_spell_script_names.sql b/sql/updates/world/2012_04_24_03_world_spell_script_names.sql new file mode 100644 index 00000000000..a53d8bd585c --- /dev/null +++ b/sql/updates/world/2012_04_24_03_world_spell_script_names.sql @@ -0,0 +1,4 @@ +-- Earthen Power +DELETE FROM `spell_script_names` WHERE `spell_id`=59566; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(59566,'spell_sha_earthen_power'); diff --git a/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql b/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql new file mode 100644 index 00000000000..5ba6f24ccf8 --- /dev/null +++ b/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql @@ -0,0 +1,4 @@ + -- Rogue T9 2P - Should proc only from Rupture ticks. +DELETE FROM `spell_proc_event` WHERE `entry` IN(67209); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `procFlags`) VALUES +(67209, 0x01, 8, 0x100000, 0x50000); -- cgit v1.2.3 From dac537c588ce8464fcfdb69b76f13cdd8aa6ee02 Mon Sep 17 00:00:00 2001 From: Kezo90 Date: Tue, 24 Apr 2012 09:19:04 +0200 Subject: fixup! DB/Spells: remove unneeded 'Mangle - Remover'. --- .../2012_04_23_04_world_spell_linked_spell.sql | 1 - .../2012_04_24_xx_world_spell_linked_spell.sql | 51 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) delete mode 100644 sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql create mode 100644 sql/updates/world/2012_04_24_xx_world_spell_linked_spell.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql b/sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql deleted file mode 100644 index 48613dca725..00000000000 --- a/sql/updates/world/2012_04_23_04_world_spell_linked_spell.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM `spell_linked_spell` WHERE `comment`='Mangle - Remover'; -- This stacking rule became useless when written in the `spell_group` table. \ No newline at end of file diff --git a/sql/updates/world/2012_04_24_xx_world_spell_linked_spell.sql b/sql/updates/world/2012_04_24_xx_world_spell_linked_spell.sql new file mode 100644 index 00000000000..6109c8db068 --- /dev/null +++ b/sql/updates/world/2012_04_24_xx_world_spell_linked_spell.sql @@ -0,0 +1,51 @@ +-- delete 'Mangle - Remover' +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33876 AND `spell_effect`=-48564 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33876 AND `spell_effect`=-48563 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33876 AND `spell_effect`=-33987 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33876 AND `spell_effect`=-33986 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33876 AND `spell_effect`=-33878 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33878 AND `spell_effect`=-48566 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33878 AND `spell_effect`=-48565 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33878 AND `spell_effect`=-33983 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33878 AND `spell_effect`=-33982 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33878 AND `spell_effect`=-33876 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33982 AND `spell_effect`=-48564 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33982 AND `spell_effect`=-48563 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33982 AND `spell_effect`=-33987 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33982 AND `spell_effect`=-33986 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33982 AND `spell_effect`=-33878 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33983 AND `spell_effect`=-48564 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33983 AND `spell_effect`=-48563 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33983 AND `spell_effect`=-33987 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33983 AND `spell_effect`=-33986 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33983 AND `spell_effect`=-33878 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33986 AND `spell_effect`=-48566 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33986 AND `spell_effect`=-48565 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33986 AND `spell_effect`=-33983 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33986 AND `spell_effect`=-33982 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33986 AND `spell_effect`=-33876 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33987 AND `spell_effect`=-48566 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33987 AND `spell_effect`=-48565 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33987 AND `spell_effect`=-33983 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33987 AND `spell_effect`=-33982 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=33987 AND `spell_effect`=-33876 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48563 AND `spell_effect`=-48566 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48563 AND `spell_effect`=-48565 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48563 AND `spell_effect`=-33983 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48563 AND `spell_effect`=-33982 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48563 AND `spell_effect`=-33876 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48564 AND `spell_effect`=-48566 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48564 AND `spell_effect`=-48565 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48564 AND `spell_effect`=-33983 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48564 AND `spell_effect`=-33982 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48564 AND `spell_effect`=-33876 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48565 AND `spell_effect`=-48564 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48565 AND `spell_effect`=-48563 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48565 AND `spell_effect`=-33987 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48565 AND `spell_effect`=-33986 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48565 AND `spell_effect`=-33878 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48566 AND `spell_effect`=-48564 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48566 AND `spell_effect`=-48563 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48566 AND `spell_effect`=-33987 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48566 AND `spell_effect`=-33986 AND `type`=1; +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=48566 AND `spell_effect`=-33878 AND `type`=1; -- cgit v1.2.3 From 396b1ded1a047182c2c3d0244f94ff6baba1d36d Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Tue, 24 Apr 2012 10:11:54 +0200 Subject: DB/Loot: Fix loot for some Bloodsail creatures, thx Exodius Closes # 5483 --- sql/updates/world/2012_04_24_05_world_creature_loot_template.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2012_04_24_05_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql b/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql new file mode 100644 index 00000000000..c524999b492 --- /dev/null +++ b/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql @@ -0,0 +1,9 @@ +-- Apply same loot template to below mentioned Bloodsail NPCs as that of Bloodsail Raider 1561 +-- (Mage 1562, Swashbuckler 1563, Warlock 1564, Sea Dog 1565) +UPDATE `creature_template` SET `lootid`=1561 WHERE `entry` IN (1562,1563,1564,1565); +-- Remove Loot from `creature_loot_template` for above mentioned NPCs because it contains only 2 items. +-- Those 2 items, along with complete loot template for these mobs is applied in query above. +DELETE FROM `creature_loot_template` WHERE `entry` IN (1562,1563,1564,1565); +-- Remove loot and gold drop from Bloodsail Warlock's Minions +UPDATE `creature_template` SET `lootid`=0, `mingold`=0 AND `maxgold`=0 WHERE `entry` IN (10928,12922); +DELETE FROM `creature_loot_template` WHERE `entry` IN (10928,12922); -- cgit v1.2.3 From 61bc8e1c6f82558b3cb1f441ffad1d40dca198a9 Mon Sep 17 00:00:00 2001 From: Kandera Date: Tue, 24 Apr 2012 11:59:08 -0400 Subject: Core/Spells: added function to initiation script. DB/SAI: added rest of quest to database for Greatmother's Soulcatcher --- sql/updates/world/2012_04_24_06_world_misc.sql | 31 ++++++++++++++++++++++++++ src/server/scripts/Spells/spell_item.cpp | 1 + 2 files changed, 32 insertions(+) create mode 100644 sql/updates/world/2012_04_24_06_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_24_06_world_misc.sql b/sql/updates/world/2012_04_24_06_world_misc.sql new file mode 100644 index 00000000000..2e095a76cd9 --- /dev/null +++ b/sql/updates/world/2012_04_24_06_world_misc.sql @@ -0,0 +1,31 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 46485; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(46485,'spell_item_greatmothers_soulcatcher'); + +DELETE FROM `conditions` WHERE `SourceEntry` IN (46485,46488); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,46485,0,1,31,1,3,26817,0,0,0,'',''), +(13,1,46485,0,1,36,1,0,0,0,1,0,'',''), +(13,1,46488,0,1,31,1,3,26817,0,0,0,'',''), +(13,1,46488,0,1,36,1,0,0,0,1,0,'',''); + +-- Gnome Soul SAI +SET @ENTRY := 26096; +SET @SPELL_ARCANE_EXPLOSION := 35426; +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,1,54,0,100,0,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gnome Soul - On Just Summoned - Quest Credit"), +(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,25814,10,1,0,0,0,0,"Gnome Soul - On Just Summoned - Set Data Fizzcrank Mechagnome"), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,69,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gnome Soul - On Just Summoned - Move to Summoner"), + +(@ENTRY,0,3,4,34,0,100,0,1,0,0,0,11,@SPELL_ARCANE_EXPLOSION,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gnome Soul - Reached Summoner - Cast Arcane Explosion Visual"), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gnome Soul - Reached Summoner - Forced Despawn"); + +-- Fizzcrank Mechagnome SAI +SET @ENTRY := 25814; +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,4,0,100,0,0,0,0,0,1,1,10000,0,0,0,0,0,0,0,0,0,0,0,0,"Fizzcrank Mechagnome - Chance Say on Aggro"), +(@ENTRY,1,0,0,38,0,100,0,1,1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Fizzcrank Mechagnome - On Data Set - Forced Despawn"); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 300e54ab027..eb2d3187636 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2104,4 +2104,5 @@ void AddSC_item_spell_scripts() new spell_item_uded(); new spell_item_chicken_cover(); new spell_item_muisek_vessel(); + new spell_item_greatmothers_soulcatcher(); } -- cgit v1.2.3 From bf0d001cd3bc5347fecd92d8fbec2a196d6dcda9 Mon Sep 17 00:00:00 2001 From: Discover- Date: Wed, 25 Apr 2012 08:15:05 +0200 Subject: DB/Misc: Fix start-up errors and non-working SmartAI from 61bc8e1c6f82558b3cb1f441ffad1d40dca198a9. Thanks @Xanvial for spotting the SAI issue and @joschiwald for the condition start-up errors. --- sql/updates/world/2012_04_25_00_world_misc.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_04_25_00_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_25_00_world_misc.sql b/sql/updates/world/2012_04_25_00_world_misc.sql new file mode 100644 index 00000000000..3d2f20fdc8c --- /dev/null +++ b/sql/updates/world/2012_04_25_00_world_misc.sql @@ -0,0 +1,3 @@ +UPDATE `smart_scripts` SET `source_type`=0,`id`=1 WHERE `entryorguid`=24814 AND `source_type`=1 AND `event_type`=38; +UPDATE `conditions` SET `SourceTypeOrReferenceId`=17 WHERE `SourceEntry` IN (46485,46488); +UPDATE `conditions` SET `ElseGroup`=0 WHERE `SourceEntry` IN (46485,46488) AND `ConditionValue1`=26817; -- cgit v1.2.3 From 5878a790db5d6a0a8acb8cdac656632bf53e3a10 Mon Sep 17 00:00:00 2001 From: Kandera Date: Wed, 25 Apr 2012 09:02:09 -0400 Subject: Core/Spells: Fix prayer of mending bonus from t9 healing 2 piece set. Closes #4069 --- .../2012_04_25_01_world_spell_script_names.sql | 3 ++ src/server/scripts/Spells/spell_priest.cpp | 47 ++++++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/2012_04_25_01_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_25_01_world_spell_script_names.sql b/sql/updates/world/2012_04_25_01_world_spell_script_names.sql new file mode 100644 index 00000000000..e42f1979229 --- /dev/null +++ b/sql/updates/world/2012_04_25_01_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 33110; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(33110,'spell_pri_prayer_of_mending_heal'); \ No newline at end of file diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index d2bba2b8bc3..2ef782d6dcf 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -291,12 +291,53 @@ class spell_pri_reflective_shield_trigger : public SpellScriptLoader } }; +enum PrayerOfMending +{ + SPELL_T9_HEALING_2_PIECE = 67201, +}; +// Prayer of Mending Heal +class spell_pri_prayer_of_mending_heal : public SpellScriptLoader +{ +public: + spell_pri_prayer_of_mending_heal() : SpellScriptLoader("spell_pri_prayer_of_mending_heal") { } + + class spell_pri_prayer_of_mending_heal_SpellScript : public SpellScript + { + PrepareSpellScript(spell_pri_prayer_of_mending_heal_SpellScript); + + void HandleHeal(SpellEffIndex /*effIndex*/) + { + if (Unit* caster = GetOriginalCaster()) + { + if (Aura* aur = caster->GetAura(SPELL_T9_HEALING_2_PIECE)) + { + int32 heal = GetHitHeal(); + AddPctN(heal, aur->GetSpellInfo()->Effects[0]->CalcValue()); + SetHitHeal(heal); + } + } + + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_pri_prayer_of_mending_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_pri_prayer_of_mending_heal_SpellScript(); + } +}; + void AddSC_priest_spell_scripts() { new spell_pri_guardian_spirit(); - new spell_pri_mana_burn; - new spell_pri_pain_and_suffering_proc; - new spell_pri_penance; + new spell_pri_mana_burn(); + new spell_pri_pain_and_suffering_proc(); + new spell_pri_penance(); new spell_pri_reflective_shield_trigger(); new spell_pri_mind_sear(); + new spell_pri_prayer_of_mending_heal(); } -- cgit v1.2.3 From 13b68af78dbc51f44656ecfddb1bfb27dc44a21a Mon Sep 17 00:00:00 2001 From: Kandera Date: Wed, 25 Apr 2012 13:47:26 -0400 Subject: Core/Spells: Convert some spells from spell_scripts in the db to a generic spellscript. --- .../2012_04_25_02_world_spell_script_names.sql | 12 ++++++ src/server/scripts/Spells/spell_generic.cpp | 43 +++++++++++++++++++--- 2 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 sql/updates/world/2012_04_25_02_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql b/sql/updates/world/2012_04_25_02_world_spell_script_names.sql new file mode 100644 index 00000000000..6d8974664f4 --- /dev/null +++ b/sql/updates/world/2012_04_25_02_world_spell_script_names.sql @@ -0,0 +1,12 @@ +select id from spell_scripts where command = 18 order by id asc; +DELETE FROM `spell_scripts` WHERE `id` IN (15998,25952,29435,45980,51592,51910,52267,54420); +DELETE FROM `spell_script_names` WHERE `spell_id` IN (15998,25952,29435,45980,51592,51910,52267,54420); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(15998, 'spell_gen_despawn_self'), +(25952, 'spell_gen_despawn_self'), +(29435, 'spell_gen_despawn_self'), +(45980, 'spell_gen_despawn_self'), +(51592, 'spell_gen_despawn_self'), +(51910, 'spell_gen_despawn_self'), +(52267, 'spell_gen_despawn_self'), +(54420, 'spell_gen_despawn_self'); \ No newline at end of file diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 2d431331691..f7e895f97f4 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -169,7 +169,7 @@ class spell_gen_burn_brutallus : public SpellScriptLoader } }; -enum eCannibalizeSpells +enum CannibalizeSpells { SPELL_CANNIBALIZE_TRIGGERED = 20578, }; @@ -224,7 +224,7 @@ class spell_gen_cannibalize : public SpellScriptLoader }; // 45472 Parachute -enum eParachuteSpells +enum ParachuteSpells { SPELL_PARACHUTE = 45472, SPELL_PARACHUTE_BUFF = 44795, @@ -365,7 +365,7 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader }; // 66118 Leeching Swarm -enum eLeechingSwarmSpells +enum LeechingSwarmSpells { SPELL_LEECHING_SWARM_DMG = 66240, SPELL_LEECHING_SWARM_HEAL = 66125, @@ -481,7 +481,7 @@ class spell_gen_elune_candle : public SpellScriptLoader }; // 24750 Trick -enum eTrickSpells +enum TrickSpells { SPELL_PIRATE_COSTUME_MALE = 24708, SPELL_PIRATE_COSTUME_FEMALE = 24709, @@ -557,7 +557,7 @@ class spell_gen_trick : public SpellScriptLoader }; // 24751 Trick or Treat -enum eTrickOrTreatSpells +enum TrickOrTreatSpells { SPELL_TRICK = 24714, SPELL_TREAT = 24715, @@ -2656,6 +2656,38 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader int32 _damagePct; }; +class spell_gen_despawn_self : public SpellScriptLoader +{ +public: + spell_gen_despawn_self() : SpellScriptLoader("spell_gen_despawn_self") { } + + class spell_gen_despawn_self_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_despawn_self_SpellScript); + + bool Load() + { + return GetCaster()->GetTypeId() == TYPEID_UNIT; + } + void HandleDummy(SpellEffIndex effIndex) + { + GetCaster()->ToCreature()->DespawnOrUnsummon(); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_FIRST_FOUND, SPELL_EFFECT_DUMMY); + OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); + + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gen_despawn_self_SpellScript(); + } +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -2709,4 +2741,5 @@ void AddSC_generic_spell_scripts() new spell_gen_wg_water(); new spell_gen_count_pct_from_max_hp("spell_gen_default_count_pct_from_max_hp"); new spell_gen_count_pct_from_max_hp("spell_gen_50pct_count_pct_from_max_hp", 50); + new spell_gen_despawn_self(); } -- cgit v1.2.3 From 1b5fa3a6f3cc1ac0ace75a3d0676e7ea044eb0de Mon Sep 17 00:00:00 2001 From: Kandera Date: Wed, 25 Apr 2012 14:21:56 -0400 Subject: Core/Spells: fix sql file from previous commit and add newline after load function --- sql/updates/world/2012_04_25_02_world_spell_script_names.sql | 1 - src/server/scripts/Spells/spell_generic.cpp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql b/sql/updates/world/2012_04_25_02_world_spell_script_names.sql index 6d8974664f4..ea6b95559c6 100644 --- a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql +++ b/sql/updates/world/2012_04_25_02_world_spell_script_names.sql @@ -1,4 +1,3 @@ -select id from spell_scripts where command = 18 order by id asc; DELETE FROM `spell_scripts` WHERE `id` IN (15998,25952,29435,45980,51592,51910,52267,54420); DELETE FROM `spell_script_names` WHERE `spell_id` IN (15998,25952,29435,45980,51592,51910,52267,54420); INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index f7e895f97f4..3f75c7d41a9 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2669,6 +2669,7 @@ public: { return GetCaster()->GetTypeId() == TYPEID_UNIT; } + void HandleDummy(SpellEffIndex effIndex) { GetCaster()->ToCreature()->DespawnOrUnsummon(); -- cgit v1.2.3 From ede6c38a43f462356868bef6771f2fc09f6362e8 Mon Sep 17 00:00:00 2001 From: Kandera Date: Wed, 25 Apr 2012 15:17:38 -0400 Subject: DB/Spells: fixes the effect stacking of Greater/Blessing of Sanctuary/Kings. Closes #768 --- sql/updates/world/2012_04_25_03_world_spell_group.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/2012_04_25_03_world_spell_group.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_25_03_world_spell_group.sql b/sql/updates/world/2012_04_25_03_world_spell_group.sql new file mode 100644 index 00000000000..a6fa90ad41d --- /dev/null +++ b/sql/updates/world/2012_04_25_03_world_spell_group.sql @@ -0,0 +1,11 @@ +DELETE FROM `spell_group` WHERE `id` IN (1117,1118); +INSERT INTO `spell_group` (`id`,`spell_id`) VALUES +(1117,25898), +(1117,25899), +(1118,20911), +(1118,20217); + +DELETE FROM `spell_group_stack_rules` WHERE `group_id` in (1117,1118); +INSERT INTO `spell_group_stack_rules` (`group_id`,`stack_rule`) VALUES +(1117,3), +(1118,3); -- cgit v1.2.3 From aee77546e9a0be3a2d779d92aff7618732737a91 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 26 Apr 2012 09:13:07 -0400 Subject: Core/Spells,DB/Conditions: Fix startup errors associated with bf0d001cd3bc5347fecd92d8fbec2a196d6dcda9 and 13b68af78dbc51f44656ecfddb1bfb27dc44a21a Closes #6346 --- sql/updates/world/2012_04_26_00_world_conditions.sql | 1 + src/server/scripts/Spells/spell_generic.cpp | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 sql/updates/world/2012_04_26_00_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_26_00_world_conditions.sql b/sql/updates/world/2012_04_26_00_world_conditions.sql new file mode 100644 index 00000000000..943fe386085 --- /dev/null +++ b/sql/updates/world/2012_04_26_00_world_conditions.sql @@ -0,0 +1 @@ +UPDATE `conditions` SET `ElseGroup` = 0, `SourceGroup` = 0 WHERE `SourceEntry` IN (46485,46488) AND `ConditionValue2` = 26817; diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 3f75c7d41a9..13ea2740abb 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2672,14 +2672,13 @@ public: void HandleDummy(SpellEffIndex effIndex) { - GetCaster()->ToCreature()->DespawnOrUnsummon(); + if (GetSpellInfo()->Effects[effIndex].Effect == SPELL_EFFECT_DUMMY || GetSpellInfo()->Effects[effIndex].Effect = SPELL_EFFECT_SCRIPT_EFFECT) + GetCaster()->ToCreature()->DespawnOrUnsummon(); } void Register() { - OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_FIRST_FOUND, SPELL_EFFECT_DUMMY); - OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); - + OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); } }; -- cgit v1.2.3 From 0bd368db36b0f5c753284aa2a56033560d266fe7 Mon Sep 17 00:00:00 2001 From: kandera Date: Thu, 26 Apr 2012 10:16:57 -0300 Subject: DB/Conditions: fix conditions where claues from previous commit --- sql/updates/world/2012_04_26_00_world_conditions.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_26_00_world_conditions.sql b/sql/updates/world/2012_04_26_00_world_conditions.sql index 943fe386085..8d525cad057 100644 --- a/sql/updates/world/2012_04_26_00_world_conditions.sql +++ b/sql/updates/world/2012_04_26_00_world_conditions.sql @@ -1 +1 @@ -UPDATE `conditions` SET `ElseGroup` = 0, `SourceGroup` = 0 WHERE `SourceEntry` IN (46485,46488) AND `ConditionValue2` = 26817; +UPDATE `conditions` SET `ElseGroup` = 0, `SourceGroup` = 0 WHERE `SourceEntry` IN (46485,46488); -- cgit v1.2.3 From a97646ca5a9c1297744b1b5557984ab187ec4982 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 26 Apr 2012 12:46:02 -0400 Subject: DB/Conditions: fix another conditions error from bf0d001cd3bc5347fecd92d8fbec2a196d6dcda9 --- sql/updates/world/2012_04_26_01_world_conditions.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_04_26_01_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_26_01_world_conditions.sql b/sql/updates/world/2012_04_26_01_world_conditions.sql new file mode 100644 index 00000000000..c43f08652ba --- /dev/null +++ b/sql/updates/world/2012_04_26_01_world_conditions.sql @@ -0,0 +1 @@ +UPDATE `conditions` SET `source_type` = 0, `id` = 1 WHERE `entryorguid` = 25814 AND `source_type` = 1 AND `id` = 0; -- cgit v1.2.3 From 778afa11ac80837c877d043c6146e18c1aab89aa Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 26 Apr 2012 12:50:37 -0400 Subject: DB/SAI: andd now this should be fixed ONCE AND FOR ALL --- sql/updates/world/2012_04_26_01_world_conditions.sql | 1 - sql/updates/world/2012_04_26_01_world_smart_scripts.sql | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 sql/updates/world/2012_04_26_01_world_conditions.sql create mode 100644 sql/updates/world/2012_04_26_01_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_26_01_world_conditions.sql b/sql/updates/world/2012_04_26_01_world_conditions.sql deleted file mode 100644 index c43f08652ba..00000000000 --- a/sql/updates/world/2012_04_26_01_world_conditions.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `conditions` SET `source_type` = 0, `id` = 1 WHERE `entryorguid` = 25814 AND `source_type` = 1 AND `id` = 0; diff --git a/sql/updates/world/2012_04_26_01_world_smart_scripts.sql b/sql/updates/world/2012_04_26_01_world_smart_scripts.sql new file mode 100644 index 00000000000..e90e7b58433 --- /dev/null +++ b/sql/updates/world/2012_04_26_01_world_smart_scripts.sql @@ -0,0 +1 @@ +UPDATE `smart_scripts` SET `source_type` = 0, `id` = 1 WHERE `entryorguid` = 25814 AND `source_type` = 1 AND `id` = 0; -- cgit v1.2.3 From 51656d7e609a4a079e636c74e5f1cd34d9141742 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 27 Apr 2012 15:38:09 +0200 Subject: Scripts/Icecrown Citadel: Fixed Scent of Blood on heroic mode of Deathbringer Saurfang encounter --- .../world/2012_04_27_00_world_instance_icc.sql | 5 ++++ src/server/game/Spells/SpellEffects.cpp | 8 ++--- src/server/game/Spells/SpellMgr.cpp | 13 ++++++-- .../IcecrownCitadel/boss_deathbringer_saurfang.cpp | 35 +++++++++++++--------- 4 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 sql/updates/world/2012_04_27_00_world_instance_icc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_27_00_world_instance_icc.sql b/sql/updates/world/2012_04_27_00_world_instance_icc.sql new file mode 100644 index 00000000000..6738e4904ab --- /dev/null +++ b/sql/updates/world/2012_04_27_00_world_instance_icc.sql @@ -0,0 +1,5 @@ +DELETE FROM `creature_text` WHERE `entry`=37813 AND `groupid`=14; +INSERT INTO `creature_text` (`entry`,`groupid`,`text`,`type`,`comment`) VALUES (37813,14,'%s''s Blood Beasts gain the scent of blood!',41,'Deathbringer Saurfang - EMOTE_SCENT_OF_BLOOD'); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=72771; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(13,3,72771,31,3,38508,'Deathbringer Saurfang - Scent of Blood on Blood Beast'); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index c72ccbacc3d..d3566c24a48 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1085,10 +1085,6 @@ void Spell::EffectForceCast(SpellEffIndex effIndex) case 52349: // Overtake unitTarget->CastCustomSpell(unitTarget, spellInfo->Id, &damage, NULL, NULL, true, NULL, NULL, m_originalCasterGUID); return; - case 72378: // Blood Nova - case 73058: // Blood Nova - m_caster->CastSpell(unitTarget, damage, true); // additional spell cast - break; } } @@ -5710,9 +5706,9 @@ void Spell::EffectSummonDeadPet(SpellEffIndex /*effIndex*/) } if (!pet) return; - + player->GetMap()->CreatureRelocation(pet, x, y, z, player->GetOrientation()); - + pet->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE); pet->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); pet->setDeathState(ALIVE); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 3de87790be9..64e1527b8d3 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3346,13 +3346,22 @@ void SpellMgr::LoadDbcDataCorrections() case 70835: // Bone Storm (Lord Marrowgar) case 70836: // Bone Storm (Lord Marrowgar) case 72864: // Death Plague (Rotting Frost Giant) - case 72378: // Blood Nova (Deathbringer Saurfang) - case 73058: // Blood Nova (Deathbringer Saurfang) case 71160: // Plague Stench (Stinky) case 71161: // Plague Stench (Stinky) case 71123: // Decimate (Stinky & Precious) spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_100_YARDS; // 100yd break; + case 72378: // Blood Nova (Deathbringer Saurfang) + case 73058: // Blood Nova (Deathbringer Saurfang) + spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS; + spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_200_YARDS; + break; + case 72769: // Scent of Blood (Deathbringer Saurfang) + spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS; + // no break + case 72771: // Scent of Blood (Deathbringer Saurfang) + spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_200_YARDS; + break; case 72723: // Resistant Skin (Deathbringer Saurfang adds) // this spell initially granted Shadow damage immunity, however it was removed but the data was left in client spellInfo->Effect[2] = 0; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index e424cd16eaa..afc7c503bee 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -39,6 +39,7 @@ enum ScriptTexts SAY_FRENZY = 11, SAY_BERSERK = 12, SAY_DEATH = 13, + EMOTE_SCENT_OF_BLOOD = 14, // High Overlord Saurfang SAY_INTRO_HORDE_1 = 0, @@ -145,6 +146,7 @@ enum EventTypes EVENT_BOILING_BLOOD = 20, EVENT_BLOOD_NOVA = 21, EVENT_RUNE_OF_BLOOD = 22, + EVENT_SCENT_OF_BLOOD = 52, EVENT_OUTRO_ALLIANCE_1 = 23, EVENT_OUTRO_ALLIANCE_2 = 24, @@ -374,16 +376,13 @@ class boss_deathbringer_saurfang : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) summon->AI()->AttackStart(target); - if (IsHeroic()) - DoCast(summon, SPELL_SCENT_OF_BLOOD); - - summon->AI()->DoCast(summon, SPELL_BLOOD_LINK_BEAST, true); - summon->AI()->DoCast(summon, SPELL_RESISTANT_SKIN, true); + summon->CastSpell(summon, SPELL_BLOOD_LINK_BEAST, true); + summon->CastSpell(summon, SPELL_RESISTANT_SKIN, true); summons.Summon(summon); DoZoneInCombat(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) { summons.Despawn(summon); } @@ -463,18 +462,13 @@ class boss_deathbringer_saurfang : public CreatureScript DoCast(me, SPELL_SUMMON_BLOOD_BEAST_25_MAN+i25); Talk(SAY_BLOOD_BEASTS); events.ScheduleEvent(EVENT_SUMMON_BLOOD_BEAST, 40000, 0, PHASE_COMBAT); + if (IsHeroic()) + events.ScheduleEvent(EVENT_SCENT_OF_BLOOD, 10000, 0, PHASE_COMBAT); break; case EVENT_BLOOD_NOVA: - { - // select at range only - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -10.0f, true); - if (!target) - target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true); // noone? select melee - if (target) - DoCast(target, SPELL_BLOOD_NOVA_TRIGGER); + DoCastAOE(SPELL_BLOOD_NOVA_TRIGGER); events.ScheduleEvent(EVENT_BLOOD_NOVA, urand(20000, 25000), 0, PHASE_COMBAT); break; - } case EVENT_RUNE_OF_BLOOD: DoCastVictim(SPELL_RUNE_OF_BLOOD); events.ScheduleEvent(EVENT_RUNE_OF_BLOOD, urand(20000, 25000), 0, PHASE_COMBAT); @@ -487,6 +481,13 @@ class boss_deathbringer_saurfang : public CreatureScript DoCast(me, SPELL_BERSERK); Talk(SAY_BERSERK); break; + case EVENT_SCENT_OF_BLOOD: + if (!summons.empty()) + { + Talk(EMOTE_SCENT_OF_BLOOD); + DoCastAOE(SPELL_SCENT_OF_BLOOD); + } + break; default: break; } @@ -1237,10 +1238,16 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader unitList.push_back(target); } + void HandleForceCast(SpellEffIndex /*effIndex*/) + { + GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), TRIGGERED_FULL_MASK); + } + void Register() { OnUnitTargetSelect += SpellUnitTargetFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnUnitTargetSelect += SpellUnitTargetFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_nova_targeting_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } Unit* target; -- cgit v1.2.3 From 13aef050799a09d6b2e1b634208a6e8823c0875e Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 28 Apr 2012 09:46:40 +0200 Subject: DB/Loot: Ulduar Descent into Madness bosses loot --- ...2012_04_28_00_world_reference_loot_template.sql | 158 +++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 sql/updates/world/2012_04_28_00_world_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql b/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql new file mode 100644 index 00000000000..b59ba90fdbc --- /dev/null +++ b/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql @@ -0,0 +1,158 @@ +-- The Descent into Madness +-- References +-- ------------------------------- +-- -- Variables and definitions -- +-- ------------------------------- +-- Set References +SET @Vezax10Ref := 34373; +SET @Vezax25Ref := @Vezax10Ref+1; +SET @Yogg10Ref := @Vezax10Ref+2; +SET @Yogg25Ref := @Vezax10Ref+3; +SET @Chest := 12034; +SET @Shoulder := 12035; +SET @EmblemRef := 34349; +SET @Recipe := 34154; +SET @Vezax10 := 33271; +SET @Vezax25 := 33449; +SET @Yogg10 := 33288; +SET @Yogg25 := 33955; + +-- ------------------------- +-- -- Reference Templates -- +-- ------------------------- +-- Delete previous templates if existing +DELETE FROM `reference_loot_template` WHERE `entry` IN (34131,34132,34133,34164,34165); +DELETE FROM `reference_loot_template` WHERE `entry` IN (@Vezax10Ref,@Vezax25Ref,@Yogg10Ref,@Yogg25Ref,@Chest,@Shoulder); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Vezax 10 man +(@Vezax10Ref,46014,0,1,1,1,1), -- Saronite Animus Cloak +(@Vezax10Ref,46008,0,1,1,1,1), -- Choker of the Abyss +(@Vezax10Ref,46010,0,1,1,1,1), -- Darkstone Ring +(@Vezax10Ref,45996,0,1,1,1,1), -- Hoperender +(@Vezax10Ref,46015,0,1,1,1,1), -- Pendant of Endless Despair +(@Vezax10Ref,46013,0,1,1,1,1), -- Underworld Mantle +(@Vezax10Ref,46012,0,1,1,1,1), -- Vestments of the Piercing Light +(@Vezax10Ref,46009,0,1,1,1,1), -- Bindings of the Depths +(@Vezax10Ref,45997,0,1,1,1,1), -- Gauntlets of the Wretched +(@Vezax10Ref,46011,0,1,1,1,1), -- Shadowbite +-- Vezax 25 man +(@Vezax25Ref,45513,0,1,1,1,1), -- Boots of the Forgotten Dephts +(@Vezax25Ref,45509,0,1,1,1,1), -- Idol of the Corruptor +(@Vezax25Ref,45501,0,1,1,1,1), -- Boots of the Underdweller +(@Vezax25Ref,45512,0,1,1,1,1), -- Grips of the Unbroken +(@Vezax25Ref,45503,0,1,1,1,1), -- Metallic Loop of the Sufferer +(@Vezax25Ref,45505,0,1,1,1,1), -- Belt of Clinging Hope +(@Vezax25Ref,45502,0,1,1,1,1), -- Helm of the Faceless +(@Vezax25Ref,45145,0,1,1,1,1), -- Libram of the Sacred Shield +(@Vezax25Ref,45508,0,1,1,1,1), -- Belt of the Darkspeaker +(@Vezax25Ref,45504,0,1,1,1,1), -- Darkcore Leggings +(@Vezax25Ref,45514,0,1,1,1,1), -- Mantle of the Unknowing +(@Vezax25Ref,45515,0,1,1,1,1), -- Ring of the Vacant Eye +(@Vezax25Ref,45507,0,1,1,1,1), -- The General's Heart +-- Yogg 10 man +(@Yogg10Ref,46016,0,1,1,1,1), -- Abaddon +(@Yogg10Ref,46018,0,1,1,1,1), -- Deliverance +(@Yogg10Ref,46019,0,1,1,1,1), -- Leggings of the Insatiable +(@Yogg10Ref,46021,0,1,1,1,1), -- Royal Seal of King Llane +(@Yogg10Ref,46022,0,1,1,1,1), -- Pendant of a Thousand Maws +(@Yogg10Ref,46024,0,1,1,1,1), -- Kingsbane +(@Yogg10Ref,46025,0,1,1,1,1), -- Devotion +(@Yogg10Ref,46028,0,1,1,1,1), -- Faceguard of the Eyeless Horror +(@Yogg10Ref,46030,0,1,1,1,1), -- Threads of the Dragon Council +(@Yogg10Ref,46031,0,1,1,1,1), -- Touch of Madness +-- Yogg 25 man +(@Yogg25Ref,45521,0,1,1,1,1), -- Earthshaper +(@Yogg25Ref,45522,0,1,1,1,1), -- Blood of the Old God +(@Yogg25Ref,45523,0,1,1,1,1), -- Garona's Guise +(@Yogg25Ref,45524,0,1,1,1,1), -- Chestguard of Insidious Intent +(@Yogg25Ref,45525,0,1,1,1,1), -- Godbane Signet +(@Yogg25Ref,45527,0,1,1,1,1), -- Soulscribe +(@Yogg25Ref,45529,0,1,1,1,1), -- Shawl of Haunted Memories +(@Yogg25Ref,45530,0,1,1,1,1), -- Sanity's Bond +(@Yogg25Ref,45531,0,1,1,1,1), -- Chestguard of the Fallen God +(@Yogg25Ref,45532,0,1,1,1,1), -- Cowl of Dark Whispers +-- Chest for Yogg +(@Chest,45635,0,1,1,1,1), -- Chestguard of the Wayward Conqueror +(@Chest,45636,0,1,1,1,1), -- Chestguard of the Wayward Protector +(@Chest,45637,0,1,1,1,1), -- Chestguard of the Wayward Vanquisher +(@Shoulder,45656,0,1,1,1,1), -- Mantle of the Wayward Conqueror +(@Shoulder,45657,0,1,1,1,1), -- Mantle of the Wayward Protector +(@Shoulder,45658,0,1,1,1,1); -- Mantle of the Wayward Vanquisher + +DELETE FROM `creature_loot_template` WHERE `entry` IN(@Vezax10,@Vezax25,@Yogg10,@Yogg25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ---------------------------------------------------------- +-- General Vezax +-- ---------------------------------------------------------- +-- 10 man mode +(@Vezax10,1,100,3,0,-@Vezax10Ref,2), -- 2x Normal Loot Item +(@Vezax10,47241,100,3,0,1,1), -- 1x Emblem of Triumph +-- hardmode loot 10 +(@Vezax10,46032,0,2,1,1,1), -- Drape of the Faceless General +(@Vezax10,46034,0,2,1,1,1), -- Leggings of Profound Darkness +(@Vezax10,46033,0,2,1,1,1), -- Tortured Earth +(@Vezax10,46035,0,2,1,1,1), -- Aesuga, Hand of the Ardent Champion +(@Vezax10,46036,0,2,1,1,1), -- Void Sabre +-- 25 man mode +(@Vezax25,1,100,3,0,-@Vezax25Ref,3), -- 3x Normal Loot Item +(@Vezax25,47241,100,3,0,1,1), -- 1x Emblem of Triumph +(@Vezax25,2,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Vezax25,3,10,1,0,-34350,1), -- Chance on Runed Orb +-- hardmode loot 25 +(@Vezax25,45498,0,2,1,1,1), -- Lotrafen, Spear of the Damned +(@Vezax25,45511,0,2,1,1,1), -- Scepter of Lost Souls +(@Vezax25,45516,0,2,1,1,1), -- Voldrethar, Dark Blade of Oblivion +(@Vezax25,45517,0,2,1,1,1), -- Pendulum of Infinity +(@Vezax25,45519,0,2,1,1,1), -- Vestments of the Blind Denizen +(@Vezax25,45518,0,2,1,1,1), -- Flare of the Heavens +(@Vezax25,45520,0,2,1,1,1), -- Handwraps of the Vigilant +-- ---------------------------------------------------------- +-- Yogg Saron +-- ---------------------------------------------------------- +-- 10 man +-- All modes +(@Yogg10,1,100,31,0,-@Yogg10Ref,1), -- 1x Normal Loot item for modes 0&1&2&3&4 +(@Yogg10,2,100,31,0,-@Chest,1), -- 1x Tier token for modes 0&1&2&3&4 +(@Yogg10,47241,100,31,0,1,1), -- 1x Emblem of Triumph for modes 0&1&2&3&4 +-- Extra for <3 watchers +(@Yogg10,3,100,30,0,-@EmblemRef,1), -- additional Emblem for modes2&3 +-- Extra for <2 watchers +(@Yogg10,4,100,28,0,-34350,1), -- Runed Orb for 0&1&2 +(@Yogg10,5,10,28,0,-@Recipe,1), -- Chance on Recipe for 0&1&2 +-- Extra for <1 watchers +(@Yogg10,6,100,24,0,-@EmblemRef,1), -- additional Emblem for 0&1 +(@Yogg10,7,100,24,0,-@Recipe,1), -- Garanteed Recipe for 0&1 +-- Hardmode 10 loot +(@Yogg10,46067,0,24,1,1,1), -- Hammer of Crushing Whispers +(@Yogg10,46068,0,24,1,1,1), -- Amice of Inconceivable Horror +(@Yogg10,46095,0,24,1,1,1), -- Soul-Devouring Cinch +(@Yogg10,46096,0,24,1,1,1), -- Signet of Soft Lament +(@Yogg10,46097,0,24,1,1,1), -- Caress of Insanity +-- Extra for 0 watchers +(@Yogg10,46312,100,16,0,1,1), -- Vanquished Clutches of Yogg-Saron +-- 25 man mode +-- All modes +(@Yogg25,1,100,31,0,-@Yogg25Ref,2), -- 2x Normal Loot item for modes 0&1&2&3&4 +(@Yogg25,2,100,31,0,-@Shoulder,2), -- 2x Tier token for modes 0&1&2&3&4 +(@Yogg25,47241,100,31,0,1,1), -- 1x Emblem of Triumph for modes 0&1&2&3&4 +(@Yogg25,3,10,31,0,-34350,1), -- Chance on Runed Orb for modes 0&1&2&3&4 +(@Yogg25,4,10,31,0,-@Recipe,1), -- Chance on Recipe for 0&1&2&3&4 +(@Yogg25,45897,100,31,0,1,1), -- Fragment of Val'anyr +-- Extra for <3 watchers +(@Yogg25,5,100,30,0,-@EmblemRef,1), -- additional Emblem for modes2&3 +-- Extra for <2 watchers +(@Yogg25,6,100,28,0,-34350,1), -- Runed Orb for 0&1&2 +-- Extra for <1 watchers +(@Yogg25,7,100,24,0,-@EmblemRef,1), -- additional Emblem for 0&1 +(@Yogg25,8,100,24,0,-@Recipe,1), -- Garanteed Recipe for 0&1 +-- Hardmode 25 loot +(@Yogg25,45533,0,24,1,1,1), -- Dark Edge of Depravity +(@Yogg25,45534,0,24,1,1,1), -- Seal of the Betrayed King +(@Yogg25,45535,0,24,1,1,1), -- Show of Faith +(@Yogg25,45536,0,24,1,1,1), -- Legguards of Cunning Deception +(@Yogg25,45537,0,24,1,1,1), -- Threads of the False Oracle +-- Extra for 0 watchers +(@Yogg25,45693,100,16,0,1,1); -- Mimiron's Head + +-- Cleanups +DELETE FROM `conditions` WHERE `SourceEntry`=45897 AND `SourceGroup`=33955; \ No newline at end of file -- cgit v1.2.3 From d6666386cd7d1667548fadda628ec9e53a39a035 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 28 Apr 2012 10:26:25 +0200 Subject: DB/Loot: Cleanup some ugly reference_templates --- ...2012_04_28_01_world_reference_loot_template.sql | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 sql/updates/world/2012_04_28_01_world_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql b/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql new file mode 100644 index 00000000000..e46c45e497a --- /dev/null +++ b/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql @@ -0,0 +1,22 @@ +SET @Triumph :=47241; +-- Cleanup some unneeded references +DELETE FROM `reference_loot_template` WHERE `entry` IN (34167,34168,34169); +UPDATE `creature_loot_template` SET `mincountOrRef`=-34349 WHERE `mincountOrRef` IN (-34167,-34168,-34169); +-- Fix this weird defined reference for ulduar +UPDATE `reference_loot_template` SET `ChanceOrQuestChance`=100,`groupid`=0 WHERE `entry`=34349; +-- Remove Emblem of Triumph from reference_loot +DELETE FROM `reference_loot_template` WHERE `item`=@Triumph AND `entry`IN (12025,35034,35040,35049); +-- Actual Emblem on creature as it should be +DELETE FROM `creature_loot_template` WHERE `entry` IN (30397,30398,31365,31367,31656,31679) AND `item`=@Triumph; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(30397,@Triumph,100,1,0,1,1), -- Commander Kolurg (1) +(30398,@Triumph,100,1,0,1,1), -- Commander Stoutbeard (1) +(31365,@Triumph,100,1,0,1,1), -- Drakkari Colossus (1) +(31367,@Triumph,100,1,0,1,1), -- Drakkari Elemental (1) +(31656,@Triumph,100,1,0,1,1), -- Dalronn the Controller (1) +(31679,@Triumph,100,1,0,1,1); -- Skarvald the Constructor (1) +-- Similar action for gameobjects +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (27416,27417) AND `item`=@Triumph; +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(27417,@Triumph,100,1,0,1,1), -- Confessor's Cache +(27416,@Triumph,100,1,0,1,1); -- Eadric's Cache -- cgit v1.2.3 From 73da25007e16239cefe543f86f00aa99bfda3d02 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 1 May 2012 17:10:20 -0230 Subject: DB/Creature: Add missing Challe & Orphan Matron Aria Spawns --- sql/updates/world/2012_05_1_00_world_creature.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2012_05_1_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_1_00_world_creature.sql b/sql/updates/world/2012_05_1_00_world_creature.sql new file mode 100644 index 00000000000..367800ee613 --- /dev/null +++ b/sql/updates/world/2012_05_1_00_world_creature.sql @@ -0,0 +1,9 @@ +-- Add missing Challe & Orphan Matron Aria Spawns +SET @GUID := 41876; +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,23101,530,1,1,-480.4989,7499.029,181.2889,3.560472,120,0,0,1,0,0), +(@GUID+1,34365,571,1,1,5716.604,642.8611,646.2927,5.88176,120,0,0,1,0,0); +-- Add to game event creature +DELETE FROM `game_event_creature` WHERE `guid`=@GUID+1; +INSERT INTO `game_event_creature` (`eventEntry`,`guid`) VALUES (10,@GUID+1); -- cgit v1.2.3 From d8e4e164c6b54444a233db9613f4564085410c7d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 1 May 2012 17:14:24 -0230 Subject: DB/Creature: Fix error in previous commit. --- sql/updates/world/2012_05_1_00_world_creature.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_1_00_world_creature.sql b/sql/updates/world/2012_05_1_00_world_creature.sql index 367800ee613..c0509d0d132 100644 --- a/sql/updates/world/2012_05_1_00_world_creature.sql +++ b/sql/updates/world/2012_05_1_00_world_creature.sql @@ -2,8 +2,8 @@ SET @GUID := 41876; DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES -(@GUID,23101,530,1,1,-480.4989,7499.029,181.2889,3.560472,120,0,0,1,0,0), -(@GUID+1,34365,571,1,1,5716.604,642.8611,646.2927,5.88176,120,0,0,1,0,0); +(@GUID,23101,530,1,1,0,0,-480.4989,7499.029,181.2889,3.560472,120,0,0,1,0,0), +(@GUID+1,34365,571,1,1,0,0,5716.604,642.8611,646.2927,5.88176,120,0,0,1,0,0); -- Add to game event creature DELETE FROM `game_event_creature` WHERE `guid`=@GUID+1; INSERT INTO `game_event_creature` (`eventEntry`,`guid`) VALUES (10,@GUID+1); -- cgit v1.2.3 From 28da592ad13e05eb6b25335fa83bfd4da80fdc94 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 2 May 2012 23:08:10 +0200 Subject: DB/Loot: Add loot for 25 man to Stinky & Precious, Add Skinning loot; Fix naming in previous SQL submission Closes #6370 --- sql/updates/world/2012_05_01_00_world_creature.sql | 9 +++++++++ sql/updates/world/2012_05_02_00_world_creature_loot_template.sql | 8 ++++++++ sql/updates/world/2012_05_1_00_world_creature.sql | 9 --------- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2012_05_01_00_world_creature.sql create mode 100644 sql/updates/world/2012_05_02_00_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_05_1_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_01_00_world_creature.sql b/sql/updates/world/2012_05_01_00_world_creature.sql new file mode 100644 index 00000000000..c0509d0d132 --- /dev/null +++ b/sql/updates/world/2012_05_01_00_world_creature.sql @@ -0,0 +1,9 @@ +-- Add missing Challe & Orphan Matron Aria Spawns +SET @GUID := 41876; +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,23101,530,1,1,0,0,-480.4989,7499.029,181.2889,3.560472,120,0,0,1,0,0), +(@GUID+1,34365,571,1,1,0,0,5716.604,642.8611,646.2927,5.88176,120,0,0,1,0,0); +-- Add to game event creature +DELETE FROM `game_event_creature` WHERE `guid`=@GUID+1; +INSERT INTO `game_event_creature` (`eventEntry`,`guid`) VALUES (10,@GUID+1); diff --git a/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql b/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql new file mode 100644 index 00000000000..f0721e63635 --- /dev/null +++ b/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql @@ -0,0 +1,8 @@ +DELETE FROM `creature_loot_template` WHERE `entry` IN(38064,38103); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Precious 25 man +(38103,1,100,1,0,-35069,2), -- Two From ICC Trashgenerated on Precious +(38103,52019,30,1,0,1,1), -- Precious Ribbon on Precious +(38064,1,100,1,0,-35069,2); -- Two From ICC Trashgenerated on Stinky +-- add skinning loot for Stinky & Precious +UPDATE `creature_template` SET `skinloot`=70214 WHERE `entry` IN (37025,38064,37217,38103); diff --git a/sql/updates/world/2012_05_1_00_world_creature.sql b/sql/updates/world/2012_05_1_00_world_creature.sql deleted file mode 100644 index c0509d0d132..00000000000 --- a/sql/updates/world/2012_05_1_00_world_creature.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Add missing Challe & Orphan Matron Aria Spawns -SET @GUID := 41876; -DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES -(@GUID,23101,530,1,1,0,0,-480.4989,7499.029,181.2889,3.560472,120,0,0,1,0,0), -(@GUID+1,34365,571,1,1,0,0,5716.604,642.8611,646.2927,5.88176,120,0,0,1,0,0); --- Add to game event creature -DELETE FROM `game_event_creature` WHERE `guid`=@GUID+1; -INSERT INTO `game_event_creature` (`eventEntry`,`guid`) VALUES (10,@GUID+1); -- cgit v1.2.3 From 224d85fe11d519c47f91f65670c60aad9669032b Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Thu, 3 May 2012 13:39:14 +0200 Subject: DB/Spawns: Readd the rare spawns that got overwritten --- sql/updates/world/2012_05_03_00_world_creature.sql | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 sql/updates/world/2012_05_03_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_03_00_world_creature.sql b/sql/updates/world/2012_05_03_00_world_creature.sql new file mode 100644 index 00000000000..d906dba78bc --- /dev/null +++ b/sql/updates/world/2012_05_03_00_world_creature.sql @@ -0,0 +1,29 @@ +SET @GUID1 := 42158; +SET @GUID2 := 42159; +-- add creature +DELETE FROM creature WHERE guid IN (@GUID1,@GUID2); +INSERT INTO `creature` +(`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`) +VALUES +(@GUID1 ,38453,571,1,1,3561.821,-2736.367,136.0317,0), -- Arcturis in Grizzly Hills +(@GUID2,35189,571,1,1,7101.845,-1443.734,924.2609,0.178631); -- Skoll in The Storm Peaks +-- Update template +UPDATE `creature_template` SET `faction_A` = 190, `faction_H`=190 WHERE `entry` IN (38453,35189); +SET @NPC= @GUID1*10; +-- Add pathing for Arcturis +DELETE FROM `creature_addon` WHERE `guid` = @GUID1; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@GUID1,@NPC,0,0,0,0,''); -- Add path for Acturis +-- Add waypoint data for the path: +DELETE FROM `waypoint_data` WHERE `id`=@NPC; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES +(@NPC,1,3563.499,-2737.698,137.1898), +(@NPC,2,3565.249,-2738.698,138.4398), +(@NPC,3,3566.749,-2739.948,139.9398), +(@NPC,4,3568.249,-2740.698,140.6898), +(@NPC,5,3567.839,-2741.380,141.9256), +(@NPC,6,3569.999,-2741.948,142.1898), +(@NPC,7,3570.749,-2742.448,143.1898), +(@NPC,8,3572.676,-2743.528,144.8479); +-- Spawntimefix +UPDATE `creature` SET `spawntimesecs`=39600 WHERE `guid` IN (@GUID1,@GUID2); -- Set the spawntime to 11 hours for Arcturis & Skoll -- cgit v1.2.3 From 9614d495986317b47b81d3d1b7a87964a3312163 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 3 May 2012 08:53:24 -0400 Subject: DB/Misc: bunch of updates for culling of stratholme. fixes the end spell for credit. adds spawns for the second area. corrects a ton of texts. fixes some db issues --- sql/updates/world/2012_05_03_01_world_cos_misc.sql | 153 +++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 sql/updates/world/2012_05_03_01_world_cos_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_03_01_world_cos_misc.sql b/sql/updates/world/2012_05_03_01_world_cos_misc.sql new file mode 100644 index 00000000000..6c2ea6d3a95 --- /dev/null +++ b/sql/updates/world/2012_05_03_01_world_cos_misc.sql @@ -0,0 +1,153 @@ +UPDATE `script_texts` SET `emote` = 432 WHERE `entry` IN (-1595111); +UPDATE `script_texts` SET `emote` = 396 WHERE `entry` IN (-1595070,-1595075,-1595078,-1595079,-1595088,-1595103,-1595106,-1595107,-1595108,-1595109,-1595113,-1595114,-1595115,-1595116); +UPDATE `script_texts` SET `emote` = 397 WHERE `entry` IN (-1595071,-1595084,-1595093); +UPDATE `script_texts` SET `emote` = 274 WHERE `entry` IN (-1595091); +UPDATE `script_texts` SET `emote` = 5 WHERE `entry` IN (-1595073,-1595118); +UPDATE `script_texts` SET `emote` = 6 WHERE `entry` IN (-1595076); +UPDATE `script_texts` SET `emote` = 1 WHERE `entry` IN (-1595083,-1595100,-1595104,-1595120); +UPDATE `script_texts` SET `emote` = 0 WHERE `entry` IN (-1595009,-1595010,-1595081,-1595082,-1595085,-1595119); + +UPDATE `script_texts` SET `type` = 1 WHERE `entry` IN (-1595009,-1595010,-1595087,-1595094,-1595095,-1595093); +UPDATE `script_texts` SET `type` = 0 WHERE `entry` IN (-1595077,-1595078,-1595119); + +UPDATE `script_texts` SET `content_default` = "Champions, meet me at the Town Hall at once. We must take the fight to Mal'Ganis." WHERE `entry` = -1595095; +UPDATE `script_texts` SET `content_default` = "Follow me, I know the way through." WHERE `entry` = -1595096; +UPDATE `script_texts` SET `content_default` = "Take position here, and I will lead a small force inside Stratholme to begin the culling. We must contain and purge the infected for the sake of all of Lordaeron!" WHERE entry = -1595087; +UPDATE `script_texts` SET `content_default` = "Ah, you've finally arrived Prince Arthas. You're here just in the nick of time." WHERE `entry` = -1595097; +UPDATE `script_texts` SET `content_default` = "Yes, I'm glad I could get to you before the plague." WHERE `entry` = -1595098; +UPDATE `script_texts` SET `content_default` = "As if I could forget. Listen, Uther, there's something about the plague you should know..." WHERE `entry` = -1595072; +UPDATE `script_texts` SET `content_default` = "There's no need for you to understand, Arthas. All you need to do is die." WHERE `entry` = -1595100; +UPDATE `script_texts` SET `content_default` = "More vile sorcery! Be ready for anything!" WHERE `entry` = -1595102; +UPDATE `script_texts` SET `content_default` = "Watch your backs: they have us surrounded in this hall." WHERE `entry` = -1595104; +UPDATE `script_texts` SET `content_default` = "Mal'Ganis is not making this easy." WHERE `entry` = -1595106; +UPDATE `script_texts` SET `content_default` = "What else can he put in my way?" WHERE `entry` = -1595108; +UPDATE `script_texts` SET `content_default` = "I do what I must for Lordaeron, and neither your words nor your actions will stop me." WHERE `entry` = -1595109; +UPDATE `script_texts` SET `content_default` = "The quickest path to Mal'Ganis lies behind that bookshelf ahead." WHERE `entry` = -1595110; +UPDATE `script_texts` SET `content_default` = "I'm relieved this secret passage still works." WHERE `entry` = -1595112; +UPDATE `script_texts` SET `content_default` = "Let's move through here as quickly as possible. If the undead don't kill us, the fires might." WHERE `entry` = -1595113; +UPDATE `script_texts` SET `content_default` = "Rest a moment and clear your lungs, but we must move again soon." WHERE `entry` = -1595114; +UPDATE `script_texts` SET `content_default` = "That's enough; we must move again. Mal'Ganis awaits." WHERE `entry` = -1595115; +UPDATE `script_texts` SET `content_default` = "At last some good luck. Market Row has not caught fire yet. Mal'Ganis is supposed to be in Crusaders' Square, which is just ahead. Tell me when you're ready to move forward." WHERE `entry` = -1595116; +UPDATE `script_texts` SET `content_default` = "Justice will be done." WHERE `entry` = -1595117; +UPDATE `script_texts` SET `content_default` = "We're going to finish this right now, Mal'Ganis. Just you... and me." WHERE `entry` = -1595118; + +UPDATE `script_texts` SET `comment` = concat(`comment`,". NEEDS VERIFICATION") WHERE `entry` IN (-1595101,-1595105); + +SET @GUID := 88474; +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+00,27737,595,3,1,25543,0,2319.89,1285.78,131.407,1.72169,60,10,0,630,0,1,0,0,0), +(@GUID+01,27737,595,3,1,10979,0,2308.12,1304.21,127.601,4.39662,60,10,0,630,0,1,0,0,0), +(@GUID+02,27737,595,3,1,25542,0,2335.47,1262.04,132.921,1.42079,60,10,0,630,0,1,0,0,0), +(@GUID+03,27737,595,3,1,25543,0,2297.73,1338.75,124.622,2.5574,60,10,0,630,0,1,0,0,0), +(@GUID+04,27737,595,3,1,10979,0,2322.65,1265.39,133.033,5.6524,60,10,0,630,0,1,0,0,0), +(@GUID+05,27737,595,3,1,10973,0,2277.83,1331.92,124.19,3.48045,60,10,0,630,0,1,0,0,0), +(@GUID+06,27737,595,3,1,25543,0,2294.18,1316.93,125.672,6.05649,60,10,0,630,0,1,0,0,0), +(@GUID+07,27737,595,3,1,10973,0,2310.56,1369,128.372,5.03364,60,10,0,630,0,1,0,0,0), +(@GUID+08,27737,595,3,1,10979,0,2306.15,1322.85,125.708,4.99133,60,10,0,630,0,1,0,0,0), +(@GUID+09,27737,595,3,1,10973,0,2320.14,1297.48,129.694,1.35248,60,10,0,630,0,1,0,0,0), +(@GUID+10,27737,595,3,1,25542,0,2291.57,1327.27,124.545,5.32358,60,10,0,630,0,1,0,0,0), +(@GUID+11,27737,595,3,1,25542,0,2308.04,1352.65,126.907,5.83741,60,10,0,630,0,1,0,0,0), +(@GUID+12,27737,595,3,1,10979,0,2329.44,1281.11,132.636,2.25207,60,10,0,630,0,1,0,0,0), +(@GUID+13,27737,595,3,1,0,0,2407.32,1423.8,131.522,6.24743,60,10,0,706,0,1,0,0,0), +(@GUID+14,27737,595,3,1,0,0,2417.26,1428.41,131.652,6.20423,60,10,0,730,0,1,0,0,0), +(@GUID+15,27737,595,3,1,0,0,2420.48,1419.99,130.716,0.0977616,60,10,0,706,0,1,0,0,0), +(@GUID+16,27737,595,3,1,0,0,2426.63,1413.41,130.464,0.404064,60,10,0,730,0,1,0,0,0), +(@GUID+17,27737,595,3,1,0,0,2430.46,1417.6,130.557,0.125247,60,10,0,730,0,1,0,0,0), +(@GUID+18,27737,595,3,1,0,0,2433.94,1427.03,131.18,0.0584885,60,10,0,706,0,1,0,0,0), +(@GUID+19,27737,595,3,1,0,0,2446.5,1428.37,131.013,6.10606,60,10,0,756,0,1,0,0,0), +(@GUID+20,27737,595,3,1,0,0,2449.49,1423.35,130.588,5.77619,60,10,0,706,0,1,0,0,0), +(@GUID+21,27737,595,3,1,0,0,2441.92,1424.41,130.606,6.07857,60,10,0,706,0,1,0,0,0), +(@GUID+22,27737,595,3,1,0,0,2450.6,1438.61,132.213,4.74889,60,10,0,730,0,1,0,0,0), +(@GUID+23,27737,595,3,1,0,0,2460.17,1436.46,131.501,4.73711,60,10,0,756,0,1,0,0,0), +(@GUID+24,27737,595,3,1,0,0,2444.68,1421.68,130.324,6.01338,60,10,0,756,0,1,0,0,0), +(@GUID+25,27737,595,3,1,0,0,2456.87,1419.07,130.488,5.39763,60,10,0,706,0,1,0,0,0), +(@GUID+26,27737,595,3,1,0,0,2464.27,1422.15,130.976,5.22092,60,10,0,756,0,1,0,0,0), +(@GUID+27,27737,595,3,1,0,0,2468.21,1403.06,130.39,5.6364,60,10,0,756,0,1,0,0,0), +(@GUID+28,27737,595,3,1,0,0,2460.88,1406.8,130.508,5.96234,60,10,0,756,0,1,0,0,0), +(@GUID+29,27737,595,3,1,0,0,2485.77,1398.35,130.795,4.71591,60,10,0,756,0,1,0,0,0), +(@GUID+30,27737,595,3,1,0,0,2485.79,1380.46,130.15,5.02928,60,10,0,730,0,1,0,0,0), +(@GUID+31,27737,595,3,1,0,0,2475.77,1396.31,130.124,4.84079,60,10,0,730,0,1,0,0,0), +(@GUID+32,27737,595,3,1,0,0,2476.92,1387.21,129.401,5.05128,60,10,0,730,0,1,0,0,0), +(@GUID+33,27737,595,3,1,0,0,2483.24,1389.37,130.123,4.74104,60,10,0,730,0,1,0,0,0), +(@GUID+34,27737,595,3,1,0,0,2480.2,1370.15,129.533,5.79583,60,10,0,706,0,1,0,0,0), +(@GUID+35,27737,595,3,1,0,0,2481.54,1375.11,129.642,5.4644,60,10,0,730,0,1,0,0,0), +(@GUID+36,27737,595,3,1,0,0,2489.44,1359.42,131.233,5.378,60,10,0,730,0,1,0,0,0), +(@GUID+37,27737,595,3,1,0,0,2486.59,1356.19,131.876,5.7275,60,10,0,756,0,1,0,0,0), +(@GUID+38,27737,595,3,1,0,0,2495.53,1348.61,133.072,5.52722,60,10,0,730,0,1,0,0,0), +(@GUID+39,27737,595,3,1,0,0,2504.48,1349.65,132.856,5.11881,60,10,0,730,0,1,0,0,0), +(@GUID+40,27737,595,3,1,0,0,2493.11,1380.29,130.24,4.93189,60,10,0,706,0,1,0,0,0), +(@GUID+41,27737,595,3,1,0,0,2487.18,1392.64,130.512,4.93818,60,10,0,706,0,1,0,0,0), +(@GUID+42,27737,595,3,1,0,0,2506.49,1336.89,132.794,5.19343,60,10,0,756,0,1,0,0,0), +(@GUID+43,27737,595,3,1,0,0,2518.2,1306.39,130.623,4.81723,60,10,0,756,0,1,0,0,0), +(@GUID+44,27737,595,3,1,0,0,2513.4,1299.67,130.868,4.4206,60,10,0,756,0,1,0,0,0), +(@GUID+45,27737,595,3,1,0,0,2511.45,1291.47,130.808,5.00729,60,10,0,756,0,1,0,0,0), +(@GUID+46,27737,595,3,1,0,0,2518.56,1292.32,130.528,5.16438,60,10,0,756,0,1,0,0,0), +(@GUID+47,27737,595,3,1,0,0,2515.49,1279.85,129.214,5.28847,60,10,0,730,0,1,0,0,0), +(@GUID+48,27737,595,3,1,0,0,2514.37,1285.92,129.934,5.70473,60,10,0,706,0,1,0,0,0), +(@GUID+49,27737,595,3,1,0,0,2522.65,1274.29,128.576,5.44634,60,10,0,706,0,1,0,0,0), +(@GUID+50,27737,595,3,1,0,0,2535.38,1275.77,127.42,5.49817,60,10,0,756,0,1,0,0,0), +(@GUID+51,27737,595,3,1,0,0,2537.59,1273.1,127.05,5.02693,60,10,0,730,0,1,0,0,0), +(@GUID+52,27737,595,3,1,0,0,2547.49,1261.7,126.44,4.78425,60,10,0,730,0,1,0,0,0), +(@GUID+53,27737,595,3,1,0,0,2534.36,1261.06,127.125,4.3994,60,10,0,756,0,1,0,0,0), +(@GUID+54,27737,595,3,1,0,0,2532.69,1251.44,127.452,5.4479,60,10,0,730,0,1,0,0,0), +(@GUID+55,27737,595,3,1,0,0,2551.84,1252.35,125.455,5.04342,60,10,0,706,0,1,0,0,0), +(@GUID+56,27737,595,3,1,0,0,2536.1,1244,126.928,5.16515,60,10,0,756,0,1,0,0,0), +(@GUID+57,27737,595,3,1,0,0,2543.63,1247.23,126.131,5.19735,60,10,0,706,0,1,0,0,0), +(@GUID+58,27737,595,3,1,0,0,2554.21,1238.95,125.475,4.64836,60,10,0,730,0,1,0,0,0), +(@GUID+59,27737,595,3,1,0,0,2548.89,1227.37,126.375,5.31517,60,10,0,756,0,1,0,0,0), +(@GUID+60,27737,595,3,1,0,0,2560.46,1225.4,125.496,4.85335,60,10,0,706,0,1,0,0,0), +(@GUID+61,27737,595,3,1,0,0,2555.11,1218.55,125.944,5.11646,60,10,0,730,0,1,0,0,0), +(@GUID+62,27737,595,3,1,0,0,2561.91,1211.56,125.38,5.5877,60,10,0,730,0,1,0,0,0), +(@GUID+63,27737,595,3,1,0,0,2568.67,1202.96,125.509,4.96095,60,10,0,756,0,1,0,0,0), +(@GUID+64,27737,595,3,1,0,0,2571.93,1193.48,125.619,5.07641,60,10,0,756,0,1,0,0,0), +(@GUID+65,27737,595,3,1,0,0,2577.77,1180.88,125.562,4.64522,60,10,0,756,0,1,0,0,0), +(@GUID+66,27737,595,3,1,0,0,2574.2,1166.63,126.089,4.44966,60,10,0,706,0,1,0,0,0), +(@GUID+67,27737,595,3,1,0,0,2564.78,1166.82,127.092,4.2266,60,10,0,756,0,1,0,0,0), +(@GUID+68,27737,595,3,1,0,0,2577.56,1158.41,126.385,4.07738,60,10,0,756,0,1,0,0,0), +(@GUID+69,27737,595,3,1,0,0,2567.93,1176.56,126.2,4.7489,60,10,0,706,0,1,0,0,0), +(@GUID+70,27737,595,3,1,0,0,2559.28,1189.46,126.642,4.73319,60,10,0,756,0,1,0,0,0), +(@GUID+71,27737,595,3,1,0,0,2554.14,1213.37,126.599,5.13845,60,10,0,706,0,1,0,0,0), +(@GUID+72,27737,595,3,1,0,0,2560.58,1218.48,125.281,4.97351,60,10,0,730,0,1,0,0,0), +(@GUID+73,27737,595,3,1,0,0,2570.2,1170.58,126.311,4.64365,60,10,0,756,0,1,0,0,0), +(@GUID+74,27729,595,3,1,0,0,2496.57,1354.66,132.217,5.13691,120,5,0,63000,0,1,0,0,0), +(@GUID+75,27729,595,3,1,0,0,2494.22,1365.17,130.812,5.15654,120,5,0,63000,0,1,0,0,0), +(@GUID+76,27729,595,3,1,0,0,2440.41,1434.46,131.456,5.69372,120,5,0,63000,0,1,0,0,0), +(@GUID+77,27729,595,3,1,0,0,2433.18,1421.13,130.644,0.046706,120,5,0,63000,0,1,0,0,0), +(@GUID+78,27734,595,3,1,0,0,2546.07,1239.17,125.945,5.07801,120,5,0,63000,0,1,0,0,0), +(@GUID+79,27734,595,3,1,0,0,2458.58,1426.22,131.056,5.42984,120,5,0,63000,0,1,0,0,0), +(@GUID+80,27736,595,3,1,0,0,2488.11,1364.91,130.402,5.35524,120,5,0,130330,0,1,0,0,0), +(@GUID+81,28199,595,3,1,0,0,2527.63,1267.59,128.168,5.12906,120,5,0,63000,0,1,0,0,0), +(@GUID+82,28199,595,3,1,0,0,2528.06,1284.34,128.877,5.14869,120,5,0,63000,0,1,0,0,0), +(@GUID+83,28199,595,3,1,0,0,2466.27,1414.57,130.977,5.18637,120,5,0,63000,0,1,0,0,0), +(@GUID+84,28200,595,3,1,0,0,2570.51,1181.4,125.809,4.61855,120,5,0,50400,44070,1,0,0,0), +(@GUID+85,28200,595,3,1,0,0,2560.45,1202.05,126.031,4.85417,120,5,0,50400,44070,1,0,0,0), +(@GUID+86,28200,595,3,1,0,0,2487.85,1373.29,130.236,5.078,120,5,0,50400,44070,1,0,0,0), +(@GUID+87,28200,595,3,1,0,0,2416.7,1416.52,130.379,0.191224,120,5,0,50400,44070,1,0,0,0), +(@GUID+88,28200,595,3,1,0,0,2424.42,1422.68,130.868,0.25327,120,5,0,50400,44070,1,0,0,0), +(@GUID+89,28201,595,3,1,0,0,2540.67,1254.82,126.274,4.97198,120,5,0,130330,0,1,0,0,0), +(@GUID+90,28201,595,3,1,0,0,2410.03,1417.19,130.577,0.191229,120,5,0,130330,0,1,0,0,0), +(@GUID+91,28249,595,3,1,0,0,2562.66,1177.9,126.716,4.77171,120,5,0,63000,0,1,0,0,0), +(@GUID+92,28249,595,3,1,0,0,2566.72,1190.41,125.837,4.7992,120,5,0,63000,0,1,0,0,0), +(@GUID+93,28249,595,3,1,0,0,2472.34,1404.76,130.752,5.20601,120,5,0,63000,0,1,0,0,0), +(@GUID+94,28249,595,3,1,0,0,2460.59,1413.26,130.46,5.4377,120,5,0,63000,0,1,0,0,0), +(@GUID+95,28249,595,3,1,0,0,2415.04,1423.52,131.111,0.214785,120,5,0,63000,0,1,0,0,0); + +DELETE FROM `script_texts` WHERE entry BETWEEN -1595052 AND -1595048; +INSERT INTO `script_texts` (npc_entry,entry, content_default, comment) VALUES +(27913,-1595048, "Scourge forces have been spotted near the Elder's Square Gate!","Spawns near elder's square gate."), +(27913,-1595059, "Scourge forces have been spotted near the Town Hall!","Spawns near town hall."), +(27913,-1595050, "Scourge forces have been spotted near the King's Square fountain!","Spawns near king's square."), +(27913,-1595051, "Scourge forces have been spotted near the Market Row Gate!", "Spawns near market row gate."), +(27913,-1595052, "Scourge forces have been spotted near the Festival Lane Gate!", "Spawns near festval lane gate."); + +UPDATE `creature_template` SET `dynamicflags` = 0 WHERE `entry` IN (32273,32313); +UPDATE `areatrigger_teleport` SET id = 5181 WHERE id = 5148; +UPDATE `creature_template` SET `flags_extra` = 128 WHERE `entry` = 20562; +UPDATE `script_waypoint` SET location_x = 2449.32, location_y = 1191.09 WHERE entry = 26499 AND pointid = 26; + +UPDATE `creature_template` SET `lootid` = 32273 WHERE `entry` IN (32273, 32313); + +-- thx warpten (fix for credit spell) +UPDATE `spell_dbc` SET `Attributes` = '8388992', `AttributesEx2` = '5', `AttributesEx3` = '269484288' WHERE `Id` = 58630; -- cgit v1.2.3 From b23986590f1c3db7278018eb64bf577807fff685 Mon Sep 17 00:00:00 2001 From: WishToDie Date: Thu, 3 May 2012 15:51:43 +0200 Subject: DB/Quest: Correct Chaining for Childrens Week Quests Closes #6404 --- .../world/2012_05_03_02_world_quest_template.sql | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 sql/updates/world/2012_05_03_02_world_quest_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_03_02_world_quest_template.sql b/sql/updates/world/2012_05_03_02_world_quest_template.sql new file mode 100644 index 00000000000..49953bd2166 --- /dev/null +++ b/sql/updates/world/2012_05_03_02_world_quest_template.sql @@ -0,0 +1,28 @@ +-- Wolvar Orphan quest order +UPDATE `quest_template` SET `prevquestid`=13927,`exclusivegroup`=-13930 WHERE `id` IN (13930,13934,13951); +UPDATE `quest_template` SET `prevquestid`=13930,`exclusivegroup`=-13955 WHERE `id` IN (13955,13957); +UPDATE `quest_template` SET `prevquestid`=13955,`exclusivegroup`=0 WHERE `id`=13938; +UPDATE `quest_template` SET `prevquestid`=13938,`exclusivegroup`=0 WHERE `id`=13960; +-- Oracle Orphan quest order +UPDATE `quest_template` SET `prevquestid`=13926,`exclusivegroup`=-13929 WHERE `id` IN (13929,13933,13950); +UPDATE `quest_template` SET `prevquestid`=13929,`exclusivegroup`=-13954 WHERE `id` IN (13954,13956); +UPDATE `quest_template` SET `prevquestid`=13954,`exclusivegroup`=0 WHERE `id`=13937; +UPDATE `quest_template` SET `prevquestid`=13937,`exclusivegroup`=0 WHERE `id`=13959; +-- Human Orphan quest order +UPDATE `quest_template` SET `prevquestid`=1468,`exclusivegroup`=-1479 WHERE `id` IN (1479,1558,1687); +UPDATE `quest_template` SET `prevquestid`=1479,`exclusivegroup`=-558 WHERE `id` IN (558,4822); +UPDATE `quest_template` SET `prevquestid`=558,`exclusivegroup`=0 WHERE `id`=171; +-- Orcish Orphan quest order +UPDATE `quest_template` SET `prevquestid`=172,`exclusivegroup`=-910 WHERE `id` IN (910,911,1800); +UPDATE `quest_template` SET `prevquestid`=910,`exclusivegroup`=-915 WHERE `id` IN (915,925); +UPDATE `quest_template` SET `prevquestid`=915,`exclusivegroup`=0 WHERE `id`=5502; +-- Draenei Orphan quest order +UPDATE `quest_template` SET `prevquestid`=10943,`exclusivegroup`=-10950 WHERE `id` IN (10950,10952,10954); +UPDATE `quest_template` SET `prevquestid`=10950,`exclusivegroup`=-10956 WHERE `id` IN (10956,10962); +UPDATE `quest_template` SET `NextQuestIdChain`=10968 WHERE `id`=10956; +UPDATE `quest_template` SET `prevquestid`=10968,`exclusivegroup`=0 WHERE `id`=10966; +-- Blood Elf Orphan quest order +UPDATE `quest_template` SET `prevquestid`=10942,`exclusivegroup`=-10945 WHERE `id` IN (10945,10951,10953); +UPDATE `quest_template` SET `prevquestid`=10945,`exclusivegroup`=-10960 WHERE `id` IN (10960,10963); +UPDATE `quest_template` SET `prevquestid`=10960,`exclusivegroup`=0 WHERE `id`=11975; +UPDATE `quest_template` SET `prevquestid`=11975,`exclusivegroup`=0 WHERE `id`=10967; -- cgit v1.2.3 From a708982a22256fcf292f4d772a0e36ef3029a4b9 Mon Sep 17 00:00:00 2001 From: WishToDie Date: Thu, 3 May 2012 16:23:40 +0200 Subject: DB/Quest: correct NPC quest relation for quest 171 --- sql/updates/world/2012_05_03_03_world_creature_questrelation.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_03_03_world_creature_questrelation.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql b/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql new file mode 100644 index 00000000000..1da4f6d29ad --- /dev/null +++ b/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql @@ -0,0 +1,2 @@ +-- Set correct NPC for A Warden of the Alliance +UPDATE `creature_questrelation` SET `id`=14305 WHERE `quest`=171; -- cgit v1.2.3 From 5dff4bf66f1d0cc2c058466ca557222dd4edf0a5 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Thu, 3 May 2012 17:12:01 +0200 Subject: DB/Quest: move some questrelations to the seasonal tables --- ...12_05_03_04_world_game_event_creature_quest.sql | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql b/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql new file mode 100644 index 00000000000..62fd4415549 --- /dev/null +++ b/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql @@ -0,0 +1,57 @@ +DELETE FROM `creature_questrelation` WHERE `id` IN (14305,14444,22817,22818,33532,33533,34365); +DELETE FROM `game_event_creature_quest` WHERE `eventEntry`=10; +INSERT INTO `game_event_creature_quest` (`eventEntry`,`id`,`quest`) VALUES +-- Alliance +(10,14450,1468), -- Orphan Matron Nightingale - Children's Week +(10,14305,1479), -- Human Orphan - The Bough of the Eternals +(10,14305,1558), -- Human Orphan - The Stonewrought Dam +(10,14305,1687), -- Human Orphan - Spooky Lighthouse +(10,14305,558), -- Human Orphan - Jaina's Autograph +(10,14305,4822), -- Human Orphan - You Scream, I Scream... +-- Horde +(10,14451,172), -- Orphan Matron Battlewail - Children's Week +(10,14444,910), -- Orcish Orphan - Down at the Docks +(10,14444,911), -- Orcish Orphan - Gateway to the Frontier +(10,14444,1800), -- Orcish Orphan - Lordaeron Throne Room +(10,14444,915), -- Orcish Orphan - You Scream, I Scream... +(10,14444,925), -- Orcish Orphan - Cairne's Hoofprint +(10,14444,5502), -- Orcish Orphan - A Warden of the Horde +-- Outlands: Blood Elfs +(10,22819,10942), -- Orphan Matron Mercy - Children's Week +(10,22817,10945), -- Blood Elf Orphan - Hch'uu and the Mushroom People +(10,22817,10951), -- Blood Elf Orphan - A Trip to the Dark Portal +(10,22817,10953), -- Blood Elf Orphan - Visit the Throne of the Elements +(10,22817,11975), -- Blood Elf Orphan - Now, When I Grow Up... +(10,22817,10963), -- Blood Elf Orphan - Time to Visit the Caverns +(10,22817,10967), -- Blood Elf Orphan - Back to the Orphanage +-- Outlands: Draenei +(10,22819,10943), -- Orphan Matron Mercy - Children's Week +(10,22818,10950), -- Draenei Orphan - Auchindoun and the Ring of Observance +(10,22818,10952), -- Draenei Orphan - A Trip to the Dark Portal +(10,22818,10954), -- Draenei Orphan - Jheel is at Aeris Landing! +(10,22818,10956), -- Draenei Orphan - The Seat of the Naaru +(10,22818,10962), -- Draenei Orphan - Time to Visit the Caverns +(10,22818,10966), -- Draenei Orphan - Back to the Orphanage +-- Northrend: Wolvar +(10,34365,13927), -- Orphan Matron Aria - Little Orphan Kekek Of The Wolvar +(10,33532,13930), -- Wolvar Orphan - Home Of The Bear-Men +(10,33532,13934), -- Wolvar Orphan - The Bronze Dragonshrine +(10,33532,13951), -- Wolvar Orphan - Playmates! +(10,33532,13955), -- Wolvar Orphan - The Dragon Queen +(10,33532,13957), -- Wolvar Orphan - The Mighty Hemet Nesingwary +(10,33532,13960), -- Wolvar Orphan - Back To The Orphanage +-- Northrend: Oracles +(10,34365,13926), -- Orphan Matron Aria - Little Orphan Roo Of The Oracles +(10,33533,13929), -- Oracle Orphan - The Biggest Tree Ever! +(10,33533,13933), -- Oracle Orphan - The Bronze Dragonshrine +(10,33533,13937), -- Oracle Orphan - A Trip To The Wonderworks +(10,33533,13950), -- Oracle Orphan - Playmates! +(10,33533,13954), -- Oracle Orphan - The Dragon Queen +(10,33533,13956), -- Oracle Orphan - Meeting a Great One +(10,33533,13959); -- Oracle Orphan - Back To The Orphanage + +-- Removed "When I Grow Up..." and replace it with "Now, When I Grow Up..." +UPDATE `quest_template` SET `prevquestid`=10945,`exclusivegroup`=-11975 WHERE `id` IN (11975,10963); +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=10960; +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,10960,0,'','','Deprecated quest: When I grow up...'); -- cgit v1.2.3 From 7a0b30dbf9e2195e12bd2aecc8b28f5c3eb9b28c Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 4 May 2012 22:10:26 -0230 Subject: DB/waypoints: Added a few paths for Trallamar, Hellfire Penn. --- .../world/2012_05_04_00_world_waypoints.sql | 137 +++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 sql/updates/world/2012_05_04_00_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_04_00_world_waypoints.sql b/sql/updates/world/2012_05_04_00_world_waypoints.sql new file mode 100644 index 00000000000..8c1528c6ef6 --- /dev/null +++ b/sql/updates/world/2012_05_04_00_world_waypoints.sql @@ -0,0 +1,137 @@ +-- Thrallamar Grunt pathing +SET @NPC := 57505; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=168.3949,`position_y`=2641.357,`position_z`=86.32077 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,168.3949,2641.357,86.32077,0,0,0,100,0), +(@PATH,2,186.5067,2615.882,87.28357,0,0,0,100,0), +(@PATH,3,188.9113,2601.655,87.28357,0,0,0,100,0), +(@PATH,4,198.3909,2602.661,87.28357,0,0,0,100,0), +(@PATH,5,201.5686,2609.845,87.28357,0,0,0,100,0), +(@PATH,6,187.2484,2616.44,87.28357,0,0,0,100,0), +(@PATH,7,168.7871,2641.268,86.32077,0,0,0,100,0), +(@PATH,8,155.2003,2681.998,84.82113,0,0,0,100,0), +(@PATH,9,194.6133,2692.07,90.61374,0,0,0,100,0), +(@PATH,10,215.4427,2693.589,90.69872,0,0,0,100,0), +(@PATH,11,219.0203,2692.25,90.69665,0,0,0,100,0), +(@PATH,12,225.5117,2680.063,90.68996,0,0,0,100,0), +(@PATH,13,235.309,2679.308,90.69373,0,0,0,100,0), +(@PATH,14,246.9184,2682.646,90.70419,0,0,0,100,0), +(@PATH,15,252.4411,2688.479,90.70386,0,0,0,100,0), +(@PATH,16,255.0155,2699.197,90.70283,0,0,0,100,0), +(@PATH,17,251.5234,2707.998,90.70486,0,0,0,100,0), +(@PATH,18,243.2346,2712.791,90.70392,0,0,0,100,0), +(@PATH,19,231.9871,2713.626,90.70399,0,0,0,100,0), +(@PATH,20,221.1457,2709.591,90.69753,0,0,0,100,0), +(@PATH,21,218.8803,2695.845,90.69318,0,0,0,100,0), +(@PATH,22,215.4517,2693.612,90.69869,0,0,0,100,0), +(@PATH,23,194.7944,2692.039,90.65273,0,0,0,100,0), +(@PATH,24,175.8115,2687.591,86.68189,0,0,0,100,0), +(@PATH,25,155.2143,2682.375,84.82113,0,0,0,100,0), +(@PATH,26,131.8727,2679.832,84.56969,0,0,0,100,0), +(@PATH,27,130.0859,2666.262,84.1262,0,0,0,100,0), +(@PATH,28,153.1291,2650.22,86.15128,0,0,0,100,0); + +-- Remove dup Thrallamar Grunt spawn +DELETE FROM `creature` WHERE `guid`=57532; +DELETE FROM `creature_addon` WHERE `guid`=57532; + +-- Bat Rider Guard pathing +SET @NPC := 54840; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=156.9029,`position_y`=2554.784,`position_z`=170.8949 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,156.9029,2554.784,170.8949,0,0,0,100,0), +(@PATH,2,52.51677,2602.816,139.7838,0,0,0,100,0), +(@PATH,3,42.10146,2627.056,139.7838,0,0,0,100,0), +(@PATH,4,37.17329,2663.729,139.7838,0,0,0,100,0), +(@PATH,5,62.91933,2687.96,139.7838,0,0,0,100,0), +(@PATH,6,96.1871,2688.141,148.4226,0,0,0,100,0), +(@PATH,7,129.818,2690.786,151.256,0,0,0,100,0), +(@PATH,8,165.6888,2715.398,170.8949,0,0,0,100,0), +(@PATH,9,199.7751,2744.93,170.8949,0,0,0,100,0), +(@PATH,10,246.0857,2761.154,170.8949,0,0,0,100,0), +(@PATH,11,295.0904,2757.991,170.8949,0,0,0,100,0), +(@PATH,12,309.3468,2726.089,170.8949,0,0,0,100,0), +(@PATH,13,303.8448,2682.588,170.8949,0,0,0,100,0), +(@PATH,14,289.3104,2650.866,170.8949,0,0,0,100,0), +(@PATH,15,261.2743,2618.831,170.8949,0,0,0,100,0), +(@PATH,16,233.6436,2578.997,170.8949,0,0,0,100,0), +(@PATH,17,199.3375,2546.226,170.8949,0,0,0,100,0); + +-- Bat Rider Guard pathing +SET @NPC := 54841; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=65.97776,`position_y`=2661.205,`position_z`=163.6752 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,65.97776,2661.205,163.6752,0,0,0,100,0), +(@PATH,2,85.52612,2668.312,163.6752,0,0,0,100,0), +(@PATH,3,119.9537,2689.26,163.6752,0,0,0,100,0), +(@PATH,4,121.8238,2721.88,163.6752,0,0,0,100,0), +(@PATH,5,142.6907,2750.891,163.6752,0,0,0,100,0), +(@PATH,6,149.9812,2788.504,163.6752,0,0,0,100,0), +(@PATH,7,142.9353,2830.464,163.6752,0,0,0,100,0), +(@PATH,8,115.1711,2822.444,163.6752,0,0,0,100,0), +(@PATH,9,57.16672,2791.644,163.6752,0,0,0,100,0), +(@PATH,10,38.80463,2758.823,163.6752,0,0,0,100,0), +(@PATH,11,19.69282,2714.784,163.6752,0,0,0,100,0), +(@PATH,12,23.22027,2677.714,163.6752,0,0,0,100,0); + +-- Bat Rider Guard pathing +SET @NPC := 54842; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=263.5968,`position_y`=2694.818,`position_z`=169.7312 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,4097); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,263.5968,2694.818,169.7312,0,0,0,100,0), +(@PATH,2,184.0861,2784.899,154.4534,0,0,0,100,0), +(@PATH,3,154.2815,2754.787,154.3701,0,0,0,100,0), +(@PATH,4,127.0308,2740.488,154.3701,0,0,0,100,0), +(@PATH,5,118.0444,2706.509,154.3701,0,0,0,100,0), +(@PATH,6,115.7577,2669.386,158.6756,0,0,0,100,0), +(@PATH,7,131.4314,2622.531,162.1478,0,0,0,100,0), +(@PATH,8,154.8241,2607.207,164.4812,0,0,0,100,0), +(@PATH,9,176.3283,2571.343,168.5645,0,0,0,100,0), +(@PATH,10,221.6267,2559.683,172.1201,0,0,0,100,0), +(@PATH,11,245.392,2593.423,169.8978,0,0,0,100,0), +(@PATH,12,251.0069,2617.749,169.7312,0,0,0,100,0), +(@PATH,13,263.0581,2644.614,169.7312,0,0,0,100,0); + +-- Bat Rider Guard pathing +SET @NPC := 54843; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=62.42025,`position_y`=2785.719,`position_z`=192.1124 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,4097); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,62.42025,2785.719,192.1124,0,0,0,100,0), +(@PATH,2,159.9371,2842.977,208.279,0,0,0,100,0), +(@PATH,3,183.0578,2845.035,208.279,0,0,0,100,0), +(@PATH,4,211.2432,2864.757,214.2235,0,0,0,100,0), +(@PATH,5,238.1182,2871.979,220.9457,0,0,0,100,0), +(@PATH,6,252.9173,2853.913,220.9457,0,0,0,100,0), +(@PATH,7,255.0203,2812.634,220.9457,0,0,0,100,0), +(@PATH,8,240.4993,2780.929,220.9457,0,0,0,100,0), +(@PATH,9,195.4901,2773.965,209.3901,0,0,0,100,0), +(@PATH,10,162.1341,2742.294,212.9179,0,0,0,100,0), +(@PATH,11,125.4935,2720.611,197.9457,0,0,0,100,0), +(@PATH,12,93.49241,2699.757,192.1124,0,0,0,100,0), +(@PATH,13,58.35324,2681.49,192.1124,0,0,0,100,0), +(@PATH,14,22.8833,2715.123,192.1124,0,0,0,100,0), +(@PATH,15,30.10514,2764.5,192.1124,0,0,0,100,0); + +-- Fix Bat Rider Guard InhabitType +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=15242; + +-- Remove dup Bat Rider Guard spawns +DELETE FROM `creature` WHERE `guid` IN (54839,54844,54845); +DELETE FROM `creature_addon` WHERE `guid` IN (54839,54844,54845); -- cgit v1.2.3 From eefbd909040dc57a1a77d41170416d5feb7715b9 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 02:01:14 -0230 Subject: DB/SAI: Speech by Martik Tor'seldor, Thrallamar --- sql/updates/world/2012_05_04_01_world_sai.sql | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sql/updates/world/2012_05_04_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_04_01_world_sai.sql b/sql/updates/world/2012_05_04_01_world_sai.sql new file mode 100644 index 00000000000..925a220cd77 --- /dev/null +++ b/sql/updates/world/2012_05_04_01_world_sai.sql @@ -0,0 +1,32 @@ +-- Speech by Martik Tor'seldor, Thrallamar +SET @ENTRY := 16577; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; +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,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldor - OOC - Load script every 6 min ooc'), +(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,18100,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldor - Reset - Cast Frost Armor'), +(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor Say text 0'), +(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), +(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), +(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 0'), +(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim emote'), +(@ENTRY*100,9,5,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Martik Tor''seldor turn to'), +(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor Say text 1'), +(@ENTRY*100,9,7,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 1'), +(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor Say text 2'), +(@ENTRY*100,9,9,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), +(@ENTRY*100,9,10,0,0,0,100,0,3000,3000,0,0,5,273,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), +(@ENTRY*100,9,11,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 2'), +(@ENTRY*100,9,12,0,0,0,100,0,1000,1000,0,0,5,15,0,0,0,0,0,9,16578,0,20,0,0,0,0,'Blood Elf Pilgrim emote'), +(@ENTRY*100,9,13,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor turn to'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry` IN (16577,16578); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(16577,0,0, 'Brothers and sisters, I have been to the promised land. I have tasted in the sublim energy. I have felt bliss - bliss so engrossing and all encompassing that I was left wondering if I had stumbled upon the dreams of gods.!',12,0,100,5,0,0, 'Martik Tor''seldor'), +(16577,1,0, 'In paradise, you merely reach out and take from the Nether.',12,0,100,1,0,0, 'Martik Tor''seldor'), +(16577,2,0, 'From the very air! Tendrils of arcane energy light up the obsidian sky as plumes of raw magic rise up from fissures in the land. Kneel and drink from the fissure as you do from a stream or well. Pluck a tendril from the heavens as if it were an apple hanging from a branch.',12,0,100,5,0,0, 'Martik Tor''seldor'), +(16578,0,0, 'Tell us more, Martik. What is it? What does it feel like?',12,0,100,1,0,0, 'Blood Elf Pilgrim'), +(16578,1,0, 'But how?',12,0,100,6,0,0, 'Blood Elf Pilgrim'), +(16578,2,0, '%s smiles/gasps.',16,0,100,0,0,0, 'Blood Elf Pilgrim'); -- cgit v1.2.3 From 58622c4986be6280aa5b0b38922e31b797ca1269 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 10:09:37 -0230 Subject: DB/Misc: Fixed some spelling in comments. --- .../world/2012_05_04_00_world_waypoints.sql | 4 +-- sql/updates/world/2012_05_04_01_world_sai.sql | 30 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_04_00_world_waypoints.sql b/sql/updates/world/2012_05_04_00_world_waypoints.sql index 8c1528c6ef6..a07bde59d49 100644 --- a/sql/updates/world/2012_05_04_00_world_waypoints.sql +++ b/sql/updates/world/2012_05_04_00_world_waypoints.sql @@ -1,4 +1,4 @@ --- Thrallamar Grunt pathing +-- Thrallmar Grunt pathing SET @NPC := 57505; SET @PATH := @NPC*10; UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=168.3949,`position_y`=2641.357,`position_z`=86.32077 WHERE `guid`=@NPC; @@ -34,7 +34,7 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z` (@PATH,27,130.0859,2666.262,84.1262,0,0,0,100,0), (@PATH,28,153.1291,2650.22,86.15128,0,0,0,100,0); --- Remove dup Thrallamar Grunt spawn +-- Remove dup Thrallmar Grunt spawn DELETE FROM `creature` WHERE `guid`=57532; DELETE FROM `creature_addon` WHERE `guid`=57532; diff --git a/sql/updates/world/2012_05_04_01_world_sai.sql b/sql/updates/world/2012_05_04_01_world_sai.sql index 925a220cd77..7021fc92548 100644 --- a/sql/updates/world/2012_05_04_01_world_sai.sql +++ b/sql/updates/world/2012_05_04_01_world_sai.sql @@ -1,32 +1,32 @@ --- Speech by Martik Tor'seldor, Thrallamar +-- Speech by Martik Tor'seldoi, Thrallmar SET @ENTRY := 16577; UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; 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,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldor - OOC - Load script every 6 min ooc'), -(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,18100,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldor - Reset - Cast Frost Armor'), -(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor Say text 0'), -(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), -(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), +(@ENTRY,0,0,0,1,0,100,0,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldoi - OOC - Load script every 6 min ooc'), +(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,18100,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldoi - Reset - Cast Frost Armor'), +(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 0'), +(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), +(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), (@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 0'), (@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim emote'), -(@ENTRY*100,9,5,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Martik Tor''seldor turn to'), -(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor Say text 1'), +(@ENTRY*100,9,5,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Martik Tor''seldoi turn to'), +(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 1'), (@ENTRY*100,9,7,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 1'), -(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor Say text 2'), -(@ENTRY*100,9,9,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), -(@ENTRY*100,9,10,0,0,0,100,0,3000,3000,0,0,5,273,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor emote'), +(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 2'), +(@ENTRY*100,9,9,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), +(@ENTRY*100,9,10,0,0,0,100,0,3000,3000,0,0,5,273,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), (@ENTRY*100,9,11,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 2'), (@ENTRY*100,9,12,0,0,0,100,0,1000,1000,0,0,5,15,0,0,0,0,0,9,16578,0,20,0,0,0,0,'Blood Elf Pilgrim emote'), -(@ENTRY*100,9,13,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldor turn to'); +(@ENTRY*100,9,13,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi turn to'); -- NPC talk text insert from sniff DELETE FROM `creature_text` WHERE `entry` IN (16577,16578); INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(16577,0,0, 'Brothers and sisters, I have been to the promised land. I have tasted in the sublim energy. I have felt bliss - bliss so engrossing and all encompassing that I was left wondering if I had stumbled upon the dreams of gods.!',12,0,100,5,0,0, 'Martik Tor''seldor'), -(16577,1,0, 'In paradise, you merely reach out and take from the Nether.',12,0,100,1,0,0, 'Martik Tor''seldor'), -(16577,2,0, 'From the very air! Tendrils of arcane energy light up the obsidian sky as plumes of raw magic rise up from fissures in the land. Kneel and drink from the fissure as you do from a stream or well. Pluck a tendril from the heavens as if it were an apple hanging from a branch.',12,0,100,5,0,0, 'Martik Tor''seldor'), +(16577,0,0, 'Brothers and sisters, I have been to the promised land. I have tasted in the sublim energy. I have felt bliss - bliss so engrossing and all encompassing that I was left wondering if I had stumbled upon the dreams of gods.!',12,0,100,5,0,0, 'Martik Tor''seldoi'), +(16577,1,0, 'In paradise, you merely reach out and take from the Nether.',12,0,100,1,0,0, 'Martik Tor''seldoi'), +(16577,2,0, 'From the very air! Tendrils of arcane energy light up the obsidian sky as plumes of raw magic rise up from fissures in the land. Kneel and drink from the fissure as you do from a stream or well. Pluck a tendril from the heavens as if it were an apple hanging from a branch.',12,0,100,5,0,0, 'Martik Tor''seldoi'), (16578,0,0, 'Tell us more, Martik. What is it? What does it feel like?',12,0,100,1,0,0, 'Blood Elf Pilgrim'), (16578,1,0, 'But how?',12,0,100,6,0,0, 'Blood Elf Pilgrim'), (16578,2,0, '%s smiles/gasps.',16,0,100,0,0,0, 'Blood Elf Pilgrim'); -- cgit v1.2.3 From 4afb1c4f3d152c2d02f56a3ed62b090f55463f60 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 12:32:38 -0230 Subject: DB/SAI: Forge of Souls Trash fixup --- sql/updates/world/2012_05_05_00_world_sai.sql | 205 ++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 sql/updates/world/2012_05_05_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_00_world_sai.sql b/sql/updates/world/2012_05_05_00_world_sai.sql new file mode 100644 index 00000000000..e03c36337af --- /dev/null +++ b/sql/updates/world/2012_05_05_00_world_sai.sql @@ -0,0 +1,205 @@ +-- Forge of Souls Trash update + +-- Npc Updates + +-- Spiteful Apparition +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36551; +UPDATE `creature` SET `spawndist`=20,`MovementType`=1,`curhealth`=1,`curmana`=0 WHERE `id`=36551; +DELETE FROM `creature_template_addon` WHERE `entry`=36551; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (36551,1, '69105 69136'); +-- Spiteful Apparition (Ambient) +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36967; +UPDATE `creature` SET `spawndist`=20,`MovementType`=1,`curhealth`=1,`curmana`=0 WHERE `id`=36967; +DELETE FROM `creature_template_addon` WHERE `entry`=36967; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (36967,1, '69663 69658'); +-- Spectral Warden +UPDATE `creature_addon` SET `auras`='69144' WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=36666); + +-- SAI Updates + +-- Spiteful Apparition SAI +SET @ENTRY := 36551; -- NPC entry +SET @SPELL1 := 41253; -- Greater Invisibility +SET @SPELL2 := 68895; -- Spite (Normal) +SET @SPELL3 := 70212; -- Spite (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,25,0,100,6,0,0,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Spiteful Apparition - On Reset - Cast Greater Invisibility'), +(@ENTRY,0,1,0,10,0,100,6,0,10,3000,4000,28,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Spiteful Apparition - OOC range - Remove Greater Invisibility'), +(@ENTRY,0,2,0,0,0,100,2,7000,9000,7000,9000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spiteful Apparition - Combat - Cast Spite "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,7000,9000,7000,9000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spiteful Apparition - Combat - Cast Spite "Heroic"'); + +-- Soulguard Reaper SAI +SET @ENTRY := 36499; -- NPC entry +SET @SPELL1 := 68797; -- Soulguard Channel +SET @SPELL2 := 69058; -- Shadow Lance +SET @SPELL3 := 69060; -- Frost Nova (Normal) +SET @SPELL4 := 70209; -- Frost Nova (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,0,0,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Reaper - OOC - Cast Soulguard Channel'), +(@ENTRY,0,1,0,0,0,100,6,5000,6000,7000,9000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Shadow Lance'), +(@ENTRY,0,2,0,0,0,100,2,7000,9000,8000,10000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Frost Nova "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,7000,9000,8000,10000,11,@SPELL4,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Frost Nova "Heroic"'), +(@ENTRY,0,4,0,4,0,100,6,0,0,0,0,39,30,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Reaper - Aggro - Call for help'); + +-- Soulguard Beam Focus Target +SET @ENTRY := 36508; -- NPC entry +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-201770,-201785,-201741); +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 +(-201770,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), +(-201785,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), +(-201741,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), +(-201741,0,1,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36564,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Bonecaster'); + +-- Spectral Warden SAI +SET @ENTRY := 36666; -- NPC entry +SET @SPELL1 := 69633; -- Veil of Shadow +SET @SPELL2 := 69148; -- Wail of Souls (Normal) +SET @SPELL3 := 70210; -- Wail of Souls (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,5000,6000,9000,10000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Veil of Shadow'), +(@ENTRY,0,1,0,0,0,100,2,9000,11000,5000,6000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Wail of Souls'), +(@ENTRY,0,2,0,0,0,100,4,9000,11000,5000,6000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Wail of Souls'); + +-- Soulguard Watchman SAI +SET @ENTRY := 36478; -- NPC entry +SET @SPELL1 := 69056; -- Shroud of Runes +SET @SPELL2 := 69053; -- Unholy Rage +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,50,6,0,10000,16000,20000,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Combat - Cast Shroud of Runes'), +(@ENTRY,0,1,2,0,0,100,6,8000,16000,32000,40000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Combat - Cast Unholy Rage'), +(@ENTRY,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, 'Soulguard Watchman - Combat - Say 0'), +(@ENTRY,0,3,0,4,0,100,6,0,0,0,0,39,20,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Aggro - Call for help'); +-- NPC talk text insert +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, '%s goes into a frenzy!',16,0,100,0,0,0, 'Soulguard Watchman'); + +-- Soul Horror SAI +SET @ENTRY := 36522; -- NPC entry +SET @SPELL1 := 69088; -- Soul Strike (Normal) +SET @SPELL2 := 70211; -- Soul Strike (Heroic) +SET @SPELL3 := 69107; -- Killing Spree Invis Aura +SET @SPELL4 := 69106; -- Killing Spree Aura +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,2,5000,6000,5000,6000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soul Horror - Combat - Cast Soul Strike'), +(@ENTRY,0,1,0,0,0,100,4,5000,6000,5000,6000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soul Horror - Combat - Cast Soul Strike'), +(@ENTRY,0,4,0,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soul Horror - Aggro - Call for help'); + +-- Soulguard Animator SAI +SET @ENTRY := 36516; -- NPC entry +SET @SPELL1 := 68834; -- Soulguard Channel Beam02 +SET @SPELL2 := 69562; -- Raise Dead +SET @SPELL3 := 69131; -- Soul Sickness +SET @SPELL4 := 69128; -- Soul Siphon +SET @SPELL5 := 69068; -- Shadow Bolt (Normal) +SET @SPELL6 := 70208; -- Shadow Bolt (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Animator - OOC - Cast Soulguard Channel Beam02'), +(@ENTRY,0,1,0,0,1,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Raise Dead'), +(@ENTRY,0,2,0,0,0,100,6,7000,9000,9000,11000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Soul Sickness'), +(@ENTRY,0,3,0,0,0,100,6,9000,11000,7000,9000,11,@SPELL4,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Soul Siphon'), +(@ENTRY,0,4,0,0,0,100,2,4000,5000,3500,4500,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Shadow Bolt "Normal"'), +(@ENTRY,0,5,0,0,0,100,4,4000,5000,3500,4500,11,@SPELL6,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Shadow Bolt "Heroic"'), +(@ENTRY,0,6,7,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Aggro - Call for help'), +(@ENTRY,0,7,0,61,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Aggro - Set phase 1'), +(@ENTRY,0,8,9,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 2 - Set data'), +(@ENTRY,0,9,0,61,0,100,6,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 2 - Set phase 2'), +(@ENTRY,0,10,11,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 3 - Set data'), +(@ENTRY,0,11,0,61,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 3 - Set phase 1'); + +-- Soulguard Adept SAI +SET @ENTRY := 36620; -- NPC entry +SET @SPELL1 := 68834; -- Soulguard Channel Beam02 +SET @SPELL2 := 69562; -- Raise Dead +SET @SPELL3 := 69068; -- Shadow Bolt (Normal) +SET @SPELL4 := 70208; -- Shadow Bolt (Heroic) +SET @SPELL5 := 69066; -- Drain Life (Normal) +SET @SPELL6 := 70213; -- Drain Life (Heroic) +SET @SPELL7 := 69564; -- Shadow Mend (Normal) +SET @SPELL8 := 70205; -- Shadow Mend (Heroic) +SET @SPELL9 := 68797; -- Soulguard Channel +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Adept - OOC - Cast Soulguard Channel Beam02'), +(@ENTRY,0,1,0,0,4,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Raise Dead'), +(@ENTRY,0,2,0,0,0,100,2,7000,8000,3500,4500,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Bolt "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,7000,8000,3500,4500,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Bolt "Heroic"'), +(@ENTRY,0,4,0,0,0,100,2,6000,7000,8000,10000,11,@SPELL5,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Drain Life "Normal"'), +(@ENTRY,0,5,0,0,0,100,4,6000,7000,8000,10000,11,@SPELL6,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Drain Life "Heroic"'), +(@ENTRY,0,6,0,0,0,100,2,30000,35000,18000,22000,11,@SPELL7,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Mend "Normal"'), +(@ENTRY,0,7,0,0,0,100,4,30000,35000,18000,22000,11,@SPELL8,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Mend "Heroic"'), +(@ENTRY,0,8,0,25,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - On Reset - Set phase 1'), +(@ENTRY,0,9,0,38,1,100,6,0,1,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - On dataset 0 1 - Set phase 2'), +(@ENTRY,0,10,0,1,2,100,7,0,0,0,0,11,@SPELL9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - OOC - Cast Soulguard Channel'), +(@ENTRY,0,11,12,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Aggro - Call for help'), +(@ENTRY,0,12,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Aggro - Set phase 3'), +(@ENTRY,0,13,14,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 2 - Set data'), +(@ENTRY,0,14,0,61,0,100,6,0,0,0,0,22,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 2 - Set phase 4'), +(@ENTRY,0,15,16,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 3 - Set data'), +(@ENTRY,0,16,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 3 - Set phase 3'); + +-- Soulguard Bonecaster SAI +SET @ENTRY := 36564; -- NPC entry +SET @SPELL1 := 68834; -- Soulguard Channel Beam02 +SET @SPELL2 := 69562; -- Raise Dead +SET @SPELL3 := 69080; -- Bone Volley (Normal) +SET @SPELL4 := 70206; -- Bone Volley (Heroic) +SET @SPELL5 := 69069; -- Shield of Bones (Normal) +SET @SPELL6 := 70207; -- Shield of Bones (Heroic) +SET @SPELL7 := 68797; -- Soulguard Channel +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Bonecaster - OOC - Cast Soulguard Channel Beam02'), +(@ENTRY,0,1,0,0,4,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Raise Dead'), +(@ENTRY,0,2,0,0,0,100,2,5000,7000,6000,8000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Bone Volley "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,5000,7000,6000,8000,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Bone Volley "Heroic"'), +(@ENTRY,0,4,0,0,0,100,2,5000,7000,7000,9000,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Shield of Bones "Normal"'), +(@ENTRY,0,5,0,0,0,100,4,5000,7000,7000,9000,11,@SPELL6,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Shield of Bones "Heroic"'), +(@ENTRY,0,6,0,25,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - On Reset - Set phase 1'), +(@ENTRY,0,7,0,38,1,100,6,0,1,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - On dataset 0 1 - Set phase 2'), +(@ENTRY,0,8,0,1,2,100,7,0,0,0,0,11,@SPELL7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - OOC - Cast Soulguard Channel'), +(@ENTRY,0,9,10,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Aggro - Call for help'), +(@ENTRY,0,10,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Aggro - Set phase 3'), +(@ENTRY,0,11,12,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 2 - Set data'), +(@ENTRY,0,12,0,61,0,100,6,0,0,0,0,22,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 2 - Set phase 4'), +(@ENTRY,0,13,14,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 3 - Set data'), +(@ENTRY,0,14,0,61,0,100,6,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 3 - Set phase 3'); + +-- Ghoul Minion SAI +SET @ENTRY := 36916; -- NPC entry +SET @SPELL1 := 69088; -- Soul Strike (Normal) +SET @SPELL2 := 70211; -- Soul Strike (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,54,0,100,6,0,0,0,0,45,0,2,0,0,0,0,23,0,0,0,0,0,0,0, 'Ghoul Minion - Just Summoned - Set Data Summoner'), +(@ENTRY,0,1,0,61,0,100,6,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - Just Summoned - Set Random Movement'), +(@ENTRY,0,2,0,0,0,100,6,115000,115000,115000,115000,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - combat - die after 2 min'), +(@ENTRY,0,3,0,1,0,100,6,15000,15000,15000,15000,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - OOC - die after 15 sec'), +(@ENTRY,0,4,5,6,0,100,6,15000,15000,15000,15000,45,0,3,0,0,0,0,23,0,0,0,0,0,0,0, 'Ghoul Minion - on Death - Set data summoner'), +(@ENTRY,0,5,0,61,0,100,6,15000,15000,15000,15000,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - on Death - despawn after 3 sec'); -- cgit v1.2.3 From 68e96d50d913d1a5af64c8af4373633ffe5d3d6c Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 14:55:16 -0230 Subject: DB/creature_template: Set proper faction for Ymirjar Skycaller (Heroic) --- sql/updates/world/2012_05_05_01_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_05_01_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_01_world_creature_template.sql b/sql/updates/world/2012_05_05_01_world_creature_template.sql new file mode 100644 index 00000000000..bc9dfbda78d --- /dev/null +++ b/sql/updates/world/2012_05_05_01_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Set proper faction for Ymirjar Skycaller (Heroic) +UPDATE `creature_template` SET `faction_A`=1885,`faction_H`=1885 WHERE `entry`=37643; \ No newline at end of file -- cgit v1.2.3 From fb9cbf96a75713940b2d400f5936ac8ef79fe73c Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 15:08:36 -0230 Subject: DB/creature_template: Fix missing line from previous commit. --- sql/updates/world/2012_05_05_01_world_creature_template.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_01_world_creature_template.sql b/sql/updates/world/2012_05_05_01_world_creature_template.sql index bc9dfbda78d..2eeaf2f40d2 100644 --- a/sql/updates/world/2012_05_05_01_world_creature_template.sql +++ b/sql/updates/world/2012_05_05_01_world_creature_template.sql @@ -1,2 +1,2 @@ -- Set proper faction for Ymirjar Skycaller (Heroic) -UPDATE `creature_template` SET `faction_A`=1885,`faction_H`=1885 WHERE `entry`=37643; \ No newline at end of file +UPDATE `creature_template` SET `faction_A`=1885,`faction_H`=1885 WHERE `entry`=37643; -- cgit v1.2.3 From 072bab69512bb91d13905ad422ab90c6ef629299 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 21:08:16 -0230 Subject: DB/Gameobjects: Add some missing Blood of Heroes spawns --- sql/updates/world/2012_05_05_02_world_gameobject.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/2012_05_05_02_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_02_world_gameobject.sql b/sql/updates/world/2012_05_05_02_world_gameobject.sql new file mode 100644 index 00000000000..c0b2c6b147b --- /dev/null +++ b/sql/updates/world/2012_05_05_02_world_gameobject.sql @@ -0,0 +1,10 @@ +-- Add some missing Blood of Heroes spawns +SET @GUID := 5276; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+5; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,176213,0,1,1,1529.10242,-1427.06946,65.49049,-3.001947,0,0,-0.9975634,0.06976615,7200,100,1), +(@GUID+1,176213,0,1,1,1705.87439,-4690.138,48.9742165,-3.08918333,0,0,-0.9996567,0.02620165,7200,100,1), +(@GUID+2,176213,0,1,1,1846.79382,-3825.265,135.5159,1.83259487,0,0,0.7933531,0.6087617,7200,100,1), +(@GUID+3,176213,0,1,1,1748.16333,-4453.13525,74.26272,-2.0594883,0,0,0,0,7200,100,1), +(@GUID+4,176213,0,1,1,2159.835,-2442.754,62.0804,-0.4886912,0,0,-0.2419214,0.9702958,7200,100,1), +(@GUID+5,176213,0,1,1,1342.557,-1382.568,46.89193,2.775069,0,0,0.9832544,0.182238,7200,100,1); -- cgit v1.2.3 From 85ca26c382914916f71d4c69d62fcbf8cf387dfa Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 23:37:14 -0230 Subject: DB/SAI: Add SAI for Wrathbone Laborer, fix unit flags, remove cpp script. --- sql/updates/world/2012_05_05_03_world_sai.sql | 17 +++++ .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 76 ---------------------- 2 files changed, 17 insertions(+), 76 deletions(-) create mode 100644 sql/updates/world/2012_05_05_03_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_03_world_sai.sql b/sql/updates/world/2012_05_05_03_world_sai.sql new file mode 100644 index 00000000000..fce3b5bc957 --- /dev/null +++ b/sql/updates/world/2012_05_05_03_world_sai.sql @@ -0,0 +1,17 @@ +-- Wrathbone Laborer SAI +SET @ENTRY := 36830; -- NPC entry +SET @SPELL1 := 70302; -- Blinding Dirt +SET @SPELL2 := 70278; -- Puncture Wound (Normal) +SET @SPELL3 := 70279; -- Puncture Wound (Heroic) +SET @SPELL4 := 69572; -- Shovelled! (Normal) +SET @SPELL5 := 70280; -- Shovelled! (Heroic) +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), +(@ENTRY,0,1,0,0,0,100,2,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), +(@ENTRY,0,2,0,0,0,100,4,8000,9000,9000,10000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Heroic)'), +(@ENTRY,0,3,0,0,0,100,2,5000,6000,7000,8000,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'), +(@ENTRY,0,4,0,0,0,100,4,5000,6000,7000,8000,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Heroic)'), +(@ENTRY,0,5,0,1,0,100,6,1000,3000,3000,3000,5,38,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Wrathbone Laborer - OOC - emote'); 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 70d72e52e67..b6c821ef66a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -25,9 +25,6 @@ enum eSpells SPELL_HELLFIRE = 69586, SPELL_TACTICAL_BLINK = 69584, SPELL_FROST_BREATH = 69527, //Iceborn Proto-Drake - SPELL_BLINDING_DIRT = 70302, //Wrathbone Laborer - SPELL_PUNCTURE_WOUND = 70278, - SPELL_SHOVELLED = 69572, SPELL_LEAPING_FACE_MAUL = 69504, // Geist Ambusher }; @@ -36,11 +33,6 @@ enum eEvents // Ymirjar Flamebearer EVENT_FIREBALL = 1, EVENT_TACTICAL_BLINK = 2, - - //Wrathbone Laborer - EVENT_BLINDING_DIRT = 3, - EVENT_PUNCTURE_WOUND = 4, - EVENT_SHOVELLED = 5, }; class mob_ymirjar_flamebearer : public CreatureScript @@ -157,73 +149,6 @@ class mob_iceborn_protodrake : public CreatureScript } }; -class mob_wrathbone_laborer : public CreatureScript -{ - public: - mob_wrathbone_laborer() : CreatureScript("mob_wrathbone_laborer") { } - - struct mob_wrathbone_laborerAI: public ScriptedAI - { - mob_wrathbone_laborerAI(Creature* creature) : ScriptedAI(creature) - { - } - - void Reset() - { - _events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - _events.ScheduleEvent(EVENT_BLINDING_DIRT, 8000); - _events.ScheduleEvent(EVENT_PUNCTURE_WOUND, 9000); - _events.ScheduleEvent(EVENT_SHOVELLED, 5000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - _events.Update(diff); - - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; - - while (uint32 eventId = _events.ExecuteEvent()) - { - switch (eventId) - { - case EVENT_BLINDING_DIRT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true)) - DoCast(target, SPELL_BLINDING_DIRT); - _events.RescheduleEvent(EVENT_BLINDING_DIRT, 10000); - return; - case EVENT_PUNCTURE_WOUND: - DoCastVictim(SPELL_PUNCTURE_WOUND); - _events.RescheduleEvent(EVENT_PUNCTURE_WOUND, 9000); - return; - case EVENT_SHOVELLED: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -5.0f)) - DoCast(target, SPELL_SHOVELLED); - _events.RescheduleEvent(EVENT_SHOVELLED, 7000); - return; - } - } - - DoMeleeAttackIfReady(); - } - - private: - EventMap _events; - }; - - CreatureAI* GetAI(Creature* creature) const - { - return new mob_wrathbone_laborerAI(creature); - } -}; - class mob_geist_ambusher : public CreatureScript { public: @@ -310,7 +235,6 @@ class spell_trash_mob_glacial_strike : public SpellScriptLoader void AddSC_pit_of_saron() { new mob_ymirjar_flamebearer(); - new mob_wrathbone_laborer(); new mob_iceborn_protodrake(); new mob_geist_ambusher(); new spell_trash_mob_glacial_strike(); -- cgit v1.2.3 From 5d3782bcf9a8ffb33edc27cbb63955e8194e2389 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 23:39:52 -0230 Subject: DB/creature_template: Some updates for Pit of Saron --- .../2012_05_05_04_world_creature_template.sql | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 sql/updates/world/2012_05_05_04_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_04_world_creature_template.sql b/sql/updates/world/2012_05_05_04_world_creature_template.sql new file mode 100644 index 00000000000..7c4f13dd667 --- /dev/null +++ b/sql/updates/world/2012_05_05_04_world_creature_template.sql @@ -0,0 +1,27 @@ +-- Fix InhabitType for Eye of the Lich King +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36913; +-- Updates From CDawg +-- Wrathbone Laborer (heroic) - fix hostility and adds equipment +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`equipment_id`=104 WHERE `entry`=37638; +-- Wrathbone Siegesmith (Heroic) add equipment +UPDATE `creature_template` SET `equipment_id`=122 WHERE `entry`=37639; +-- Fallen Warrior add equipment +UPDATE `creature_template` SET `equipment_id`=2328 WHERE `entry`=37612; +-- Forgemaster Garfrost add equipment +UPDATE `creature_template` SET `equipment_id`=2325 WHERE `entry`=37613; +-- Deathwhisper Necrolyte add equipment +UPDATE `creature_template` SET `equipment_id`=2365 WHERE `entry`=37609; +-- Deathwhisper Shadowcaster - add equipment +UPDATE `creature_template` SET `equipment_id`=2365 WHERE `entry`=38025; +-- Alliance slaves add equipments +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37645; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37646; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37647; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37648; +-- horde slaves add equipments +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37649; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37650; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37651; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37652; +-- Ymirjar Skycaller (heroic) - Fix unit flags and add equipment +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32832,`equipment_id`=2438 WHERE `entry`=37643; -- cgit v1.2.3 From aa482f7b58fe87c93f8c4f5b4995928ce4436117 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 5 May 2012 23:58:48 -0230 Subject: DB/creature_template: Fix a few target dummys to not allow skillup --- sql/updates/world/2012_05_05_05_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_05_05_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_05_world_creature_template.sql b/sql/updates/world/2012_05_05_05_world_creature_template.sql new file mode 100644 index 00000000000..a2f2a217252 --- /dev/null +++ b/sql/updates/world/2012_05_05_05_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Fix skillup on some target dummys +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|262144 WHERE `entry` IN (31144,2674,2673); -- cgit v1.2.3 From 2c4faaadf6cceada6c673f475fea34b670684a42 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 6 May 2012 00:34:39 -0230 Subject: DB/SAI: Updated SAI for Wrathbone Laborer. Was never aware of the dbc spell geek thing. --- sql/updates/world/2012_05_05_06_world_sai.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sql/updates/world/2012_05_05_06_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_05_06_world_sai.sql b/sql/updates/world/2012_05_05_06_world_sai.sql new file mode 100644 index 00000000000..7b064af4a4e --- /dev/null +++ b/sql/updates/world/2012_05_05_06_world_sai.sql @@ -0,0 +1,13 @@ +-- Wrathbone Laborer SAI +SET @ENTRY := 36830; -- NPC entry +SET @SPELL1 := 70302; -- Blinding Dirt +SET @SPELL2 := 70278; -- Puncture Wound +SET @SPELL3 := 69572; -- Shovelled! +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), +(@ENTRY,0,1,0,0,0,100,6,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), +(@ENTRY,0,2,0,0,0,100,6,5000,6000,7000,8000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'), +(@ENTRY,0,3,0,1,0,100,6,1000,3000,3000,3000,5,38,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Wrathbone Laborer - OOC - emote'); -- cgit v1.2.3 From 97a772e1cf03a348a7ce233f4d5f0ef31c039b76 Mon Sep 17 00:00:00 2001 From: gecko32 Date: Sun, 6 May 2012 11:30:03 +0200 Subject: DB/Loot: Add missing gold drops to ToC Partial fix for #5449 --- sql/updates/world/2012_05_06_00_world_creature_template.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_05_06_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_06_00_world_creature_template.sql b/sql/updates/world/2012_05_06_00_world_creature_template.sql new file mode 100644 index 00000000000..30dbf85c28d --- /dev/null +++ b/sql/updates/world/2012_05_06_00_world_creature_template.sql @@ -0,0 +1,5 @@ +-- Gold for Toc based on old.wowhead +UPDATE `creature_template` SET `mingold`=850000,`maxgold`=950000 WHERE `entry` IN(34797,35447,35448,35449); -- Icehowl +UPDATE `creature_template` SET `mingold`=550000,`maxgold`=650000 WHERE `entry` IN(34780,35216,35268,35269); -- Lord Jaraxxus +UPDATE `creature_template` SET `mingold`=650000,`maxgold`=700000 WHERE `entry` IN(34497,35350,35351,35352,34496,35347,35348,35359); -- Fjola Lightbane & Eydis Darkbane +UPDATE `creature_template` SET `mingold`=500000,`maxgold`=600000 WHERE `entry` IN(34564,34566,35615,35616); -- Anub'arak -- cgit v1.2.3 From 5a291149c1288b338c96c951e92ad9dde2c61732 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sun, 6 May 2012 11:48:25 +0200 Subject: DB/Loot: Add gold drops to Ulduar Closes #5449 --- sql/updates/world/2012_05_06_01_world_creature_template.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/2012_05_06_01_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_06_01_world_creature_template.sql b/sql/updates/world/2012_05_06_01_world_creature_template.sql new file mode 100644 index 00000000000..fa0c9af5805 --- /dev/null +++ b/sql/updates/world/2012_05_06_01_world_creature_template.sql @@ -0,0 +1,11 @@ +-- Based on old.wowhead.com +UPDATE `creature_template` SET `mingold`=1600000,`maxgold`=1800000 WHERE `entry` IN (33113,34003); -- Flame Levithian +UPDATE `creature_template` SET `mingold`=1100000,`maxgold`=1300000 WHERE `entry` IN (33118,33190); -- Ignis the Furnace Master +UPDATE `creature_template` SET `mingold`=280000,`maxgold`=360000 WHERE `entry` IN (33186,33724); -- Razorscale +UPDATE `creature_template` SET `mingold`=670000,`maxgold`=750000 WHERE `entry` IN (33293,33885); -- XT-002 Deconstructor +UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32857,33694); -- Stormcaller Brundir +UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32927,33692); -- Runemaster Molgeim +UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32867,33693); -- Steelbreaker +UPDATE `creature_template` SET `mingold`=1220000,`maxgold`=1500000 WHERE `entry` IN (33515,34175); -- Auriaya +UPDATE `creature_template` SET `mingold`=1650000,`maxgold`=1950000 WHERE `entry` IN (33271,33449); -- General Vezax +UPDATE `creature_template` SET `mingold`=2020000,`maxgold`=2220000 WHERE `entry` IN (33288,33955); -- Yogg-Saron -- cgit v1.2.3 From 5378d2eb48097fd50cd367ee191fae99fbd11e75 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 May 2012 11:00:56 -0230 Subject: DB/waypoints: A few missing paths for pit of saron --- .../world/2012_05_07_00_world_waypoints.sql | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 sql/updates/world/2012_05_07_00_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_07_00_world_waypoints.sql b/sql/updates/world/2012_05_07_00_world_waypoints.sql new file mode 100644 index 00000000000..f24b7c9c254 --- /dev/null +++ b/sql/updates/world/2012_05_07_00_world_waypoints.sql @@ -0,0 +1,73 @@ +-- Wrathbone Siegesmith pathing +SET @NPC := 202159; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=646.5851,`position_y`=-191.1892,`position_z`=526.8476 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,646.5851,-191.1892,526.8476,0,0,0,100,0), +(@PATH,2,648.8837,-181.967,526.7226,0,0,0,100,0), +(@PATH,3,649.4167,-179.4531,526.7226,14000,0,0,100,0), +(@PATH,4,652.1736,-183.3594,526.7226,0,0,0,100,0), +(@PATH,5,648.5643,-188.309,526.8476,0,0,0,100,0), +(@PATH,6,642.5313,-193.4826,527.3874,0,0,0,100,0), +(@PATH,7,633.688,-200.741,528.941,12000,0,0,100,0), +(@PATH,8,641.9254,-196.5747,528.9726,0,0,0,100,0); + +-- Wrathbone Siegesmith pathing +SET @NPC := 201855; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=723.5469,`position_y`=-170.9497,`position_z`=527.5121 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,723.5469,-170.9497,527.5121,13000,0,0,100,0), +(@PATH,2,726.6484,-173.3438,527.1627,0,0,0,100,0), +(@PATH,3,726.6484,-174.3438,527.1627,0,0,0,100,0), +(@PATH,4,725.25,-175.2379,526.8134,0,0,0,100,0), +(@PATH,5,722.0521,-181.5122,526.8134,0,0,0,100,0), +(@PATH,6,721.2031,-187.8142,526.8134,0,0,0,100,0), +(@PATH,7,717.7917,-194.4358,526.8134,0,0,0,100,0), +(@PATH,8,719.3073,-202.2691,527.1509,0,0,0,100,0), +(@PATH,9,720.3403,-206.1198,527.7932,12000,0,0,100,0), +(@PATH,10,717.6111,-199.5035,526.9384,0,0,0,100,0), +(@PATH,11,717.566,-189.0642,526.8134,0,0,0,100,0), +(@PATH,12,718.5764,-182.3958,526.8134,0,0,0,100,0), +(@PATH,13,719.9531,-176.0729,526.8134,0,0,0,100,0); + +-- Forgemaster Garfrost pathing +SET @NPC := 201992; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=712.1371,`position_y`=-215.7014,`position_z`=527.066 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`auras`) VALUES (@NPC,@PATH,1,'68792'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,712.1371,-215.7014,527.066,0,0,0,100,0), +(@PATH,2,719.507,-227.8559,527.066,3000,0,0,100,0), +(@PATH,3,712.1371,-215.7014,527.066,0,0,0,100,0), +(@PATH,4,685.1805,-207.349,526.8424,0,0,0,100,0), +(@PATH,5,664.5191,-203.3472,526.816,0,0,0,100,0), +(@PATH,6,645.033,-208.5295,528.941,0,0,0,100,0), +(@PATH,7,653.0729,-194.3681,526.7226,0,0,0,100,0), +(@PATH,8,664.8646,-195.2135,526.7226,0,0,0,100,0), +(@PATH,9,686.0816,-213.8264,526.8424,0,0,0,100,0), +(@PATH,10,697.9757,-221.6215,526.8424,0,0,0,100,0), +(@PATH,11,708.0903,-211.908,527.066,0,0,0,100,0), +(@PATH,12,717.8924,-204.6979,527.191,0,0,0,100,0), +(@PATH,13,699.0504,-201.3438,526.8424,0,0,0,100,0), +(@PATH,14,672.066,-201.1493,526.8424,0,0,0,100,0), +(@PATH,15,655.9496,-203.4931,526.816,0,0,0,100,0), +(@PATH,16,672.066,-201.1493,526.8424,0,0,0,100,0), +(@PATH,17,699.0504,-201.3438,526.8424,0,0,0,100,0), +(@PATH,18,717.8924,-204.6979,527.191,0,0,0,100,0), +(@PATH,19,708.0903,-211.908,527.066,0,0,0,100,0), +(@PATH,20,697.9757,-221.6215,526.8424,0,0,0,100,0), +(@PATH,21,686.0816,-213.8264,526.8424,0,0,0,100,0), +(@PATH,22,664.8646,-195.2135,526.7226,0,0,0,100,0), +(@PATH,23,653.0729,-194.3681,526.7226,0,0,0,100,0), +(@PATH,24,645.033,-208.5295,528.941,0,0,0,100,0), +(@PATH,25,664.5191,-203.3472,526.816,0,0,0,100,0), +(@PATH,26,685.1805,-207.349,526.8424,0,0,0,100,0); -- cgit v1.2.3 From f4b629a61d4800a0aa40b3942d6f5c749819257f Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 May 2012 16:12:04 -0230 Subject: DB/SAI: Some misc fixes for Pit of Saron --- sql/updates/world/2012_05_07_01_world_sai.sql | 51 +++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 sql/updates/world/2012_05_07_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_07_01_world_sai.sql b/sql/updates/world/2012_05_07_01_world_sai.sql new file mode 100644 index 00000000000..83676d31df9 --- /dev/null +++ b/sql/updates/world/2012_05_07_01_world_sai.sql @@ -0,0 +1,51 @@ +-- Ymirjar Skycaller SAI addition +SET @ENTRY := 31260; -- NPC entry +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY AND `id`=2; +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,2,0,25,0,100,6,0,0,0,0,11,46598,0,0,0,0,0,19,36891,20,0,0,0,0,0, 'Ymirjar Skycaller - Reset - Cast Ride Vehicle Hardcoded'); + +-- Wrathbone Laborer SAI +SET @ENTRY := -201800; -- NPC entry +SET @SPELL1 := 70302; -- Blinding Dirt +SET @SPELL2 := 70278; -- Puncture Wound +SET @SPELL3 := 69572; -- Shovelled! +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), +(@ENTRY,0,1,0,0,0,100,6,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), +(@ENTRY,0,2,0,0,0,100,6,5000,6000,7000,8000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'); + +-- Wrathbone Laborer pathing +SET @NPC := 201800; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=584.4202,`position_y`=188.9149,`position_z`=509.6726 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,584.4202,188.9149,509.6726,0,0,0,100,0), +(@PATH,2,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,3,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,4,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,5,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,6,594.0781,190.2622,508.8613,0,0,0,100,0), +(@PATH,7,604.9809,191.5451,507.6583,0,0,0,100,0), +(@PATH,8,617.8438,191.3455,507.5206,0,0,0,100,0), +(@PATH,9,633.1597,186.8281,508.6275,3000,0,48,100,0), +(@PATH,10,633.1597,186.8281,508.6275,3000,0,48,100,0), +(@PATH,11,624.3472,190.9705,507.7706,0,0,0,100,0), +(@PATH,12,613.3229,189.9236,507.3956,0,0,0,100,0), +(@PATH,13,604.5156,189.651,507.3956,0,0,0,100,0), +(@PATH,14,593.9844,187.4479,508.9778,0,0,0,100,0), +(@PATH,15,584.4202,188.9149,509.6726,0,0,0,100,0); +DELETE FROM `waypoint_scripts` WHERE `id`=48; +INSERT INTO `waypoint_scripts` (`id`,`delay`,`command`,`datalong`,`guid`) VALUES +(48,0,1,38,67); + +-- Add Overlord Drakuru riders to Stonespine Gargoyle +UPDATE creature_template SET InhabitType=4,`flags_extra`=`flags_extra`|128 WHERE entry=28717; +DELETE FROM `creature` WHERE `id`=28717 AND `map`=658; +DELETE FROM `vehicle_template_accessory` WHERE `entry`=36896; +INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`) VALUES +(36896,28717,1,0, 'Overlord Drakuru on Stonespine Gargoyle',6,30000); -- cgit v1.2.3 From fdc4f679215912e21cdaa643a3cb81c203f94bb6 Mon Sep 17 00:00:00 2001 From: Discover- Date: Tue, 8 May 2012 00:10:09 +0200 Subject: Database/Quests: Script quest Arelion's Mistress. Closes #3120 --- sql/updates/world/2012_05_08_00_world_sai.sql | 89 +++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 sql/updates/world/2012_05_08_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_08_00_world_sai.sql b/sql/updates/world/2012_05_08_00_world_sai.sql new file mode 100644 index 00000000000..8a776b5f2d2 --- /dev/null +++ b/sql/updates/world/2012_05_08_00_world_sai.sql @@ -0,0 +1,89 @@ +-- [Q] Arelion's Mistress +-- Viera Sunwhisper SAI +-- Twinkle SAI +SET @ENTRY_VIERA := 17226; +SET @ENTRY_TWINKLE := 17230; +SET @QUEST_PLEASURES := 9483; +SET @SPELL_RETRIBUTION := 30077; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_TWINKLE); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_VIERA,@ENTRY_TWINKLE,@ENTRY_VIERA*100,@ENTRY_VIERA*100+1); +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_VIERA,0,0,0,20,0,100,0,@QUEST_PLEASURES,0,0,0,80,@ENTRY_VIERA*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Quest Finish - Run Script'), +(@ENTRY_VIERA*100,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Viera Sunwhisper - On Script - Remove Quest Flag"), +(@ENTRY_VIERA*100,9,1,0,0,0,100,0,2000,2000,0,0,53,0,@ENTRY_VIERA,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Start WP 1'), +(@ENTRY_VIERA*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 0'), +(@ENTRY_VIERA*100,9,3,0,0,0,100,0,0,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Stand Up'), +(@ENTRY_VIERA*100,9,4,0,0,0,100,0,6500,6500,0,0,45,0,1,0,0,0,0,10,61963,@ENTRY_TWINKLE,0,0,0,0,0,'Viera Sunwhisper - On Script - Set Data 0 1 Twinkle'), +(@ENTRY_VIERA,0,1,2,40,0,100,0,10,@ENTRY_VIERA,0,0,66,0,0,0,0,0,0,11,@ENTRY_TWINKLE,15,0,0,0,0,0,'Viera Sunwhisper - On WP 10 - Face Twinkle'), +(@ENTRY_VIERA,0,2,0,61,0,100,0,0,0,0,0,54,1000000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 10 - Pause WP'), + +(@ENTRY_TWINKLE,0,0,0,38,0,100,0,0,1,0,0,53,1,@ENTRY_TWINKLE,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On Data 0 1 Set - Start WP 1 (run)'), +(@ENTRY_TWINKLE,0,1,0,40,0,100,0,13,@ENTRY_TWINKLE,0,0,54,1000000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On WP 13 - Pause WP'), +(@ENTRY_TWINKLE,0,2,0,38,0,100,0,1,2,0,0,53,1,@ENTRY_TWINKLE*10,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On Data Set 1 2 - Start WP 2 (run)'), +(@ENTRY_TWINKLE,0,3,0,40,0,100,0,4,@ENTRY_TWINKLE*10,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 4 (2) - Force Despawn'), + +(@ENTRY_VIERA,0,3,0,8,0,100,0,@SPELL_RETRIBUTION,0,0,0,80,@ENTRY_VIERA*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Spellhit - Run Second Script'), +(@ENTRY_VIERA*100+1,9,0,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 1'), +(@ENTRY_VIERA*100+1,9,1,0,0,0,100,0,0,0,0,0,33,@ENTRY_VIERA,0,0,0,0,0,7,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Quest Credit'), +(@ENTRY_VIERA*100+1,9,2,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 2'), +(@ENTRY_VIERA*100+1,9,3,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,9,@ENTRY_TWINKLE,0,25,0,0,0,0,'Twinkle - On Script - Say Line 0'), +(@ENTRY_VIERA*100+1,9,4,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 3'), +(@ENTRY_VIERA*100+1,9,5,0,0,0,100,0,0,0,0,0,45,1,2,0,0,0,0,10,61963,@ENTRY_TWINKLE,0,0,0,0,0,'Viera Sunwhisper - On Script - Set Data 1 2 Twinkle'), +(@ENTRY_VIERA*100+1,9,6,0,0,0,100,0,0,0,0,0,53,1,@ENTRY_VIERA*10,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Start WP 2 (run)'), +(@ENTRY_VIERA,0,4,0,40,0,100,0,4,@ENTRY_VIERA*10,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 4 (2) - Force Despawn'); + +-- Waypoints for Viera Sunwhisper +DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_VIERA*10); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY_VIERA,1,-653.739197,4145.138184,64.200729,'Viera Sunwhisper'), +(@ENTRY_VIERA,2,-658.875732,4147.715332,64.168304,'Viera Sunwhisper'), +(@ENTRY_VIERA,3,-681.465088,4147.636230,64.118073,'Viera Sunwhisper'), +(@ENTRY_VIERA,4,-686.400696,4161.865234,59.707859,'Viera Sunwhisper'), +(@ENTRY_VIERA,5,-695.956909,4179.237305,57.618931,'Viera Sunwhisper'), +(@ENTRY_VIERA,6,-699.832153,4189.959473,57.503750,'Viera Sunwhisper'), +(@ENTRY_VIERA,7,-708.518616,4184.436035,55.275894,'Viera Sunwhisper'), +(@ENTRY_VIERA,8,-716.137268,4178.130371,52.637508,'Viera Sunwhisper'), +(@ENTRY_VIERA,9,-719.865295,4174.992676,51.554867,'Viera Sunwhisper'), +(@ENTRY_VIERA,10,-720.839417,4162.232422,50.805923,'Viera Sunwhisper'), + +(@ENTRY_VIERA*10,1,-722.323486,4147.936523,50.337898,'Viera Sunwhisper'), +(@ENTRY_VIERA*10,2,-726.639343,4125.156250,48.479683,'Viera Sunwhisper'), +(@ENTRY_VIERA*10,3,-727.648315,4109.684082,47.528461,'Viera Sunwhisper'), +(@ENTRY_VIERA*10,4,-727.874329,4093.438721,46.446579,'Viera Sunwhisper'); + +-- Waypoints for Twinkle +DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY_TWINKLE,@ENTRY_TWINKLE*10); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY_TWINKLE,1,-605.445190,4165.205078,64.081802,'Twinkle'), +(@ENTRY_TWINKLE,2,-619.293335,4161.776855,63.217815,'Twinkle'), +(@ENTRY_TWINKLE,3,-629.536560,4153.708984,64.067123,'Twinkle'), +(@ENTRY_TWINKLE,4,-644.773438,4151.062988,64.174675,'Twinkle'), +(@ENTRY_TWINKLE,5,-658.875732,4147.715332,64.168304,'Twinkle'), +(@ENTRY_TWINKLE,6,-681.465088,4147.636230,64.118073,'Twinkle'), +(@ENTRY_TWINKLE,7,-686.400696,4161.865234,59.707859,'Twinkle'), +(@ENTRY_TWINKLE,8,-695.956909,4179.237305,57.618931,'Twinkle'), +(@ENTRY_TWINKLE,9,-699.832153,4189.959473,57.503750,'Twinkle'), +(@ENTRY_TWINKLE,10,-708.518616,4184.436035,55.275894,'Twinkle'), +(@ENTRY_TWINKLE,11,-716.137268,4178.130371,52.637508,'Twinkle'), +(@ENTRY_TWINKLE,12,-719.865295,4174.992676,51.554867,'Twinkle'), +(@ENTRY_TWINKLE,13,-720.636292,4166.637695,50.815567,'Twinkle'), + +(@ENTRY_TWINKLE*10,1,-722.323486,4147.936523,50.337898,'Twinkle'), +(@ENTRY_TWINKLE*10,2,-726.639343,4125.156250,48.479683,'Twinkle'), +(@ENTRY_TWINKLE*10,3,-727.648315,4109.684082,47.528461,'Twinkle'), +(@ENTRY_TWINKLE*10,4,-727.874329,4093.438721,46.446579,'Twinkle'); + +-- Spawn spell focus object on correct position +DELETE FROM `gameobject` WHERE `id`=300071 AND `guid`=303; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(303,300071,530,1,1,-720.803,4162.77,50.7916,4.61029,0,0,0.742267,-0.670104,300,0,1); + +-- Texts +DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_TWINKLE); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY_VIERA,0,0,"Ok, let's go. I know just the perfect spot!",12,0,100,0,0,0,'Viera Sunwhisper'), +(@ENTRY_VIERA,1,0,"I can't wait to try this wine!",12,0,100,0,0,0,'Viera Sunwhisper'), +(@ENTRY_VIERA,2,0,"What... is happening... to me? Get this cat away from me!",12,0,100,0,0,0,'Viera Sunwhisper'), +(@ENTRY_VIERA,3,0,"%s scurries away, attempting to flee from Twinkle",16,0,100,0,0,0,'Viera Sunwhisper'), + +(@ENTRY_TWINKLE,0,0,"%s looks at Viera Sunwhisper with very hungry eyes",16,0,100,0,0,0,'Twinkle'); -- cgit v1.2.3 From 51ed0525ae5a2315589c4ae3be609539312dd529 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 May 2012 20:49:04 -0230 Subject: DB/gameobject: Add missing Ice Wall spawn to Pit of Saron. --- sql/updates/world/2012_05_08_01_world_gameobject.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_05_08_01_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_08_01_world_gameobject.sql b/sql/updates/world/2012_05_08_01_world_gameobject.sql new file mode 100644 index 00000000000..e6fc74a5e80 --- /dev/null +++ b/sql/updates/world/2012_05_08_01_world_gameobject.sql @@ -0,0 +1,5 @@ +-- Add Missing Ice Wall, Pit of Saron +SET @GUID := 303; +DELETE FROM `gameobject` WHERE `guid`=@GUID; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,201885,658,3,1,932.2674,-80.6684,591.6761,2.286379,0,0,0,0,300,100,1); -- cgit v1.2.3 From 2956631f82989a6777c231b0c02999651050161a Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 May 2012 21:01:54 -0230 Subject: DB/gameobject: Change guid, Discovered is my nemisis! --- sql/updates/world/2012_05_08_01_world_gameobject.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_08_01_world_gameobject.sql b/sql/updates/world/2012_05_08_01_world_gameobject.sql index e6fc74a5e80..b83d02b4762 100644 --- a/sql/updates/world/2012_05_08_01_world_gameobject.sql +++ b/sql/updates/world/2012_05_08_01_world_gameobject.sql @@ -1,5 +1,5 @@ -- Add Missing Ice Wall, Pit of Saron -SET @GUID := 303; +SET @GUID := 305; DELETE FROM `gameobject` WHERE `guid`=@GUID; INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES (@GUID,201885,658,3,1,932.2674,-80.6684,591.6761,2.286379,0,0,0,0,300,100,1); -- cgit v1.2.3 From 5b02191a1d217b2d035415815e080ba827caa686 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 May 2012 21:26:56 -0230 Subject: DB/Misc: Updates for Pit of Saron. --- sql/updates/world/2012_05_08_01_world_misc.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2012_05_08_01_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_08_01_world_misc.sql b/sql/updates/world/2012_05_08_01_world_misc.sql new file mode 100644 index 00000000000..8f19132fa27 --- /dev/null +++ b/sql/updates/world/2012_05_08_01_world_misc.sql @@ -0,0 +1,9 @@ +-- Spell area spells for entering POS +DELETE FROM `spell_area` WHERE `spell` IN (70056,70057); +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(70056,4904,0,0,0,0,690,2,1), -- Send Script Event (22717) +(70057,4904,0,0,0,0,1101,2,1); -- Send Script Event (22718) + +-- Fix flags and equipment for Ymirjar Deathbringer +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256 WHERE `entry` IN (36892,37641); +UPDATE `creature_template` SET `equipment_id`=2444 WHERE `entry`=37641; -- cgit v1.2.3 From 1af30a9ea24f90abaefeb0782ccbd40d376da3ce Mon Sep 17 00:00:00 2001 From: kaelima Date: Wed, 9 May 2012 01:48:18 +0200 Subject: Scripts/Wormhole: Add rare 6th option to "Underground". Fixed some teleport positions (from sniffs) And made some random cleanup for npc_shadowfiend and npc_lightwell --- .../2012_05_09_00_world_spell_target_position.sql | 7 + src/server/scripts/World/npcs_special.cpp | 201 +++++++++++---------- 2 files changed, 108 insertions(+), 100 deletions(-) create mode 100644 sql/updates/world/2012_05_09_00_world_spell_target_position.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_09_00_world_spell_target_position.sql b/sql/updates/world/2012_05_09_00_world_spell_target_position.sql new file mode 100644 index 00000000000..a6e9d7289b7 --- /dev/null +++ b/sql/updates/world/2012_05_09_00_world_spell_target_position.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_target_position` WHERE `id` IN (67834, 68081); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(67834, 571, 3167.01, 5586.04, 880.067, 0), +(68081, 571, 5857.252, 516.8015, 599.82, 2.987); + +UPDATE `spell_target_position` SET `target_position_x`=6136.89,`target_position_y`=4785.55,`target_position_z`=100.673 WHERE `id`=67835; +UPDATE `spell_target_position` SET `target_position_x`=8301.39,`target_position_y`=1501.34,`target_position_z`=870.555 WHERE `id`=67836; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index e1cfd077444..13880d240bf 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1975,33 +1975,31 @@ public: class npc_lightwell : public CreatureScript { -public: - npc_lightwell() : CreatureScript("npc_lightwell") { } - - struct npc_lightwellAI : public PassiveAI - { - npc_lightwellAI(Creature* creature) : PassiveAI(creature) {} + public: + npc_lightwell() : CreatureScript("npc_lightwell") { } - void Reset() + struct npc_lightwellAI : public PassiveAI { - DoCast(me, 59907, false); // Spell for Lightwell Charges - } + npc_lightwellAI(Creature* creature) : PassiveAI(creature) + { + DoCast(me, 59907, false); + } - void EnterEvadeMode() - { - if (!me->isAlive()) - return; + void EnterEvadeMode() + { + if (!me->isAlive()) + return; - me->DeleteThreatList(); - me->CombatStop(true); - me->ResetPlayerDamageReq(); - } - }; + me->DeleteThreatList(); + me->CombatStop(true); + me->ResetPlayerDamageReq(); + } + }; - CreatureAI* GetAI(Creature* creature) const - { - return new npc_lightwellAI(creature); - } + CreatureAI* GetAI(Creature* creature) const + { + return new npc_lightwellAI(creature); + } }; enum eTrainingDummy @@ -2099,34 +2097,26 @@ public: class npc_shadowfiend : public CreatureScript { -public: - npc_shadowfiend() : CreatureScript("npc_shadowfiend") { } - - struct npc_shadowfiendAI : public ScriptedAI - { - npc_shadowfiendAI(Creature* creature) : ScriptedAI(creature) {} + public: + npc_shadowfiend() : CreatureScript("npc_shadowfiend") { } - void DamageTaken(Unit* /*killer*/, uint32& damage) + struct npc_shadowfiendAI : public ScriptedAI { - if (me->isSummon()) - if (Unit* owner = me->ToTempSummon()->GetSummoner()) - if (owner->HasAura(GLYPH_OF_SHADOWFIEND) && damage >= me->GetHealth()) - owner->CastSpell(owner, GLYPH_OF_SHADOWFIEND_MANA, true); - } + npc_shadowfiendAI(Creature* creature) : ScriptedAI(creature) {} - void UpdateAI(uint32 const /*diff*/) - { - if (!UpdateVictim()) - return; + void DamageTaken(Unit* /*killer*/, uint32& damage) + { + if (me->isSummon()) + if (Unit* owner = me->ToTempSummon()->GetSummoner()) + if (owner->HasAura(GLYPH_OF_SHADOWFIEND) && damage >= me->GetHealth()) + owner->CastSpell(owner, GLYPH_OF_SHADOWFIEND_MANA, true); + } + }; - DoMeleeAttackIfReady(); + CreatureAI* GetAI(Creature* creature) const + { + return new npc_shadowfiendAI(creature); } - }; - - CreatureAI* GetAI(Creature* creature) const - { - return new npc_shadowfiendAI(creature); - } }; /*###### @@ -2193,7 +2183,7 @@ public: } }; - CreatureAI *GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const { return new npc_fire_elementalAI(creature); } @@ -2238,7 +2228,7 @@ public: } }; - CreatureAI *GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const { return new npc_earth_elementalAI(creature); } @@ -2248,78 +2238,89 @@ public: # npc_wormhole ######*/ -#define GOSSIP_ENGINEERING1 "Borean Tundra." -#define GOSSIP_ENGINEERING2 "Howling Fjord." -#define GOSSIP_ENGINEERING3 "Sholazar Basin." -#define GOSSIP_ENGINEERING4 "Icecrown." -#define GOSSIP_ENGINEERING5 "Storm Peaks." +#define GOSSIP_ENGINEERING1 "Borean Tundra" +#define GOSSIP_ENGINEERING2 "Howling Fjord" +#define GOSSIP_ENGINEERING3 "Sholazar Basin" +#define GOSSIP_ENGINEERING4 "Icecrown" +#define GOSSIP_ENGINEERING5 "Storm Peaks" +#define GOSSIP_ENGINEERING6 "Underground..." -enum eWormhole +enum WormholeSpells { - SPELL_HOWLING_FJORD = 67838, + SPELL_BOREAN_TUNDRA = 67834, SPELL_SHOLAZAR_BASIN = 67835, SPELL_ICECROWN = 67836, SPELL_STORM_PEAKS = 67837, + SPELL_HOWLING_FJORD = 67838, + SPELL_UNDERGROUND = 68081, TEXT_WORMHOLE = 907 }; class npc_wormhole : public CreatureScript { -public: - npc_wormhole() : CreatureScript("npc_wormhole") { } + public: + npc_wormhole() : CreatureScript("npc_wormhole") + { + showUnderground = urand(0, 100) == 0; // Guessed value, it is really rare though + } - bool OnGossipHello(Player* player, Creature* creature) - { - if (creature->isSummon()) + bool OnGossipHello(Player* player, Creature* creature) { - if (player == creature->ToTempSummon()->GetSummoner()) + if (creature->isSummon()) { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); + if (player == creature->ToTempSummon()->GetSummoner()) + { + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); + + if (showUnderground) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - player->PlayerTalkClass->SendGossipMenu(TEXT_WORMHOLE, creature->GetGUID()); + player->PlayerTalkClass->SendGossipMenu(TEXT_WORMHOLE, creature->GetGUID()); + } } + return true; } - return true; - } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) - { - player->PlayerTalkClass->ClearMenus(); - bool roll = urand(0, 1); - - switch (action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { - case GOSSIP_ACTION_INFO_DEF + 1: //Borean Tundra - player->CLOSE_GOSSIP_MENU(); - if (roll) //At the moment we don't have chance on spell_target_position table so we hack this - player->TeleportTo(571, 4305.505859f, 5450.839844f, 63.005806f, 0.627286f); - else - player->TeleportTo(571, 3201.936279f, 5630.123535f, 133.658798f, 3.855272f); - break; - case GOSSIP_ACTION_INFO_DEF + 2: //Howling Fjord - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_HOWLING_FJORD, true); - break; - case GOSSIP_ACTION_INFO_DEF + 3: //Sholazar Basin - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_SHOLAZAR_BASIN, true); - break; - case GOSSIP_ACTION_INFO_DEF + 4: //Icecrown - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_ICECROWN, true); - break; - case GOSSIP_ACTION_INFO_DEF + 5: //Storm peaks - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, SPELL_STORM_PEAKS, true); - break; + player->PlayerTalkClass->ClearMenus(); + + switch (action) + { + case GOSSIP_ACTION_INFO_DEF + 1: // Borean Tundra + player->CLOSE_GOSSIP_MENU(); + creature->CastSpell(player, SPELL_BOREAN_TUNDRA, false); + break; + case GOSSIP_ACTION_INFO_DEF + 2: // Howling Fjord + player->CLOSE_GOSSIP_MENU(); + creature->CastSpell(player, SPELL_HOWLING_FJORD, false); + break; + case GOSSIP_ACTION_INFO_DEF + 3: // Sholazar Basin + player->CLOSE_GOSSIP_MENU(); + creature->CastSpell(player, SPELL_SHOLAZAR_BASIN, false); + break; + case GOSSIP_ACTION_INFO_DEF + 4: // Icecrown + player->CLOSE_GOSSIP_MENU(); + creature->CastSpell(player, SPELL_ICECROWN, false); + break; + case GOSSIP_ACTION_INFO_DEF + 5: // Storm peaks + player->CLOSE_GOSSIP_MENU(); + creature->CastSpell(player, SPELL_STORM_PEAKS, false); + break; + case GOSSIP_ACTION_INFO_DEF + 6: // Underground + player->CLOSE_GOSSIP_MENU(); + creature->CastSpell(player, SPELL_UNDERGROUND, false); + break; + } + return true; } - return true; - } + private: + bool underGround; }; /*###### @@ -2865,7 +2866,7 @@ public: } }; - CreatureAI *GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const { return new npc_fireworkAI(creature); } -- cgit v1.2.3 From d6d45633c8ca34176d066755ba8be182b1ed7ac7 Mon Sep 17 00:00:00 2001 From: Kandera Date: Wed, 9 May 2012 10:07:18 -0400 Subject: Core/Commands: Add level 3 command for setting npc data. used for testing scripts. --- sql/updates/world/2012_05_09_01_world_commands.sql | 8 +++++ src/server/game/Miscellaneous/Language.h | 3 +- src/server/scripts/Commands/cs_npc.cpp | 34 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_05_09_01_world_commands.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_09_01_world_commands.sql b/sql/updates/world/2012_05_09_01_world_commands.sql new file mode 100644 index 00000000000..dcd4c9130eb --- /dev/null +++ b/sql/updates/world/2012_05_09_01_world_commands.sql @@ -0,0 +1,8 @@ +DELETE FROM `trinity_string` WHERE `entry` = 555; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(555,"SetData performed on [GUID: %u, entry: %u, name: %s] Field: %u, Data: %u, with %s"); + +DELETE FROM `command` WHERE `name` = "npc set data"; +INSERT INTO `command` (`name`,`security`,`help`) VALUES +("npc set data", 3, "Syntax: .npc set data $field $data +Sets data for the selected creature. Used for testing Scripting"); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 4b07d19bd7a..aec72835d86 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -522,8 +522,9 @@ enum TrinityStrings LANG_YOURS_EXPLORE_SET_ALL = 553, LANG_YOURS_EXPLORE_SET_NOTHING = 554, + LANG_NPC_SETDATA = 555, + //! Old ones now free: - // LANG_HOVER_ENABLED = 555, // LANG_HOVER_DISABLED = 556, LANG_YOURS_LEVEL_UP = 557, diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index a9959c60201..6089d256387 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -73,6 +73,7 @@ public: { "phase", SEC_GAMEMASTER, false, &HandleNpcSetPhaseCommand, "", NULL }, { "spawndist", SEC_GAMEMASTER, false, &HandleNpcSetSpawnDistCommand, "", NULL }, { "spawntime", SEC_GAMEMASTER, false, &HandleNpcSetSpawnTimeCommand, "", NULL }, + { "data", SEC_ADMINISTRATOR, false, &HandleNpcSetDataCommand, "", NULL }, //{ TODO: fix or remove these commands { "name", SEC_GAMEMASTER, false, &HandleNpcSetNameCommand, "", NULL }, { "subname", SEC_GAMEMASTER, false, &HandleNpcSetSubNameCommand, "", NULL }, @@ -524,6 +525,39 @@ public: return true; } + //set data of creature for testing scripting + static bool HandleNpcSetDataCommand(ChatHandler* handler, const char* args) + { + if (!*args) + return false; + + char* arg1 = strtok((char*)args, " "); + char* arg2 = strtok((char*)NULL, ""); + + if (!arg1 || !arg2) + return false; + + uint32 data_1 = (uint32)atoi(arg1); + uint32 data_2 = (uint32)atoi(arg2); + + if (!data_1 || !data_2) + return false; + + Creature* creature = handler->getSelectedCreature(); + + if (!creature) + { + handler->SendSysMessage(LANG_SELECT_CREATURE); + handler->SetSentErrorMessage(true); + return false; + } + + creature->AI()->SetData(data_1, data_2); + std::string AIorScript = creature->GetAIName() != "" ? "AI type: " + creature->GetAIName() : (creature->GetScriptName() != "" ? "Script Name: " + creature->GetScriptName() : "No AI or Script Name Set"); + handler->PSendSysMessage(LANG_NPC_SETDATA, creature->GetGUID(), creature->GetEntry(), creature->GetName(), data_1, data_2, AIorScript); + return true; + } + //npc follow handling static bool HandleNpcFollowCommand(ChatHandler* handler, const char* /*args*/) { -- cgit v1.2.3 From 890c7e64e17b1303809787255b09a9818ff46c50 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Wed, 9 May 2012 22:40:59 +0200 Subject: Battleground/Strand of the Ancients: Fix Achievement: Not Even a Scratch --- .../2012_05_09_02_achievement_criteria_data.sql | 6 ++++++ .../game/Battlegrounds/Zones/BattlegroundSA.cpp | 12 +++++++----- .../game/Battlegrounds/Zones/BattlegroundSA.h | 9 +++++++-- src/server/scripts/World/achievement_scripts.cpp | 22 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 sql/updates/world/2012_05_09_02_achievement_criteria_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_09_02_achievement_criteria_data.sql b/sql/updates/world/2012_05_09_02_achievement_criteria_data.sql new file mode 100644 index 00000000000..e1c0529fffe --- /dev/null +++ b/sql/updates/world/2012_05_09_02_achievement_criteria_data.sql @@ -0,0 +1,6 @@ +DELETE FROM `disables` WHERE `entry` IN (7626,7634) AND `sourceType`=4; + +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (7626,7634); +INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES +(7626, 11, 0, 0, 'achievement_not_even_a_scratch'), +(7634, 11, 0, 0, 'achievement_not_even_a_scratch'); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 977897b8d48..d20efbddbbe 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -56,6 +56,8 @@ void BattlegroundSA::Reset() GateStatus[i] = BG_SA_GATE_OK; ShipsStarted = false; gateDestroyed = false; + _notEvenAScratch[BG_TEAM_ALLIANCE] = true; + _notEvenAScratch[BG_TEAM_HORDE] = true; Status = BG_SA_WARMUP; } @@ -553,13 +555,13 @@ void BattlegroundSA::EventPlayerDamagedGO(Player* /*player*/, GameObject* go, ui SendWarningToAll(LANG_BG_SA_IS_UNDER_ATTACK, go->GetGOInfo()->name.c_str()); } -void BattlegroundSA::HandleKillUnit(Creature* unit, Player* killer) +void BattlegroundSA::HandleKillUnit(Creature* creature, Player* killer) { - if (!unit) - return; - - if (unit->GetEntry() == NPC_DEMOLISHER_SA) + if (creature->GetEntry() == NPC_DEMOLISHER_SA) + { UpdatePlayerScore(killer, SCORE_DESTROYED_DEMOLISHER, 1); + _notEvenAScratch[Attackers] = false; + } } /* diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index c18806490f2..fd11cb2c5ea 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -456,7 +456,7 @@ class BattlegroundSA : public Battleground /// Called when a player deal damage to building (door) virtual void EventPlayerDamagedGO(Player* player, GameObject* go, uint32 eventType); /// Called when a player kill a unit in bg - virtual void HandleKillUnit(Creature* unit, Player* killer); + virtual void HandleKillUnit(Creature* creature, Player* killer); /// Return the nearest graveyard where player can respawn virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player); /// Called when a player click on flag (graveyard flag) @@ -531,9 +531,12 @@ class BattlegroundSA : public Battleground /// Update score board void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true); - // Achievement Defense of the Ancients + // Achievement: Defense of the Ancients bool gateDestroyed; + // Achievement: Not Even a Scratch + bool notEvenAScratch(uint32 team) const { return _notEvenAScratch[GetTeamIndexByTeamId(team)]; } + /// Id of attacker team TeamId Attackers; @@ -615,5 +618,7 @@ class BattlegroundSA : public Battleground bool InitSecondRound; std::map DemoliserRespawnList; + // Achievement: Not Even a Scratch + bool _notEvenAScratch[BG_TEAMS_COUNT]; }; #endif diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index 9bcf450b3aa..3dc737f0c95 100755 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -313,6 +313,27 @@ class achievement_tilted : public AchievementCriteriaScript } }; +class achievement_not_even_a_scratch : public AchievementCriteriaScript +{ + public: + achievement_not_even_a_scratch() : AchievementCriteriaScript("achievement_not_even_a_scratch") { } + + bool OnCheck(Player* source, Unit* /*target*/) + { + if (!source) + return false; + + Battleground* battleground = source->GetBattleground(); + if (!battleground) + return false; + + if (static_cast(battleground)->notEvenAScratch(source->GetTeam())) + return true; + + return false; + } +}; + void AddSC_achievement_scripts() { new achievement_resilient_victory(); @@ -331,4 +352,5 @@ void AddSC_achievement_scripts() new achievement_arena_kills("achievement_arena_5v5_kills", ARENA_TYPE_5v5); new achievement_bg_sa_defense_of_ancients(); new achievement_tilted(); + new achievement_not_even_a_scratch(); } -- cgit v1.2.3 From 36542c9180d0ee5b390e87ac9f63194b6e922eb4 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 9 May 2012 21:39:32 -0230 Subject: DB/SAI: Fixup for Quest Quest:The Path to the Citadel "Alliance and Horde" --- sql/updates/world/2012_05_09_02_world_sai.sql | 116 ++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 sql/updates/world/2012_05_09_02_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_09_02_world_sai.sql b/sql/updates/world/2012_05_09_02_world_sai.sql new file mode 100644 index 00000000000..01004b23505 --- /dev/null +++ b/sql/updates/world/2012_05_09_02_world_sai.sql @@ -0,0 +1,116 @@ +-- Fixup for Quest Quest:The Path to the Citadel "Alliance and Horde" + +-- Alliance slave add missing equipments +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=36767; + +-- Horde Slave SAI +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36770,36771,36772,36773); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36770,36771,36772,36773); +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3677000); +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 +(36770,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36771,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36772,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36773,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36770,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +(36771,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +(36772,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +(36773,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +-- Script +(3677000,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - Turnto envoker'), +(3677000,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - say text'), +(3677000,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set unitflag'), +(3677000,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set faction'), +(3677000,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set Emotestate'), +(3677000,9,5,0,0,0,100,0,100,100,100,100,33,36770,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - give quest credit'), +(3677000,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set run on'), +(3677000,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Horde Slave - Script - move to closest trigger'), +(3677000,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - despawn'); + +-- Alliance Slave SAI +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36764,36765,36766,36767); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36764,36765,36766,36767); +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3676400); +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 +(36764,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36765,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36766,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36767,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36764,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +(36765,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +(36766,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +(36767,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +-- Script +(3676400,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - Turnto envoker'), +(3676400,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - say text'), +(3676400,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set unitflag'), +(3676400,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set faction'), +(3676400,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set Emotestate'), +(3676400,9,5,0,0,0,100,0,100,100,100,100,33,36764,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - give quest credit'), +(3676400,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set run on'), +(3676400,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Alliance Slave - Script - move to closest trigger'), +(3676400,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - despawn'); + +-- Ball and chain SAI +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (201969); +DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid` IN (201969); +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 +(201969,1,0,0,64,0,100,6,0,0,0,0,85,71281,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Ball and chain - On Gossip Hello - Envoker cast on self'); + +-- Spell Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=71281; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,71281,0,31,3,36770,0,0,'','Spell 71281 targets entry 36770'), +(13,1,71281,1,31,3,36771,0,0,'','Spell 71281 targets entry 36771'), +(13,1,71281,2,31,3,36772,0,0,'','Spell 71281 targets entry 36772'), +(13,1,71281,3,31,3,36773,0,0,'','Spell 71281 targets entry 36773'), +(13,1,71281,4,31,3,36764,0,0,'','Spell 71281 targets entry 36764'), +(13,1,71281,5,31,3,36765,0,0,'','Spell 71281 targets entry 36765'), +(13,1,71281,6,31,3,36766,0,0,'','Spell 71281 targets entry 36766'), +(13,1,71281,7,31,3,36767,0,0,'','Spell 71281 targets entry 36767'); + +-- Creature text from sniff +DELETE FROM `creature_text` WHERE `entry` IN (36770,36771,36772,36773,36764,36765,36766,36767); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +-- Alliance Slaves +(36764,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36764,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36764,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36764,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36764,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36765,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36766,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36767,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +-- Horde Slaves +(36770,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36770,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36770,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36770,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36770,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36771,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36772,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36773,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'); -- cgit v1.2.3 From b5ff1633541bb1d7d2c4f2efd26a8a53544ae4eb Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 9 May 2012 22:11:27 -0230 Subject: DB/misc: Misc updates for Pit of Saron --- sql/updates/world/2012_05_09_03_world_misc.sql | 56 ++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 sql/updates/world/2012_05_09_03_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_09_03_world_misc.sql b/sql/updates/world/2012_05_09_03_world_misc.sql new file mode 100644 index 00000000000..5d47b27323c --- /dev/null +++ b/sql/updates/world/2012_05_09_03_world_misc.sql @@ -0,0 +1,56 @@ +-- Update Scourgelord Tyrannus "Make him fly" +UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36794; + +-- Put Rimefang in the air and make him fly +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36661; +UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36661; + +-- Deathwhisper Necrolyte SAI +SET @ENTRY := 36788; -- NPC entry +SET @SPELL1 := 69577; -- Shadow Bolt +SET @SPELL2 := 69578; -- Conversion Beam +SET @SPELL3 := 45104; -- Shadow Channelling +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,100,100,3000,3000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Shadow Bolt'), +(@ENTRY,0,1,0,0,0,100,6,9000,9000,24000,24000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Conversion Beam'), + +-- Deathwhisper Necrolyte pathing +SET @NPC := 202231; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=592.975,`position_y`=176.104,`position_z`=508.746 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,596.0208,175.5243,508.3654,0,0,0,100,0), +(@PATH,2,605.2656,157.7101,507.2126,0,0,0,100,0), +(@PATH,3,604.4063,146.283,507.3376,0,0,0,100,0), +(@PATH,4,592.2899,131.4271,507.8163,0,0,0,100,0), +(@PATH,5,577.4531,118.224,508.3163,0,0,0,100,0), +(@PATH,6,563.0695,103.7309,514.1504,0,0,0,100,0), +(@PATH,7,557.7743,89.41319,523.1727,0,0,0,100,0), +(@PATH,8,560.9583,77.65278,525.4227,0,0,0,100,0), +(@PATH,9,560.9583,77.65278,525.4227,0,0,0,100,0), +(@PATH,10,571.0139,69.43403,525.2753,0,0,0,100,0), +(@PATH,11,560.9583,77.65278,525.4227,0,0,0,100,0), +(@PATH,12,557.7743,89.41319,523.1727,0,0,0,100,0), +(@PATH,13,563.0695,103.7309,514.1504,0,0,0,100,0), +(@PATH,14,577.4531,118.224,508.3163,0,0,0,100,0), +(@PATH,15,592.2899,131.4271,507.8163,0,0,0,100,0), +(@PATH,16,604.4063,146.283,507.3376,0,0,0,100,0), +(@PATH,17,605.2656,157.7101,507.2126,0,0,0,100,0), +(@PATH,18,596.0208,175.5243,508.3654,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=202231; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(202231,202231,0,0,2), +(202231,202099,7,288,2), +(202231,202282,7,324,2), +(202231,202125,7,360,2), +(202231,202203,7,36,2), +(202231,201960,7,72,2); + +-- Remove a dupe spawn +DELETE * FROM `creature` WHERE `guid`=201998; +DELETE * FROM `creature_addon` WHERE `guid`=201998; -- cgit v1.2.3 From 9c3842fe491ac73edb1a9d8224947ef414695785 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 9 May 2012 22:13:13 -0230 Subject: DB/Misc: fix sql error :| --- sql/updates/world/2012_05_09_03_world_misc.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_09_03_world_misc.sql b/sql/updates/world/2012_05_09_03_world_misc.sql index 5d47b27323c..75c04b88df9 100644 --- a/sql/updates/world/2012_05_09_03_world_misc.sql +++ b/sql/updates/world/2012_05_09_03_world_misc.sql @@ -52,5 +52,5 @@ INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`gro (202231,201960,7,72,2); -- Remove a dupe spawn -DELETE * FROM `creature` WHERE `guid`=201998; -DELETE * FROM `creature_addon` WHERE `guid`=201998; +DELETE FROM `creature` WHERE `guid`=201998; +DELETE FROM `creature_addon` WHERE `guid`=201998; -- cgit v1.2.3 From 4aa2032cd4ea0647168c3bdedb09172c9915ac64 Mon Sep 17 00:00:00 2001 From: Discover- Date: Thu, 10 May 2012 13:15:09 +0200 Subject: Database/Errors: Fix another SQL error from b5ff1633541bb1d7d2c4f2efd26a8a53544ae4eb :thumbsdown: --- sql/updates/world/2012_05_09_03_world_misc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_09_03_world_misc.sql b/sql/updates/world/2012_05_09_03_world_misc.sql index 75c04b88df9..63e162fcfce 100644 --- a/sql/updates/world/2012_05_09_03_world_misc.sql +++ b/sql/updates/world/2012_05_09_03_world_misc.sql @@ -13,7 +13,7 @@ SET @SPELL3 := 45104; -- Shadow Channelling DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES (@ENTRY,0,0,0,0,0,100,6,100,100,3000,3000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Shadow Bolt'), -(@ENTRY,0,1,0,0,0,100,6,9000,9000,24000,24000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Conversion Beam'), +(@ENTRY,0,1,0,0,0,100,6,9000,9000,24000,24000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Conversion Beam'); -- Deathwhisper Necrolyte pathing SET @NPC := 202231; -- cgit v1.2.3 From 7a6314595a9159c8ba9e10239585f882f10af55d Mon Sep 17 00:00:00 2001 From: Discover- Date: Thu, 10 May 2012 13:27:28 +0200 Subject: Database/Quests: Script quest See On The Other Side. Closes #4174 Closes #3340 Partly closes #5200 --- sql/updates/world/2012_05_10_00_world_sai.sql | 42 +++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 sql/updates/world/2012_05_10_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_10_00_world_sai.sql b/sql/updates/world/2012_05_10_00_world_sai.sql new file mode 100644 index 00000000000..c6d6e914345 --- /dev/null +++ b/sql/updates/world/2012_05_10_00_world_sai.sql @@ -0,0 +1,42 @@ +-- [Q] See You on the Other Side + +-- Gan'jo SAI +SET @ENTRY := 26924; +SET @QUEST := 12121; +SET @GOSSIP := 10220; +SET @SPELL_RESURRECT := 61613; +UPDATE `creature_template` SET `npcflag`=3,`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,1,62,0,100,0,@GOSSIP,0,0,0,11,@SPELL_RESURRECT,1,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Cast Ganjo Resurrection"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Close Gossip"); + +-- Essence of Warlord Jin'arrak SAI +SET @ENTRY := 26902; +SET @SPELL_DIE_EFFECT := 61611; +SET @SPELL_CAMERA_SHAKE := 47533; +UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=128 WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100) 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 +(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Just Summoned - Run Script"), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"), +(@ENTRY*100,9,1,0,0,0,100,0,4000,4000,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Killed Monster Credit"), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Monster Whisper Line 0"), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"), +(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,85,@SPELL_DIE_EFFECT,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast On The Other Side"); + +-- Essence of Warlord Jin'arrak text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"How dare you summon me without an offering!",42,0,0,0,0,0,"Essence of Warlord Jin'arrak"); + +-- Ganjo's Resurrection removes On The Other Side +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=@SPELL_RESURRECT; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +(@SPELL_RESURRECT,-@SPELL_DIE_EFFECT,1,"Ganjo's Resurrection removes On The Other Side"); + +-- Conditions for Gan'jo's gossip option +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTarget`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`comment`) VALUES +(15,@GOSSIP,0,0,0,1,@SPELL_DIE_EFFECT,0,"Ganjo's Gossip - requires aura See You On The Other Side"), +(15,@GOSSIP,0,0,1,9,@QUEST,0,"Ganjo's Gossip - requires quest See You On The Other Side to be rewarded"); -- cgit v1.2.3 From 0ecd9e72d0745ed0e79f8730f808153139a795a1 Mon Sep 17 00:00:00 2001 From: Discover- Date: Thu, 10 May 2012 13:43:40 +0200 Subject: Scripts/Quests: Script quest Leave Nothing to Chance. Closes #1863 Closes #3087 Closes #2061 --- sql/updates/world/2012_05_10_01_world_misc.sql | 37 ++++++++++++++++ src/server/scripts/Spells/spell_quest.cpp | 58 ++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 sql/updates/world/2012_05_10_01_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_10_01_world_misc.sql b/sql/updates/world/2012_05_10_01_world_misc.sql new file mode 100644 index 00000000000..a7a30d518a2 --- /dev/null +++ b/sql/updates/world/2012_05_10_01_world_misc.sql @@ -0,0 +1,37 @@ +-- [Q] Leave Nothing to Chance + +-- Lower Wintergarde Mine Shaft and Upper Wintergarde Mine Shaft +UPDATE `creature_template` SET `MovementType`=0,`flags_extra`=`flags_extra`|128 WHERE `entry`IN (27437,27436); +UPDATE `creature` SET `MovementType`=0,`spawndist`=0 WHERE `id` IN (27437,27436); + +-- Wintergarde Mine Bomb SAI +SET @ENTRY := 27435; +SET @SPELL_EXPLOSION := 48742; +UPDATE `creature_template` SET `AIName`='SmartAI' 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,1,1,0,100,1,14000,14000,0,0,11,@SPELL_EXPLOSION,2,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - Out of Combat - Cast Wintergarde Mine Explosion"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - On Wintergarde Mine Explosion Cast - Forced Despawn"); + +-- Spawn missing spell focus object for upper mine +DELETE FROM `gameobject` WHERE `id`=188711 AND `guid`=370; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(370,188711,571,1,1,3898.18,-881.748,119.533,0.421023,0,0,0.20896,0.977924,300,0,1); + +-- Spawn missing Upper Wintergarde Mine Shaft +DELETE FROM `creature` WHERE `id`=27436 AND `guid`=42576; +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 +(42576,27436,571,1,1,0,0,3899.86,-883.613,119.536,0.0636665,300,0,0,42,0,0,0,0,0); + +-- Spellscriptname +DELETE FROM `spell_script_names` WHERE `spell_id`=@SPELL_EXPLOSION; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(@SPELL_EXPLOSION,'spell_q12277_wintergarde_mine_explosion'); + +-- The conditions will make it works exactly like it should. Thanks a lot Josh. +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_EXPLOSION; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,@SPELL_EXPLOSION,0,31,3,27437,0,0,'',"Wintergarde Mine Explosion - Lower Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY +(13,1,@SPELL_EXPLOSION,1,31,3,27436,0,0,'',"Wintergarde Mine Explosion - Upper Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY +(13,2,@SPELL_EXPLOSION,0,31,4,0,0,0,'',"Wintergarde Mine Explosion - Targets Players"), -- Effect 1 - SPELL_EFFECT_KNOCK_BACK +(13,4,@SPELL_EXPLOSION,0,31,5,188712,0,0,'',"Wintergarde Mine Explosion - Wintergarde Mine Cave In (2)"); -- Effect 2 - SPELL_EFFECT_ACTIVATE_OBJECT diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 9d042da0789..87db81d2518 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -1105,6 +1105,63 @@ public: } }; +enum LeaveNothingToChance +{ + NPC_UPPER_MINE_SHAFT = 27436, + NPC_LOWER_MINE_SHAFT = 27437, + + SPELL_UPPER_MINE_SHAFT_CREDIT = 48744, + SPELL_LOWER_MINE_SHAFT_CREDIT = 48745, +}; + +class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader +{ + public: + spell_q12277_wintergarde_mine_explosion() : SpellScriptLoader("spell_q12277_wintergarde_mine_explosion") { } + + class spell_q12277_wintergarde_mine_explosion_SpellScript : public SpellScript + { + PrepareSpellScript(spell_q12277_wintergarde_mine_explosion_SpellScript) + + void HandleDummy(SpellEffIndex /*effIndex*/) + { + if (Creature* unitTarget = GetHitCreature()) + { + if (Unit* caster = GetCaster()) + { + if (caster->GetTypeId() == TYPEID_UNIT) + { + if (Unit* owner = caster->GetOwner()) + { + switch (unitTarget->GetEntry()) + { + case NPC_UPPER_MINE_SHAFT: + caster->CastSpell(owner, SPELL_UPPER_MINE_SHAFT_CREDIT, true); + break; + case NPC_LOWER_MINE_SHAFT: + caster->CastSpell(owner, SPELL_LOWER_MINE_SHAFT_CREDIT, true); + break; + default: + break; + } + } + } + } + } + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_q12277_wintergarde_mine_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_q12277_wintergarde_mine_explosion_SpellScript(); + } +}; + void AddSC_quest_spell_scripts() { new spell_q55_sacred_cleansing(); @@ -1131,4 +1188,5 @@ void AddSC_quest_spell_scripts() new spell_q14112_14145_chum_the_water(); new spell_q9452_cast_net(); new spell_q12987_read_pronouncement(); + new spell_q12277_wintergarde_mine_explosion(); } -- cgit v1.2.3 From 133652624c3774bf506beac9a442707b8d72d096 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 10 May 2012 09:03:26 -0400 Subject: DB/CreatureTemplate: fix startup error with loot ids. --- sql/updates/world/2012_05_10_02_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_10_02_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_10_02_world_creature_template.sql b/sql/updates/world/2012_05_10_02_world_creature_template.sql new file mode 100644 index 00000000000..28893f24fdf --- /dev/null +++ b/sql/updates/world/2012_05_10_02_world_creature_template.sql @@ -0,0 +1,2 @@ +-- fix creauture_template loot id for infinite corruptor. could have sworn this was already in the db. +UPDATE `creature_template` SET `lootid` = 0 WHERE `entry` IN (32313,32273); -- cgit v1.2.3 From 62b1d4b8e13f35688fae7cc212699a86033f4887 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 10 May 2012 10:08:16 -0400 Subject: DB/Misc: various fixes from the issue tracker. Remove obsolete requirement 'cooking profession' from quest 'Beer Basted Boar Ribs' (thx tifkat) closes #5198 Fix proc for Death's Verdict/Choice (author: kandera) closes #6041 Disables quest "Desperate Research" for all factions author trista closes #5285 Disables scourge invasion connected quests Limit Bloodgem Shard use to Netherstorm Cristal Target author: nelegalno closes #4165 Path of xx and A Change of Heart (Ashen Band rings) author: studioworks closes #2544 spawn farmer torp author: zxbiohazardzx closes #6256 Disgusting Oozeling aura author: gecko32 closes #6197 Mr. Chilly Add aura chilly for Periodic slide Update to Change to $n in page text author: gecko32 closes #5930 Update frost shock and you to only be for shamans. author: whit33r closes #4727 fixes ashen band of destruction proc author: kandera fixes quest credit from Fel reaver no thanks! author: tREAk & shlomi1515 closes #3715 fix areatrigger for wickerman camp author: boomper closes #3549 yous have da darkrune should be daily author: kaelima closes #3457 fix infinite corruptor loot id author: vincent-michael --- sql/updates/world/2012_05_10_03_world_misc.sql | 129 +++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 sql/updates/world/2012_05_10_03_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_10_03_world_misc.sql b/sql/updates/world/2012_05_10_03_world_misc.sql new file mode 100644 index 00000000000..339f52ac0bb --- /dev/null +++ b/sql/updates/world/2012_05_10_03_world_misc.sql @@ -0,0 +1,129 @@ + -- Remove obsolete requirement 'cooking profession' from quest 'Beer Basted Boar Ribs' (thx tifkat) closes #5198 +UPDATE `quest_template` SET `RequiredSkillId`=0, `RequiredSkillPoints`=0 WHERE `Id`=384; + +-- Fix proc for Death's Verdict/Choice (author: kandera) closes #6041 +UPDATE `spell_proc_event` SET `procFlags` = 0, `procEx` = `procEx`|262144 WHERE `entry` in (67702, 67771); + +-- Disables quest "Desperate Research" for all factions author trista closes #5285 +DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12782,12783,12811,12784,12752,12775,12777,12753,12808,12772); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,12782,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'), +(1,12783,0,0,0,'Disable quest from Scourge Invasion for Orcs'), +(1,12811,0,0,0,'Disable quest from Scourge Invasion for Trolls'), +(1,12784,0,0,0,'Disable quest from Scourge Invasion for Tauren'), +(1,12752,0,0,0,'Disable quest from Scourge Invasion for undead'), +(1,12775,0,0,0,'Disable quest from Scourge Invasion for Human'), +(1,12777,0,0,0,'Disable quest from Scourge Invasion for Draenei'), +(1,12753,0,0,0,'Disable quest from Scourge Invasion for Dwarves'), +(1,12808,0,0,0,'Disable quest from Scourge Invasion for Gnomes'), +(1,12772,0,0,0,'Disable quest from Scourge Invasion for Night Elves'); +-- Disables scourge invasion connected quests listed below +DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12788,12812,12785,12786,12787,12774,12776,12771,12809,12773); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,12788,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'), +(1,12812,0,0,0,'Disable quest from Scourge Invasion for Orcs'), +(1,12785,0,0,0,'Disable quest from Scourge Invasion for Trolls'), +(1,12786,0,0,0,'Disable quest from Scourge Invasion for Tauren'), +(1,12787,0,0,0,'Disable quest from Scourge Invasion for undead'), +(1,12774,0,0,0,'Disable quest from Scourge Invasion for Human'), +(1,12776,0,0,0,'Disable quest from Scourge Invasion for Draenei'), +(1,12771,0,0,0,'Disable quest from Scourge Invasion for Dwarves'), +(1,12809,0,0,0,'Disable quest from Scourge Invasion for Gnomes'), +(1,12773,0,0,0,'Disable quest from Scourge Invasion for Night Elves'); + +-- Limit Bloodgem Shard use to Netherstorm Cristal Target author: nelegalno closes #4165 +DELETE FROM `conditions` WHERE (`SourceEntry`=34367 AND `SourceTypeOrReferenceId`=17 AND `ConditionTypeOrReference`=29); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,34367,0,29,19421,15,0,64,'','Limit Bloodgem Shard use to Netherstorm Cristal Target'); + +-- Path of xx and A Change of Heart (Ashen Band rings) author: studioworks closes #2544 +UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `id` IN +(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831,24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN +-- Paths +(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831, +-- A Change of Heart +24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES +-- Path of Courage +(19,0,24827,0,2,50375,1,0,'Path of Courage 1'), +(19,0,24834,0,2,50388,1,0,'Path of Courage 2'), +(19,0,24835,0,2,50403,1,0,'Path of Courage 3'), +-- Path of Destruction +(19,0,24823,0,2,50384,1,0,'Path of Destruction 1'), +(19,0,24828,0,2,50377,1,0,'Path of Destruction 2'), +(19,0,24829,0,2,50397,1,0,'Path of Destruction 3'), +-- Path of Might +(19,0,25239,0,2,52569,1,0,'Path of Might 1'), +(19,0,25240,0,2,52570,1,0,'Path of Might 2'), +(19,0,25242,0,2,52571,1,0,'Path of Might 3'), +-- Path of Vengeance +(19,0,24826,0,2,50376,1,0,'Path of Vengeance 1'), +(19,0,24832,0,2,50387,1,0,'Path of Vengeance 2'), +(19,0,24833,0,2,50401,1,0,'Path of Vengeance 3'), +-- Path of Wisdom +(19,0,24825,0,2,50378,1,0,'Path of Wisdom 1'), +(19,0,24830,0,2,50386,1,0,'Path of Wisdom 2'), +(19,0,24831,0,2,50399,1,0,'Path of Wisdom 3'), +-- A Change of Heart +(19,0,24819,0,2,50377,1,0,'A Change of Heart'), +(19,0,24820,0,2,50376,1,0,'A Change of Heart'), +(19,0,24821,0,2,50375,1,0,'A Change of Heart'), +(19,0,24822,0,2,50378,1,0,'A Change of Heart'), +(19,0,24836,0,2,50384,1,0,'A Change of Heart'), +(19,0,24837,0,2,50386,1,0,'A Change of Heart'), +(19,0,24838,0,2,50387,1,0,'A Change of Heart'), +(19,0,24839,0,2,50388,1,0,'A Change of Heart'), +(19,0,24840,0,2,50397,1,0,'A Change of Heart'), +(19,0,24841,0,2,50399,1,0,'A Change of Heart'), +(19,0,24842,0,2,50401,1,0,'A Change of Heart'), +(19,0,24843,0,2,50403,1,0,'A Change of Heart'), +(19,0,24844,0,2,50398,1,0,'A Change of Heart'), +(19,0,24845,0,2,50400,1,0,'A Change of Heart'), +(19,0,24846,0,2,50402,1,0,'A Change of Heart'), +(19,0,24847,0,2,50404,1,0,'A Change of Heart'), +(19,0,25246,0,2,52572,1,0,'A Change of Heart'), +(19,0,25247,0,2,52569,1,0,'A Change of Heart'), +(19,0,25248,0,2,52570,1,0,'A Change of Heart'), +(19,0,25249,0,2,52571,1,0,'A Change of Heart'); + +-- spawn farmer torp author: zxbiohazardzx closes #6256 +SET @guid := 42652; +DELETE FROM `creature` WHERE `guid`=@guid; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`) +VALUES +(@guid,25607,571,1,1,2886.325,6385.55,92.96985,1.4512,120); -- Farmer Torp + +-- Disgusting Oozeling aura author: gecko32 closes #6197 +UPDATE `creature_template_addon` SET `auras`='25163' WHERE `entry`=15429; +-- Mr. Chilly +-- Add aura chilly for Periodic slide +DELETE FROM `creature_template_addon` WHERE `entry`=29726; +INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES +(29726, 0, 0, 0, 0, 0, '61811'); + +-- Update to Change to $n in page text author: gecko32 closes #5930 +UPDATE `page_text` SET `text`='This proof of deed is to verify that $n slew Margol the Rager, scourge of the searing gorge.$B$BThe Ironforge museum recognizes this achievement and thanks the bearer for their generous contribution.$B$B-Head Curator Thorius Stonetender' WHERE `entry`=1231; + +-- Update frost shock and you to only be for shamans. author: whit33r closes #4727 +UPDATE `quest_template` SET `RequiredClasses`=64 WHERE `id` = 7505; + +-- fixes ashen band of destruction proc author: kandera +DELETE FROM `spell_proc_event` WHERE `entry` = 72417; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(72417,0,0,0,0,0,327680,0,0,0,60); + +-- fixes quest credit from Fel reaver no thanks! author: tREAk & shlomi1515 closes #3715 +UPDATE `spell_dbc` SET `Effect1`=16,`EffectMiscValue1`=10855 WHERE `id`=38758; +DELETE FROM `creature_ai_scripts` WHERE creature_id=22293; + +-- fix areatrigger for wickerman camp author: boomper closes #3549 +DELETE FROM `areatrigger_involvedrelation` WHERE `id` =3991; +INSERT INTO `areatrigger_involvedrelation` (`id`, `quest`) +VALUES (3991,1658); + +-- yous have da darkrune should be daily author: kaelima closes #3457 +UPDATE `quest_template` SET `SpecialFlags` = `SpecialFlags` | 1 WHERE `id` = 11027; + +-- fix infinite corruptor loot id author: vincent-michael +UPDATE `creature_template` SET `lootid` = 32313 WHERE `entry` =32313; -- cgit v1.2.3 From 9d5c59939f0ebb5e7a078ebac67b9cc0029fb7d9 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 10 May 2012 12:11:49 -0230 Subject: DB/creature sai: Add missing Disturbed Glacial Revenant spawn to Pit of Saron Heroic with SAI. --- sql/updates/world/2012_05_10_04_world_ceature_sai.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 sql/updates/world/2012_05_10_04_world_ceature_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_10_04_world_ceature_sai.sql b/sql/updates/world/2012_05_10_04_world_ceature_sai.sql new file mode 100644 index 00000000000..5f01e951c4b --- /dev/null +++ b/sql/updates/world/2012_05_10_04_world_ceature_sai.sql @@ -0,0 +1,14 @@ +-- Spawn Disturbed Glacial Revenant +DELETE FROM `creature` WHERE `guid`=201998; +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 +(201998,36874,658,2,1,0,0,1053.894,-93.05556,632.8575,4.223697,86400,0,0,1,0,0,0,0,0); +DELETE FROM `creature_addon` WHERE `guid`=201998; +INSERT INTO `creature_addon` (`guid`,`bytes2`) VALUES +(201998,1); + +-- Disturbed Glacial Revenant SAI +SET @ENTRY := 36874; -- NPC entry +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,4,0,0,12000,15000,11,55216,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Disturbed Glacial Revenant - Combat - Cast Avalanche'); -- cgit v1.2.3 From 587e6cb77eefb1615eded5c24815f7470fab1662 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 10 May 2012 20:22:22 -0230 Subject: DB/waypoints: Add some missing pathing to Pit of Saron --- .../world/2012_05_10_05_world_waypoints.sql | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 sql/updates/world/2012_05_10_05_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_10_05_world_waypoints.sql b/sql/updates/world/2012_05_10_05_world_waypoints.sql new file mode 100644 index 00000000000..1677d74c4a7 --- /dev/null +++ b/sql/updates/world/2012_05_10_05_world_waypoints.sql @@ -0,0 +1,88 @@ +-- Deathwhisper Necrolyte pathing +SET @NPC := 202103; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,555.3976,303.5347,507.6232,0,0,0,100,0), +(@PATH,2,568.4896,297.9913,506.9572,0,0,0,100,0), +(@PATH,3,586.1476,292.5486,506.3322,0,0,0,100,0), +(@PATH,4,598.5833,292.6007,506.3322,0,0,0,100,0), +(@PATH,5,602.3438,300.2135,506.9457,0,0,0,100,0), +(@PATH,6,603.0573,307.5399,507.6957,0,0,0,100,0), +(@PATH,7,611.7239,316.1129,508.4457,0,0,0,100,0), +(@PATH,8,620.0677,312.684,508.1957,0,0,0,100,0), +(@PATH,9,622.184,305.0868,508.3207,0,0,0,100,0), +(@PATH,10,616.684,295.2083,507.8819,0,0,0,100,0), +(@PATH,11,613.9236,287.4288,507.0737,0,0,0,100,0), +(@PATH,12,618.5174,272.882,507.6097,0,0,0,100,0), +(@PATH,13,621.4445,263.4861,507.9438,0,0,0,100,0), +(@PATH,14,618.5174,272.882,507.6097,0,0,0,100,0), +(@PATH,15,613.9236,287.4288,507.0737,0,0,0,100,0), +(@PATH,16,616.684,295.2083,507.8819,0,0,0,100,0), +(@PATH,17,622.184,305.0868,508.3207,0,0,0,100,0), +(@PATH,18,620.0677,312.684,508.1,0,0,0,100,0), +(@PATH,19,611.7239,316.1129,508.4457,0,0,0,100,0), +(@PATH,20,603.0573,307.5399,507.6629,0,0,0,100,0), +(@PATH,21,602.3438,300.2135,506.8405,0,0,0,100,0), +(@PATH,22,598.5833,292.6007,506.3498,0,0,0,100,0), +(@PATH,23,586.1476,292.5486,506.3322,0,0,0,100,0), +(@PATH,24,568.4896,297.9913,506.9572,0,0,0,100,0); +DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@NPC,@NPC,0,0,2), +(@NPC,201819,7,270,2), +(@NPC,201934,7,306,2), +(@NPC,202121,7,342,2), +(@NPC,202196,7,18,2), +(@NPC,202098,7,54,2), +(@NPC,201954,7,90,2); + +-- Deathwhisper Necrolyte pathing +SET @NPC := 202273; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,611.9375,117.441,508.0308,0,0,0,100,0), +(@PATH,2,620.9531,139.3004,506.531,0,0,0,100,0), +(@PATH,3,624.3854,153.9531,507.3376,0,0,0,100,0), +(@PATH,4,625.8316,167.6233,507.4478,0,0,0,100,0), +(@PATH,5,622.8368,183.6788,507.7706,0,0,0,100,0), +(@PATH,6,625.8316,167.6233,507.4478,0,0,0,100,0), +(@PATH,7,624.3854,153.9531,507.3376,0,0,0,100,0), +(@PATH,8,620.9531,139.3004,506.531,0,0,0,100,0), +(@PATH,9,611.9375,117.441,508.0308,0,0,0,100,0), +(@PATH,10,610.8828,99.47656,510.0737,0,0,0,100,0); +DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@NPC,@NPC,0,0,2), +(@NPC,202054,7,270,2), +(@NPC,201845,7,306,2), +(@NPC,201914,7,342,2), +(@NPC,202145,7,18,2), +(@NPC,202227,7,54,2), +(@NPC,201988,7,90,2); + +-- Fix previous creature removal +DELETE FROM `creature` WHERE `id`=42160; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`, `position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(42160,36881,658,3,1,0,0,592.975,176.104,510.1582,508.746,86400,0,0,1,0,0); +UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988); +DELETE FROM `creature_formations` WHERE `leaderGUID`=202231; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(202231,202231,0,0,2), +(202231,202099,7,270,2), +(202231,202282,7,306,2), +(202231,202125,7,342,2), +(202231,202203,7,18,2), +(202231,201960,7,54,2), +(202231,42160,7,90,2); + +-- Update Scourgelord Tyrannus "Make him fly" +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36794; -- cgit v1.2.3 From f12ec9d058dc7d90957376a3dea3325ffb93f9d8 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 10 May 2012 21:17:43 -0230 Subject: DB/waypoints: Add missing path to Pit of Saron --- .../world/2012_05_10_06_world_waypoints.sql | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 sql/updates/world/2012_05_10_06_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_10_06_world_waypoints.sql b/sql/updates/world/2012_05_10_06_world_waypoints.sql new file mode 100644 index 00000000000..6fd04d0e4da --- /dev/null +++ b/sql/updates/world/2012_05_10_06_world_waypoints.sql @@ -0,0 +1,40 @@ +-- Deathwhisper Necrolyte pathing +SET @NPC := 202063; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +UPDATE `creature` SET `position_x`=631.8229,`position_y`=229.7292,`position_z`=508.0604 WHERE `guid` IN (202028,202000,201957,201820,202122,202199); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,631.8229,229.7292,508.0604,0,0,0,100,0), +(@PATH,2,643.8733,215.2674,508.2268,0,0,0,100,0), +(@PATH,3,659.0139,215.9635,507.8518,0,0,0,100,0), +(@PATH,4,674.184,213.5833,508.8467,0,0,0,100,0), +(@PATH,5,678.8004,201.066,508.4717,0,0,0,100,0), +(@PATH,6,662.4636,183.0694,507.9585,0,0,0,100,0), +(@PATH,7,650.8941,171.5642,507.7085,0,0,0,100,0), +(@PATH,8,637.7292,155.2569,507.9196,0,0,0,100,0), +(@PATH,9,644.6389,130.2639,510.4212,0,0,0,100,0), +(@PATH,10,654.9896,121.3038,511.9212,0,0,0,100,0), +(@PATH,11,677.7448,136.6528,512.7715,0,0,0,100,0), +(@PATH,12,678.2847,149.1233,507.8965,0,0,0,100,0), +(@PATH,13,677.7448,136.6528,512.7715,0,0,0,100,0), +(@PATH,14,654.9896,121.3038,511.9212,0,0,0,100,0), +(@PATH,15,644.6389,130.2639,510.4212,0,0,0,100,0), +(@PATH,16,637.7292,155.2569,507.9196,0,0,0,100,0), +(@PATH,17,650.8941,171.5642,507.7085,0,0,0,100,0), +(@PATH,18,662.4636,183.0694,507.9585,0,0,0,100,0), +(@PATH,19,678.8004,201.066,508.4717,0,0,0,100,0), +(@PATH,20,674.184,213.5833,508.8467,0,0,0,100,0), +(@PATH,21,659.0139,215.9635,507.8518,0,0,0,100,0), +(@PATH,22,643.8733,215.2674,508.2268,0,0,0,100,0); +DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@NPC,@NPC,0,0,2), +(@NPC,202028,7,270,2), +(@NPC,202000,7,306,2), +(@NPC,201957,7,342,2), +(@NPC,201820,7,18,2), +(@NPC,202122,7,54,2), +(@NPC,202199,7,90,2); -- cgit v1.2.3 From 1327591a926bd6eaa5b1dcc7e1aa2f39e5e1c08b Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 11 May 2012 20:18:16 -0230 Subject: DB/Gameobject_template: Update flags for two Pit of Saron object. --- sql/updates/world/2012_05_11_01_world_gameobject_template.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_11_01_world_gameobject_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_11_01_world_gameobject_template.sql b/sql/updates/world/2012_05_11_01_world_gameobject_template.sql new file mode 100644 index 00000000000..630a166276b --- /dev/null +++ b/sql/updates/world/2012_05_11_01_world_gameobject_template.sql @@ -0,0 +1,4 @@ +-- Lock Ice Wall and make untargetable +UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201885; +-- Saronite Rock Should be untargetable +UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=196485; -- cgit v1.2.3 From a24110507e35b2ced9a58088f85e52392853be0b Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 11 May 2012 20:19:52 -0230 Subject: DB/waypoints: Add path for one Scourgelord Tyrannus spawn, Pit of Saron --- .../world/2012_05_11_00_world_waypoints.sql | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 sql/updates/world/2012_05_11_00_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_11_00_world_waypoints.sql b/sql/updates/world/2012_05_11_00_world_waypoints.sql new file mode 100644 index 00000000000..fa4e18f6468 --- /dev/null +++ b/sql/updates/world/2012_05_11_00_world_waypoints.sql @@ -0,0 +1,31 @@ +-- Scourgelord Tyrannus pathing +SET @NPC := 201951; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=873.783,`position_y`=136.9774,`position_z`=623.6115,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,873.783,136.9774,623.6115,0,0,0,100,0), +(@PATH,2,872.9045,139.2743,622.4446,0,0,0,100,0), +(@PATH,3,888.7917,171.3403,591.3615,0,0,0,100,0), +(@PATH,4,861.3073,209.8455,591.3615,0,0,0,100,0), +(@PATH,5,830.4913,254.5556,591.3615,0,0,0,100,0), +(@PATH,6,780.4844,277.6406,591.3615,0,0,0,100,0), +(@PATH,7,732.6771,272.4635,591.3615,0,0,0,100,0), +(@PATH,8,683.9028,265.276,591.3615,0,0,0,100,0), +(@PATH,9,612.3368,284.7934,553.4998,0,0,0,100,0), +(@PATH,10,554.816,303.1858,553.4998,0,0,0,100,0), +(@PATH,11,498.1024,309.0625,553.4998,0,0,0,100,0), +(@PATH,12,470.4167,230.0174,553.4998,0,0,0,100,0), +(@PATH,13,454.0087,175.2135,553.4998,0,0,0,100,0), +(@PATH,14,492.4288,127.1806,583.1108,0,0,0,100,0), +(@PATH,15,551.2604,121.6354,583.1108,0,0,0,100,0), +(@PATH,16,647.5573,126.3542,583.1108,0,0,0,100,0), +(@PATH,17,766.2222,130.9254,583.1108,0,0,0,100,0), +(@PATH,18,829.408,42.33854,583.1108,0,0,0,100,0), +(@PATH,19,746.7101,-53.03299,583.1108,0,0,0,100,0), +(@PATH,20,663.2379,-77.32291,583.1108,0,0,0,100,0), +(@PATH,21,618.6389,3.369792,583.1108,0,0,0,100,0), +(@PATH,22,641.8559,89.27604,583.1108,0,0,0,100,0), +(@PATH,23,794.1667,115.6858,583.1108,0,0,0,100,0); -- cgit v1.2.3 From e39634246ed49933b8d18854740793a0b2445145 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 11 May 2012 20:56:23 -0230 Subject: DB/conditions: Add conditions for Pit of Saron Script spells --- .../world/2012_05_11_02_world_conditions.sql | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 sql/updates/world/2012_05_11_02_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_11_02_world_conditions.sql b/sql/updates/world/2012_05_11_02_world_conditions.sql new file mode 100644 index 00000000000..a10c27a0ef5 --- /dev/null +++ b/sql/updates/world/2012_05_11_02_world_conditions.sql @@ -0,0 +1,23 @@ +-- Spell Conditions for spell Necromantic Power 69347 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=69347; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,69347,0,31,3,37496,0,0,'','Spell 69347 targets entry 37496'), +(13,1,69347,1,31,3,37497,0,0,'','Spell 69347 targets entry 37497'), +(13,1,69347,2,31,3,37498,0,0,'','Spell 69347 targets entry 37498'), +(13,1,69347,3,31,3,37584,0,0,'','Spell 69347 targets entry 37584'), +(13,1,69347,4,31,3,37587,0,0,'','Spell 69347 targets entry 37587'), +(13,1,69347,5,31,3,37588,0,0,'','Spell 69347 targets entry 37588'); + +-- Spell Conditions for spell Shriek of the Highborne 70512 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70512; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,70512,3,31,3,37584,0,0,'','Spell 70512 targets entry 37584'), +(13,1,70512,4,31,3,37587,0,0,'','Spell 70512 targets entry 37587'), +(13,1,70512,5,31,3,37588,0,0,'','Spell 70512 targets entry 37588'); + +-- Spell Conditions for spell Empowered Blizzard 70130 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70130; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,70130,0,31,3,37496,0,0,'','Spell 70130 targets entry 37496'), +(13,1,70130,1,31,3,37497,0,0,'','Spell 70130 targets entry 37497'), +(13,1,70130,2,31,3,37498,0,0,'','Spell 70130 targets entry 37498'); -- cgit v1.2.3 From d770c125e97cf4313d2c32adbb6d9ceab308d477 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 12 May 2012 12:19:41 -0230 Subject: Core/Scripts: Fix Halls of Reflection Portcullis door in Pit of Saron. Now requires Tyrannus boss kill to open. --- sql/updates/world/2012_05_12_00_world_gameobject_template.sql | 2 ++ .../Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp | 7 +++++++ src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h | 1 + 3 files changed, 10 insertions(+) create mode 100644 sql/updates/world/2012_05_12_00_world_gameobject_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_12_00_world_gameobject_template.sql b/sql/updates/world/2012_05_12_00_world_gameobject_template.sql new file mode 100644 index 00000000000..ffa932c8640 --- /dev/null +++ b/sql/updates/world/2012_05_12_00_world_gameobject_template.sql @@ -0,0 +1,2 @@ +-- Lock Halls of Reflection Portcullis +UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201848; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 02782a22452..c75bdb8095f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -27,6 +27,7 @@ DoorData const Doors[] = { {GO_ICE_WALL, DATA_GARFROST, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, {GO_ICE_WALL, DATA_ICK, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, + {GO_HALLS_OF_REFLECTION_PORTCULLIS, DATA_TYRANNUS, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, }; class instance_pit_of_saron : public InstanceMapScript @@ -168,6 +169,9 @@ class instance_pit_of_saron : public InstanceMapScript case GO_ICE_WALL: AddDoor(go, true); break; + case GO_HALLS_OF_REFLECTION_PORTCULLIS: + AddDoor(go, true); + break; } } @@ -178,6 +182,9 @@ class instance_pit_of_saron : public InstanceMapScript case GO_ICE_WALL: AddDoor(go, false); break; + case GO_HALLS_OF_REFLECTION_PORTCULLIS: + AddDoor(go, true); + break; } } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 4252f4f59a8..768c3ba40ec 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -91,6 +91,7 @@ enum GameObjectIds { GO_SARONITE_ROCK = 196485, GO_ICE_WALL = 201885, + GO_HALLS_OF_REFLECTION_PORTCULLIS = 201848, }; #endif -- cgit v1.2.3 From 44c88301c6b13dcac11f5478c37cd271781c3575 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sun, 13 May 2012 00:09:17 +0200 Subject: DB/Loot: Fix Loot you get from Satchel of Helpful Goods. Fixes #1183 --- .../2012_05_12_01_world_item_loot_template.sql | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 sql/updates/world/2012_05_12_01_world_item_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_12_01_world_item_loot_template.sql b/sql/updates/world/2012_05_12_01_world_item_loot_template.sql new file mode 100644 index 00000000000..052b749c48c --- /dev/null +++ b/sql/updates/world/2012_05_12_01_world_item_loot_template.sql @@ -0,0 +1,92 @@ +DELETE FROM `item_loot_template` WHERE `entry` BETWEEN 51999 AND 52005; +INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Satchel of Helpfull Goods (level 0-25) +(51999,51964,0,1,1,1,1), -- Vigorous Belt +(51999,51968,0,1,1,1,1), -- Enumerated Wrap +(51999,51978,0,1,1,1,1), -- Earthbound Girdle +(51999,51994,25,1,1,1,1), -- Tumultuous Cloak +-- Satchel of Helpfull Goods (level 26-35) +(52000,51965,0,1,1,1,1), -- Vigorous Handguards +(52000,51973,0,1,1,1,1), -- Enumerated Handwraps +(52000,51980,0,1,1,1,1), -- Earthbound Handgrips +(52000,51996,25,1,1,1,1), -- Tumultuous Necklace +-- Satchel of Helpfull Goods (level 36-45) +(52001,51966,0,1,1,1,1), -- Vigorous Spaulders +(52001,51974,0,1,1,1,1), -- Enumerated Shoulderpads +(52001,51976,0,1,1,1,1), -- Earthbound Shoulderguards +(52001,51984,0,1,1,1,1), -- Stalwart Shoulderpads +(52001,51992,25,1,1,1,1), -- Tumultuous Ring +-- Satchel of Helpfull Goods (level 46-55) +(52002,51962,0,1,1,1,1), -- Vigorous Bracers +(52002,51963,0,1,1,1,1), -- Vigorous Stompers +(52002,51967,0,1,1,1,1), -- Enumerated Sandals +(52002,51972,0,1,1,1,1), -- Enumerated Bracers +(52002,51981,0,1,1,1,1), -- Earthbound Wristguards +(52002,51982,0,1,1,1,1), -- Earthbound Boots +(52002,51989,0,1,1,1,1), -- Stalwart Bands +(52002,51990,0,1,1,1,1), -- Stalwart Treads +-- Satchel of Helpfull Goods (level 56-60) +(52003,51959,0,1,1,1,1), -- Vigorous Belt +(52003,51971,0,1,1,1,1), -- Enumerated Belt +(52003,51977,0,1,1,1,1), -- Earthbound Girdle +(52003,51985,0,1,1,1,1), -- Stalwart Belt +(52003,51993,25,1,1,1,1), -- Turbulent Cloak +-- Satchel of Helpfull Goods (level 61-64) +(52004,51960,0,1,1,1,1), -- Vigorous Gloves +(52004,51970,0,1,1,1,1), -- Enumerated Gloves +(52004,51979,0,1,1,1,1), -- Earthbound Grips +(52004,51987,0,1,1,1,1), -- Stalwart Grips +(52004,51995,25,1,1,1,1), -- Turbulent Necklace +-- Satchel of Helpfull Goods (level 65-70) +(52005,51961,0,1,1,1,1), -- Vigorous Shoulderguards +(52005,51969,0,1,1,1,1), -- Enumerated Shoulders +(52005,51975,0,1,1,1,1), -- Earthbound Shoulders +(52005,51983,0,1,1,1,1), -- Stalwart Shoulderguards +(52005,51991,25,1,0,1,1); -- Turbulent Signet +-- ------------------------------------------------------------------- +-- Set some Parameters +-- ------------------------------------------------------------------- +SET @Cloth := 400; -- Class Bitmask: 16 (Priest) +128 (Mage) +256 (Warlock) +SET @Leather1 := 1100; -- Class Bitmask: 4 (Hunter) +8 (Rogue) +64 (Shaman) +1024 (Druid) +SET @Leather2 := 1032; -- Class Bitmask: 8 (Rogue) +1024 (Druid) +SET @Mail1 := 3; -- Class Bitmask: 1 (Warrior) +2 (Paladin) +SET @Mail2 := 68; -- Class Bitmask: 4 (Hunter) +8 (Shaman) +SET @Plate := 35; -- Class Bitmask: 1 (Warrior) +2 (Paladin) +32 (DeathKnight) +-- Add conditions to make sure everyone gets beneficial loot for their class +-- ------------------------------------------------------------------- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=5 AND `SourceGroup` BETWEEN 51999 AND 52005 ; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +-- Cloth Items +(5,51999,51968,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Wrap only for clothusers'), +(5,52000,51973,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Handwraps only for clothusers'), +(5,52001,51974,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulderpads only for clothusers'), +(5,52002,51967,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Sandals only for clothusers'), +(5,52002,51972,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Bracers only for clothusers'), +(5,52003,51971,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Belt only for clothusers'), +(5,52004,51970,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Gloves only for clothusers'), +(5,52005,51969,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulders only for clothusers'), +-- Leather Items +(5,51999,51964,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'), +(5,52000,51965,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Handguards only for leatherusers'), +(5,52001,51966,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Spaulders only for leatherusers'), +(5,52002,51962,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Bracers only for leatherusers'), +(5,52002,51963,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Stompers only for leatherusers'), +(5,52003,51959,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'), +(5,52004,51960,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Gloves only for leatherusers'), +(5,52005,51961,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Shoulderguards only for leatherusers'), +-- Mail Items +(5,51999,51978,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'), +(5,52000,51980,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Handgrips only for mail users'), +(5,52001,51976,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulderguards only for mail users'), +(5,52002,51982,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Boots only for mail users'), +(5,52002,51981,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Wristguards only for mail users'), +(5,52003,51977,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'), +(5,52004,51979,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Grips only for mail users'), +(5,52005,51975,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulders only for mail users'), +-- Plate Items +(5,52001,51984,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderpads only for plate users'), +(5,52002,51989,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Bands only for plate users'), +(5,52002,51990,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Treads only for plate users'), +(5,52003,51985,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Belt only for plate users'), +(5,52004,51987,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Grips only for plate users'), +(5,52005,51983,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderguards only for plate users'); -- cgit v1.2.3 From 7190b1f33680a08fd311840c517388b92eaaba0f Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sun, 13 May 2012 00:40:55 +0200 Subject: DB/Loot: Add loot for HoR, fixing some startup errors along the way --- ...012_05_12_02_world_gameobject_loot_template.sql | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql b/sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..b1f445faa59 --- /dev/null +++ b/sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql @@ -0,0 +1,37 @@ +-- Add Reference Loots +SET @RefNormal := 35091; +SET @RefHeroic := 35092; +DELETE FROM `reference_loot_template` WHERE `entry` IN (@RefNormal,@RefHeroic); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Normal Loot +(@RefNormal,49839,0,1,1,1,1), -- Mourning Malice +(@RefNormal,49840,0,1,1,1,1), -- Hate-Forged Cleaver +(@RefNormal,49841,0,1,1,1,1), -- Blackened Geist Ribs +(@RefNormal,49842,0,1,1,1,1), -- Tapestry of the Frozen Throne +(@RefNormal,49843,0,1,1,1,1), -- Crystalline Citadel Gauntlets +(@RefNormal,49844,0,1,1,1,1), -- Crypt Fiend Slayer +(@RefNormal,49845,0,1,1,1,1), -- Bone Golem Scapula +(@RefNormal,49846,0,1,1,1,1), -- Chilled Heart of the Glacier +(@RefNormal,49847,0,1,1,1,1), -- Legguards of Untimely Demise +(@RefNormal,49848,0,1,1,1,1), -- Grim Lasher Shoulderguards +(@RefNormal,49849,0,1,1,1,1), -- Tattered Glacial-Woven Hood +(@RefNormal,49851,0,1,1,1,1), -- Greathelm of the Silver Hand +-- Heroic Loot +(@RefHeroic,50303,0,1,1,1,1), -- Black Icicle +(@RefHeroic,50302,0,1,1,1,1), -- Liar's Tongue +(@RefHeroic,50311,0,1,1,1,1), -- Second Helm of the Executioner +(@RefHeroic,50312,0,1,1,1,1), -- Chestguard of Broken Branches +(@RefHeroic,50310,0,1,1,1,1), -- Fossilized Ammonite Choker +(@RefHeroic,50313,0,1,1,1,1), -- Oath of Empress Zoe +(@RefHeroic,50309,0,1,1,1,1), -- Shriveled Heart +(@RefHeroic,50314,0,1,1,1,1), -- Strip of Remorse +(@RefHeroic,50308,0,1,1,1,1), -- Blighted Leather Footpads +(@RefHeroic,50305,0,1,1,1,1), -- Grinning Skull Boots +(@RefHeroic,50306,0,1,1,1,1), -- The Lady's Promise +(@RefHeroic,50304,0,1,1,1,1); -- Hoarfrost Gauntlets +-- Assign to the chest +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (27985,27993); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(27985,1,100,1,0,-@RefNormal,2), -- Two from Normal Reference Loot +(27993,1,100,1,0,-@RefHeroic,2), -- Two from Heroic Reference Loot +(27993,43102,85,1,0,1,1); -- Frozen Orb -- cgit v1.2.3 From 42b0dfc94f9e9960a38024624f0a0f9886c5ccbd Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 13 May 2012 14:36:24 -0230 Subject: Core/Scripts: Update text for Garfrost to creature_text. Added some missing text & added call for help to aggro. --- .../world/2012_05_13_00_world_creature_text.sql | 13 +++++++++ .../PitOfSaron/boss_forgemaster_garfrost.cpp | 33 ++++++++++++++-------- 2 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 sql/updates/world/2012_05_13_00_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_13_00_world_creature_text.sql b/sql/updates/world/2012_05_13_00_world_creature_text.sql new file mode 100644 index 00000000000..8d083156fb0 --- /dev/null +++ b/sql/updates/world/2012_05_13_00_world_creature_text.sql @@ -0,0 +1,13 @@ +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=36494; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(36494,0,0, 'Tiny creatures under feet, you bring Garfrost something good to eat!',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,1,0, 'Axe too weak. Garfrost make better and CRUSH YOU.',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,2,0, 'Garfrost tired of puny mortals. Now your bones will freeze!',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,3,0, 'Garfrost hope giant underpants clean. Save boss great shame. For later.',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,4,0, 'Will save for snack. For later.',12,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,4,1, 'That one maybe not so good to eat now. Stupid Garfrost! BAD! BAD!',12,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,5,0, '%s hurls a massive saronite boulder at you!',16,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,6,0, '%s casts |cFF00AACCDeep Freeze|r at $n.',41,0,100,0,0,0, 'Forgemaster Garfrost'); +-- Remove old script text +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1658006 AND -1658001; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 64609efd7ff..a3b8c5df4e7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -20,14 +20,15 @@ enum Yells { - SAY_AGGRO = -1658001, - SAY_SLAY_1 = -1658002, - SAY_SLAY_2 = -1658003, - SAY_DEATH = -1658004, - SAY_PHASE2 = -1658005, - SAY_PHASE3 = -1658006, - - SAY_TYRANNUS_DEATH = -1658007, + SAY_AGGRO = 0, + SAY_PHASE2 = 1, + SAY_PHASE3 = 2, + SAY_DEATH = 3, + SAY_SLAY = 4, + SAY_THROW_SARONITE = 5, + SAY_CAST_DEEP_FREEZE = 6, + + SAY_TYRANNUS_DEATH = -1658007, // todo }; enum Spells @@ -107,8 +108,9 @@ class boss_garfrost : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_PERMAFROST); + me->CallForHelp(70.0f); events.ScheduleEvent(EVENT_THROW_SARONITE, 7000); instance->SetBossState(DATA_GARFROST, IN_PROGRESS); @@ -117,12 +119,13 @@ class boss_garfrost : public CreatureScript void KilledUnit(Unit* victim) { if (victim->GetTypeId() == TYPEID_PLAYER) - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); + if (Creature* tyrannus = me->GetCreature(*me, instance->GetData64(DATA_TYRANNUS))) DoScriptText(SAY_TYRANNUS_DEATH, tyrannus); @@ -134,6 +137,7 @@ class boss_garfrost : public CreatureScript if (events.GetPhaseMask() & PHASE_ONE_MASK && !HealthAbovePct(66)) { events.SetPhase(PHASE_TWO); + Talk(SAY_PHASE2); events.DelayEvents(8000); DoCast(me, SPELL_THUNDERING_STOMP); events.ScheduleEvent(EVENT_JUMP, 1500); @@ -143,6 +147,7 @@ class boss_garfrost : public CreatureScript if (events.GetPhaseMask() & PHASE_TWO_MASK && !HealthAbovePct(33)) { events.SetPhase(PHASE_THREE); + Talk(SAY_PHASE3); events.DelayEvents(8000); DoCast(me, SPELL_THUNDERING_STOMP); events.ScheduleEvent(EVENT_JUMP, 1500); @@ -199,7 +204,10 @@ class boss_garfrost : public CreatureScript { case EVENT_THROW_SARONITE: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + { + Talk(SAY_THROW_SARONITE); DoCast(target, SPELL_THROW_SARONITE); + } events.ScheduleEvent(EVENT_THROW_SARONITE, urand(12500, 20000)); break; case EVENT_CHILLING_WAVE: @@ -208,7 +216,10 @@ class boss_garfrost : public CreatureScript break; case EVENT_DEEP_FREEZE: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + { + Talk(SAY_CAST_DEEP_FREEZE); DoCast(target, SPELL_DEEP_FREEZE); + } events.ScheduleEvent(EVENT_DEEP_FREEZE, 35000, 0, PHASE_THREE); break; case EVENT_JUMP: -- cgit v1.2.3 From e144b8e3bef87a55791188f6578e176e28e9bdd7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 13 May 2012 20:30:11 -0230 Subject: DB/creature_text: Added creature text for Boss Sara. --- sql/updates/world/2012_05_13_01_world_creature_text.sql | 14 ++++++++++++++ .../scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp | 14 ++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 sql/updates/world/2012_05_13_01_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_13_01_world_creature_text.sql b/sql/updates/world/2012_05_13_01_world_creature_text.sql new file mode 100644 index 00000000000..8e983fd9a73 --- /dev/null +++ b/sql/updates/world/2012_05_13_01_world_creature_text.sql @@ -0,0 +1,14 @@ +-- NPC talk text insert for Sara +DELETE FROM `creature_text` WHERE `entry`=33134; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(33134,0,0, 'Help me! Please get them off me!',14,0,100,0,0,15771, 'Sara YELL_PREFIGHT'), +(33134,0,1, 'What do you want from me? Leave me alone!',14,0,100,0,0,15772, 'Sara YELL_PREFIGHT'), +(33134,1,0, 'Yes! YES! Show them no mercy! Give no pause to your attacks!',14,0,100,0,0,15773, 'Sara YELL_COMBAT_PHASE_1'), +(33134,1,1, 'Let hatred and rage guide your blows!',14,0,100,0,0,15774, 'Sara YELL_COMBAT_PHASE_1'), +(33134,1,2, 'The time to strike at the head of the beast will soon be upon us! Focus your anger and hatred on his minions!',14,0,100,457,0,15775, 'Sara YELL_COMBAT_PHASE_1'), +(33134,2,0, 'Suffocate upon your own hate!',14,0,100,0,0,15776, 'Sara YELL_COMBAT_PHASE_2'), +(33134,2,1, 'Tremble, mortals, before the coming of the end!',14,0,100,0,0,15777, 'Sara YELL_COMBAT_PHASE_2'), +(33134,3,0, 'Powerless to act...',14,0,100,0,0,15778, 'Sara YELL_SLAY'), +(33134,3,1, 'Could they have been saved?',14,0,100,0,0,15779, 'YELL SAY_SLAY'); +-- remove script text +DELETE FROM script_texts WHERE entry BETWEEN -1603319 AND -1603310; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index 3f01f21b189..585967ebdcc 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -20,16 +20,10 @@ enum Sara_Yells { - SAY_SARA_PREFIGHT_1 = -1603310, - SAY_SARA_PREFIGHT_2 = -1603311, - SAY_SARA_AGGRO_1 = -1603312, - SAY_SARA_AGGRO_2 = -1603313, - SAY_SARA_AGGRO_3 = -1603314, - SAY_SARA_SLAY_1 = -1603315, - SAY_SARA_SLAY_2 = -1603316, - WHISP_SARA_INSANITY = -1603317, - SAY_SARA_PHASE2_1 = -1603318, - SAY_SARA_PHASE2_2 = -1603319, + YELL_SARA_PREFIGHT = 0, + YELL_COMBAT_PHASE_1 = 1, + YELL_COMBAT_PHASE_2 = 2, + YELL_SLAY = 3, }; enum YoggSaron_Yells -- cgit v1.2.3 From ac844f99537dc9867242269f63c3cd58be96e1b2 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 16 May 2012 12:30:37 -0230 Subject: Core/Scripts: Scripting of Dragonspire Hall Runes "UBRS" Additional work to do. --- sql/updates/world/2012_05_16_00_world_scripts.sql | 2 ++ .../BlackrockSpire/blackrock_spire.h | 1 + .../BlackrockSpire/instance_blackrock_spire.cpp | 23 ++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 sql/updates/world/2012_05_16_00_world_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_16_00_world_scripts.sql b/sql/updates/world/2012_05_16_00_world_scripts.sql new file mode 100644 index 00000000000..9997c09bd8d --- /dev/null +++ b/sql/updates/world/2012_05_16_00_world_scripts.sql @@ -0,0 +1,2 @@ +-- Add script to Dragonspire Hall Runes "UBRS" +UPDATE `gameobject_template` SET `ScriptName`= 'go_dragonspire_hall_rune' WHERE `entry` BETWEEN 175194 AND 175200; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h index cef08375c13..beef71ea857 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h @@ -57,6 +57,7 @@ enum AdditionalData { SPELL_SUMMON_ROOKERY_WHELP = 15745, MAX_ENCOUNTER = 14, + MAX_DRAGONSPIRE_HALL_RUNES = 7, }; enum GameObjects diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index ff97984fa09..b5b1b34a593 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -247,7 +247,30 @@ public: }; +uint8 ActivatedRunes = 0; + +class go_dragonspire_hall_rune : public GameObjectScript +{ +public: + go_dragonspire_hall_rune() : GameObjectScript("go_dragonspire_hall_rune") { } + + void OnGameObjectStateChanged(GameObject* go, uint32 state) + { + if (state == GO_STATE_READY) + { + if (++ActivatedRunes == MAX_DRAGONSPIRE_HALL_RUNES) + { + if (GameObject* door1 = GetClosestGameObjectWithEntry(go, GO_EMBERSEER_IN, 150.0f)) + door1->SetGoState(GO_STATE_ACTIVE); + if (GameObject* door2 = GetClosestGameObjectWithEntry(go, GO_DOORS, 150.0f)) + door2->SetGoState(GO_STATE_ACTIVE); + } + } + } +}; + void AddSC_instance_blackrock_spire() { new instance_blackrock_spire(); + new go_dragonspire_hall_rune; } -- cgit v1.2.3 From 609002067dc3a7f646c0a1444bdd0e91387b14c3 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 17 May 2012 07:35:55 -0230 Subject: DB/creature_text: Text for Pyroguard Embeeseer. --- sql/updates/world/2012_05_17_00_world_creature_text.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_05_17_00_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_17_00_world_creature_text.sql b/sql/updates/world/2012_05_17_00_world_creature_text.sql new file mode 100644 index 00000000000..d7df0f94c0b --- /dev/null +++ b/sql/updates/world/2012_05_17_00_world_creature_text.sql @@ -0,0 +1,7 @@ +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=9816; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(9816,0,0, '%s begins to regain its strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'), +(9816,1,0, '%s is nearly at full strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'), +(9816,2,0, '%s regains its power and breaks free of its bonds!',16,0,100,0,0,0, 'Pyroguard Emberseer'), +(9816,3,0, 'Ha! Ha! Ha! Thank you for freeing me, fools. Now let me repay you by charring the flesh from your bones.',14,0,100,0,0,0, 'Pyroguard Emberseer'); -- cgit v1.2.3 From 01b2bf80575d1a115f88928bf7c4e17ba573c890 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 18 May 2012 12:09:35 -0400 Subject: Core/Spells, DB/Conditions: convert checkcast cpp to conditions for spell 52264 (deliver stolen horse) --- sql/updates/world/2012_05_18_00_world_conditions.sql | 3 +++ src/server/game/Spells/Spell.cpp | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 sql/updates/world/2012_05_18_00_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_18_00_world_conditions.sql b/sql/updates/world/2012_05_18_00_world_conditions.sql new file mode 100644 index 00000000000..a1de19ced35 --- /dev/null +++ b/sql/updates/world/2012_05_18_00_world_conditions.sql @@ -0,0 +1,3 @@ +DELETE FROM `conditions` WHERE `SourceEntry` = 52264; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,0,52264,0,0,29,0,28653,5,0,0,97,NULL,"Creature conditions for spell 52264 (Deliver stolen horse)"); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index b27326fce59..ae9f68f594c 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4992,11 +4992,6 @@ SpellCastResult Spell::CheckCast(bool strict) if (!unit || !unit->HasAura(17743)) return SPELL_FAILED_BAD_TARGETS; } - else if (m_spellInfo->Id == 52264) // Deliver Stolen Horse - { - if (!m_caster->FindNearestCreature(28653, 5)) - return SPELL_FAILED_OUT_OF_RANGE; - } else if (m_spellInfo->Id == 31789) // Righteous Defense { if (m_caster->GetTypeId() != TYPEID_PLAYER) -- cgit v1.2.3 From e59d7a33404f3a401a54258ca59e55cd420de0e3 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 18 May 2012 12:15:34 -0400 Subject: DB/Conditions: fix sql error from previous commit. --- sql/updates/world/2012_05_18_00_world_conditions.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_18_00_world_conditions.sql b/sql/updates/world/2012_05_18_00_world_conditions.sql index a1de19ced35..ad18a6c65ef 100644 --- a/sql/updates/world/2012_05_18_00_world_conditions.sql +++ b/sql/updates/world/2012_05_18_00_world_conditions.sql @@ -1,3 +1,3 @@ DELETE FROM `conditions` WHERE `SourceEntry` = 52264; INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,0,52264,0,0,29,0,28653,5,0,0,97,NULL,"Creature conditions for spell 52264 (Deliver stolen horse)"); +(13,0,52264,0,0,29,0,28653,5,0,0,97,"","Creature conditions for spell 52264 (Deliver stolen horse)"); -- cgit v1.2.3 From 7b8bece5788339a9da91f845d1ebf2399c360460 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 18 May 2012 13:44:30 -0400 Subject: DB/SpellTargeting: use correct spell target position data from sniffs for all teleport to dalaran spells. --- sql/updates/world/2012_05_18_01_world_spell_target_position.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2012_05_18_01_world_spell_target_position.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_18_01_world_spell_target_position.sql b/sql/updates/world/2012_05_18_01_world_spell_target_position.sql new file mode 100644 index 00000000000..72ebc409d9d --- /dev/null +++ b/sql/updates/world/2012_05_18_01_world_spell_target_position.sql @@ -0,0 +1,9 @@ +DELETE FROM `spell_target_position` WHERE `id` IN (30719,53140,53141,53360,54406,68328,71512); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(30719,571,5807.75,588.347,661.505,1.663), +(53140,571,5807.75,588.347,661.505,1.663), +(53141,571,5807.75,588.347,661.505,1.663), +(53360,571,5807.75,588.347,661.505,1.663), +(54406,571,5807.75,588.347,661.505,1.663), +(68328,571,5807.75,588.347,661.505,1.663), +(71512,571,5807.75,588.347,661.505,1.663); -- cgit v1.2.3 From 7e62c34b247d886d89aea8bd5e8e9241d8cefa44 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 18 May 2012 14:08:05 -0400 Subject: DB/Misc: use correct nextquestid for quests 936,3784,3762 Closes #3820. fix blood presence to NOT proc on positive spells (causes issues with healing spells making you heal) Closes #6009. fix dk t10 4peice bonus Closes #6449. --- sql/updates/world/2012_05_18_01_world_misc.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_05_18_01_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_18_01_world_misc.sql b/sql/updates/world/2012_05_18_01_world_misc.sql new file mode 100644 index 00000000000..bded6fae447 --- /dev/null +++ b/sql/updates/world/2012_05_18_01_world_misc.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_proc_event` WHERE `entry` = 70656; + +UPDATE `quest_template` SET `NextQuestId` = 3761 WHERE `id` IN (936,3784,3762); + +DELETE FROM `spell_proc_event` WHERE `entry` = 63611; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(63611,0,0,0,0,0,51154,0,0,0,0); -- cgit v1.2.3 From d078ef9b4885de4228c9533af14416b6f545c972 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 19 May 2012 10:15:40 +0200 Subject: DB/Quest: Remove autocomplete from Body and Heart Fixes #6139 --- sql/updates/world/2012_05_19_00_world_quest_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_19_00_world_quest_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_19_00_world_quest_template.sql b/sql/updates/world/2012_05_19_00_world_quest_template.sql new file mode 100644 index 00000000000..f18172ed836 --- /dev/null +++ b/sql/updates/world/2012_05_19_00_world_quest_template.sql @@ -0,0 +1,2 @@ +-- Change Flags for the Body and Heart Quest +UPDATE `quest_template` SET `Flags`=`Flags`&~2, `SpecialFlags`=`SpecialFlags`|2 WHERE `id` IN (6001,6002); -- cgit v1.2.3 From fc0950dbf33e6a4a9797be46bfe2e7dd2366d9e1 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 19 May 2012 11:48:41 +0100 Subject: SQLS: Correct comments for 2012_02_16_00_world_conditions.sql (Core/Opcs: Use Handle_NULL for an unused opcode) Closes #6517 (pr) --- sql/updates/world/2012_02_16_00_world_conditions.sql | 10 +++++----- src/server/game/Server/Protocol/Opcodes.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_16_00_world_conditions.sql b/sql/updates/world/2012_02_16_00_world_conditions.sql index a01792ef838..5bef38fc485 100644 --- a/sql/updates/world/2012_02_16_00_world_conditions.sql +++ b/sql/updates/world/2012_02_16_00_world_conditions.sql @@ -4,8 +4,8 @@ CREATE TABLE `temp_convert_spells` PRIMARY KEY (`id`) ); -# spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534 -# those spells are the ones which require explicit unit target to cast +-- spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534 +-- those spells are the ones which require explicit unit target to cast INSERT INTO `temp_convert_spells` VALUES (5), (11), @@ -12783,13 +12783,13 @@ INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_5` FROM `item_temp INSERT INTO `temp_cond_vals` (`spellId`, `entry`, `dead`, `errorTextId`, `comment`) SELECT DISTINCT (SELECT `spellId` FROM `temp_item_spell` WHERE `itemId` = `SourceEntry`), `ConditionValue2`, (`ConditionValue1` - 1), `ErrorTextId`, `Comment` FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18; -#use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET +-- use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`) SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 31, 1, 3, `entry`, 0, 0, `errorTextId`, `comment` FROM `temp_cond_vals`; -#for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement +-- for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`) SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 36, 1, 0, 0, 0, 1, `errorTextId`, `comment` FROM `temp_cond_vals` WHERE `dead`; -#remove entries which could be converted by this sql +-- remove entries which could be converted by this sql DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18 AND `SourceEntry` IN (SELECT `itemId` FROM `temp_item_spell`); DROP TABLE `temp_convert_spells`; DROP TABLE `temp_cond_vals`; diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index aa6013fae3d..63ee2369ce3 100755 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -491,7 +491,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x1CE*/ { "CMSG_QUERY_TIME", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQueryTimeOpcode }, /*0x1CF*/ { "SMSG_QUERY_TIME_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x1D0*/ { "SMSG_LOG_XPGAIN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x1D1*/ { "SMSG_AURACASTLOG", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x1D1*/ { "SMSG_AURACASTLOG", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x1D2*/ { "CMSG_RECLAIM_CORPSE", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleReclaimCorpseOpcode }, /*0x1D3*/ { "CMSG_WRAP_ITEM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWrapItemOpcode }, /*0x1D4*/ { "SMSG_LEVELUP_INFO", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, -- cgit v1.2.3 From 064b30b0cd4c4321dabc2611dd26b25a30267773 Mon Sep 17 00:00:00 2001 From: nelegalno Date: Sat, 19 May 2012 12:00:57 +0100 Subject: SQLS: Correct comments for 2012_02_20_02_world_conditons.sql Ref #6517 (pr) --- sql/updates/world/2012_02_20_02_world_conditons.sql | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_20_02_world_conditons.sql b/sql/updates/world/2012_02_20_02_world_conditons.sql index 832d8dbdae5..f87a95fb1c9 100644 --- a/sql/updates/world/2012_02_20_02_world_conditons.sql +++ b/sql/updates/world/2012_02_20_02_world_conditons.sql @@ -1,9 +1,10 @@ -# Update a typo in original data entry +-- Update a typo in original data entry UPDATE `npc_spellclick_spells` SET `quest_end`=11999 WHERE `npc_entry`=26477 AND `spell_id`=61832 AND `quest_start`=11999; -# Delete redundant data with invalid condition type + +-- Delete redundant data with invalid condition type DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18; -# Static Data +-- Static Data INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, `ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES (18,24752,44363,0,8,0,11460,0,0,1,'Forbidden rewarded quest for spellclick'), @@ -167,9 +168,10 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, (18,40176,74905,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'), (18,40176,74905,0,9,0,25444,0,0,0,'Required quest active for spellclick'); -# Below is a procedure to dynamically convert custom content to conditions table. -# However this procedure only works for MySQL server versions >= 5.6 due to -# a bug / missing feature in older MySQL versions. +-- Below is a procedure to dynamically convert custom content to conditions table. +-- However this procedure only works for MySQL server versions >= 5.6 due to +-- a bug / missing feature in older MySQL versions. + /* DROP PROCEDURE IF EXISTS ConvertSpellClickConditions; @@ -185,7 +187,7 @@ BEGIN DECLARE quest INT DEFAULT 0; DECLARE quest2 INT DEFAULT 0; DECLARE questStartCanActive INT DEFAULT 0; - DECLARE maxElseGroupId INT DEFAULT 14; # Change this for custom content + DECLARE maxElseGroupId INT DEFAULT 14; -- Change this for custom content SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_required` !=0; WHILE counter < recordCount DO SELECT `npc_entry`, `spell_id`, `aura_required` @@ -228,12 +230,12 @@ BEGIN `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) VALUES (18,npcEntry,spellId,maxElseGroupId+1,8,0,quest,0,0,'Required quest rewarded for spellclick'); SET maxElseGroupId = maxElseGroupId+1; - # ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest) + -- ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest) ELSEIF questStartCanActive = 1 && quest2 = quest THEN INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) VALUES (18,npcEntry,spellId,9,0,quest,0,0,'Required quest active for spellclick'); - # ^Adds the required active quest condition. Prohibit quest reward is done in next loop + -- ^Adds the required active quest condition. Prohibit quest reward is done in next loop ELSEIF questStartCanActive = 0 THEN INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) -- cgit v1.2.3 From 7972b6977b6fd95873c6c6cad2753bee50a38211 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 19 May 2012 12:15:19 +0100 Subject: DB/Quests|SAI: Fix the first 5 quests of Ring of Blood Closes #6334 Last quest still needs to be fixed. --- sql/updates/world/2012_05_19_01_world_smart_scripts.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_05_19_01_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_19_01_world_smart_scripts.sql b/sql/updates/world/2012_05_19_01_world_smart_scripts.sql new file mode 100644 index 00000000000..06169d8610a --- /dev/null +++ b/sql/updates/world/2012_05_19_01_world_smart_scripts.sql @@ -0,0 +1,7 @@ +-- Fix Quest 9962,9967,9970,9972,9973 +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18398 AND `id`=1; -- Brokentoe +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18399 AND `id`=4; -- Murkblood Twin +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18400 AND `id`=5; -- Rokdar the Sundered Lord +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18401 AND `id`=3; -- Skra'gath +UPDATE `smart_scripts` SET `id`=5,`link`=6,`target_type`=16 WHERE `entryorguid`=18402 AND `action_type`=15; -- Warmaul Champion +UPDATE `smart_scripts` SET `id`=6 WHERE `entryorguid`=18402 AND `action_type`=45; -- Warmaul Champion -- cgit v1.2.3 From 484223e1293654fcbed1e46a5dedbd2fee84ec6b Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 19 May 2012 13:32:29 +0100 Subject: SQLS: Fix two startup DB errors and add proper file endings for various sqls --- sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql | 2 +- sql/updates/world/2012_02_18_02_world_gossip.sql | 2 +- sql/updates/world/2012_02_21_01_world_conditions.sql | 2 +- sql/updates/world/2012_02_22_01_world_creature_text.sql | 2 +- sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql | 2 +- sql/updates/world/2012_03_07_00_world_trinity_string.sql | 2 +- sql/updates/world/2012_04_25_01_world_spell_script_names.sql | 2 +- sql/updates/world/2012_04_25_02_world_spell_script_names.sql | 2 +- sql/updates/world/2012_04_28_00_world_reference_loot_template.sql | 2 +- sql/updates/world/2012_05_19_02_world_misc.sql | 6 ++++++ 10 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2012_05_19_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql b/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql index 4361f33cf38..e7993726132 100644 --- a/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql +++ b/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql @@ -4,4 +4,4 @@ INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`, (13013, 12, 1, 0, ""), -- heroic (13012, 12, 1, 0, ""), -- heroic (13011, 12, 0, 0, ""), -- normal -(12780, 12, 0, 0, ""); -- normal \ No newline at end of file +(12780, 12, 0, 0, ""); -- normal diff --git a/sql/updates/world/2012_02_18_02_world_gossip.sql b/sql/updates/world/2012_02_18_02_world_gossip.sql index c72532e3f21..47882d4eb36 100644 --- a/sql/updates/world/2012_02_18_02_world_gossip.sql +++ b/sql/updates/world/2012_02_18_02_world_gossip.sql @@ -49,4 +49,4 @@ INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,` (573,0,0,'These dwarves are the same ones today, yes? Do dwarves maintain any other links to the Earthen?',1,1,574,0,0,0,''), (574,0,0,'Who are the Creators?',1,1,575,0,0,0,''), (575,0,0,'This is a lot to think about.',1,1,576,0,0,0,''), -(576,0,0,'I will access the discs now.',1,1,0,0,0,0,''); \ No newline at end of file +(576,0,0,'I will access the discs now.',1,1,0,0,0,0,''); diff --git a/sql/updates/world/2012_02_21_01_world_conditions.sql b/sql/updates/world/2012_02_21_01_world_conditions.sql index 54685868186..95c32703ea4 100644 --- a/sql/updates/world/2012_02_21_01_world_conditions.sql +++ b/sql/updates/world/2012_02_21_01_world_conditions.sql @@ -3589,4 +3589,4 @@ UPDATE `conditions` SET `ConditionTypeOrReference` = 32, `ConditionValue1` = 0x9 UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 5 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 0; DROP TABLE `temp_convert_spells`; -DROP TABLE `temp_cond_vals`; \ No newline at end of file +DROP TABLE `temp_cond_vals`; diff --git a/sql/updates/world/2012_02_22_01_world_creature_text.sql b/sql/updates/world/2012_02_22_01_world_creature_text.sql index 035962e11c3..8b7761e48a0 100644 --- a/sql/updates/world/2012_02_22_01_world_creature_text.sql +++ b/sql/updates/world/2012_02_22_01_world_creature_text.sql @@ -31,4 +31,4 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr (15214,27,0, 'The Horde has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), (15214,28,0, 'The Horde has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), (15214,29,0, 'The Alliance has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'); \ No newline at end of file +(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'); diff --git a/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql b/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql index 99c2444f20b..9c07709246f 100644 --- a/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql +++ b/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql @@ -363,4 +363,4 @@ INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x` (@OGUID+16,192400,571,1,32,5041.650879,3294.318604,381.919952,-1.605702,0,0,0,1,180,0,1), (@OGUID+17,192401,571,1,32,4855.444336,3297.600830,376.495758,-3.115388,0,0,0,1,180,0,1), (@OGUID+18,192281,571,1,32,4857.971191,3335.415771,369.291901,-2.888511,0,0,0,1,180,0,1), -(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1); \ No newline at end of file +(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1); diff --git a/sql/updates/world/2012_03_07_00_world_trinity_string.sql b/sql/updates/world/2012_03_07_00_world_trinity_string.sql index 96344520236..df5afea5d4f 100644 --- a/sql/updates/world/2012_03_07_00_world_trinity_string.sql +++ b/sql/updates/world/2012_03_07_00_world_trinity_string.sql @@ -1,3 +1,3 @@ DELETE FROM `trinity_string` WHERE `entry`=175; INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES -(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.'); \ No newline at end of file +(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.'); diff --git a/sql/updates/world/2012_04_25_01_world_spell_script_names.sql b/sql/updates/world/2012_04_25_01_world_spell_script_names.sql index e42f1979229..7b7135860ab 100644 --- a/sql/updates/world/2012_04_25_01_world_spell_script_names.sql +++ b/sql/updates/world/2012_04_25_01_world_spell_script_names.sql @@ -1,3 +1,3 @@ DELETE FROM `spell_script_names` WHERE `spell_id` = 33110; INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(33110,'spell_pri_prayer_of_mending_heal'); \ No newline at end of file +(33110,'spell_pri_prayer_of_mending_heal'); diff --git a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql b/sql/updates/world/2012_04_25_02_world_spell_script_names.sql index ea6b95559c6..ad63bc87837 100644 --- a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql +++ b/sql/updates/world/2012_04_25_02_world_spell_script_names.sql @@ -8,4 +8,4 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (51592, 'spell_gen_despawn_self'), (51910, 'spell_gen_despawn_self'), (52267, 'spell_gen_despawn_self'), -(54420, 'spell_gen_despawn_self'); \ No newline at end of file +(54420, 'spell_gen_despawn_self'); diff --git a/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql b/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql index b59ba90fdbc..07c53a8f7c9 100644 --- a/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql +++ b/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql @@ -155,4 +155,4 @@ INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`loot (@Yogg25,45693,100,16,0,1,1); -- Mimiron's Head -- Cleanups -DELETE FROM `conditions` WHERE `SourceEntry`=45897 AND `SourceGroup`=33955; \ No newline at end of file +DELETE FROM `conditions` WHERE `SourceEntry`=45897 AND `SourceGroup`=33955; diff --git a/sql/updates/world/2012_05_19_02_world_misc.sql b/sql/updates/world/2012_05_19_02_world_misc.sql new file mode 100644 index 00000000000..1dd946b5a18 --- /dev/null +++ b/sql/updates/world/2012_05_19_02_world_misc.sql @@ -0,0 +1,6 @@ +-- 2012-05-19 12:48:24 SourceEntry 52264 in `condition` table, has incorrect SourceGroup 0 (spell effectMask) set , ignoring. +UPDATE `conditions` SET `SourceId`=1 WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=0 AND `SourceEntry`=52264 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=29 AND `ConditionTarget`=0 AND `ConditionValue1`=28653 AND `ConditionValue2`=5 AND `ConditionValue3`=0; + +-- 2012-05-19 12:48:18 Quest 384 has `ZoneOrSort` = -304 but `RequiredSkillId` does not have a corresponding value (185). +-- It is not clear if cooking was required on 3.3.5, so reverting it to its original state (however we are sure it is not required in Cata) +UPDATE `quest_template` SET `RequiredSkillId`=185, `RequiredSkillPoints`=1 WHERE `Id`=384; -- cgit v1.2.3 From 9474902479bf627874b66c41c8fcb138cfb85b48 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 19 May 2012 14:27:24 +0100 Subject: TDB 335.11.47 - 2012/05/19 --- sql/old/3.3.5a/2012_02_13_00_world_version.sql | 1 + ...12_02_14_00_world_achievement_criteria_data.sql | 7 + .../3.3.5a/2012_02_15_00_world_quest_template.sql | 1 + .../2012_02_15_01_world_areatrigger_tavern.sql | 13 + .../3.3.5a/2012_02_15_02_world_item_template.sql | 3 + .../3.3.5a/2012_02_15_03_world_quest_template.sql | 18 + .../3.3.5a/2012_02_15_04_world_quest_template.sql | 17 + ...12_02_15_06_world_creature_involvedrelation.sql | 3 + sql/old/3.3.5a/2012_02_15_07_00_world_creature.sql | 57 + .../2012_02_15_07_01_world_waypoint_data.sql | 147 + sql/old/3.3.5a/2012_02_15_07_02_world_misc.sql | 120 + sql/old/3.3.5a/2012_02_15_08_world_sai.sql | 9 + .../2012_02_15_09_world_spell_proc_event.sql | 6 + sql/old/3.3.5a/2012_02_16_00_world_conditions.sql | 12800 +++++++++++++++++++ sql/old/3.3.5a/2012_02_16_01_world_conditions.sql | 3 + sql/old/3.3.5a/2012_02_17_00_world_waypoints.sql | 77 + .../2012_02_18_00_world_spell_script_names.sql | 69 + sql/old/3.3.5a/2012_02_18_01_world_spell_dbc.sql | 3 + sql/old/3.3.5a/2012_02_18_02_world_gossip.sql | 52 + sql/old/3.3.5a/2012_02_18_03_world_gossip.sql | 1068 ++ .../2012_02_18_04_world_spell_script_names.sql | 6 + sql/old/3.3.5a/2012_02_18_05_world_creatures.sql | 3 + sql/old/3.3.5a/2012_02_18_06_world_gossip.sql | 166 + sql/old/3.3.5a/2012_02_18_07_world_gossip.sql | 44 + sql/old/3.3.5a/2012_02_18_08_world_gossip.sql | 5 + sql/old/3.3.5a/2012_02_19_00_auth_account.sql | 2 + .../2012_02_19_00_characters_warden_action.sql | 7 + .../3.3.5a/2012_02_19_00_world_quest_template.sql | 14 + .../3.3.5a/2012_02_19_01_world_quest_template.sql | 11 + sql/old/3.3.5a/2012_02_19_02_world_gameobject.sql | 4 + .../3.3.5a/2012_02_19_03_world_warden_checks.sql | 802 ++ .../3.3.5a/2012_02_19_04_world_misc_db_updates.sql | 21 + .../3.3.5a/2012_02_19_05_world_creature_text.sql | 7 + .../3.3.5a/2012_02_19_06_world_creature_text.sql | 20 + sql/old/3.3.5a/2012_02_20_00_world_sai.sql | 4 + sql/old/3.3.5a/2012_02_20_01_world_gossip.sql | 8 + sql/old/3.3.5a/2012_02_20_02_world_conditons.sql | 277 + .../2012_02_21_00_world_creature_loot_template.sql | 78 + sql/old/3.3.5a/2012_02_21_01_world_conditions.sql | 3592 ++++++ .../2012_02_21_02_world_creature_loot_template.sql | 11 + .../2012_02_21_03_world_creature_loot_template.sql | 26 + .../2012_02_21_04_world_creature_loot_template.sql | 16 + sql/old/3.3.5a/2012_02_21_05_world_gossip.sql | 39 + sql/old/3.3.5a/2012_02_21_06_world_Gossip.sql | 184 + sql/old/3.3.5a/2012_02_22_00_world_sai.sql | 39 + .../3.3.5a/2012_02_22_01_world_creature_text.sql | 34 + sql/old/3.3.5a/2012_02_22_02_world_misc.sql | 57 + sql/old/3.3.5a/2012_02_22_03_world_conditions.sql | 3 + .../2012_02_23_00_world_spell_script_names.sql | 7 + ...012_02_24_00_world_gameobject_loot_template.sql | 10 + sql/old/3.3.5a/2012_02_24_01_world_sai.sql | 44 + .../2012_02_25_00_world_spell_script_names.sql | 1 + sql/old/3.3.5a/2012_02_25_01_world_command.sql | 6 + sql/old/3.3.5a/2012_02_25_01_world_misc.sql | 11 + sql/old/3.3.5a/2012_02_25_02_world_sai.sql | 28 + sql/old/3.3.5a/2012_02_26_00_world_misc.sql | 13 + .../2012_02_26_01_world_spell_script_names.sql | 4 + .../2012_02_27_00_world_creature_template.sql | 8 + .../2012_02_28_00_world_wintergrasp_spawns.sql | 366 + .../3.3.5a/2012_02_29_00_world_conditions_misc.sql | 126 + sql/old/3.3.5a/2012_02_29_01_world_conditions.sql | 5 + sql/old/3.3.5a/2012_02_29_02_world_conditions.sql | 5 + .../3.3.5a/2012_02_29_03_world_creature_text.sql | 18 + .../3.3.5a/2012_02_29_04_world_creature_text.sql | 11 + .../3.3.5a/2012_02_29_05_world_creature_text.sql | 15 + sql/old/3.3.5a/2012_03_01_00_world_conditions.sql | 5 + .../3.3.5a/2012_03_01_01_world_creature_text.sql | 15 + .../2012_03_01_02_world_locales_creature_text.sql | 15 + sql/old/3.3.5a/2012_03_03_00_world_command.sql | 9 + sql/old/3.3.5a/2012_03_04_00_world_misc.sql | 13 + .../2012_03_04_01_world_areatrigger_scripts.sql | 7 + sql/old/3.3.5a/2012_03_06_00_world_commands.sql | 3 + sql/old/3.3.5a/2012_03_06_01_world_misc.sql | 4 + .../2012_03_06_02_world_queststatus_seasonal.sql | 1 + .../3.3.5a/2012_03_06_03_world_smart_scripts.sql | 17 + .../3.3.5a/2012_03_06_04_world_creature_text.sql | 6 + .../3.3.5a/2012_03_07_00_world_trinity_string.sql | 3 + sql/old/3.3.5a/2012_03_10_00_world_creature.sql | 21 + .../3.3.5a/2012_03_10_00_world_smart_scripts.sql | 129 + .../3.3.5a/2012_03_10_00_world_waypoint_data.sql | 25 + sql/old/3.3.5a/2012_03_11_00_world_sai.sql | 60 + .../2012_03_12_00_world_creature_template.sql | 1 + sql/old/3.3.5a/2012_03_12_01_world_conditions.sql | 3 + sql/old/3.3.5a/2012_03_12_01_world_gameobject.sql | 4 + .../2012_03_12_01_world_spell_script_names.sql | 3 + .../3.3.5a/2012_03_14_00_world_creature_addon.sql | 2 + .../3.3.5a/2012_03_19_00_world_smart_scripts.sql | 21 + sql/old/3.3.5a/2012_03_20_00_world_gossip.sql | 88 + sql/old/3.3.5a/2012_03_21_00_world_creature.sql | 71 + .../2012_03_22_00_world_creature_template.sql | 2 + sql/old/3.3.5a/2012_03_22_01_world_conditions.sql | 2 + sql/old/3.3.5a/2012_03_23_00_world_ip2nation.sql | 21 + sql/old/3.3.5a/2012_03_24_00_world_misc.sql | 22 + .../2012_03_24_01_world_creature_loot_template.sql | 290 + .../2012_03_24_02_world_creature_loot_template.sql | 136 + sql/old/3.3.5a/2012_03_25_00_auth_misc.sql | 8 + sql/old/3.3.5a/2012_03_25_00_world_game_event.sql | 4 + sql/old/3.3.5a/2012_03_26_00_auth_realmlist.sql | 2 + .../2012_03_26_00_world_creature_template.sql | 73 + .../2012_03_26_01_world_spell_script_names.sql | 4 + sql/old/3.3.5a/2012_03_27_00_world_misc.sql | 49 + sql/old/3.3.5a/2012_03_27_01_world_misc.sql | 15 + sql/old/3.3.5a/2012_03_27_02_world_misc.sql | 78 + sql/old/3.3.5a/2012_03_27_03_world_misc.sql | 59 + sql/old/3.3.5a/2012_03_27_04_world_misc.sql | 3 + sql/old/3.3.5a/2012_03_28_00_auth_account.sql | 13 + .../3.3.5a/2012_03_28_01_auth_account_access.sql | 3 + .../2012_03_28_01_world_spell_bonus_data.sql | 2 + .../3.3.5a/2012_03_28_02_auth_account_banned.sql | 4 + sql/old/3.3.5a/2012_03_28_03_auth_ip_banned.sql | 2 + sql/old/3.3.5a/2012_03_28_04_auth_logs.sql | 5 + .../3.3.5a/2012_03_28_05_auth_realmcharacters.sql | 4 + sql/old/3.3.5a/2012_03_28_06_auth_realmlist.sql | 6 + sql/old/3.3.5a/2012_03_28_07_auth_uptime.sql | 6 + .../3.3.5a/2012_03_30_00_world_smart_scripts.sql | 94 + .../2012_03_31_00_world_creature_loot_template.sql | 191 + sql/old/3.3.5a/2012_04_01_00_auth_realmlist.sql | 1 + sql/old/3.3.5a/2012_04_01_00_world_creature.sql | 17 + .../2012_04_01_00_world_spell_script_names.sql | 6 + sql/old/3.3.5a/2012_04_01_01_world_creature.sql | 26 + ...2012_04_01_02_world_spell_group_stack_rules.sql | 9 + sql/old/3.3.5a/2012_04_01_03_world_trainers.sql | 83 + sql/old/3.3.5a/2012_04_01_04_world_conditions.sql | 5 + .../2012_04_01_05_world_creature_template.sql | 2 + sql/old/3.3.5a/2012_04_01_06_world_sai.sql | 7 + sql/old/3.3.5a/2012_04_01_07_world_misc.sql | 4 + .../2012_04_03_00_world_spell_script_names.sql | 3 + sql/old/3.3.5a/2012_04_04_00_auth_realmlist.sql | 1 + sql/old/3.3.5a/2012_04_04_00_world_conditions.sql | 7 + sql/old/3.3.5a/2012_04_04_01_world_spell_dbc.sql | 1 + .../2012_04_05_00_world_gameobject_template.sql | 32 + .../2012_04_05_00_world_spell_script_names.sql | 6 + .../2012_04_05_01_world_spell_proc_event.sql | 2 + .../2012_04_06_00_world_spell_proc_event.sql | 1 + sql/old/3.3.5a/2012_04_06_01_world_spell_dbc.sql | 3 + .../2012_04_06_02_world_gameobject_template.sql | 4 + sql/old/3.3.5a/2012_04_06_03_world_spell_dbc.sql | 3 + sql/old/3.3.5a/2012_04_06_04_world_page_text.sql | 25 + .../2012_04_07_00_characters_lag_reports.sql | 2 + sql/old/3.3.5a/2012_04_07_00_world_gameobject.sql | 5 + sql/old/3.3.5a/2012_04_07_01_world_game_event.sql | 2 + .../2012_04_07_02_world_spell_proc_event.sql | 1 + .../2012_04_08_00_world_spell_script_names.sql | 3 + .../2012_04_08_01_world_creature_template.sql | 2 + sql/old/3.3.5a/2012_04_08_02_world_spell_dbc.sql | 3 + .../2012_04_08_02_world_spell_script_names.sql | 6 + .../2012_04_08_03_world_spell_script_names.sql | 3 + .../2012_04_12_00_world_creature_template.sql | 2 + .../2012_04_12_01_world_creature_template.sql | 6 + .../2012_04_12_02_world_spell_bonus_data.sql | 29 + .../2012_04_12_03_world_spell_bonus_data.sql | 8 + .../2012_04_12_04_world_creature_template.sql | 2 + sql/old/3.3.5a/2012_04_12_05_world_command.sql | 2 + sql/old/3.3.5a/2012_04_13_00_world_sai.sql | 25 + sql/old/3.3.5a/2012_04_13_01_world_misc.sql | 219 + sql/old/3.3.5a/2012_04_13_02_world_misc.sql | 18 + sql/old/3.3.5a/2012_04_13_03_world_bg_template.sql | 7 + .../2012_04_13_04_world_spell_proc_event.sql | 4 + ...012_04_14_00_world_gameobject_loot_template.sql | 3 + ...012_04_14_01_world_gameobject_loot_template.sql | 11 + ...2012_04_14_02_world_creature_template_addon.sql | 3 + .../2012_04_14_03_world_spell_bonus_data.sql | 1 + .../2012_04_14_04_world_spell_proc_event.sql | 3 + .../2012_04_14_05_world_spell_proc_event.sql | 1 + sql/old/3.3.5a/2012_04_16_00_world_game_event.sql | 4 + sql/old/3.3.5a/2012_04_17_00_world_creature.sql | 28 + .../2012_04_18_00_world_npc_spellclick_spells.sql | 2 + sql/old/3.3.5a/2012_04_18_01_world_creature.sql | 1 + ...2012_04_18_02_world_reference_loot_template.sql | 377 + .../2012_04_18_03_world_creature_loot_template.sql | 2 + ..._04_18_04_world_pickpocketing_loot_template.sql | 501 + sql/old/3.3.5a/2012_04_18_05_world_conditions.sql | 4 + .../2012_04_18_06_world_creature_template.sql | 2 + .../2012_04_18_07_world_fishing_loot_template.sql | 2 + .../2012_04_18_08_world_creature_loot_template.sql | 22 + .../2012_04_19_00_world_creature_template.sql | 7 + ..._04_19_01_world_pickpocketing_loot_template.sql | 202 + .../2012_04_19_02_world_creature_loot_template.sql | 2 + .../3.3.5a/2012_04_19_03_world_instance_ulduar.sql | 174 + ...012_04_20_00_world_gameobject_loot_template.sql | 15 + .../2012_04_20_01_world_item_loot_template.sql | 10 + .../2012_04_20_02_world_creature_loot_template.sql | 4 + .../2012_04_20_03_world_creature_loot_template.sql | 7 + .../2012_04_20_04_world_creature_loot_template.sql | 3 + .../3.3.5a/2012_04_20_05_gameobject_template.sql | 8 + .../2012_04_21_00_world_spell_script_names.sql | 14 + sql/old/3.3.5a/2012_04_22_00_world_sai.sql | 63 + sql/old/3.3.5a/2012_04_23_00_world_creatures.sql | 12 + sql/old/3.3.5a/2012_04_23_01_world_conditions.sql | 5 + ...12_04_23_02_world_prospecting_loot_template.sql | 112 + .../2012_04_23_03_world_skinning_loot_template.sql | 44 + .../2012_04_23_04_world_creature_loot_template.sql | 2 + .../2012_04_23_05_world_creature_loot_template.sql | 3 + sql/old/3.3.5a/2012_04_24_00_world_command.sql | 10 + .../2012_04_24_01_world_spell_proc_event.sql | 4 + .../3.3.5a/2012_04_24_02_world_warden_checks.sql | 8 + .../2012_04_24_03_world_spell_script_names.sql | 4 + .../2012_04_24_04_world_spell_proc_event.sql | 4 + .../2012_04_24_05_world_creature_loot_template.sql | 9 + sql/old/3.3.5a/2012_04_24_06_world_misc.sql | 31 + sql/old/3.3.5a/2012_04_25_00_world_misc.sql | 3 + .../2012_04_25_01_world_spell_script_names.sql | 3 + .../2012_04_25_02_world_spell_script_names.sql | 11 + sql/old/3.3.5a/2012_04_25_03_world_spell_group.sql | 11 + sql/old/3.3.5a/2012_04_26_00_world_conditions.sql | 1 + .../3.3.5a/2012_04_26_01_world_smart_scripts.sql | 1 + .../3.3.5a/2012_04_27_00_world_instance_icc.sql | 5 + ...2012_04_28_00_world_reference_loot_template.sql | 158 + ...2012_04_28_01_world_reference_loot_template.sql | 22 + sql/old/3.3.5a/2012_05_01_00_world_creature.sql | 9 + .../2012_05_02_00_world_creature_loot_template.sql | 8 + sql/old/3.3.5a/2012_05_03_00_world_creature.sql | 29 + sql/old/3.3.5a/2012_05_03_01_world_cos_misc.sql | 153 + .../3.3.5a/2012_05_03_02_world_quest_template.sql | 28 + .../2012_05_03_03_world_creature_questrelation.sql | 2 + ...12_05_03_04_world_game_event_creature_quest.sql | 57 + sql/old/3.3.5a/2012_05_04_00_world_waypoints.sql | 137 + sql/old/3.3.5a/2012_05_04_01_world_sai.sql | 32 + sql/old/3.3.5a/2012_05_05_00_world_sai.sql | 205 + .../2012_05_05_01_world_creature_template.sql | 2 + sql/old/3.3.5a/2012_05_05_02_world_gameobject.sql | 10 + sql/old/3.3.5a/2012_05_05_03_world_sai.sql | 17 + .../2012_05_05_04_world_creature_template.sql | 27 + .../2012_05_05_05_world_creature_template.sql | 2 + sql/old/3.3.5a/2012_05_05_06_world_sai.sql | 13 + .../2012_05_06_00_world_creature_template.sql | 5 + .../2012_05_06_01_world_creature_template.sql | 11 + sql/old/3.3.5a/2012_05_07_00_world_waypoints.sql | 73 + sql/old/3.3.5a/2012_05_07_01_world_sai.sql | 51 + sql/old/3.3.5a/2012_05_08_00_world_sai.sql | 89 + sql/old/3.3.5a/2012_05_08_01_world_gameobject.sql | 5 + sql/old/3.3.5a/2012_05_08_01_world_misc.sql | 9 + .../2012_05_09_00_world_spell_target_position.sql | 7 + sql/old/3.3.5a/2012_05_09_01_world_commands.sql | 8 + sql/old/3.3.5a/2012_05_09_02_world_sai.sql | 116 + sql/old/3.3.5a/2012_05_09_03_world_misc.sql | 56 + sql/old/3.3.5a/2012_05_10_00_world_sai.sql | 42 + sql/old/3.3.5a/2012_05_10_01_world_misc.sql | 37 + .../2012_05_10_02_world_creature_template.sql | 2 + sql/old/3.3.5a/2012_05_10_03_world_misc.sql | 129 + sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql | 14 + sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql | 88 + sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql | 40 + sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql | 31 + .../2012_05_11_01_world_gameobject_template.sql | 4 + sql/old/3.3.5a/2012_05_11_02_world_conditions.sql | 23 + .../2012_05_12_00_world_gameobject_template.sql | 2 + .../2012_05_12_01_world_item_loot_template.sql | 92 + ...012_05_12_02_world_gameobject_loot_template.sql | 37 + .../3.3.5a/2012_05_13_00_world_creature_text.sql | 13 + .../3.3.5a/2012_05_13_01_world_creature_text.sql | 14 + sql/old/3.3.5a/2012_05_16_00_world_scripts.sql | 2 + .../3.3.5a/2012_05_17_00_world_creature_text.sql | 7 + sql/old/3.3.5a/2012_05_18_00_world_conditions.sql | 3 + sql/old/3.3.5a/2012_05_18_01_world_misc.sql | 7 + .../2012_05_18_01_world_spell_target_position.sql | 9 + .../3.3.5a/2012_05_19_00_world_quest_template.sql | 2 + .../3.3.5a/2012_05_19_01_world_smart_scripts.sql | 7 + sql/old/3.3.5a/2012_05_19_02_world_misc.sql | 6 + sql/updates/auth/2012_02_19_00_auth_account.sql | 2 - sql/updates/auth/2012_03_25_00_auth_misc.sql | 8 - sql/updates/auth/2012_03_26_00_auth_realmlist.sql | 2 - sql/updates/auth/2012_03_28_00_auth_account.sql | 13 - .../auth/2012_03_28_01_auth_account_access.sql | 3 - .../auth/2012_03_28_02_auth_account_banned.sql | 4 - sql/updates/auth/2012_03_28_03_auth_ip_banned.sql | 2 - sql/updates/auth/2012_03_28_04_auth_logs.sql | 5 - .../auth/2012_03_28_05_auth_realmcharacters.sql | 4 - sql/updates/auth/2012_03_28_06_auth_realmlist.sql | 6 - sql/updates/auth/2012_03_28_07_auth_uptime.sql | 6 - sql/updates/auth/2012_04_01_00_auth_realmlist.sql | 1 - sql/updates/auth/2012_04_04_00_auth_realmlist.sql | 1 - .../2012_02_19_00_characters_warden_action.sql | 7 - .../2012_04_07_00_characters_lag_reports.sql | 2 - sql/updates/world/2012_02_13_00_world_version.sql | 1 - ...12_02_14_00_world_achievement_criteria_data.sql | 7 - .../world/2012_02_15_00_world_quest_template.sql | 1 - .../2012_02_15_01_world_areatrigger_tavern.sql | 13 - .../world/2012_02_15_02_world_item_template.sql | 3 - .../world/2012_02_15_03_world_quest_template.sql | 18 - .../world/2012_02_15_04_world_quest_template.sql | 17 - ...12_02_15_06_world_creature_involvedrelation.sql | 3 - .../world/2012_02_15_07_00_world_creature.sql | 57 - .../world/2012_02_15_07_01_world_waypoint_data.sql | 147 - sql/updates/world/2012_02_15_07_02_world_misc.sql | 120 - sql/updates/world/2012_02_15_08_world_sai.sql | 9 - .../world/2012_02_15_09_world_spell_proc_event.sql | 6 - .../world/2012_02_16_00_world_conditions.sql | 12800 ------------------- .../world/2012_02_16_01_world_conditions.sql | 3 - .../world/2012_02_17_00_world_waypoints.sql | 77 - .../2012_02_18_00_world_spell_script_names.sql | 69 - .../world/2012_02_18_01_world_spell_dbc.sql | 3 - sql/updates/world/2012_02_18_02_world_gossip.sql | 52 - sql/updates/world/2012_02_18_03_world_gossip.sql | 1068 -- .../2012_02_18_04_world_spell_script_names.sql | 6 - .../world/2012_02_18_05_world_creatures.sql | 3 - sql/updates/world/2012_02_18_06_world_gossip.sql | 166 - sql/updates/world/2012_02_18_07_world_gossip.sql | 44 - sql/updates/world/2012_02_18_08_world_gossip.sql | 5 - .../world/2012_02_19_00_world_quest_template.sql | 14 - .../world/2012_02_19_01_world_quest_template.sql | 11 - .../world/2012_02_19_02_world_gameobject.sql | 4 - sql/updates/world/2012_02_19_03_world_version.sql | 1 + .../world/2012_02_19_03_world_warden_checks.sql | 802 -- .../world/2012_02_19_04_world_misc_db_updates.sql | 21 - .../world/2012_02_19_05_world_creature_text.sql | 7 - .../world/2012_02_19_06_world_creature_text.sql | 20 - sql/updates/world/2012_02_20_00_world_sai.sql | 4 - sql/updates/world/2012_02_20_01_world_gossip.sql | 8 - .../world/2012_02_20_02_world_conditons.sql | 277 - .../2012_02_21_00_world_creature_loot_template.sql | 78 - .../world/2012_02_21_01_world_conditions.sql | 3592 ------ .../2012_02_21_02_world_creature_loot_template.sql | 11 - .../2012_02_21_03_world_creature_loot_template.sql | 26 - .../2012_02_21_04_world_creature_loot_template.sql | 16 - sql/updates/world/2012_02_21_05_world_gossip.sql | 39 - sql/updates/world/2012_02_21_06_world_Gossip.sql | 184 - sql/updates/world/2012_02_22_00_world_SAI.sql | 39 - .../world/2012_02_22_01_world_creature_text.sql | 34 - sql/updates/world/2012_02_22_02_world_misc.sql | 57 - .../world/2012_02_22_03_world_conditions.sql | 3 - .../2012_02_23_00_world_spell_script_names.sql | 7 - ...012_02_24_00_world_gameobject_loot_template.sql | 10 - sql/updates/world/2012_02_24_01_world_sai.sql | 44 - .../2012_02_25_00_world_spell_script_names.sql | 1 - sql/updates/world/2012_02_25_01_world_command.sql | 6 - sql/updates/world/2012_02_25_01_world_misc.sql | 11 - sql/updates/world/2012_02_25_02_world_sai.sql | 28 - sql/updates/world/2012_02_26_00_world_misc.sql | 13 - .../2012_02_26_01_world_spell_script_names.sql | 4 - .../2012_02_27_00_world_creature_template.sql | 8 - .../2012_02_28_00_world_wintergrasp_spawns.sql | 366 - .../world/2012_02_29_00_world_conditions_misc.sql | 126 - .../world/2012_02_29_01_world_conditions.sql | 5 - .../world/2012_02_29_02_world_conditions.sql | 5 - .../world/2012_02_29_03_world_creature_text.sql | 18 - .../world/2012_02_29_04_world_creature_text.sql | 11 - .../world/2012_02_29_05_world_creature_text.sql | 15 - .../world/2012_03_01_00_world_conditions.sql | 5 - .../world/2012_03_01_01_world_creature_text.sql | 15 - .../2012_03_01_02_world_locales_creature_text.sql | 15 - sql/updates/world/2012_03_03_00_world_command.sql | 9 - sql/updates/world/2012_03_04_00_world_misc.sql | 13 - .../2012_03_04_01_world_areatrigger_scripts.sql | 7 - sql/updates/world/2012_03_06_00_world_commands.sql | 3 - sql/updates/world/2012_03_06_01_world_misc.sql | 4 - .../2012_03_06_02_world_queststatus_seasonal.sql | 1 - .../world/2012_03_06_03_world_smart_scripts.sql | 17 - .../world/2012_03_06_04_world_creature_text.sql | 6 - .../world/2012_03_07_00_world_trinity_string.sql | 3 - sql/updates/world/2012_03_10_00_world_creature.sql | 21 - .../world/2012_03_10_00_world_smart_scripts.sql | 129 - .../world/2012_03_10_00_world_waypoint_data.sql | 25 - sql/updates/world/2012_03_11_00_world_sai.sql | 60 - .../2012_03_12_00_world_creature_template.sql | 1 - .../world/2012_03_12_01_world_conditions.sql | 3 - .../world/2012_03_12_01_world_gameobject.sql | 4 - .../2012_03_12_01_world_spell_script_names.sql | 3 - .../world/2012_03_14_00_world_creature_addon.sql | 2 - .../world/2012_03_19_00_world_smart_scripts.sql | 21 - sql/updates/world/2012_03_20_00_world_gossip.sql | 88 - sql/updates/world/2012_03_21_00_world_creature.sql | 71 - .../2012_03_22_00_world_creature_template.sql | 2 - .../world/2012_03_22_01_world_conditions.sql | 2 - .../world/2012_03_23_00_world_ip2nation.sql | 21 - sql/updates/world/2012_03_24_00_world_misc.sql | 22 - .../2012_03_24_01_world_creature_loot_template.sql | 290 - .../2012_03_24_02_world_creature_loot_template.sql | 136 - .../world/2012_03_25_00_world_game_event.sql | 4 - .../2012_03_26_00_world_creature_template.sql | 73 - .../2012_03_26_01_world_spell_script_names.sql | 4 - sql/updates/world/2012_03_27_00_world_misc.sql | 49 - sql/updates/world/2012_03_27_01_world_misc.sql | 15 - sql/updates/world/2012_03_27_02_world_misc.sql | 78 - sql/updates/world/2012_03_27_03_world_misc.sql | 59 - sql/updates/world/2012_03_27_04_world_misc.sql | 3 - .../world/2012_03_28_01_world_spell_bonus_data.sql | 2 - .../world/2012_03_30_00_world_smart_scripts.sql | 94 - .../2012_03_31_00_world_creature_loot_template.sql | 191 - sql/updates/world/2012_04_01_00_world_creature.sql | 17 - .../2012_04_01_00_world_spell_script_names.sql | 6 - sql/updates/world/2012_04_01_01_world_creature.sql | 26 - ...2012_04_01_02_world_spell_group_stack_rules.sql | 9 - sql/updates/world/2012_04_01_03_world_trainers.sql | 83 - .../world/2012_04_01_04_world_conditions.sql | 5 - .../2012_04_01_05_world_creature_template.sql | 2 - sql/updates/world/2012_04_01_06_world_sai.sql | 7 - sql/updates/world/2012_04_01_07_world_misc.sql | 4 - .../2012_04_03_00_world_spell_script_names.sql | 3 - .../world/2012_04_04_00_world_conditions.sql | 7 - .../world/2012_04_04_01_world_spell_dbc.sql | 1 - .../2012_04_05_00_world_gameobject_template.sql | 32 - .../2012_04_05_00_world_spell_script_names.sql | 6 - .../world/2012_04_05_01_world_spell_proc_event.sql | 2 - .../world/2012_04_06_00_world_spell_proc_event.sql | 1 - .../world/2012_04_06_01_world_spell_dbc.sql | 3 - .../2012_04_06_02_world_gameobject_template.sql | 4 - .../world/2012_04_06_03_world_spell_dbc.sql | 3 - .../world/2012_04_06_04_world_page_text.sql | 25 - .../world/2012_04_07_00_world_gameobject.sql | 5 - .../world/2012_04_07_01_world_game_event.sql | 2 - .../world/2012_04_07_02_world_spell_proc_event.sql | 1 - .../2012_04_08_00_world_spell_script_names.sql | 3 - .../2012_04_08_01_world_creature_template.sql | 2 - .../world/2012_04_08_02_world_spell_dbc.sql | 3 - .../2012_04_08_02_world_spell_script_names.sql | 6 - .../2012_04_08_03_world_spell_script_names.sql | 3 - .../2012_04_12_00_world_creature_template.sql | 2 - .../2012_04_12_01_world_creature_template.sql | 6 - .../world/2012_04_12_02_world_spell_bonus_data.sql | 29 - .../world/2012_04_12_03_world_spell_bonus_data.sql | 8 - .../2012_04_12_04_world_creature_template.sql | 2 - sql/updates/world/2012_04_12_05_world_command.sql | 2 - sql/updates/world/2012_04_13_00_world_sai.sql | 25 - sql/updates/world/2012_04_13_01_world_misc.sql | 219 - sql/updates/world/2012_04_13_02_world_misc.sql | 18 - .../world/2012_04_13_03_world_bg_template.sql | 7 - .../world/2012_04_13_04_world_spell_proc_event.sql | 4 - ...012_04_14_00_world_gameobject_loot_template.sql | 3 - ...012_04_14_01_world_gameobject_loot_template.sql | 11 - ...2012_04_14_02_world_creature_template_addon.sql | 3 - .../world/2012_04_14_03_world_spell_bonus_data.sql | 1 - .../world/2012_04_14_04_world_spell_proc_event.sql | 3 - .../world/2012_04_14_05_world_spell_proc_event.sql | 1 - .../world/2012_04_16_00_world_game_event.sql | 4 - sql/updates/world/2012_04_17_00_world_creature.sql | 28 - .../2012_04_18_00_world_npc_spellclick_spells.sql | 2 - sql/updates/world/2012_04_18_01_world_creature.sql | 1 - ...2012_04_18_02_world_reference_loot_template.sql | 377 - .../2012_04_18_03_world_creature_loot_template.sql | 2 - ..._04_18_04_world_pickpocketing_loot_template.sql | 501 - .../world/2012_04_18_05_world_conditions.sql | 4 - .../2012_04_18_06_world_creature_template.sql | 2 - .../2012_04_18_07_world_fishing_loot_template.sql | 2 - .../2012_04_18_08_world_creature_loot_template.sql | 22 - .../2012_04_19_00_world_creature_template.sql | 7 - ..._04_19_01_world_pickpocketing_loot_template.sql | 202 - .../2012_04_19_02_world_creature_loot_template.sql | 2 - .../world/2012_04_19_03_world_instance_ulduar.sql | 174 - ...012_04_20_00_world_gameobject_loot_template.sql | 15 - .../2012_04_20_01_world_item_loot_template.sql | 10 - .../2012_04_20_02_world_creature_loot_template.sql | 4 - .../2012_04_20_03_world_creature_loot_template.sql | 7 - .../2012_04_20_04_world_creature_loot_template.sql | 3 - .../world/2012_04_20_05_gameobject_template.sql | 8 - .../2012_04_21_00_world_spell_script_names.sql | 14 - sql/updates/world/2012_04_22_00_world_sai.sql | 63 - .../world/2012_04_23_00_world_creatures.sql | 12 - .../world/2012_04_23_01_world_conditions.sql | 5 - ...12_04_23_02_world_prospecting_loot_template.sql | 112 - .../2012_04_23_03_world_skinning_loot_template.sql | 44 - .../2012_04_23_04_world_creature_loot_template.sql | 2 - .../2012_04_23_05_world_creature_loot_template.sql | 3 - sql/updates/world/2012_04_24_00_world_command.sql | 10 - .../world/2012_04_24_01_world_spell_proc_event.sql | 4 - .../world/2012_04_24_02_world_warden_checks.sql | 8 - .../2012_04_24_03_world_spell_script_names.sql | 4 - .../world/2012_04_24_04_world_spell_proc_event.sql | 4 - .../2012_04_24_05_world_creature_loot_template.sql | 9 - sql/updates/world/2012_04_24_06_world_misc.sql | 31 - sql/updates/world/2012_04_25_00_world_misc.sql | 3 - .../2012_04_25_01_world_spell_script_names.sql | 3 - .../2012_04_25_02_world_spell_script_names.sql | 11 - .../world/2012_04_25_03_world_spell_group.sql | 11 - .../world/2012_04_26_00_world_conditions.sql | 1 - .../world/2012_04_26_01_world_smart_scripts.sql | 1 - .../world/2012_04_27_00_world_instance_icc.sql | 5 - ...2012_04_28_00_world_reference_loot_template.sql | 158 - ...2012_04_28_01_world_reference_loot_template.sql | 22 - sql/updates/world/2012_05_01_00_world_creature.sql | 9 - .../2012_05_02_00_world_creature_loot_template.sql | 8 - sql/updates/world/2012_05_03_00_world_creature.sql | 29 - sql/updates/world/2012_05_03_01_world_cos_misc.sql | 153 - .../world/2012_05_03_02_world_quest_template.sql | 28 - .../2012_05_03_03_world_creature_questrelation.sql | 2 - ...12_05_03_04_world_game_event_creature_quest.sql | 57 - .../world/2012_05_04_00_world_waypoints.sql | 137 - sql/updates/world/2012_05_04_01_world_sai.sql | 32 - sql/updates/world/2012_05_05_00_world_sai.sql | 205 - .../2012_05_05_01_world_creature_template.sql | 2 - .../world/2012_05_05_02_world_gameobject.sql | 10 - sql/updates/world/2012_05_05_03_world_sai.sql | 17 - .../2012_05_05_04_world_creature_template.sql | 27 - .../2012_05_05_05_world_creature_template.sql | 2 - sql/updates/world/2012_05_05_06_world_sai.sql | 13 - .../2012_05_06_00_world_creature_template.sql | 5 - .../2012_05_06_01_world_creature_template.sql | 11 - .../world/2012_05_07_00_world_waypoints.sql | 73 - sql/updates/world/2012_05_07_01_world_sai.sql | 51 - sql/updates/world/2012_05_08_00_world_sai.sql | 89 - .../world/2012_05_08_01_world_gameobject.sql | 5 - sql/updates/world/2012_05_08_01_world_misc.sql | 9 - .../2012_05_09_00_world_spell_target_position.sql | 7 - sql/updates/world/2012_05_09_01_world_commands.sql | 8 - sql/updates/world/2012_05_09_02_world_sai.sql | 116 - sql/updates/world/2012_05_09_03_world_misc.sql | 56 - sql/updates/world/2012_05_10_00_world_sai.sql | 42 - sql/updates/world/2012_05_10_01_world_misc.sql | 37 - .../2012_05_10_02_world_creature_template.sql | 2 - sql/updates/world/2012_05_10_03_world_misc.sql | 129 - .../world/2012_05_10_04_world_ceature_sai.sql | 14 - .../world/2012_05_10_05_world_waypoints.sql | 88 - .../world/2012_05_10_06_world_waypoints.sql | 40 - .../world/2012_05_11_00_world_waypoints.sql | 31 - .../2012_05_11_01_world_gameobject_template.sql | 4 - .../world/2012_05_11_02_world_conditions.sql | 23 - .../2012_05_12_00_world_gameobject_template.sql | 2 - .../2012_05_12_01_world_item_loot_template.sql | 92 - ...012_05_12_02_world_gameobject_loot_template.sql | 37 - .../world/2012_05_13_00_world_creature_text.sql | 13 - .../world/2012_05_13_01_world_creature_text.sql | 14 - sql/updates/world/2012_05_16_00_world_scripts.sql | 2 - .../world/2012_05_17_00_world_creature_text.sql | 7 - .../world/2012_05_18_00_world_conditions.sql | 3 - sql/updates/world/2012_05_18_01_world_misc.sql | 7 - .../2012_05_18_01_world_spell_target_position.sql | 9 - .../world/2012_05_19_00_world_quest_template.sql | 2 - .../world/2012_05_19_01_world_smart_scripts.sql | 7 - sql/updates/world/2012_05_19_02_world_misc.sql | 6 - 519 files changed, 26565 insertions(+), 26564 deletions(-) create mode 100644 sql/old/3.3.5a/2012_02_13_00_world_version.sql create mode 100644 sql/old/3.3.5a/2012_02_14_00_world_achievement_criteria_data.sql create mode 100644 sql/old/3.3.5a/2012_02_15_00_world_quest_template.sql create mode 100644 sql/old/3.3.5a/2012_02_15_01_world_areatrigger_tavern.sql create mode 100644 sql/old/3.3.5a/2012_02_15_02_world_item_template.sql create mode 100644 sql/old/3.3.5a/2012_02_15_03_world_quest_template.sql create mode 100644 sql/old/3.3.5a/2012_02_15_04_world_quest_template.sql create mode 100644 sql/old/3.3.5a/2012_02_15_06_world_creature_involvedrelation.sql create mode 100644 sql/old/3.3.5a/2012_02_15_07_00_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_02_15_07_01_world_waypoint_data.sql create mode 100644 sql/old/3.3.5a/2012_02_15_07_02_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_02_15_08_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_02_15_09_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_02_16_00_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_02_16_01_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_02_17_00_world_waypoints.sql create mode 100644 sql/old/3.3.5a/2012_02_18_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_02_18_01_world_spell_dbc.sql create mode 100644 sql/old/3.3.5a/2012_02_18_02_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_18_03_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_18_04_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_02_18_05_world_creatures.sql create mode 100644 sql/old/3.3.5a/2012_02_18_06_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_18_07_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_18_08_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_19_00_auth_account.sql create mode 100644 sql/old/3.3.5a/2012_02_19_00_characters_warden_action.sql create mode 100644 sql/old/3.3.5a/2012_02_19_00_world_quest_template.sql create mode 100644 sql/old/3.3.5a/2012_02_19_01_world_quest_template.sql create mode 100644 sql/old/3.3.5a/2012_02_19_02_world_gameobject.sql create mode 100644 sql/old/3.3.5a/2012_02_19_03_world_warden_checks.sql create mode 100644 sql/old/3.3.5a/2012_02_19_04_world_misc_db_updates.sql create mode 100644 sql/old/3.3.5a/2012_02_19_05_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_02_19_06_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_02_20_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_02_20_01_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_20_02_world_conditons.sql create mode 100644 sql/old/3.3.5a/2012_02_21_00_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_02_21_01_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_02_21_02_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_02_21_03_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_02_21_04_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_02_21_05_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_21_06_world_Gossip.sql create mode 100644 sql/old/3.3.5a/2012_02_22_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_02_22_01_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_02_22_02_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_02_22_03_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_02_23_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_02_24_00_world_gameobject_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_02_24_01_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_02_25_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_02_25_01_world_command.sql create mode 100644 sql/old/3.3.5a/2012_02_25_01_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_02_25_02_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_02_26_00_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_02_26_01_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_02_27_00_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_02_28_00_world_wintergrasp_spawns.sql create mode 100644 sql/old/3.3.5a/2012_02_29_00_world_conditions_misc.sql create mode 100644 sql/old/3.3.5a/2012_02_29_01_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_02_29_02_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_02_29_03_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_02_29_04_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_02_29_05_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_03_01_00_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_03_01_01_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_03_01_02_world_locales_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_03_03_00_world_command.sql create mode 100644 sql/old/3.3.5a/2012_03_04_00_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_04_01_world_areatrigger_scripts.sql create mode 100644 sql/old/3.3.5a/2012_03_06_00_world_commands.sql create mode 100644 sql/old/3.3.5a/2012_03_06_01_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_06_02_world_queststatus_seasonal.sql create mode 100644 sql/old/3.3.5a/2012_03_06_03_world_smart_scripts.sql create mode 100644 sql/old/3.3.5a/2012_03_06_04_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_03_07_00_world_trinity_string.sql create mode 100644 sql/old/3.3.5a/2012_03_10_00_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_03_10_00_world_smart_scripts.sql create mode 100644 sql/old/3.3.5a/2012_03_10_00_world_waypoint_data.sql create mode 100644 sql/old/3.3.5a/2012_03_11_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_03_12_00_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_03_12_01_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_03_12_01_world_gameobject.sql create mode 100644 sql/old/3.3.5a/2012_03_12_01_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_03_14_00_world_creature_addon.sql create mode 100644 sql/old/3.3.5a/2012_03_19_00_world_smart_scripts.sql create mode 100644 sql/old/3.3.5a/2012_03_20_00_world_gossip.sql create mode 100644 sql/old/3.3.5a/2012_03_21_00_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_03_22_00_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_03_22_01_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_03_23_00_world_ip2nation.sql create mode 100644 sql/old/3.3.5a/2012_03_24_00_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_24_01_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_03_24_02_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_03_25_00_auth_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_25_00_world_game_event.sql create mode 100644 sql/old/3.3.5a/2012_03_26_00_auth_realmlist.sql create mode 100644 sql/old/3.3.5a/2012_03_26_00_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_03_26_01_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_03_27_00_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_27_01_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_27_02_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_27_03_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_27_04_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_03_28_00_auth_account.sql create mode 100644 sql/old/3.3.5a/2012_03_28_01_auth_account_access.sql create mode 100644 sql/old/3.3.5a/2012_03_28_01_world_spell_bonus_data.sql create mode 100644 sql/old/3.3.5a/2012_03_28_02_auth_account_banned.sql create mode 100644 sql/old/3.3.5a/2012_03_28_03_auth_ip_banned.sql create mode 100644 sql/old/3.3.5a/2012_03_28_04_auth_logs.sql create mode 100644 sql/old/3.3.5a/2012_03_28_05_auth_realmcharacters.sql create mode 100644 sql/old/3.3.5a/2012_03_28_06_auth_realmlist.sql create mode 100644 sql/old/3.3.5a/2012_03_28_07_auth_uptime.sql create mode 100644 sql/old/3.3.5a/2012_03_30_00_world_smart_scripts.sql create mode 100644 sql/old/3.3.5a/2012_03_31_00_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_01_00_auth_realmlist.sql create mode 100644 sql/old/3.3.5a/2012_04_01_00_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_04_01_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_01_01_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_04_01_02_world_spell_group_stack_rules.sql create mode 100644 sql/old/3.3.5a/2012_04_01_03_world_trainers.sql create mode 100644 sql/old/3.3.5a/2012_04_01_04_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_04_01_05_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_04_01_06_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_04_01_07_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_04_03_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_04_00_auth_realmlist.sql create mode 100644 sql/old/3.3.5a/2012_04_04_00_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_04_04_01_world_spell_dbc.sql create mode 100644 sql/old/3.3.5a/2012_04_05_00_world_gameobject_template.sql create mode 100644 sql/old/3.3.5a/2012_04_05_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_05_01_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_06_00_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_06_01_world_spell_dbc.sql create mode 100644 sql/old/3.3.5a/2012_04_06_02_world_gameobject_template.sql create mode 100644 sql/old/3.3.5a/2012_04_06_03_world_spell_dbc.sql create mode 100644 sql/old/3.3.5a/2012_04_06_04_world_page_text.sql create mode 100644 sql/old/3.3.5a/2012_04_07_00_characters_lag_reports.sql create mode 100644 sql/old/3.3.5a/2012_04_07_00_world_gameobject.sql create mode 100644 sql/old/3.3.5a/2012_04_07_01_world_game_event.sql create mode 100644 sql/old/3.3.5a/2012_04_07_02_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_08_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_08_01_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_04_08_02_world_spell_dbc.sql create mode 100644 sql/old/3.3.5a/2012_04_08_02_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_08_03_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_12_00_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_04_12_01_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_04_12_02_world_spell_bonus_data.sql create mode 100644 sql/old/3.3.5a/2012_04_12_03_world_spell_bonus_data.sql create mode 100644 sql/old/3.3.5a/2012_04_12_04_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_04_12_05_world_command.sql create mode 100644 sql/old/3.3.5a/2012_04_13_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_04_13_01_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_04_13_02_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_04_13_03_world_bg_template.sql create mode 100644 sql/old/3.3.5a/2012_04_13_04_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_14_00_world_gameobject_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_14_01_world_gameobject_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_14_02_world_creature_template_addon.sql create mode 100644 sql/old/3.3.5a/2012_04_14_03_world_spell_bonus_data.sql create mode 100644 sql/old/3.3.5a/2012_04_14_04_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_14_05_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_16_00_world_game_event.sql create mode 100644 sql/old/3.3.5a/2012_04_17_00_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_04_18_00_world_npc_spellclick_spells.sql create mode 100644 sql/old/3.3.5a/2012_04_18_01_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_04_18_02_world_reference_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_18_03_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_18_04_world_pickpocketing_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_18_05_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_04_18_06_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_04_18_07_world_fishing_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_18_08_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_19_00_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_04_19_01_world_pickpocketing_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_19_02_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_19_03_world_instance_ulduar.sql create mode 100644 sql/old/3.3.5a/2012_04_20_00_world_gameobject_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_20_01_world_item_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_20_02_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_20_03_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_20_04_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql create mode 100644 sql/old/3.3.5a/2012_04_21_00_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_22_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_04_23_00_world_creatures.sql create mode 100644 sql/old/3.3.5a/2012_04_23_01_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_04_23_02_world_prospecting_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_23_03_world_skinning_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_23_04_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_23_05_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_24_00_world_command.sql create mode 100644 sql/old/3.3.5a/2012_04_24_01_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_24_02_world_warden_checks.sql create mode 100644 sql/old/3.3.5a/2012_04_24_03_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_24_04_world_spell_proc_event.sql create mode 100644 sql/old/3.3.5a/2012_04_24_05_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_24_06_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_04_25_00_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_04_25_01_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_25_02_world_spell_script_names.sql create mode 100644 sql/old/3.3.5a/2012_04_25_03_world_spell_group.sql create mode 100644 sql/old/3.3.5a/2012_04_26_00_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_04_26_01_world_smart_scripts.sql create mode 100644 sql/old/3.3.5a/2012_04_27_00_world_instance_icc.sql create mode 100644 sql/old/3.3.5a/2012_04_28_00_world_reference_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_04_28_01_world_reference_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_05_01_00_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_05_02_00_world_creature_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_05_03_00_world_creature.sql create mode 100644 sql/old/3.3.5a/2012_05_03_01_world_cos_misc.sql create mode 100644 sql/old/3.3.5a/2012_05_03_02_world_quest_template.sql create mode 100644 sql/old/3.3.5a/2012_05_03_03_world_creature_questrelation.sql create mode 100644 sql/old/3.3.5a/2012_05_03_04_world_game_event_creature_quest.sql create mode 100644 sql/old/3.3.5a/2012_05_04_00_world_waypoints.sql create mode 100644 sql/old/3.3.5a/2012_05_04_01_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_05_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_05_01_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_05_05_02_world_gameobject.sql create mode 100644 sql/old/3.3.5a/2012_05_05_03_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_05_04_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_05_05_05_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_05_05_06_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_06_00_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_05_06_01_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_05_07_00_world_waypoints.sql create mode 100644 sql/old/3.3.5a/2012_05_07_01_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_08_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_08_01_world_gameobject.sql create mode 100644 sql/old/3.3.5a/2012_05_08_01_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_05_09_00_world_spell_target_position.sql create mode 100644 sql/old/3.3.5a/2012_05_09_01_world_commands.sql create mode 100644 sql/old/3.3.5a/2012_05_09_02_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_09_03_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_05_10_00_world_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_10_01_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_05_10_02_world_creature_template.sql create mode 100644 sql/old/3.3.5a/2012_05_10_03_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql create mode 100644 sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql create mode 100644 sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql create mode 100644 sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql create mode 100644 sql/old/3.3.5a/2012_05_11_01_world_gameobject_template.sql create mode 100644 sql/old/3.3.5a/2012_05_11_02_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_05_12_00_world_gameobject_template.sql create mode 100644 sql/old/3.3.5a/2012_05_12_01_world_item_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_05_12_02_world_gameobject_loot_template.sql create mode 100644 sql/old/3.3.5a/2012_05_13_00_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_05_13_01_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_05_16_00_world_scripts.sql create mode 100644 sql/old/3.3.5a/2012_05_17_00_world_creature_text.sql create mode 100644 sql/old/3.3.5a/2012_05_18_00_world_conditions.sql create mode 100644 sql/old/3.3.5a/2012_05_18_01_world_misc.sql create mode 100644 sql/old/3.3.5a/2012_05_18_01_world_spell_target_position.sql create mode 100644 sql/old/3.3.5a/2012_05_19_00_world_quest_template.sql create mode 100644 sql/old/3.3.5a/2012_05_19_01_world_smart_scripts.sql create mode 100644 sql/old/3.3.5a/2012_05_19_02_world_misc.sql delete mode 100644 sql/updates/auth/2012_02_19_00_auth_account.sql delete mode 100644 sql/updates/auth/2012_03_25_00_auth_misc.sql delete mode 100644 sql/updates/auth/2012_03_26_00_auth_realmlist.sql delete mode 100644 sql/updates/auth/2012_03_28_00_auth_account.sql delete mode 100644 sql/updates/auth/2012_03_28_01_auth_account_access.sql delete mode 100644 sql/updates/auth/2012_03_28_02_auth_account_banned.sql delete mode 100644 sql/updates/auth/2012_03_28_03_auth_ip_banned.sql delete mode 100644 sql/updates/auth/2012_03_28_04_auth_logs.sql delete mode 100644 sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql delete mode 100644 sql/updates/auth/2012_03_28_06_auth_realmlist.sql delete mode 100644 sql/updates/auth/2012_03_28_07_auth_uptime.sql delete mode 100644 sql/updates/auth/2012_04_01_00_auth_realmlist.sql delete mode 100644 sql/updates/auth/2012_04_04_00_auth_realmlist.sql delete mode 100644 sql/updates/characters/2012_02_19_00_characters_warden_action.sql delete mode 100644 sql/updates/characters/2012_04_07_00_characters_lag_reports.sql delete mode 100644 sql/updates/world/2012_02_13_00_world_version.sql delete mode 100644 sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql delete mode 100644 sql/updates/world/2012_02_15_00_world_quest_template.sql delete mode 100644 sql/updates/world/2012_02_15_01_world_areatrigger_tavern.sql delete mode 100644 sql/updates/world/2012_02_15_02_world_item_template.sql delete mode 100644 sql/updates/world/2012_02_15_03_world_quest_template.sql delete mode 100644 sql/updates/world/2012_02_15_04_world_quest_template.sql delete mode 100644 sql/updates/world/2012_02_15_06_world_creature_involvedrelation.sql delete mode 100644 sql/updates/world/2012_02_15_07_00_world_creature.sql delete mode 100644 sql/updates/world/2012_02_15_07_01_world_waypoint_data.sql delete mode 100644 sql/updates/world/2012_02_15_07_02_world_misc.sql delete mode 100644 sql/updates/world/2012_02_15_08_world_sai.sql delete mode 100644 sql/updates/world/2012_02_15_09_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_02_16_00_world_conditions.sql delete mode 100644 sql/updates/world/2012_02_16_01_world_conditions.sql delete mode 100644 sql/updates/world/2012_02_17_00_world_waypoints.sql delete mode 100644 sql/updates/world/2012_02_18_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_02_18_01_world_spell_dbc.sql delete mode 100644 sql/updates/world/2012_02_18_02_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_18_03_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_18_04_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_02_18_05_world_creatures.sql delete mode 100644 sql/updates/world/2012_02_18_06_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_18_07_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_18_08_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_19_00_world_quest_template.sql delete mode 100644 sql/updates/world/2012_02_19_01_world_quest_template.sql delete mode 100644 sql/updates/world/2012_02_19_02_world_gameobject.sql create mode 100644 sql/updates/world/2012_02_19_03_world_version.sql delete mode 100644 sql/updates/world/2012_02_19_03_world_warden_checks.sql delete mode 100644 sql/updates/world/2012_02_19_04_world_misc_db_updates.sql delete mode 100644 sql/updates/world/2012_02_19_05_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_19_06_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_20_00_world_sai.sql delete mode 100644 sql/updates/world/2012_02_20_01_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_20_02_world_conditons.sql delete mode 100644 sql/updates/world/2012_02_21_00_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_02_21_01_world_conditions.sql delete mode 100644 sql/updates/world/2012_02_21_02_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_02_21_03_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_02_21_04_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_02_21_05_world_gossip.sql delete mode 100644 sql/updates/world/2012_02_21_06_world_Gossip.sql delete mode 100644 sql/updates/world/2012_02_22_00_world_SAI.sql delete mode 100644 sql/updates/world/2012_02_22_01_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_22_02_world_misc.sql delete mode 100644 sql/updates/world/2012_02_22_03_world_conditions.sql delete mode 100644 sql/updates/world/2012_02_23_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql delete mode 100644 sql/updates/world/2012_02_24_01_world_sai.sql delete mode 100644 sql/updates/world/2012_02_25_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_02_25_01_world_command.sql delete mode 100644 sql/updates/world/2012_02_25_01_world_misc.sql delete mode 100644 sql/updates/world/2012_02_25_02_world_sai.sql delete mode 100644 sql/updates/world/2012_02_26_00_world_misc.sql delete mode 100644 sql/updates/world/2012_02_26_01_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_02_27_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql delete mode 100644 sql/updates/world/2012_02_29_00_world_conditions_misc.sql delete mode 100644 sql/updates/world/2012_02_29_01_world_conditions.sql delete mode 100644 sql/updates/world/2012_02_29_02_world_conditions.sql delete mode 100644 sql/updates/world/2012_02_29_03_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_29_04_world_creature_text.sql delete mode 100644 sql/updates/world/2012_02_29_05_world_creature_text.sql delete mode 100644 sql/updates/world/2012_03_01_00_world_conditions.sql delete mode 100644 sql/updates/world/2012_03_01_01_world_creature_text.sql delete mode 100644 sql/updates/world/2012_03_01_02_world_locales_creature_text.sql delete mode 100644 sql/updates/world/2012_03_03_00_world_command.sql delete mode 100644 sql/updates/world/2012_03_04_00_world_misc.sql delete mode 100644 sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql delete mode 100644 sql/updates/world/2012_03_06_00_world_commands.sql delete mode 100644 sql/updates/world/2012_03_06_01_world_misc.sql delete mode 100644 sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql delete mode 100644 sql/updates/world/2012_03_06_03_world_smart_scripts.sql delete mode 100644 sql/updates/world/2012_03_06_04_world_creature_text.sql delete mode 100644 sql/updates/world/2012_03_07_00_world_trinity_string.sql delete mode 100644 sql/updates/world/2012_03_10_00_world_creature.sql delete mode 100644 sql/updates/world/2012_03_10_00_world_smart_scripts.sql delete mode 100644 sql/updates/world/2012_03_10_00_world_waypoint_data.sql delete mode 100644 sql/updates/world/2012_03_11_00_world_sai.sql delete mode 100644 sql/updates/world/2012_03_12_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_03_12_01_world_conditions.sql delete mode 100644 sql/updates/world/2012_03_12_01_world_gameobject.sql delete mode 100644 sql/updates/world/2012_03_12_01_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_03_14_00_world_creature_addon.sql delete mode 100644 sql/updates/world/2012_03_19_00_world_smart_scripts.sql delete mode 100644 sql/updates/world/2012_03_20_00_world_gossip.sql delete mode 100644 sql/updates/world/2012_03_21_00_world_creature.sql delete mode 100644 sql/updates/world/2012_03_22_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_03_22_01_world_conditions.sql delete mode 100644 sql/updates/world/2012_03_23_00_world_ip2nation.sql delete mode 100644 sql/updates/world/2012_03_24_00_world_misc.sql delete mode 100644 sql/updates/world/2012_03_24_01_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_03_24_02_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_03_25_00_world_game_event.sql delete mode 100644 sql/updates/world/2012_03_26_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_03_26_01_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_03_27_00_world_misc.sql delete mode 100644 sql/updates/world/2012_03_27_01_world_misc.sql delete mode 100644 sql/updates/world/2012_03_27_02_world_misc.sql delete mode 100644 sql/updates/world/2012_03_27_03_world_misc.sql delete mode 100644 sql/updates/world/2012_03_27_04_world_misc.sql delete mode 100644 sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql delete mode 100644 sql/updates/world/2012_03_30_00_world_smart_scripts.sql delete mode 100644 sql/updates/world/2012_03_31_00_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_01_00_world_creature.sql delete mode 100644 sql/updates/world/2012_04_01_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_01_01_world_creature.sql delete mode 100644 sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql delete mode 100644 sql/updates/world/2012_04_01_03_world_trainers.sql delete mode 100644 sql/updates/world/2012_04_01_04_world_conditions.sql delete mode 100644 sql/updates/world/2012_04_01_05_world_creature_template.sql delete mode 100644 sql/updates/world/2012_04_01_06_world_sai.sql delete mode 100644 sql/updates/world/2012_04_01_07_world_misc.sql delete mode 100644 sql/updates/world/2012_04_03_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_04_00_world_conditions.sql delete mode 100644 sql/updates/world/2012_04_04_01_world_spell_dbc.sql delete mode 100644 sql/updates/world/2012_04_05_00_world_gameobject_template.sql delete mode 100644 sql/updates/world/2012_04_05_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_05_01_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_06_00_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_06_01_world_spell_dbc.sql delete mode 100644 sql/updates/world/2012_04_06_02_world_gameobject_template.sql delete mode 100644 sql/updates/world/2012_04_06_03_world_spell_dbc.sql delete mode 100644 sql/updates/world/2012_04_06_04_world_page_text.sql delete mode 100644 sql/updates/world/2012_04_07_00_world_gameobject.sql delete mode 100644 sql/updates/world/2012_04_07_01_world_game_event.sql delete mode 100644 sql/updates/world/2012_04_07_02_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_08_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_08_01_world_creature_template.sql delete mode 100644 sql/updates/world/2012_04_08_02_world_spell_dbc.sql delete mode 100644 sql/updates/world/2012_04_08_02_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_08_03_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_12_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_04_12_01_world_creature_template.sql delete mode 100644 sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql delete mode 100644 sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql delete mode 100644 sql/updates/world/2012_04_12_04_world_creature_template.sql delete mode 100644 sql/updates/world/2012_04_12_05_world_command.sql delete mode 100644 sql/updates/world/2012_04_13_00_world_sai.sql delete mode 100644 sql/updates/world/2012_04_13_01_world_misc.sql delete mode 100644 sql/updates/world/2012_04_13_02_world_misc.sql delete mode 100644 sql/updates/world/2012_04_13_03_world_bg_template.sql delete mode 100644 sql/updates/world/2012_04_13_04_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql delete mode 100644 sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql delete mode 100644 sql/updates/world/2012_04_14_02_world_creature_template_addon.sql delete mode 100644 sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql delete mode 100644 sql/updates/world/2012_04_14_04_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_14_05_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_16_00_world_game_event.sql delete mode 100644 sql/updates/world/2012_04_17_00_world_creature.sql delete mode 100644 sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql delete mode 100644 sql/updates/world/2012_04_18_01_world_creature.sql delete mode 100644 sql/updates/world/2012_04_18_02_world_reference_loot_template.sql delete mode 100644 sql/updates/world/2012_04_18_03_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql delete mode 100644 sql/updates/world/2012_04_18_05_world_conditions.sql delete mode 100644 sql/updates/world/2012_04_18_06_world_creature_template.sql delete mode 100644 sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql delete mode 100644 sql/updates/world/2012_04_18_08_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_19_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql delete mode 100644 sql/updates/world/2012_04_19_02_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_19_03_world_instance_ulduar.sql delete mode 100644 sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql delete mode 100644 sql/updates/world/2012_04_20_01_world_item_loot_template.sql delete mode 100644 sql/updates/world/2012_04_20_02_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_20_03_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_20_04_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_20_05_gameobject_template.sql delete mode 100644 sql/updates/world/2012_04_21_00_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_22_00_world_sai.sql delete mode 100644 sql/updates/world/2012_04_23_00_world_creatures.sql delete mode 100644 sql/updates/world/2012_04_23_01_world_conditions.sql delete mode 100644 sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql delete mode 100644 sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql delete mode 100644 sql/updates/world/2012_04_23_04_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_23_05_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_24_00_world_command.sql delete mode 100644 sql/updates/world/2012_04_24_01_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_24_02_world_warden_checks.sql delete mode 100644 sql/updates/world/2012_04_24_03_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_24_04_world_spell_proc_event.sql delete mode 100644 sql/updates/world/2012_04_24_05_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_04_24_06_world_misc.sql delete mode 100644 sql/updates/world/2012_04_25_00_world_misc.sql delete mode 100644 sql/updates/world/2012_04_25_01_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_25_02_world_spell_script_names.sql delete mode 100644 sql/updates/world/2012_04_25_03_world_spell_group.sql delete mode 100644 sql/updates/world/2012_04_26_00_world_conditions.sql delete mode 100644 sql/updates/world/2012_04_26_01_world_smart_scripts.sql delete mode 100644 sql/updates/world/2012_04_27_00_world_instance_icc.sql delete mode 100644 sql/updates/world/2012_04_28_00_world_reference_loot_template.sql delete mode 100644 sql/updates/world/2012_04_28_01_world_reference_loot_template.sql delete mode 100644 sql/updates/world/2012_05_01_00_world_creature.sql delete mode 100644 sql/updates/world/2012_05_02_00_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_05_03_00_world_creature.sql delete mode 100644 sql/updates/world/2012_05_03_01_world_cos_misc.sql delete mode 100644 sql/updates/world/2012_05_03_02_world_quest_template.sql delete mode 100644 sql/updates/world/2012_05_03_03_world_creature_questrelation.sql delete mode 100644 sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql delete mode 100644 sql/updates/world/2012_05_04_00_world_waypoints.sql delete mode 100644 sql/updates/world/2012_05_04_01_world_sai.sql delete mode 100644 sql/updates/world/2012_05_05_00_world_sai.sql delete mode 100644 sql/updates/world/2012_05_05_01_world_creature_template.sql delete mode 100644 sql/updates/world/2012_05_05_02_world_gameobject.sql delete mode 100644 sql/updates/world/2012_05_05_03_world_sai.sql delete mode 100644 sql/updates/world/2012_05_05_04_world_creature_template.sql delete mode 100644 sql/updates/world/2012_05_05_05_world_creature_template.sql delete mode 100644 sql/updates/world/2012_05_05_06_world_sai.sql delete mode 100644 sql/updates/world/2012_05_06_00_world_creature_template.sql delete mode 100644 sql/updates/world/2012_05_06_01_world_creature_template.sql delete mode 100644 sql/updates/world/2012_05_07_00_world_waypoints.sql delete mode 100644 sql/updates/world/2012_05_07_01_world_sai.sql delete mode 100644 sql/updates/world/2012_05_08_00_world_sai.sql delete mode 100644 sql/updates/world/2012_05_08_01_world_gameobject.sql delete mode 100644 sql/updates/world/2012_05_08_01_world_misc.sql delete mode 100644 sql/updates/world/2012_05_09_00_world_spell_target_position.sql delete mode 100644 sql/updates/world/2012_05_09_01_world_commands.sql delete mode 100644 sql/updates/world/2012_05_09_02_world_sai.sql delete mode 100644 sql/updates/world/2012_05_09_03_world_misc.sql delete mode 100644 sql/updates/world/2012_05_10_00_world_sai.sql delete mode 100644 sql/updates/world/2012_05_10_01_world_misc.sql delete mode 100644 sql/updates/world/2012_05_10_02_world_creature_template.sql delete mode 100644 sql/updates/world/2012_05_10_03_world_misc.sql delete mode 100644 sql/updates/world/2012_05_10_04_world_ceature_sai.sql delete mode 100644 sql/updates/world/2012_05_10_05_world_waypoints.sql delete mode 100644 sql/updates/world/2012_05_10_06_world_waypoints.sql delete mode 100644 sql/updates/world/2012_05_11_00_world_waypoints.sql delete mode 100644 sql/updates/world/2012_05_11_01_world_gameobject_template.sql delete mode 100644 sql/updates/world/2012_05_11_02_world_conditions.sql delete mode 100644 sql/updates/world/2012_05_12_00_world_gameobject_template.sql delete mode 100644 sql/updates/world/2012_05_12_01_world_item_loot_template.sql delete mode 100644 sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql delete mode 100644 sql/updates/world/2012_05_13_00_world_creature_text.sql delete mode 100644 sql/updates/world/2012_05_13_01_world_creature_text.sql delete mode 100644 sql/updates/world/2012_05_16_00_world_scripts.sql delete mode 100644 sql/updates/world/2012_05_17_00_world_creature_text.sql delete mode 100644 sql/updates/world/2012_05_18_00_world_conditions.sql delete mode 100644 sql/updates/world/2012_05_18_01_world_misc.sql delete mode 100644 sql/updates/world/2012_05_18_01_world_spell_target_position.sql delete mode 100644 sql/updates/world/2012_05_19_00_world_quest_template.sql delete mode 100644 sql/updates/world/2012_05_19_01_world_smart_scripts.sql delete mode 100644 sql/updates/world/2012_05_19_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/old/3.3.5a/2012_02_13_00_world_version.sql b/sql/old/3.3.5a/2012_02_13_00_world_version.sql new file mode 100644 index 00000000000..2dd7ab92ddb --- /dev/null +++ b/sql/old/3.3.5a/2012_02_13_00_world_version.sql @@ -0,0 +1 @@ +UPDATE `version` SET `db_version`='TDB 335.11.46' LIMIT 1; diff --git a/sql/old/3.3.5a/2012_02_14_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_02_14_00_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..e7993726132 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_14_00_world_achievement_criteria_data.sql @@ -0,0 +1,7 @@ +-- Criteria conditions for Once Bitten, Twice Shy achievement +DELETE FROM `achievement_criteria_data` WHERE `type`=12 AND `criteria_id` IN (13013, 13012, 13011, 12780); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`scriptname`) VALUES +(13013, 12, 1, 0, ""), -- heroic +(13012, 12, 1, 0, ""), -- heroic +(13011, 12, 0, 0, ""), -- normal +(12780, 12, 0, 0, ""); -- normal diff --git a/sql/old/3.3.5a/2012_02_15_00_world_quest_template.sql b/sql/old/3.3.5a/2012_02_15_00_world_quest_template.sql new file mode 100644 index 00000000000..e26f52fd0fe --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_00_world_quest_template.sql @@ -0,0 +1 @@ +UPDATE `quest_template` SET `OfferRewardText` = 'Good, $C. You have done well in serving the Dark Lady. Your continued perseverance and ambition will be of great use to the Lady''s subjects. Return to me again in the future. Perhaps I will have other tasks for you that will aid the Dark Lady in her attempts at overtaking the Lich King and completely freeing the Scourge.', `RequestItemsText` = 'There are a hundred other tasks awaiting my attention, $C. Do you have the books?' WHERE `Id` = 14356; diff --git a/sql/old/3.3.5a/2012_02_15_01_world_areatrigger_tavern.sql b/sql/old/3.3.5a/2012_02_15_01_world_areatrigger_tavern.sql new file mode 100644 index 00000000000..1c3d45dc490 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_01_world_areatrigger_tavern.sql @@ -0,0 +1,13 @@ +DELETE FROM `areatrigger_tavern` WHERE `id` IN (98, 4109, 4300, 4378, 4380, 4498, 4608, 5314, 5315, 5316, 5317); +INSERT INTO `areatrigger_tavern` (`id`, `name`) VALUES +(98, 'Nesingwary''s Expedition'), +(4109, 'Tranquillen - Upper level Inn'), +(4300, 'Cenarion Refugee - Outside Inn'), +(4378, 'Stonebreaker Hold Inn'), +(4380, 'Falcon Watch Inn'), +(4498, 'Old Hillsbrad Foothills Inn'), +(4608, 'Sanctum Of The Stars - Upper level Inn'), +(5314, 'Wyrmrest Temple'), +(5315, 'Wyrmrest Temple'), +(5316, 'Wyrmrest Temple'), +(5317, 'Wyrmrest Temple'); diff --git a/sql/old/3.3.5a/2012_02_15_02_world_item_template.sql b/sql/old/3.3.5a/2012_02_15_02_world_item_template.sql new file mode 100644 index 00000000000..463d43368cd --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_02_world_item_template.sql @@ -0,0 +1,3 @@ +DELETE FROM `item_template` WHERE `entry`=49867; +INSERT INTO `item_template` (`entry`, `class`, `subclass`, `unk0`, `name`, `displayid`, `Quality`, `Flags`, `FlagsExtra`, `BuyCount`, `BuyPrice`, `SellPrice`, `InventoryType`, `AllowableClass`, `AllowableRace`, `ItemLevel`, `RequiredLevel`, `RequiredSkill`, `RequiredSkillRank`, `requiredspell`, `requiredhonorrank`, `RequiredCityRank`, `RequiredReputationFaction`, `RequiredReputationRank`, `maxcount`, `stackable`, `ContainerSlots`, `StatsCount`, `stat_type1`, `stat_value1`, `stat_type2`, `stat_value2`, `stat_type3`, `stat_value3`, `stat_type4`, `stat_value4`, `stat_type5`, `stat_value5`, `stat_type6`, `stat_value6`, `stat_type7`, `stat_value7`, `stat_type8`, `stat_value8`, `stat_type9`, `stat_value9`, `stat_type10`, `stat_value10`, `ScalingStatDistribution`, `ScalingStatValue`, `dmg_min1`, `dmg_max1`, `dmg_type1`, `dmg_min2`, `dmg_max2`, `dmg_type2`, `armor`, `holy_res`, `fire_res`, `nature_res`, `frost_res`, `shadow_res`, `arcane_res`, `delay`, `ammo_type`, `RangedModRange`, `spellid_1`, `spelltrigger_1`, `spellcharges_1`, `spellppmRate_1`, `spellcooldown_1`, `spellcategory_1`, `spellcategorycooldown_1`, `spellid_2`, `spelltrigger_2`, `spellcharges_2`, `spellppmRate_2`, `spellcooldown_2`, `spellcategory_2`, `spellcategorycooldown_2`, `spellid_3`, `spelltrigger_3`, `spellcharges_3`, `spellppmRate_3`, `spellcooldown_3`, `spellcategory_3`, `spellcategorycooldown_3`, `spellid_4`, `spelltrigger_4`, `spellcharges_4`, `spellppmRate_4`, `spellcooldown_4`, `spellcategory_4`, `spellcategorycooldown_4`, `spellid_5`, `spelltrigger_5`, `spellcharges_5`, `spellppmRate_5`, `spellcooldown_5`, `spellcategory_5`, `spellcategorycooldown_5`, `bonding`, `description`, `PageText`, `LanguageID`, `PageMaterial`, `startquest`, `lockid`, `Material`, `sheath`, `RandomProperty`, `RandomSuffix`, `block`, `itemset`, `MaxDurability`, `area`, `Map`, `BagFamily`, `TotemCategory`, `socketColor_1`, `socketContent_1`, `socketColor_2`, `socketContent_2`, `socketColor_3`, `socketContent_3`, `socketBonus`, `GemProperties`, `RequiredDisenchantSkill`, `ArmorDamageModifier`, `Duration`, `ItemLimitCategory`, `HolidayId`, `ScriptName`, `DisenchantID`, `FoodType`, `minMoneyLoot`, `maxMoneyLoot`, `WDBVerified`) VALUES +(49867, 12, 0, -1, 'Crown Chemical Co. Supplies', 11448, 1, 0, 8192, 1, 0, 0, 0, -1, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 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, 1000, 0, 0, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 4, 'You can hear the clink of glass... dont drop it!', 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 423, 0, 0, 0, 0, 14545); diff --git a/sql/old/3.3.5a/2012_02_15_03_world_quest_template.sql b/sql/old/3.3.5a/2012_02_15_03_world_quest_template.sql new file mode 100644 index 00000000000..833d36b246c --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_03_world_quest_template.sql @@ -0,0 +1,18 @@ +-- Love is in the Air +-- Quests Missing Text ... By Albis + +UPDATE `quest_template` SET `RequestItemsText` ='The cologne isn''t going to give itself out, you know.$B$BGet spraying!' , `OfferRewardText` ='Nice work, $N! People will be buying Crown colognes by the crate-load now that they''ve had a chance to try them.$B$BHere''s a little something for helping us out.' WHERE `Id` = 24635; +UPDATE `quest_template` SET `RequestItemsText` ='That perfume''s not going to spray itself, you know.$B$BGet going!' , `OfferRewardText` ='Great work, $N! People will come running to buy Crown perfumes now that they''ve had a chance to sample their wonders.$B$BHere''s a little something for helping us out.' WHERE `Id` = 24629; +UPDATE `quest_template` SET `RequestItemsText` ='You know, those chocolates aren''t going to fling themselves at people.$B$BYou need to get to work!' , `OfferRewardText` ='Lovely work, $N! People will be tripping over one another to get Crown chocolates now that they''ve had a chance to taste those sweet, romantic treats.$B$BHere''s a little something for helping us out.' WHERE `Id` = 24636; +UPDATE `quest_template` SET `OfferRewardText` ='Hey. You got some time on your hands? I could use someone like you.' WHERE `Id` IN (24804,24805); +UPDATE `quest_template` SET `RequestItemsText` ='You analyze that reek yet, kid?' , `OfferRewardText` ='Hey, thanks, kid. Give it over, let''s take a look.$B$B$B$BOh, that ain''t good.' WHERE `Id` IN (24655,24536); +UPDATE `quest_template` SET `RequestItemsText` ='Did they toss ya a crate to deliver?' , `OfferRewardText` ='You got it, huh? Good job, kid. Top notch. Let''s see what we what we got here.$B$B$B$BThat''s not like my Snivel, but what choice is there?' WHERE `Id` = 24848; +UPDATE `quest_template` SET `OfferRewardText` ='You''re not Snivel. He was supposed to be here an hour ago! What have you done with him?$B$B$B$BThis isn''t like my Snivel. Do you think something''s happened to him?' WHERE `Id` = 24850; +UPDATE `quest_template` SET `RequestItemsText` ='Who are you?' , `OfferRewardText` ='All he talked about was leaving town with all his money? Then he really has abandoned me, hasn''t he?$B$BOh, $N. I was such a fool to fall for him, but how could I help myself? He was so irresistible!' WHERE `Id` = 24849; +UPDATE `quest_template` SET `RequestItemsText` ='Who are you?' , `OfferRewardText` ='All he talked about was leaving town with all his money? Then he really has abandoned me, hasn''t he?$B$BI can''t believe I fell for such a horrible goblin! But he was so irresistible when we first met.' WHERE `Id` = 24851; +UPDATE `quest_template` SET `RequestItemsText` ='Did you find the guy, or did he crawl under a rock?' , `OfferRewardText` ='You got his ledger? Really? That''s great, $N. There''s probably loads of good information in here.' WHERE `Id` IN (24657,24576); +UPDATE `quest_template` SET `OfferRewardText` ='Fantastic. Help is exactly what I need.' WHERE `Id` IN (24792,24793); +UPDATE `quest_template` SET `RequestItemsText` ='I don''t remember ordering a cleaing service... why yes, I am Apothecary Hummel.$B$B...wait, what is the meaning of this? You think these meaningless papers can stop me? Hah!' , `OfferRewardText` ='What we do here is none of your business...' WHERE `Id` = 11488; +UPDATE `quest_template` SET `RequestItemsText` ='Did you take care of those no-good scheming villains?' , `OfferRewardText` ='What''ve you got there?$B$BOh hey, this is big. Real big. Most of the crazy details in one little package. Thanks - you really helped us reel this all in. Good working with ya.' WHERE `Id` IN (24745,14483); +UPDATE `quest_template` SET `RequestItemsText` ='Did you teach ''em a lesson?' , `OfferRewardText` ='Good job, kid. You deserve a little somethin''. And hey, come back tomorrow if you get the time; I might have a job for ya.' WHERE `Id` IN (24658,24665,24666,24664,24663,24659,24660,24662,24647,24638,24651,24652,24650,24649,24645,24648); diff --git a/sql/old/3.3.5a/2012_02_15_04_world_quest_template.sql b/sql/old/3.3.5a/2012_02_15_04_world_quest_template.sql new file mode 100644 index 00000000000..8b6ad1d2cf9 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_04_world_quest_template.sql @@ -0,0 +1,17 @@ +-- Horde +UPDATE `quest_template` SET `PrevQuestId`=24805 WHERE `Id`=24536; -- Uncommon Scents completed before starting Something Stinks +UPDATE `quest_template` SET `PrevQuestId`=24536 WHERE `Id`=24541; -- Something Stinks completed before starting Pilfering Perfume +UPDATE `quest_template` SET `PrevQuestId`=24541 WHERE `Id`=24850; -- Pilfering Perfume completed before starting Snivel's Sweetheart +UPDATE `quest_template` SET `PrevQuestId`=24850 WHERE `Id`=24851; -- Snivel's Sweetheart completed before starting Hot On The Trail +UPDATE `quest_template` SET `PrevQuestId`=24851 WHERE `Id`=24576; -- Hot On The Trail completed before starting A Friendly Chat... + +UPDATE `quest_template` SET `PrevQuestId`=24576 WHERE `Id` IN (24638,24645,24647,24648,24649,24650,24651,24652); -- A Friendly Chat... completed before starting Crushing the Crown + +-- Alliance +UPDATE `quest_template` SET `PrevQuestId`=24804 WHERE `Id`=24655; -- Uncommon Scents completed before starting Something Stinks +UPDATE `quest_template` SET `PrevQuestId`=24655 WHERE `Id`=24656; -- Something Stinks completed before starting Pilfering Perfume +UPDATE `quest_template` SET `PrevQuestId`=24656 WHERE `Id`=24848; -- Pilfering Perfume completed before starting Snivel's Sweetheart +UPDATE `quest_template` SET `PrevQuestId`=24848 WHERE `Id`=24849; -- Snivel's Sweetheart completed before starting Hot On The Trail +UPDATE `quest_template` SET `PrevQuestId`=24849 WHERE `Id`=24657; -- Hot On The Trail completed before starting A Friendly Chat... + +UPDATE `quest_template` SET `PrevQuestId`=24657 WHERE `Id` IN (24658,24659,24660,24662,24663,24664,24665,24666); -- A Friendly Chat... completed before starting Crushing the Crown diff --git a/sql/old/3.3.5a/2012_02_15_06_world_creature_involvedrelation.sql b/sql/old/3.3.5a/2012_02_15_06_world_creature_involvedrelation.sql new file mode 100644 index 00000000000..431e23b53b8 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_06_world_creature_involvedrelation.sql @@ -0,0 +1,3 @@ +DELETE FROM `creature_involvedrelation` WHERE `quest`=24745; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES +(38066, 24745); -- A - Something is in the Air (and it Ain't Love) - Inspector Snip Snagglebolt diff --git a/sql/old/3.3.5a/2012_02_15_07_00_world_creature.sql b/sql/old/3.3.5a/2012_02_15_07_00_world_creature.sql new file mode 100644 index 00000000000..75beec97d67 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_07_00_world_creature.sql @@ -0,0 +1,57 @@ +SET @GUID := 40489; +SET @NPC :=3254; + +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+7; +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 ,@NPC,1,1,1,0,0, 10.3997021, -2316.43555, 92.1945343, 2.91896486,120,0,0,1,0,0,0,0,0), +(@GUID+1,@NPC,1,1,1,0,0,346.736572 , -2606.38916, 91.7916641, 1.58010352,120,0,0,1,0,0,0,0,0), +(@GUID+2,@NPC,1,1,1,0,0, 83.07206 , -2545.2085 , 98.107666 , 1.86412442,120,0,0,1,0,0,0,0,0), +(@GUID+3,@NPC,1,1,1,0,0,-93.53362 , -2287.0835 , 92.35358 , 0.8518014 ,120,0,0,1,0,0,0,0,0), +(@GUID+4,@NPC,1,1,1,0,0,-618.9995,-2738.234,91.91664,4.303216,120,0,0,1,0,0,0,0,0), +(@GUID+5,@NPC,1,1,1,0,0,-491.2982,-2473.443,93.66666,2.670027,120,0,0,1,0,0,0,0,0), +(@GUID+6,@NPC,1,1,1,0,0,-614.9523,-2721.66 ,93.85735,1.412064,120,0,0,1,0,0,0,0,0), +(@GUID+7,@NPC,1,1,1,0,0,-617.4864,-2710.463,96.7657 ,1.582084,120,0,0,1,0,0,0,0,0); + +SET @NPC1=@GUID*10; +SET @NPC2=(@GUID+1)*10; +SET @NPC3=(@GUID+2)*10; +SET @NPC4=(@GUID+3)*10; +SET @NPC5=(@GUID+6)*10; +SET @NPC6=(@GUID+7)*10; + +DELETE FROM `waypoint_data` WHERE `id` IN (@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6); +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +-- 1st +(@NPC1,1,6.336712,-2322.309,92.16663,0,0,0,0,100,0), +-- 2nd +(@NPC2,1,346.4289,-2573.332,91.79166,0,0,0,0,100,0), +-- 3rd +(@NPC3,1,81.53384,-2540.826,97.38716,0,0,0,0,100,0), +(@NPC3,2,80.28384,-2537.076,96.63716,0,0,0,0,100,0), +(@NPC3,3,79.03384,-2533.326,95.38716,0,0,0,0,100,0), +(@NPC3,4,78.28384,-2530.326,94.63716,0,0,0,0,100,0), +(@NPC3,5,77.03384,-2526.576,93.63716,0,0,0,0,100,0), +(@NPC3,6,76.49564,-2523.443,93.66665,0,0,0,0,100,0), +-- 4th +(@NPC4,1,-88.46167,-2281.137,92.69763,0,0,0,0,100,0), +(@NPC4,2,-92.46167,-2285.637,91.94763,0,0,0,0,100,0), +-- 5th +(@NPC5,1,-614.9318,-2720.435,94.01199,0,0,0,0,100,0), +-- 6th +(@NPC6,1,-617.2921,-2722.99,93.41664,0,0,0,0,100,0), +(@NPC6,2,-617.3077,-2721.99,93.41664,0,0,0,0,100,0), +(@NPC6,3,-617.3398,-2719.99,94.16664,0,0,0,0,100,0), +(@NPC6,4,-617.3867,-2716.99,95.04164,0,0,0,0,100,0), +(@NPC6,5,-617.4336,-2713.99,95.91664,0,0,0,0,100,0), +(@NPC6,6,-617.4805,-2710.99,96.66664,0,0,0,0,100,0), +(@NPC6,7,-617.503,-2708.995,97.04164,0,0,0,0,100,0), +(@NPC6,8,-617.503,-2708.995,97.04164,0,0,0,0,100,0); + +DELETE FROM `creature_addon` WHERE `guid` IN (@GUID,@GUID+1,@GUID+2,@GUID+3,@GUID+6,@GUID+7); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@GUID ,@NPC1,0,0,0,0,''), +(@GUID+1,@NPC2,0,0,0,0,''), +(@GUID+2,@NPC3,0,0,0,0,''), +(@GUID+3,@NPC4,0,0,0,0,''), +(@GUID+6,@NPC5,0,0,0,0,''), +(@GUID+7,@NPC6,0,0,0,0,''); diff --git a/sql/old/3.3.5a/2012_02_15_07_01_world_waypoint_data.sql b/sql/old/3.3.5a/2012_02_15_07_01_world_waypoint_data.sql new file mode 100644 index 00000000000..e47572b2074 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_07_01_world_waypoint_data.sql @@ -0,0 +1,147 @@ +SET @NPC := 26841; +SET @GUID := 40497; -- need 9 + +SET @SPAWN0 := (@GUID )*10; +SET @SPAWN1 := (@GUID+1)*10; +SET @SPAWN2 := (@GUID+2)*10; +SET @SPAWN3 := (@GUID+3)*10; +SET @SPAWN4 := (@GUID+4)*10; +SET @SPAWN5 := (@GUID+5)*10; +SET @SPAWN6 := (@GUID+6)*10; +SET @SPAWN7 := (@GUID+7)*10; +SET @SPAWN8 := (@GUID+8)*10; + +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+8; +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 ,@NPC,571,1,1,0,0,4690.292,859.291,154.1271,2.914072,120,0,0,1,0,0,0,0,0), +(@GUID+1,@NPC,571,1,1,0,0,4362.418,750.5102,123.7846,6.194367,120,0,0,1,0,0,0,0,0), +(@GUID+2,@NPC,571,1,1,0,0,4191.03,645.8215,109.6868,0.4027403,120,0,0,1,0,0,0,0,0), +(@GUID+3,@NPC,571,1,1,0,0,4098.345,657.0866,99.36436,5.185792,120,0,0,1,0,0,0,0,0), +(@GUID+4,@NPC,571,1,1,0,0,4065.753,709.2308,108.47,1.153499,120,0,0,1,0,0,0,0,0), +(@GUID+5,@NPC,571,1,1,0,0,4012.895,495.4877,82.1595,0.8684024,120,0,0,1,0,0,0,0,0), +(@GUID+6,@NPC,571,1,1,0,0,3941.605,552.9745,144.0994,0.06546114,120,0,0,1,0,0,0,0,0), +(@GUID+7,@NPC,571,1,1,0,0,3995.586,447.6094,88.55691,1.320955,120,0,0,1,0,0,0,0,0), +(@GUID+8,@NPC,571,1,1,0,0,3869.004,707.384,134.3378,4.695541,120,0,0,1,0,0,0,0,0); + +DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+8; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@GUID ,@SPAWN0,0,0,0,0,''), +(@GUID+1,@SPAWN1,0,0,0,0,''), +(@GUID+2,@SPAWN2,0,0,0,0,''), +(@GUID+3,@SPAWN3,0,0,0,0,''), +(@GUID+4,@SPAWN4,0,0,0,0,''), +(@GUID+5,@SPAWN5,0,0,0,0,''), +(@GUID+6,@SPAWN6,0,0,0,0,''), +(@GUID+7,@SPAWN7,0,0,0,0,''), +(@GUID+8,@SPAWN8,0,0,0,0,''); + +DELETE FROM `waypoint_data` WHERE `id` IN (@SPAWN0,@SPAWN1,@SPAWN2,@SPAWN3,@SPAWN4,@SPAWN5,@SPAWN6,@SPAWN7,@SPAWN8); +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +-- 1st +(@SPAWN0,0,4716.777,833.6211,169.0006,0,0,0,0,100,0), +(@SPAWN0,1,4643.756,855.9798,132.5562,0,0,0,0,100,0), +(@SPAWN0,2,4550.864,812.4362,133.6673,0,0,0,0,100,0), +(@SPAWN0,3,4532.678,762.772,130.1951,0,0,0,0,100,0), +(@SPAWN0,4,4566.182,662.6984,132.7506,0,0,0,0,100,0), +(@SPAWN0,5,4592.511,595.6938,130.1674,0,0,0,0,100,0), +(@SPAWN0,6,4732.632,631.5569,164.584,0,0,0,0,100,0), +(@SPAWN0,7,4716.777,833.6211,169.0006,0,0,0,0,100,0), +(@SPAWN0,8,4643.756,855.9798,132.5562,0,0,0,0,100,0), +(@SPAWN0,9,4550.864,812.4362,133.6673,0,0,0,0,100,0), +-- 2nd +(@SPAWN1,0,4431.805,596.8371,157.1775,0,0,0,0,100,0), +(@SPAWN1,1,4128.16,507.4055,198.8118,0,0,0,0,100,0), +(@SPAWN1,2,4102.405,567.1112,198.8118,0,0,0,0,100,0), +(@SPAWN1,3,4112.486,636.6321,86.95068,0,0,0,0,100,0), +(@SPAWN1,4,4141.771,704.1605,67.97847,0,0,0,0,100,0), +(@SPAWN1,5,4191.388,726.6014,98.11736,0,0,0,0,100,0), +(@SPAWN1,6,4247.502,724.9836,182.4229,0,0,0,0,100,0), +(@SPAWN1,7,4295.807,746.8245,210.1174,0,0,0,0,100,0), +(@SPAWN1,8,4387.15,744.5955,93.08962,0,0,0,0,100,0), +(@SPAWN1,9,4428.509,680.8868,91.33962,0,0,0,0,100,0), +(@SPAWN1,10,4431.805,596.8371,157.1775,0,0,0,0,100,0), +(@SPAWN1,11,4128.16,507.4055,198.8118,0,0,0,0,100,0), +(@SPAWN1,12,4102.405,567.1112,198.8118,0,0,0,0,100,0), +-- 3rd +(@SPAWN2,0,4170.111,627.0887,100.283,0,0,0,0,100,0), +(@SPAWN2,1,4265.816,644.1154,136.2274,0,0,0,0,100,0), +(@SPAWN2,2,4272.799,551.5093,50.92185,0,0,0,0,100,0), +(@SPAWN2,3,4378.531,451.3199,54.28299,0,0,0,0,100,0), +(@SPAWN2,4,4277.019,345.219,121.2274,0,0,0,0,100,0), +(@SPAWN2,5,4185.893,458.5754,118.5608,0,0,0,0,100,0), +(@SPAWN2,6,4170.111,627.0887,100.283,0,0,0,0,100,0), +(@SPAWN2,7,4265.816,644.1154,136.2274,0,0,0,0,100,0), +(@SPAWN2,8,4272.799,551.5093,50.92185,0,0,0,0,100,0), +-- 4th +(@SPAWN3,0,4464.15,712.9612,99.36437,0,0,0,0,100,0), +(@SPAWN3,1,4466.412,769.1019,99.36437,0,0,0,0,100,0), +(@SPAWN3,2,4427.949,785.3342,99.36437,0,0,0,0,100,0), +(@SPAWN3,3,4382.415,794.0613,99.36437,0,0,0,0,100,0), +(@SPAWN3,4,4312.128,808.5213,99.36437,0,0,0,0,100,0), +(@SPAWN3,5,4206.404,817.2534,99.36437,0,0,0,0,100,0), +(@SPAWN3,6,4089.363,771.5425,99.36437,0,0,0,0,100,0), +(@SPAWN3,7,4114.452,637.4808,99.36437,0,0,0,0,100,0), +(@SPAWN3,8,4265.095,661.3358,99.36437,0,0,0,0,100,0), +(@SPAWN3,9,4366.876,678.4272,99.36437,0,0,0,0,100,0), +(@SPAWN3,10,4433.122,674.1555,99.36437,0,0,0,0,100,0), +(@SPAWN3,11,4464.15,712.9612,99.36437,0,0,0,0,100,0), +(@SPAWN3,12,4466.412,769.1019,99.36437,0,0,0,0,100,0), +(@SPAWN3,13,4427.949,785.3342,99.36437,0,0,0,0,100,0), +-- 5th +(@SPAWN4,0,4331.604,778.9,114.7446,0,0,0,0,100,0), +(@SPAWN4,1,4270.823,698.3784,130.4668,0,0,0,0,100,0), +(@SPAWN4,2,4232.598,681.8058,126.7724,0,0,0,0,100,0), +(@SPAWN4,3,4156.661,638.471,129.439,0,0,0,0,100,0), +(@SPAWN4,4,4062.89,681.9251,102.9113,0,0,0,0,100,0), +(@SPAWN4,5,4096.761,758.9566,123.5501,0,0,0,0,100,0), +(@SPAWN4,6,4134.598,799.989,109.8835,0,0,0,0,100,0), +(@SPAWN4,7,4189.475,840.5444,114.6335,0,0,0,0,100,0), +(@SPAWN4,8,4274.875,812.3191,101.3001,0,0,0,0,100,0), +(@SPAWN4,9,4331.604,778.9,114.7446,0,0,0,0,100,0), +(@SPAWN4,10,4270.823,698.3784,130.4668,0,0,0,0,100,0), +(@SPAWN4,11,4232.598,681.8058,126.7724,0,0,0,0,100,0), +-- 6th +(@SPAWN5,0,3769.598,454.0081,82.1595,0,0,0,0,100,0), +(@SPAWN5,1,3879.825,441.5815,82.1595,0,0,0,0,100,0), +(@SPAWN5,2,3926.388,447.295,82.1595,0,0,0,0,100,0), +(@SPAWN5,3,4017.082,501.3171,82.1595,0,0,0,0,100,0), +(@SPAWN5,4,4015.132,597.8423,82.1595,0,0,0,0,100,0), +(@SPAWN5,5,3923.788,576.8113,82.1595,0,0,0,0,100,0), +(@SPAWN5,6,3865.991,561.2335,82.1595,0,0,0,0,100,0), +(@SPAWN5,7,3795.942,538.189,82.1595,0,0,0,0,100,0), +(@SPAWN5,8,3769.598,454.0081,82.1595,0,0,0,0,100,0), +(@SPAWN5,9,3879.825,441.5815,82.1595,0,0,0,0,100,0), +(@SPAWN5,10,3926.388,447.295,82.1595,0,0,0,0,100,0), +-- 7th +(@SPAWN6,0,3886.876,810.7806,134.3378,0,0,0,0,100,0), +(@SPAWN6,1,3868.72,688.4549,134.3378,0,0,0,0,100,0), +(@SPAWN6,2,3883.254,607.1956,134.3378,0,0,0,0,100,0), +(@SPAWN6,3,3904.998,559.2425,134.3378,0,0,0,0,100,0), +(@SPAWN6,4,3969.396,561.8792,148.5877,0,0,0,0,100,0), +(@SPAWN6,5,4010.678,638.0726,130.6155,0,0,0,0,100,0), +(@SPAWN6,6,3976.813,756.3585,134.3378,0,0,0,0,100,0), +(@SPAWN6,7,3886.876,810.7806,134.3378,0,0,0,0,100,0), +(@SPAWN6,8,3868.72,688.4549,134.3378,0,0,0,0,100,0), +(@SPAWN6,9,3883.254,607.1956,134.3378,0,0,0,0,100,0), +-- 8th +(@SPAWN7,0,4187.318,438.9777,88.55692,0,0,0,0,100,0), +(@SPAWN7,1,4151.397,351.4095,88.55692,0,0,0,0,100,0), +(@SPAWN7,2,4106.679,347.3126,88.55692,0,0,0,0,100,0), +(@SPAWN7,3,4056.414,373.3088,88.55692,0,0,0,0,100,0), +(@SPAWN7,4,3994.193,440.1974,88.55692,0,0,0,0,100,0), +(@SPAWN7,5,4076.892,564.8895,88.55692,0,0,0,0,100,0), +(@SPAWN7,6,4178.652,558.3406,88.55692,0,0,0,0,100,0), +(@SPAWN7,7,4187.318,438.9777,88.55692,0,0,0,0,100,0), +(@SPAWN7,8,4151.397,351.4095,88.55692,0,0,0,0,100,0), +(@SPAWN7,9,4106.679,347.3126,88.55692,0,0,0,0,100,0), +-- 9th +(@SPAWN8,0,3886.876,810.7806,134.3378,0,0,0,0,100,0), +(@SPAWN8,1,3868.72,688.4549,134.3378,0,0,0,0,100,0), +(@SPAWN8,2,3883.254,607.1956,134.3378,0,0,0,0,100,0), +(@SPAWN8,3,3904.998,559.2425,134.3378,0,0,0,0,100,0), +(@SPAWN8,4,3969.396,561.8792,148.5877,0,0,0,0,100,0), +(@SPAWN8,5,4010.678,638.0726,130.6155,0,0,0,0,100,0), +(@SPAWN8,6,3976.813,756.3585,134.3378,0,0,0,0,100,0), +(@SPAWN8,7,3886.876,810.7806,134.3378,0,0,0,0,100,0), +(@SPAWN8,8,3868.72,688.4549,134.3378,0,0,0,0,100,0), +(@SPAWN8,9,3883.254,607.1956,134.3378,0,0,0,0,100,0); diff --git a/sql/old/3.3.5a/2012_02_15_07_02_world_misc.sql b/sql/old/3.3.5a/2012_02_15_07_02_world_misc.sql new file mode 100644 index 00000000000..e7ffe54e922 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_07_02_world_misc.sql @@ -0,0 +1,120 @@ +-- Love is in the Air +SET @OGUID := 24399; +SET @CGUID := 40506; +SET @OLDGUID := 40489; -- wrong guids +SET @EVENT := 8; + +-- Quest chain +DELETE FROM `creature_questrelation` WHERE `quest` IN (24804,24657,24656,24848,24849); +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES +(38293, 24804), -- A - Uncommon Scents - Junior Inspector +(38325, 24657), -- A - Friendly Chat... - Marion Sutton +(38066, 24656), -- A - Pilfering Perfume - Inspector Snip Snagglebolt +(38066, 24848), -- A - Fireworks At The Gilded Rose - Inspector Snip Snagglebolt +(38325, 24849); -- A - Hot On The Trail - Marion Sutton + +DELETE FROM `creature_involvedrelation` WHERE `quest` IN (24804,24657,24656,24848,24849); +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES +(38066, 24804), -- A - Uncommon Scents - Inspector Snip Snagglebolt +(38066, 24657), -- A - Friendly Chat... - Inspector Snip Snagglebolt +(38066, 24656), -- A - Pilfering Perfume - Inspector Snip Snagglebolt +(38325, 24848), -- A - Fireworks At The Gilded Rose - Marion Sutton +(38325, 24849); -- A - Hot On The Trail - Marion Sutton + +-- Loot: Crown Chemical Co. Supplies +DELETE FROM `gameobject_loot_template` WHERE `entry`=27766; +INSERT INTO `gameobject_loot_template` VALUES +(27766, 49867, -100, 1, 0, 1, 1); -- Crown Chemical Co. Supplies + +-- GO spawns +DELETE FROM `gameobject` WHERE `id` IN (181086,201752,201778) AND `guid` BETWEEN @OGUID+0 AND @OGUID+42; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +-- Valentine Arch +(@OGUID+0, 181086, 1, 1, 1, 9869.12, 2493.13, 1315.88, 6.16653, 0, 0, 0.0582931, -0.9983, 300, 0, 1), +(@OGUID+1, 181086, 530, 1, 1, -4004.66, -11844.5, 0.19541, 4.93701, 0, 0, 0.623403, -0.7819, 300, 0, 1), +(@OGUID+2, 181086, 0, 1, 1, -4918.78, -983.208, 501.455, 2.30465, 0, 0, 0.913711, 0.406364, 300, 0, 1), +(@OGUID+3, 181086, 0, 1, 1, -8869.51, 636.686, 95.7873, 0.794388, 0, 0, 0.386832, 0.92215, 300, 0, 1), +(@OGUID+4, 181086, 1, 1, 1, 1653.44, -4437.37, 18.1863, 1.72627, 0, 0, 0.759883, 0.65006, 300, 0, 1), +(@OGUID+5, 181086, 1, 1, 1, -1224.34, 68.3642, 129.71, 3.17285, 0, 0, 0.999878, -0.015627, 300, 0, 1), +(@OGUID+6, 181086, 530, 1, 1, 9612.28, -7184.77, 14.285, 1.82938, 0, 0, 0.792374, 0.610036, 300, 0, 1), +(@OGUID+7, 181086, 0, 1, 1, 1629.62, 240.116, 63.8516, 0.155664, 0, 0, 0.0777534, 0.996973, 300, 0, 1), +-- Large Crate +(@OGUID+8, 201752, 0, 1, 1, -9029.77, 353.325, 92.923, 0.8808, 0, 0, 0.426301, 0.904581, 300, 0, 1), +(@OGUID+9, 201752, 0, 1, 1, -9029.87, 351.542, 92.9248, 0.489671, 0, 0, 0.242397, 0.970177, 300, 0, 1), +(@OGUID+10, 201752, 0, 1, 1, -9028.41, 352.69, 92.9163, 0.721364, 0, 0, 0.352912, 0.935656, 300, 0, 1), +(@OGUID+11, 201752, 0, 1, 1, -9027.7, 351.062, 92.9193, 0.689162, 0, 0, 0.337803, 0.941217, 300, 0, 1), +(@OGUID+12, 201752, 0, 1, 1, -9029.08, 349.917, 92.932, 0.657746, 0, 0, 0.322977, 0.946407, 300, 0, 1), +(@OGUID+13, 201752, 0, 1, 1, -9028.77, 352.62, 94.1596, 6.02202, 0, 0, 0.130214, -0.991486, 300, 0, 1), +(@OGUID+14, 201752, 0, 1, 1, -9028.84, 350.443, 94.1755, 0.771628, 0, 0, 0.376314, 0.926492, 300, 0, 1), +(@OGUID+15, 201752, 0, 1, 1, -9026.5, 348.864, 93.0359, 2.17356, 0, 0, 0.885134, 0.465337, 300, 0, 1), +(@OGUID+16, 201752, 0, 1, 1, -9028.21, 348.744, 93.024, 0.889436, 0, 0, 0.430203, 0.902732, 300, 0, 1), +(@OGUID+17, 201752, 1, 1, 1, 1381.97, -4431.17, 30.6588, 5.49617, 0, 0, 0.383432, -0.923569, 300, 0, 1), +(@OGUID+18, 201752, 1, 1, 1, 1380.98, -4432.28, 30.6586, 5.55507, 0, 0, 0.356069, -0.93446, 300, 0, 1), +(@OGUID+19, 201752, 1, 1, 1, 1379.73, -4433.4, 30.6569, 5.69644, 0, 0, 0.28918, -0.957275, 300, 0, 1), +(@OGUID+20, 201752, 1, 1, 1, 1377.96, -4432.16, 30.6489, 5.58649, 0, 0, 0.341345, -0.939938, 300, 0, 1), +(@OGUID+21, 201752, 1, 1, 1, 1379.23, -4431.41, 30.6768, 5.559, 0, 0, 0.354231, -0.935158, 300, 0, 1), +(@OGUID+22, 201752, 1, 1, 1, 1379.85, -4432.91, 31.8999, 5.66896, 0, 0, 0.302309, -0.95321, 300, 0, 1), +(@OGUID+23, 201752, 1, 1, 1, 1380.81, -4431.58, 31.902, 5.64147, 0, 0, 0.315381, -0.948965, 300, 0, 1), +(@OGUID+24, 201752, 1, 1, 1, 1377.67, -4434.36, 30.6055, 5.36265, 0, 0, 0.444186, -0.895935, 300, 0, 1), +-- Crown Chemical Co. Supplies +(@OGUID+25, 201778, 0, 1, 1, -9031.18, 354.399, 92.9752, 6.12019, 0, 0, 0.0814081, -0.996681, 300, 0, 1), +(@OGUID+26, 201778, 0, 1, 1, -9028.76, 352.525, 95.4034, 0.503804, 0, 0, 0.249246, 0.96844, 300, 0, 1), +(@OGUID+27, 201778, 0, 1, 1, -9030.19, 351.409, 94.1683, 0.134668, 0, 0, 0.067283, 0.997734, 300, 0, 1), +(@OGUID+28, 201778, 0, 1, 1, -9031.52, 349.739, 92.9068, 0.338872, 0, 0, 0.168626, 0.98568, 300, 0, 1), +(@OGUID+29, 201778, 0, 1, 1, -9030.55, 347.899, 92.9635, 0.751206, 0, 0, 0.366833, 0.930287, 300, 0, 1), +(@OGUID+30, 201778, 0, 1, 1, -9027.59, 348.911, 94.2683, 1.784, 0, 0, 0.77833, 0.627855, 300, 0, 1), +(@OGUID+31, 201778, 0, 1, 1, -9028.87, 349.971, 95.4191, 1.82327, 0, 0, 0.790507, 0.612452, 300, 0, 1), +(@OGUID+32, 201778, 0, 1, 1, -9031.75, 354.82, 92.9939, 6.0605, 0, 0, 0.111113, -0.993808, 300, 0, 1), +(@OGUID+33, 201778, 0, 1, 1, -9032.22, 352.779, 92.9627, 6.0605, 0, 0, 0.111113, -0.993808, 300, 0, 1), +(@OGUID+34, 201778, 1, 1, 1, 1375.84, -4432.46, 30.5735, 5.69645, 0, 0, 0.289178, -0.957275, 300, 0, 1), +(@OGUID+35, 201778, 1, 1, 1, 1377.99, -4431.81, 31.8923, 5.5001, 0, 0, 0.381614, -0.924322, 300, 0, 1), +(@OGUID+36, 201778, 1, 1, 1, 1379.21, -4430.58, 31.9198, 4.81681, 0, 0, 0.669241, -0.743045, 300, 0, 1), +(@OGUID+37, 201778, 1, 1, 1, 1379.35, -4432.78, 33.143, 5.61791, 0, 0, 0.326536, -0.945185, 300, 0, 1), +(@OGUID+38, 201778, 1, 1, 1, 1380.87, -4431.5, 33.1452, 4.66994, 0, 0, 0.721955, -0.69194, 300, 0, 1), +(@OGUID+39, 201778, 1, 1, 1, 1380.96, -4429.36, 30.6772, 4.6503, 0, 0, 0.728713, -0.68482, 300, 0, 1), +(@OGUID+40, 201778, 1, 1, 1, 1383.08, -4429.42, 30.651, 4.53642, 0, 0, 0.766505, -0.642238, 300, 0, 1), +(@OGUID+41, 201778, 1, 1, 1, 1378.64, -4428.42, 30.6846, 5.23543, 0, 0, 0.500243, -0.865885, 300, 0, 1), +(@OGUID+42, 201778, 1, 1, 1, 1377.05, -4429.39, 30.6467, 5.31397, 0, 0, 0.465863, -0.884857, 300, 0, 1); + +DELETE FROM `game_event_gameobject` WHERE `eventEntry`=@EVENT AND `guid` BETWEEN @OGUID AND @OGUID+42; +INSERT INTO `game_event_gameobject` (`guid`, `eventEntry`) VALUES +(@OGUID, @EVENT),(@OGUID+1, @EVENT),(@OGUID+2, @EVENT), +(@OGUID+3, @EVENT),(@OGUID+4, @EVENT),(@OGUID+5, @EVENT), +(@OGUID+6, @EVENT),(@OGUID+7, @EVENT),(@OGUID+8, @EVENT), +(@OGUID+9, @EVENT),(@OGUID+10, @EVENT),(@OGUID+11, @EVENT), +(@OGUID+12, @EVENT),(@OGUID+13, @EVENT),(@OGUID+14, @EVENT), +(@OGUID+15, @EVENT),(@OGUID+16, @EVENT),(@OGUID+17, @EVENT), +(@OGUID+18, @EVENT),(@OGUID+19, @EVENT),(@OGUID+20, @EVENT), +(@OGUID+21, @EVENT),(@OGUID+22, @EVENT),(@OGUID+23, @EVENT), +(@OGUID+24, @EVENT),(@OGUID+25, @EVENT),(@OGUID+26, @EVENT), +(@OGUID+27, @EVENT),(@OGUID+28, @EVENT),(@OGUID+29, @EVENT), +(@OGUID+30, @EVENT),(@OGUID+31, @EVENT),(@OGUID+32, @EVENT), +(@OGUID+33, @EVENT),(@OGUID+34, @EVENT),(@OGUID+35, @EVENT), +(@OGUID+36, @EVENT),(@OGUID+37, @EVENT),(@OGUID+38, @EVENT), +(@OGUID+39, @EVENT),(@OGUID+40, @EVENT),(@OGUID+41, @EVENT), +(@OGUID+42, @EVENT); + +-- [Q]: Pilfering Perfume +-- Note: this is EndText (misleading field name), NOT ObjectiveText1 +UPDATE `quest_template` SET `EndText` = 'Steal perfume package from Crown Chemical Co. outside Stormind' WHERE `Id` = 24656; -- Alliance +UPDATE `quest_template` SET `EndText` = 'Steal perfume package from Crown Chemical Co. outside Orgrimmar' WHERE `Id` = 24541; -- Horde + +-- Creature templates and spawns +UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=75 WHERE `entry`=37671; -- Crown Supply Guard +UPDATE `creature_template` SET `npcflag`=`npcflag`|1, `gossip_menu_id`=10991 WHERE `entry`=38293; -- Junior Inspector (gossip menu not confirmed) + +DELETE FROM `creature` WHERE `id` IN (38293,38065,37671) AND `guid` BETWEEN @CGUID+0 AND @CGUID+3; +DELETE FROM `creature` WHERE `id` IN (38293,38065,37671) AND `guid` BETWEEN @OLDGUID+0 AND @OLDGUID+3; +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 +(@CGUID+0, 38293, 530, 1, 1, 0, 0, -4022.81, -11842.7, 0.0062171, 5.89912, 300, 0, 0, 955, 0, 0, 0, 0, 0), -- Junior Inspector +(@CGUID+1, 38065, 1, 1, 1, 0, 0, 1380.22, -4426.79, 30.6681, 2.03572, 300, 0, 0, 12600, 0, 0, 0, 0, 0), -- Crown Supply Sentry +(@CGUID+2, 37671, 0, 1, 1, 30912, 0, -9033.01, 356.408, 93.1543, 2.09345, 300, 0, 0, 42, 0, 0, 0, 0, 0), -- Crown Supply Guard +(@CGUID+3, 37671, 0, 1, 1, 30912, 0, -9028.63, 344.994, 93.2389, 3.37679, 300, 0, 0, 42, 0, 0, 0, 0, 0); -- Crown Supply Guard + +DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+3 AND `eventEntry`=@EVENT; +DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @OLDGUID+0 AND @OLDGUID+3 AND `eventEntry`=@EVENT; +INSERT INTO `game_event_creature` (`guid`, `eventEntry`) VALUES +(@CGUID+0, @EVENT), +(@CGUID+1, @EVENT), +(@CGUID+2, @EVENT), +(@CGUID+3, @EVENT); diff --git a/sql/old/3.3.5a/2012_02_15_08_world_sai.sql b/sql/old/3.3.5a/2012_02_15_08_world_sai.sql new file mode 100644 index 00000000000..ef49ff484f3 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_08_world_sai.sql @@ -0,0 +1,9 @@ +SET @Pinata := 34632; + +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Pinata 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 +(@Pinata, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 11, 65788, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Ogre Pinata - On death cast Pile of Candy'), +(@Pinata, 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, 'Ogre Pinata - On reset set react state passive'); + +-- same faction of the GO that is spawned by spell 65788 (not sniffed) +UPDATE `creature_template` SET `faction_A`=7,`faction_H`=7,`exp`=0,`AIName`='SmartAI' WHERE `entry`=@Pinata; diff --git a/sql/old/3.3.5a/2012_02_15_09_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_02_15_09_world_spell_proc_event.sql new file mode 100644 index 00000000000..4811e5d66fe --- /dev/null +++ b/sql/old/3.3.5a/2012_02_15_09_world_spell_proc_event.sql @@ -0,0 +1,6 @@ +-- Corrected proc of Misery +DELETE FROM `spell_proc_event` WHERE `entry` IN (33191, 33192, 33193); +INSERT INTO `spell_proc_event` VALUES +(33191, 0x00, 0x06, 0x00008000, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0), +(33192, 0x00, 0x06, 0x00008000, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0), +(33193, 0x00, 0x06, 0x00008000, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0); diff --git a/sql/old/3.3.5a/2012_02_16_00_world_conditions.sql b/sql/old/3.3.5a/2012_02_16_00_world_conditions.sql new file mode 100644 index 00000000000..5bef38fc485 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_16_00_world_conditions.sql @@ -0,0 +1,12800 @@ +CREATE TABLE `temp_convert_spells` +( + `id` INT(11), + PRIMARY KEY (`id`) +); + +-- spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534 +-- those spells are the ones which require explicit unit target to cast +INSERT INTO `temp_convert_spells` VALUES +(5), +(11), +(12), +(14), +(15), +(17), +(25), +(49), +(50), +(53), +(56), +(58), +(59), +(60), +(61), +(67), +(68), +(72), +(75), +(78), +(89), +(91), +(96), +(100), +(101), +(113), +(116), +(118), +(131), +(132), +(133), +(134), +(139), +(142), +(143), +(145), +(172), +(184), +(205), +(228), +(246), +(260), +(271), +(284), +(285), +(339), +(348), +(355), +(370), +(403), +(408), +(421), +(453), +(457), +(467), +(475), +(512), +(514), +(526), +(527), +(528), +(529), +(530), +(546), +(548), +(550), +(552), +(585), +(589), +(591), +(592), +(594), +(596), +(598), +(600), +(603), +(605), +(606), +(633), +(635), +(639), +(647), +(676), +(686), +(689), +(692), +(694), +(695), +(699), +(700), +(701), +(702), +(703), +(705), +(707), +(709), +(710), +(720), +(731), +(744), +(745), +(746), +(770), +(772), +(774), +(782), +(785), +(812), +(835), +(837), +(845), +(851), +(853), +(879), +(915), +(921), +(930), +(932), +(943), +(970), +(974), +(976), +(980), +(984), +(988), +(992), +(996), +(1004), +(1010), +(1014), +(1026), +(1035), +(1042), +(1044), +(1058), +(1062), +(1075), +(1079), +(1082), +(1088), +(1090), +(1094), +(1098), +(1106), +(1108), +(1120), +(1121), +(1126), +(1130), +(1139), +(1152), +(1159), +(1194), +(1196), +(1210), +(1214), +(1225), +(1228), +(1234), +(1241), +(1243), +(1244), +(1245), +(1249), +(1250), +(1251), +(1266), +(1267), +(1329), +(1330), +(1350), +(1364), +(1373), +(1413), +(1430), +(1446), +(1459), +(1460), +(1461), +(1462), +(1464), +(1467), +(1472), +(1473), +(1474), +(1475), +(1481), +(1485), +(1490), +(1495), +(1513), +(1515), +(1516), +(1536), +(1579), +(1588), +(1604), +(1608), +(1609), +(1650), +(1664), +(1665), +(1666), +(1669), +(1671), +(1672), +(1714), +(1715), +(1752), +(1753), +(1754), +(1755), +(1756), +(1757), +(1758), +(1759), +(1760), +(1766), +(1767), +(1768), +(1769), +(1770), +(1776), +(1777), +(1795), +(1796), +(1797), +(1798), +(1800), +(1809), +(1810), +(1811), +(1822), +(1823), +(1824), +(1831), +(1833), +(1852), +(1906), +(1908), +(1943), +(1950), +(1966), +(1978), +(1991), +(2000), +(2020), +(2021), +(2050), +(2052), +(2053), +(2054), +(2055), +(2060), +(2061), +(2070), +(2090), +(2091), +(2094), +(2096), +(2098), +(2110), +(2118), +(2119), +(2124), +(2125), +(2136), +(2137), +(2138), +(2139), +(2141), +(2142), +(2143), +(2147), +(2148), +(2154), +(2155), +(2275), +(2280), +(2313), +(2372), +(2373), +(2400), +(2425), +(2442), +(2443), +(2444), +(2446), +(2552), +(2589), +(2590), +(2591), +(2601), +(2602), +(2606), +(2607), +(2608), +(2609), +(2610), +(2626), +(2629), +(2630), +(2633), +(2634), +(2636), +(2637), +(2643), +(2647), +(2649), +(2650), +(2653), +(2691), +(2764), +(2767), +(2782), +(2791), +(2800), +(2816), +(2817), +(2818), +(2819), +(2834), +(2850), +(2855), +(2860), +(2871), +(2880), +(2893), +(2908), +(2912), +(2941), +(2944), +(2948), +(2949), +(2969), +(2972), +(2973), +(2974), +(2995), +(3007), +(3009), +(3010), +(3011), +(3018), +(3029), +(3034), +(3043), +(3044), +(3105), +(3108), +(3110), +(3120), +(3121), +(3130), +(3131), +(3132), +(3137), +(3140), +(3145), +(3147), +(3148), +(3150), +(3205), +(3206), +(3207), +(3229), +(3233), +(3234), +(3237), +(3242), +(3243), +(3246), +(3247), +(3252), +(3261), +(3263), +(3267), +(3268), +(3279), +(3280), +(3286), +(3332), +(3355), +(3356), +(3358), +(3360), +(3387), +(3388), +(3393), +(3396), +(3405), +(3409), +(3427), +(3429), +(3436), +(3442), +(3446), +(3465), +(3466), +(3472), +(3510), +(3514), +(3539), +(3542), +(3551), +(3553), +(3571), +(3578), +(3583), +(3584), +(3586), +(3602), +(3603), +(3604), +(3606), +(3607), +(3609), +(3627), +(3635), +(3636), +(3650), +(3674), +(3715), +(3716), +(3747), +(3812), +(3911), +(3912), +(3913), +(3921), +(4011), +(4039), +(4040), +(4041), +(4058), +(4060), +(4089), +(4090), +(4091), +(4101), +(4102), +(4130), +(4131), +(4132), +(4150), +(4159), +(4164), +(4165), +(4166), +(4167), +(4168), +(4169), +(4209), +(4221), +(4240), +(4243), +(4244), +(4262), +(4280), +(4281), +(4282), +(4285), +(4286), +(4294), +(4316), +(4362), +(4423), +(4500), +(4504), +(4505), +(4506), +(4538), +(4630), +(4659), +(4805), +(4877), +(4940), +(4961), +(4962), +(4974), +(4979), +(4980), +(4984), +(4987), +(4996), +(4997), +(4998), +(4999), +(5000), +(5003), +(5019), +(5025), +(5103), +(5105), +(5116), +(5133), +(5137), +(5138), +(5143), +(5144), +(5145), +(5164), +(5165), +(5171), +(5176), +(5177), +(5178), +(5179), +(5180), +(5185), +(5186), +(5187), +(5188), +(5189), +(5195), +(5196), +(5201), +(5208), +(5211), +(5213), +(5221), +(5232), +(5234), +(5246), +(5255), +(5259), +(5260), +(5263), +(5271), +(5276), +(5306), +(5308), +(5320), +(5321), +(5322), +(5323), +(5324), +(5325), +(5337), +(5374), +(5375), +(5376), +(5401), +(5413), +(5416), +(5422), +(5424), +(5433), +(5480), +(5503), +(5507), +(5508), +(5509), +(5513), +(5514), +(5547), +(5565), +(5566), +(5567), +(5570), +(5588), +(5589), +(5595), +(5597), +(5598), +(5614), +(5615), +(5648), +(5649), +(5676), +(5679), +(5696), +(5697), +(5703), +(5726), +(5727), +(5739), +(5760), +(5781), +(5782), +(5862), +(5884), +(5917), +(5918), +(5938), +(5940), +(5951), +(5967), +(6000), +(6016), +(6027), +(6028), +(6041), +(6060), +(6061), +(6063), +(6064), +(6065), +(6066), +(6074), +(6075), +(6076), +(6077), +(6078), +(6121), +(6128), +(6130), +(6132), +(6136), +(6142), +(6144), +(6146), +(6178), +(6199), +(6203), +(6205), +(6213), +(6215), +(6217), +(6222), +(6223), +(6245), +(6252), +(6253), +(6254), +(6255), +(6257), +(6273), +(6277), +(6278), +(6304), +(6327), +(6346), +(6348), +(6349), +(6350), +(6351), +(6352), +(6353), +(6357), +(6358), +(6359), +(6360), +(6362), +(6409), +(6435), +(6460), +(6465), +(6466), +(6483), +(6484), +(6509), +(6530), +(6531), +(6533), +(6546), +(6547), +(6548), +(6552), +(6554), +(6555), +(6572), +(6574), +(6576), +(6580), +(6581), +(6595), +(6607), +(6647), +(6655), +(6660), +(6664), +(6685), +(6713), +(6716), +(6719), +(6726), +(6728), +(6730), +(6742), +(6743), +(6744), +(6745), +(6746), +(6747), +(6748), +(6751), +(6753), +(6754), +(6756), +(6760), +(6761), +(6762), +(6766), +(6767), +(6768), +(6770), +(6774), +(6778), +(6780), +(6785), +(6787), +(6788), +(6789), +(6795), +(6798), +(6800), +(6807), +(6808), +(6809), +(6814), +(6866), +(6870), +(6873), +(6894), +(6907), +(6909), +(6917), +(6922), +(6927), +(6942), +(6946), +(6949), +(6950), +(6951), +(6957), +(6958), +(6960), +(6963), +(6965), +(6979), +(6980), +(6984), +(7001), +(7033), +(7054), +(7057), +(7068), +(7079), +(7081), +(7084), +(7092), +(7093), +(7098), +(7099), +(7101), +(7102), +(7105), +(7120), +(7122), +(7124), +(7125), +(7127), +(7140), +(7145), +(7154), +(7159), +(7160), +(7162), +(7211), +(7266), +(7288), +(7289), +(7290), +(7295), +(7321), +(7322), +(7329), +(7357), +(7365), +(7367), +(7369), +(7372), +(7373), +(7379), +(7384), +(7386), +(7399), +(7400), +(7402), +(7405), +(7414), +(7415), +(7416), +(7439), +(7482), +(7485), +(7588), +(7621), +(7638), +(7641), +(7645), +(7646), +(7648), +(7651), +(7655), +(7656), +(7712), +(7714), +(7715), +(7716), +(7717), +(7718), +(7719), +(7736), +(7761), +(7763), +(7764), +(7799), +(7800), +(7801), +(7802), +(7806), +(7807), +(7808), +(7809), +(7810), +(7811), +(7813), +(7814), +(7815), +(7816), +(7821), +(7829), +(7853), +(7874), +(7875), +(7876), +(7877), +(7878), +(7879), +(7880), +(7881), +(7882), +(7883), +(7884), +(7885), +(7887), +(7891), +(7896), +(7901), +(7914), +(7922), +(7925), +(7926), +(7927), +(7932), +(7933), +(7938), +(7947), +(7951), +(7967), +(7992), +(7994), +(7997), +(8004), +(8008), +(8010), +(8012), +(8014), +(8016), +(8026), +(8028), +(8029), +(8034), +(8037), +(8040), +(8042), +(8044), +(8045), +(8046), +(8050), +(8052), +(8053), +(8056), +(8058), +(8068), +(8070), +(8091), +(8092), +(8094), +(8095), +(8096), +(8097), +(8098), +(8099), +(8100), +(8101), +(8102), +(8103), +(8104), +(8105), +(8106), +(8112), +(8113), +(8114), +(8115), +(8116), +(8117), +(8118), +(8119), +(8120), +(8121), +(8129), +(8137), +(8138), +(8139), +(8140), +(8151), +(8208), +(8211), +(8221), +(8222), +(8242), +(8246), +(8255), +(8256), +(8257), +(8272), +(8275), +(8277), +(8282), +(8288), +(8289), +(8292), +(8295), +(8312), +(8313), +(8314), +(8318), +(8319), +(8344), +(8345), +(8346), +(8347), +(8352), +(8353), +(8355), +(8362), +(8363), +(8365), +(8379), +(8380), +(8382), +(8383), +(8384), +(8385), +(8391), +(8400), +(8401), +(8402), +(8406), +(8407), +(8408), +(8412), +(8413), +(8414), +(8415), +(8416), +(8417), +(8425), +(8426), +(8428), +(8440), +(8441), +(8442), +(8444), +(8445), +(8446), +(8447), +(8448), +(8449), +(8452), +(8453), +(8456), +(8459), +(8460), +(8463), +(8464), +(8493), +(8496), +(8497), +(8552), +(8554), +(8555), +(8595), +(8598), +(8600), +(8613), +(8615), +(8616), +(8617), +(8618), +(8619), +(8620), +(8621), +(8623), +(8624), +(8627), +(8629), +(8631), +(8632), +(8633), +(8637), +(8639), +(8640), +(8643), +(8645), +(8646), +(8647), +(8649), +(8650), +(8654), +(8673), +(8676), +(8680), +(8682), +(8685), +(8689), +(8699), +(8716), +(8721), +(8724), +(8725), +(8733), +(8735), +(8788), +(8806), +(8818), +(8820), +(8903), +(8905), +(8907), +(8910), +(8914), +(8921), +(8924), +(8925), +(8926), +(8927), +(8928), +(8929), +(8936), +(8938), +(8939), +(8940), +(8941), +(8946), +(8947), +(8949), +(8950), +(8951), +(8955), +(8972), +(8983), +(8992), +(8994), +(8998), +(9000), +(9005), +(9007), +(9034), +(9053), +(9057), +(9080), +(9159), +(9176), +(9234), +(9268), +(9275), +(9347), +(9373), +(9454), +(9455), +(9456), +(9459), +(9462), +(9472), +(9473), +(9474), +(9481), +(9482), +(9483), +(9484), +(9485), +(9487), +(9488), +(9492), +(9493), +(9532), +(9552), +(9574), +(9591), +(9612), +(9613), +(9614), +(9654), +(9658), +(9672), +(9734), +(9735), +(9739), +(9745), +(9750), +(9752), +(9756), +(9758), +(9771), +(9775), +(9786), +(9789), +(9790), +(9791), +(9796), +(9806), +(9823), +(9824), +(9826), +(9827), +(9829), +(9830), +(9833), +(9834), +(9835), +(9839), +(9840), +(9841), +(9849), +(9850), +(9852), +(9853), +(9856), +(9857), +(9858), +(9866), +(9867), +(9875), +(9876), +(9880), +(9881), +(9884), +(9885), +(9888), +(9889), +(9892), +(9894), +(9896), +(9901), +(9904), +(9910), +(9912), +(9949), +(9977), +(9991), +(9999), +(10055), +(10056), +(10060), +(10073), +(10101), +(10136), +(10141), +(10142), +(10143), +(10146), +(10147), +(10148), +(10149), +(10150), +(10151), +(10156), +(10157), +(10158), +(10162), +(10163), +(10164), +(10171), +(10172), +(10175), +(10176), +(10178), +(10179), +(10180), +(10181), +(10188), +(10189), +(10190), +(10194), +(10195), +(10196), +(10197), +(10198), +(10199), +(10200), +(10203), +(10204), +(10205), +(10206), +(10207), +(10208), +(10209), +(10210), +(10211), +(10212), +(10217), +(10218), +(10221), +(10222), +(10224), +(10226), +(10227), +(10231), +(10239), +(10244), +(10245), +(10246), +(10277), +(10308), +(10310), +(10312), +(10313), +(10314), +(10321), +(10326), +(10328), +(10329), +(10346), +(10370), +(10371), +(10373), +(10391), +(10392), +(10412), +(10413), +(10414), +(10435), +(10436), +(10444), +(10445), +(10447), +(10448), +(10452), +(10458), +(10466), +(10467), +(10468), +(10472), +(10473), +(10577), +(10578), +(10605), +(10617), +(10651), +(10653), +(10657), +(10659), +(10661), +(10663), +(10689), +(10730), +(10767), +(10768), +(10769), +(10771), +(10833), +(10838), +(10839), +(10843), +(10847), +(10851), +(10855), +(10863), +(10872), +(10892), +(10893), +(10894), +(10898), +(10899), +(10900), +(10901), +(10908), +(10909), +(10915), +(10916), +(10917), +(10921), +(10927), +(10928), +(10929), +(10933), +(10934), +(10937), +(10938), +(10945), +(10946), +(10947), +(10955), +(10957), +(10958), +(10960), +(10961), +(10963), +(10964), +(10965), +(10966), +(11014), +(11016), +(11020), +(11021), +(11027), +(11084), +(11085), +(11131), +(11132), +(11196), +(11197), +(11198), +(11203), +(11204), +(11205), +(11267), +(11268), +(11269), +(11273), +(11274), +(11275), +(11279), +(11280), +(11281), +(11285), +(11286), +(11289), +(11290), +(11293), +(11294), +(11297), +(11299), +(11300), +(11303), +(11335), +(11336), +(11337), +(11353), +(11354), +(11362), +(11366), +(11374), +(11391), +(11397), +(11409), +(11428), +(11430), +(11431), +(11436), +(11442), +(11443), +(11444), +(11446), +(11469), +(11470), +(11471), +(11512), +(11519), +(11520), +(11522), +(11525), +(11528), +(11538), +(11539), +(11545), +(11564), +(11565), +(11566), +(11567), +(11572), +(11573), +(11574), +(11578), +(11584), +(11585), +(11595), +(11596), +(11597), +(11600), +(11601), +(11604), +(11605), +(11608), +(11609), +(11610), +(11612), +(11639), +(11640), +(11641), +(11642), +(11650), +(11658), +(11659), +(11660), +(11661), +(11665), +(11667), +(11668), +(11671), +(11672), +(11675), +(11699), +(11700), +(11707), +(11708), +(11711), +(11712), +(11713), +(11719), +(11721), +(11722), +(11725), +(11726), +(11762), +(11763), +(11772), +(11773), +(11774), +(11775), +(11776), +(11777), +(11778), +(11779), +(11780), +(11781), +(11782), +(11783), +(11784), +(11785), +(11786), +(11787), +(11791), +(11820), +(11821), +(11824), +(11825), +(11835), +(11836), +(11839), +(11877), +(11879), +(11885), +(11886), +(11887), +(11888), +(11889), +(11918), +(11920), +(11921), +(11922), +(11960), +(11962), +(11963), +(11971), +(11972), +(11974), +(11976), +(11977), +(11978), +(11980), +(11981), +(11985), +(11986), +(11994), +(11998), +(12021), +(12023), +(12024), +(12039), +(12054), +(12057), +(12058), +(12096), +(12097), +(12098), +(12118), +(12127), +(12128), +(12130), +(12131), +(12160), +(12161), +(12162), +(12166), +(12167), +(12170), +(12174), +(12175), +(12176), +(12177), +(12178), +(12179), +(12181), +(12242), +(12245), +(12246), +(12248), +(12251), +(12279), +(12280), +(12289), +(12294), +(12355), +(12461), +(12466), +(12471), +(12479), +(12480), +(12484), +(12485), +(12486), +(12491), +(12492), +(12493), +(12494), +(12505), +(12509), +(12510), +(12521), +(12522), +(12523), +(12524), +(12525), +(12526), +(12531), +(12538), +(12540), +(12541), +(12542), +(12545), +(12548), +(12551), +(12553), +(12555), +(12578), +(12579), +(12654), +(12657), +(12668), +(12675), +(12693), +(12699), +(12705), +(12721), +(12723), +(12738), +(12739), +(12742), +(12747), +(12798), +(12809), +(12821), +(12824), +(12825), +(12826), +(12850), +(12868), +(12885), +(12888), +(12890), +(12998), +(13003), +(13005), +(13006), +(13009), +(13013), +(13022), +(13029), +(13044), +(13099), +(13119), +(13120), +(13138), +(13140), +(13142), +(13180), +(13181), +(13218), +(13222), +(13223), +(13224), +(13278), +(13279), +(13281), +(13298), +(13318), +(13319), +(13321), +(13322), +(13323), +(13325), +(13326), +(13327), +(13338), +(13339), +(13340), +(13341), +(13342), +(13374), +(13375), +(13398), +(13424), +(13438), +(13439), +(13440), +(13441), +(13442), +(13443), +(13444), +(13445), +(13446), +(13459), +(13480), +(13482), +(13486), +(13490), +(13491), +(13496), +(13518), +(13519), +(13524), +(13526), +(13527), +(13528), +(13530), +(13534), +(13549), +(13550), +(13551), +(13552), +(13553), +(13554), +(13555), +(13566), +(13567), +(13579), +(13583), +(13584), +(13585), +(13608), +(13619), +(13692), +(13728), +(13729), +(13737), +(13738), +(13748), +(13752), +(13797), +(13860), +(13864), +(13878), +(13880), +(13884), +(13897), +(13901), +(13902), +(13907), +(13921), +(13952), +(13953), +(13977), +(14030), +(14032), +(14033), +(14034), +(14053), +(14087), +(14099), +(14102), +(14103), +(14105), +(14106), +(14109), +(14110), +(14112), +(14118), +(14119), +(14120), +(14122), +(14126), +(14129), +(14130), +(14134), +(14145), +(14156), +(14157), +(14160), +(14178), +(14180), +(14183), +(14189), +(14200), +(14247), +(14251), +(14253), +(14260), +(14261), +(14262), +(14263), +(14264), +(14265), +(14266), +(14269), +(14270), +(14271), +(14278), +(14281), +(14282), +(14283), +(14284), +(14285), +(14286), +(14287), +(14288), +(14289), +(14290), +(14298), +(14299), +(14300), +(14301), +(14308), +(14309), +(14323), +(14324), +(14325), +(14326), +(14327), +(14331), +(14443), +(14515), +(14516), +(14517), +(14518), +(14537), +(14752), +(14792), +(14795), +(14818), +(14819), +(14867), +(14868), +(14873), +(14874), +(14875), +(14890), +(14892), +(14893), +(14894), +(14895), +(14897), +(14902), +(14903), +(14914), +(14916), +(14917), +(14918), +(14919), +(14920), +(14921), +(15037), +(15039), +(15040), +(15042), +(15043), +(15057), +(15065), +(15089), +(15090), +(15095), +(15096), +(15117), +(15120), +(15122), +(15123), +(15124), +(15128), +(15187), +(15207), +(15208), +(15211), +(15228), +(15229), +(15230), +(15232), +(15234), +(15235), +(15236), +(15238), +(15241), +(15242), +(15247), +(15248), +(15249), +(15250), +(15254), +(15257), +(15261), +(15262), +(15263), +(15264), +(15265), +(15266), +(15267), +(15277), +(15279), +(15280), +(15283), +(15284), +(15288), +(15305), +(15306), +(15331), +(15332), +(15342), +(15343), +(15344), +(15346), +(15357), +(15359), +(15362), +(15363), +(15366), +(15398), +(15407), +(15451), +(15471), +(15472), +(15487), +(15493), +(15495), +(15496), +(15497), +(15498), +(15499), +(15500), +(15501), +(15505), +(15530), +(15534), +(15535), +(15536), +(15537), +(15539), +(15547), +(15549), +(15570), +(15572), +(15574), +(15575), +(15580), +(15581), +(15582), +(15583), +(15586), +(15587), +(15592), +(15598), +(15605), +(15607), +(15608), +(15610), +(15611), +(15612), +(15614), +(15615), +(15616), +(15617), +(15618), +(15619), +(15620), +(15621), +(15643), +(15651), +(15652), +(15653), +(15654), +(15655), +(15656), +(15657), +(15659), +(15661), +(15662), +(15664), +(15665), +(15667), +(15691), +(15692), +(15695), +(15698), +(15699), +(15702), +(15708), +(15712), +(15713), +(15729), +(15730), +(15732), +(15734), +(15735), +(15736), +(15749), +(15752), +(15753), +(15784), +(15785), +(15790), +(15791), +(15793), +(15795), +(15797), +(15798), +(15801), +(15802), +(15848), +(15850), +(15859), +(15860), +(15876), +(15878), +(15968), +(15969), +(15970), +(15976), +(15980), +(15981), +(15982), +(16000), +(16001), +(16006), +(16007), +(16029), +(16031), +(16033), +(16034), +(16044), +(16045), +(16050), +(16053), +(16067), +(16071), +(16075), +(16095), +(16100), +(16101), +(16128), +(16143), +(16144), +(16145), +(16168), +(16170), +(16172), +(16176), +(16177), +(16186), +(16231), +(16235), +(16236), +(16237), +(16240), +(16243), +(16247), +(16249), +(16333), +(16336), +(16343), +(16344), +(16351), +(16352), +(16353), +(16366), +(16373), +(16375), +(16391), +(16392), +(16393), +(16400), +(16401), +(16402), +(16403), +(16405), +(16406), +(16407), +(16408), +(16409), +(16410), +(16411), +(16412), +(16413), +(16414), +(16415), +(16427), +(16429), +(16430), +(16431), +(16433), +(16448), +(16449), +(16451), +(16454), +(16455), +(16456), +(16458), +(16460), +(16461), +(16472), +(16495), +(16496), +(16498), +(16508), +(16509), +(16511), +(16527), +(16528), +(16530), +(16536), +(16549), +(16552), +(16553), +(16554), +(16555), +(16561), +(16564), +(16565), +(16568), +(16569), +(16570), +(16573), +(16583), +(16587), +(16588), +(16603), +(16608), +(16610), +(16612), +(16614), +(16618), +(16627), +(16628), +(16636), +(16697), +(16707), +(16708), +(16709), +(16711), +(16712), +(16713), +(16714), +(16716), +(16722), +(16782), +(16783), +(16784), +(16788), +(16790), +(16793), +(16798), +(16799), +(16804), +(16805), +(16827), +(16828), +(16829), +(16830), +(16831), +(16832), +(16844), +(16856), +(16857), +(16868), +(16869), +(16871), +(16898), +(16908), +(16921), +(16922), +(16927), +(16928), +(16953), +(16979), +(16997), +(17008), +(17009), +(17011), +(17012), +(17013), +(17105), +(17134), +(17137), +(17138), +(17139), +(17140), +(17141), +(17142), +(17143), +(17144), +(17146), +(17147), +(17148), +(17149), +(17150), +(17151), +(17153), +(17156), +(17157), +(17158), +(17159), +(17160), +(17165), +(17168), +(17170), +(17171), +(17172), +(17173), +(17174), +(17175), +(17183), +(17194), +(17195), +(17198), +(17201), +(17213), +(17227), +(17230), +(17233), +(17234), +(17238), +(17243), +(17244), +(17246), +(17253), +(17255), +(17256), +(17257), +(17258), +(17259), +(17260), +(17261), +(17273), +(17274), +(17276), +(17281), +(17284), +(17287), +(17289), +(17290), +(17292), +(17293), +(17307), +(17308), +(17311), +(17312), +(17313), +(17314), +(17315), +(17330), +(17331), +(17333), +(17334), +(17347), +(17348), +(17353), +(17364), +(17368), +(17393), +(17405), +(17407), +(17434), +(17435), +(17439), +(17445), +(17451), +(17452), +(17470), +(17483), +(17484), +(17492), +(17494), +(17496), +(17500), +(17503), +(17504), +(17505), +(17506), +(17509), +(17510), +(17511), +(17529), +(17547), +(17607), +(17608), +(17609), +(17610), +(17611), +(17613), +(17615), +(17620), +(17630), +(17633), +(17639), +(17648), +(17649), +(17672), +(17682), +(17692), +(17734), +(17736), +(17738), +(17744), +(17745), +(17749), +(17753), +(17754), +(17755), +(17776), +(17777), +(17794), +(17797), +(17798), +(17799), +(17800), +(17843), +(17855), +(17856), +(17857), +(17859), +(17860), +(17863), +(17877), +(17883), +(17919), +(17920), +(17921), +(17922), +(17923), +(17924), +(17925), +(17926), +(17939), +(17943), +(17944), +(17946), +(17948), +(17950), +(17961), +(17962), +(17963), +(18070), +(18072), +(18075), +(18077), +(18078), +(18081), +(18082), +(18083), +(18084), +(18085), +(18086), +(18088), +(18089), +(18090), +(18091), +(18092), +(18101), +(18103), +(18104), +(18105), +(18106), +(18107), +(18108), +(18111), +(18112), +(18118), +(18138), +(18145), +(18149), +(18151), +(18152), +(18153), +(18159), +(18164), +(18165), +(18172), +(18173), +(18187), +(18197), +(18199), +(18200), +(18202), +(18203), +(18204), +(18205), +(18206), +(18208), +(18209), +(18210), +(18211), +(18214), +(18217), +(18223), +(18266), +(18267), +(18270), +(18276), +(18278), +(18289), +(18347), +(18362), +(18367), +(18368), +(18375), +(18381), +(18387), +(18389), +(18390), +(18395), +(18396), +(18398), +(18425), +(18469), +(18476), +(18498), +(18502), +(18503), +(18543), +(18545), +(18557), +(18561), +(18562), +(18608), +(18610), +(18631), +(18632), +(18633), +(18647), +(18649), +(18651), +(18652), +(18654), +(18656), +(18657), +(18658), +(18663), +(18670), +(18702), +(18761), +(18763), +(18796), +(18798), +(18802), +(18805), +(18807), +(18809), +(18812), +(18813), +(18817), +(18819), +(18833), +(18867), +(18868), +(18869), +(18870), +(18871), +(18945), +(18952), +(18958), +(18968), +(18972), +(18980), +(18988), +(18996), +(19027), +(19128), +(19130), +(19131), +(19132), +(19133), +(19134), +(19136), +(19179), +(19196), +(19213), +(19244), +(19260), +(19276), +(19277), +(19278), +(19279), +(19280), +(19306), +(19319), +(19362), +(19386), +(19391), +(19393), +(19395), +(19397), +(19411), +(19434), +(19437), +(19439), +(19444), +(19445), +(19446), +(19447), +(19448), +(19450), +(19452), +(19460), +(19463), +(19469), +(19471), +(19472), +(19476), +(19481), +(19486), +(19501), +(19503), +(19505), +(19512), +(19548), +(19595), +(19597), +(19632), +(19633), +(19637), +(19639), +(19642), +(19643), +(19644), +(19647), +(19648), +(19650), +(19652), +(19653), +(19654), +(19658), +(19661), +(19662), +(19663), +(19664), +(19674), +(19675), +(19676), +(19677), +(19678), +(19679), +(19680), +(19681), +(19682), +(19683), +(19684), +(19685), +(19686), +(19687), +(19688), +(19689), +(19692), +(19693), +(19694), +(19696), +(19697), +(19699), +(19700), +(19701), +(19725), +(19727), +(19728), +(19729), +(19730), +(19731), +(19734), +(19736), +(19737), +(19738), +(19739), +(19740), +(19742), +(19750), +(19755), +(19767), +(19770), +(19771), +(19775), +(19776), +(19777), +(19779), +(19785), +(19797), +(19801), +(19816), +(19820), +(19834), +(19835), +(19836), +(19837), +(19838), +(19850), +(19852), +(19853), +(19854), +(19869), +(19872), +(19874), +(19881), +(19901), +(19931), +(19938), +(19939), +(19940), +(19941), +(19942), +(19943), +(19970), +(19971), +(19972), +(19973), +(19974), +(19975), +(19983), +(20000), +(20004), +(20005), +(20006), +(20019), +(20066), +(20170), +(20184), +(20185), +(20186), +(20187), +(20211), +(20217), +(20220), +(20221), +(20223), +(20228), +(20233), +(20236), +(20240), +(20243), +(20252), +(20253), +(20271), +(20276), +(20279), +(20294), +(20295), +(20297), +(20298), +(20367), +(20368), +(20369), +(20370), +(20371), +(20372), +(20373), +(20374), +(20410), +(20420), +(20424), +(20425), +(20463), +(20467), +(20473), +(20474), +(20475), +(20477), +(20508), +(20511), +(20534), +(20535), +(20536), +(20537), +(20539), +(20541), +(20543), +(20547), +(20559), +(20560), +(20564), +(20565), +(20569), +(20586), +(20604), +(20605), +(20614), +(20615), +(20616), +(20617), +(20618), +(20623), +(20625), +(20627), +(20629), +(20630), +(20647), +(20655), +(20656), +(20657), +(20658), +(20660), +(20661), +(20662), +(20663), +(20664), +(20665), +(20666), +(20668), +(20677), +(20678), +(20679), +(20682), +(20684), +(20685), +(20688), +(20690), +(20691), +(20692), +(20695), +(20696), +(20698), +(20700), +(20714), +(20720), +(20726), +(20733), +(20735), +(20736), +(20740), +(20751), +(20787), +(20788), +(20790), +(20791), +(20792), +(20793), +(20795), +(20797), +(20800), +(20801), +(20802), +(20804), +(20805), +(20806), +(20807), +(20808), +(20811), +(20812), +(20815), +(20816), +(20819), +(20820), +(20821), +(20822), +(20823), +(20824), +(20825), +(20826), +(20829), +(20830), +(20831), +(20832), +(20869), +(20882), +(20883), +(20893), +(20900), +(20901), +(20902), +(20903), +(20904), +(20909), +(20910), +(20911), +(20929), +(20930), +(20989), +(21008), +(21027), +(21030), +(21047), +(21049), +(21050), +(21055), +(21056), +(21059), +(21060), +(21062), +(21063), +(21064), +(21066), +(21067), +(21068), +(21072), +(21074), +(21077), +(21081), +(21100), +(21128), +(21140), +(21141), +(21150), +(21151), +(21159), +(21162), +(21163), +(21164), +(21170), +(21179), +(21183), +(21187), +(21330), +(21332), +(21335), +(21337), +(21343), +(21356), +(21357), +(21368), +(21369), +(21372), +(21388), +(21390), +(21398), +(21401), +(21402), +(21463), +(21464), +(21465), +(21541), +(21542), +(21543), +(21546), +(21549), +(21551), +(21552), +(21553), +(21647), +(21654), +(21667), +(21668), +(21669), +(21670), +(21731), +(21732), +(21734), +(21735), +(21737), +(21745), +(21787), +(21794), +(21807), +(21829), +(21832), +(21834), +(21835), +(21840), +(21847), +(21866), +(21889), +(21892), +(21898), +(21912), +(21939), +(21949), +(21952), +(21953), +(21960), +(21961), +(21971), +(21979), +(21987), +(21990), +(21992), +(22009), +(22012), +(22048), +(22068), +(22088), +(22108), +(22109), +(22110), +(22111), +(22112), +(22113), +(22114), +(22115), +(22116), +(22117), +(22118), +(22119), +(22120), +(22121), +(22127), +(22128), +(22167), +(22168), +(22187), +(22189), +(22207), +(22227), +(22272), +(22273), +(22274), +(22284), +(22289), +(22290), +(22291), +(22312), +(22335), +(22336), +(22355), +(22357), +(22371), +(22373), +(22411), +(22412), +(22414), +(22415), +(22416), +(22418), +(22423), +(22426), +(22427), +(22428), +(22429), +(22433), +(22438), +(22482), +(22565), +(22568), +(22570), +(22572), +(22574), +(22575), +(22582), +(22591), +(22592), +(22639), +(22641), +(22646), +(22651), +(22661), +(22662), +(22666), +(22667), +(22677), +(22678), +(22682), +(22687), +(22689), +(22690), +(22691), +(22692), +(22695), +(22709), +(22713), +(22715), +(22742), +(22744), +(22745), +(22751), +(22752), +(22784), +(22785), +(22799), +(22800), +(22814), +(22816), +(22817), +(22818), +(22820), +(22822), +(22823), +(22827), +(22828), +(22829), +(22856), +(22858), +(22859), +(22864), +(22883), +(22885), +(22886), +(22887), +(22893), +(22901), +(22907), +(22909), +(22911), +(22916), +(22919), +(22920), +(22935), +(22947), +(22950), +(22951), +(22959), +(22968), +(22993), +(22994), +(22995), +(22997), +(23015), +(23038), +(23059), +(23064), +(23065), +(23073), +(23102), +(23104), +(23106), +(23114), +(23115), +(23122), +(23123), +(23124), +(23125), +(23135), +(23139), +(23153), +(23154), +(23155), +(23169), +(23170), +(23174), +(23205), +(23206), +(23224), +(23256), +(23262), +(23267), +(23268), +(23275), +(23278), +(23298), +(23301), +(23304), +(23333), +(23335), +(23337), +(23340), +(23359), +(23379), +(23380), +(23381), +(23391), +(23392), +(23402), +(23416), +(23417), +(23451), +(23452), +(23454), +(23460), +(23490), +(23491), +(23493), +(23504), +(23505), +(23546), +(23552), +(23567), +(23568), +(23569), +(23577), +(23580), +(23590), +(23592), +(23601), +(23604), +(23605), +(23620), +(23621), +(23622), +(23623), +(23625), +(23626), +(23627), +(23658), +(23661), +(23675), +(23687), +(23693), +(23694), +(23695), +(23696), +(23699), +(23702), +(23735), +(23736), +(23737), +(23738), +(23765), +(23766), +(23767), +(23768), +(23769), +(23774), +(23775), +(23786), +(23848), +(23850), +(23853), +(23859), +(23860), +(23862), +(23865), +(23881), +(23892), +(23893), +(23894), +(23895), +(23921), +(23922), +(23923), +(23924), +(23925), +(23947), +(23948), +(23952), +(23953), +(23958), +(23959), +(23960), +(23961), +(23962), +(23963), +(23964), +(23967), +(23970), +(23978), +(23979), +(24002), +(24003), +(24016), +(24017), +(24020), +(24023), +(24042), +(24049), +(24053), +(24061), +(24064), +(24097), +(24109), +(24111), +(24131), +(24132), +(24133), +(24134), +(24135), +(24178), +(24179), +(24185), +(24187), +(24193), +(24199), +(24201), +(24208), +(24210), +(24212), +(24213), +(24238), +(24239), +(24241), +(24248), +(24251), +(24253), +(24254), +(24257), +(24259), +(24261), +(24267), +(24274), +(24275), +(24300), +(24306), +(24314), +(24315), +(24316), +(24317), +(24327), +(24331), +(24332), +(24333), +(24335), +(24336), +(24337), +(24339), +(24341), +(24374), +(24378), +(24379), +(24388), +(24393), +(24394), +(24407), +(24408), +(24412), +(24413), +(24414), +(24423), +(24435), +(24458), +(24466), +(24530), +(24573), +(24577), +(24578), +(24579), +(24583), +(24585), +(24586), +(24587), +(24596), +(24600), +(24601), +(24611), +(24617), +(24618), +(24619), +(24637), +(24640), +(24648), +(24649), +(24668), +(24671), +(24672), +(24674), +(24680), +(24684), +(24685), +(24686), +(24690), +(24705), +(24708), +(24709), +(24710), +(24711), +(24712), +(24713), +(24714), +(24715), +(24723), +(24725), +(24726), +(24727), +(24730), +(24732), +(24735), +(24736), +(24740), +(24742), +(24745), +(24747), +(24750), +(24751), +(24752), +(24753), +(24755), +(24757), +(24759), +(24761), +(24762), +(24766), +(24767), +(24769), +(24771), +(24773), +(24776), +(24785), +(24787), +(24791), +(24792), +(24793), +(24802), +(24803), +(24816), +(24817), +(24819), +(24824), +(24825), +(24826), +(24829), +(24831), +(24832), +(24844), +(24857), +(24872), +(24873), +(24875), +(24923), +(24928), +(24935), +(24937), +(24942), +(24950), +(24951), +(24952), +(24953), +(24954), +(24955), +(24957), +(24960), +(24961), +(24962), +(24963), +(24964), +(24965), +(24966), +(24974), +(24975), +(24976), +(24977), +(24982), +(24993), +(25006), +(25008), +(25009), +(25010), +(25011), +(25012), +(25021), +(25022), +(25025), +(25028), +(25050), +(25051), +(25052), +(25054), +(25055), +(25058), +(25104), +(25139), +(25140), +(25143), +(25165), +(25174), +(25185), +(25187), +(25189), +(25190), +(25191), +(25208), +(25210), +(25212), +(25213), +(25217), +(25218), +(25221), +(25222), +(25225), +(25231), +(25233), +(25234), +(25235), +(25236), +(25241), +(25242), +(25245), +(25246), +(25248), +(25251), +(25258), +(25262), +(25263), +(25266), +(25269), +(25272), +(25273), +(25274), +(25275), +(25281), +(25282), +(25286), +(25288), +(25290), +(25291), +(25292), +(25294), +(25295), +(25297), +(25298), +(25299), +(25300), +(25302), +(25304), +(25306), +(25307), +(25308), +(25309), +(25311), +(25312), +(25314), +(25315), +(25316), +(25345), +(25349), +(25363), +(25364), +(25367), +(25368), +(25371), +(25372), +(25373), +(25375), +(25383), +(25384), +(25387), +(25389), +(25391), +(25396), +(25420), +(25424), +(25433), +(25439), +(25442), +(25448), +(25449), +(25454), +(25457), +(25462), +(25464), +(25465), +(25467), +(25471), +(25488), +(25497), +(25501), +(25504), +(25514), +(25515), +(25530), +(25531), +(25595), +(25602), +(25603), +(25605), +(25645), +(25646), +(25650), +(25651), +(25652), +(25668), +(25671), +(25673), +(25677), +(25678), +(25686), +(25710), +(25712), +(25721), +(25725), +(25742), +(25748), +(25755), +(25760), +(25761), +(25762), +(25771), +(25772), +(25777), +(25778), +(25779), +(25781), +(25788), +(25800), +(25802), +(25803), +(25806), +(25807), +(25808), +(25809), +(25810), +(25811), +(25816), +(25821), +(25838), +(25840), +(25843), +(25845), +(25847), +(25848), +(25852), +(25854), +(25856), +(25861), +(25902), +(25903), +(25911), +(25912), +(25913), +(25914), +(25947), +(25992), +(25995), +(25997), +(25999), +(26001), +(26004), +(26005), +(26006), +(26007), +(26008), +(26012), +(26013), +(26017), +(26035), +(26044), +(26050), +(26077), +(26078), +(26079), +(26081), +(26082), +(26090), +(26095), +(26097), +(26098), +(26100), +(26108), +(26125), +(26126), +(26134), +(26141), +(26143), +(26170), +(26181), +(26194), +(26195), +(26196), +(26197), +(26198), +(26206), +(26207), +(26211), +(26218), +(26226), +(26233), +(26258), +(26259), +(26275), +(26281), +(26282), +(26339), +(26350), +(26363), +(26364), +(26365), +(26366), +(26367), +(26368), +(26369), +(26370), +(26371), +(26372), +(26374), +(26375), +(26377), +(26406), +(26408), +(26409), +(26410), +(26412), +(26414), +(26415), +(26419), +(26446), +(26448), +(26470), +(26476), +(26548), +(26556), +(26561), +(26565), +(26572), +(26584), +(26601), +(26610), +(26613), +(26616), +(26622), +(26623), +(26624), +(26625), +(26636), +(26639), +(26641), +(26649), +(26654), +(26663), +(26679), +(26688), +(26693), +(26740), +(26742), +(26748), +(26791), +(26796), +(26799), +(26800), +(26839), +(26861), +(26862), +(26863), +(26864), +(26865), +(26866), +(26867), +(26884), +(26890), +(26899), +(26923), +(26924), +(26968), +(26978), +(26979), +(26980), +(26981), +(26982), +(26984), +(26985), +(26986), +(26987), +(26988), +(26989), +(26990), +(26992), +(26995), +(26996), +(27000), +(27001), +(27002), +(27003), +(27004), +(27005), +(27006), +(27007), +(27008), +(27010), +(27013), +(27014), +(27016), +(27019), +(27021), +(27024), +(27030), +(27031), +(27047), +(27048), +(27049), +(27050), +(27051), +(27060), +(27065), +(27067), +(27068), +(27069), +(27070), +(27071), +(27072), +(27073), +(27074), +(27075), +(27078), +(27079), +(27126), +(27132), +(27135), +(27136), +(27137), +(27138), +(27140), +(27142), +(27154), +(27174), +(27175), +(27176), +(27177), +(27180), +(27187), +(27189), +(27209), +(27210), +(27211), +(27215), +(27216), +(27217), +(27218), +(27219), +(27220), +(27223), +(27224), +(27228), +(27243), +(27254), +(27255), +(27258), +(27261), +(27263), +(27267), +(27270), +(27274), +(27275), +(27276), +(27277), +(27281), +(27286), +(27288), +(27290), +(27360), +(27375), +(27376), +(27378), +(27379), +(27380), +(27381), +(27384), +(27385), +(27386), +(27387), +(27389), +(27390), +(27391), +(27392), +(27393), +(27395), +(27396), +(27397), +(27398), +(27441), +(27448), +(27486), +(27526), +(27527), +(27532), +(27541), +(27547), +(27548), +(27549), +(27550), +(27552), +(27553), +(27554), +(27555), +(27556), +(27557), +(27559), +(27565), +(27567), +(27571), +(27572), +(27573), +(27576), +(27577), +(27580), +(27581), +(27582), +(27584), +(27605), +(27606), +(27608), +(27609), +(27611), +(27613), +(27615), +(27620), +(27624), +(27626), +(27632), +(27633), +(27634), +(27635), +(27636), +(27637), +(27638), +(27640), +(27648), +(27655), +(27662), +(27673), +(27677), +(27686), +(27752), +(27754), +(27755), +(27756), +(27760), +(27765), +(27794), +(27806), +(27814), +(27819), +(27841), +(27849), +(27852), +(27860), +(27861), +(27863), +(27864), +(27865), +(27868), +(27873), +(27874), +(27891), +(27907), +(27909), +(27910), +(27915), +(27919), +(27931), +(27937), +(27983), +(27991), +(27992), +(27994), +(27995), +(28030), +(28099), +(28133), +(28147), +(28149), +(28167), +(28169), +(28239), +(28251), +(28252), +(28253), +(28254), +(28255), +(28256), +(28257), +(28258), +(28259), +(28260), +(28261), +(28262), +(28263), +(28265), +(28271), +(28272), +(28276), +(28287), +(28293), +(28299), +(28301), +(28303), +(28306), +(28308), +(28310), +(28314), +(28318), +(28319), +(28320), +(28321), +(28329), +(28336), +(28337), +(28342), +(28350), +(28351), +(28375), +(28393), +(28394), +(28396), +(28397), +(28410), +(28412), +(28418), +(28419), +(28420), +(28428), +(28431), +(28434), +(28439), +(28444), +(28445), +(28467), +(28470), +(28478), +(28516), +(28522), +(28597), +(28601), +(28608), +(28614), +(28624), +(28674), +(28676), +(28678), +(28684), +(28685), +(28689), +(28690), +(28691), +(28692), +(28696), +(28698), +(28702), +(28715), +(28718), +(28720), +(28722), +(28723), +(28724), +(28734), +(28750), +(28772), +(28776), +(28783), +(28788), +(28790), +(28791), +(28793), +(28795), +(28810), +(28824), +(28825), +(28826), +(28827), +(28836), +(28839), +(28858), +(28859), +(28872), +(28873), +(28880), +(28882), +(28883), +(28887), +(28896), +(28899), +(28900), +(28901), +(28902), +(28913), +(28969), +(28993), +(29001), +(29002), +(29003), +(29006), +(29044), +(29054), +(29058), +(29060), +(29098), +(29117), +(29126), +(29127), +(29128), +(29129), +(29134), +(29135), +(29136), +(29137), +(29138), +(29139), +(29151), +(29155), +(29157), +(29158), +(29160), +(29164), +(29166), +(29168), +(29170), +(29175), +(29182), +(29185), +(29188), +(29194), +(29196), +(29198), +(29228), +(29290), +(29295), +(29300), +(29306), +(29314), +(29317), +(29319), +(29320), +(29341), +(29362), +(29364), +(29380), +(29386), +(29395), +(29405), +(29407), +(29408), +(29425), +(29426), +(29427), +(29428), +(29435), +(29436), +(29443), +(29473), +(29487), +(29492), +(29494), +(29495), +(29497), +(29500), +(29502), +(29515), +(29516), +(29519), +(29522), +(29528), +(29539), +(29540), +(29543), +(29544), +(29546), +(29555), +(29560), +(29561), +(29562), +(29563), +(29564), +(29567), +(29570), +(29572), +(29574), +(29575), +(29576), +(29577), +(29578), +(29580), +(29581), +(29582), +(29583), +(29585), +(29586), +(29587), +(29607), +(29609), +(29638), +(29639), +(29640), +(29641), +(29644), +(29646), +(29647), +(29652), +(29653), +(29655), +(29661), +(29665), +(29666), +(29667), +(29670), +(29673), +(29675), +(29676), +(29677), +(29679), +(29684), +(29690), +(29703), +(29704), +(29707), +(29711), +(29712), +(29716), +(29722), +(29765), +(29768), +(29815), +(29832), +(29845), +(29847), +(29848), +(29850), +(29879), +(29881), +(29896), +(29901), +(29903), +(29906), +(29907), +(29909), +(29915), +(29916), +(29917), +(29925), +(29926), +(29927), +(29928), +(29930), +(29953), +(29954), +(29955), +(29956), +(29964), +(29990), +(29991), +(30010), +(30013), +(30014), +(30016), +(30019), +(30022), +(30036), +(30039), +(30044), +(30050), +(30053), +(30055), +(30069), +(30070), +(30077), +(30081), +(30099), +(30100), +(30102), +(30103), +(30104), +(30105), +(30108), +(30112), +(30113), +(30115), +(30121), +(30127), +(30128), +(30130), +(30131), +(30151), +(30153), +(30164), +(30173), +(30175), +(30177), +(30178), +(30180), +(30194), +(30195), +(30197), +(30198), +(30202), +(30213), +(30218), +(30219), +(30223), +(30238), +(30253), +(30269), +(30270), +(30271), +(30280), +(30285), +(30324), +(30330), +(30335), +(30351), +(30353), +(30356), +(30357), +(30358), +(30383), +(30395), +(30400), +(30401), +(30402), +(30404), +(30405), +(30412), +(30421), +(30422), +(30423), +(30424), +(30430), +(30433), +(30435), +(30448), +(30449), +(30451), +(30455), +(30459), +(30463), +(30464), +(30465), +(30466), +(30467), +(30468), +(30471), +(30474), +(30478), +(30479), +(30481), +(30493), +(30495), +(30500), +(30501), +(30504), +(30505), +(30507), +(30512), +(30520), +(30528), +(30530), +(30545), +(30546), +(30601), +(30605), +(30606), +(30607), +(30608), +(30609), +(30614), +(30615), +(30619), +(30621), +(30637), +(30638), +(30639), +(30641), +(30643), +(30646), +(30647), +(30648), +(30651), +(30652), +(30653), +(30654), +(30661), +(30686), +(30687), +(30688), +(30689), +(30691), +(30695), +(30719), +(30736), +(30740), +(30751), +(30753), +(30755), +(30756), +(30768), +(30817), +(30822), +(30830), +(30832), +(30838), +(30839), +(30846), +(30849), +(30850), +(30854), +(30875), +(30876), +(30877), +(30878), +(30888), +(30889), +(30890), +(30900), +(30901), +(30909), +(30910), +(30923), +(30926), +(30932), +(30936), +(30937), +(30942), +(30943), +(30944), +(30945), +(30967), +(30971), +(30977), +(30980), +(30981), +(30984), +(30986), +(30989), +(30990), +(30992), +(31008), +(31009), +(31012), +(31015), +(31016), +(31018), +(31022), +(31041), +(31042), +(31043), +(31046), +(31069), +(31117), +(31125), +(31139), +(31249), +(31257), +(31262), +(31263), +(31270), +(31271), +(31272), +(31274), +(31275), +(31279), +(31280), +(31281), +(31282), +(31284), +(31286), +(31287), +(31288), +(31289), +(31290), +(31292), +(31295), +(31296), +(31305), +(31306), +(31312), +(31316), +(31319), +(31330), +(31334), +(31337), +(31339), +(31345), +(31366), +(31367), +(31368), +(31376), +(31378), +(31381), +(31387), +(31389), +(31390), +(31394), +(31397), +(31399), +(31400), +(31401), +(31402), +(31404), +(31405), +(31406), +(31407), +(31410), +(31415), +(31416), +(31417), +(31418), +(31419), +(31420), +(31423), +(31425), +(31426), +(31427), +(31436), +(31445), +(31446), +(31457), +(31464), +(31477), +(31481), +(31486), +(31513), +(31516), +(31535), +(31547), +(31551), +(31552), +(31553), +(31566), +(31589), +(31595), +(31596), +(31600), +(31601), +(31602), +(31604), +(31609), +(31610), +(31618), +(31620), +(31622), +(31623), +(31626), +(31627), +(31629), +(31651), +(31662), +(31664), +(31703), +(31705), +(31707), +(31709), +(31713), +(31715), +(31717), +(31718), +(31721), +(31724), +(31729), +(31733), +(31734), +(31739), +(31740), +(31741), +(31742), +(31743), +(31747), +(31751), +(31754), +(31758), +(31759), +(31764), +(31766), +(31772), +(31779), +(31782), +(31784), +(31789), +(31790), +(31803), +(31804), +(31807), +(31808), +(31810), +(31811), +(31812), +(31813), +(31814), +(31815), +(31816), +(31819), +(31827), +(31843), +(31863), +(31864), +(31865), +(31893), +(31898), +(31907), +(31911), +(31916), +(31923), +(31935), +(31939), +(31942), +(31946), +(31948), +(31955), +(31956), +(31961), +(31965), +(31966), +(31971), +(31972), +(31973), +(31975), +(31976), +(31977), +(31978), +(31984), +(31988), +(31994), +(31996), +(31999), +(32000), +(32001), +(32002), +(32004), +(32005), +(32006), +(32009), +(32010), +(32011), +(32012), +(32013), +(32015), +(32017), +(32018), +(32019), +(32020), +(32021), +(32022), +(32024), +(32025), +(32026), +(32039), +(32049), +(32055), +(32056), +(32063), +(32065), +(32071), +(32076), +(32077), +(32080), +(32082), +(32092), +(32093), +(32094), +(32095), +(32103), +(32104), +(32105), +(32110), +(32120), +(32125), +(32126), +(32129), +(32131), +(32132), +(32133), +(32139), +(32154), +(32168), +(32175), +(32176), +(32190), +(32197), +(32202), +(32211), +(32224), +(32231), +(32247), +(32248), +(32261), +(32268), +(32270), +(32300), +(32306), +(32315), +(32317), +(32319), +(32320), +(32321), +(32323), +(32325), +(32328), +(32329), +(32330), +(32337), +(32338), +(32346), +(32361), +(32363), +(32364), +(32369), +(32370), +(32376), +(32378), +(32379), +(32386), +(32388), +(32389), +(32390), +(32391), +(32405), +(32414), +(32415), +(32416), +(32417), +(32418), +(32422), +(32428), +(32430), +(32431), +(32441), +(32445), +(32474), +(32491), +(32546), +(32550), +(32578), +(32583), +(32588), +(32593), +(32594), +(32595), +(32605), +(32606), +(32639), +(32643), +(32645), +(32652), +(32654), +(32666), +(32674), +(32675), +(32677), +(32678), +(32679), +(32682), +(32683), +(32684), +(32689), +(32690), +(32691), +(32693), +(32699), +(32700), +(32707), +(32709), +(32716), +(32721), +(32733), +(32734), +(32735), +(32736), +(32738), +(32739), +(32740), +(32741), +(32742), +(32747), +(32748), +(32749), +(32751), +(32752), +(32759), +(32769), +(32770), +(32771), +(32772), +(32774), +(32778), +(32779), +(32784), +(32797), +(32829), +(32830), +(32831), +(32835), +(32846), +(32858), +(32860), +(32862), +(32863), +(32864), +(32889), +(32897), +(32901), +(32902), +(32903), +(32904), +(32905), +(32906), +(32907), +(32908), +(32909), +(32913), +(32915), +(32916), +(32917), +(32919), +(32921), +(32922), +(32924), +(32926), +(32935), +(32940), +(32950), +(32959), +(32960), +(32962), +(32967), +(32969), +(32971), +(32984), +(32996), +(33031), +(33040), +(33044), +(33045), +(33047), +(33049), +(33051), +(33055), +(33056), +(33068), +(33069), +(33072), +(33073), +(33074), +(33077), +(33078), +(33079), +(33080), +(33081), +(33082), +(33086), +(33096), +(33098), +(33126), +(33129), +(33130), +(33144), +(33173), +(33175), +(33196), +(33197), +(33198), +(33206), +(33227), +(33230), +(33246), +(33247), +(33324), +(33326), +(33331), +(33335), +(33346), +(33360), +(33382), +(33383), +(33385), +(33387), +(33389), +(33392), +(33401), +(33404), +(33417), +(33419), +(33462), +(33463), +(33480), +(33482), +(33483), +(33487), +(33493), +(33502), +(33526), +(33527), +(33528), +(33529), +(33534), +(33535), +(33542), +(33552), +(33553), +(33554), +(33619), +(33620), +(33625), +(33626), +(33628), +(33631), +(33632), +(33640), +(33641), +(33643), +(33659), +(33661), +(33665), +(33684), +(33688), +(33689), +(33698), +(33699), +(33700), +(33709), +(33723), +(33728), +(33731), +(33745), +(33750), +(33763), +(33768), +(33781), +(33786), +(33787), +(33789), +(33792), +(33793), +(33794), +(33813), +(33824), +(33825), +(33827), +(33832), +(33833), +(33837), +(33844), +(33849), +(33850), +(33865), +(33871), +(33876), +(33878), +(33899), +(33907), +(33910), +(33911), +(33912), +(33913), +(33914), +(33925), +(33938), +(33947), +(33951), +(33960), +(33964), +(33969), +(33970), +(33975), +(33982), +(33983), +(33985), +(33986), +(33987), +(33988), +(33989), +(34014), +(34020), +(34025), +(34036), +(34071), +(34073), +(34083), +(34087), +(34088), +(34089), +(34092), +(34093), +(34095), +(34097), +(34099), +(34107), +(34108), +(34110), +(34112), +(34113), +(34120), +(34130), +(34132), +(34135), +(34138), +(34139), +(34143), +(34149), +(34150), +(34163), +(34171), +(34172), +(34176), +(34177), +(34213), +(34214), +(34215), +(34216), +(34217), +(34218), +(34219), +(34232), +(34243), +(34259), +(34298), +(34344), +(34345), +(34346), +(34347), +(34348), +(34351), +(34352), +(34353), +(34354), +(34357), +(34361), +(34363), +(34366), +(34370), +(34379), +(34389), +(34390), +(34391), +(34394), +(34400), +(34411), +(34412), +(34413), +(34414), +(34415), +(34416), +(34417), +(34418), +(34419), +(34423), +(34425), +(34428), +(34432), +(34437), +(34438), +(34439), +(34445), +(34446), +(34447), +(34451), +(34463), +(34490), +(34510), +(34520), +(34578), +(34580), +(34587), +(34613), +(34614), +(34615), +(34616), +(34618), +(34620), +(34625), +(34626), +(34629), +(34637), +(34639), +(34640), +(34641), +(34643), +(34644), +(34645), +(34650), +(34653), +(34654), +(34655), +(34661), +(34665), +(34672), +(34694), +(34695), +(34696), +(34697), +(34709), +(34714), +(34715), +(34719), +(34722), +(34745), +(34752), +(34784), +(34786), +(34787), +(34788), +(34789), +(34793), +(34794), +(34797), +(34798), +(34799), +(34800), +(34802), +(34809), +(34811), +(34812), +(34820), +(34824), +(34828), +(34829), +(34841), +(34852), +(34856), +(34875), +(34879), +(34881), +(34883), +(34886), +(34889), +(34891), +(34893), +(34906), +(34907), +(34913), +(34914), +(34916), +(34917), +(34920), +(34922), +(34924), +(34925), +(34930), +(34931), +(34940), +(34941), +(34942), +(34945), +(34969), +(34974), +(34975), +(34976), +(34984), +(34996), +(35004), +(35010), +(35011), +(35012), +(35013), +(35033), +(35034), +(35039), +(35047), +(35049), +(35054), +(35055), +(35056), +(35062), +(35065), +(35066), +(35067), +(35069), +(35071), +(35072), +(35088), +(35089), +(35092), +(35096), +(35101), +(35105), +(35106), +(35107), +(35112), +(35115), +(35117), +(35120), +(35144), +(35147), +(35161), +(35178), +(35179), +(35180), +(35182), +(35183), +(35185), +(35189), +(35195), +(35201), +(35207), +(35229), +(35231), +(35234), +(35238), +(35243), +(35244), +(35263), +(35267), +(35273), +(35280), +(35290), +(35291), +(35292), +(35293), +(35294), +(35295), +(35313), +(35314), +(35316), +(35317), +(35318), +(35321), +(35323), +(35325), +(35326), +(35328), +(35329), +(35331), +(35332), +(35333), +(35334), +(35335), +(35339), +(35346), +(35353), +(35371), +(35376), +(35377), +(35382), +(35387), +(35389), +(35392), +(35395), +(35401), +(35410), +(35412), +(35424), +(35460), +(35466), +(35472), +(35473), +(35493), +(35499), +(35501), +(35506), +(35507), +(35510), +(35511), +(35514), +(35518), +(35519), +(35556), +(35570), +(35621), +(35686), +(35718), +(35727), +(35728), +(35735), +(35741), +(35742), +(35748), +(35759), +(35760), +(35771), +(35772), +(35780), +(35783), +(35839), +(35846), +(35851), +(35853), +(35857), +(35871), +(35873), +(35877), +(35913), +(35914), +(35916), +(35918), +(35919), +(35920), +(35927), +(35928), +(35932), +(35944), +(35945), +(35946), +(35949), +(35954), +(35955), +(35963), +(35964), +(35965), +(35966), +(35967), +(35968), +(35969), +(35970), +(35971), +(35972), +(35973), +(35974), +(35975), +(35976), +(35977), +(35978), +(35979), +(35980), +(35981), +(35982), +(35983), +(35984), +(35985), +(35986), +(35987), +(35988), +(35989), +(35990), +(35997), +(35998), +(35999), +(36002), +(36020), +(36021), +(36023), +(36025), +(36033), +(36052), +(36054), +(36073), +(36088), +(36093), +(36094), +(36095), +(36099), +(36100), +(36102), +(36115), +(36123), +(36138), +(36140), +(36141), +(36145), +(36152), +(36153), +(36170), +(36173), +(36176), +(36181), +(36207), +(36208), +(36224), +(36227), +(36228), +(36237), +(36238), +(36246), +(36247), +(36250), +(36276), +(36277), +(36279), +(36288), +(36295), +(36296), +(36299), +(36310), +(36312), +(36314), +(36328), +(36332), +(36333), +(36339), +(36340), +(36341), +(36342), +(36343), +(36344), +(36345), +(36348), +(36380), +(36398), +(36399), +(36401), +(36402), +(36404), +(36414), +(36415), +(36416), +(36417), +(36433), +(36434), +(36435), +(36436), +(36438), +(36439), +(36441), +(36447), +(36448), +(36457), +(36458), +(36461), +(36464), +(36469), +(36470), +(36475), +(36478), +(36482), +(36483), +(36488), +(36500), +(36507), +(36508), +(36509), +(36516), +(36517), +(36518), +(36527), +(36534), +(36536), +(36538), +(36539), +(36540), +(36541), +(36554), +(36558), +(36570), +(36571), +(36578), +(36586), +(36590), +(36594), +(36601), +(36604), +(36606), +(36608), +(36609), +(36612), +(36622), +(36623), +(36624), +(36625), +(36627), +(36628), +(36632), +(36638), +(36641), +(36642), +(36645), +(36646), +(36647), +(36650), +(36655), +(36656), +(36659), +(36664), +(36671), +(36677), +(36678), +(36679), +(36710), +(36711), +(36712), +(36713), +(36714), +(36732), +(36739), +(36778), +(36779), +(36780), +(36781), +(36787), +(36789), +(36791), +(36796), +(36801), +(36805), +(36806), +(36807), +(36810), +(36812), +(36814), +(36822), +(36825), +(36831), +(36832), +(36833), +(36836), +(36838), +(36839), +(36840), +(36841), +(36842), +(36843), +(36844), +(36863), +(36864), +(36866), +(36872), +(36876), +(36877), +(36886), +(36891), +(36894), +(36905), +(36906), +(36909), +(36913), +(36914), +(36916), +(36917), +(36919), +(36920), +(36921), +(36924), +(36927), +(36929), +(36947), +(36956), +(36957), +(36965), +(36966), +(36971), +(36972), +(36974), +(36979), +(36980), +(36983), +(36984), +(36986), +(36987), +(36988), +(36990), +(36991), +(37027), +(37028), +(37030), +(37031), +(37054), +(37057), +(37067), +(37073), +(37074), +(37082), +(37089), +(37104), +(37110), +(37111), +(37112), +(37113), +(37121), +(37122), +(37123), +(37126), +(37132), +(37133), +(37136), +(37138), +(37154), +(37156), +(37162), +(37176), +(37208), +(37216), +(37221), +(37249), +(37250), +(37251), +(37252), +(37254), +(37255), +(37257), +(37259), +(37260), +(37271), +(37272), +(37273), +(37274), +(37275), +(37276), +(37277), +(37320), +(37321), +(37322), +(37323), +(37328), +(37329), +(37330), +(37331), +(37332), +(37334), +(37335), +(37359), +(37361), +(37369), +(37372), +(37387), +(37389), +(37412), +(37417), +(37421), +(37450), +(37455), +(37456), +(37460), +(37462), +(37463), +(37470), +(37479), +(37486), +(37500), +(37506), +(37511), +(37527), +(37532), +(37537), +(37540), +(37548), +(37551), +(37552), +(37554), +(37563), +(37566), +(37572), +(37577), +(37578), +(37579), +(37580), +(37581), +(37589), +(37591), +(37592), +(37596), +(37597), +(37599), +(37602), +(37621), +(37628), +(37629), +(37630), +(37632), +(37634), +(37646), +(37647), +(37654), +(37661), +(37662), +(37664), +(37667), +(37668), +(37675), +(37681), +(37685), +(37695), +(37700), +(37711), +(37717), +(37718), +(37719), +(37727), +(37749), +(37770), +(37777), +(37778), +(37798), +(37800), +(37801), +(37802), +(37803), +(37804), +(37805), +(37806), +(37807), +(37808), +(37809), +(37810), +(37811), +(37813), +(37823), +(37834), +(37838), +(37839), +(37840), +(37841), +(37847), +(37850), +(37851), +(37856), +(37862), +(37865), +(37867), +(37871), +(37892), +(37894), +(37906), +(37908), +(37910), +(37921), +(37922), +(37930), +(37933), +(37937), +(37940), +(37945), +(37946), +(37950), +(37956), +(37958), +(37962), +(37965), +(37967), +(37968), +(37972), +(37973), +(37974), +(37975), +(37978), +(37979), +(37986), +(37988), +(37992), +(37998), +(38002), +(38007), +(38009), +(38010), +(38023), +(38024), +(38025), +(38027), +(38029), +(38030), +(38032), +(38034), +(38035), +(38047), +(38048), +(38051), +(38052), +(38053), +(38056), +(38058), +(38059), +(38063), +(38065), +(38066), +(38067), +(38074), +(38075), +(38076), +(38078), +(38083), +(38084), +(38085), +(38093), +(38094), +(38095), +(38107), +(38109), +(38113), +(38120), +(38122), +(38125), +(38127), +(38129), +(38133), +(38134), +(38135), +(38136), +(38145), +(38146), +(38147), +(38148), +(38149), +(38153), +(38154), +(38155), +(38167), +(38177), +(38178), +(38182), +(38183), +(38187), +(38193), +(38203), +(38204), +(38205), +(38208), +(38209), +(38210), +(38213), +(38223), +(38226), +(38233), +(38234), +(38238), +(38239), +(38240), +(38243), +(38245), +(38246), +(38252), +(38253), +(38254), +(38259), +(38260), +(38262), +(38263), +(38264), +(38265), +(38267), +(38274), +(38275), +(38276), +(38277), +(38279), +(38280), +(38285), +(38295), +(38310), +(38313), +(38324), +(38328), +(38329), +(38330), +(38333), +(38338), +(38340), +(38342), +(38344), +(38363), +(38366), +(38370), +(38372), +(38374), +(38377), +(38378), +(38383), +(38386), +(38387), +(38391), +(38400), +(38401), +(38441), +(38446), +(38461), +(38465), +(38470), +(38474), +(38495), +(38496), +(38505), +(38509), +(38510), +(38520), +(38523), +(38526), +(38534), +(38535), +(38538), +(38543), +(38554), +(38556), +(38557), +(38558), +(38559), +(38560), +(38561), +(38562), +(38563), +(38564), +(38565), +(38566), +(38567), +(38568), +(38569), +(38570), +(38572), +(38580), +(38582), +(38584), +(38585), +(38586), +(38588), +(38591), +(38595), +(38598), +(38606), +(38616), +(38617), +(38621), +(38625), +(38626), +(38628), +(38630), +(38631), +(38634), +(38636), +(38641), +(38643), +(38645), +(38657), +(38658), +(38661), +(38663), +(38669), +(38692), +(38697), +(38699), +(38704), +(38708), +(38721), +(38723), +(38731), +(38739), +(38742), +(38753), +(38760), +(38762), +(38764), +(38765), +(38767), +(38768), +(38770), +(38772), +(38775), +(38777), +(38791), +(38797), +(38798), +(38801), +(38804), +(38806), +(38807), +(38808), +(38815), +(38816), +(38817), +(38821), +(38822), +(38823), +(38824), +(38825), +(38826), +(38827), +(38846), +(38848), +(38849), +(38851), +(38852), +(38858), +(38859), +(38861), +(38863), +(38864), +(38875), +(38879), +(38880), +(38881), +(38882), +(38883), +(38884), +(38887), +(38894), +(38895), +(38896), +(38897), +(38899), +(38904), +(38907), +(38909), +(38913), +(38914), +(38915), +(38918), +(38919), +(38921), +(38923), +(38926), +(38930), +(38935), +(38940), +(38941), +(38942), +(38943), +(38945), +(38946), +(38950), +(38952), +(38959), +(38967), +(38971), +(38985), +(38986), +(38987), +(38988), +(38989), +(38990), +(38992), +(38995), +(39000), +(39002), +(39006), +(39009), +(39015), +(39016), +(39017), +(39019), +(39020), +(39021), +(39022), +(39023), +(39025), +(39026), +(39029), +(39032), +(39039), +(39044), +(39046), +(39047), +(39053), +(39054), +(39058), +(39060), +(39061), +(39062), +(39064), +(39065), +(39066), +(39068), +(39069), +(39070), +(39076), +(39077), +(39078), +(39079), +(39083), +(39087), +(39097), +(39098), +(39099), +(39101), +(39116), +(39119), +(39120), +(39121), +(39122), +(39123), +(39125), +(39129), +(39135), +(39136), +(39145), +(39153), +(39157), +(39159), +(39160), +(39164), +(39165), +(39171), +(39172), +(39174), +(39176), +(39182), +(39192), +(39196), +(39197), +(39198), +(39202), +(39204), +(39207), +(39210), +(39212), +(39214), +(39215), +(39226), +(39229), +(39230), +(39252), +(39258), +(39262), +(39267), +(39268), +(39270), +(39271), +(39285), +(39293), +(39297), +(39299), +(39309), +(39322), +(39328), +(39329), +(39332), +(39337), +(39339), +(39349), +(39367), +(39371), +(39378), +(39386), +(39396), +(39412), +(39413), +(39415), +(39419), +(39435), +(39436), +(39445), +(39449), +(39456), +(39457), +(39460), +(39474), +(39475), +(39476), +(39477), +(39512), +(39513), +(39528), +(39529), +(39544), +(39560), +(39566), +(39574), +(39582), +(39587), +(39590), +(39592), +(39595), +(39600), +(39609), +(39621), +(39622), +(39661), +(39665), +(39668), +(39669), +(39670), +(39674), +(39675), +(39676), +(39697), +(39703), +(39794), +(39796), +(39810), +(39812), +(39826), +(39830), +(39835), +(39837), +(39838), +(39857), +(39865), +(39883), +(39886), +(39901), +(39904), +(39908), +(39920), +(39928), +(39945), +(39948), +(39955), +(39956), +(39967), +(39972), +(39979), +(39980), +(39995), +(39996), +(40011), +(40019), +(40032), +(40041), +(40055), +(40057), +(40063), +(40066), +(40071), +(40074), +(40081), +(40084), +(40086), +(40097), +(40099), +(40102), +(40109), +(40119), +(40123), +(40124), +(40146), +(40157), +(40165), +(40166), +(40167), +(40173), +(40185), +(40191), +(40193), +(40197), +(40198), +(40199), +(40220), +(40225), +(40227), +(40228), +(40239), +(40248), +(40251), +(40254), +(40259), +(40279), +(40290), +(40293), +(40303), +(40310), +(40311), +(40312), +(40313), +(40317), +(40321), +(40322), +(40325), +(40327), +(40334), +(40337), +(40339), +(40344), +(40346), +(40347), +(40348), +(40351), +(40356), +(40357), +(40358), +(40363), +(40366), +(40367), +(40368), +(40384), +(40385), +(40392), +(40400), +(40406), +(40411), +(40412), +(40413), +(40414), +(40415), +(40416), +(40420), +(40423), +(40427), +(40429), +(40430), +(40431), +(40434), +(40449), +(40450), +(40471), +(40472), +(40481), +(40486), +(40489), +(40491), +(40493), +(40497), +(40504), +(40505), +(40507), +(40508), +(40509), +(40525), +(40536), +(40542), +(40554), +(40560), +(40563), +(40564), +(40565), +(40569), +(40571), +(40581), +(40585), +(40595), +(40597), +(40602), +(40604), +(40605), +(40608), +(40616), +(40620), +(40633), +(40635), +(40639), +(40641), +(40643), +(40645), +(40646), +(40651), +(40652), +(40671), +(40672), +(40685), +(40726), +(40728), +(40736), +(40739), +(40740), +(40742), +(40751), +(40758), +(40770), +(40772), +(40777), +(40778), +(40787), +(40796), +(40801), +(40810), +(40814), +(40822), +(40827), +(40835), +(40837), +(40838), +(40842), +(40843), +(40844), +(40846), +(40856), +(40859), +(40860), +(40861), +(40864), +(40872), +(40873), +(40876), +(40877), +(40881), +(40886), +(40888), +(40890), +(40892), +(40893), +(40894), +(40895), +(40901), +(40903), +(40906), +(40909), +(40917), +(40926), +(40928), +(40930), +(40935), +(40945), +(40951), +(40954), +(40958), +(40964), +(40965), +(40968), +(40969), +(40970), +(40972), +(40976), +(40991), +(41001), +(41003), +(41028), +(41029), +(41032), +(41035), +(41044), +(41047), +(41050), +(41052), +(41054), +(41055), +(41060), +(41063), +(41065), +(41069), +(41070), +(41072), +(41075), +(41080), +(41082), +(41083), +(41084), +(41092), +(41093), +(41103), +(41109), +(41115), +(41116), +(41121), +(41137), +(41139), +(41152), +(41169), +(41170), +(41171), +(41177), +(41178), +(41179), +(41180), +(41182), +(41183), +(41184), +(41186), +(41187), +(41188), +(41189), +(41190), +(41192), +(41197), +(41198), +(41213), +(41214), +(41225), +(41226), +(41227), +(41228), +(41229), +(41230), +(41231), +(41238), +(41241), +(41247), +(41250), +(41255), +(41256), +(41259), +(41264), +(41265), +(41270), +(41272), +(41278), +(41279), +(41280), +(41281), +(41283), +(41291), +(41299), +(41302), +(41332), +(41334), +(41335), +(41336), +(41338), +(41345), +(41346), +(41351), +(41352), +(41353), +(41355), +(41360), +(41363), +(41368), +(41370), +(41372), +(41373), +(41374), +(41375), +(41377), +(41378), +(41383), +(41384), +(41388), +(41389), +(41390), +(41392), +(41394), +(41395), +(41396), +(41407), +(41410), +(41411), +(41419), +(41421), +(41426), +(41439), +(41440), +(41442), +(41448), +(41450), +(41451), +(41456), +(41461), +(41467), +(41468), +(41470), +(41471), +(41472), +(41473), +(41483), +(41484), +(41485), +(41486), +(41487), +(41489), +(41490), +(41491), +(41492), +(41519), +(41526), +(41528), +(41533), +(41540), +(41543), +(41544), +(41546), +(41547), +(41548), +(41549), +(41558), +(41559), +(41563), +(41564), +(41565), +(41567), +(41568), +(41571), +(41578), +(41579), +(41580), +(41581), +(41586), +(41588), +(41592), +(41596), +(41597), +(41598), +(41601), +(41621), +(41622), +(41625), +(41626), +(41633), +(41637), +(41911), +(41914), +(41916), +(41917), +(41926), +(41931), +(41932), +(41933), +(41936), +(41937), +(41939), +(41940), +(41957), +(41958), +(41959), +(41960), +(41961), +(41964), +(41965), +(41978), +(41980), +(41984), +(41985), +(41990), +(42002), +(42003), +(42013), +(42018), +(42020), +(42021), +(42024), +(42025), +(42053), +(42058), +(42129), +(42131), +(42132), +(42133), +(42139), +(42142), +(42144), +(42149), +(42150), +(42152), +(42161), +(42165), +(42169), +(42185), +(42203), +(42246), +(42299), +(42313), +(42315), +(42319), +(42320), +(42322), +(42324), +(42325), +(42326), +(42328), +(42329), +(42330), +(42331), +(42332), +(42333), +(42337), +(42349), +(42360), +(42363), +(42368), +(42369), +(42370), +(42371), +(42372), +(42380), +(42382), +(42383), +(42384), +(42385), +(42389), +(42395), +(42396), +(42397), +(42399), +(42400), +(42401), +(42402), +(42411), +(42414), +(42426), +(42434), +(42435), +(42441), +(42443), +(42447), +(42455), +(42463), +(42476), +(42483), +(42485), +(42486), +(42488), +(42489), +(42502), +(42512), +(42514), +(42516), +(42518), +(42535), +(42537), +(42540), +(42560), +(42561), +(42574), +(42579), +(42580), +(42583), +(42587), +(42611), +(42628), +(42632), +(42633), +(42634), +(42635), +(42653), +(42658), +(42670), +(42671), +(42672), +(42696), +(42702), +(42710), +(42711), +(42717), +(42719), +(42721), +(42724), +(42725), +(42730), +(42733), +(42739), +(42740), +(42741), +(42746), +(42747), +(42756), +(42762), +(42767), +(42772), +(42780), +(42781), +(42782), +(42783), +(42785), +(42789), +(42790), +(42791), +(42793), +(42799), +(42802), +(42803), +(42804), +(42811), +(42826), +(42832), +(42833), +(42834), +(42841), +(42842), +(42843), +(42846), +(42853), +(42858), +(42859), +(42867), +(42869), +(42870), +(42872), +(42873), +(42878), +(42879), +(42880), +(42889), +(42890), +(42891), +(42894), +(42895), +(42896), +(42897), +(42902), +(42903), +(42904), +(42907), +(42908), +(42913), +(42914), +(42953), +(42964), +(42972), +(42978), +(42995), +(42999), +(43003), +(43004), +(43006), +(43036), +(43037), +(43043), +(43044), +(43058), +(43061), +(43063), +(43064), +(43065), +(43067), +(43075), +(43077), +(43083), +(43084), +(43086), +(43087), +(43090), +(43093), +(43094), +(43097), +(43100), +(43103), +(43104), +(43107), +(43108), +(43122), +(43123), +(43125), +(43128), +(43130), +(43131), +(43132), +(43133), +(43137), +(43138), +(43140), +(43150), +(43151), +(43153), +(43156), +(43157), +(43159), +(43178), +(43187), +(43191), +(43192), +(43193), +(43194), +(43195), +(43196), +(43197), +(43198), +(43199), +(43202), +(43205), +(43206), +(43225), +(43228), +(43235), +(43243), +(43245), +(43246), +(43256), +(43259), +(43260), +(43261), +(43262), +(43267), +(43268), +(43270), +(43273), +(43286), +(43287), +(43288), +(43292), +(43297), +(43298), +(43299), +(43300), +(43301), +(43303), +(43305), +(43309), +(43315), +(43325), +(43330), +(43334), +(43337), +(43340), +(43341), +(43345), +(43346), +(43347), +(43348), +(43352), +(43353), +(43354), +(43356), +(43357), +(43358), +(43359), +(43361), +(43362), +(43364), +(43365), +(43368), +(43370), +(43379), +(43380), +(43381), +(43384), +(43393), +(43398), +(43399), +(43409), +(43410), +(43411), +(43413), +(43415), +(43416), +(43417), +(43419), +(43427), +(43428), +(43433), +(43435), +(43439), +(43441), +(43445), +(43451), +(43456), +(43461), +(43469), +(43470), +(43471), +(43472), +(43473), +(43474), +(43475), +(43477), +(43483), +(43484), +(43488), +(43489), +(43492), +(43495), +(43496), +(43497), +(43501), +(43505), +(43507), +(43511), +(43512), +(43515), +(43516), +(43517), +(43518), +(43519), +(43520), +(43522), +(43523), +(43524), +(43525), +(43526), +(43528), +(43529), +(43532), +(43535), +(43543), +(43545), +(43553), +(43556), +(43560), +(43564), +(43565), +(43567), +(43569), +(43571), +(43572), +(43574), +(43575), +(43577), +(43578), +(43579), +(43581), +(43584), +(43585), +(43586), +(43591), +(43592), +(43593), +(43612), +(43613), +(43619), +(43621), +(43622), +(43644), +(43646), +(43648), +(43649), +(43650), +(43651), +(43660), +(43661), +(43663), +(43665), +(43666), +(43667), +(43671), +(43673), +(43680), +(43682), +(43683), +(43684), +(43690), +(43693), +(43695), +(43701), +(43709), +(43714), +(43715), +(43720), +(43726), +(43727), +(43728), +(43729), +(43732), +(43746), +(43767), +(43769), +(43785), +(43786), +(43789), +(43794), +(43795), +(43799), +(43804), +(43807), +(43809), +(43821), +(43834), +(43869), +(43895), +(43903), +(43906), +(43923), +(43928), +(43931), +(43932), +(43933), +(43937), +(43941), +(43948), +(43951), +(43952), +(43969), +(43971), +(43974), +(43976), +(43984), +(43988), +(43993), +(43996), +(43997), +(44000), +(44005), +(44008), +(44015), +(44016), +(44030), +(44031), +(44038), +(44053), +(44078), +(44079), +(44081), +(44082), +(44089), +(44093), +(44095), +(44120), +(44121), +(44126), +(44127), +(44137), +(44138), +(44139), +(44141), +(44142), +(44144), +(44148), +(44149), +(44152), +(44156), +(44159), +(44164), +(44165), +(44168), +(44169), +(44170), +(44171), +(44173), +(44174), +(44176), +(44181), +(44185), +(44188), +(44189), +(44202), +(44211), +(44212), +(44216), +(44219), +(44220), +(44221), +(44222), +(44223), +(44237), +(44241), +(44242), +(44247), +(44248), +(44256), +(44258), +(44262), +(44267), +(44268), +(44271), +(44274), +(44280), +(44285), +(44286), +(44289), +(44294), +(44304), +(44308), +(44310), +(44318), +(44319), +(44323), +(44325), +(44327), +(44328), +(44332), +(44339), +(44351), +(44357), +(44358), +(44361), +(44364), +(44368), +(44370), +(44382), +(44407), +(44408), +(44415), +(44424), +(44425), +(44429), +(44430), +(44454), +(44455), +(44457), +(44464), +(44473), +(44477), +(44478), +(44479), +(44481), +(44482), +(44503), +(44504), +(44512), +(44518), +(44519), +(44525), +(44530), +(44532), +(44533), +(44534), +(44536), +(44541), +(44542), +(44547), +(44553), +(44563), +(44564), +(44572), +(44577), +(44583), +(44586), +(44600), +(44602), +(44606), +(44614), +(44617), +(44618), +(44619), +(44620), +(44622), +(44639), +(44640), +(44641), +(44642), +(44654), +(44657), +(44658), +(44685), +(44732), +(44753), +(44755), +(44765), +(44780), +(44781), +(44787), +(44788), +(44789), +(44790), +(44791), +(44796), +(44808), +(44811), +(44812), +(44813), +(44817), +(44818), +(44823), +(44843), +(44848), +(44868), +(44871), +(44872), +(44876), +(44881), +(44934), +(44937), +(44945), +(44956), +(44957), +(44961), +(44966), +(44985), +(44997), +(45012), +(45017), +(45023), +(45026), +(45029), +(45031), +(45036), +(45055), +(45064), +(45071), +(45075), +(45088), +(45089), +(45090), +(45096), +(45101), +(45102), +(45105), +(45108), +(45110), +(45113), +(45123), +(45124), +(45129), +(45130), +(45133), +(45134), +(45141), +(45145), +(45185), +(45189), +(45192), +(45195), +(45197), +(45199), +(45200), +(45204), +(45205), +(45206), +(45209), +(45214), +(45215), +(45221), +(45228), +(45235), +(45251), +(45256), +(45269), +(45271), +(45274), +(45276), +(45280), +(45284), +(45286), +(45287), +(45288), +(45289), +(45290), +(45291), +(45292), +(45293), +(45294), +(45295), +(45296), +(45297), +(45298), +(45299), +(45300), +(45301), +(45302), +(45314), +(45321), +(45324), +(45327), +(45328), +(45334), +(45337), +(45344), +(45350), +(45352), +(45353), +(45356), +(45362), +(45409), +(45417), +(45419), +(45420), +(45421), +(45425), +(45428), +(45429), +(45430), +(45442), +(45444), +(45447), +(45456), +(45458), +(45462), +(45463), +(45468), +(45469), +(45472), +(45476), +(45477), +(45485), +(45487), +(45491), +(45493), +(45497), +(45504), +(45505), +(45507), +(45509), +(45511), +(45516), +(45524), +(45534), +(45537), +(45543), +(45544), +(45573), +(45576), +(45577), +(45578), +(45580), +(45587), +(45588), +(45589), +(45590), +(45600), +(45603), +(45604), +(45611), +(45625), +(45627), +(45628), +(45629), +(45632), +(45639), +(45645), +(45646), +(45647), +(45648), +(45649), +(45650), +(45659), +(45660), +(45661), +(45664), +(45693), +(45696), +(45716), +(45717), +(45719), +(45724), +(45725), +(45730), +(45739), +(45742), +(45744), +(45748), +(45773), +(45777), +(45778), +(45798), +(45799), +(45800), +(45803), +(45804), +(45815), +(45820), +(45833), +(45837), +(45854), +(45866), +(45873), +(45874), +(45875), +(45889), +(45897), +(45898), +(45899), +(45900), +(45902), +(45906), +(45913), +(45919), +(45924), +(45926), +(45931), +(45940), +(45943), +(45946), +(45947), +(45964), +(45967), +(45975), +(45980), +(45981), +(45983), +(45989), +(45992), +(46010), +(46012), +(46014), +(46015), +(46016), +(46023), +(46027), +(46028), +(46029), +(46031), +(46032), +(46033), +(46035), +(46042), +(46043), +(46044), +(46045), +(46047), +(46049), +(46057), +(46062), +(46065), +(46067), +(46070), +(46074), +(46080), +(46081), +(46083), +(46084), +(46092), +(46093), +(46098), +(46099), +(46101), +(46104), +(46119), +(46145), +(46152), +(46153), +(46155), +(46161), +(46164), +(46166), +(46167), +(46180), +(46181), +(46182), +(46183), +(46187), +(46188), +(46189), +(46190), +(46191), +(46192), +(46194), +(46198), +(46200), +(46202), +(46206), +(46221), +(46231), +(46232), +(46239), +(46260), +(46266), +(46276), +(46279), +(46280), +(46283), +(46285), +(46288), +(46291), +(46292), +(46305), +(46315), +(46323), +(46331), +(46333), +(46341), +(46357), +(46361), +(46362), +(46364), +(46365), +(46366), +(46368), +(46380), +(46381), +(46394), +(46406), +(46411), +(46420), +(46421), +(46422), +(46429), +(46430), +(46432), +(46433), +(46434), +(46440), +(46443), +(46444), +(46447), +(46448), +(46449), +(46459), +(46460), +(46466), +(46468), +(46469), +(46479), +(46480), +(46481), +(46483), +(46485), +(46486), +(46487), +(46543), +(46550), +(46556), +(46557), +(46558), +(46559), +(46560), +(46561), +(46562), +(46563), +(46566), +(46567), +(46568), +(46572), +(46579), +(46580), +(46582), +(46587), +(46590), +(46591), +(46595), +(46598), +(46602), +(46607), +(46611), +(46612), +(46613), +(46614), +(46615), +(46616), +(46617), +(46618), +(46620), +(46621), +(46624), +(46629), +(46630), +(46641), +(46642), +(46651), +(46654), +(46661), +(46664), +(46665), +(46667), +(46671), +(46672), +(46673), +(46674), +(46677), +(46681), +(46686), +(46691), +(46693), +(46696), +(46702), +(46704), +(46709), +(46711), +(46716), +(46717), +(46718), +(46719), +(46720), +(46721), +(46722), +(46723), +(46724), +(46725), +(46726), +(46727), +(46728), +(46729), +(46730), +(46731), +(46734), +(46745), +(46762), +(46764), +(46770), +(46772), +(46773), +(46787), +(46791), +(46801), +(46813), +(46816), +(46824), +(46825), +(46826), +(46841), +(46845), +(46846), +(46856), +(46857), +(46877), +(46879), +(46880), +(46887), +(46906), +(46956), +(46960), +(46962), +(46978), +(46982), +(46983), +(46987), +(46988), +(46990), +(47001), +(47003), +(47009), +(47011), +(47012), +(47014), +(47020), +(47021), +(47028), +(47029), +(47033), +(47034), +(47042), +(47043), +(47057), +(47059), +(47062), +(47063), +(47064), +(47066), +(47068), +(47069), +(47070), +(47071), +(47072), +(47074), +(47076), +(47077), +(47079), +(47081), +(47084), +(47093), +(47096), +(47098), +(47107), +(47117), +(47122), +(47139), +(47143), +(47144), +(47145), +(47146), +(47148), +(47149), +(47151), +(47152), +(47153), +(47155), +(47156), +(47157), +(47158), +(47160), +(47161), +(47162), +(47163), +(47164), +(47165), +(47166), +(47168), +(47171), +(47173), +(47176), +(47206), +(47208), +(47219), +(47244), +(47248), +(47249), +(47257), +(47272), +(47277), +(47282), +(47293), +(47299), +(47305), +(47307), +(47308), +(47316), +(47321), +(47322), +(47323), +(47326), +(47333), +(47334), +(47337), +(47338), +(47339), +(47340), +(47345), +(47380), +(47382), +(47390), +(47392), +(47394), +(47403), +(47405), +(47410), +(47413), +(47414), +(47422), +(47424), +(47431), +(47432), +(47442), +(47447), +(47449), +(47450), +(47451), +(47453), +(47465), +(47467), +(47468), +(47470), +(47471), +(47472), +(47474), +(47475), +(47476), +(47480), +(47481), +(47482), +(47485), +(47486), +(47487), +(47488), +(47489), +(47497), +(47498), +(47504), +(47516), +(47517), +(47519), +(47520), +(47528), +(47530), +(47534), +(47540), +(47541), +(47550), +(47575), +(47601), +(47604), +(47610), +(47611), +(47614), +(47629), +(47632), +(47633), +(47635), +(47637), +(47664), +(47665), +(47673), +(47674), +(47676), +(47679), +(47689), +(47695), +(47697), +(47698), +(47700), +(47702), +(47703), +(47718), +(47721), +(47722), +(47723), +(47724), +(47729), +(47739), +(47740), +(47741), +(47744), +(47749), +(47751), +(47753), +(47757), +(47758), +(47761), +(47767), +(47768), +(47777), +(47778), +(47780), +(47781), +(47782), +(47783), +(47785), +(47788), +(47808), +(47809), +(47810), +(47811), +(47812), +(47813), +(47814), +(47815), +(47824), +(47825), +(47826), +(47827), +(47835), +(47836), +(47837), +(47838), +(47841), +(47843), +(47848), +(47850), +(47851), +(47852), +(47853), +(47855), +(47857), +(47859), +(47860), +(47863), +(47864), +(47865), +(47867), +(47902), +(47914), +(47917), +(47920), +(47926), +(47928), +(47930), +(47938), +(47948), +(47960), +(47961), +(47962), +(47964), +(47968), +(47976), +(47984), +(47991), +(47992), +(47993), +(47994), +(47995), +(47996), +(48011), +(48013), +(48039), +(48045), +(48046), +(48047), +(48048), +(48053), +(48060), +(48062), +(48063), +(48065), +(48066), +(48067), +(48068), +(48070), +(48071), +(48072), +(48073), +(48084), +(48085), +(48098), +(48099), +(48100), +(48101), +(48102), +(48103), +(48104), +(48105), +(48119), +(48120), +(48122), +(48123), +(48124), +(48125), +(48126), +(48127), +(48130), +(48132), +(48133), +(48134), +(48135), +(48137), +(48140), +(48147), +(48155), +(48156), +(48157), +(48158), +(48159), +(48160), +(48161), +(48163), +(48164), +(48165), +(48169), +(48181), +(48184), +(48187), +(48192), +(48208), +(48210), +(48232), +(48245), +(48249), +(48250), +(48261), +(48262), +(48264), +(48267), +(48268), +(48282), +(48283), +(48285), +(48286), +(48287), +(48288), +(48290), +(48291), +(48292), +(48296), +(48298), +(48299), +(48300), +(48301), +(48307), +(48309), +(48310), +(48316), +(48330), +(48334), +(48360), +(48365), +(48374), +(48376), +(48377), +(48378), +(48400), +(48417), +(48423), +(48424), +(48440), +(48441), +(48442), +(48443), +(48450), +(48451), +(48459), +(48461), +(48462), +(48463), +(48464), +(48465), +(48468), +(48469), +(48479), +(48480), +(48489), +(48490), +(48491), +(48504), +(48532), +(48533), +(48540), +(48541), +(48542), +(48543), +(48548), +(48549), +(48563), +(48564), +(48565), +(48566), +(48567), +(48568), +(48569), +(48570), +(48571), +(48572), +(48573), +(48574), +(48575), +(48576), +(48577), +(48578), +(48579), +(48583), +(48585), +(48598), +(48599), +(48601), +(48603), +(48606), +(48617), +(48622), +(48628), +(48637), +(48638), +(48639), +(48640), +(48648), +(48652), +(48656), +(48657), +(48658), +(48659), +(48660), +(48661), +(48662), +(48663), +(48664), +(48665), +(48666), +(48667), +(48668), +(48669), +(48671), +(48672), +(48673), +(48674), +(48675), +(48676), +(48678), +(48679), +(48680), +(48689), +(48690), +(48691), +(48693), +(48696), +(48697), +(48698), +(48699), +(48700), +(48712), +(48714), +(48737), +(48738), +(48746), +(48747), +(48749), +(48750), +(48752), +(48753), +(48754), +(48755), +(48756), +(48759), +(48760), +(48765), +(48770), +(48772), +(48774), +(48775), +(48781), +(48782), +(48784), +(48785), +(48788), +(48800), +(48801), +(48802), +(48805), +(48806), +(48812), +(48813), +(48815), +(48820), +(48821), +(48822), +(48823), +(48824), +(48825), +(48826), +(48827), +(48828), +(48829), +(48830), +(48831), +(48832), +(48845), +(48850), +(48851), +(48852), +(48854), +(48862), +(48871), +(48872), +(48873), +(48876), +(48877), +(48878), +(48880), +(48881), +(48883), +(48895), +(48917), +(48920), +(48931), +(48932), +(48935), +(48936), +(48953), +(48960), +(48974), +(48981), +(48984), +(48995), +(48996), +(48998), +(48999), +(49000), +(49001), +(49005), +(49009), +(49010), +(49011), +(49012), +(49020), +(49021), +(49026), +(49028), +(49029), +(49037), +(49044), +(49045), +(49047), +(49048), +(49049), +(49050), +(49051), +(49052), +(49053), +(49054), +(49078), +(49084), +(49089), +(49090), +(49091), +(49092), +(49093), +(49099), +(49106), +(49110), +(49111), +(49113), +(49119), +(49124), +(49125), +(49127), +(49138), +(49143), +(49158), +(49161), +(49165), +(49177), +(49184), +(49204), +(49206), +(49213), +(49215), +(49230), +(49231), +(49232), +(49233), +(49235), +(49236), +(49237), +(49238), +(49239), +(49240), +(49242), +(49243), +(49256), +(49257), +(49266), +(49267), +(49268), +(49269), +(49270), +(49271), +(49272), +(49273), +(49275), +(49276), +(49278), +(49279), +(49282), +(49283), +(49284), +(49288), +(49294), +(49296), +(49298), +(49305), +(49309), +(49312), +(49317), +(49323), +(49324), +(49348), +(49349), +(49353), +(49354), +(49362), +(49363), +(49364), +(49372), +(49376), +(49381), +(49383), +(49387), +(49404), +(49406), +(49418), +(49427), +(49429), +(49433), +(49439), +(49446), +(49453), +(49454), +(49459), +(49463), +(49466), +(49481), +(49482), +(49485), +(49500), +(49501), +(49511), +(49512), +(49527), +(49537), +(49544), +(49546), +(49547), +(49549), +(49560), +(49576), +(49584), +(49587), +(49592), +(49613), +(49616), +(49617), +(49624), +(49637), +(49639), +(49641), +(49644), +(49675), +(49678), +(49680), +(49681), +(49686), +(49690), +(49696), +(49704), +(49705), +(49706), +(49708), +(49710), +(49711), +(49712), +(49715), +(49718), +(49719), +(49720), +(49723), +(49729), +(49734), +(49742), +(49747), +(49749), +(49753), +(49755), +(49758), +(49759), +(49771), +(49776), +(49797), +(49799), +(49800), +(49802), +(49803), +(49804), +(49805), +(49806), +(49830), +(49836), +(49840), +(49841), +(49843), +(49846), +(49848), +(49859), +(49861), +(49863), +(49865), +(49891), +(49892), +(49893), +(49894), +(49895), +(49896), +(49897), +(49903), +(49904), +(49906), +(49909), +(49913), +(49914), +(49915), +(49916), +(49917), +(49918), +(49919), +(49920), +(49921), +(49922), +(49923), +(49924), +(49926), +(49927), +(49928), +(49929), +(49930), +(49935), +(49942), +(49945), +(49956), +(49961), +(49965), +(49966), +(49967), +(49968), +(49969), +(49970), +(49971), +(49972), +(49973), +(49974), +(49975), +(49978), +(49980), +(49981), +(49985), +(49986), +(49987), +(49989), +(49991), +(49993), +(49994), +(49995), +(49996), +(49997), +(49998), +(49999), +(50004), +(50006), +(50015), +(50021), +(50027), +(50028), +(50035), +(50038), +(50046), +(50047), +(50050), +(50052), +(50064), +(50066), +(50073), +(50075), +(50084), +(50086), +(50089), +(50090), +(50091), +(50092), +(50094), +(50100), +(50101), +(50102), +(50104), +(50135), +(50144), +(50145), +(50146), +(50156), +(50165), +(50169), +(50183), +(50184), +(50185), +(50188), +(50196), +(50198), +(50205), +(50206), +(50207), +(50217), +(50231), +(50232), +(50234), +(50245), +(50251), +(50252), +(50255), +(50256), +(50257), +(50259), +(50265), +(50271), +(50273), +(50276), +(50282), +(50287), +(50288), +(50289), +(50290), +(50291), +(50293), +(50295), +(50299), +(50301), +(50303), +(50305), +(50306), +(50307), +(50319), +(50323), +(50328), +(50335), +(50341), +(50343), +(50344), +(50347), +(50349), +(50356), +(50361), +(50370), +(50375), +(50377), +(50378), +(50379), +(50380), +(50400), +(50401), +(50402), +(50403), +(50405), +(50406), +(50410), +(50411), +(50412), +(50424), +(50431), +(50432), +(50434), +(50435), +(50436), +(50437), +(50439), +(50445), +(50454), +(50455), +(50456), +(50459), +(50462), +(50463), +(50464), +(50477), +(50478), +(50479), +(50484), +(50498), +(50499), +(50500), +(50504), +(50508), +(50509), +(50510), +(50511), +(50512), +(50517), +(50518), +(50519), +(50521), +(50523), +(50533), +(50534), +(50536), +(50537), +(50538), +(50541), +(50545), +(50550), +(50559), +(50566), +(50572), +(50573), +(50578), +(50581), +(50582), +(50588), +(50597), +(50629), +(50631), +(50633), +(50634), +(50635), +(50638), +(50655), +(50658), +(50659), +(50660), +(50661), +(50662), +(50663), +(50666), +(50668), +(50673), +(50675), +(50679), +(50688), +(50691), +(50693), +(50701), +(50704), +(50705), +(50706), +(50721), +(50725), +(50729), +(50731), +(50732), +(50733), +(50737), +(50739), +(50740), +(50744), +(50761), +(50770), +(50773), +(50782), +(50783), +(50796), +(50797), +(50799), +(50804), +(50818), +(50820), +(50821), +(50830), +(50832), +(50834), +(50842), +(50843), +(50844), +(50845), +(50846), +(50853), +(50854), +(50859), +(50861), +(50874), +(50876), +(50894), +(50895), +(50900), +(50905), +(50907), +(50914), +(50918), +(50919), +(50923), +(50924), +(50926), +(50927), +(50978), +(50979), +(50992), +(50997), +(51011), +(51015), +(51016), +(51018), +(51020), +(51026), +(51035), +(51037), +(51046), +(51054), +(51055), +(51057), +(51059), +(51062), +(51064), +(51067), +(51069), +(51072), +(51077), +(51079), +(51081), +(51083), +(51085), +(51087), +(51089), +(51091), +(51093), +(51095), +(51097), +(51100), +(51102), +(51105), +(51107), +(51111), +(51120), +(51121), +(51131), +(51134), +(51135), +(51137), +(51154), +(51156), +(51157), +(51165), +(51187), +(51196), +(51197), +(51198), +(51199), +(51200), +(51203), +(51216), +(51220), +(51221), +(51226), +(51227), +(51228), +(51229), +(51232), +(51233), +(51235), +(51236), +(51240), +(51243), +(51258), +(51259), +(51270), +(51272), +(51275), +(51279), +(51285), +(51287), +(51290), +(51292), +(51298), +(51305), +(51308), +(51310), +(51315), +(51316), +(51325), +(51326), +(51327), +(51328), +(51330), +(51334), +(51339), +(51340), +(51354), +(51356), +(51363), +(51365), +(51372), +(51382), +(51399), +(51409), +(51410), +(51411), +(51413), +(51416), +(51417), +(51418), +(51419), +(51423), +(51424), +(51425), +(51426), +(51427), +(51428), +(51429), +(51430), +(51431), +(51432), +(51440), +(51442), +(51446), +(51447), +(51454), +(51460), +(51467), +(51484), +(51489), +(51491), +(51492), +(51495), +(51496), +(51500), +(51502), +(51503), +(51504), +(51505), +(51506), +(51509), +(51514), +(51515), +(51573), +(51580), +(51584), +(51585), +(51586), +(51587), +(51588), +(51591), +(51592), +(51593), +(51596), +(51598), +(51601), +(51608), +(51609), +(51610), +(51613), +(51614), +(51618), +(51656), +(51657), +(51658), +(51659), +(51662), +(51675), +(51676), +(51677), +(51680), +(51693), +(51695), +(51699), +(51714), +(51718), +(51722), +(51724), +(51726), +(51728), +(51732), +(51734), +(51735), +(51736), +(51740), +(51751), +(51756), +(51757), +(51772), +(51775), +(51776), +(51778), +(51779), +(51786), +(51787), +(51797), +(51798), +(51799), +(51803), +(51804), +(51808), +(51809), +(51811), +(51818), +(51827), +(51830), +(51842), +(51844), +(51853), +(51854), +(51855), +(51856), +(51857), +(51863), +(51864), +(51872), +(51875), +(51876), +(51877), +(51878), +(51879), +(51886), +(51888), +(51889), +(51893), +(51894), +(51895), +(51897), +(51898), +(51899), +(51901), +(51909), +(51912), +(51917), +(51918), +(51919), +(51920), +(51926), +(51934), +(51935), +(51936), +(51937), +(51940), +(51945), +(51949), +(51951), +(51961), +(51962), +(51963), +(51968), +(51973), +(51976), +(51979), +(51981), +(51989), +(51990), +(51997), +(51998), +(51999), +(52000), +(52004), +(52005), +(52007), +(52008), +(52014), +(52025), +(52026), +(52030), +(52032), +(52042), +(52043), +(52045), +(52053), +(52069), +(52078), +(52082), +(52083), +(52086), +(52088), +(52090), +(52108), +(52125), +(52139), +(52149), +(52157), +(52160), +(52163), +(52167), +(52169), +(52171), +(52187), +(52194), +(52196), +(52198), +(52199), +(52206), +(52207), +(52209), +(52210), +(52212), +(52217), +(52219), +(52221), +(52223), +(52224), +(52228), +(52229), +(52230), +(52251), +(52252), +(52253), +(52256), +(52261), +(52263), +(52265), +(52267), +(52270), +(52280), +(52282), +(52292), +(52307), +(52312), +(52318), +(52327), +(52328), +(52334), +(52345), +(52346), +(52352), +(52353), +(52355), +(52356), +(52359), +(52360), +(52361), +(52364), +(52372), +(52373), +(52374), +(52375), +(52383), +(52389), +(52391), +(52401), +(52402), +(52415), +(52425), +(52428), +(52430), +(52431), +(52433), +(52444), +(52445), +(52447), +(52460), +(52463), +(52465), +(52466), +(52468), +(52469), +(52471), +(52472), +(52473), +(52474), +(52475), +(52476), +(52486), +(52487), +(52496), +(52498), +(52499), +(52501), +(52502), +(52504), +(52506), +(52511), +(52515), +(52519), +(52521), +(52522), +(52527), +(52532), +(52534), +(52536), +(52537), +(52538), +(52540), +(52542), +(52544), +(52545), +(52546), +(52547), +(52548), +(52549), +(52554), +(52566), +(52577), +(52581), +(52583), +(52586), +(52587), +(52591), +(52594), +(52595), +(52596), +(52600), +(52601), +(52604), +(52608), +(52609), +(52610), +(52613), +(52620), +(52631), +(52633), +(52643), +(52644), +(52655), +(52657), +(52658), +(52660), +(52672), +(52675), +(52680), +(52684), +(52695), +(52696), +(52699), +(52700), +(52702), +(52705), +(52708), +(52709), +(52711), +(52713), +(52715), +(52718), +(52719), +(52721), +(52722), +(52737), +(52740), +(52741), +(52743), +(52751), +(52752), +(52754), +(52755), +(52758), +(52761), +(52762), +(52764), +(52771), +(52772), +(52773), +(52778), +(52781), +(52782), +(52784), +(52789), +(52794), +(52806), +(52807), +(52813), +(52814), +(52818), +(52825), +(52835), +(52839), +(52851), +(52856), +(52859), +(52862), +(52863), +(52864), +(52871), +(52872), +(52873), +(52883), +(52885), +(52889), +(52890), +(52904), +(52905), +(52909), +(52921), +(52926), +(52931), +(52932), +(52939), +(52943), +(52986), +(52987), +(52988), +(52992), +(52994), +(52996), +(53001), +(53002), +(53003), +(53005), +(53006), +(53007), +(53019), +(53023), +(53027), +(53031), +(53033), +(53043), +(53044), +(53045), +(53051), +(53058), +(53059), +(53060), +(53062), +(53068), +(53069), +(53070), +(53072), +(53073), +(53085), +(53086), +(53087), +(53088), +(53089), +(53094), +(53098), +(53099), +(53100), +(53101), +(53102), +(53108), +(53109), +(53111), +(53116), +(53141), +(53145), +(53148), +(53150), +(53153), +(53158), +(53174), +(53191), +(53193), +(53194), +(53195), +(53208), +(53209), +(53214), +(53254), +(53271), +(53288), +(53289), +(53301), +(53307), +(53308), +(53310), +(53311), +(53313), +(53314), +(53317), +(53318), +(53322), +(53326), +(53327), +(53329), +(53330), +(53332), +(53333), +(53335), +(53338), +(53339), +(53340), +(53346), +(53351), +(53352), +(53353), +(53357), +(53359), +(53364), +(53366), +(53372), +(53388), +(53394), +(53395), +(53396), +(53402), +(53404), +(53407), +(53408), +(53418), +(53422), +(53424), +(53425), +(53431), +(53435), +(53437), +(53438), +(53442), +(53449), +(53460), +(53477), +(53480), +(53492), +(53493), +(53498), +(53499), +(53508), +(53509), +(53526), +(53528), +(53529), +(53532), +(53533), +(53534), +(53536), +(53537), +(53538), +(53540), +(53542), +(53543), +(53544), +(53545), +(53546), +(53547), +(53548), +(53549), +(53550), +(53558), +(53559), +(53560), +(53561), +(53562), +(53564), +(53565), +(53566), +(53567), +(53568), +(53571), +(53572), +(53573), +(53574), +(53575), +(53578), +(53579), +(53580), +(53581), +(53582), +(53584), +(53586), +(53587), +(53588), +(53589), +(53595), +(53600), +(53601), +(53617), +(53618), +(53625), +(53629), +(53631), +(53633), +(53638), +(53639), +(53652), +(53653), +(53654), +(53659), +(53669), +(53697), +(53704), +(53719), +(53726), +(53733), +(53739), +(53742), +(53769), +(53772), +(53786), +(53788), +(53799), +(53807), +(53809), +(53810), +(53815), +(53821), +(53824), +(54016), +(54028), +(54029), +(54035), +(54039), +(54042), +(54049), +(54050), +(54051), +(54052), +(54053), +(54060), +(54063), +(54068), +(54070), +(54071), +(54074), +(54075), +(54076), +(54077), +(54078), +(54079), +(54080), +(54092), +(54094), +(54095), +(54096), +(54113), +(54121), +(54126), +(54129), +(54132), +(54135), +(54158), +(54169), +(54172), +(54175), +(54183), +(54185), +(54188), +(54190), +(54191), +(54195), +(54196), +(54198), +(54203), +(54216), +(54226), +(54235), +(54237), +(54238), +(54249), +(54260), +(54261), +(54273), +(54283), +(54284), +(54290), +(54299), +(54303), +(54309), +(54311), +(54315), +(54316), +(54319), +(54321), +(54324), +(54331), +(54334), +(54335), +(54337), +(54338), +(54339), +(54340), +(54345), +(54350), +(54361), +(54376), +(54378), +(54380), +(54387), +(54393), +(54394), +(54395), +(54396), +(54399), +(54416), +(54417), +(54429), +(54431), +(54433), +(54451), +(54453), +(54458), +(54459), +(54460), +(54468), +(54470), +(54479), +(54485), +(54487), +(54491), +(54495), +(54498), +(54499), +(54502), +(54504), +(54507), +(54511), +(54514), +(54518), +(54521), +(54525), +(54526), +(54527), +(54531), +(54532), +(54540), +(54549), +(54565), +(54573), +(54576), +(54577), +(54578), +(54587), +(54588), +(54593), +(54594), +(54602), +(54604), +(54609), +(54610), +(54611), +(54612), +(54613), +(54615), +(54616), +(54617), +(54618), +(54619), +(54620), +(54622), +(54624), +(54630), +(54631), +(54632), +(54634), +(54640), +(54644), +(54646), +(54648), +(54651), +(54660), +(54662), +(54663), +(54667), +(54668), +(54673), +(54675), +(54677), +(54679), +(54680), +(54688), +(54689), +(54694), +(54702), +(54703), +(54704), +(54706), +(54708), +(54709), +(54716), +(54719), +(54723), +(54755), +(54757), +(54761), +(54770), +(54772), +(54781), +(54785), +(54788), +(54790), +(54791), +(54794), +(54799), +(54801), +(54804), +(54805), +(54820), +(54822), +(54823), +(54843), +(54846), +(54880), +(54881), +(54882), +(54883), +(54884), +(54885), +(54886), +(54887), +(54900), +(54906), +(54908), +(54919), +(54920), +(54932), +(54933), +(54951), +(54956), +(54957), +(54958), +(54965), +(54970), +(54971), +(54973), +(54974), +(54975), +(54976), +(54977), +(54982), +(54983), +(54986), +(54987), +(54992), +(54997), +(55006), +(55007), +(55008), +(55009), +(55021), +(55029), +(55039), +(55041), +(55046), +(55050), +(55051), +(55054), +(55065), +(55066), +(55069), +(55070), +(55071), +(55074), +(55075), +(55078), +(55079), +(55090), +(55093), +(55095), +(55102), +(55104), +(55144), +(55160), +(55168), +(55196), +(55209), +(55210), +(55216), +(55217), +(55218), +(55219), +(55220), +(55224), +(55225), +(55226), +(55240), +(55241), +(55253), +(55255), +(55258), +(55259), +(55260), +(55261), +(55262), +(55263), +(55264), +(55265), +(55268), +(55269), +(55270), +(55271), +(55274), +(55276), +(55277), +(55281), +(55284), +(55313), +(55314), +(55317), +(55318), +(55319), +(55320), +(55321), +(55322), +(55324), +(55331), +(55334), +(55346), +(55348), +(55359), +(55360), +(55363), +(55364), +(55411), +(55412), +(55416), +(55424), +(55425), +(55430), +(55469), +(55470), +(55482), +(55483), +(55484), +(55485), +(55487), +(55488), +(55489), +(55490), +(55491), +(55492), +(55495), +(55496), +(55497), +(55498), +(55499), +(55504), +(55505), +(55506), +(55507), +(55508), +(55509), +(55511), +(55520), +(55521), +(55530), +(55536), +(55549), +(55550), +(55555), +(55556), +(55557), +(55567), +(55568), +(55569), +(55579), +(55581), +(55582), +(55597), +(55598), +(55599), +(55602), +(55604), +(55605), +(55613), +(55622), +(55624), +(55625), +(55643), +(55645), +(55646), +(55648), +(55652), +(55659), +(55700), +(55703), +(55704), +(55716), +(55719), +(55728), +(55736), +(55748), +(55749), +(55750), +(55751), +(55752), +(55753), +(55754), +(55756), +(55770), +(55771), +(55772), +(55778), +(55779), +(55780), +(55781), +(55790), +(55797), +(55802), +(55804), +(55809), +(55813), +(55815), +(55818), +(55823), +(55824), +(55838), +(55840), +(55841), +(55864), +(55874), +(55877), +(55880), +(55890), +(55894), +(55929), +(55931), +(55932), +(55933), +(55935), +(55936), +(55937), +(55939), +(55951), +(55958), +(55959), +(55960), +(55962), +(55963), +(55968), +(55973), +(55978), +(55981), +(55982), +(55983), +(55984), +(56033), +(56036), +(56038), +(56046), +(56061), +(56071), +(56072), +(56090), +(56091), +(56092), +(56098), +(56104), +(56106), +(56107), +(56112), +(56113), +(56115), +(56122), +(56123), +(56125), +(56127), +(56130), +(56131), +(56132), +(56138), +(56139), +(56141), +(56143), +(56144), +(56147), +(56149), +(56160), +(56161), +(56185), +(56190), +(56191), +(56198), +(56200), +(56211), +(56222), +(56223), +(56230), +(56236), +(56239), +(56252), +(56254), +(56260), +(56277), +(56287), +(56305), +(56320), +(56326), +(56329), +(56331), +(56332), +(56346), +(56351), +(56352), +(56361), +(56362), +(56379), +(56404), +(56405), +(56411), +(56425), +(56426), +(56430), +(56433), +(56434), +(56440), +(56442), +(56444), +(56447), +(56448), +(56485), +(56491), +(56506), +(56513), +(56515), +(56517), +(56520), +(56521), +(56525), +(56536), +(56537), +(56539), +(56545), +(56557), +(56559), +(56562), +(56564), +(56565), +(56581), +(56582), +(56584), +(56586), +(56603), +(56605), +(56606), +(56607), +(56609), +(56624), +(56626), +(56627), +(56628), +(56629), +(56630), +(56631), +(56640), +(56641), +(56645), +(56659), +(56662), +(56664), +(56666), +(56668), +(56670), +(56671), +(56672), +(56678), +(56685), +(56687), +(56698), +(56699), +(56701), +(56707), +(56715), +(56718), +(56719), +(56720), +(56721), +(56727), +(56728), +(56729), +(56730), +(56731), +(56734), +(56753), +(56754), +(56755), +(56760), +(56761), +(56770), +(56771), +(56772), +(56773), +(56774), +(56775), +(56776), +(56777), +(56780), +(56781), +(56785), +(56790), +(56791), +(56795), +(56796), +(56797), +(56815), +(56854), +(56860), +(56861), +(56862), +(56891), +(56893), +(56896), +(56898), +(56902), +(56903), +(56905), +(56906), +(56907), +(56909), +(56917), +(56918), +(56919), +(56920), +(56921), +(56922), +(56923), +(56925), +(56933), +(56937), +(56938), +(56939), +(56940), +(56966), +(56969), +(57049), +(57050), +(57052), +(57053), +(57058), +(57062), +(57063), +(57089), +(57090), +(57094), +(57095), +(57108), +(57118), +(57143), +(57292), +(57305), +(57323), +(57337), +(57346), +(57347), +(57369), +(57374), +(57376), +(57380), +(57384), +(57386), +(57388), +(57389), +(57390), +(57391), +(57392), +(57393), +(57395), +(57397), +(57402), +(57407), +(57411), +(57413), +(57420), +(57454), +(57456), +(57461), +(57464), +(57465), +(57466), +(57473), +(57480), +(57486), +(57487), +(57488), +(57490), +(57506), +(57507), +(57528), +(57530), +(57536), +(57537), +(57547), +(57548), +(57553), +(57554), +(57556), +(57573), +(57580), +(57582), +(57587), +(57589), +(57590), +(57593), +(57594), +(57596), +(57599), +(57601), +(57602), +(57603), +(57615), +(57616), +(57617), +(57620), +(57628), +(57635), +(57640), +(57641), +(57644), +(57645), +(57647), +(57648), +(57651), +(57657), +(57661), +(57665), +(57670), +(57671), +(57677), +(57679), +(57723), +(57724), +(57725), +(57745), +(57755), +(57759), +(57765), +(57766), +(57767), +(57770), +(57774), +(57775), +(57777), +(57778), +(57779), +(57780), +(57781), +(57783), +(57785), +(57787), +(57789), +(57790), +(57795), +(57799), +(57802), +(57807), +(57808), +(57823), +(57825), +(57833), +(57834), +(57838), +(57841), +(57842), +(57845), +(57846), +(57860), +(57863), +(57864), +(57871), +(57874), +(57888), +(57896), +(57897), +(57906), +(57908), +(57914), +(57921), +(57922), +(57941), +(57949), +(57951), +(57964), +(57965), +(57969), +(57970), +(57974), +(57975), +(57981), +(57984), +(57992), +(57993), +(57994), +(58012), +(58021), +(58025), +(58044), +(58054), +(58061), +(58062), +(58071), +(58106), +(58117), +(58118), +(58119), +(58151), +(58154), +(58179), +(58180), +(58181), +(58183), +(58184), +(58187), +(58194), +(58203), +(58204), +(58205), +(58207), +(58208), +(58209), +(58210), +(58211), +(58212), +(58213), +(58214), +(58215), +(58216), +(58217), +(58218), +(58219), +(58220), +(58221), +(58222), +(58223), +(58224), +(58230), +(58270), +(58282), +(58283), +(58349), +(58351), +(58352), +(58371), +(58373), +(58412), +(58418), +(58419), +(58420), +(58421), +(58438), +(58448), +(58449), +(58450), +(58451), +(58452), +(58453), +(58456), +(58457), +(58459), +(58460), +(58461), +(58462), +(58464), +(58466), +(58471), +(58475), +(58494), +(58504), +(58505), +(58508), +(58509), +(58510), +(58511), +(58513), +(58514), +(58516), +(58517), +(58518), +(58519), +(58520), +(58526), +(58529), +(58531), +(58534), +(58535), +(58537), +(58544), +(58548), +(58561), +(58563), +(58564), +(58566), +(58567), +(58597), +(58604), +(58605), +(58607), +(58608), +(58609), +(58610), +(58611), +(58612), +(58617), +(58619), +(58621), +(58622), +(58624), +(58628), +(58632), +(58633), +(58642), +(58644), +(58660), +(58663), +(58664), +(58665), +(58666), +(58667), +(58678), +(58681), +(58683), +(58684), +(58691), +(58700), +(58701), +(58702), +(58743), +(58747), +(58758), +(58769), +(58770), +(58772), +(58781), +(58782), +(58786), +(58787), +(58788), +(58797), +(58798), +(58799), +(58810), +(58811), +(58814), +(58815), +(58816), +(58817), +(58822), +(58823), +(58827), +(58829), +(58830), +(58839), +(58840), +(58843), +(58844), +(58845), +(58847), +(58849), +(58850), +(58855), +(58859), +(58861), +(58867), +(58879), +(58890), +(58896), +(58898), +(58902), +(58905), +(58912), +(58913), +(58915), +(58919), +(58921), +(58922), +(58935), +(58940), +(58941), +(58953), +(58955), +(58959), +(58961), +(58966), +(58967), +(58969), +(58971), +(58972), +(58973), +(58976), +(58978), +(58980), +(58981), +(58987), +(58988), +(58989), +(58991), +(58996), +(59001), +(59006), +(59007), +(59011), +(59013), +(59016), +(59017), +(59019), +(59020), +(59021), +(59023), +(59024), +(59025), +(59034), +(59035), +(59039), +(59040), +(59044), +(59047), +(59050), +(59051), +(59060), +(59064), +(59065), +(59069), +(59079), +(59080), +(59081), +(59082), +(59083), +(59085), +(59100), +(59102), +(59104), +(59105), +(59106), +(59109), +(59110), +(59111), +(59114), +(59119), +(59121), +(59124), +(59130), +(59131), +(59132), +(59133), +(59134), +(59138), +(59142), +(59144), +(59146), +(59147), +(59148), +(59150), +(59151), +(59153), +(59155), +(59160), +(59161), +(59163), +(59164), +(59165), +(59166), +(59167), +(59168), +(59169), +(59170), +(59171), +(59172), +(59178), +(59179), +(59180), +(59182), +(59185), +(59186), +(59187), +(59191), +(59192), +(59199), +(59209), +(59210), +(59211), +(59215), +(59220), +(59223), +(59225), +(59226), +(59228), +(59233), +(59235), +(59237), +(59239), +(59241), +(59242), +(59243), +(59244), +(59246), +(59247), +(59248), +(59249), +(59251), +(59252), +(59254), +(59256), +(59257), +(59259), +(59260), +(59261), +(59262), +(59263), +(59264), +(59265), +(59268), +(59269), +(59270), +(59271), +(59273), +(59280), +(59288), +(59290), +(59300), +(59304), +(59318), +(59319), +(59324), +(59325), +(59329), +(59330), +(59331), +(59342), +(59343), +(59344), +(59346), +(59347), +(59348), +(59350), +(59351), +(59352), +(59355), +(59357), +(59359), +(59361), +(59362), +(59364), +(59367), +(59371), +(59373), +(59374), +(59376), +(59381), +(59389), +(59391), +(59392), +(59395), +(59397), +(59398), +(59399), +(59400), +(59401), +(59402), +(59408), +(59409), +(59412), +(59413), +(59423), +(59432), +(59434), +(59439), +(59444), +(59448), +(59455), +(59460), +(59467), +(59468), +(59471), +(59482), +(59485), +(59513), +(59515), +(59517), +(59519), +(59520), +(59525), +(59530), +(59542), +(59543), +(59544), +(59545), +(59547), +(59548), +(59557), +(59558), +(59563), +(59575), +(59577), +(59590), +(59593), +(59594), +(59599), +(59603), +(59604), +(59605), +(59606), +(59607), +(59608), +(59610), +(59611), +(59616), +(59617), +(59633), +(59634), +(59637), +(59638), +(59651), +(59653), +(59656), +(59661), +(59663), +(59679), +(59682), +(59683), +(59684), +(59685), +(59691), +(59695), +(59696), +(59700), +(59703), +(59710), +(59712), +(59713), +(59715), +(59716), +(59717), +(59718), +(59723), +(59727), +(59735), +(59736), +(59742), +(59743), +(59746), +(59750), +(59760), +(59762), +(59763), +(59765), +(59766), +(59767), +(59769), +(59779), +(59795), +(59805), +(59812), +(59813), +(59814), +(59815), +(59817), +(59823), +(59826), +(59827), +(59832), +(59839), +(59840), +(59841), +(59844), +(59846), +(59851), +(59852), +(59855), +(59856), +(59863), +(59864), +(59877), +(59879), +(59881), +(59882), +(59883), +(59884), +(59885), +(59886), +(59894), +(59901), +(59921), +(59963), +(59965), +(59972), +(59974), +(59978), +(59982), +(59984), +(59985), +(59986), +(59987), +(59988), +(59989), +(59991), +(59992), +(59993), +(59994), +(59997), +(59999), +(60003), +(60004), +(60005), +(60006), +(60008), +(60009), +(60011), +(60012), +(60013), +(60015), +(60016), +(60017), +(60018), +(60032), +(60035), +(60039), +(60041), +(60043), +(60051), +(60052), +(60053), +(60067), +(60073), +(60076), +(60078), +(60079), +(60080), +(60085), +(60089), +(60100), +(60103), +(60106), +(60107), +(60111), +(60112), +(60115), +(60117), +(60122), +(60123), +(60127), +(60129), +(60181), +(60183), +(60186), +(60194), +(60195), +(60197), +(60203), +(60204), +(60210), +(60211), +(60212), +(60229), +(60233), +(60234), +(60235), +(60236), +(60239), +(60241), +(60300), +(60307), +(60309), +(60339), +(60351), +(60352), +(60428), +(60431), +(60432), +(60433), +(60440), +(60443), +(60446), +(60447), +(60450), +(60452), +(60453), +(60472), +(60474), +(60483), +(60488), +(60500), +(60504), +(60505), +(60506), +(60518), +(60526), +(60530), +(60540), +(60541), +(60542), +(60578), +(60580), +(60585), +(60588), +(60590), +(60626), +(60642), +(60644), +(60646), +(60654), +(60672), +(60678), +(60682), +(60683), +(60699), +(60708), +(60742), +(60753), +(60781), +(60782), +(60784), +(60785), +(60786), +(60790), +(60802), +(60803), +(60805), +(60809), +(60814), +(60817), +(60842), +(60844), +(60850), +(60856), +(60857), +(60859), +(60868), +(60869), +(60870), +(60871), +(60872), +(60873), +(60876), +(60880), +(60882), +(60890), +(60896), +(60897), +(60898), +(60899), +(60900), +(60901), +(60905), +(60906), +(60917), +(60918), +(60924), +(60926), +(60927), +(60930), +(60932), +(60935), +(60940), +(60941), +(60944), +(60945), +(60946), +(60947), +(60949), +(60950), +(60951), +(60952), +(60954), +(60959), +(60961), +(60962), +(60963), +(60965), +(60968), +(60972), +(60973), +(60979), +(60980), +(60981), +(60982), +(60983), +(60988), +(60991), +(60995), +(61001), +(61005), +(61006), +(61016), +(61018), +(61024), +(61025), +(61029), +(61034), +(61036), +(61039), +(61041), +(61042), +(61046), +(61048), +(61051), +(61064), +(61070), +(61077), +(61080), +(61083), +(61087), +(61091), +(61094), +(61100), +(61101), +(61103), +(61109), +(61110), +(61111), +(61115), +(61123), +(61124), +(61127), +(61129), +(61133), +(61140), +(61143), +(61159), +(61160), +(61162), +(61164), +(61166), +(61168), +(61171), +(61172), +(61173), +(61176), +(61178), +(61182), +(61186), +(61187), +(61191), +(61193), +(61194), +(61195), +(61196), +(61197), +(61198), +(61209), +(61211), +(61213), +(61215), +(61218), +(61223), +(61226), +(61242), +(61243), +(61244), +(61253), +(61259), +(61260), +(61263), +(61269), +(61272), +(61281), +(61282), +(61286), +(61287), +(61291), +(61295), +(61296), +(61299), +(61300), +(61301), +(61302), +(61305), +(61314), +(61319), +(61320), +(61326), +(61327), +(61343), +(61344), +(61347), +(61352), +(61358), +(61372), +(61373), +(61374), +(61375), +(61380), +(61381), +(61382), +(61385), +(61395), +(61398), +(61399), +(61409), +(61411), +(61415), +(61419), +(61420), +(61421), +(61423), +(61424), +(61443), +(61445), +(61448), +(61454), +(61457), +(61461), +(61466), +(61474), +(61479), +(61480), +(61486), +(61490), +(61491), +(61493), +(61507), +(61511), +(61512), +(61515), +(61528), +(61545), +(61549), +(61550), +(61552), +(61554), +(61556), +(61558), +(61561), +(61562), +(61563), +(61565), +(61567), +(61569), +(61572), +(61579), +(61584), +(61590), +(61592), +(61593), +(61596), +(61597), +(61599), +(61600), +(61601), +(61604), +(61606), +(61607), +(61613), +(61621), +(61623), +(61624), +(61626), +(61627), +(61628), +(61634), +(61635), +(61662), +(61663), +(61666), +(61667), +(61668), +(61676), +(61685), +(61696), +(61705), +(61712), +(61716), +(61721), +(61728), +(61729), +(61730), +(61733), +(61747), +(61767), +(61780), +(61781), +(61789), +(61791), +(61793), +(61794), +(61795), +(61796), +(61797), +(61798), +(61799), +(61800), +(61801), +(61802), +(61804), +(61805), +(61806), +(61807), +(61808), +(61815), +(61817), +(61819), +(61821), +(61822), +(61823), +(61824), +(61825), +(61832), +(61833), +(61834), +(61835), +(61836), +(61837), +(61838), +(61839), +(61840), +(61841), +(61842), +(61843), +(61844), +(61845), +(61849), +(61857), +(61859), +(61862), +(61866), +(61868), +(61870), +(61873), +(61879), +(61880), +(61881), +(61888), +(61893), +(61895), +(61896), +(61897), +(61903), +(61909), +(61911), +(61912), +(61923), +(61924), +(61925), +(61926), +(61927), +(61928), +(61929), +(61965), +(61967), +(61973), +(61998), +(62014), +(62026), +(62030), +(62036), +(62053), +(62063), +(62078), +(62089), +(62103), +(62105), +(62117), +(62118), +(62119), +(62120), +(62121), +(62122), +(62124), +(62128), +(62129), +(62130), +(62131), +(62138), +(62167), +(62169), +(62195), +(62198), +(62204), +(62225), +(62226), +(62249), +(62250), +(62261), +(62264), +(62265), +(62280), +(62292), +(62298), +(62305), +(62309), +(62310), +(62312), +(62315), +(62316), +(62317), +(62318), +(62322), +(62326), +(62327), +(62328), +(62331), +(62332), +(62333), +(62334), +(62335), +(62342), +(62347), +(62354), +(62356), +(62368), +(62372), +(62373), +(62382), +(62395), +(62401), +(62402), +(62415), +(62417), +(62418), +(62420), +(62441), +(62442), +(62443), +(62444), +(62445), +(62446), +(62455), +(62456), +(62466), +(62479), +(62482), +(62503), +(62507), +(62526), +(62531), +(62536), +(62540), +(62544), +(62554), +(62563), +(62575), +(62581), +(62583), +(62589), +(62601), +(62607), +(62608), +(62611), +(62613), +(62614), +(62626), +(62638), +(62648), +(62649), +(62653), +(62658), +(62672), +(62673), +(62707), +(62708), +(62711), +(62717), +(62722), +(62726), +(62732), +(62767), +(62768), +(62769), +(62793), +(62796), +(62806), +(62832), +(62836), +(62844), +(62845), +(62846), +(62854), +(62855), +(62863), +(62867), +(62874), +(62875), +(62881), +(62900), +(62901), +(62902), +(62903), +(62904), +(62928), +(62935), +(62938), +(62939), +(62960), +(62961), +(62989), +(62997), +(62998), +(63003), +(63010), +(63012), +(63028), +(63034), +(63035), +(63036), +(63047), +(63082), +(63094), +(63103), +(63104), +(63105), +(63111), +(63112), +(63120), +(63124), +(63125), +(63126), +(63127), +(63134), +(63136), +(63138), +(63147), +(63151), +(63169), +(63171), +(63172), +(63174), +(63175), +(63177), +(63178), +(63179), +(63180), +(63183), +(63184), +(63185), +(63216), +(63221), +(63226), +(63228), +(63233), +(63240), +(63242), +(63259), +(63276), +(63278), +(63301), +(63311), +(63313), +(63314), +(63315), +(63316), +(63336), +(63337), +(63338), +(63344), +(63345), +(63356), +(63359), +(63361), +(63362), +(63363), +(63380), +(63382), +(63413), +(63416), +(63418), +(63459), +(63462), +(63463), +(63464), +(63465), +(63466), +(63468), +(63477), +(63479), +(63487), +(63493), +(63494), +(63495), +(63511), +(63518), +(63519), +(63529), +(63535), +(63536), +(63544), +(63549), +(63550), +(63551), +(63553), +(63556), +(63559), +(63562), +(63564), +(63569), +(63571), +(63573), +(63575), +(63599), +(63605), +(63612), +(63615), +(63619), +(63652), +(63653), +(63654), +(63655), +(63661), +(63668), +(63669), +(63670), +(63671), +(63672), +(63673), +(63675), +(63678), +(63685), +(63689), +(63691), +(63699), +(63700), +(63716), +(63728), +(63736), +(63738), +(63754), +(63755), +(63759), +(63760), +(63789), +(63803), +(63804), +(63809), +(63815), +(63823), +(63825), +(63827), +(63845), +(63846), +(63852), +(63861), +(63913), +(63914), +(63915), +(63916), +(63917), +(63918), +(63919), +(63920), +(63921), +(63922), +(63923), +(63931), +(63980), +(63989), +(63993), +(63995), +(63997), +(63998), +(64003), +(64005), +(64006), +(64014), +(64024), +(64025), +(64026), +(64027), +(64028), +(64029), +(64030), +(64031), +(64032), +(64034), +(64036), +(64039), +(64044), +(64058), +(64065), +(64085), +(64090), +(64097), +(64102), +(64104), +(64107), +(64113), +(64114), +(64115), +(64119), +(64123), +(64128), +(64134), +(64136), +(64138), +(64142), +(64151), +(64152), +(64153), +(64156), +(64157), +(64159), +(64160), +(64186), +(64204), +(64211), +(64212), +(64213), +(64215), +(64230), +(64269), +(64324), +(64328), +(64330), +(64331), +(64332), +(64333), +(64334), +(64335), +(64336), +(64337), +(64338), +(64339), +(64342), +(64346), +(64363), +(64365), +(64367), +(64374), +(64375), +(64376), +(64377), +(64380), +(64382), +(64387), +(64388), +(64390), +(64391), +(64395), +(64396), +(64412), +(64413), +(64429), +(64430), +(64442), +(64467), +(64478), +(64496), +(64499), +(64501), +(64507), +(64528), +(64529), +(64535), +(64542), +(64552), +(64580), +(64583), +(64588), +(64590), +(64591), +(64592), +(64595), +(64627), +(64637), +(64638), +(64640), +(64646), +(64647), +(64648), +(64649), +(64654), +(64665), +(64666), +(64667), +(64668), +(64669), +(64674), +(64682), +(64686), +(64692), +(64696), +(64698), +(64699), +(64705), +(64719), +(64740), +(64757), +(64758), +(64759), +(64766), +(64768), +(64771), +(64773), +(64776), +(64780), +(64787), +(64795), +(64798), +(64801), +(64806), +(64807), +(64821), +(64841), +(64870), +(64874), +(64876), +(64888), +(64891), +(64903), +(64909), +(64918), +(64930), +(64953), +(64967), +(64970), +(64971), +(64974), +(64978), +(64991), +(65030), +(65031), +(65033), +(65035), +(65036), +(65038), +(65039), +(65040), +(65042), +(65054), +(65055), +(65056), +(65057), +(65058), +(65059), +(65061), +(65062), +(65071), +(65080), +(65081), +(65104), +(65111), +(65113), +(65122), +(65123), +(65131), +(65133), +(65147), +(65162), +(65201), +(65210), +(65240), +(65266), +(65280), +(65343), +(65351), +(65359), +(65360), +(65374), +(65378), +(65379), +(65386), +(65391), +(65392), +(65403), +(65431), +(65488), +(65490), +(65492), +(65502), +(65503), +(65512), +(65513), +(65516), +(65531), +(65532), +(65541), +(65542), +(65545), +(65546), +(65564), +(65565), +(65575), +(65576), +(65577), +(65634), +(65635), +(65636), +(65647), +(65648), +(65693), +(65694), +(65703), +(65720), +(65722), +(65723), +(65728), +(65729), +(65744), +(65754), +(65775), +(65778), +(65782), +(65790), +(65791), +(65799), +(65801), +(65807), +(65809), +(65810), +(65812), +(65813), +(65814), +(65815), +(65819), +(65820), +(65821), +(65825), +(65826), +(65854), +(65855), +(65856), +(65857), +(65859), +(65862), +(65863), +(65866), +(65867), +(65868), +(65877), +(65878), +(65881), +(65883), +(65918), +(65924), +(65926), +(65927), +(65929), +(65930), +(65931), +(65934), +(65935), +(65936), +(65940), +(65941), +(65954), +(65957), +(65960), +(65962), +(65970), +(65971), +(65972), +(65973), +(65974), +(65978), +(65987), +(65998), +(66003), +(66005), +(66007), +(66008), +(66009), +(66012), +(66017), +(66018), +(66019), +(66020), +(66021), +(66042), +(66043), +(66045), +(66047), +(66053), +(66054), +(66055), +(66056), +(66057), +(66063), +(66065), +(66066), +(66067), +(66068), +(66069), +(66070), +(66072), +(66075), +(66079), +(66081), +(66093), +(66095), +(66097), +(66099), +(66100), +(66104), +(66109), +(66112), +(66113), +(66114), +(66115), +(66116), +(66125), +(66126), +(66134), +(66154), +(66177), +(66188), +(66196), +(66197), +(66198), +(66206), +(66207), +(66209), +(66213), +(66215), +(66216), +(66217), +(66236), +(66237), +(66240), +(66243), +(66244), +(66245), +(66250), +(66259), +(66260), +(66261), +(66262), +(66265), +(66283), +(66285), +(66290), +(66291), +(66292), +(66293), +(66294), +(66295), +(66313), +(66326), +(66331), +(66334), +(66342), +(66359), +(66377), +(66378), +(66407), +(66408), +(66409), +(66410), +(66417), +(66420), +(66423), +(66425), +(66457), +(66460), +(66461), +(66474), +(66477), +(66479), +(66480), +(66481), +(66489), +(66493), +(66516), +(66528), +(66532), +(66533), +(66536), +(66537), +(66538), +(66548), +(66549), +(66588), +(66592), +(66593), +(66594), +(66595), +(66596), +(66613), +(66619), +(66620), +(66629), +(66638), +(66666), +(66668), +(66669), +(66686), +(66687), +(66688), +(66689), +(66716), +(66717), +(66719), +(66733), +(66735), +(66736), +(66742), +(66744), +(66765), +(66770), +(66773), +(66777), +(66784), +(66796), +(66797), +(66809), +(66813), +(66823), +(66824), +(66863), +(66867), +(66869), +(66879), +(66880), +(66887), +(66888), +(66890), +(66891), +(66892), +(66899), +(66903), +(66904), +(66922), +(66940), +(66941), +(66950), +(66951), +(66952), +(66953), +(66954), +(66955), +(66957), +(66958), +(66959), +(66960), +(66961), +(66962), +(66963), +(66964), +(66965), +(66972), +(66973), +(66974), +(66975), +(66976), +(66977), +(66978), +(66979), +(66988), +(66989), +(66990), +(66991), +(66992), +(66994), +(67029), +(67030), +(67031), +(67033), +(67035), +(67049), +(67050), +(67051), +(67073), +(67074), +(67075), +(67088), +(67089), +(67090), +(67097), +(67098), +(67099), +(67114), +(67148), +(67229), +(67235), +(67237), +(67247), +(67252), +(67253), +(67280), +(67289), +(67290), +(67309), +(67310), +(67311), +(67312), +(67313), +(67314), +(67324), +(67325), +(67330), +(67331), +(67333), +(67366), +(67372), +(67373), +(67387), +(67390), +(67477), +(67478), +(67479), +(67480), +(67481), +(67485), +(67518), +(67519), +(67528), +(67529), +(67530), +(67531), +(67532), +(67533), +(67534), +(67540), +(67542), +(67550), +(67554), +(67560), +(67573), +(67574), +(67577), +(67606), +(67607), +(67608), +(67612), +(67613), +(67614), +(67618), +(67619), +(67620), +(67624), +(67625), +(67626), +(67632), +(67633), +(67634), +(67650), +(67651), +(67652), +(67654), +(67655), +(67656), +(67674), +(67675), +(67676), +(67678), +(67679), +(67680), +(67686), +(67703), +(67708), +(67709), +(67710), +(67714), +(67718), +(67719), +(67721), +(67722), +(67724), +(67725), +(67730), +(67745), +(67749), +(67760), +(67767), +(67772), +(67773), +(67774), +(67793), +(67799), +(67810), +(67811), +(67817), +(67818), +(67819), +(67821), +(67823), +(67830), +(67834), +(67835), +(67836), +(67837), +(67838), +(67846), +(67847), +(67861), +(67862), +(67863), +(67878), +(67879), +(67880), +(67881), +(67882), +(67883), +(67884), +(67885), +(67891), +(67892), +(67905), +(67906), +(67907), +(67929), +(67930), +(67931), +(67932), +(67933), +(67934), +(67935), +(67936), +(67937), +(67938), +(67939), +(67940), +(67941), +(67942), +(67943), +(67944), +(67945), +(67946), +(67947), +(67948), +(67949), +(67951), +(67952), +(67953), +(67957), +(67958), +(67959), +(67965), +(67966), +(67967), +(67968), +(67969), +(67970), +(67971), +(67972), +(67973), +(67977), +(67978), +(67979), +(67980), +(67981), +(67982), +(67983), +(67984), +(67985), +(67988), +(67989), +(67990), +(67991), +(67992), +(67993), +(67994), +(67995), +(67996), +(67997), +(67998), +(67999), +(68003), +(68004), +(68005), +(68008), +(68009), +(68010), +(68011), +(68012), +(68013), +(68014), +(68015), +(68016), +(68017), +(68018), +(68019), +(68023), +(68024), +(68025), +(68026), +(68027), +(68028), +(68032), +(68033), +(68034), +(68035), +(68036), +(68037), +(68038), +(68039), +(68040), +(68042), +(68043), +(68044), +(68055), +(68073), +(68077), +(68078), +(68081), +(68088), +(68089), +(68090), +(68091), +(68092), +(68093), +(68094), +(68095), +(68096), +(68100), +(68101), +(68102), +(68106), +(68107), +(68108), +(68109), +(68110), +(68111), +(68112), +(68113), +(68114), +(68115), +(68116), +(68117), +(68118), +(68119), +(68120), +(68123), +(68124), +(68125), +(68130), +(68133), +(68134), +(68135), +(68136), +(68137), +(68138), +(68139), +(68140), +(68141), +(68148), +(68149), +(68150), +(68151), +(68152), +(68153), +(68154), +(68155), +(68156), +(68157), +(68158), +(68159), +(68272), +(68282), +(68284), +(68301), +(68306), +(68307), +(68310), +(68311), +(68313), +(68315), +(68317), +(68318), +(68319), +(68321), +(68328), +(68333), +(68334), +(68340), +(68341), +(68350), +(68357), +(68362), +(68363), +(68364), +(68365), +(68372), +(68391), +(68415), +(68458), +(68472), +(68478), +(68479), +(68498), +(68501), +(68502), +(68503), +(68504), +(68505), +(68550), +(68551), +(68586), +(68587), +(68588), +(68607), +(68621), +(68622), +(68623), +(68624), +(68625), +(68626), +(68627), +(68628), +(68629), +(68727), +(68753), +(68754), +(68755), +(68756), +(68757), +(68758), +(68762), +(68763), +(68764), +(68778), +(68781), +(68782), +(68783), +(68784), +(68788), +(68799), +(68812), +(68834), +(68839), +(68841), +(68843), +(68868), +(68879), +(68884), +(68900), +(68915), +(68927), +(68934), +(68948), +(68966), +(68971), +(68980), +(68982), +(68984), +(68985), +(68991), +(69000), +(69003), +(69021), +(69023), +(69028), +(69034), +(69038), +(69051), +(69058), +(69063), +(69065), +(69066), +(69067), +(69068), +(69088), +(69091), +(69124), +(69128), +(69130), +(69131), +(69133), +(69137), +(69138), +(69153), +(69155), +(69156), +(69158), +(69160), +(69172), +(69180), +(69181), +(69189), +(69190), +(69198), +(69200), +(69209), +(69210), +(69211), +(69212), +(69218), +(69222), +(69232), +(69243), +(69246), +(69274), +(69275), +(69276), +(69285), +(69308), +(69342), +(69352), +(69387), +(69389), +(69391), +(69397), +(69398), +(69403), +(69404), +(69405), +(69406), +(69409), +(69410), +(69416), +(69420), +(69427), +(69438), +(69445), +(69455), +(69483), +(69489), +(69492), +(69496), +(69497), +(69498), +(69499), +(69500), +(69501), +(69503), +(69504), +(69520), +(69528), +(69542), +(69543), +(69544), +(69548), +(69563), +(69564), +(69566), +(69567), +(69569), +(69570), +(69572), +(69573), +(69574), +(69576), +(69577), +(69578), +(69579), +(69581), +(69583), +(69603), +(69617), +(69623), +(69627), +(69633), +(69644), +(69651), +(69668), +(69672), +(69673), +(69675), +(69681), +(69692), +(69693), +(69696), +(69699), +(69710), +(69722), +(69724), +(69726), +(69729), +(69730), +(69731), +(69733), +(69734), +(69771), +(69772), +(69779), +(69828), +(69837), +(69856), +(69861), +(69866), +(69869), +(69871), +(69882), +(69889), +(69891), +(69892), +(69893), +(69896), +(69898), +(69899), +(69902), +(69903), +(69906), +(69910), +(69911), +(69912), +(69916), +(69917), +(69920), +(69923), +(69926), +(69927), +(69933), +(69956), +(69958), +(69961), +(69963), +(69967), +(69968), +(69969), +(69970), +(69972), +(69973), +(69974), +(69975), +(69984), +(69989), +(70002), +(70043), +(70070), +(70074), +(70080), +(70110), +(70119), +(70122), +(70126), +(70141), +(70144), +(70153), +(70161), +(70162), +(70182), +(70183), +(70191), +(70192), +(70196), +(70205), +(70208), +(70211), +(70213), +(70227), +(70269), +(70270), +(70271), +(70273), +(70275), +(70276), +(70277), +(70278), +(70279), +(70280), +(70281), +(70282), +(70285), +(70289), +(70292), +(70296), +(70302), +(70304), +(70308), +(70309), +(70320), +(70322), +(70327), +(70333), +(70337), +(70355), +(70361), +(70381), +(70386), +(70387), +(70388), +(70391), +(70393), +(70396), +(70400), +(70408), +(70409), +(70410), +(70423), +(70428), +(70429), +(70432), +(70435), +(70437), +(70445), +(70449), +(70451), +(70453), +(70495), +(70510), +(70516), +(70525), +(70538), +(70539), +(70540), +(70542), +(70583), +(70594), +(70599), +(70616), +(70639), +(70640), +(70645), +(70646), +(70648), +(70653), +(70656), +(70659), +(70698), +(70746), +(70751), +(70754), +(70772), +(70781), +(70802), +(70809), +(70821), +(70838), +(70856), +(70857), +(70858), +(70859), +(70860), +(70861), +(70864), +(70867), +(70886), +(70890), +(70895), +(70896), +(70897), +(70906), +(70917), +(70923), +(70928), +(70929), +(70942), +(70946), +(70964), +(70965), +(70971), +(70972), +(70973), +(70974), +(70980), +(71003), +(71004), +(71005), +(71006), +(71020), +(71021), +(71023), +(71038), +(71040), +(71041), +(71087), +(71089), +(71090), +(71103), +(71107), +(71108), +(71112), +(71116), +(71117), +(71119), +(71120), +(71121), +(71124), +(71126), +(71127), +(71129), +(71130), +(71131), +(71133), +(71135), +(71136), +(71138), +(71140), +(71141), +(71142), +(71143), +(71144), +(71145), +(71146), +(71148), +(71153), +(71154), +(71155), +(71157), +(71163), +(71164), +(71169), +(71203), +(71204), +(71237), +(71248), +(71253), +(71254), +(71257), +(71264), +(71289), +(71291), +(71296), +(71297), +(71298), +(71316), +(71317), +(71318), +(71319), +(71326), +(71327), +(71328), +(71330), +(71331), +(71335), +(71339), +(71340), +(71350), +(71361), +(71362), +(71363), +(71392), +(71405), +(71410), +(71420), +(71433), +(71434), +(71443), +(71446), +(71450), +(71459), +(71462), +(71466), +(71473), +(71475), +(71476), +(71477), +(71478), +(71479), +(71480), +(71488), +(71489), +(71490), +(71500), +(71501), +(71504), +(71510), +(71512), +(71522), +(71532), +(71533), +(71539), +(71544), +(71546), +(71547), +(71548), +(71549), +(71551), +(71552), +(71553), +(71554), +(71590), +(71591), +(71594), +(71595), +(71607), +(71623), +(71624), +(71625), +(71626), +(71646), +(71647), +(71686), +(71687), +(71688), +(71713), +(71715), +(71726), +(71727), +(71728), +(71729), +(71738), +(71745), +(71748), +(71750), +(71752), +(71757), +(71758), +(71759), +(71760), +(71778), +(71779), +(71780), +(71781), +(71782), +(71783), +(71784), +(71785), +(71786), +(71788), +(71789), +(71801), +(71806), +(71807), +(71815), +(71818), +(71819), +(71820), +(71821), +(71822), +(71823), +(71824), +(71825), +(71834), +(71838), +(71839), +(71841), +(71842), +(71847), +(71864), +(71866), +(71874), +(71879), +(71909), +(71923), +(71924), +(71925), +(71926), +(71927), +(71928), +(71930), +(71931), +(71932), +(71933), +(71934), +(71936), +(71937), +(71938), +(71951), +(71954), +(71955), +(71972), +(71988), +(72004), +(72005), +(72007), +(72008), +(72010), +(72021), +(72022), +(72023), +(72024), +(72057), +(72065), +(72066), +(72098), +(72106), +(72120), +(72121), +(72123), +(72124), +(72133), +(72163), +(72164), +(72166), +(72167), +(72171), +(72194), +(72196), +(72198), +(72208), +(72211), +(72218), +(72219), +(72222), +(72231), +(72258), +(72264), +(72265), +(72266), +(72267), +(72268), +(72269), +(72293), +(72301), +(72302), +(72303), +(72304), +(72313), +(72318), +(72319), +(72321), +(72322), +(72324), +(72326), +(72327), +(72329), +(72330), +(72333), +(72334), +(72335), +(72336), +(72360), +(72366), +(72367), +(72368), +(72369), +(72373), +(72400), +(72409), +(72410), +(72421), +(72422), +(72423), +(72424), +(72426), +(72427), +(72434), +(72437), +(72447), +(72448), +(72449), +(72451), +(72453), +(72457), +(72463), +(72465), +(72484), +(72485), +(72486), +(72487), +(72488), +(72489), +(72490), +(72491), +(72492), +(72501), +(72502), +(72503), +(72504), +(72531), +(72539), +(72540), +(72541), +(72551), +(72552), +(72553), +(72556), +(72558), +(72566), +(72567), +(72568), +(72569), +(72570), +(72571), +(72586), +(72588), +(72590), +(72597), +(72613), +(72617), +(72645), +(72671), +(72672), +(72688), +(72728), +(72756), +(72796), +(72797), +(72798), +(72804), +(72805), +(72806), +(72809), +(72810), +(72811), +(72847), +(72848), +(72865), +(72875), +(72876), +(72879), +(72883), +(72898), +(72901), +(72930), +(72960), +(72961), +(72963), +(72964), +(72965), +(72966), +(72967), +(72985), +(72995), +(73003), +(73040), +(73075), +(73076), +(73079), +(73395), +(73412), +(73488), +(73489), +(73491), +(73492), +(73499), +(73536), +(73574), +(73712), +(73771), +(73772), +(73782), +(73783), +(73784), +(73788), +(73789), +(73790), +(73797), +(73798), +(73799), +(73830), +(73832), +(73833), +(73879), +(73896), +(73906), +(73912), +(73913), +(73914), +(73943), +(73952), +(73985), +(74035), +(74046), +(74062), +(74080), +(74111), +(74162), +(74163), +(74164), +(74166), +(74184), +(74185), +(74222), +(74307), +(74325), +(74326), +(74327), +(74347), +(74367), +(74394), +(74395), +(74403), +(74404), +(74413), +(74414), +(74417), +(74421), +(74422), +(74424), +(74438), +(74445), +(74451), +(74453), +(74454), +(74470), +(74485), +(74502), +(74506), +(74507), +(74524), +(74562), +(74710), +(74749), +(74762), +(74768), +(74772), +(74774), +(74792), +(74797), +(74807), +(74812), +(74904), +(74905), +(74913), +(74978), +(74982), +(75055), +(75058), +(75082), +(75086), +(75088), +(75102), +(75159), +(75160), +(75161), +(75163), +(75168), +(75182), +(75185), +(75186), +(75188), +(75209), +(75213), +(75234), +(75314), +(75327), +(75329), +(75330), +(75331), +(75332), +(75362), +(75366), +(75367), +(75382), +(75383), +(75384), +(75412), +(75419), +(75421), +(75422), +(75423), +(75434), +(75459), +(75493), +(75494), +(75648), +(75731), +(75760), +(75780), +(75888), +(75889), +(75953), +(76096), +(76221), +(79187), +(79397); +CREATE TABLE `temp_cond_vals` +( + `spellId` INT(11), + `elseGroup` INT(11) AUTO_INCREMENT, + `entry` INT(11), + `dead` INT(11), + `errorTextId` INT(11), + `comment` VARCHAR(255), + PRIMARY KEY (`spellId`, `elseGroup`) +) ENGINE=MYISAM; + +CREATE TABLE `temp_item_spell` +( + `itemId` INT(11), + `spellId` INT(11), + PRIMARY KEY (`itemId`, `spellId`) +); + +CREATE TABLE `temp_item` +( + `itemId` INT(11), + PRIMARY KEY (`itemId`) +); + +INSERT INTO `temp_item` SELECT DISTINCT `SourceEntry` FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18; +INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_1` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_1` IN (SELECT * FROM `temp_convert_spells`); +INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_2` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_2` IN (SELECT * FROM `temp_convert_spells`); +INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_3` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_3` IN (SELECT * FROM `temp_convert_spells`); +INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_4` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_4` IN (SELECT * FROM `temp_convert_spells`); +INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_5` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_5` IN (SELECT * FROM `temp_convert_spells`); + +INSERT INTO `temp_cond_vals` (`spellId`, `entry`, `dead`, `errorTextId`, `comment`) SELECT DISTINCT (SELECT `spellId` FROM `temp_item_spell` WHERE `itemId` = `SourceEntry`), `ConditionValue2`, (`ConditionValue1` - 1), `ErrorTextId`, `Comment` FROM `conditions` +WHERE `SourceTypeOrReferenceId` = 18; + +-- use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`) +SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 31, 1, 3, `entry`, 0, 0, `errorTextId`, `comment` FROM `temp_cond_vals`; +-- for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`) +SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 36, 1, 0, 0, 0, 1, `errorTextId`, `comment` FROM `temp_cond_vals` WHERE `dead`; +-- remove entries which could be converted by this sql +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18 AND `SourceEntry` IN (SELECT `itemId` FROM `temp_item_spell`); +DROP TABLE `temp_convert_spells`; +DROP TABLE `temp_cond_vals`; +DROP TABLE `temp_item_spell`; +DROP TABLE `temp_item`; + +ALTER TABLE conditions DROP PRIMARY KEY; +ALTER TABLE conditions ADD PRIMARY KEY (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`); diff --git a/sql/old/3.3.5a/2012_02_16_01_world_conditions.sql b/sql/old/3.3.5a/2012_02_16_01_world_conditions.sql new file mode 100644 index 00000000000..4bcf997b8e4 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_16_01_world_conditions.sql @@ -0,0 +1,3 @@ +UPDATE `conditions` SET ConditionValue3 = 0, ConditionTarget = 1 WHERE ConditionTypeOrReference = 1 AND ConditionValue3 = 1; +UPDATE `conditions` SET ConditionTypeOrReference = 31, ConditionValue2 = ConditionValue1, ConditionValue1 = 3, ConditionTarget = 1 WHERE ConditionTypeOrReference = 19; +UPDATE `conditions` SET ConditionTypeOrReference = 38, ConditionValue2 = 4, ConditionTarget = 1 WHERE ConditionTypeOrReference = 20; diff --git a/sql/old/3.3.5a/2012_02_17_00_world_waypoints.sql b/sql/old/3.3.5a/2012_02_17_00_world_waypoints.sql new file mode 100644 index 00000000000..1cff86f5d51 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_17_00_world_waypoints.sql @@ -0,0 +1,77 @@ +-- Pathing for Eye of Thrallmar +SET @NPC :=57585; +SET @PATH :=@NPC*10; +UPDATE `creature` SET `position_x`=203.191,`position_y`=2850.286,`position_z`=160.4257,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,197.9876,2842.495,160.4257,0,0,0,100,0), +(@PATH,2,212.5493,2807.971,174.2035,0,0,0,100,0), +(@PATH,3,244.0748,2812.302,156.8424,0,0,0,100,0), +(@PATH,4,262.963,2839.935,173.5923,0,0,0,100,0), +(@PATH,5,249.0294,2865.575,155.9257,0,0,0,100,0), +(@PATH,6,223.3671,2870.441,169.5924,0,0,0,100,0), +(@PATH,7,203.191,2850.286,160.4257,0,0,0,100,0); + +-- Pathing for Eye of Thrallmar +SET @NPC :=57586; +SET @PATH :=@NPC*10; +UPDATE `creature` SET `position_x`=210.6249,`position_y`=2809.285,`position_z`=208.7277,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,213.0469,2809.036,207.1722,0,0,0,100,0), +(@PATH,2,223.5349,2797.282,213.4777,0,0,0,100,0), +(@PATH,3,238.895,2805.732,213.4777,0,0,0,100,0), +(@PATH,4,252.788,2818.183,213.4777,0,0,0,100,0), +(@PATH,5,255.2734,2839.056,213.4777,0,0,0,100,0), +(@PATH,6,245.0219,2851.84,213.4777,0,0,0,100,0), +(@PATH,7,229.2117,2860.19,213.4777,0,0,0,100,0), +(@PATH,8,213.6996,2851.376,206.5887,0,0,0,100,0), +(@PATH,9,204.457,2828.248,199.6443,0,0,0,100,0), +(@PATH,10,212.4397,2807.455,199.6443,0,0,0,100,0), +(@PATH,11,241.3802,2813.464,199.6443,0,0,0,100,0), +(@PATH,12,249.7797,2829.964,199.6443,0,0,0,100,0), +(@PATH,13,244.951,2854.129,199.6443,0,0,0,100,0), +(@PATH,14,221.8344,2856.781,199.6443,0,0,0,100,0), +(@PATH,15,210.7503,2837.578,199.6443,0,0,0,100,0), +(@PATH,16,210.6249,2809.285,208.7277,0,0,0,100,0); + +-- Pathing for Eye of Thrallmar +SET @NPC :=57587; +SET @PATH :=@NPC*10; +UPDATE `creature` SET `position_x`=236.1859,`position_y`=2813.747,`position_z`=200.9708,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,241.7692,2815.284,200.8042,0,0,0,100,0), +(@PATH,2,255.8273,2833.317,201.443,0,0,0,100,0), +(@PATH,3,247.4309,2853.592,205.1653,0,0,0,100,0), +(@PATH,4,223.9901,2858.107,208.5819,0,0,0,100,0), +(@PATH,5,208.0596,2843.793,192.3596,0,0,0,100,0), +(@PATH,6,213.9734,2816.793,188.4153,0,0,0,100,0), +(@PATH,7,236.1859,2813.747,200.9708,0,0,0,100,0); + +-- Pathing for Eye of Thrallmar +SET @NPC :=57588; +SET @PATH :=@NPC*10; +UPDATE `creature` SET `position_x`=245.9259,`position_y`=2829.09,`position_z`=177.804,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,251.6207,2841.322,177.804,0,0,0,100,0), +(@PATH,2,241.4914,2859.113,169.6652,0,0,0,100,0), +(@PATH,3,214.9913,2858.249,176.3595,0,0,0,100,0), +(@PATH,4,210.2245,2836.028,169.7762,0,0,0,100,0), +(@PATH,5,225.7556,2822.145,169.9707,0,0,0,100,0), +(@PATH,6,237.9712,2823.874,170.1096,0,0,0,100,0), +(@PATH,7,245.9259,2829.09,177.804,0,0,0,100,0); + +DELETE FROM `creature` WHERE `guid`=57589; +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=16598; + + diff --git a/sql/old/3.3.5a/2012_02_18_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_18_00_world_spell_script_names.sql new file mode 100644 index 00000000000..993fe3a2f38 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_00_world_spell_script_names.sql @@ -0,0 +1,69 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` in (-100,-12162,13567,17251,23019,23448,23453,25860,28089,29200,29858,30458,30507,31225,35745,37674,39090,39093,39096,42784,43723,44875,47170,49357,50243,51582,51961,52759,52845,53808,54171,54577,55004,64385,-1464,-5308,12809,23881,-1454,-50286,8171,52041,52046,52047,52048,52049,52050,52059,52060,52061,52031,52033,52034,52035,52036,58778,58779,58780,60103,-49998,-66188,-47541,52375,59134,-62900,49560,62324,31890); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(-100,'spell_warr_charge'), +(-12162,'spell_warr_deep_wounds'), +(13567,'spell_gen_dummy_trigger'), +(17251,'spell_gen_spirit_healer_res'), +(23019,'spell_item_crystal_prison_dummy_dnd'), +(23448,'spell_gen_gadgetzan_transporter_backfire'), +(23453,'spell_gen_gnomish_transporter'), +(25860,'spell_item_reindeer_transformation'), +(28089,'spell_thaddius_polarity_shift'), +(29200,'spell_item_purify_helboar_meat'), +(29858,'spell_warl_soulshatter'), +(30458,'spell_item_nigh_invulnerability'), +(30507,'spell_item_poultryizer'), +(31225,'spell_item_shimmering_vessel'), +(35745,'spell_item_socrethars_stone'), +(37674,'spell_gen_chaos_blast'), +(39090,'spell_capacitus_polarity_charge'), +(39093,'spell_capacitus_polarity_charge'), +(39096,'spell_capacitus_polarity_shift'), +(42784,'spell_astromancer_wrath_of_the_astromancer'), +(43723,'spell_item_demon_broiled_surprise'), +(44875,'spell_item_complete_raptor_capture'), +(47170,'spell_item_impale_leviroth'), +(49357,'spell_item_brewfest_mount_transformation'), +(50243,'spell_item_teach_language'), +(51582,'spell_item_rocket_boots'), +(51961,'spell_item_chicken_cover'), +(52759,'spell_sha_ancestral_awakening_proc'), +(52845,'spell_item_brewfest_mount_transformation'), +(53808,'spell_item_pygmy_oil'), +(54577,'spell_item_uded'), +(54171,'spell_pal_divine_storm_dummy'), +(55004,'spell_item_nitro_boots'), +(64385,'spell_item_unusual_compass'), +(-1464,'spell_warr_slam'), +(-5308,'spell_warr_execute'), +(12809,'spell_warr_concussion_blow'), +(23881,'spell_warr_bloodthirst'), +(-1454,'spell_warl_life_tap'), +(-50286,'spell_dru_starfall_dummy'), +(8171,'spell_sha_cleansing_totem_pulse'), +(52041,'spell_sha_healing_stream_totem'), +(52046,'spell_sha_healing_stream_totem'), +(52047,'spell_sha_healing_stream_totem'), +(52048,'spell_sha_healing_stream_totem'), +(52049,'spell_sha_healing_stream_totem'), +(52050,'spell_sha_healing_stream_totem'), +(52059,'spell_sha_healing_stream_totem'), +(52060,'spell_sha_healing_stream_totem'), +(52061,'spell_sha_healing_stream_totem'), +(52031,'spell_sha_mana_spring_totem'), +(52033,'spell_sha_mana_spring_totem'), +(52034,'spell_sha_mana_spring_totem'), +(52035,'spell_sha_mana_spring_totem'), +(52036,'spell_sha_mana_spring_totem'), +(58778,'spell_sha_mana_spring_totem'), +(58779,'spell_sha_mana_spring_totem'), +(58780,'spell_sha_mana_spring_totem'), +(60103,'spell_sha_lava_lash'), +(-49998,'spell_dk_death_strike'), +(-66188,'spell_dk_death_strike'), +(-47541,'spell_dk_death_coil'), +(52375,'spell_dk_death_coil'), +(59134,'spell_dk_death_coil'), +(-62900,'spell_dk_death_coil'), +(49560,'spell_dk_death_grip'), +(62324,'spell_vehicle_throw_passenger'); diff --git a/sql/old/3.3.5a/2012_02_18_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_02_18_01_world_spell_dbc.sql new file mode 100644 index 00000000000..b343399d7f2 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_01_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `id`=31980; +INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(31980,0,0,328064,1024,4,268894208,0,0,0,0,0,0,0,1,0,0,101,0,0,14,14,0,13,0,-1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,15,0,0,12,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,10,0,4,0,0,0,0,1,0,0,0,1,"Righteous Defense Trigger Spell"); diff --git a/sql/old/3.3.5a/2012_02_18_02_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_02_world_gossip.sql new file mode 100644 index 00000000000..47882d4eb36 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_02_world_gossip.sql @@ -0,0 +1,52 @@ +-- Gossip for Lore Keeper of Norgannon "Uldaman" for quest 2278 "The Platinum Discs" +UPDATE `creature_template` SET `gossip_menu_id`=562 WHERE `entry`=7172; + +-- SAI for Lore Keeper of Norgannon +SET @ENTRY := 7172; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,62,0,100,0,576,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Lore Keeper of Norgannon - On gossip option select - close gossip'), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,26,2278,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Lore Keeper of Norgannon - On gossip option select - give quest credit'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=562 AND `SourceEntry`=0; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,562,0,0,9,2278,0,0,0,'','Show gossip option if player has quest 2278 but not complete'); + +DELETE FROM `gossip_menu` WHERE `entry` BETWEEN 561 AND 576; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(561,1080), +(562,1079), +(563,1081), +(564,1082), +(565,1083), +(566,1084), +(567,1085), +(568,1086), +(569,1087), +(570,1088), +(571,1089), +(572,1090), +(573,1091), +(574,1092), +(575,1093), +(576,1094); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 561 AND 576; +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 +(561,0,0,'What is a "subterranean being matrix"?',1,1,563,0,0,0,''), +(562,0,0,'Who are the Earthen?',1,1,561,0,0,0,''), +(563,0,0,'What are the anomalies you speak of?',1,1,564,0,0,0,''), +(564,0,0,'What is a "resilient foundation of construction"?',1,1,565,0,0,0,''), +(565,0,0,'So... the Earthen were made out of stone?',1,1,566,0,0,0,''), +(566,0,0,'Anything else I should know about the Earthen?',1,1,567,0,0,0,''), +(567,0,0,'I think I understand the Creators'' design intent for the Earthen now. What are the Earthen''s anomalies that you spoke of earlier?',1,1,568,0,0,0,''), +(568,0,0,'What high-stress environments would cause the Earthen to destabilize?',1,1,569,0,0,0,''), +(569,0,0,'What happens when the Earthen destabilize?',1,1,570,0,0,0,''), +(570,0,0,'Troggs?! Are the troggs you mention the same as the ones in the world today?',1,1,571,0,0,0,''), +(571,0,0,'You mentioned two results when the Earthen destabilize. What is the second?',1,1,572,0,0,0,''), +(572,0,0,'Dwarves!!! Now you''re telling me that dwarves originally came from the Earthen?!',1,1,573,0,0,0,''), +(573,0,0,'These dwarves are the same ones today, yes? Do dwarves maintain any other links to the Earthen?',1,1,574,0,0,0,''), +(574,0,0,'Who are the Creators?',1,1,575,0,0,0,''), +(575,0,0,'This is a lot to think about.',1,1,576,0,0,0,''), +(576,0,0,'I will access the discs now.',1,1,0,0,0,0,''); diff --git a/sql/old/3.3.5a/2012_02_18_03_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_03_world_gossip.sql new file mode 100644 index 00000000000..990006f5098 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_03_world_gossip.sql @@ -0,0 +1,1068 @@ +-- XXXXXXXXXXXXXXXXXXXX +-- X Rogue Trainers X +-- XXXXXXXXXXXXXXXXXXXX + +UPDATE `creature_template` SET `gossip_menu_id`=410 WHERE `entry`=1234; +UPDATE `creature_template` SET `gossip_menu_id`=85 WHERE `entry`=2122; +UPDATE `creature_template` SET `gossip_menu_id`=3984 WHERE `entry`=6707; +UPDATE `creature_template` SET `gossip_menu_id`=4512 WHERE `entry`=3328; +UPDATE `creature_template` SET `gossip_menu_id`=4575 WHERE `entry`=4215; +UPDATE `creature_template` SET `gossip_menu_id`=4577 WHERE `entry`=4214; +UPDATE `creature_template` SET `gossip_menu_id`=4658 WHERE `entry`=1411; + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 85; +SET @TEXTYES := 581; +SET @TEXTNO := 4796; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 141; +SET @TEXTYES := 638; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 381; +SET @TEXTYES := 878; +SET @TEXTNO := 4799; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I am in need of training, Keryn.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 410; +SET @TEXTYES := 4795; +SET @TEXTNO := 4797; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 411; +SET @TEXTYES := 908; +SET @TEXTNO := 4798; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Good day, Hulfdan, I am looking for training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 436; +SET @TEXTYES := 934; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Hello! I am a Rogue in need of training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 3984; +SET @TEXTYES := 4838; +SET @TEXTNO := 4839; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Yes, I have. Teach me.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4502; +SET @TEXTYES := 4835; +SET @TEXTNO := 4837; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4512; +SET @TEXTYES := 638; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4513; +SET @TEXTYES := 638; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4540; +SET @TEXTYES := 581; +SET @TEXTNO := 4796; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4541; +SET @TEXTYES := 581; +SET @TEXTNO := 4796; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4542; +SET @TEXTYES := 581; +SET @TEXTNO := 4796; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4561; +SET @TEXTYES := 5695; +SET @TEXTNO := 4833; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I'm lookin' for rogue trainin'.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4562; +SET @TEXTYES := 4834; +SET @TEXTNO := 4833; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I'm lookin' for rogue trainin'.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4575; +SET @TEXTYES := 4795; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4576; +SET @TEXTYES := 4795; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4577; +SET @TEXTYES := 4795; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4658; +SET @TEXTYES := 6165; +SET @TEXTNO := 6164; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4659; +SET @TEXTYES := 4835; +SET @TEXTNO := 4837; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4676; +SET @TEXTYES := 4835; +SET @TEXTNO := 4833; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 4690; +SET @TEXTYES := 4795; +SET @TEXTNO := 4793; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 5061; +SET @TEXTYES := 4835; +SET @TEXTNO := 4837; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- Gossip Condition for Rogue Trainers +SET @GOSSIP := 6650; +SET @TEXTYES := 9188; +SET @TEXTNO := 9187; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), +(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I require rogue training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), +(@GOSSIP,4,0,"",1,1,0,0,0,0,''); + +-- XXXXXXXXXXXXXXXXXXXXX +-- X Hunter Trainers X +-- XXXXXXXXXXXXXXXXXXXXX + +UPDATE `creature_template` SET `gossip_menu_id`=4657 WHERE `entry`=1404; +UPDATE `creature_template` SET `gossip_menu_id`=4695 WHERE `entry`=3596; +UPDATE `creature_template` SET `gossip_menu_id`=4009 WHERE `entry`=3601; +UPDATE `creature_template` SET `gossip_menu_id`=6652 WHERE `entry`=16672; +UPDATE `creature_template` SET `gossip_menu_id`=4101 WHERE `entry`=987; + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4008; +SET @TEXTYES := 4863; +SET @TEXTNO := 4993; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I'd like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4009; +SET @TEXTYES := 4316; +SET @TEXTNO := 4993; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I am in need of training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4010; +SET @TEXTYES := 4866; +SET @TEXTNO := 5003; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I have come for training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4011; +SET @TEXTYES := 4867; +SET @TEXTNO := 4998; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I am in need of training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4012; +SET @TEXTYES := 4868; +SET @TEXTNO := 4998; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I am a hunter and wish to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4017; +SET @TEXTYES := 4888; +SET @TEXTNO := 4888; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"Please train me.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4023; +SET @TEXTYES := 4889; +SET @TEXTNO := 4996; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I wish to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4101; +SET @TEXTYES := 5001; +SET @TEXTNO := 5002; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4472; +SET @TEXTYES := 4893; +SET @TEXTNO := 5000; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4473; +SET @TEXTYES := 4893; +SET @TEXTNO := 5000; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4474; +SET @TEXTYES := 4893; +SET @TEXTNO := 5000; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4506; +SET @TEXTYES := 4987; +SET @TEXTNO := 5004; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I wish to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4524; +SET @TEXTYES := 4997; +SET @TEXTNO := 4998; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4549; +SET @TEXTYES := 4999; +SET @TEXTNO := 5000; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4550; +SET @TEXTYES := 4890; +SET @TEXTNO := 5000; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I am here for training.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4551; +SET @TEXTYES := 4999; +SET @TEXTNO := 5000; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4647; +SET @TEXTYES := 4997; +SET @TEXTNO := 4998; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4648; +SET @TEXTYES := 4987; +SET @TEXTNO := 5004; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I wish to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4657; +SET @TEXTYES := 5001; +SET @TEXTNO := 5002; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4675; +SET @TEXTYES := 4999; +SET @TEXTNO := 5000; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4693; +SET @TEXTYES := 6160; +SET @TEXTNO := 4993; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I'd like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 4695; +SET @TEXTYES := 4863; +SET @TEXTNO := 4993; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I'd like to train.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 6652; +SET @TEXTYES := 9190; +SET @TEXTNO := 9189; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 7262; +SET @TEXTYES := 8585; +SET @TEXTNO := 8586; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Gossip Condition for Hunter Trainers +SET @GOSSIP := 7368; +SET @TEXTYES := 8804; +SET @TEXTNO := 8823; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), +(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); +-- Add Any Missing Gossip Menu item +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; +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 +(@GOSSIP,0,3,"I am a hunter in need of training, Acteon.",5,16,0,0,0,0,''), +(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), +(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); + +-- Add some missing gossip from sniff for Zabra'jin in Zangermarsh +UPDATE `creature_template` SET `gossip_menu_id`=7601 WHERE `entry`=18013; +UPDATE `creature_template` SET `gossip_menu_id`=7602 WHERE `entry`=18014; +UPDATE `creature_template` SET `gossip_menu_id`=7608 WHERE `entry`=18015; +UPDATE `creature_template` SET `gossip_menu_id`=7603 WHERE `entry`=18017; +UPDATE `creature_template` SET `gossip_menu_id`=7609 WHERE `entry`=18018; +UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=18244; +UPDATE `creature_template` SET `gossip_menu_id`=7722 WHERE `entry`=18564; + +DELETE FROM `gossip_menu` WHERE `entry` IN (7601,7602,7603,7608,7609,7722,7946,9821); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(7601,9248),(7602,9249),(7603,9250),(7608,9259), +(7609,9260),(7722,9431),(7946,9752),(9821,13584); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7603,7608,7609) AND `id` IN (0); +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7609,7722,9821) AND `id` IN (1); +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 +(7603,0,1,'I would like to buy from you.',3,128,0,0,0,0,''), +(7608,0,1,'I wish to purchase tradeskill supplies.',3,128,0,0,0,0,''), +(7609,0,1,'I wish to purchase fishing supplies.',3,128,0,0,0,0,''), +(7609,1,3,'Give me some pointers on my fishing technique.',5,16,0,0,0,0,''), +(7722,1,1,'I have marks to redeem!',3,128,0,0,0,0,''), +(9821,1,1,'I''m looking for a lost companion.',14,4194304,0,0,0,0,''); + +-- Add some missing gossip from sniff for Thunderlord Stronghold in Blade's Edge Mountains +UPDATE `creature_template` SET `gossip_menu_id`=9856 WHERE `entry`=19471; +UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=19476; +UPDATE `creature_template` SET `gossip_menu_id`=5856 WHERE `entry`=19478; +UPDATE `creature_template` SET `gossip_menu_id`=8283 WHERE `entry`=21311; +UPDATE `creature_template` SET `gossip_menu_id`=8406 WHERE `entry`=21950; +UPDATE `creature_template` SET `gossip_menu_id`=8244 WHERE `entry`=21147; +UPDATE `creature_template` SET `gossip_menu_id`=8525 WHERE `entry`=21984; +UPDATE `creature_template` SET `gossip_menu_id`=8239 WHERE `entry`=21117; + +DELETE FROM `gossip_menu` WHERE `entry` IN (8283,8406,8244,8525,8239); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(8283,10322),(8406,10508),(8244,10259),(8525,10661),(8239,10251); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9856) AND `id` IN (0); +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 +(9856,0,1,'Show me what you have for sale.',3,128,0,0,0,0,''); + diff --git a/sql/old/3.3.5a/2012_02_18_04_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_18_04_world_spell_script_names.sql new file mode 100644 index 00000000000..8fa5bc55197 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_04_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (52059,52060,52061); +DELETE FROM `spell_script_names` WHERE `spell_id` IN (58759,58760,58761); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(58759,'spell_sha_healing_stream_totem'), +(58760,'spell_sha_healing_stream_totem'), +(58761,'spell_sha_healing_stream_totem'); diff --git a/sql/old/3.3.5a/2012_02_18_05_world_creatures.sql b/sql/old/3.3.5a/2012_02_18_05_world_creatures.sql new file mode 100644 index 00000000000..3fdac99c854 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_05_world_creatures.sql @@ -0,0 +1,3 @@ +UPDATE `creature` SET `MovementType`=1 WHERE `spawndist`!=0 AND `MovementType`=2 AND `guid` IN (49123,49124,49125,49127,49128,49129,49143,49144,49145,49146,49150,49151,49154,49156,49157,49158,49167,49186,49187,49188,49318,49319,49664,49665,49751,49762,51398,51402,51422,51423,123148,127753,137490,137491,202314); +UPDATE `creature` SET `MovementType`=0 WHERE `spawndist`=0 AND `MovementType`=2 AND `guid` IN (49123,49124,49125,49127,49128,49129,49143,49144,49145,49146,49150,49151,49154,49156,49157,49158,49167,49186,49187,49188,49318,49319,49664,49665,49751,49762,51398,51402,51422,51423,123148,127753,137490,137491,202314); +UPDATE `creature_template` SET `MovementType`=0 WHERE `MovementType`=2 AND `entry` NOT IN (21657,30007); diff --git a/sql/old/3.3.5a/2012_02_18_06_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_06_world_gossip.sql new file mode 100644 index 00000000000..e3385ceb5b0 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_06_world_gossip.sql @@ -0,0 +1,166 @@ +-- Add some missing gossip to Nagrand From UDB +UPDATE `creature_template` SET `gossip_menu_id`=7675 WHERE `entry`=18261; +UPDATE `creature_template` SET `gossip_menu_id`=7723 WHERE `entry`=18333; +UPDATE `creature_template` SET `gossip_menu_id`=7719 WHERE `entry`=18417; +UPDATE `creature_template` SET `gossip_menu_id`=7724 WHERE `entry`=18581; +UPDATE `creature_template` SET `gossip_menu_id`=7625 WHERE `entry`=18265; +UPDATE `creature_template` SET `gossip_menu_id`=7626 WHERE `entry`=18276; +UPDATE `creature_template` SET `gossip_menu_id`=7631 WHERE `entry`=18335; +UPDATE `creature_template` SET `gossip_menu_id`=7699 WHERE `entry`=18471; +UPDATE `creature_template` SET `gossip_menu_id`=7563 WHERE `entry`=18074; +UPDATE `creature_template` SET `gossip_menu_id`=7592 WHERE `entry`=18200; +UPDATE `creature_template` SET `gossip_menu_id`=7579 WHERE `entry`=18180; +UPDATE `creature_template` SET `gossip_menu_id`=7607 WHERE `entry`=18218; +UPDATE `creature_template` SET `gossip_menu_id`=7704 WHERE `entry`=18482; +UPDATE `creature_template` SET `gossip_menu_id`=8493, `npcflag`=`npcflag`|1 WHERE `entry`=22113; + +DELETE FROM `gossip_menu` WHERE `entry`=7563 AND `text_id`=9181; +DELETE FROM `gossip_menu` WHERE `entry`=7578 AND `text_id`=9220; +DELETE FROM `gossip_menu` WHERE `entry`=7579 AND `text_id` IN (9219,9221,9256,9257); +DELETE FROM `gossip_menu` WHERE `entry`=7592 AND `text_id` IN (9240,9283,9284); +DELETE FROM `gossip_menu` WHERE `entry`=7607 AND `text_id` IN (9258,9286); +DELETE FROM `gossip_menu` WHERE `entry`=7625 AND `text_id`=9287; +DELETE FROM `gossip_menu` WHERE `entry`=7626 AND `text_id`=9288; +DELETE FROM `gossip_menu` WHERE `entry`=7631 AND `text_id`=9312; +DELETE FROM `gossip_menu` WHERE `entry`=7675 AND `text_id` IN (9361,9369); +DELETE FROM `gossip_menu` WHERE `entry`=7676 AND `text_id`=9368; +DELETE FROM `gossip_menu` WHERE `entry`=7677 AND `text_id`=9367; +DELETE FROM `gossip_menu` WHERE `entry`=7678 AND `text_id`=9366; +DELETE FROM `gossip_menu` WHERE `entry`=7679 AND `text_id`=9365; +DELETE FROM `gossip_menu` WHERE `entry`=7680 AND `text_id`=9364; +DELETE FROM `gossip_menu` WHERE `entry`=7681 AND `text_id`=9363; +DELETE FROM `gossip_menu` WHERE `entry`=7682 AND `text_id`=9362; +DELETE FROM `gossip_menu` WHERE `entry`=7699 AND `text_id`=9394; +DELETE FROM `gossip_menu` WHERE `entry`=7704 AND `text_id`=9405; +DELETE FROM `gossip_menu` WHERE `entry`=7705 AND `text_id`=9406; +DELETE FROM `gossip_menu` WHERE `entry`=7714 AND `text_id`=9424; +DELETE FROM `gossip_menu` WHERE `entry`=7715 AND `text_id`=9423; +DELETE FROM `gossip_menu` WHERE `entry`=7716 AND `text_id`=9422; +DELETE FROM `gossip_menu` WHERE `entry`=7717 AND `text_id`=9421; +DELETE FROM `gossip_menu` WHERE `entry`=7718 AND `text_id`=9420; +DELETE FROM `gossip_menu` WHERE `entry`=7719 AND `text_id` IN (9419,9427); +DELETE FROM `gossip_menu` WHERE `entry`=7723 AND `text_id`=9429; +DELETE FROM `gossip_menu` WHERE `entry`=7724 AND `text_id`=9433; +DELETE FROM `gossip_menu` WHERE `entry`=8393 AND `text_id`=10493; +DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10492; +DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10614; -- was incorrect in the db +DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10494; +DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10615; -- was incorrect in the db +DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10495; +DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10616; -- was incorrect in the db +DELETE FROM `gossip_menu` WHERE `entry`=8398 AND `text_id`=10497; +DELETE FROM `gossip_menu` WHERE `entry`=8493 AND `text_id` IN (10606,10655,10854); +DELETE FROM `gossip_menu` WHERE `entry`=8497 AND `text_id`=10616; +DELETE FROM `gossip_menu` WHERE `entry`=8498 AND `text_id`=10615; +DELETE FROM `gossip_menu` WHERE `entry`=8499 AND `text_id`=10614; +DELETE FROM `gossip_menu` WHERE `entry` BETWEEN 21296 AND 21303; -- the old menus assigned to Lantresor which were not sniffed +DELETE FROM `gossip_menu` WHERE `entry` BETWEEN 21304 AND 21309; -- the old menus assigned to Altruis which were not sniffed +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(7563,9181), +(7578,9220), +(7579,9219),(7579,9221),(7579,9256),(7579,9257), +(7592,9240),(7592,9283),(7592,9284), +(7625,9287), +(7626,9288), +(7631,9312), +(7699,9394), +(7607,9258),(7607,9286), +(7675,9361),(7675,9369), +(7676,9368), +(7677,9367), +(7678,9366), +(7679,9365), +(7680,9364), +(7681,9363), +(7682,9362), +(7704,9405), +(7705,9406), +(7714,9424), +(7715,9423), +(7716,9422), +(7717,9421), +(7718,9420), +(7719,9419),(7719,9427), +(7723,9429), +(7724,9433), +(8394,10492), +(8393,10493), +(8395,10494), +(8396,10495), +(8398,10497), +(8493,10606),(8493,10655),(8493,10854), +(8497,10616), +(8498,10615), +(8499,10614); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7579,7704,7715,7716,7717,7718,7719,8393,8394,8395,8396,8398,8497,8498,8499) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7719,7724) AND `id`=1; +DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 7675 AND 7682 AND `id`=0; +UPDATE `gossip_menu_option` SET `action_menu_id`=8499 WHERE `menu_id`=8397; -- was incorrect +DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 21296 AND 21303; -- the old options assigned to Lantresor which were not sniffed +DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 21304 AND 21309; -- the old options assigned to Altruis which was not sniffed +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 +(7579,0,0,'Hemet Nesingwary, what are you doing here in the Outland?',1,1,7578,0,0,0,''), +(7704,0,0,'Empoor, you''re going to tell me what I want to know, or else!',1,1,0,0,0,0,''), +(7715,0,0,'Forge camps?',1,1,7714,0,0,0,''), +(7716,0,0,'How do you see them now?',1,1,7715,0,0,0,''), +(7717,0,0,'And now?',1,1,7716,0,0,0,''), +(7718,0,0,'Legion?',1,1,7717,0,0,0,''), +(7719,0,0,'I see twisted steel and smell sundered earth.',1,1,7718,0,0,0,''), +(7719,1,0,'Tell me about the demon hunter training grounds at the Ruins of Karabor.',1,1,8394,0,0,0,''), +(7724,1,1,'I have marks to redeem!',3,128,0,0,0,0,''), +(7675,0,0,'I have killed many of your ogres, Lantresor. I have no fear.',1,1,7682,0,0,0,''), +(7682,0,0,'Should I know? You look like an orc to me.',1,1,7681,0,0,0,''), +(7681,0,0,'And the other half?',1,1,7680,0,0,0,''), +(7680,0,0,'I have heard of your kind, but I never thought to see the day when I would meet a half-breed.',1,1,7679,0,0,0,''), +(7679,0,0,'My apologies. I did not mean to offend. I am here on behalf of my people.',1,1,7678,0,0,0,''), +(7678,0,0,'My people ask that you pull back your Boulderfist ogres and cease all attacks on our territories. In return, we will also pull back our forces.',1,1,7677,0,0,0,''), +(7677,0,0,'We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people.',1,1,7676,0,0,0,''), +(7676,0,0,'What do I need to do?',1,1,0,0,0,0,''), +(8394,0,0,'I''m listening.',1,1,8393,0,0,0,''), +(8393,0,0,'Go on, please.',1,1,8395,0,0,0,''), +(8395,0,0,'Interesting.',1,1,8396,0,0,0,''), +(8396,0,0,'That''s quite a story.',1,1,8398,0,0,0,''), +(8398,0,0,'There was something else I wanted to ask you, Altruis.',1,1,7719,0,0,0,''), +(8499,0,0,'But you are dragons! How could orcs do this to you?',1,1,8498,0,0,0,''), +(8498,0,0,'Your mate?',1,1,8497,0,0,0,''), +(8497,0,0,'I have battled many beasts, dragon. I will help you.',1,1,0,0,0,0,''); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7579 AND `SourceEntry` IN (9221,9256,9257); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7592 AND `SourceEntry` IN (9283,9284); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7607 AND `SourceEntry`=9286; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7675 AND `SourceEntry`=9369; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7719 AND `SourceEntry`=9427; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8493 AND `SourceEntry` IN (10655,10854); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7675 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7704,7719) AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7719) AND `SourceEntry`=1; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=21304; -- condition for Altruis' gossip that wasn't sniffed +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=21295; -- condition for Lantresor's gossip that wasn't sniffed +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,7579,9221,0,0,8,208,0,0,0,0,'','Show different gossip if player has rewarded quest 208'), +(14,7579,9256,0,0,8,9851,0,0,0,0,'','Show different gossip if player has rewarded quest 9851'), +(14,7579,9257,0,0,8,9852,0,0,0,0,'','Show different gossip if player has rewarded quest 9852'), +(14,7592,9283,0,0,8,9854,0,0,0,0,'','Show different gossip if player has rewarded quest 9854'), +(14,7592,9284,0,0,8,9856,0,0,0,0,'','Show different gossip if player has rewarded quest 9856'), +(14,7607,9286,0,0,8,9859,0,0,0,0,'','Show different gossip if player has rewarded quest 9859'), +(14,7675,9369,0,0,8,10107,0,0,0,0,'','Show different gossip if player has rewarded quest 10107'), +(14,7675,9369,0,1,8,10108,0,0,0,0,'','Show different gossip if player has rewarded quest 10108'), +(14,7719,9427,0,0,8,9991,0,0,0,0,'','Show different gossip if player has rewarded quest 9991'), +(14,8493,10655,0,0,8,10870,0,0,0,0,'','Show different gossip if player has rewarded quest 10870'), +(14,8493,10854,0,0,8,11012,0,0,0,0,'','Show different gossip if player has rewarded quest 11012'), +(15,7675,0,0,0,9,10107,0,0,0,0,'','Show gossip option if player has quest 10107 but not complete'), +(15,7675,0,0,1,9,10108,0,0,0,0,'','Show gossip option if player has quest 10108 but not complete'), +(15,7704,0,0,0,9,9978,0,0,0,0,'','Show gossip option if player has quest 9978 but not complete'), +(15,7719,0,0,0,8,9991,0,0,1,0,'','Show gossip option if player has not rewarded quest 9991'), +(15,7719,1,0,0,9,10646,0,0,0,0,'','Show gossip option if player has quest 10646 but not complete'); + +UPDATE `smart_scripts` SET `event_param1`=7715 WHERE `entryorguid`=18417 AND `id` IN (0,1); -- correct Altruis' script +UPDATE `smart_scripts` SET `event_param1`=8396 WHERE `entryorguid`=18417 AND `id`=2; + +UPDATE `smart_scripts` SET `event_param1`=8497 WHERE `entryorguid`=21657 AND `id`=0; -- correct Neltharaku's script + +UPDATE `smart_scripts` SET `link`=3, `event_param1`=7676 WHERE `entryorguid`=18261 AND `id` IN (1,2); -- correct Lantresor's script +DELETE FROM `smart_scripts` WHERE `entryorguid`=18261 AND `id`=3; +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 +(18261,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lantresor - On gossip select - Close gossip'); diff --git a/sql/old/3.3.5a/2012_02_18_07_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_07_world_gossip.sql new file mode 100644 index 00000000000..6246f12cefc --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_07_world_gossip.sql @@ -0,0 +1,44 @@ +-- Fallen Hero of the Horde http://old.wowhead.com/npc=7572 +DELETE FROM `gossip_menu` WHERE `entry`=840 AND `text_id`=1451; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (840,1451); +DELETE FROM `gossip_menu` WHERE `entry`=880 AND `text_id`=1452; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (880,1452); +DELETE FROM `gossip_menu` WHERE `entry`=881 AND `text_id`=1456; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (881,1456); +DELETE FROM `gossip_menu` WHERE `entry`=882 AND `text_id`=1455; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (882,1455); +DELETE FROM `gossip_menu` WHERE `entry`=883 AND `text_id`=1454; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (883,1454); +DELETE FROM `gossip_menu` WHERE `entry`=884 AND `text_id`=1453; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (884,1453); +-- Text Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=840 AND `SourceEntry` IN (1391); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,840,1391,0,8,2784,0,0,0,'','Show gossip text if player has quest 2801 or 2784 completed'), -- It's hard to imagine that so much death and despair could be confined to such a small area; yet beyond the swamp is a land plagued by chaos and destruction.$B$BWatch your step, adventurer. The Blasted Lands are the final resting place to far greater beings than you. +(14,840,1391,1,8,2801,0,0,0,'','Show gossip text if player has quest 2801 or 2784 completed'); -- It's hard to imagine that so much death and despair could be confined to such a small area; yet beyond the swamp is a land plagued by chaos and destruction.$B$BWatch your step, adventurer. The Blasted Lands are the final resting place to far greater beings than you. +-- Gossip option conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=840; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,840,0,0,9,2784,0,0,0,'','Show gossip option if player has quest 2784 but not complete'), +(15,840,1,0,9,2801,0,0,0,'','Show gossip option if player has quest 2801 but not complete'), +(15,840,2,0,9,2702,0,0,0,'','Show gossip option if player has quest 2702 but not complete'); +-- Add Any Missing Gossip Option +DELETE FROM `gossip_menu_option` WHERE `menu_id`=840 AND `id` IN (0,1); +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (880,881,882,883,884) AND `id` IN (0); +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 +(840,0,0,"Please continue, Hero...",1,1,880,0,0,0,''), +(840,1,0,"Please continue, Hero...",1,1,880,0,0,0,''), +(880,0,0,"What could be worse than death?",1,1,884,0,0,0,''), +(881,0,0,"I shall.",1,1,0,0,0,0,''), +(882,0,0,"You can count on me, Hero.",1,1,881,0,0,0,''), +(883,0,0,"What are the stones of binding?",1,1,882,0,0,0,''), +(884,0,0,"Subordinates?",1,1,883,0,0,0,''); +-- Fallen Hero of the Horde SAI +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=7572; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=7572 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 +(7572,0,0,1,62,0,100,0,881,0,0,0,26,2784,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - complete quest 2784'), +(7572,0,1,2,61,0,100,0,0,0,0,0,26,2801,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - complete quest 2801'), +(7572,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - Close Gossip'), +(7572,0,3,4,62,0,100,0,840,2,0,0,12,7750,1,180000,0,0,0,8,0,0,0,-10630.3,-2987.05,28.96,4.54,'Fallen Hero of the Horde - On Gossip option select - Spawn Corporal Thund Splithoof'), +(7572,0,4,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - Close Gossip'); diff --git a/sql/old/3.3.5a/2012_02_18_08_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_08_world_gossip.sql new file mode 100644 index 00000000000..a9fef9bcd76 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_18_08_world_gossip.sql @@ -0,0 +1,5 @@ +-- Fix mistake in Fallen Hero of the Horde gossip update +UPDATE `conditions` SET `ConditionValue1`=2784,`Comment`='Show gossip text if player has quest 2801 or 2784 completed' WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=840 AND `ConditionValue1`=2704; +UPDATE `conditions` SET `Comment`='Show gossip text if player has quest 2801 or 2784 completed' WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=840 AND `ConditionValue1`=2801; +UPDATE `conditions` SET `ConditionValue1`=2784,`Comment`='Show gossip option if player has quest 2784 but not complete' WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=840 AND `ConditionValue1`=2704; +UPDATE `smart_scripts` SET `action_param1`=2784 WHERE `entryorguid`=7572 AND `id`=0; diff --git a/sql/old/3.3.5a/2012_02_19_00_auth_account.sql b/sql/old/3.3.5a/2012_02_19_00_auth_account.sql new file mode 100644 index 00000000000..a5b48ede3b4 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_00_auth_account.sql @@ -0,0 +1,2 @@ +ALTER TABLE `account` + ADD COLUMN `os` VARCHAR(4) DEFAULT '' NOT NULL AFTER `locale`; diff --git a/sql/old/3.3.5a/2012_02_19_00_characters_warden_action.sql b/sql/old/3.3.5a/2012_02_19_00_characters_warden_action.sql new file mode 100644 index 00000000000..587f65fedc5 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_00_characters_warden_action.sql @@ -0,0 +1,7 @@ +DROP TABLE IF EXISTS `warden_action`; + +CREATE TABLE `warden_action` ( + `wardenId` smallint(5) unsigned NOT NULL, + `action` tinyint(3) unsigned DEFAULT NULL, + PRIMARY KEY (`wardenId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/sql/old/3.3.5a/2012_02_19_00_world_quest_template.sql b/sql/old/3.3.5a/2012_02_19_00_world_quest_template.sql new file mode 100644 index 00000000000..76ab51f803b --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_00_world_quest_template.sql @@ -0,0 +1,14 @@ +-- Shadowmourne quest chain fix by nelegalno + +-- Limit quests to Warrior, Paladin and Death Knight classes +UPDATE `quest_template` SET `RequiredClasses` = 35 WHERE `Id` IN (24545, 24743, 24547, 24749, 24756, 24757, 24548, 24748); + +-- Quest relations +UPDATE `quest_template` SET `NextQuestId` = 24743 WHERE `Id` = 24545; -- The Sacred and the Corrupt +UPDATE `quest_template` SET `NextQuestId` = 24547 WHERE `Id` = 24743; -- Shadow's Edge +UPDATE `quest_template` SET `NextQuestId` = 24749 WHERE `Id` = 24547; -- A Feast of Souls +UPDATE `quest_template` SET `NextQuestId` = 24756 WHERE `Id` = 24749; -- Unholy Infusion +UPDATE `quest_template` SET `NextQuestId` = 24757 WHERE `Id` = 24756; -- Blood Infusion +UPDATE `quest_template` SET `NextQuestId` = 24548 WHERE `Id` = 24757; -- Frost Infusion +UPDATE `quest_template` SET `NextQuestId` = 24549 WHERE `Id` = 24548; -- The Splintered Throne +UPDATE `quest_template` SET `NextQuestId` = 24748 WHERE `Id` = 24549; -- Shadowmourne... to The Lich King's Last Stand diff --git a/sql/old/3.3.5a/2012_02_19_01_world_quest_template.sql b/sql/old/3.3.5a/2012_02_19_01_world_quest_template.sql new file mode 100644 index 00000000000..2f888f08cdd --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_01_world_quest_template.sql @@ -0,0 +1,11 @@ +-- Dire Maul Book Quests + +UPDATE `quest_template` SET `RequiredClasses` = 1 WHERE `Id` = 7499; -- Codex of Defense (18357/7499) +UPDATE `quest_template` SET `RequiredClasses` = 2 WHERE `Id` = 7501; -- The Light and How to Swing It (18359/7501) +UPDATE `quest_template` SET `RequiredClasses` = 4 WHERE `Id` = 7503; -- The Greatest Race of Hunters (18361/7503) +UPDATE `quest_template` SET `RequiredClasses` = 8 WHERE `Id` = 7498; -- Garona: A Study on Stealth and Treachery (18356/7498) +UPDATE `quest_template` SET `RequiredClasses` = 16 WHERE `Id` = 7504; -- Holy Bologna: What the Light Won't Tell You (18362/7504) +UPDATE `quest_template` SET `RequiredClasses` = 64 WHERE `Id` = 7505; -- Frost Shock and You (18363/7505) Closes #4727 +UPDATE `quest_template` SET `RequiredClasses` = 128 WHERE `Id` = 7500; -- The Arcanist's Cookbook (18358/7500) +UPDATE `quest_template` SET `RequiredClasses` = 256 WHERE `Id` = 7502; -- Harnessing Shadows (18360/7502) +UPDATE `quest_template` SET `RequiredClasses` = 1024 WHERE `Id` = 7506; -- The Emerald Dream... (18364/7506) diff --git a/sql/old/3.3.5a/2012_02_19_02_world_gameobject.sql b/sql/old/3.3.5a/2012_02_19_02_world_gameobject.sql new file mode 100644 index 00000000000..88a1f2e3a4c --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_02_world_gameobject.sql @@ -0,0 +1,4 @@ +-- meeting stone for UK +DELETE FROM `gameobject` WHERE `id`=188488; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(245, 188488, 571, 1, 1, 1237.301, -4948.268, 36.02063, 2.495818, 0, 0, 0.9483232, 0.3173059, 300, 0, 1); diff --git a/sql/old/3.3.5a/2012_02_19_03_world_warden_checks.sql b/sql/old/3.3.5a/2012_02_19_03_world_warden_checks.sql new file mode 100644 index 00000000000..3698c461358 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_03_world_warden_checks.sql @@ -0,0 +1,802 @@ +DROP TABLE IF EXISTS `warden_checks`; + +CREATE TABLE `warden_checks` ( + `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT, + `type` tinyint(3) unsigned DEFAULT NULL, + `data` varchar(48) DEFAULT NULL, + `str` varchar(20) DEFAULT NULL, + `address` int(10) unsigned DEFAULT NULL, + `length` tinyint(3) unsigned DEFAULT NULL, + `result` varchar(24) DEFAULT NULL, + `comment` varchar(50) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +INSERT INTO `warden_checks`(`id`,`type`,`data`,`str`,`address`,`length`,`result`,`comment`) VALUES +(1,178,'07F223143C69271AA2A851FECF6DC883A9D3A7DBA6FE26CC','',710730,23,'',NULL), +(2,191,'C7D18F99DBC446A4B36E78B9130B6FA2E365B3D2D4199DF5','',28940,17,'',NULL), +(3,191,'AA1A8559776F873F26954F15E49E6041EDC2C3766AD87A59','',21826,11,'',NULL), +(4,178,'5F342A4D0EA9DB35F93FAE6E32670D810F017309817AA7C0','',676970,23,'',NULL), +(5,178,'C57BD89DD447131EA2083784AB4DA8BD58CF3E182F1D8AF6','',690106,23,'',NULL), +(6,191,'69AA85EFE8A1A990DA5ECFED4FAFD5B14F1D52EF2548FD15','',12905,36,'',NULL), +(7,191,'083ECAD073DE2D61E3564B4BF767C9D1F8F15AA0495F5A76','',41096,24,'',NULL), +(8,178,'C774D64EF60AD5A141FC56F3D02AE78AC147770FAE25D8FE','',3037164,22,'',NULL), +(9,191,'502C59CAFEA11E9584C13BFE75F85EB79936AEEE31B44165','',12194860,37,'',NULL), +(10,178,'4FBE8978A662428C616AABD71DA5562E4AC21F54BEB8ADBF','',3037164,22,'',NULL), +(11,178,'83D3F7FD7DCA144AD8219A6A4E20F0CFC6E7EA208C4144FF','',3033068,22,'',NULL), +(12,243,'','',4623652,7,'578B7D08578BF1','Pointer to realmlist address'), +(13,178,'00523153EE2298A8D80D7B26B7067CA7B26AC06FF374FE7B','',673210,23,'',NULL), +(14,191,'91BC368FA14A3FE3E13D0B1056F485F846925E613D8E8903','',12194860,37,'',NULL), +(15,243,'','',10010636,12,'8166443FFF1FFFD9565CD95E',NULL), +(16,178,'8FEFDBC58301AB0E0D0F6EBC5FBDA5ED9A7126873A9AB337','',682394,23,'',NULL), +(17,191,'B40FF92D4F092599EA9014C88B474DE4352C3F1635109882','',448492,48,'',NULL), +(18,191,'42B596FF923054531E4918DC39E08F8564FED16D559B494A','',29852,20,'',NULL), +(19,178,'24291D6733A7CEFA3D54C3BCCAE95D56D8365BAB42AEE1CE','',3037164,22,'',NULL), +(20,178,'6C4E321E2D5A153F2BB664EB6EEDF8D67FDE7ECC8076D087','',3990720,23,'',NULL), +(21,178,'FB649706C8F1AFF5990B5F3118DFE54FF6F9609C6991C161','',3045776,31,'',NULL), +(22,191,'D1B451C906B81261B048FD4025217245950C11660815367F','',28920,23,'',NULL), +(23,191,'40079A1083A6B57E3B713992BD395FB6650B631E4C4B8D4E','',29852,20,'',NULL), +(24,178,'3F8FEFE08CB358D6613656AFDB498AB8C599BA18B5574FB6','',682378,23,'',NULL), +(25,191,'EECA71B5536EE1992FD7825A5CCC4B7F9F3B413C0DA498B6','',29884,20,'',NULL), +(26,191,'B8786BFF2421ED1F1FB30F3F0BAF671FC1DAD5B3B33124C8','',28956,17,'',NULL), +(27,191,'BF0C842D635D9D8B3F6FF84EF6DF7C963C485EBAF02D17B0','',28920,23,'',NULL), +(28,191,'9672ED2A27C4972E04DF4471C95492C721024E241995170C','',36924,24,'',NULL), +(29,191,'63532B056020A261251BD24AB026BBC5D4468AF863136044','',17906,11,'',NULL), +(30,178,'7D38C80FEAB10B857A4A7BEF15D27A58FB43FD875E29C73C','',3990720,23,'',NULL), +(31,178,'B158752316672A90BF29846E7AD64BA4FD1699C638BFD3B6','',2299116,33,'',NULL), +(32,178,'4549AE7CA28700562D996CBC78FA7341DC05F644C01474E4','',3000288,31,'',NULL), +(33,178,'EE77806A4F5723FD9C6FC6F43308C8AB448E0A139CB43700','',690106,23,'',NULL), +(34,191,'046D6EA3E99E275F51CAA591BD8C478B6F964A3072018F43','',21660,15,'',NULL), +(35,178,'B1682CE919907AD7D8990F3D8272CFF24A996162565D52B4','',676970,23,'',NULL), +(36,178,'22E057649A8BF1D9672841EF47A4DA175AAC082FFEF059DA','',710730,23,'',NULL), +(37,178,'7BA62D5F5CFEB545D1AE646962F4EB9A91B93EF8FFD5D1B0','',710554,23,'',NULL), +(38,178,'702802D919D9E5C3FD42CA9188936C73E47F87CFA419025A','',3033068,22,'',NULL), +(39,178,'FDA6D997BFB8A991B57755633D1AB3C7E567A74C1EC09937','',3070052,22,'',NULL), +(40,191,'84F6BDD28490937867774E7BF8D5B78F68BF9EB43DE90F10','',477912,60,'',NULL), +(41,191,'5A5B4BA32BD937FF253016AE836DD44B794F8D05982860A6','',447736,48,'',NULL), +(42,178,'A243986665C7FCA1E60A9F209DE9431C3098D082DF1C4528','',682378,23,'',NULL), +(43,178,'7CC89374CE3A9C07DCD685006690B828931D60085EE5FEE8','',710554,23,'',NULL), +(44,191,'01F10590E6DFED79523D26C043D5424174BEF1011F3F4974','',477928,60,'',NULL), +(45,178,'C9728BDC4B77BAA7B3515AFD3628EDB0986DFA20B46917B4','',672746,23,'',NULL), +(46,191,'179B80E5E054521E44BA8F5978D5FC489CC9E514B350A3FF','',28956,17,'',NULL), +(47,243,'','',5417948,5,'7734FF2485','FrameXML Signature Check'), +(48,191,'7769A67D6E2460450873133B0CFF99B67A58CE6C404A17F8','',17282,15,'',NULL), +(49,178,'CF3896074EEBC0F93B539FD44E4D825227D4C1556B8F2279','',3990720,23,'',NULL), +(50,178,'88F2833B5267A71A0CA72509C40819B99283A6E556FD9038','',198,10,'',NULL), +(51,243,'','',8491566,5,'8B4D10890D','Lua DoString'), +(52,178,'F7229DF2D879A9E8D5BCEDCDC7046D75BAEE1C9D4DA41E55','',3638348,23,'',NULL), +(53,191,'AE78585CD862134059B13669FC416B8124752EC6471DDCE6','',28940,17,'',NULL), +(54,191,'B408E9F9B475E4B6A81F9B7F2E060824F618FFDABBFFE805','',13634,11,'',NULL), +(55,178,'A9DA016B83961F95097E08F2DEBE69517C7573FFF06D8C4B','',668874,23,'',NULL), +(56,191,'0E74160C242EF826D09BCE4ED535E9A9D251B1CD20E31891','',24812,14,'',NULL), +(57,178,'A58E4D44D952C1F9DB7B5E423167EE4C28AD02668C5B86AF','',710730,23,'',NULL), +(58,191,'35A9FC42ACBF3A147B0C8CF67BA04EC979C6534B20249B45','',28956,12,'',NULL), +(59,243,'','',5345746,7,'746583F9177760','Lua Protection Patch'), +(60,191,'1430DC4A627EA5FA2CFF9C010CE16022F259F81DB6047879','',13634,11,'',NULL), +(61,191,'85A005398AF851382267C01BB6FB04AEF2093213C20EC200','',360508,13,'',NULL), +(62,191,'96916CD89649027A9A8BBFBD28AE190CD5D590E24BBAD451','',13033,36,'',NULL), +(63,191,'056D57A5C1A46883400E1F69405750B23DE18C3032C3D91C','',27270,13,'',NULL), +(64,191,'87C641E1EDBD96D9F170C7BE0FA13F45611DCDF41AC02526','',41127,24,'',NULL), +(65,191,'1F378DF1E7BD99164DDC7401A98CA5E9551BD50B4A35D5AA','',34176,25,'',NULL), +(66,178,'B5ED443D6CA2F6095BAC8DAFDC8F3413F7B473916357C17E','',209352,75,'',NULL), +(67,191,'A2BC3FF01787A38CB88B3EF45C1CD97DA113157FC395D38C','',30012,16,'',NULL), +(68,191,'190862E5018F1428E5B12BFDAD08283ECD057B34AD722846','',41228,24,'',NULL), +(69,191,'6E0E55BE8690F64442E275559E6C9F8A3FDCAA00937D1C13','',49347,24,'',NULL), +(70,191,'B6FC4C07BB2CBE7C5C854CD99DAFEC0D1AE4101FC51460F9','',477912,60,'',NULL), +(71,178,'3B5955C3B498489869990F08A4CAE566A7D689C23990518B','',156,8,'',NULL), +(72,243,'','',7246064,6,'8950108B450C','Movement State related'), +(73,178,'F24317DAA28AA477996EEBB9538A89569ABF9B185A3EA4E4','',718842,23,'',NULL), +(74,178,'DA25A4134671325719833878E2556455EC4321A2207B6728','',198,10,'',NULL), +(75,191,'DC9490A7BEB43C64585E013B5260BE843D126EB3BCEBAC11','',50040,26,'',NULL), +(76,178,'4BB92BBD5CA8C192C9D0E1EDB6C21FF3F4A61ED1B151365F','',673210,23,'',NULL), +(77,178,'13E8DD1C9F5501A270A59CC4B61311F6D5D18DC3F2AA351A','',3037164,22,'',NULL), +(78,191,'346CFA39FF98198BDE1C23673FBF51A50CFF5ADED784F077','',17522,15,'',NULL), +(79,113,'0590FC57AB448975FA46C314A8AB75AF96DF0FD0A3D9FB23','Afd32uu',0,0,'',NULL), +(80,178,'E37D413DC96A92D3CEAB8A482B8F5397587A0E654C9A0166','',672954,23,'',NULL), +(81,178,'E7D5551799C2C7F0072BC3149A22F37D09EA1EB83F64C655','',3045912,31,'',NULL), +(82,191,'7CC5260578671130CA5B3392BA5CFD0F3DE0BE1085E556B6','',9977,32,'',NULL), +(83,191,'F44A40945F24385D089E040A733553EEFF92EFAAB0636323','',134968,32,'',NULL), +(84,178,'D3122CF30EE55310CF4A710E61B190D2B108227B746B41AD','',679578,23,'',NULL), +(85,191,'7E3CC1BC53477D84F05F623BBC94B9DE8D01A2607CA935DB','',41188,24,'',NULL), +(86,191,'DC06565CC1512B5A91A848E08BC4FBC6DA705F6503667852','',41127,24,'',NULL), +(87,191,'03DC47CDFBB14C5CF0D0010FA5424556F951585588A2180A','',29916,16,'',NULL), +(88,191,'29EC91C4D87891FECDED381CE65A86A259F00DD788833E4D','',174688,37,'',NULL), +(89,191,'31F024003681765368F6EFB667E83CE1D12799723AA99BF9','',685304,44,'',NULL), +(90,191,'6A82AC1D0BFEF5DA7385510CBC57189FACD42E45E0D2A65E','',30012,16,'',NULL), +(91,191,'3901FBD52655E12ADA4EEDED3B365B1DDFAAA925A140097F','',448492,48,'',NULL), +(92,191,'6E9991A25EC347BEA5813EDE0A842D746779C97606565B5A','',17906,11,'',NULL), +(93,191,'0AC9F2B104AC5AA9131FB14E669B98D30D056936625B0245','',27270,13,'',NULL), +(94,178,'A338B3DA78A6683CBEE08A63C5EEFBE1AF33BF54983D583D','',684876,29,'',NULL), +(95,178,'38759C29F2ACF42DA9D16EF35837A470DC7C42C3284B2A3C','',3049492,22,'',NULL), +(96,191,'F35817564FC39F4DB7994021352FEEB86E2FEE86C11B8DBB','',360508,13,'',NULL), +(97,191,'09FAC087283873DAEE0AD074ABF7DDB1B395F5CF6BC2141E','',28956,17,'',NULL), +(98,178,'87FE57916743AF3C97CC3B583B29E89B6E503D31D1747B64','',676970,23,'',NULL), +(99,178,'97D854645011BAD1F6625679511D78D1B7367A51EB0FCC6E','',668874,23,'',NULL), +(100,178,'12369F6F1B875FB5CC5E67445ADEAE2B295D196596679317','',0,9,'',NULL), +(101,191,'5034278808E93A3DFC9BEFFD8E180FEFA24DFC5056ED3BE1','',433168,48,'',NULL), +(102,178,'55EF16220A7EF3F74A9D895821610DFBD2A757FB05C792D5','',209352,75,'',NULL), +(103,191,'67445533AA0BB737D2F74C9258148C6C667794F0E3D07498','',45324,24,'',NULL), +(104,178,'AA8649100B17A9C5BE227F47F867FADE51AD242BAAD39821','',3045632,31,'',NULL), +(105,191,'85545FE9242B2474574EEBABBF452FBD11497073CB1E46A5','',41080,24,'',NULL), +(106,191,'9DACD6981681F53650B681EAE68065D26F4803682058709D','',448456,48,'',NULL), +(107,191,'96B74F1436A05E658E3282164BC3CBDF4DBBB2CF6A5B866F','',9977,32,'',NULL), +(108,191,'033BD6861DF7878DC9470EC2F699772BB2F3D5000490866F','',90202,13,'',NULL), +(109,113,'B797D0AF3164EE83167D5C054A511A5B209A70C6655C408B','IPSect',0,0,'',NULL), +(110,178,'D91A2764435C5091D3F9471AB8B5F397E609330294694488','',710730,23,'',NULL), +(111,191,'94EED02DCDB71789E50917DA401A03F4B91BDBEA050D8BCA','',3766400,37,'',NULL), +(112,178,'2DF33CBB544E2D5238FB591F2547AC507B4D8A652D789F2B','',2303444,33,'',NULL), +(113,243,'','',7860712,5,'742DF6407C',NULL), +(114,178,'81A74F35F0F887144D59F93647C18C70C5FEEF542A7F3782','',709322,22,'',NULL), +(115,178,'2E1F8A68FDDF084A950B786A1EE7E0CE43E62449A56F92A3','',3045632,31,'',NULL), +(116,191,'B1F8988B6664A90E79503FA5D843C3CB97BFDC23EB8C7690','',433168,48,'',NULL), +(117,178,'0277E26DE31814DFD675A59E526669E39080E033BAE88859','',0,9,'',NULL), +(118,243,'','',10714892,8,'BB8D243FD4D0313E','Wall Climb'), +(119,178,'09BBFC19FCADC69D6B5BF655A5BB6350B4A8120C3EB557D2','',3990720,23,'',NULL), +(120,178,'BF4ABDEB726B0060E74701C03180C3CB02170ADCB7DCB61C','',3049872,31,'',NULL), +(121,243,'','',9990741,9,'8B878000000089463C','No Fall Damage Patch'), +(122,178,'D259A46A6D1855C436BFC96FB9376BDCDF5E9FFAE8B4147C','',3045616,31,'',NULL), +(123,178,'F425A62A44097742D72A05669B6BE93AD9CEFE9E40D71E48','',3045976,31,'',NULL), +(124,191,'B134291F515D136B6576FFBC0133C7859755974611170D07','',20512,16,'',NULL), +(125,191,'125BE691985D8DB37068DC14D74EA2DA1260E4A63D3F74BF','',45324,24,'',NULL), +(126,178,'E06E3C5B356B34BA92F6765108556AD53ABB74B986D5810E','',3070052,22,'',NULL), +(127,178,'8CC87DFF61F2EC82DE033865C9879010D94E1614369FE286','',710554,23,'',NULL), +(128,191,'E1F5233450FEFFB6F0E8F2B17683047A485828FEDD3E5B80','',448456,48,'',NULL), +(129,191,'31BA6EA4DF2362676AB71F4CB60B0D40FA51A3AABD25D5CB','',36924,24,'',NULL), +(130,191,'C14630E1D519EB85C254C536FE81DC490977E869BD5CD884','',12985,36,'',NULL), +(131,191,'B337F892EEDD52A5B978C116A19D927134273626EFC4DAA3','',17890,11,'',NULL), +(132,191,'D97560108AA21A487EC9278759F7615BFA304A933776A201','',18680,35,'',NULL), +(133,178,'DA59505BA61459508532CBEAD246DCD2C8E7BF5C6D3CE676','',3037164,22,'',NULL), +(134,191,'5803CA69E5B7F1DF08D95219894D75F52EDB1AD429E562D9','',174688,37,'',NULL), +(135,178,'8A1099E19139D91573286DBB3DED2CC093A99FD178F7FEC8','',3033068,22,'',NULL), +(136,178,'0331B438B085F55C06F7F697160845BE953D9CE789AA62A4','',3000288,31,'',NULL), +(137,191,'E844078A5671FF7DB0621E7F1C7EDDF9C92F5A9FA0477FCB','',41023,24,'',NULL), +(138,178,'AAD7F47B231861913F353341FD26E5AA89AFB586FB6A5366','',672746,23,'',NULL), +(139,178,'136DFB3FE66D2830DF46EE155FCAEADC9624FFE1410088DA','',3041472,31,'',NULL), +(140,191,'C6015A0D5C9109768BA4233639A51F163CC7ED58749E5026','',25724,20,'',NULL), +(141,178,'9C668CE4D328EEA9B6AB7AD5FF54169289B35B230275A43C','',3049872,31,'',NULL), +(142,178,'FC3C95E71F968C46BD5DB5C9EF9B0A5BDCC5619B805046F5','',2299060,33,'',NULL), +(143,178,'FBE3808C0E36BFBC1D1F5A0E508CA89E81E550CD2FDEEC48','',149,5,'',NULL), +(144,178,'35A8252DBC65514E858256C497141153812EE61C724BF5A9','',710730,23,'',NULL), +(145,178,'CC79AA9AE29A52A998181D183D38974221B8BAC0AB534E7D','',0,9,'',NULL), +(146,178,'B89F25A249D295580E649F5ABE0C65EC24401F4889A4FB16','',668874,23,'',NULL), +(147,178,'742A0A9997B9E857C355AA75797466506BAE73D44D26399D','',3037164,22,'',NULL), +(148,178,'E7975701601B2FDF8262098521B7BB4FF5CCC484F8E919E7','',3045776,31,'',NULL), +(149,178,'43E81BE830F169F4EDD23B84ABFA9D15EF12C978FE134346','',60648,56,'',NULL), +(150,178,'66CA9E464A2122E301A72FAEF13A4853D8CB1A45C177E854','',178504,96,'',NULL), +(151,113,'0A3C294B0799FD2C9EC17C1CCBCD174A51B6A2ECC62FEF17','IPSect',0,0,'',NULL), +(152,178,'6E9CE81BFCAF0C250705FCC599981D2D9E4D474A7E857B37','',2299108,33,'',NULL), +(153,178,'8734D6E081D5C993DCE8161CFDFC6197F39A487E4083A3E1','',149,5,'',NULL), +(154,178,'A33355AF7B5FF3CECB3A6059F6621F30AEE695D69421EA2B','',3049492,22,'',NULL), +(155,191,'BF8CEA63013511BDE0B551DAAC492DFBB9608645140B88F7','',29916,16,'',NULL), +(156,178,'8D5D5E99EAB2ED21A104913B05D6BD7A8E63ADA56B66CDED','',3022016,31,'',NULL), +(157,191,'778256BFEF82EA60C4E0F25083655FB2BB75B83FD60A9C06','',18680,35,'',NULL), +(158,178,'43FB8007D7DD7B01FFBEEA3EF9D0242778565544281EC761','',0,9,'',NULL), +(159,191,'94DCF5D21FE2106F5303216C14AD55EEDC1B19FDC91D5F76','',28704,16,'',NULL), +(160,191,'7EBBF90F7D8462D1453479DF9AC5943AF483FE2828C74FDD','',477928,60,'',NULL), +(161,191,'A171148491E099B12CCD1708B784D8C3B09737772C7780C0','',401992,14,'',NULL), +(162,191,'5350ACB75F9FA498FE0D2A371649C9FD9716BDDE2C32F5FB','',13634,11,'',NULL), +(163,191,'85E53280630956C58D4CA7FD8DC5FE73C9A2A03314DFF294','',45223,24,'',NULL), +(164,191,'391BC8A81D4EB6D526BAF0DC3468CAA36C9207B82E194B7A','',130380,14,'',NULL), +(165,191,'0F88FA5CD9B9950F850C18FE76C948FF43CDDE3E75638FF1','',17938,11,'',NULL), +(166,178,'EB63FC60164AFF92726DA658882BF1CE47CF0BF6C80B1B97','',690106,23,'',NULL), +(167,178,'E30B2494142B416BBE95DA3DAE4A82CBDF3A020715F10E8B','',4011280,23,'',NULL), +(168,191,'6CA1C19D0E9191CBC9CA3D5BC3CF1D19764D8F17C6B54AE4','',59620,13,'',NULL), +(169,178,'4730B7A7EC70544A688211A5C754C357A090116092D3EC4D','',682378,23,'',NULL), +(170,243,'','',10000022,6,'894644894E54',NULL), +(171,191,'713A7B79619AEF3C47E44102F86EDCE0D6AFBC5ABE87F861','',13538,11,'',NULL), +(172,191,'575F1C6AF7C71085C7D9CB2291844D9F2DA3B71391C0B941','',36907,24,'',NULL), +(173,178,'296F233E4FAC4CF419D5FBF2701AC4D5AA0866CB4D0DAEC6','',3045976,31,'',NULL), +(174,178,'933C1A228C99E35DF309838B25B7D5EA3A8E961E81D81D32','',673194,23,'',NULL), +(175,191,'9EC125252C3738478CA942DCB59030097194B284A9162B32','',59620,13,'',NULL), +(176,178,'6665F3FB8DC6BE71C152C3674B5783D6E57FE8BF796D190C','',3634252,23,'',NULL), +(177,191,'E120DD63042FEFF9E7FCEC0CA44D2544F03C5D4CDBA1C008','',12985,36,'',NULL), +(178,113,'09BDABA6CB17BE561B4104124A3D0266C858D194A8765198','drvsys_mon',0,0,'',NULL), +(179,178,'3AAE69E7088E4060EA32EF95E9B6D9532460F5B84EE4EC80','',684876,29,'',NULL), +(180,191,'990D4E1C2D63C8E447F034642686D57B727064E3EDE13B00','',448500,48,'',NULL), +(181,191,'E88F31BDC5513216CF3701CAF8BE954CCC7EAE0E7AC7D942','',594348,26,'',NULL), +(182,178,'81229C1E56FA72E01B52E8CBB8BB5F55ED48A11B72E7729B','',710554,23,'',NULL), +(183,191,'B4D0CDE7D53493A1549328F711013F07DBD3A9BE88DB2EF9','',685304,44,'',NULL), +(184,178,'D6CA6F94FF248F722F97037C1AE7C8DE0191D5F4D1E3A5B8','',156,8,'',NULL), +(185,178,'9C9DF1E868BB33D43676F21096C4F75759C0807096EEB886','',60648,56,'',NULL), +(186,178,'1C79B3B5A74A4F09A1FAE19BB15CDCF26B5F917861071F1C','',198,10,'',NULL), +(187,178,'AC1AD3E831A4C758858350A8A197A24FE82583F4B0E39A85','',3049888,31,'',NULL), +(188,178,'56E4980485E3129E94F370E7066E80B07141C4A669B9FC0F','',672746,23,'',NULL), +(189,178,'C21574305E0377A3D2B72D1E1546B9D62DCFA8B1A4405F16','',3638348,23,'',NULL), +(190,178,'AA74121AF835978BC1C1BB402A8B7388CB7C075C1227C253','',3049888,31,'',NULL), +(191,178,'D6457A86DFADF9825D6093090AED2A807FE7DA6ECF5922AF','',3065956,22,'',NULL), +(192,191,'1BAB7E6B5ACBEED8F54B667EDF13A385B9E146C0C50D9FB7','',448456,48,'',NULL), +(193,243,'','',7517484,7,'7518683B010000','Follow Unit Check'), +(194,178,'01000FEAC61ED76FE04ED1169C40289D96C71A1564E38FCB','',690106,23,'',NULL), +(195,191,'F095338ED87C658C916CC604A427F4ED95309C4A07B7898C','',34176,25,'',NULL), +(196,191,'800E120187DF74A231722FB887B3944AD16A703FB8CB9D39','',28920,23,'',NULL), +(197,191,'2CFCE981C322A54724E1418B6A6D1896B95D584630EEEA43','',38300,21,'',NULL), +(198,243,'','',5081862,8,'6840AAB600C60200',NULL), +(199,178,'481751066D6C97AD5EE90173E8ED107BB1C9FD873B0CE55A','',3037164,22,'',NULL), +(200,178,'7FC57D49535798CDA7E4DC5DCEA2E085AAB9A68BF7F9469D','',149,5,'',NULL), +(201,191,'33357C112DE0195F013FAAC4D57AB1BE77417934CE03A2B9','',3766400,37,'',NULL), +(202,191,'BF8AC678DC3CD354BADBFE46C9173D34CC84D13302190EBB','',21826,11,'',NULL), +(203,178,'4E2F9721D52A7552AE2728B9695F1523DD62DC0569237C3F','',2299108,33,'',NULL), +(204,191,'9F015E7D8A11F30AA1954D9FEA7142D0247E3C09FF2BFF72','',12194860,37,'',NULL), +(205,178,'1EB5AD39B94DB5CDC3294DF49FA589DFBE2C674D07E4B211','',710730,23,'',NULL), +(206,178,'E9D67F07E035A64B89C9E91614DC1930FEF61DC3A5C1BBA6','',690106,23,'',NULL), +(207,191,'36411C2FF2C3AC51B7F6A6B8DF61DBD4E5895C27438847BE','',59620,13,'',NULL), +(208,178,'A77F30CBB8057E0DB37782367C8462FA98D4DB21DE936ECD','',3049492,22,'',NULL), +(209,243,'','',7452688,10,'8B81CC07000025000000','WoWEmuHacker Injection'), +(210,178,'A8C806E1FB7CA3625E6BB6F5E4D9E2BF0EBDBE70BA7226F7','',3049872,31,'',NULL), +(211,191,'B3DD04807DEA2679045F4F197BDDAED5C7CCEEFE19622B43','',360508,13,'',NULL), +(212,178,'B075C8B4D8C5D83FE703677319491DC816EA5103901B44A8','',682394,23,'',NULL), +(213,191,'53DB506C0341B50BEA3897E2E3C0DD74C2CA2D8F5F34A2E4','',59620,13,'',NULL), +(214,191,'E112F38956124FE0F48BF569F5E81B40E293DC6E16B544D6','',17282,15,'',NULL), +(215,191,'0363EF2B1AAE09E6C2B1FA555E706F4EE094BE678DA27598','',3766400,37,'',NULL), +(216,191,'EA256F01B6340C99E27611B39C5ED28CF2FA202436F0972F','',49564,24,'',NULL), +(217,178,'A86C95C4E58495A10F5F1C9B5B62D3365132E8DC62863E8B','',198,12,'',NULL), +(218,191,'56DD8D99991F83AFA2E169315B395BD388B248340E9C64D3','',30044,16,'',NULL), +(219,191,'684B23E010C3D6B88CC12BD9F0B6B0CE00D692C71BFB84A8','',28940,17,'',NULL), +(220,178,'83AEEFCDF4C2E80B18DDF93D99120A89F916C19206D257AB','',668874,23,'',NULL), +(221,178,'D68651921F5CD387C7E860FB7C3B143409735748E3B2FB7F','',682394,23,'',NULL), +(222,113,'A4D501A9DB9D84BD8695A8BF61FC853BF434D2D4B352C7A0','HideEx',0,0,'',NULL), +(223,191,'5E77F12C032D4FEF559F9B837B85BDB9D95ADB10C9F56649','',448504,48,'',NULL), +(224,178,'F08406AEDFA8F19B6FB7C9ADDE0BFEE82CB0D2E275593150','',2303444,33,'',NULL), +(225,178,'AC0EC72522ADA5B2BFFAFAC92D6D0A0225E1D5C727CDFFA7','',672602,23,'',NULL), +(226,178,'4D1A7D1C88AB04438510E3255184E51EAE2036BB09DB553A','',700714,23,'',NULL), +(227,178,'68BBC36F75DC763B573DACAB1D6D8F70E667638AA894BEE9','',717898,23,'',NULL), +(228,178,'2AC3C23FBDE2C1EC46C9ECFF71BD7F603F17C9DFC1328D1C','',3638348,23,'',NULL), +(229,191,'C365E9FE00580EBB14EE863A5CE3C8139B1A59A610520AE7','',3766400,37,'',NULL), +(230,178,'DB2A0451B9753100085C9D149B61CE47A195D77C8B709143','',178504,96,'',NULL), +(231,178,'0871F69205FA62C74C2DDE200A3911FC3E41A4FB8BAB9817','',682378,23,'',NULL), +(232,191,'0017307F2FF889462B0FA06018D99EB1F847F189B6CC9B99','',21826,11,'',NULL), +(233,178,'0FEFCD6B0BF8C2816A9259AB5FD7B89231AEB8D92DE53D26','',3045356,22,'',NULL), +(234,178,'87EAD79656133B3183C2E452886D8F00C5EC6C9D741673A2','',3037164,22,'',NULL), +(235,178,'C2B6C5E19FA98D121B2CDE51789BD2883A324015E7D131E0','',710554,23,'',NULL), +(236,178,'B6F3A7D557A3E3BC4833C3D9B6B0B0609255591CC8AB3B65','',3022016,31,'',NULL), +(237,243,'','',5283280,12,'558BECB8084E0000E8731DF0','AddChatMessage'), +(238,191,'AEA87B23CD9463E9693B6C053C1D9030F8E229DA308DBF29','',90202,13,'',NULL), +(239,178,'8C16C7E8EEAD49AE67E4E91E229FFBCE2F6590A48348914E','',3049888,31,'',NULL), +(240,178,'7B2DCA97CD348E45490C288EADE9303CE270CF57F28EB1E4','',690106,23,'',NULL), +(241,191,'BC10B10BE398F2397FA6962C4E59C8CF11FDD7158EC222A5','',29916,16,'',NULL), +(242,178,'8E53EC1B8ABE90C9A5C087671DE0A3007BEA4488EE5415D0','',3037164,22,'',NULL), +(243,191,'65B5CE07A794164101F7E379D21A7A544EF1EC2A3A39A2D8','',27270,13,'',NULL), +(244,191,'C6C8597824F249180A53196699421ADF7857A5C4E4F80D6F','',13033,36,'',NULL), +(245,178,'FE677759E719178BC5CB49DA252D9B635F76030FC4C9876C','',673194,23,'',NULL), +(246,243,'','',5265823,5,'72118B5518','Language Patch'), +(247,178,'BA2D161EF412084B0229A08E64D5A445C4E9F9F2645535E5','',706314,23,'',NULL), +(248,191,'0174B647A535F206711D3EEEF08D3F421BCABD7016A2F103','',17282,15,'',NULL), +(249,178,'5F5F754FD6E7BAC9650B715387646CF992813730A2BA37DA','',2303444,33,'',NULL), +(250,178,'D2CC7F98209E9A9BBA483BD1E9A916E40EB971EE2129AFF8','',3990720,23,'',NULL), +(251,178,'E8C741CC79005898FFD0026821F61A2E4E67C695C6E1CE1C','',198,10,'',NULL), +(252,191,'23B364A9012EF40A39EC4D04A91F9B60FC7EF7D85E3F240A','',18680,35,'',NULL), +(253,191,'C9363F808D37F13FC09EBB7F700AD09EEB27DA046E41FD52','',36907,24,'',NULL), +(254,191,'2D92FC5B8603E18F50D9CAA0922F5C7BB89E42A4656ED2D5','',3766400,37,'',NULL), +(255,178,'EDEDBC5B1A3D92D2A91192118898FDBF840C967C82968D70','',3045912,31,'',NULL), +(256,113,'BFEF06E80472106B57B15D711F94A25243F6ABA7FE354C95','ndis_x86',0,0,'',NULL), +(257,178,'FB20B0EB9ACF571FE37C6B69CBE86F7906F96B996D7E5EFA','',2303444,33,'',NULL), +(258,191,'917AC1C48C1FF354FD594A3705C70A2C356FE981275E7FB5','',22792,25,'',NULL), +(259,178,'48CD29D8B39DC07B0FD071FD8C643E07A8FC2C9AFC2A3083','',3045356,22,'',NULL), +(260,243,'','',11154396,8,'D893FEC0488C11C1','Jump Momentum'), +(261,191,'FB13A8360C8E23B83ED7309625A7EFBAEE7DCF737068C5A6','',174688,37,'',NULL), +(262,191,'3C8D85F85ED5DD0354561F84EACA575123DE05EE941C28D2','',56063,25,'',NULL), +(263,191,'FBC20EEA52B5882209BC016EC14818376CA7BAF28780BCED','',22792,25,'',NULL), +(264,191,'210D85A84F7BE48F3EB427E0CBCCD9C146320ABAAB5E28D8','',41096,24,'',NULL), +(265,178,'953107F9F718795B6DF9E5E5BEE0EA949800CAD0EB71F891','',3037164,22,'',NULL), +(266,113,'FBBA36D0FC5434D12EE1509E148FF908D51F18719CCBEABC','IPSect',0,0,'',NULL), +(267,178,'82CB32BA2A05B228F2F8D0313C185EB6FDC50A94340F40C8','',209352,75,'',NULL), +(268,191,'079172B91B1768A2650A87BAB06AF700BB4C9A0B5E5B983B','',17522,15,'',NULL), +(269,191,'881751DF112F817E799953E00E94543DA4610968437DB7C6','',12194860,37,'',NULL), +(270,191,'9A47B274EAAC888FA2007B4EC0623580365458E3621CC416','',28956,17,'',NULL), +(271,191,'77344CE014111FAAA66DEF35B670B2E76AE878B054F85285','',61874,42,'',NULL), +(272,191,'0A74CBD8DFF245DA5E8691C1174F037D7ABE823E265226AB','',685656,44,'',NULL), +(273,178,'0E13ADDD413B679E2984060D929440064FAC308FC2B90742','',3049872,31,'',NULL), +(274,178,'D0D8CE5001596C6F4A766FE94726FE7E337F42469CB96CA1','',3065956,22,'',NULL), +(275,191,'313C58F8401B47F716B220B88411CAD0E85966D95B301591','',13033,36,'',NULL), +(276,178,'ACBDC68A4D748C48ED1180DD3DA52632EA6FC275BFC35D5B','',0,9,'',NULL), +(277,191,'BACA83A742B9E09CD07787BC6B50389707EA94C41886BAD0','',448504,48,'',NULL), +(278,178,'549B42D266E7F17B7F30B72E301A9CB3C5E3865DE9B7E90B','',60648,56,'',NULL), +(279,178,'86DB854557D75BEEE7DA820FCA15669B08C760E8B165B06F','',3037164,22,'',NULL), +(280,178,'02D5FBD9E30D43ACED0EFD00CF16DAA69EDD262C292136AB','',178504,96,'',NULL), +(281,191,'B9D920131EFC38767012340CF0FFBFE154DBA28E6EF3B859','',61874,42,'',NULL), +(282,191,'96E6CAE70AF690F5D552E0948C29CA9AA527DEBF9731B16B','',20512,16,'',NULL), +(283,191,'375B22B4990997348A8AEDD53319897BE196398B4F1DBAC3','',30012,16,'',NULL), +(284,178,'932F4622AE9F1B3990900F1F88375FA1DD7C238F7C6133C6','',684876,29,'',NULL), +(285,178,'43583C7BCCD9DF14C64CC84710BEE44DD30E199F579890AE','',3049872,31,'',NULL), +(286,191,'97CF98F0BCABA04BC2BAD40FBD4EBFB3C1FD8A7139D5C9B9','',433168,48,'',NULL), +(287,178,'97A0E0F8F8ACE7F1E6492DAFADE8F45B366446E79C1B0419','',3049452,22,'',NULL), +(288,243,'','',5284488,9,'7507C7451400000000','Language Patch'), +(289,191,'C3546D16052E0DC1838E7A6E18936B88CC8A40C2AEC0BE3B','',21826,11,'',NULL), +(290,178,'4179D6BD8C2F11AD5D5C103A7877504074009AB53AE4D8A6','',3045356,22,'',NULL), +(291,191,'2C360CEAB996C8D6E5DE3FFAC30E412DED48E7814D1CE110','',20512,16,'',NULL), +(292,191,'6F1486BE58078BD453F1B249947BB99CB8E17E9A355CE024','',41228,24,'',NULL), +(293,178,'924F4631DC3167BCFAB02F92DDB49A871DA0C55122EF9EB8','',0,9,'',NULL), +(294,178,'411029C5B28D942ED3C7BC1F4299162D874838A661410894','',700714,23,'',NULL), +(295,191,'B9093BAED730E86AF004119B3B7258938C56902915C2E8BA','',501956,48,'',NULL), +(296,178,'63BD2D7FF6C5442795361031E5768C396A37AE38AF98DB11','',668874,23,'',NULL), +(297,191,'754A2FE56037B971E128FFAA669032C511BDA3A62524CE03','',28956,12,'',NULL), +(298,178,'9AEFDCDB62EBC2DABD6CEBF8C411C1145274FCA7CED890CB','',3037164,22,'',NULL), +(299,178,'3AC57BAC3B782AE5ADBB899CCC060D4E8F66E5217F7DF654','',676970,23,'',NULL), +(300,191,'2F0D9702A58D6D5A8599529A0A816AA101AFE581D98416B2','',56063,25,'',NULL), +(301,178,'77804219E627B4D38C9F95194301A895180B598AEFA9963F','',3022016,31,'',NULL), +(302,178,'0D1B99EDC8E458705A88E72F7FDEEE9233DB21290A0098E6','',149,5,'',NULL), +(303,191,'BB795B4069F985BF44C7418DE264C3B0E9BA6D61A116FF81','',90202,13,'',NULL), +(304,191,'5A6EEBA1E6B9EE71BD4A5F63014E9928302C36FC806DC796','',3766400,37,'',NULL), +(305,191,'BA5777AF7FFF3895935669878D662B585912A759A2DFCE68','',24812,14,'',NULL), +(306,178,'5E690DB1AD8910886334158C6D4452FA2CE896634BCDDF40','',580768,52,'',NULL), +(307,191,'42A8F651F55F697E783ADA1959A2833276F970F1EE0410C7','',41280,16,'',NULL), +(308,243,'','',5296496,12,'558BEC81ECE80D00006A0AE8','SendChatMessage'), +(309,191,'445A6894B8C1838462D7D0D29FBE6BF815B5E6C344971349','',31924,23,'',NULL), +(310,178,'C010786A38F396503B7411FBADA0C1A68795F54A7AAE228E','',679578,23,'',NULL), +(311,113,'E3185EE4428291F9D2E4080C2EB1B19ADB005AD26EF0A993','IPSect',0,0,'',NULL), +(312,243,'','',7739760,11,'01BE80000000E805B6FFFF','Jump related?'), +(313,191,'1995FA3235ADA4B25232DC6403E7463A8D1864528BF9FDD4','',12905,36,'',NULL), +(314,243,'','',5124558,5,'8BF08D4608','GetCharacterInfo'), +(315,191,'30A26827798B7F1646003A9E846E8A9A8FF10A9DF926825A','',49564,24,'',NULL), +(316,178,'A567BBE4CA9D8E976083024E8D68903CF15CEA88C47C9961','',2299060,33,'',NULL), +(317,191,'BEA7165D7DD8E24E31B1C3D791A47A28731E1BACD1189A17','',24812,14,'',NULL), +(318,191,'0971A7CEB84D392670C7B8CBB61776762C25259D8E772CA5','',13538,11,'',NULL), +(319,178,'13200A59A28561A413FADAADFFFE4521A209CB691EA199A5','',690106,23,'',NULL), +(320,243,'','',5090917,8,'E886EE1D0083C40C',NULL), +(321,191,'56CABE081991356465BDE1DA3B8DED099DF9B6E746D1B531','',25724,20,'',NULL), +(322,191,'F98469C704F8B8ABC1A251EF8FC1E4CB5CEF1E007BAB5EA5','',57602,42,'',NULL), +(323,178,'6A64BF5AC652747B47E0B8E6593B7EEAC1EF38E0A84F4F5D','',3049452,22,'',NULL), +(324,191,'978BCD17BC9C81B05A2F0A50EC2CC206EC5F6AB1FE40D38D','',28956,12,'',NULL), +(325,178,'A28EDC898CEB14FB52591754DEF981C7168DD2421D0742FA','',3037164,22,'',NULL), +(326,191,'35E88DF07F0D48A0B7ABD53F4865DB762E6935529DC826DF','',360508,13,'',NULL), +(327,178,'BF1FB7E4C3CDD5D5A93AA1B24FC822AA5537DBB59F696818','',3037164,22,'',NULL), +(328,178,'343F1AFF6DA7A967D2DB958C608A6E2A19F83E862F8E3954','',149,5,'',NULL), +(329,243,'','',10694516,8,'2F549A416F12033B','Wall Climb'), +(330,178,'0B008034F97BD411A9F900D87578258AA1B79873850BC12B','',3049888,31,'',NULL), +(331,178,'C5A35B72E6BC604BAC9AA218908B3747D6850769CEA79C0F','',2299092,33,'',NULL), +(332,191,'FDDB2AA7F8884C8E3A7ED646B3E9E4AF5A8C0704130C39A7','',29852,20,'',NULL), +(333,178,'F57343CEA7133DE6469B1CFD1A749845D553B8D806B2BAA4','',3037164,22,'',NULL), +(334,178,'565A63583AC736E3CAFB95EE5AF9A64D3A7D3C3A8B234121','',3045912,31,'',NULL), +(335,191,'E26CF0E2ED92F608A80733CE703D7EA2C3DB83FE46182519','',3766400,37,'',NULL), +(336,191,'2F44EE3A34EFF98303B3724005EF3A8AC89CB25F9CA1B8BC','',12985,36,'',NULL), +(337,191,'C32F7CDB33BEF7B3093262F89263884DBB44E57D74D646B7','',12985,36,'',NULL), +(338,113,'2357AD2012CEBA72283F93460AC5FF55E4E5719A5AB9F5B9','drvsys_mon',0,0,'',NULL), +(339,178,'1C1595A1A64016D8725619CBC2FC7ABD41835320958A97FD','',676970,23,'',NULL), +(340,191,'DB5765A8B8D5F636D619E44669E9D3EF968BD8011C5D6999','',36907,24,'',NULL), +(341,191,'70B78734AC394D83D45427E0B7C88351E9BB108ED59C7E71','',37136,40,'',NULL), +(342,191,'85F2A5072D2D7557155CBF5157CAA460B19470DEE8AF96BB','',22792,25,'',NULL), +(343,243,'','',4609669,5,'8986100F00','Login Password Pointer'), +(344,191,'6C33FD80565B2860A76C87BB772E794E2FF444D813079A2F','',685656,44,'',NULL), +(345,178,'F09BEAD15FDEBD09240316D9E2E736028B54972B13F14E5E','',673194,23,'',NULL), +(346,191,'302E114D921D40EE54585BD9D63B9BDDFF7A2BD4D678DA97','',30044,16,'',NULL), +(347,178,'24807D7810C58A4B9A070A21B8AE50A0385DD4B4C6BD8B6F','',3049872,31,'',NULL), +(348,178,'B6BDECA858773B6F995AC6496923F5D0CBFDB1F76DB29C58','',198,12,'',NULL), +(349,243,'','',5296823,7,'75166824020000','Language patch (speak all)'), +(350,191,'C125EB3FD1B222ACE1B518959D96C5AC83EEAF109E9C6D20','',12194860,37,'',NULL), +(351,178,'8AFF28C3E6367B10340FB963B093AB52E61B267C541D5659','',2299108,33,'',NULL), +(352,191,'734D3EDDA69D9DD307032245FA0806456E2F02E90C2291E2','',36907,24,'',NULL), +(353,191,'9CB5A848D90B7FA4F58801ABD8A68EF8FDF8C602063C2CD6','',13033,36,'',NULL), +(354,178,'C8BCF785F8B7118D0270016E620E2C3DF6802E034471E5E4','',3033068,22,'',NULL), +(355,178,'8FB282098C8BB4EC10C8398E44C630677C6E2785227E31D3','',0,9,'',NULL), +(356,191,'2381BB2B613C58C364E962738335EBC2F3EFF81009DE49E4','',37180,24,'',NULL), +(357,191,'AA2A24A7C90D149C7817640B0D2D46C8A4B4D52146837605','',501956,48,'',NULL), +(358,191,'6815D749CCA8C1738A5F3236A737F0B70AE037E82D46033A','',448500,48,'',NULL), +(359,178,'F9F131F27BCC37FEF638FB8EDDAC29400652020C290D4F75','',676970,23,'',NULL), +(360,191,'319CBACC4CD2E1F54F8C8FC41EF44A3A9C492A652B00C622','',18700,32,'',NULL), +(361,178,'A4A7DB31BF51180F1ACFEA6C0E59AC84B43D022CB4BB817D','',2299116,33,'',NULL), +(362,191,'0DF639ED45B0C578DD616DD191014727A3C22C346E9FF73C','',50040,26,'',NULL), +(363,191,'72944B7FED63C1D2FC9D2CF6A07B5788731BE2B02215CEE4','',447736,48,'',NULL), +(364,191,'9148E18CF9213B25197C247F08CCA4C0DC60FEA73E3A247C','',13250,15,'',NULL), +(365,191,'ADA39A6A805BDF59271BBCE21734E8F28182164563CA15AA','',29916,16,'',NULL), +(366,191,'D5C852D85FA4393D027615506B7DEE07A1074AA4633019D8','',41023,24,'',NULL), +(367,191,'D06EE8DDC2115E5895E96D26A2A2F11FC566297D1D21BD26','',56063,25,'',NULL), +(368,191,'3AFE3B981D50B26FCAAC9DBE5A4BCB24F5BC3E9348AAA04B','',25724,20,'',NULL), +(369,191,'058E826BD75C26BACE712DF9D67B0A751896515802E9DDAE','',501956,48,'',NULL), +(370,178,'6E4C9CA0F7140E32D9284AF2E0EEB76419696771D4DDE887','',3634252,23,'',NULL), +(371,178,'29E43B1309ACB344AC777636BE838F0BFE6A04570B7FB09C','',700714,23,'',NULL), +(372,191,'5B7AC53977D57C5756A2F61582DD386EC93F5FE180FAB5DC','',27270,13,'',NULL), +(373,191,'22BF8D63A306178F368016E4657CCFCA5B2B21EBC90B8DB2','',50040,26,'',NULL), +(374,178,'1E8729EE000CD5BD8BABC49C368E0FF5AC08BC2B30921BC4','',709322,22,'',NULL), +(375,178,'8A1304B9AB2579F392F92D8A592308728EF76B26AE258A41','',4011280,23,'',NULL), +(376,178,'8A90AA547378BD5930D24FC415AEC08EF52E29B22073335F','',710730,23,'',NULL), +(377,113,'4BBF42A918109CC23F231B8E657076A213601AD681C032D1','HideEx',0,0,'',NULL), +(378,191,'06D9E92AE3953D13A0AC5FA31EC24B16C6A2260E2D32BF8E','',41096,24,'',NULL), +(379,178,'D4D3A9950FA07FAEDAD0658F9128007ADE282C043210A201','',683146,23,'',NULL), +(380,191,'94530FBCCC455105E8BB67E5B19BE0A4534A6F39A1201B52','',13291422,37,'',NULL), +(381,243,'','',4198410,6,'CCCCCCCCCCCC',NULL), +(382,178,'2313AF1E20F446936533F9440B220BEA966D9EB3A0502DCF','',178504,96,'',NULL), +(383,191,'F982BFDF01EB3BC6FFB70E897BFE21376232B2EEEFB25E58','',20512,16,'',NULL), +(384,178,'26308A71C6F483CC7795A01A2F2CF7E7EE97787C12CACC52','',2299108,33,'',NULL), +(385,113,'368334F9A3A549DFD3ABC9793E4EB83E837AA43F010354D1','ndis_x86',0,0,'',NULL), +(386,113,'5DA702DF95570780875ADB4C64259E887CE0A867D9B67711','Afd32uu',0,0,'',NULL), +(387,191,'B51E8DA25AAE556552404F5172642D0808A89E2AFE870B23','',694376,44,'',NULL), +(388,191,'4748EAC0350B1B56D8549157AAAAF4FF35438078A7E37AB5','',34176,25,'',NULL), +(389,191,'FBE20B03C75572D992273F192CE72CE78A65E6764BF8E6F6','',36907,24,'',NULL), +(390,191,'D8C1B9DEF3CA9CA59C5B827F055729B636FD55BA6242F9F0','',694376,44,'',NULL), +(391,191,'448475EBCA685E5A4ECC5F810740C9181825B49613CDDDA8','',477928,60,'',NULL), +(392,191,'2AF2DEE0CA5F307895E5773A083AEB862EA3D5210E037F06','',41080,24,'',NULL), +(393,178,'1708C050FF0C98DE59FE8F070273D80F9C1A612D336AB9FC','',3049452,22,'',NULL), +(394,178,'ED6BB184C9DD307229A023C1905E6EE73981D3E088D69FE6','',676970,23,'',NULL), +(395,191,'EB63A86D51668323A18AE2F8CE2BDD1ADAE57375B5F76C6B','',45223,24,'',NULL), +(396,178,'5837373EE8D4CCB5687045C04A4297450ACDE774FE973917','',673194,23,'',NULL), +(397,191,'65CCA5E079D38DCF32053D8DEE6C5ECF88E6AD8E1CF5379B','',31924,23,'',NULL), +(398,178,'FB895125A69DE5DB112B4731F6216668EB09C4F57943D85A','',706314,23,'',NULL), +(399,191,'A388E8CE523DB7C3C501AC5DB2C8AAE58FD1831E75665C48','',401992,14,'',NULL), +(400,178,'77C74B5E4CBCA9150FB64261E497AC4E7642A316C89B291A','',3045356,22,'',NULL), +(401,178,'8A2C4F7F3367A4648744D8964BB9A6833182ECABFE015B00','',3022016,31,'',NULL), +(402,243,'','',4609675,5,'5E5DC20800','Loggin Result'), +(403,191,'E8A24A78E6A716734CC666B48263B424804A42155C0BDB51','',18700,32,'',NULL), +(404,191,'3C881D2F0634D9223A36DF5266A7CF36B503DCF424441FA5','',28928,17,'',NULL), +(405,191,'7B3D92577810CAB5DA0134FDDA91CE6F36003C5373526774','',41023,24,'',NULL), +(406,178,'7F794E0811DA99DABA76CD9925B3E78045425E32880F05D3','',672746,23,'',NULL), +(407,178,'08235E08E4F83DDEA588D9FE32BD084FB26BDA6DEBB1E416','',668874,23,'',NULL), +(408,191,'5EF7C22867612F48FE5B41E219A1CA389AE8D32D8F0FC46B','',21660,15,'',NULL), +(409,178,'C7C78789911D6B30FA6E67198EF03B73CEE37576AEBFF5EA','',3045356,22,'',NULL), +(410,178,'62BF4E6440FE3F28138094B46FB469CDEB35008DEB652B8B','',3045776,31,'',NULL), +(411,191,'E24027620A1723C203E8084AD6269A852CD50D6F79D50530','',36544,55,'',NULL), +(412,113,'49CA50FCF2699AE5F4A867156A5D8053C4239B36DACE170C','HideEx',0,0,'',NULL), +(413,191,'073F4A76F248FE7C38F799437D475B9A2E9E81FA08B0C6BB','',17666,11,'',NULL), +(414,178,'6ECA7966F2845B9B61C6D9356E4FE4C913FE917808C8AFFE','',684876,29,'',NULL), +(415,178,'30BA488B3964465B142E75F6D1E1BA42DC9F489C3AC70BDA','',2299092,33,'',NULL), +(416,178,'55492051D368975D444428D6218A7D731555ABF7C3391E7D','',3049888,31,'',NULL), +(417,191,'94E0CEC4F7BDE7844C4D4ACF62E5C96ECF1D11FC2169CF8E','',433168,48,'',NULL), +(418,191,'5003A599A1162170A30F1906C0AD5B16DC7041E72D28A4B4','',28956,17,'',NULL), +(419,178,'686F700B2223502053CAFDF9977D8774E905E76B8C960E7C','',3049492,22,'',NULL), +(420,191,'F5A776E794B34ABBF93CA93E9230B7224CA088AB741DCB57','',13291422,37,'',NULL), +(421,191,'4A67D56DDA6B0E7D9117CFDB17EC6572E68B9300609FFE3C','',28956,17,'',NULL), +(422,178,'1B695DF78AA0708221E0EC2F5A69AB7078ED8143B2EAD174','',668874,23,'',NULL), +(423,191,'7C8CD40E29AE999923CD8EAFC233E619C73885A0258A6E3D','',21826,11,'',NULL), +(424,191,'73407824E9064DF5F1161A204A272A9CD69026EB4DF1004A','',29916,16,'',NULL), +(425,191,'B21609972E46C9BC8C6A77A18161A77D0C1D4001DC892DF1','',41080,24,'',NULL), +(426,191,'BB66A6AC45D02568067987834ECD8BF0A2BD0DAD06D12753','',17762,11,'',NULL), +(427,191,'2550EB7C358B7FB86FAF0EACDDC3111118769F448D93BF7A','',49347,24,'',NULL), +(428,178,'B6E4EF9350CA859576DB74D02C115D5A19C79AA58B0F6681','',684876,29,'',NULL), +(429,191,'451D2C8FF751743B52109FF5D95ED633DDBD8BCDB80EB7A9','',17906,11,'',NULL), +(430,191,'4A0161A4E5D50F11F58E1B23B281ABDA106625E3DC5A179C','',685304,44,'',NULL), +(431,178,'E4F21910D4B5D3E7B5461ED384889F6D0969645AE83F7601','',3037164,22,'',NULL), +(432,113,'B9756E3E1093B54511AC5A7B85711E53CEBEA373EF4866EE','Afde32uu',0,0,'',NULL), +(433,178,'A5AD6C8506004101E42165CD95051A7B5F13FBADD027461B','',710730,23,'',NULL), +(434,178,'B8AE30A02C59219D144EE95228C6CC9F99916F6FE423C940','',700714,23,'',NULL), +(435,178,'DAFD84BA8F977F5CFEEC9310C0EEF8F949F8EB6B827EBE71','',3990720,23,'',NULL), +(436,191,'B42986974893A82D73CC497B3252E9B844A11A99ACF46BEA','',41188,24,'',NULL), +(437,243,'','',11287980,8,'04000000903C9F00','Parental Controls related'), +(438,191,'0DC0953AE42E913121092DF17BC2BEE8BE133D1C53C8BFFD','',17762,11,'',NULL), +(439,178,'72C81E9BA425C54DE57BF4B7745D9C8D6B44D56E8FE933BA','',3049888,31,'',NULL), +(440,191,'100426CD22E80090502AA7A087B094B49ACFF4E7A09773ED','',30044,16,'',NULL), +(441,178,'46C797D1E60CC458E6C9D874650B996D10FC52641C2E7AA7','',676970,23,'',NULL), +(442,178,'DEA2C8A5775AA8CA86B8241BD418979D10DF4587E8E95C87','',250,11,'',NULL), +(443,113,'8807783067F9FF2697A61DEE925760682EB894C6F0A798AE','Afd32uu',0,0,'',NULL), +(444,178,'F63823A1F60619FDE6B4D6F3915EFB03EC03DEBEC82AFB9E','',673210,23,'',NULL), +(445,191,'E4DFD66163F2A65ECDD2EE9CA8062D707CC51882336F6483','',130380,14,'',NULL), +(446,178,'88182C96807A6025E628C90CE436C9EC54EC5FEC858A12B2','',690106,23,'',NULL), +(447,178,'EC322863C90B861E66A0008554BB8702EA92E1406F6F1711','',3070052,22,'',NULL), +(448,178,'9C851C7C05E54E5514E7BE038ABC5C669A3F5747EC573333','',3022016,31,'',NULL), +(449,178,'46D70E5C13F6D16BDD01A7481D9AFA51B73202070CA5D712','',673210,23,'',NULL), +(450,178,'CBEBB5F6F4EFB1324D17AB6CB48C573B639A37EAFD6299B4','',683146,23,'',NULL), +(451,191,'684575AAC0D8BC30D5325D56D3D522380E85ABFF380FA80F','',17938,11,'',NULL), +(452,178,'952BC8983C2CAEB6239BB2774F176A7F87A9F2DC10261205','',3045356,22,'',NULL), +(453,191,'4EAE0459E341062DB99658136D494BD79511B883F00BCE6A','',57602,42,'',NULL), +(454,178,'67E6E0A4006561DC5A67026886D1FF37AD14C5AA1AEA3CAD','',149,5,'',NULL), +(455,191,'222FE6B0A70CE2CEE633597E018706B3F78C338D96F6D9DC','',38300,21,'',NULL), +(456,113,'79747D68A5D6CD203671EF43029F17591E42BBCDB60B8B93','IPSect',0,0,'',NULL), +(457,178,'77ECC7613D44E56210F7CCDD6046226B41C8F087E901C94D','',682394,23,'',NULL), +(458,191,'77A59932BC8D497D992A213256ABD52C4D5F4FFB8A06002E','',49564,24,'',NULL), +(459,113,'2D14DD3BC859535580D8D9DC3BE7D59865A4E3FD112598A5','drvsys_mon',0,0,'',NULL), +(460,178,'9B487CD5032D00424A24FF3185AC4C17246729ECCE431951','',3049872,31,'',NULL), +(461,191,'978D8D1F3E1EF11CEBC4B65B13F1C5CE6E9E220E71B255B9','',13033,36,'',NULL), +(462,191,'1F5AD2397EB3CA814C5D156C6777C040F5D73085F3751C35','',433168,48,'',NULL), +(463,178,'912807952F9397C8F2B718C9164424D720E4EFC681DA3099','',3045356,22,'',NULL), +(464,191,'095F1A232F56B3DDA3338B5DE2CA310E5CF0EC0B6F72E87F','',17890,11,'',NULL), +(465,178,'2A5E27A3EE36254F61795E168A98C055772F88CEA5CCD6F1','',3033068,22,'',NULL), +(466,178,'4319BA4F2139568E87BAAC5F7C95121DD98D710B1C901E2B','',718842,23,'',NULL), +(467,191,'74E55BA8CDEFB5BD54BF1C0B0D326721D756440BA33C3ECE','',27270,13,'',NULL), +(468,191,'ED9FED6EE63B6C5E35C9E4615AC444603F6BF1FBC669D8B5','',13033,36,'',NULL), +(469,191,'DF967A96C67C8D6CB1955D1CA06556F37EEFC88D26F1D684','',90202,13,'',NULL), +(470,191,'2BDB1F4509561B2F846AAE7A5354008215C1EF4BDD0EA1D1','',49347,24,'',NULL), +(471,178,'0F3B3F0934C1B1E32DC9F83F67308BF9CFCCEB0EFE10B2FA','',672602,23,'',NULL), +(472,178,'E89980FFE6987D22DF5379283F53DA8DC3B5CD4862BA22C4','',335122,23,'',NULL), +(473,191,'156B3F2929664A16C3DA2D47CE3050B3A1BC32F9C30E4776','',27270,13,'',NULL), +(474,191,'65B03F581DEAA68B6A07C679C6B620A2623FD83EB4C4978B','',28940,17,'',NULL), +(475,178,'044C63CB9F480E28E02D68426C1F3D69BD146B39A7F081B5','',0,9,'',NULL), +(476,178,'B3BC7201BF77B362B943C8C13F9E70A751906F304F9AE133','',673210,23,'',NULL), +(477,191,'4783BF04A6BD423D63CD955407780BE0E15A70BC2643F853','',28928,17,'',NULL), +(478,178,'A71B471FFB4C58A2C99FC6818DD0269C4AE4C5686D5FDA87','',690106,23,'',NULL), +(479,191,'3EA0347F1F7D9BC9CAE387816DFBE4F492F53533400315B4','',17762,11,'',NULL), +(480,178,'AA5ADEE929B0B2FB655080B35D19607695F611672E6AD364','',3045616,31,'',NULL), +(481,191,'2DAAB5C524CA576967A7B0B713C1C34DA8EBF3990A86730C','',28704,16,'',NULL), +(482,191,'D0042CAE82A7121F7783A1382F542074B34ABFDF50A1B13A','',22792,25,'',NULL), +(483,191,'4D30286AD524AB2EB05C1A361A81036F787B1C0ACA36DD74','',30012,16,'',NULL), +(484,191,'03F9E0F9328E7C7025C0D5C59585700F19E29E8C8F9BF5B4','',49564,24,'',NULL), +(485,191,'430C4F44FD7CDF1A51F7A8FA5852ECCDA6CFA92C2A6ACB3A','',28920,23,'',NULL), +(486,178,'A2886E2080C54F25867AEDACDADD8F5175545F44512A3B58','',672746,23,'',NULL), +(487,178,'8438939BFCD0C550664ADE2DD75DD15FA23DC435EB5FC011','',3638348,23,'',NULL), +(488,191,'66480AAA84C5C00B64EEABE96DD21EB3773228B144E25D0E','',20512,16,'',NULL), +(489,191,'76C1B0FAC29E4E41FC6DAC31A0592CB0087BCE0D052904FE','',61874,42,'',NULL), +(490,191,'DA219765DA22ABBDBE5486CF7DB01C283FBF9986732C9A91','',37180,24,'',NULL), +(491,178,'F58BFE40291DD85F45C47E0E255594382DE0180AAE1F1FC9','',149,5,'',NULL), +(492,178,'8D8A305C43A3DD47DE550F256BD5F4B1753EDCC079AF279E','',3070052,22,'',NULL), +(493,191,'69CA60928A9A85D79ED39596C018DF899BD14C6219EFE088','',41080,24,'',NULL), +(494,191,'8D9AA947B904C003D06ACDF4EA0C84104612B274696999C4','',17890,11,'',NULL), +(495,178,'289CBF469FC750449980BFC2CA6AD7E42A69E14595D140A3','',209352,75,'',NULL), +(496,178,'49961CDE71B612E5432EAB389E7AD193476E05BB2778B751','',700714,23,'',NULL), +(497,178,'43818F9575A04BF426F4BE167052859015CC63622F7D4F3A','',672746,23,'',NULL), +(498,191,'7828B55FDE24719EC377E29FAE55BA6324020D00CD42A99D','',360508,13,'',NULL), +(499,178,'5432916108AFDFA313B6D88C886D87B5722E43EEBCAFC627','',0,8,'',NULL), +(500,191,'106F24060B7A4FC87A7971A4B0EFC1021F7181A09598C336','',17906,11,'',NULL), +(501,191,'13AA99805639421566A2652F0A7104939EA52EF0F77CFB03','',24812,14,'',NULL), +(502,178,'D0938B578EC70162A30A25571CD5DC7E765780F6191EAE1B','',710730,23,'',NULL), +(503,178,'70FA2C3749960F1B0D881FDB186DB9992D6EFD30C6674104','',580768,52,'',NULL), +(504,191,'BCA2CC6F5740DEF5D01D314146879036A5B6965C01424B0C','',45223,24,'',NULL), +(505,178,'47DD279576A64BCB3A4AF23D55895600C73BB5C214B70AEF','',3049452,22,'',NULL), +(506,178,'09C9B53C215456866BF764553A7B7E4F1F20F33A8D2CB613','',3638348,23,'',NULL), +(507,178,'3EC2D3876D82F424718D3B8E0B87562244C3F5A11A29F0E8','',682394,23,'',NULL), +(508,191,'7B4E9BBDC89694CCAE5BA6996D4240EB2E0C9C7F03CC5D40','',59620,13,'',NULL), +(509,178,'E2333772B05ABC620076EB66CFBB4AFE2313CCB6D719399F','',3065956,22,'',NULL), +(510,178,'2EB4C04C0946264F5BC8EFBAA832CA97381A8A6523BAB093','',178504,96,'',NULL), +(511,178,'0E3DE8374276C08D5DD241ABA2AC0AC1D2319F5CD22AAB52','',2303444,33,'',NULL), +(512,178,'FDB8DF478DADD2E36619D63D04D106EDB86EBF8FB9EC8CB4','',3000288,31,'',NULL), +(513,191,'BA76761FA5F569497047C3484FBC6FDDD8AFA71B96FE93C8','',24812,14,'',NULL), +(514,191,'2496E15413F7008A01FA53AC109C01E45B80BF2C3BC2F205','',56063,25,'',NULL), +(515,191,'CACB6383E8613E41489D93D7FE7235BE61214F9AE0825F44','',13291422,37,'',NULL), +(516,178,'931C403D2562AEE58EEB2586D73D51323A3A739860290AA6','',690106,23,'',NULL), +(517,191,'1A95AFB270B9C0D170E7280816891492C21E87D92E9EA6E5','',433168,48,'',NULL), +(518,191,'7483929857AE7A16C2D9EB0857EB1D5E9477479C2EEF0B5C','',37180,24,'',NULL), +(519,113,'379E1F6905F203E1026DB54A58AF588EF5726D9F50FCF369','Afde32uu',0,0,'',NULL), +(520,113,'08394625CCD77F36897EF283FAA0C019EE9F36775182584F','Afd32uu',0,0,'',NULL), +(521,191,'D9ADFC0283E75A86A3E1672BF50F5D1AD8E8466AE7086437','',27270,13,'',NULL), +(522,178,'D37F6219417C0E5196D3A4473D57ED767E6D9B49BB2B9555','',0,9,'',NULL), +(523,191,'93AAFBD4B8B50D6AE72F3BA7002D76791942D0EC0E61253A','',41127,24,'',NULL), +(524,191,'F9B132A5E1FFF379EC7175C12A58683C85272CC96E03E161','',41023,24,'',NULL), +(525,178,'1867D3CEC9379D1E6B8A1B9B667BDB1B6084B02ED9A60864','',3037164,22,'',NULL), +(526,178,'86548378A25632100F7E6E872ECF4D591B7542D977B623AE','',3049452,22,'',NULL), +(527,191,'9E00F6F9AF1D63FA2628E60B7BF2B1D63EFDD42D69929A73','',41080,24,'',NULL), +(528,178,'7DDD4CF1352822A1F9D19775498EE865FABB26C69F8FDEFE','',209352,75,'',NULL), +(529,191,'3D793384AD147BDDE98743EBE1E943263EFD6CAD542E2757','',17522,15,'',NULL), +(530,191,'9014AFDE93FDAC6C20971BEE76898FBB300A744CCBC24DA1','',28956,12,'',NULL), +(531,178,'D1212D7155D2C3114DA596070139C0B3610597CA0CE1CB17','',149,5,'',NULL), +(532,178,'BE18517661568A9D7F3CC9548592867F3A987A705866F60F','',3049888,31,'',NULL), +(533,191,'5D833D8DF05A7AF50DF945F5AF6880D325AC52B3ABC815AF','',41188,24,'',NULL), +(534,178,'1AA3B0D9AD368562F181E4E5D498652B3859210C126824D8','',672602,23,'',NULL), +(535,191,'331E027A700CAFDBEAC9E80B68B8304D0895D52947447448','',501956,48,'',NULL), +(536,191,'8E704337CE9F823A8A93947130ED1EE14A99F2EDB5458B94','',12194860,37,'',NULL), +(537,178,'BB1C818F79DB2F1FF71B7CB181021EB4F425311D09DAAE81','',0,9,'',NULL), +(538,178,'F1AD484D3F189A08EBF420C235D16ECAF1B485092FB063D6','',3045776,31,'',NULL), +(539,191,'1CF7028BE4D68B7AC6BB8061BECBFF402860541D04C90C0C','',17906,11,'',NULL), +(540,191,'2550D8249054E57086D4F4CF80396C686A71673C070711DA','',17890,11,'',NULL), +(541,191,'E864BD00AEB4F3D18CFFA7AADEAC7926A9A1E3EA7588F17A','',29884,20,'',NULL), +(542,191,'9E70338B4C8C845F8514925463DB624FC4423F9C467F5E62','',685304,44,'',NULL), +(543,178,'FC5EF49EDEE7A5268395298071BBA270822547A7416AEFB1','',3634252,23,'',NULL), +(544,191,'8282F57B7C3CD9B449B6363D5C9E792C2044EA2C3F381F9F','',17282,15,'',NULL), +(545,191,'B793EEE20E44B2942C6522F79343C58738A1A8489A381FB0','',24812,14,'',NULL), +(546,191,'6178EE9E575927A3505835AC88DA31BE15F0622DA55B31EB','',28956,12,'',NULL), +(547,178,'7BFD2D88793D6AB1A2351A3E8873B1E20CF44BF6563A0930','',3049888,31,'',NULL), +(548,191,'4102F13984A4E146C134D3F607AE7CA1B3263A22B52308C6','',447736,48,'',NULL), +(549,178,'EA1C4CA2A64548757BC2ED1C5BB6D2B5094AAD5B5C331F7D','',683146,23,'',NULL), +(550,178,'BEB42A9DB2B656B2DFF3DD7D1B8D87033F1D99A019CD4BB5','',3045632,31,'',NULL), +(551,191,'4E209437251EBB0CF31CF8A7CCF2C873A4D759B9563D573E','',34176,25,'',NULL), +(552,191,'85EB9C8A36B32287F096CF73F7FAE8B57405321342E9B779','',17666,11,'',NULL), +(553,191,'2EDE42629DD4A72669FFC9BBFBE15F357BF241853DBF7B2E','',27270,13,'',NULL), +(554,191,'FF47A1D9514F4DD81BDA23FC9018F03D894F9096E26EF809','',18680,35,'',NULL), +(555,191,'65185BBCA1D9995EA4B796E908B9F78923FDAE2D0C2500BC','',594348,26,'',NULL), +(556,191,'BD55E51B55A8FAB82CBF45012D761B1BEEE9BC0DAD8A83CD','',28920,17,'',NULL), +(557,178,'AACC3E694ACD478B1F99714734B5A43BD7D7A2A3565ED9B2','',3049492,22,'',NULL), +(558,191,'F3C07663325C5358F58A547725FBDF8DEF591021CD94513D','',685304,44,'',NULL), +(559,191,'503B5AB938616DE7672103919957B421FA8B6C98F72375F6','',20512,16,'',NULL), +(560,191,'3B6EFA3FF9443BEF4CBD2E7CAE08DA1753C79E5EDFA8510F','',37136,40,'',NULL), +(561,191,'3E5D1B5BBAD191442388FBD5236F5406CB2CA68EDF986328','',17666,11,'',NULL), +(562,178,'D8AB51DCC7840369846821B2A6B229CBA2E42C0CA566792D','',0,9,'',NULL), +(563,178,'F8004FA24C4925FAA3ED4993B0D457C5E4C5371915BB93D0','',3037164,22,'',NULL), +(564,178,'EAF4A696D564F6BC800BF0F6D732E4E92B50133DE02EE8C4','',0,9,'',NULL), +(565,191,'30BDC2BC3E4A2055426FA0EC67DBDEB7705C58047EFFA4D6','',61874,42,'',NULL), +(566,191,'3C8BCED97B2F9E5A52587E725004E136DED2B53AB2DB9D4F','',20512,16,'',NULL), +(567,178,'0B586F15A8CFD6B7A96632FF2B48D0F71E9D06BFAC174002','',3049888,31,'',NULL), +(568,191,'B2B3043BF9CDF3DB535D52ABC45BE586E6B8097B58D82C45','',17890,11,'',NULL), +(569,191,'9ED22064CDACF86DAC8C365C325EE428A87B628D137E038E','',28920,17,'',NULL), +(570,178,'2254B046D6D8D1A47E5F9275474B5EEE7A96CD99E8D952E9','',682378,23,'',NULL), +(571,113,'0A268B6DB28320A1956B54C36C61C625B02A48A4768A0823','Afd32uu',0,0,'',NULL), +(572,191,'41B3450DB8D10C506A561C7B95354A7792286D837C08B437','',12194860,37,'',NULL), +(573,191,'5CEDF5982800D9C6D16F9D357AEA17BBBAABADC8F3A12EC6','',45223,24,'',NULL), +(574,178,'3399D1DE6156FDE8614333B6C4AB0F5B2354381AAB7AF818','',3049872,31,'',NULL), +(575,178,'31DA5322A7B1F1715CA35F0976C201122A76D46A719F0C28','',335122,23,'',NULL), +(576,178,'36172791F3ACC5EFD406A7AD6F5D218279B94D458BDD60C3','',700714,23,'',NULL), +(577,178,'C64DDA3E5D94BD0DEFEDDB867DD304177B554C5771CF4DEF','',682378,23,'',NULL), +(578,178,'701D57AFE1315795AFE1340C35E923FE69C36EFC670C0BA5','',0,9,'',NULL), +(579,191,'D55BBE3C196C2FE07829CC54717C0A2A27C13A38ED4CF582','',30012,16,'',NULL), +(580,178,'DAD3C22D23FAB30C9AA6796E19EAB23CB7DCCD639854C14F','',3045976,31,'',NULL), +(581,178,'B3EC9710B55079104420F126BA7257F8FD7DC39D46880E5B','',2299060,33,'',NULL), +(582,191,'7762CCDD012D51167BF42F775CC307238C35EA5DA55B999E','',41096,24,'',NULL), +(583,191,'CEB7B2C893B8410CA8716C77DB679AB860F7F0E86BCF2D8E','',12194860,37,'',NULL), +(584,113,'C584FF543FABE32DBA3206AB324CAFAD92497C4926BBF8B2','HideEx',0,0,'',NULL), +(585,178,'122B96C9AD3D43FA5EE82ADFA464904F304EB7FD4CB5622D','',2299108,33,'',NULL), +(586,178,'3EFBC5B273BFF42D9F704C74DC2381B8A0D50D61C2F1512E','',717898,23,'',NULL), +(587,178,'8C5824E4A6D16714A2BFB5FC9D0CBF4706B8A2170DA87D7B','',0,9,'',NULL), +(588,191,'402282B90E06579656CF454305C0B5A925C95FBF6A7CF265','',477928,60,'',NULL), +(589,191,'71B36C6D650EF0D049328643E5B12E73DF95B58B2F30D0DC','',17938,11,'',NULL), +(590,178,'7C49C303394E1493D897E802528CA8E558B6A7BFE8320F08','',3037164,22,'',NULL), +(591,178,'2C190F9E920AF2EF67DA4D06905C2A6A0A2BC63D0192BAC5','',3045632,31,'',NULL), +(592,191,'E59168C40E1A0C9F8896EA9E2D684988D81A522FFCDC51D5','',3766400,37,'',NULL), +(593,191,'3C825803D3ABF20A11495E54718A2D83A0B35FD7D741B5E1','',12905,36,'',NULL), +(594,191,'DCF32E3E1C5DF813DFB137A2D9B21D95B0AF66CC2AD0F245','',41023,24,'',NULL), +(595,178,'7B66BDB4A0A713A7B315888708B88F90CCF7313832CCE35E','',3045356,22,'',NULL), +(596,178,'FFAF20DD14D7018A4156F000D1455DF36966513EB76F93E7','',2299116,33,'',NULL), +(597,178,'0C59AA1F05D2D9D3C0C5ECF6A38D9FF57187A7A461DEE908','',717898,23,'',NULL), +(598,191,'913AA6D16EBE73143FA4B4EF89C786668C6E7DD0B936DD18','',90202,13,'',NULL), +(599,191,'A9F5CA81A547D8F8051928A287DD280F7FE835B2858CEED5','',20512,16,'',NULL), +(600,178,'16B4D8897AEED4732A47239CDC99603D2F505D0AD602847F','',673210,23,'',NULL), +(601,191,'23F29E10D55E8701A1A699A1C05CED4553676E9FBA5B51F5','',13634,11,'',NULL), +(602,178,'9A65A024256C0D7D677C9F24A9C16A48BEA9B03CCA016098','',3000288,31,'',NULL), +(603,191,'AA0004288ED58DE4324FA521F849807DB1EF33634C7FE8C3','',61874,42,'',NULL), +(604,191,'E400A401BD0376A0475F1216731F5EE0DDF42C9A4FA805D2','',59620,13,'',NULL), +(605,178,'FD434987A57E848192562B61CA0D67BDCEA2392514CDD0AF','',3000288,31,'',NULL), +(606,191,'88C140A6580061C775D9141887FABD3F20E574DC4C0C4BBB','',9977,32,'',NULL), +(607,178,'3623B441A5D414AFD6650C8B8623ECF3C3A9129E1F5A81C1','',672954,23,'',NULL), +(608,178,'393A06D430D287FEC1C02F9945C34BA2A7954241C6357909','',335122,23,'',NULL), +(609,191,'0955A3267A3E576B9BD823BB210E8200F37CCB0421BF208C','',685656,44,'',NULL), +(610,191,'1A00ED18B456ADC1A1F39A5DEF572250FB0CCAC8BECA9DD8','',477928,60,'',NULL), +(611,178,'370B9B6E3AA987595F986C5716BF9FFCF0369438D5DC5D11','',156,8,'',NULL), +(612,191,'E8E85DFE24D8D20852A37D702CDF029C3B1FA30B99CAA4BE','',447736,48,'',NULL), +(613,178,'FA24C5FEEAF4538DD4913F10C99F3F64380B7354EB318386','',3041472,31,'',NULL), +(614,191,'C6AD92AC13B340575AB5D0769A1A7EED47BC42A5968E67D6','',37136,40,'',NULL), +(615,191,'990EFFE367D44A29E82F62C57B6041A66F66C1D100B05639','',28956,12,'',NULL), +(616,191,'631E42C3B6ED8A22F5AFA903176A7EB011754F5ABF2081EF','',3766400,37,'',NULL), +(617,191,'D8AB4091C51177D7BBA7384EE12E0384A7EDB73E38D15920','',13291422,37,'',NULL), +(618,178,'54AAA1926869D259C427870A620AE0C24AFC9B472F424633','',3049888,31,'',NULL), +(619,191,'CC0E40919988E53DA0B447F0984A30D51CC42E9DB54A8F1F','',49564,24,'',NULL), +(620,191,'396E7EC540DC2C74CD6709753CC627517E3A2DB8A1EF3633','',29916,16,'',NULL), +(621,191,'84A5A077180DFB9841E8DF4A4EC49EADE886D905768EE032','',57602,42,'',NULL), +(622,178,'072300C283F8DF72B3ED5F3CD8B7DF47574AECF7B21FBB59','',668874,23,'',NULL), +(623,191,'D4FC9A6022B7CFA81904503E43B813631D4735D80BC61868','',9977,32,'',NULL), +(624,178,'47B5A19B87234257CB6C1485AB2C0CB25513260F60094BEE','',3037164,22,'',NULL), +(625,191,'B8B6F4BA5FD45F0ABDCB060F72987987B6EF62B80C9E378F','',12194860,37,'',NULL), +(626,178,'261F2915266F20B7289A1560176F24198930C61540BEFA01','',3638348,23,'',NULL), +(627,191,'019A378006B0677C0B2F42C6CA882EC571D504E7D8F5B05B','',17282,15,'',NULL), +(628,178,'4E82DD9F04571D6DAB2FFCFCD638699D1D4C84917F720F32','',717898,23,'',NULL), +(629,178,'EAA75F6AE049552C55AFFDABB7268682428B1A9BF028C4D4','',673194,23,'',NULL), +(630,178,'F1431C669453FE0BD95430ECD8328EA0D3CD37BA658F094E','',198,12,'',NULL), +(631,178,'8AD8C581E8BAF7A2140211C4298A93E229493F272F4EFF4A','',3045912,31,'',NULL), +(632,191,'C154E3B6CE0B979BA98FEDAA1829DCCF2A7172642DEF9EFC','',37180,24,'',NULL), +(633,191,'295A29C81B1B9CC9B6758440BED913ED4D8B5E05A90D7CE7','',41023,24,'',NULL), +(634,178,'3ED9105E3D1F31AD1D4376C54B07D18348C56E7453D161B2','',690106,23,'',NULL), +(635,178,'74C75B8F0147ADA8610F6C9BB80C4BDA543C1D95943ADCEB','',0,8,'',NULL), +(636,191,'7BE7A7D3F4AD8B30A0A144D5D4AC5E569BB9A0D18AB590FC','',37180,24,'',NULL), +(637,191,'0B5C54A4850924038D95A3F1C44F300921CEA1E13644842E','',57602,42,'',NULL), +(638,191,'876743AA30D61C83444427F4F18203B2FF443C337E5DD190','',22792,25,'',NULL), +(639,191,'C83A14C21D1E66345574E3E0E3613E924F702883A30A1809','',31924,23,'',NULL), +(640,191,'2545F02B4FC2F5425960A2E5C0299936C99FF2EC68A5ECDB','',501956,48,'',NULL), +(641,191,'85EF9C6353712A8D0E2E27B1702B510A95B1305473F86345','',41023,24,'',NULL), +(642,191,'35282392AA86692A153FC159D6E13C74F9DF01661E4867D6','',13538,11,'',NULL), +(643,191,'0D6CC3008615CD5BFB96A90620805B78D5BFBC6100B1AF0D','',13538,15,'',NULL), +(644,191,'D573179188521C485CFD24A9EE9CDA77C540A31EE68E3E78','',41228,24,'',NULL), +(645,191,'8FA80694C3766FC1B041103EB35EBA3B7C77081A5DA8FFD8','',28940,17,'',NULL), +(646,113,'CD6B8F9D23612C807F7653D29F1F1C54BC8F917C5C5BD8F1','Afd32uu',0,0,'',NULL), +(647,178,'FCB5CF830DB536208D4C58E5838D1C8798F0738247EF0867','',672602,23,'',NULL), +(648,178,'4451680A3F41926C1545701887F93A0A49CC29C3E114AADB','',4011280,23,'',NULL), +(649,191,'6BE2C4F29ADF49AE5BF0485A27A854087E775FA28047168C','',27270,13,'',NULL), +(650,191,'016FF5D8685E37969B1B7C310756DCD93D4AB34256837031','',38300,21,'',NULL), +(651,191,'6726DA4A8F112CC25DD78500CA9BF792DB688F7D8D1FBC4B','',57602,42,'',NULL), +(652,191,'9F8B3A3C70027496420A619969CF1EB7AF447D245DA766A0','',29884,20,'',NULL), +(653,178,'E74FFC8ADF5FE8A0FE0F10BCABCFCEDB3B2B9C2307340D7C','',3041472,31,'',NULL), +(654,178,'B31302D6A47971059B2643B57D2D50EBEBEAA89BE483F1F4','',3037164,22,'',NULL), +(655,191,'2F761DEA3CD3394A0091D745FD2976B52F3B16BB0A48BC80','',29884,20,'',NULL), +(656,178,'8E44EC966A93870696359D3E2474D12C071A381B9403B1B9','',673210,23,'',NULL), +(657,191,'2424AFA7FEC48FF09E5E3BDAF93FAA74743A7551B6FB1495','',56063,25,'',NULL), +(658,178,'ACCF5804D419F30643F87A650C4DC6E0E10266922692AECE','',682378,23,'',NULL), +(659,191,'6EC19D6D1244E3FE787AE448EC905C509DBA3C01FBE34F24','',41280,16,'',NULL), +(660,178,'5B2D2EE40383C33D381998995210918AC6B1AD67C5880F6D','',710554,23,'',NULL), +(661,178,'83FFE0F8F224D5E56C38D731EFE8AD5AD1285B1AD4FA019B','',683146,23,'',NULL), +(662,191,'9D67A809FD8FDA1E1504F0C038E21E1D5FC4C6D11F426228','',28940,17,'',NULL), +(663,191,'2965EC092EC0A4B3D4A3C781F0A0A542824C77B7300BF50C','',45324,24,'',NULL), +(664,191,'FE31901F5558E6555DA6BC5B1BC3415E82CB97DECBB486BB','',41096,24,'',NULL), +(665,191,'B35406A77D6501A50F41981C7C137AD5272EB612F4A74109','',29884,20,'',NULL), +(666,178,'7275397E511B45264BCFA30E3A3F8101894AA3923D91BE6E','',3037164,22,'',NULL), +(667,178,'CA7D8D0E1F20385DCF6FC209799750CE9D0160B0C67196E7','',700714,23,'',NULL), +(668,191,'F5CCDA244D826B3180E7C49193B3B0B5DBF651EC67DCB47A','',594348,26,'',NULL), +(669,191,'7977F1E72B30179072EE1784396AB0406D06162051CA1EDB','',37136,40,'',NULL), +(670,178,'603F8A015D8436CCBCD68B26FF6006E7A81BA9A8D9524B1F','',3045356,22,'',NULL), +(671,178,'9631E9EBC78E0333010E522045852C7BEA44655080D418F3','',3049888,31,'',NULL), +(672,191,'43BE7C00605D9FECAEFAE38D8FFEAED78B8382563A245F10','',9977,32,'',NULL), +(673,191,'E493F1BAED1DBE7A0D429BF1A5D665636D29069060310BF0','',13291422,37,'',NULL), +(674,191,'6C53203FA95EBE4DBB0A7F3E85994058DECA069A5244C29E','',130380,14,'',NULL), +(675,178,'5A07E5A0525DBD5005CBDE16F7393EC8B795ADB2327C2F96','',3045356,22,'',NULL), +(676,178,'D7665366F333BD580C5F8E2FF8971294F69E99EC7E3623F3','',717898,23,'',NULL), +(677,191,'FB87EB8F178C69D9F7576AC7FF75D0479467057A2B6C956D','',9977,32,'',NULL), +(678,178,'292911AC98E7ED34DF021B562D5DEBE8DAA15570B552978B','',3000288,31,'',NULL), +(679,178,'6618F45C49D47C4105070C085FD5C384254A62E4AB614DB9','',3634252,23,'',NULL), +(680,191,'316E531545999AFC533814888434999501FEA8ABFBAF8655','',134968,32,'',NULL), +(681,191,'9945ED64886F68664A4BDF50731F4B4DC680273AB2E0DBCB','',20512,16,'',NULL), +(682,191,'1D4D6EC7B6B26553FC914D28BF9B62FD81D0B865DE606D97','',29884,20,'',NULL), +(683,178,'63B2D2ACF6E912CDC68282B080A2D610BE6AFE8EBB95FD31','',3070052,22,'',NULL), +(684,191,'B0955BAC042D5441496103E7C45E38609A9AE3799D534BD9','',18680,35,'',NULL), +(685,178,'6488E44D4E965581650F73F6E68DD8F863795162D99104F8','',682378,23,'',NULL), +(686,191,'CC0D3F7D8FCF928A55F92F6414F4AEF7AD75DED5819BF870','',13538,15,'',NULL), +(687,191,'CD3835965AF27EC338F828666CD06089B847B04A2DD56AE0','',17938,11,'',NULL), +(688,178,'D04E9CF6A03D4767AFF1E4EE0EFBC333AEBA5B0552F15957','',0,9,'',NULL), +(689,178,'120904F033D78A13DB0971F095C809852B7EB876D1A8AA01','',3045632,31,'',NULL), +(690,191,'7DDD19DCF77E27DF0A31BC21C7F716FF85076AF065F102DC','',36924,24,'',NULL), +(691,178,'5486E2CDD98AC3F25C223FD515CE7EF3FB09AC12ED338C86','',198,10,'',NULL), +(692,178,'F8D6423F01E5369D16F6F70180083B936F0DDE3737B23308','',2299092,33,'',NULL), +(693,191,'EC10CC349A8E654240B27B03EE1232B9CCED28F7104CCB71','',49347,24,'',NULL), +(694,178,'29E064ACC509206873A1D548F4816DB60D29D6EE9FF63A56','',682378,23,'',NULL), +(695,178,'E1A8A2A81920A7BA9F419A6D19CAC3DD9E292EF39F963234','',676970,23,'',NULL), +(696,191,'32393EB09F7C829F58612E5E47018F7203C43218C3506C79','',20512,16,'',NULL), +(697,178,'AFC4D19CACEDE8E9A2FDE3CC3D29CF8556AF4980872DFE1A','',3033068,22,'',NULL), +(698,178,'09A2B97FD351B1D339030233AC51C741E0ECDC21AA7A152B','',3049452,22,'',NULL), +(699,191,'2B2AF2171B8A9FC0D44EFE0ECDCB9DE1A55ACC8D83661E16','',41023,24,'',NULL), +(700,178,'D111B236DC42EB338870E72FF6EE3141714D0437864B02AE','',3045356,22,'',NULL), +(701,178,'E6DC6898929D1DA9F5768A9BFCBE848F8C1F31E8B6910FB8','',335122,23,'',NULL), +(702,113,'85A32F8B5F8430A086D27E62EB17D878E49CE815F6AC91CA','IPSect',0,0,'',NULL), +(703,191,'B6CB7B905A6BDD64BC032BE71927C1FE31153D14D6CF87E1','',447736,48,'',NULL), +(704,178,'40EE7F4EEE1D707ECB770CDBBB54730CB863CC8E268D4208','',3634252,23,'',NULL), +(705,178,'D74E308262D8C52ACE81B66F1D90C160AC86B2E0508176C1','',0,8,'',NULL), +(706,178,'E15287D29EE155299619F8E93E66B55B564FD921FA41CF50','',3049452,22,'',NULL), +(707,191,'58DFAEE44A52F0D5A58B0C94F0E5E63C1C7F76206D7FA7CA','',22792,25,'',NULL), +(708,191,'83705EAE8AAD9709494E52EB05AC0481C998C15730E61099','',30012,16,'',NULL), +(709,178,'0271F4D624304A48CB7CDFA016E3A735DCA3170FAD557468','',3070052,22,'',NULL), +(710,178,'217DFFE3C12F984992E1E0AE7B5864061572BA301B21D869','',178504,96,'',NULL), +(711,178,'C5C7AC33D1E4CF33E661033006BFEDE08523B643CCF51261','',3045356,22,'',NULL), +(712,243,'','',4618113,10,'FF1554F79D003B470C89','WS2_32.Send'), +(713,191,'D45144FC835266270E67CFB1F2900FD227B63204698A3EA7','',50040,26,'',NULL), +(714,191,'B5BB832AEEC591196864E08A392592C5789D76D3DDDD4DBF','',27270,13,'',NULL), +(715,191,'93582814E00150E2DD750ACAD7BD1719C4EBCD4C06F482AB','',28940,17,'',NULL), +(716,191,'FD6B6AC7FA5F2E7828CB1B429A9442383BD93E762A5D7D00','',31924,23,'',NULL), +(717,191,'51DF4EDECBBE42CC7C5D6723318F98E43E14A45F41CBD124','',41080,24,'',NULL), +(718,191,'F2B2260FDD23E5F268FAAE4D1A48E74C452F2AC5D114765D','',57602,42,'',NULL), +(719,191,'69FBDB69EC2E113EF691E47EDD46E40F03D1EBE226A1F7CE','',29884,20,'',NULL), +(720,178,'E3E431D8F8FB38F0F2586D0F50D809BCCEB13651C5EF2619','',682394,23,'',NULL), +(721,178,'2294015927F07D884FE2923FA17B3A8BCABC0A378930CF84','',679578,23,'',NULL), +(722,191,'0A022AB25C52F94404A01F96687B2D6E6BE774237254BD05','',20512,16,'',NULL), +(723,191,'65EEE243504EDC3319C3528B1A1E8061A3E75F4C25B61F95','',41228,24,'',NULL), +(724,178,'877C654036A29FC108FE8D69D416361732D7A0270E51189D','',3022016,31,'',NULL), +(725,178,'1A223564DF9E7BADD3CF858FB8250FE59F892232AC3B412D','',4011280,23,'',NULL), +(726,191,'4FEDF58FB4DE45289C97ACCF16EB2DEA6FBC85C74A52D3C9','',37180,24,'',NULL), +(727,191,'D4BE47EA1D68B92E2AD8307D139877705BE2B6A98B6A916E','',13033,36,'',NULL), +(728,191,'9658AC7EF426A52C327BBC1ED71C6FA6DC5940E35DCC18C7','',18680,35,'',NULL), +(729,113,'1B17998CD8E0CDA4D84B0A0F9DB05E536DACE0348A883D24','ndis_x86',0,0,'',NULL), +(730,178,'BB9B86ED12359A465B02387A1D727F11F78D35C8B7FCC2FC','',2299092,33,'',NULL), +(731,191,'842BC1A8C53902D26018B1C5E05ADCD70D973A968E298331','',50040,26,'',NULL), +(732,178,'3E894F9682573CC0AD54C7E9873C9026AC050929392D0B93','',3049452,22,'',NULL), +(733,191,'4A31E3D24FD6D576D84EF1BFB813D0F066870DEB38C32E47','',21826,11,'',NULL), +(734,191,'EEA122B4C066EC0B196F67511E633EBACB37C4EA6AE4BFF7','',41096,24,'',NULL), +(735,191,'66211671BEF80FB973B1C9595A70B462AD79EC83530DFE89','',12905,36,'',NULL), +(736,178,'3760BBD6FE99A0BBEE0AB61A8BD52A6ABCAC48FF3CB265B8','',3070052,22,'',NULL), +(737,191,'70F425426612D0D8495386C2375F7A4183548C0D4E7DFA46','',594348,26,'',NULL), +(738,178,'BB310E9DDE9259027123500E65F9FA1E8D9D0F5FE8381CD2','',3638348,23,'',NULL), +(739,191,'6FFB5E4982D306680E0C59087DA961CD4F6B068E323C3BB4','',401992,14,'',NULL), +(740,191,'6DDCA79B7460A1F3671532A28FDCEB331DE6CA550E3178D0','',3766400,37,'',NULL), +(741,191,'A8F7B2FB37CF3BEF43D6CE5C0BF85E85077E681490BA1C4C','',37136,40,'',NULL), +(742,191,'052F425E7528B3A7155C45EEE530F915DBB154E5C8876E25','',50040,26,'',NULL), +(743,178,'D6DE200B631AF71BFBC76202D82649942FD6ED9BC4A9EF75','',198,12,'',NULL), +(744,178,'61077261C66B2CF9B199F115A3A656EA6A00068F151E3656','',706314,23,'',NULL), +(745,191,'513FC0F0673A9DF86FA1FA05371040C14634CE08311ED619','',401992,14,'',NULL), +(746,191,'5E0970A6EB246A79DDF427CB76D0D921F971E13921DD5D2C','',134968,32,'',NULL), +(747,178,'53CAC3EF654610AC7E043C6AAD62709EF0B5400DBDE755EB','',149,5,'',NULL), +(748,178,'566637D06BAEA9190B7CE510C697F72CD20FE3D958A95A25','',3049888,31,'',NULL), +(749,113,'3C9B0CC7FE020EEBD43E6B1D88EDDF0EC46AC35974765068','drvsys_mon',0,0,'',NULL), +(750,191,'BDFEE5DCDD37FC5B2A1B3E42FBE5F7997CFED35E86062EB6','',28920,23,'',NULL), +(751,191,'7794AE60131E4D07860DB48047206784B885B30457EAB83E','',12194860,37,'',NULL), +(752,178,'653A308BB00D914AE1ECD773BA4B0BA7724874BC62647D10','',3037164,22,'',NULL), +(753,178,'06B696C35F905E75B451A02E121BDA0330CD44E0D9B872BF','',60648,56,'',NULL), +(754,191,'35E8CD9E8CBD879B1E53278926C634AA8B72B8D9A20009F9','',17522,15,'',NULL), +(755,191,'9B13F2E744904ADAAA062F9113A576D11C2C450D1CD6A4AB','',13033,36,'',NULL), +(756,191,'60851B4A6F7338632A84795FBBB20320E49AD2CC2034BA80','',28940,17,'',NULL), +(757,191,'3BC0BE02AE0B6975974D3B13B811EC6BDACBF9EE122BE633','',90202,13,'',NULL), +(758,191,'E47F7DD8D5B5C29B70AFFD4F25AA286167D411937F9BD247','',36907,24,'',NULL), +(759,178,'35D1CDEE86A410DF087DE6D5F5AC6289C4888B9753293E73','',3037164,22,'',NULL), +(760,191,'2ED2EEB29EE0D48477779E5CA875F1F5F15CCE74CA85BDAA','',28956,17,'',NULL), +(761,191,'A373FDB6A789CC46072A4CC51A429C817C40862DC6C0190F','',30012,16,'',NULL), +(762,178,'3D02551F548DFB58832626FE90A7AAA12824D93A54A0DC14','',709322,22,'',NULL), +(763,191,'09D04CF8ABC51D06D874784442987E5F2631041550607255','',36544,55,'',NULL), +(764,191,'F3CD473F8C85977895CA5BA9DC22185BCCBBF6B977205193','',448492,48,'',NULL), +(765,191,'30E2F23DB1038D16D2DEEAB1D0F1790D961E468368DC5108','',30012,16,'',NULL), +(766,191,'540D465F760320A63981289D30CD40CCC770EE126523C71D','',477912,60,'',NULL), +(767,191,'C461E1BE054FE29A1FD58B33D33890BC4A1279DE4F572B47','',37180,24,'',NULL), +(768,191,'1AC3D903CFCA11321E76A257BDA0608E5060030BE745CCF3','',130380,14,'',NULL), +(769,178,'96281A2887E61232007D7015E4A35DA118794841A8EC84BC','',3037164,22,'',NULL), +(770,178,'8A1AC926B46A9E3D60D3BD87A59FF77D7B80A1510BC327A7','',710730,23,'',NULL), +(771,191,'3620B6BDF3993B87FD35E906FE8376A04FF34684E2023D8E','',41280,16,'',NULL), +(772,191,'025C373F05EC6E809EF5A86A903570FDA14D219286BCED5E','',448492,48,'',NULL), +(773,178,'5C0E4EE98C4E34CBE44F6BD595C13DD675555164A8D491DA','',710554,23,'',NULL), +(774,191,'BECE667BF9443EF6515E8E154F74FC2C5817455C8636DB72','',501956,48,'',NULL), +(775,191,'94F1DA3E0D955761826D6BC932E26F44D321B4838C7567D8','',13538,15,'',NULL), +(776,191,'EA3A3AD71FD14B038C98F256E80C1EFA1F45562A3DF92E7D','',22792,25,'',NULL), +(777,191,'AD5A8CBF55EC436DA968EE0B9744C93F65D9E0D6E3C1B136','',174688,37,'',NULL), +(778,191,'9B6B3B311BA9007C06CF0D146BB979B11CF295C58768DD4F','',31924,23,'',NULL), +(779,217,'','RPE.DLL',0,0,'','rEdoX Packet Editor - injected dll'), +(780,243,'','',5345728,2,'558B','Lua Protection Remover'), +(781,243,'','',7726137,2,'7414','Walk on Water Patch'), +(782,243,'','',8016620,2,'7417','Collision M2 Special'), +(783,243,'','',8016079,6,'0F8462010000','Collision M2 Regular'), +(784,243,'','',8054762,2,'7506','Collision WMD'), +(785,243,'','',9995315,2,'7544','Multi-Jump Patch'), +(786,217,'','WPESPY.DLL',0,0,'','WPE PRO - injected dll'); diff --git a/sql/old/3.3.5a/2012_02_19_04_world_misc_db_updates.sql b/sql/old/3.3.5a/2012_02_19_04_world_misc_db_updates.sql new file mode 100644 index 00000000000..32fada1e895 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_04_world_misc_db_updates.sql @@ -0,0 +1,21 @@ +-- Horde Orphan should not have weapons +UPDATE `creature_template` SET `equipment_id`=0 WHERE `entry`=14499; +-- Tog'thar Gossip +UPDATE `creature_template` SET `gossip_menu_id`=264 WHERE `entry`=2238; +DELETE FROM `gossip_menu` WHERE `entry`=264 AND `text_id`=761; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (264,761); +-- Cosmetic Silkwing should have InhabitType 4 +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=21840; +-- Leoroxx +UPDATE `creature_template` SET `gossip_menu_id`=8511 WHERE `entry`=22004; +DELETE FROM `gossip_menu` WHERE `entry`=8511 AND `text_id`=10645; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8511,10645); +-- Spiritcaller Dohgar +UPDATE `creature_template` SET `gossip_menu_id`=8513 WHERE `entry`=22312; +DELETE FROM `gossip_menu` WHERE `entry`=8513 AND `text_id`=10647; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8513,10647); +-- Ogrin +UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=22468; +-- Wanted Poster "Blade's Edge Mountains" +DELETE FROM `gossip_menu` WHERE `entry`=8242 AND `text_id`=10257; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8242,10257); diff --git a/sql/old/3.3.5a/2012_02_19_05_world_creature_text.sql b/sql/old/3.3.5a/2012_02_19_05_world_creature_text.sql new file mode 100644 index 00000000000..b70385660a1 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_05_world_creature_text.sql @@ -0,0 +1,7 @@ +-- NPC talk text from sniff +DELETE FROM `creature_text` WHERE `entry`=7604; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(7604,0,0, 'What? How dare you say that to me?!?',12,0,100,6,0,0, 'Sergeant Bly'), +(7604,1,0, 'After all we''ve been through? Well, I didn''t like you anyway!!',12,0,100,5,0,0, 'Sergeant Bly'); +-- Remove old text +DELETE FROM `script_texts` WHERE `entry` IN (-1209002,-1209003); diff --git a/sql/old/3.3.5a/2012_02_19_06_world_creature_text.sql b/sql/old/3.3.5a/2012_02_19_06_world_creature_text.sql new file mode 100644 index 00000000000..f69c4cb86a9 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_19_06_world_creature_text.sql @@ -0,0 +1,20 @@ +-- SAI for Erich Lohan +SET @ENTRY=3627; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,0,100,0,10000,15000,10000,15000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Erich Lohan - OOC - Say random text'); +-- Talk text from sniff +DELETE FROM `creature_text` WHERE `entry`=3627; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(3627,0,0, 'Magical studies stressing your brain? Relax at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,1, 'Best drinks in Stormwind!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,2, 'Come for the beer, stay for the atmosphere!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,3, 'The only place in Stormwind where magic and spirits mix, come to the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,4, 'Free drinks at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,5, 'Feeling blue? Come on down to the Blue Recluse for a good time!',12,7,100,0,0,0, 'Erich Lohan'), +(3627,0,6, 'Head on over to the Blue Recluse. Where everybody knows your name!',12,7,100,0,0,0, 'Erich Lohan'); +-- Remove old waypoint text +UPDATE `waypoint_data` SET `action`=0 WHERE `id`=904450; +DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 432 AND 446; +DELETE FROM `db_script_string` WHERE `entry` BETWEEN 2000005185 AND 2000005199; diff --git a/sql/old/3.3.5a/2012_02_20_00_world_sai.sql b/sql/old/3.3.5a/2012_02_20_00_world_sai.sql new file mode 100644 index 00000000000..44f8ab68d70 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_20_00_world_sai.sql @@ -0,0 +1,4 @@ +UPDATE `smart_scripts` SET `event_param3`=2*60*60*1000, `event_param4`=2*60*60*1000 WHERE `entryorguid`=18481 AND `source_type`=0 AND `id`=0; +UPDATE `smart_scripts` SET `event_flags`=`event_flags`|1 WHERE `entryorguid` IN (-85175,-85176) AND `source_type`=0 AND `id`=5 AND `link`=6; +UPDATE `smart_scripts` SET `event_flags`=`event_flags`|1 WHERE `entryorguid`=30146 AND `source_type`=0 AND `id`=0; +UPDATE `smart_scripts` SET `event_flags`=`event_flags`|0x20 WHERE `entryorguid` IN (-85175,-85176) AND `source_type`=0 AND `id`=2 AND `link`=3; diff --git a/sql/old/3.3.5a/2012_02_20_01_world_gossip.sql b/sql/old/3.3.5a/2012_02_20_01_world_gossip.sql new file mode 100644 index 00000000000..f3943ded29a --- /dev/null +++ b/sql/old/3.3.5a/2012_02_20_01_world_gossip.sql @@ -0,0 +1,8 @@ +-- Fix error in Scourge Deathspeaker SAI +UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=27615 AND `id`=14; +-- Fix up Keeper Remulos SAI +UPDATE `smart_scripts` SET `id`=3 WHERE `entryorguid`=11832 AND `id`=4; +-- Spiritcaller Dohgar +UPDATE `creature_template` SET `gossip_menu_id`=8513 WHERE `entry`=22312; +DELETE FROM `gossip_menu` WHERE `entry`=8513 AND `text_id`=10647; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8513,10647); diff --git a/sql/old/3.3.5a/2012_02_20_02_world_conditons.sql b/sql/old/3.3.5a/2012_02_20_02_world_conditons.sql new file mode 100644 index 00000000000..f87a95fb1c9 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_20_02_world_conditons.sql @@ -0,0 +1,277 @@ +-- Update a typo in original data entry +UPDATE `npc_spellclick_spells` SET `quest_end`=11999 WHERE `npc_entry`=26477 AND `spell_id`=61832 AND `quest_start`=11999; + +-- Delete redundant data with invalid condition type +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18; + +-- Static Data +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, +`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +(18,24752,44363,0,8,0,11460,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,24752,44363,0,9,0,11460,0,0,0,'Required quest active for spellclick'), +(18,25596,45875,0,8,0,11690,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,25596,45875,0,9,0,11690,0,0,0,'Required quest active for spellclick'), +(18,25841,46166,0,8,0,11795,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,25841,46166,0,9,0,11795,0,0,0,'Required quest active for spellclick'), +(18,26200,39996,0,8,0,11960,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26200,39996,0,9,0,11960,0,0,0,'Required quest active for spellclick'), +(18,26200,61286,0,8,0,11960,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26200,61286,0,9,0,11960,0,0,0,'Required quest active for spellclick'), +(18,26421,47575,0,8,0,12092,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26421,47575,0,8,0,12096,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26421,47575,0,9,0,12092,0,0,0,'Required quest active for spellclick'), +(18,26421,47575,0,9,0,12096,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,47096,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,47096,0,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,0,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,26477,61286,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,0,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,61286,0,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,26477,61832,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61832,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61832,0,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,61832,0,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,27061,47920,0,8,0,12050,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,27061,47920,0,9,0,12050,0,0,0,'Required quest active for spellclick'), +(18,27354,60944,18,8,0,12244,0,0,0,'Required quest rewarded for spellclick'), +(18,27354,60944,18,9,0,12244,0,0,0,'Required quest active for spellclick'), +(18,28161,39996,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,39996,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,39996,0,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,39996,0,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,28161,51037,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51037,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51037,0,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,51037,0,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,28161,51961,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51961,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51961,0,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,51961,0,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,28162,39996,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28162,39996,0,9,0,12519,0,0,0,'Required quest active for spellclick'), +(18,28162,50737,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28162,50737,0,9,0,12519,0,0,0,'Required quest active for spellclick'), +(18,28162,51026,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28162,51026,0,9,0,12519,0,0,0,'Required quest active for spellclick'), +(18,28162,61286,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28162,61286,0,9,0,12519,0,0,0,'Required quest active for spellclick'), +(18,28202,50926,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28202,50926,0,9,0,12527,0,0,0,'Required quest active for spellclick'), +(18,28202,50927,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28202,50927,0,9,0,12527,0,0,0,'Required quest active for spellclick'), +(18,28203,50918,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28203,50918,0,9,0,12527,0,0,0,'Required quest active for spellclick'), +(18,28203,50919,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28203,50919,0,9,0,12527,0,0,0,'Required quest active for spellclick'), +(18,28222,52082,0,8,0,12546,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28222,52082,0,9,0,12546,0,0,0,'Required quest active for spellclick'), +(18,28379,51658,0,8,0,12607,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28379,51658,0,9,0,12607,0,0,0,'Required quest active for spellclick'), +(18,28389,51592,0,8,0,12605,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28389,51592,0,9,0,12605,0,0,0,'Required quest active for spellclick'), +(18,28389,51593,0,8,0,12605,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28389,51593,0,9,0,12605,0,0,0,'Required quest active for spellclick'), +(18,28782,52280,0,8,0,12687,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28782,52280,0,9,0,12687,0,0,0,'Required quest active for spellclick'), +(18,29488,54568,15,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), +(18,29488,54568,15,9,0,12670,0,0,0,'Required quest active for spellclick'), +(18,29563,56795,0,8,0,1,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29598,54768,0,8,0,12856,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29708,55028,0,8,0,12856,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29708,55028,0,9,0,12856,0,0,0,'Required quest active for spellclick'), +(18,29856,55363,0,8,0,12629,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29856,55363,0,8,0,12643,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29856,55363,0,9,0,12629,0,0,0,'Required quest active for spellclick'), +(18,29856,55363,0,9,0,12643,0,0,0,'Required quest active for spellclick'), +(18,29857,55457,0,8,0,12910,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29857,55457,0,9,0,12910,0,0,0,'Required quest active for spellclick'), +(18,30066,43977,0,8,0,12953,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,30337,43671,0,8,0,13069,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,30337,43671,0,9,0,13069,0,0,0,'Required quest active for spellclick'), +(18,30500,56679,0,8,0,13045,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,30500,56679,0,9,0,13045,0,0,0,'Required quest active for spellclick'), +(18,30560,57347,0,1,0,57348,0,0,1,'Forbidden aura for spellclick'), +(18,31736,59592,0,8,0,13280,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,31736,59592,0,9,0,13280,0,0,0,'Required quest active for spellclick'), +(18,31785,59656,0,8,0,13283,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,31785,59656,0,9,0,13283,0,0,0,'Required quest active for spellclick'), +(18,31883,60123,0,1,0,48085,0,0,1,'Forbidden aura for spellclick'), +(18,31893,60123,0,1,0,48084,0,0,1,'Forbidden aura for spellclick'), +(18,31894,60123,0,1,0,28276,0,0,1,'Forbidden aura for spellclick'), +(18,31895,60123,0,1,0,27874,0,0,1,'Forbidden aura for spellclick'), +(18,31896,60123,0,1,0,27873,0,0,1,'Forbidden aura for spellclick'), +(18,31897,60123,0,1,0,7001,0,0,1,'Forbidden aura for spellclick'), +(18,32788,57539,17,8,0,13075,0,0,0,'Required quest rewarded for spellclick'), +(18,32788,57539,17,9,0,13075,0,0,0,'Required quest active for spellclick'), +(18,32790,57654,16,8,0,13073,0,0,0,'Required quest rewarded for spellclick'), +(18,32790,57654,16,9,0,13073,0,0,0,'Required quest active for spellclick'), +(18,33498,63126,0,8,0,13654,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,33498,63126,0,9,0,13654,0,0,0,'Required quest active for spellclick'), +(18,33790,62781,0,8,0,13690,0,0,0,'Required quest rewarded for spellclick'), +(18,33790,62781,0,8,0,13705,0,0,0,'Required quest rewarded for spellclick'), +(18,33791,62786,0,8,0,13696,0,0,0,'Required quest rewarded for spellclick'), +(18,33791,62786,0,8,0,13711,0,0,0,'Required quest rewarded for spellclick'), +(18,33792,62785,0,8,0,13694,0,0,0,'Required quest rewarded for spellclick'), +(18,33792,62785,0,8,0,13709,0,0,0,'Required quest rewarded for spellclick'), +(18,33793,62780,0,8,0,13688,0,0,0,'Required quest rewarded for spellclick'), +(18,33793,62780,0,8,0,13704,0,0,0,'Required quest rewarded for spellclick'), +(18,33794,62782,0,8,0,13689,0,0,0,'Required quest rewarded for spellclick'), +(18,33794,62782,0,8,0,13706,0,0,0,'Required quest rewarded for spellclick'), +(18,33795,62779,0,8,0,13685,0,0,0,'Required quest rewarded for spellclick'), +(18,33795,62779,0,8,0,13703,0,0,0,'Required quest rewarded for spellclick'), +(18,33796,62784,0,8,0,13693,0,0,0,'Required quest rewarded for spellclick'), +(18,33796,62784,0,8,0,13708,0,0,0,'Required quest rewarded for spellclick'), +(18,33798,62787,0,8,0,13695,0,0,0,'Required quest rewarded for spellclick'), +(18,33798,62787,0,8,0,13710,0,0,0,'Required quest rewarded for spellclick'), +(18,33799,62783,0,8,0,13691,0,0,0,'Required quest rewarded for spellclick'), +(18,33799,62783,0,8,0,13707,0,0,0,'Required quest rewarded for spellclick'), +(18,33800,62774,0,8,0,13593,0,0,0,'Required quest rewarded for spellclick'), +(18,33800,62774,0,8,0,13684,0,0,0,'Required quest rewarded for spellclick'), +(18,33842,63791,0,8,0,13668,0,0,0,'Required quest rewarded for spellclick'), +(18,33842,63791,0,8,0,13687,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,33843,63792,0,8,0,13667,0,0,0,'Required quest rewarded for spellclick'), +(18,33843,63792,0,8,0,13686,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,33870,63663,0,8,0,1,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13847,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13851,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13852,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13854,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13855,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13856,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13857,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13858,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13859,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13860,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13861,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13862,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13863,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,8,0,13864,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,34125,63215,0,9,0,13847,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13851,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13852,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13854,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13855,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13856,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13857,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13858,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13859,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13860,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13861,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13862,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13863,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,0,9,0,13864,0,0,0,'Required quest active for spellclick'), +(18,38248,71462,0,1,0,71443,0,0,1,'Forbidden aura for spellclick'), +(18,40176,74904,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,40176,74904,0,9,0,25444,0,0,0,'Required quest active for spellclick'), +(18,40176,74905,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,40176,74905,0,9,0,25444,0,0,0,'Required quest active for spellclick'); + +-- Below is a procedure to dynamically convert custom content to conditions table. +-- However this procedure only works for MySQL server versions >= 5.6 due to +-- a bug / missing feature in older MySQL versions. + +/* + +DROP PROCEDURE IF EXISTS ConvertSpellClickConditions; +DELIMITER // +CREATE PROCEDURE ConvertSpellClickConditions() +BEGIN + DECLARE counter INT DEFAULT 0; + DECLARE recordCount INT DEFAULT 0; + DECLARE counterPlusOne INT DEFAULT 0; + DECLARE npcEntry INT DEFAULT 0; + DECLARE spellId INT DEFAULT 0; + DECLARE aura INT DEFAULT 0; + DECLARE quest INT DEFAULT 0; + DECLARE quest2 INT DEFAULT 0; + DECLARE questStartCanActive INT DEFAULT 0; + DECLARE maxElseGroupId INT DEFAULT 14; -- Change this for custom content + SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_required` !=0; + WHILE counter < recordCount DO + SELECT `npc_entry`, `spell_id`, `aura_required` + INTO npcEntry, spellId, aura + FROM `npc_spellclick_spells` WHERE `aura_required` !=0 + LIMIT counter,1; + INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, + `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) + VALUES (18,npcEntry,spellId,1,0,aura,0,0,'Required aura for spellclick'); + SET counter = counter+1; + END WHILE; + + SET counter = 0; + SET recordCount = 0; + SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_forbidden` !=0; + WHILE counter < recordCount DO + SELECT `npc_entry`, `spell_id`, `aura_forbidden` + INTO npcEntry, spellId, aura + FROM `npc_spellclick_spells` WHERE `aura_forbidden` !=0 + LIMIT counter,1; + INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, + `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) + VALUES (18,npcEntry,spellId,1,0,aura,0,1,'Forbidden aura for spellclick'); + SET counter = counter+1; + END WHILE; + + SET counter = 0; + SET recordCount = 0; + SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `quest_start` !=0; + WHILE counter < recordCount DO + SELECT `npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end` + INTO npcEntry, spellId, quest, questStartCanActive, quest2 + FROM `npc_spellclick_spells` WHERE `quest_start` !=0 + LIMIT counter,1; + IF questStartCanActive = 1 AND quest2 = 0 THEN + INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`, `ConditionTypeOrReference`, + `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) + VALUES (18,npcEntry,spellId,maxElseGroupId+1,9,0,quest,0,0,'Required quest active for spellclick'); + INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`, `ConditionTypeOrReference`, + `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) + VALUES (18,npcEntry,spellId,maxElseGroupId+1,8,0,quest,0,0,'Required quest rewarded for spellclick'); + SET maxElseGroupId = maxElseGroupId+1; + -- ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest) + ELSEIF questStartCanActive = 1 && quest2 = quest THEN + INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, + `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) + VALUES (18,npcEntry,spellId,9,0,quest,0,0,'Required quest active for spellclick'); + -- ^Adds the required active quest condition. Prohibit quest reward is done in next loop + ELSEIF questStartCanActive = 0 THEN + INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, + `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) + VALUES (18,npcEntry,spellId,8,0,quest,0,0,'Required quest rewarded for spellclick'); + END IF; + + SET counter = counter+1; + END WHILE; + + SET counter = 0; + SET recordCount = 0; + SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `quest_end` !=0; + WHILE counter < recordCount DO + SELECT `npc_entry`, `spell_id`, `quest_end` + INTO npcEntry, spellId, quest + FROM `npc_spellclick_spells` WHERE `quest_end` !=0 + LIMIT counter,1; + INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, + `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) + VALUES (18,npcEntry,spellId,8,0,quest,0,1,'Forbidden rewarded quest for spellclick'); + SET counter = counter+1; + END WHILE; + +END// + +DELIMITER ; + +CALL ConvertSpellClickConditions(); +DROP PROCEDURE ConvertSpellClickConditions; + +*/ + +ALTER TABLE `npc_spellclick_spells` + DROP COLUMN `quest_start`, + DROP COLUMN `quest_start_active`, + DROP COLUMN `quest_end`, + DROP COLUMN `aura_required`, + DROP COLUMN `aura_forbidden` +; diff --git a/sql/old/3.3.5a/2012_02_21_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_00_world_creature_loot_template.sql new file mode 100644 index 00000000000..1d05c031868 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_21_00_world_creature_loot_template.sql @@ -0,0 +1,78 @@ +-- Loot for Hellfire 5-man dungeons Trash (heroic and normal) -- +-- ------------------------------------------------------------- + +-- Hellfire Citadel: Ramparts +SET @Lootid := 17259; +-- set all lootids to same entry (normal and heroic) +UPDATE `creature_template` SET `lootid`=@Lootid WHERE `entry` IN +(17259,17264,17269,17270,17271,17280,17281,17309,17455,17478,17517,18048,18049,18050,18051,18052,18053,18054,18055,18057,18058,18059); +-- populate trashloot table +DELETE FROM `creature_loot_template` WHERE `entry` IN +(17259,17264,17269,17270,17271,17280,17281,17309,17455,17478,17517,18048,18049,18050,18051,18052,18053,18054,18055,18057,18058,18059); +DELETE FROM `creature_loot_template` WHERE `entry`=@Lootid; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- rough indication based on wowhead data of ALL mobs in the dungeon +(@Lootid,14047,40,1,0,1,4), -- Runecloth +(@Lootid,21877,20,1,0,1,4), -- Netherweave Cloth +(@Lootid, 8952,10,1,0,1,4), -- Roasted Quail +(@Lootid, 8766, 5,1,0,1,3), -- Morning Glory Dew +-- references for worldgreys +(@Lootid,1,5,1,0,-24000,1), -- Outland Grey Item Reference1 +(@Lootid,2,5,1,0,-24002,1), -- Outland Grey Item Reference2 +(@Lootid,3,5,1,0,-24003,1), -- Outland Grey Item Reference3 +(@Lootid,4,5,1,0,-24011,1), -- Outland Grey Item Reference4 +(@Lootid,5,5,1,0,-24022,1), -- Outland Grey Item Reference5 +(@Lootid,6,5,1,0,-24023,1), -- Outland Grey Item Reference6 +-- specifics +(@Lootid,5759,0.25,1,0,1,1), -- Thorium Lockbox +(@Lootid,5760,0.30,1,0,1,1), -- Eternium Lockbox +-- Scrolls +(@Lootid,7,5,1,0,-24724,1); -- Scroll of IV + +-- ----------------------------------------- +-- -- Hellfire Citadel: The Blood Furnace -- +-- ----------------------------------------- +SET @Lootid := 17370; +UPDATE `creature_template` SET `lootid`=@Lootid WHERE `entry` IN (17256,17370,17371,17395,17397,17398,17399,17414,17429,17477,17491,17624,17626,17653,18894,19016,18608,18619,18617,18615,18612,18614,18618,18603,18606,18610,18611,18609,18620,21645,21646); + +DELETE FROM `creature_loot_template` WHERE `entry` IN (17370,17371,17395,17397,17398,17414,17429,17491,17624,17626,18894); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Lootid,23894,-100,1,0,1,1), -- Fel Orc Blood (quest) +-- most common items +(@Lootid,14047,40,1,0,1,4), -- Runecloth +(@Lootid,21877,20,1,0,1,4), -- Netherweave Cloth +(@Lootid, 8952,10,1,0,1,4), -- Roasted Quail +(@Lootid, 8766, 5,1,0,1,3), -- Morning Glory Dew +-- references for worldgreys +(@Lootid,1,5,1,0,-24000,1), -- Outland Grey Item Reference1 +(@Lootid,2,5,1,0,-24002,1), -- Outland Grey Item Reference2 +(@Lootid,3,5,1,0,-24003,1), -- Outland Grey Item Reference3 +(@Lootid,4,5,1,0,-24011,1), -- Outland Grey Item Reference4 +(@Lootid,5,5,1,0,-24022,1), -- Outland Grey Item Reference5 +(@Lootid,6,5,1,0,-24023,1), -- Outland Grey Item Reference6 +-- specifics +(@Lootid,5759,0.25,1,0,1,1), -- Thorium Lockbox +(@Lootid,5760,0.30,1,0,1,1), -- Eternium Lockbox +-- Scrolls +(@Lootid,7,5,1,0,-24724,1); -- Scroll of IV + +-- ------------------------------------------- +-- -- Hellfire Citadel: The Shattered Halls -- +-- ------------------------------------------- +SET @Lootid := 16507; +UPDATE `creature_template` SET `lootid`=@Lootid WHERE `entry` IN (17669,16507,17622,17462,17427,17420,17083,16699,16704,17695,17670,16700,16593,16594,17464,17694,17465,17461,17671,20593,20582,20576,20590,20589,20594,20567,20587,20579,20581,20595,20586,20583,20578,20574,20588,20584,20577,20580); + +DELETE FROM `creature_loot_template` WHERE `entry` IN (16507,16593,16594,16699,16700,16704,17083,17420,17427,17461,17462,17464,17465,17669,17670,17671,17694,17695,17669,16594,17694,17427,17695,17461,16593,17465,17671,17464,17420,17670,16700,16699,16507,16704,17462); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Lootid,21877,40,1,0,2,3), -- Netherweave Cloth +(@Lootid,27854,20,1,0,1,1), -- Smoked Talbuk Venison +(@Lootid,27860,20,1,0,1,1), -- Purified Draenic Water +(@Lootid,31952,2.5,1,0,1,1), -- Khorium Lockbox +-- references +(@Lootid,1,5,1,1,-24002,1), -- Outland Grey Item Reference1 +(@Lootid,2,2,1,1,-24009,1), -- Outland Green Reference1 +(@Lootid,3,5,1,1,-24011,1), -- Outland Grey Item Reference2 +(@Lootid,4,1,1,1,-24012,1), -- Outland Blue Reference1 +(@Lootid,5,5,1,1,-24093,1), -- Outland Plans & patterns +-- Scrolls +(@Lootid,6,5,1,0,-24724,1); -- Scroll of IV diff --git a/sql/old/3.3.5a/2012_02_21_01_world_conditions.sql b/sql/old/3.3.5a/2012_02_21_01_world_conditions.sql new file mode 100644 index 00000000000..95c32703ea4 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_21_01_world_conditions.sql @@ -0,0 +1,3592 @@ +CREATE TABLE `temp_convert_spells` +( + `id` INT(11), + `effMask` INT(11), + `onlyPlayers` TINYINT(3), + PRIMARY KEY (`id`) +); + +INSERT INTO `temp_convert_spells` VALUES +(46174,1,0), +(78002,1,1), +(78001,1,1), +(78000,1,1), +(77999,1,1), +(77984,1,1), +(76379,1,0), +(76098,1,0), +(76092,1,0), +(75920,1,1), +(75767,1,1), +(75765,1,1), +(75396,1,0), +(75389,1,1), +(75364,1,0), +(75319,1,0), +(75313,1,0), +(75244,1,0), +(75197,1,0), +(75195,1,0), +(75181,1,0), +(75107,1,0), +(75100,1,0), +(75078,1,0), +(75053,1,0), +(75018,1,0), +(74977,1,0), +(74903,1,0), +(74801,1,1), +(74758,1,0), +(74735,1,0), +(74549,1,0), +(74548,1,0), +(74486,1,0), +(74455,1,0), +(74444,1,0), +(74313,1,0), +(74285,1,0), +(74219,1,0), +(74182,1,0), +(74148,1,0), +(74098,1,0), +(74090,1,1), +(74086,1,1), +(74074,1,0), +(74033,1,0), +(73980,1,0), +(73955,1,0), +(73953,1,0), +(73886,1,0), +(73846,1,1), +(73845,1,1), +(73844,1,1), +(73843,1,1), +(73837,1,0), +(73836,1,0), +(73835,1,0), +(73787,1,0), +(73786,1,0), +(73785,1,0), +(73725,1,0), +(73659,1,0), +(73650,1,1), +(73582,1,0), +(73556,1,0), +(73555,1,0), +(73548,1,0), +(73331,1,1), +(73288,1,0), +(73165,1,0), +(73164,1,1), +(73159,1,1), +(73129,1,0), +(73128,1,0), +(73082,1,0), +(73071,1,0), +(73035,1,0), +(72959,1,1), +(72934,1,1), +(72928,1,1), +(72900,1,1), +(72830,1,1), +(72748,1,0), +(72747,1,0), +(72746,1,0), +(72745,1,0), +(72728,1,0), +(72706,1,1), +(72618,1,0), +(72595,1,1), +(72527,1,0), +(72479,1,1), +(72431,1,1), +(72429,1,1), +(72401,1,0), +(72347,1,0), +(72346,1,1), +(72280,1,0), +(72279,1,0), +(72278,1,0), +(72262,1,0), +(72260,1,0), +(72257,1,1), +(72209,1,0), +(72202,1,0), +(72099,1,0), +(72033,1,0), +(72032,1,0), +(72031,1,0), +(71952,1,0), +(71949,1,1), +(71948,1,0), +(71946,1,0), +(71848,1,0), +(71811,1,0), +(71809,1,0), +(71753,1,1), +(71693,1,0), +(71620,1,0), +(71617,1,0), +(71599,1,0), +(71538,1,1), +(71536,1,1), +(71520,1,0), +(71440,1,0), +(71415,1,0), +(71412,1,0), +(71365,1,0), +(71352,1,1), +(71322,1,0), +(71310,1,0), +(71308,1,0), +(71306,1,0), +(71281,1,0), +(71272,1,0), +(71189,1,0), +(71082,1,0), +(71081,1,0), +(71080,1,0), +(71079,1,0), +(71078,1,0), +(71075,1,0), +(71070,1,0), +(71032,1,0), +(71024,1,0), +(70995,1,0), +(70983,1,0), +(70966,1,1), +(70939,1,0), +(70936,1,0), +(70933,1,0), +(70931,1,0), +(70921,1,0), +(70881,1,0), +(70861,1,0), +(70860,1,0), +(70859,1,0), +(70858,1,0), +(70857,1,0), +(70856,1,0), +(70792,1,0), +(70790,1,0), +(70784,1,0), +(70781,1,0), +(70743,1,0), +(70713,1,1), +(70643,1,0), +(70639,1,0), +(70638,1,1), +(70636,1,1), +(70635,1,0), +(70623,1,1), +(70614,1,0), +(70611,1,0), +(70602,1,0), +(70595,1,0), +(70588,1,0), +(70586,1,0), +(70572,1,0), +(70569,1,0), +(70527,1,1), +(70525,1,0), +(70488,1,0), +(70485,1,0), +(70471,1,0), +(70466,1,0), +(70464,1,0), +(70444,1,0), +(70443,1,1), +(70403,1,0), +(70397,1,0), +(70383,1,0), +(70374,1,0), +(70366,1,0), +(70360,1,0), +(70338,1,0), +(70331,1,1), +(70299,1,0), +(70293,1,0), +(70290,1,0), +(70267,1,0), +(70266,1,0), +(70265,1,0), +(70246,1,0), +(70225,1,0), +(70224,1,0), +(70143,1,0), +(70130,1,0), +(70104,1,0), +(70100,1,0), +(70098,1,0), +(70079,1,0), +(70078,1,0), +(70053,1,0), +(70041,1,0), +(70040,1,0), +(70021,1,0), +(69960,1,0), +(69959,1,0), +(69922,1,0), +(69907,1,0), +(69886,1,0), +(69857,1,0), +(69843,1,0), +(69801,1,0), +(69798,1,0), +(69796,1,0), +(69784,1,0), +(69782,1,0), +(69768,1,0), +(69753,1,0), +(69705,1,0), +(69682,1,0), +(69614,1,0), +(69610,1,0), +(69601,1,0), +(69600,1,0), +(69593,1,0), +(69553,1,0), +(69538,1,0), +(69508,1,0), +(69431,1,0), +(69372,1,0), +(69347,1,0), +(69298,1,1), +(69171,1,0), +(69125,1,0), +(69101,1,0), +(69098,1,0), +(69097,1,0), +(69048,1,1), +(69039,1,0), +(69016,1,0), +(68957,1,0), +(68922,1,0), +(68919,1,0), +(68901,1,0), +(68881,1,0), +(68880,1,0), +(68861,1,0), +(68847,1,0), +(68842,1,0), +(68798,1,0), +(68663,1,0), +(68644,1,0), +(68617,1,0), +(68616,1,0), +(68614,1,0), +(68515,1,1), +(68471,1,1), +(68470,1,1), +(68401,1,0), +(68400,1,0), +(68360,1,0), +(68359,1,0), +(68358,1,0), +(68206,1,1), +(68198,1,1), +(68197,1,1), +(68193,1,1), +(68186,1,1), +(67888,1,0), +(67864,1,0), +(67857,1,0), +(67856,1,0), +(67855,1,0), +(67804,1,0), +(67757,1,0), +(67756,1,0), +(67755,1,0), +(67748,1,0), +(67732,1,0), +(67715,1,0), +(67705,1,0), +(67551,1,1), +(67547,1,0), +(67482,1,0), +(67400,1,0), +(67397,1,0), +(67369,1,0), +(67335,1,0), +(67328,1,0), +(67163,1,0), +(67162,1,0), +(67161,1,0), +(67160,1,0), +(67159,1,0), +(67158,1,0), +(66986,1,1), +(66810,1,1), +(66798,1,0), +(66785,1,0), +(66774,1,0), +(66718,1,1), +(66665,1,0), +(66637,1,0), +(66636,1,0), +(66630,1,0), +(66551,1,0), +(66550,1,0), +(66513,1,0), +(66512,1,0), +(66508,1,0), +(66401,1,0), +(66391,1,0), +(66390,1,0), +(66387,1,0), +(66386,1,0), +(66385,1,0), +(66384,1,0), +(66383,1,0), +(66382,1,0), +(66379,1,0), +(66357,1,0), +(66356,1,0), +(66355,1,0), +(66354,1,0), +(66353,1,0), +(66352,1,0), +(66350,1,0), +(66349,1,0), +(66348,1,0), +(66345,1,0), +(66339,1,0), +(66332,1,0), +(66314,1,1), +(66312,1,1), +(66287,1,0), +(66256,1,0), +(66193,1,0), +(66181,1,0), +(66153,1,0), +(66152,1,0), +(66141,1,0), +(66140,1,0), +(66135,1,1), +(66133,1,0), +(66132,1,0), +(65872,1,0), +(65861,1,0), +(65719,1,0), +(65718,1,0), +(65699,1,0), +(65685,1,0), +(65652,1,0), +(65614,1,0), +(65613,1,0), +(65611,1,0), +(65594,1,1), +(65589,1,0), +(65588,1,0), +(65587,1,0), +(65509,1,0), +(65357,1,0), +(65354,1,0), +(65350,1,0), +(65349,1,0), +(65346,1,1), +(65312,1,1), +(65311,1,1), +(65265,1,0), +(65258,1,0), +(65238,1,0), +(65224,1,0), +(65206,1,0), +(65200,1,0), +(65192,1,0), +(65184,1,1), +(65140,1,0), +(65109,1,0), +(65061,1,0), +(65042,1,0), +(65040,1,1), +(65034,1,0), +(65016,1,0), +(65015,1,0), +(64996,1,0), +(64995,1,0), +(64898,1,0), +(64887,1,0), +(64886,1,0), +(64880,1,0), +(64828,1,0), +(64799,1,0), +(64767,1,0), +(64623,1,0), +(64620,1,0), +(64619,1,0), +(64618,1,0), +(64597,1,0), +(64543,1,0), +(64539,1,0), +(64503,1,0), +(64499,1,0), +(64480,1,0), +(64475,1,0), +(64474,1,0), +(64466,1,0), +(64465,1,0), +(64463,1,0), +(64449,1,0), +(64444,1,0), +(64425,1,0), +(64414,1,0), +(64402,1,0), +(64397,1,0), +(64320,1,0), +(64229,1,0), +(64225,1,0), +(64224,1,0), +(64201,1,0), +(64185,1,0), +(64184,1,0), +(64183,1,0), +(64173,1,0), +(64172,1,0), +(64098,1,0), +(64069,1,0), +(64063,1,0), +(64061,1,0), +(64059,1,1), +(64032,1,0), +(64031,1,0), +(64030,1,0), +(64029,1,0), +(64028,1,0), +(64027,1,0), +(64026,1,0), +(64025,1,0), +(64024,1,0), +(64014,1,0), +(63984,1,0), +(63979,1,0), +(63947,1,0), +(63886,1,0), +(63882,1,0), +(63820,1,0), +(63813,1,0), +(63812,1,0), +(63764,1,0), +(63763,1,0), +(63762,1,0), +(63761,1,0), +(63749,1,0), +(63747,1,1), +(63745,1,1), +(63744,1,0), +(63702,1,0), +(63676,1,0), +(63659,1,0), +(63658,1,0), +(63657,1,0), +(63629,1,0), +(63628,1,0), +(63576,1,0), +(63524,1,0), +(63499,1,0), +(63446,1,0), +(63445,1,0), +(63444,1,0), +(63443,1,0), +(63442,1,0), +(63441,1,0), +(63440,1,0), +(63439,1,0), +(63438,1,0), +(63352,1,0), +(63348,1,0), +(63322,1,1), +(63274,1,0), +(63255,1,0), +(63238,1,0), +(63109,1,0), +(63037,1,0), +(63013,1,0), +(63001,1,0), +(62990,1,0), +(62978,1,0), +(62976,1,0), +(62943,1,0), +(62911,1,0), +(62909,1,0), +(62906,1,0), +(62888,1,0), +(62883,1,0), +(62882,1,0), +(62834,1,0), +(62809,1,0), +(62797,1,1), +(62778,1,0), +(62731,1,0), +(62727,1,0), +(62711,1,0), +(62708,1,0), +(62706,1,0), +(62701,1,0), +(62669,1,0), +(62646,1,0), +(62603,1,0), +(62584,1,0), +(62577,1,0), +(62567,1,0), +(62533,1,0), +(62525,1,0), +(62524,1,0), +(62521,1,0), +(62509,1,0), +(62505,1,0), +(62496,1,0), +(62488,1,0), +(62485,1,0), +(62484,1,0), +(62483,1,0), +(62480,1,0), +(62464,1,0), +(62378,1,0), +(124,1,0), +(2222,1,0), +(3730,1,0), +(4020,1,0), +(4338,1,0), +(5249,1,0), +(5251,1,0), +(5432,1,0), +(5555,1,0), +(6636,1,0), +(6672,1,0), +(6755,1,0), +(6955,1,0), +(6967,1,0), +(7022,1,0), +(7035,1,0), +(7036,1,0), +(7277,1,0), +(7393,1,0), +(7670,1,0), +(7769,1,0), +(8283,1,0), +(8593,1,0), +(8596,1,0), +(9002,1,0), +(9003,1,0), +(9004,1,0), +(9012,1,0), +(9082,1,0), +(9095,1,0), +(9455,1,0), +(9457,1,0), +(9712,1,0), +(9976,1,0), +(10113,1,0), +(10137,1,0), +(10252,1,0), +(10258,1,0), +(10259,1,0), +(10260,1,0), +(10345,1,0), +(10604,1,0), +(10727,1,0), +(10747,1,0), +(11195,1,0), +(11402,1,0), +(11440,1,0), +(11513,1,0), +(11637,1,0), +(11757,1,0), +(11893,1,0), +(12134,1,0), +(12158,1,0), +(12159,1,0), +(12347,1,0), +(12512,1,0), +(12564,1,0), +(12613,1,0), +(12623,1,0), +(12699,1,0), +(12709,1,0), +(12774,1,0), +(12938,1,0), +(13461,1,0), +(13727,1,0), +(13821,1,0), +(13951,1,0), +(13982,1,0), +(14250,1,0), +(14292,1,0), +(14806,1,0), +(14813,1,0), +(14928,1,0), +(15252,1,0), +(15281,1,0), +(15591,1,0), +(15658,1,0), +(15746,1,0), +(15958,1,0), +(16007,1,0), +(16032,1,0), +(16037,1,0), +(16053,1,0), +(16068,1,0), +(16069,1,0), +(16070,1,0), +(16074,1,0), +(16378,1,0), +(16381,1,0), +(16404,1,0), +(16556,1,0), +(16558,1,0), +(16637,1,0), +(16786,1,0), +(16807,1,0), +(17048,1,0), +(17166,1,0), +(17190,1,0), +(17202,1,0), +(17272,1,0), +(17278,1,0), +(17279,1,0), +(17471,1,0), +(17536,1,0), +(17616,1,0), +(17618,1,0), +(17652,1,0), +(17671,1,0), +(17675,1,0), +(17676,1,0), +(17677,1,0), +(17678,1,0), +(17698,1,0), +(17748,1,0), +(18110,1,0), +(18655,1,0), +(18666,1,0), +(18811,1,0), +(18969,1,0), +(19032,1,0), +(19096,1,0), +(19571,1,0), +(19593,1,0), +(19721,1,0), +(19749,1,0), +(19770,1,0), +(19773,1,0), +(19952,1,0), +(20358,1,0), +(20465,1,0), +(20619,1,0), +(21052,1,0), +(21075,1,0), +(21076,1,0), +(21391,1,0), +(21556,1,0), +(21566,1,0), +(21885,1,0), +(21950,1,0), +(22096,1,0), +(22203,1,0), +(22205,1,0), +(22393,1,0), +(22458,1,0), +(22860,1,0), +(22906,1,0), +(22966,1,0), +(23014,1,0), +(23016,1,0), +(23018,1,0), +(23019,1,0), +(23168,1,0), +(23328,1,0), +(23360,1,0), +(23389,1,0), +(23394,1,0), +(23415,1,0), +(23642,1,0), +(23951,1,0), +(23974,1,0), +(24062,1,0), +(24083,1,0), +(24172,1,0), +(24207,1,0), +(24217,1,0), +(24311,1,0), +(24322,1,0), +(24323,1,0), +(24391,1,0), +(24734,1,0), +(24744,1,0), +(24756,1,0), +(24758,1,0), +(24760,1,0), +(24763,1,0), +(24765,1,0), +(24768,1,0), +(24770,1,0), +(24772,1,0), +(24784,1,0), +(24786,1,0), +(24788,1,0), +(24789,1,0), +(24790,1,0), +(24804,1,0), +(24933,1,0), +(25030,1,0), +(25031,1,0), +(25032,1,0), +(25099,1,0), +(25145,1,0), +(25149,1,0), +(25150,1,0), +(25158,1,0), +(25201,1,0), +(25715,1,0), +(25727,1,0), +(25745,1,0), +(25822,1,0), +(25823,1,0), +(25896,1,0), +(26235,1,0), +(26344,1,0), +(26345,1,0), +(26346,1,0), +(26347,1,0), +(26348,1,0), +(26349,1,0), +(26351,1,0), +(26352,1,0), +(26353,1,0), +(26354,1,0), +(26355,1,0), +(26356,1,0), +(26462,1,0), +(26522,1,1), +(26608,1,0), +(26687,1,1), +(26879,1,0), +(27583,1,0), +(27651,1,0), +(27663,1,0), +(27745,1,0), +(27885,1,0), +(27886,1,0), +(27892,1,0), +(27893,1,0), +(27894,1,0), +(27928,1,0), +(27929,1,0), +(27935,1,0), +(27936,1,0), +(28018,1,0), +(28032,1,0), +(28056,1,0), +(28078,1,0), +(28087,1,0), +(28096,1,0), +(28111,1,0), +(28159,1,0), +(28278,1,0), +(28281,1,0), +(28309,1,0), +(28326,1,0), +(28338,1,0), +(28339,1,0), +(28365,1,0), +(28366,1,0), +(28367,1,0), +(28374,1,0), +(28392,1,0), +(28404,1,0), +(28441,1,0), +(28605,1,0), +(28697,1,0), +(28731,1,0), +(28732,1,0), +(28861,1,0), +(29070,1,0), +(29072,1,0), +(29120,1,0), +(29121,1,0), +(29122,1,0), +(29172,1,0), +(29173,1,0), +(29176,1,0), +(29328,1,1), +(29339,1,0), +(29340,1,0), +(29428,1,0), +(29437,1,0), +(29456,1,0), +(29457,1,0), +(29458,1,0), +(29459,1,0), +(29461,1,0), +(29531,1,0), +(29534,1,0), +(29612,1,0), +(29705,1,0), +(29726,1,0), +(29727,1,0), +(29769,1,0), +(29770,1,0), +(29846,1,1), +(29962,1,0), +(29966,1,0), +(29967,1,0), +(29969,1,0), +(29970,1,0), +(29972,1,0), +(29989,1,0), +(30012,1,0), +(30065,1,0), +(30107,1,0), +(30166,1,0), +(30207,1,0), +(30221,1,0), +(30232,1,0), +(30273,1,0), +(30410,1,0), +(30417,1,0), +(30418,1,0), +(30425,1,0), +(30427,1,0), +(30460,1,0), +(30462,1,0), +(30469,1,0), +(30477,1,0), +(30541,1,0), +(30544,1,0), +(30571,1,1), +(30572,1,0), +(30625,1,0), +(30631,1,1), +(30656,1,0), +(30662,1,0), +(30676,1,0), +(30690,1,0), +(30735,1,0), +(30738,1,0), +(30745,1,0), +(30751,1,0), +(30762,1,0), +(30763,1,0), +(30764,1,0), +(30765,1,0), +(30766,1,0), +(30834,1,0), +(30835,1,0), +(30875,1,0), +(30876,1,0), +(30951,1,0), +(30952,1,0), +(30964,1,0), +(30968,1,0), +(30970,1,0), +(30974,1,0), +(30985,1,0), +(30988,1,0), +(31115,1,0), +(31225,1,0), +(31315,1,0), +(31324,1,0), +(31326,1,0), +(31329,1,0), +(31336,1,0), +(31346,1,0), +(31411,1,0), +(31412,1,0), +(31413,1,0), +(31414,1,0), +(31474,1,0), +(31515,1,0), +(31532,1,0), +(31537,1,0), +(31550,1,0), +(31611,1,0), +(31628,1,0), +(31630,1,0), +(31631,1,0), +(31702,1,0), +(31727,1,0), +(31736,1,0), +(31749,1,0), +(31781,1,0), +(31793,1,0), +(31799,1,0), +(31806,1,0), +(31889,1,0), +(31902,1,0), +(31936,1,0), +(31979,1,0), +(31993,1,0), +(32040,1,0), +(32042,1,0), +(32045,1,0), +(32051,1,0), +(32052,1,0), +(32087,1,0), +(32111,1,0), +(32127,1,0), +(32146,1,0), +(32163,1,0), +(32164,1,0), +(32227,1,0), +(32228,1,0), +(32251,1,0), +(32260,1,0), +(32286,1,0), +(32301,1,0), +(32303,1,0), +(32312,1,0), +(32373,1,0), +(32396,1,0), +(32560,1,0), +(32573,1,0), +(32589,1,0), +(32622,1,0), +(32623,1,0), +(32638,1,0), +(32668,1,0), +(32708,1,1), +(32760,1,0), +(32838,1,0), +(32890,1,0), +(32928,1,0), +(32929,1,0), +(32930,1,0), +(32953,1,0), +(32958,1,0), +(32974,1,0), +(32976,1,0), +(32979,1,0), +(33067,1,0), +(33270,1,1), +(33329,1,0), +(33332,1,0), +(33336,1,0), +(33337,1,0), +(33423,1,0), +(33424,1,0), +(33425,1,0), +(33531,1,0), +(33532,1,0), +(33618,1,0), +(33644,1,0), +(33655,1,0), +(33669,1,0), +(33710,1,0), +(33716,1,1), +(33742,1,0), +(33744,1,0), +(33796,1,0), +(33805,1,0), +(33806,1,0), +(33809,1,0), +(33822,1,0), +(33831,1,0), +(33838,1,0), +(33861,1,0), +(33862,1,0), +(33918,1,0), +(33924,1,0), +(33937,1,0), +(33981,1,0), +(34011,1,0), +(34013,1,0), +(34016,1,0), +(34019,1,0), +(34023,1,0), +(34024,1,0), +(34062,1,0), +(34063,1,0), +(34076,1,0), +(34119,1,0), +(34154,1,0), +(34156,1,0), +(34209,1,0), +(34211,1,0), +(34212,1,0), +(34221,1,0), +(34239,1,0), +(34254,1,0), +(34330,1,0), +(34332,1,0), +(34367,1,0), +(34378,1,0), +(34393,1,0), +(34397,1,0), +(34430,1,0), +(34516,1,0), +(34526,1,0), +(34536,1,0), +(34581,1,0), +(34583,1,0), +(34613,1,0), +(34627,1,0), +(34646,1,0), +(34662,1,0), +(34742,1,0), +(34806,1,0), +(34874,1,0), +(34893,1,0), +(34946,1,0), +(35016,1,0), +(35040,1,0), +(35063,1,0), +(35097,1,0), +(35113,1,0), +(35137,1,0), +(35140,1,0), +(35141,1,0), +(35155,1,0), +(35160,1,0), +(35162,1,0), +(35170,1,0), +(35176,1,0), +(35190,1,0), +(35245,1,0), +(35262,1,0), +(35282,1,0), +(35301,1,0), +(35372,1,0), +(35413,1,0), +(35427,1,0), +(35515,1,0), +(35516,1,0), +(35598,1,0), +(35600,1,0), +(35673,1,0), +(35682,1,0), +(35724,1,0), +(35746,1,0), +(35756,1,0), +(35770,1,0), +(35771,1,0), +(35772,1,0), +(35782,1,0), +(35930,1,0), +(35941,1,1), +(35956,1,1), +(35960,1,0), +(35961,1,0), +(35962,1,0), +(36000,1,0), +(36035,1,0), +(36089,1,0), +(36090,1,0), +(36103,1,0), +(36167,1,0), +(36174,1,0), +(36196,1,0), +(36197,1,0), +(36198,1,0), +(36201,1,0), +(36220,1,0), +(36239,1,0), +(36241,1,0), +(36243,1,0), +(36290,1,0), +(36291,1,0), +(36293,1,0), +(36327,1,0), +(36330,1,0), +(36378,1,0), +(36384,1,0), +(36431,1,0), +(36452,1,0), +(36455,1,1), +(36456,1,0), +(36514,1,0), +(36544,1,0), +(36639,1,0), +(36651,1,0), +(36652,1,0), +(36692,1,0), +(36709,1,0), +(36717,1,1), +(36779,1,0), +(36795,1,0), +(36802,1,0), +(36803,1,0), +(36804,1,0), +(36823,1,0), +(36852,1,0), +(36854,1,0), +(36856,1,0), +(36857,1,0), +(36858,1,0), +(36859,1,0), +(36871,1,0), +(36878,1,0), +(36884,1,0), +(36896,1,0), +(36951,1,0), +(36953,1,0), +(36969,1,0), +(36995,1,0), +(37013,1,0), +(37017,1,0), +(37032,1,0), +(37033,1,0), +(37034,1,0), +(37035,1,0), +(37051,1,0), +(37052,1,0), +(37053,1,0), +(37055,1,0), +(37056,1,0), +(37071,1,0), +(37072,1,0), +(37103,1,0), +(37142,1,0), +(37143,1,0), +(37144,1,0), +(37146,1,0), +(37147,1,0), +(37148,1,0), +(37149,1,0), +(37150,1,0), +(37151,1,0), +(37152,1,0), +(37153,1,0), +(37199,1,0), +(37220,1,0), +(37226,1,0), +(37229,1,0), +(37235,1,0), +(37281,1,0), +(37285,1,0), +(37337,1,0), +(37339,1,0), +(37345,1,0), +(37348,1,0), +(37388,1,0), +(37406,1,0), +(37408,1,1), +(37413,1,0), +(37422,1,0), +(37427,1,0), +(37428,1,0), +(37448,1,1), +(37449,1,1), +(37453,1,0), +(37454,1,0), +(37459,1,0), +(37461,1,0), +(37465,1,0), +(37469,1,0), +(37471,1,0), +(37472,1,0), +(37474,1,0), +(37476,1,0), +(37498,1,0), +(37502,1,0), +(37573,1,0), +(37626,1,0), +(37645,1,0), +(37689,1,0), +(37697,1,0), +(37712,1,0), +(37720,1,0), +(37748,1,0), +(37755,1,0), +(37775,1,0), +(37784,1,0), +(37824,1,0), +(37842,1,0), +(37843,1,0), +(37848,1,0), +(37849,1,1), +(37853,1,0), +(37868,1,0), +(37893,1,0), +(37895,1,0), +(37918,1,0), +(37934,1,0), +(37936,1,0), +(37964,1,0), +(37984,1,0), +(38003,1,0), +(38014,1,0), +(38015,1,0), +(38017,1,0), +(38020,1,0), +(38053,1,0), +(38054,1,0), +(38072,1,0), +(38073,1,0), +(38112,1,0), +(38121,1,0), +(38123,1,0), +(38126,1,0), +(38128,1,0), +(38130,1,0), +(38202,1,0), +(38250,1,0), +(38269,1,0), +(38360,1,0), +(38444,1,0), +(38451,1,0), +(38452,1,0), +(38455,1,0), +(38469,1,0), +(38482,1,0), +(38508,1,0), +(38530,1,0), +(38629,1,0), +(38632,1,0), +(38691,1,0), +(38711,1,0), +(38722,1,0), +(38736,1,0), +(38738,1,0), +(38762,1,0), +(38802,1,0), +(38829,1,1), +(38966,1,0), +(38968,1,0), +(39010,1,0), +(39011,1,0), +(39043,1,0), +(39073,1,0), +(39094,1,0), +(39124,1,0), +(39126,1,0), +(39140,1,0), +(39141,1,0), +(39184,1,0), +(39185,1,0), +(39189,1,0), +(39190,1,0), +(39206,1,0), +(39211,1,0), +(39216,1,0), +(39219,1,0), +(39221,1,0), +(39248,1,0), +(39334,1,0), +(39335,1,0), +(39338,1,0), +(39341,1,0), +(39342,1,0), +(39344,1,0), +(39350,1,0), +(39352,1,0), +(39353,1,0), +(39354,1,0), +(39355,1,0), +(39356,1,0), +(39357,1,0), +(39358,1,0), +(39359,1,0), +(39360,1,0), +(39361,1,0), +(39362,1,0), +(39395,1,0), +(39495,1,0), +(39497,1,1), +(39552,1,0), +(39559,1,0), +(39583,1,0), +(39601,1,0), +(39635,1,0), +(39678,1,0), +(39687,1,0), +(39690,1,0), +(39691,1,0), +(39692,1,0), +(39696,1,0), +(39758,1,0), +(39834,1,1), +(39849,1,0), +(39851,1,1), +(39852,1,1), +(39853,1,1), +(39854,1,1), +(39873,1,0), +(39899,1,0), +(39914,1,0), +(39915,1,0), +(39919,1,0), +(39921,1,0), +(39923,1,1), +(39930,1,0), +(39938,1,0), +(39939,1,0), +(39940,1,0), +(39974,1,0), +(39977,1,0), +(39978,1,0), +(39985,1,0), +(39989,1,0), +(39993,1,0), +(39999,1,0), +(40085,1,0), +(40094,1,0), +(40106,1,0), +(40110,1,0), +(40112,1,1), +(40136,1,0), +(40147,1,0), +(40153,1,0), +(40156,1,0), +(40160,1,0), +(40187,1,0), +(40189,1,0), +(40190,1,0), +(40224,1,0), +(40281,1,0), +(40287,1,0), +(40288,1,0), +(40289,1,0), +(40309,1,0), +(40350,1,0), +(40359,1,0), +(40382,1,0), +(40383,1,0), +(40397,1,0), +(40437,1,0), +(40439,1,0), +(40454,1,0), +(40490,1,0), +(40494,1,0), +(40498,1,0), +(40499,1,0), +(40512,1,0), +(40520,1,0), +(40521,1,0), +(40523,1,0), +(40532,1,0), +(40547,1,0), +(40607,1,0), +(40638,1,0), +(40693,1,0), +(40704,1,0), +(40707,1,0), +(40708,1,0), +(40709,1,0), +(40710,1,0), +(40711,1,0), +(40712,1,0), +(40713,1,0), +(40715,1,0), +(40730,1,1), +(40738,1,0), +(40750,1,0), +(40761,1,0), +(40788,1,0), +(40821,1,0), +(40824,1,0), +(40825,1,0), +(40828,1,0), +(40830,1,0), +(40848,1,1), +(40874,1,0), +(40887,1,0), +(40978,1,0), +(40985,1,1), +(40989,1,0), +(40993,1,1), +(41007,1,1), +(41015,1,1), +(41022,1,1), +(41073,1,0), +(41077,1,0), +(41122,1,0), +(41124,1,0), +(41125,1,0), +(41128,1,0), +(41129,1,0), +(41154,1,0), +(41257,1,0), +(41268,1,0), +(41269,1,0), +(41271,1,0), +(41285,1,1), +(41295,1,0), +(41333,1,0), +(41342,1,0), +(41343,1,0), +(41344,1,0), +(41362,1,0), +(41455,1,0), +(41457,1,0), +(41477,1,0), +(41499,1,0), +(41522,1,0), +(41525,1,0), +(41537,1,0), +(41557,1,0), +(41560,1,0), +(41575,1,0), +(41602,1,0), +(41614,1,0), +(41624,1,1), +(41975,1,0), +(41976,1,0), +(41993,1,0), +(42008,1,0), +(42014,1,0), +(42138,1,1), +(42143,1,0), +(42151,1,0), +(42166,1,0), +(42167,1,0), +(42168,1,0), +(42178,1,0), +(42219,1,0), +(42222,1,0), +(42247,1,0), +(42269,1,0), +(42271,1,0), +(42272,1,0), +(42289,1,0), +(42317,1,0), +(42318,1,0), +(42321,1,0), +(42339,1,0), +(42341,1,0), +(42352,1,0), +(42356,1,0), +(42391,1,0), +(42393,1,0), +(42405,1,0), +(42410,1,0), +(42415,1,0), +(42428,1,0), +(42442,1,0), +(42447,1,0), +(42454,1,0), +(42471,1,0), +(42473,1,0), +(42482,1,0), +(42484,1,0), +(42515,1,0), +(42517,1,0), +(42530,1,0), +(42534,1,0), +(42536,1,0), +(42542,1,0), +(42550,1,0), +(42564,1,0), +(42567,1,0), +(42570,1,0), +(42577,1,0), +(42585,1,0), +(42604,1,0), +(42605,1,0), +(42616,1,0), +(42631,1,0), +(42638,1,1), +(42647,1,0), +(42654,1,0), +(42655,1,0), +(42659,1,0), +(42661,1,0), +(42664,1,0), +(42674,1,1), +(42685,1,0), +(42695,1,0), +(42697,1,0), +(42703,1,0), +(42707,1,0), +(42713,1,0), +(42720,1,0), +(42734,1,0), +(42757,1,1), +(42768,1,0), +(42793,1,0), +(42797,1,0), +(42808,1,0), +(42809,1,0), +(42813,1,0), +(42815,1,0), +(42816,1,0), +(42818,1,0), +(42821,1,0), +(42839,1,0), +(42857,1,0), +(42881,1,0), +(42882,1,0), +(42883,1,0), +(42884,1,0), +(42888,1,0), +(42905,1,0), +(42968,1,0), +(42982,1,0), +(43033,1,0), +(43035,1,0), +(43057,1,0), +(43066,1,0), +(43068,1,0), +(43069,1,0), +(43072,1,0), +(43076,1,0), +(43078,1,0), +(43079,1,0), +(43092,1,0), +(43101,1,0), +(43106,1,0), +(43109,1,0), +(43144,1,0), +(43171,1,0), +(43209,1,0), +(43210,1,0), +(43234,1,0), +(43239,1,0), +(43244,1,0), +(43255,1,0), +(43291,1,0), +(43306,1,0), +(43307,1,0), +(43333,1,0), +(43371,1,0), +(43385,1,0), +(43386,1,0), +(43403,1,0), +(43404,1,0), +(43407,1,0), +(43450,1,0), +(43458,1,0), +(43468,1,0), +(43486,1,0), +(43487,1,0), +(43515,1,0), +(43520,1,0), +(43525,1,0), +(43546,1,0), +(43559,1,0), +(43563,1,0), +(43568,1,0), +(43615,1,0), +(43647,1,0), +(43662,1,0), +(43685,1,0), +(43691,1,0), +(43711,1,0), +(43734,1,0), +(43754,1,0), +(43770,1,0), +(43791,1,0), +(43805,1,0), +(43863,1,0), +(43865,1,0), +(43867,1,0), +(43871,1,0), +(43872,1,0), +(43878,1,0), +(43882,1,0), +(43892,1,0), +(43942,1,0), +(43943,1,0), +(43949,1,0), +(43962,1,0), +(43990,1,0), +(43994,1,0), +(44014,1,0), +(44022,1,0), +(44023,1,0), +(44024,1,0), +(44026,1,0), +(44027,1,0), +(44028,1,0), +(44037,1,0), +(44145,1,0), +(44161,1,0), +(44193,1,0), +(44214,1,0), +(44224,1,1), +(44229,1,0), +(44232,1,1), +(44250,1,0), +(44255,1,0), +(44260,1,0), +(44266,1,0), +(44270,1,0), +(44283,1,0), +(44284,1,0), +(44309,1,0), +(44313,1,0), +(44329,1,0), +(44330,1,0), +(44355,1,0), +(44362,1,0), +(44365,1,0), +(44367,1,0), +(44374,1,0), +(44392,1,0), +(44411,1,0), +(44420,1,0), +(44422,1,0), +(44458,1,0), +(44550,1,0), +(44562,1,0), +(44574,1,0), +(44609,1,0), +(44610,1,0), +(44653,1,0), +(44681,1,0), +(44682,1,1), +(44749,1,0), +(44804,1,0), +(44807,1,0), +(44826,1,0), +(44837,1,0), +(44838,1,0), +(44839,1,0), +(44840,1,0), +(44841,1,0), +(44842,1,0), +(44845,1,0), +(44846,1,0), +(44849,1,1), +(44864,1,0), +(44865,1,0), +(44872,1,0), +(44877,1,0), +(44883,1,0), +(44886,1,0), +(44938,1,0), +(44939,1,0), +(44941,1,0), +(44946,1,0), +(44948,1,0), +(44963,1,0), +(44965,1,0), +(44981,1,0), +(45005,1,0), +(45008,1,0), +(45012,1,0), +(45013,1,0), +(45076,1,0), +(45086,1,0), +(45103,1,0), +(45109,1,0), +(45114,1,0), +(45115,1,0), +(45119,1,0), +(45172,1,0), +(45188,1,0), +(45191,1,0), +(45219,1,0), +(45223,1,0), +(45224,1,0), +(45229,1,0), +(45233,1,0), +(45259,1,0), +(45260,1,1), +(45264,1,0), +(45267,1,0), +(45277,1,0), +(45279,1,0), +(45307,1,0), +(45323,1,0), +(45339,1,0), +(45340,1,0), +(45351,1,0), +(45368,1,0), +(45371,1,0), +(45388,1,0), +(45389,1,0), +(45405,1,0), +(45407,1,0), +(45414,1,0), +(45437,1,0), +(45446,1,0), +(45448,1,0), +(45449,1,0), +(45465,1,0), +(45474,1,0), +(45536,1,0), +(45581,1,0), +(45583,1,0), +(45586,1,0), +(45594,1,0), +(45595,1,0), +(45596,1,0), +(45597,1,0), +(45602,1,0), +(45605,1,0), +(45606,1,0), +(45607,1,0), +(45608,1,0), +(45609,1,0), +(45622,1,0), +(45623,1,0), +(45630,1,0), +(45634,1,0), +(45644,1,1), +(45651,1,0), +(45655,1,0), +(45656,1,0), +(45666,1,0), +(45667,1,0), +(45671,1,1), +(45680,1,1), +(45692,1,0), +(45700,1,0), +(45714,1,0), +(45732,1,0), +(45735,1,0), +(45761,1,0), +(45774,1,0), +(45780,1,0), +(45788,1,0), +(45805,1,0), +(45808,1,0), +(45834,1,0), +(45835,1,0), +(45841,1,0), +(45853,1,0), +(45859,1,0), +(45863,1,0), +(45864,1,0), +(45867,1,0), +(45872,1,0), +(45888,1,0), +(45907,1,0), +(45911,1,0), +(45912,1,0), +(45914,1,0), +(45918,1,1), +(45923,1,0), +(45929,1,0), +(45930,1,0), +(45941,1,0), +(45949,1,0), +(45961,1,0), +(45968,1,0), +(45969,1,0), +(45970,1,0), +(45976,1,0), +(45979,1,0), +(45990,1,0), +(45993,1,0), +(46013,1,0), +(46018,1,1), +(46022,1,0), +(46034,1,0), +(46054,1,0), +(46058,1,0), +(46063,1,0), +(46066,1,0), +(46068,1,0), +(46085,1,0), +(46143,1,0), +(46171,1,0), +(46173,1,0), +(62377,1,0), +(46175,1,0), +(46176,1,0), +(46177,1,0), +(46178,1,0), +(46201,1,0), +(46208,1,0), +(46219,1,0), +(46222,1,0), +(46236,1,0), +(46237,1,0), +(46245,1,0), +(46246,1,0), +(46281,1,0), +(46307,1,1), +(46318,1,0), +(46319,1,0), +(46320,1,1), +(46330,1,0), +(46363,1,0), +(46372,1,1), +(46374,1,0), +(46376,1,0), +(46382,1,0), +(46385,1,0), +(46396,1,1), +(46398,1,0), +(46399,1,0), +(46400,1,0), +(46474,1,0), +(46475,1,0), +(46477,1,0), +(46482,1,0), +(46488,1,0), +(46521,1,0), +(46588,1,1), +(46592,1,0), +(46593,1,0), +(46603,1,0), +(46609,1,0), +(46610,1,0), +(46623,1,0), +(46631,1,0), +(46637,1,0), +(46650,1,0), +(46652,1,0), +(46656,1,0), +(46685,1,0), +(46692,1,0), +(46694,1,0), +(46704,1,0), +(46707,1,0), +(46732,1,1), +(46733,1,0), +(46735,1,0), +(46747,1,0), +(46793,1,0), +(46797,1,0), +(46809,1,0), +(46815,1,0), +(46818,1,0), +(46820,1,0), +(46843,1,0), +(46886,1,0), +(46895,1,0), +(46900,1,0), +(46902,1,0), +(46903,1,0), +(46904,1,0), +(46936,1,0), +(46937,1,0), +(46963,1,0), +(46964,1,0), +(46965,1,1), +(46974,1,0), +(47016,1,0), +(47026,1,0), +(47035,1,0), +(47060,1,0), +(47065,1,0), +(47104,1,0), +(47110,1,0), +(47137,1,0), +(47170,1,0), +(47176,1,0), +(47184,1,0), +(47214,1,0), +(47253,1,0), +(47254,1,0), +(47336,1,0), +(47344,1,0), +(47370,1,1), +(47374,1,0), +(47378,1,0), +(47421,1,0), +(47452,1,0), +(47460,1,0), +(47463,1,0), +(47469,1,0), +(47542,1,0), +(47547,1,0), +(47563,1,0), +(47574,1,0), +(47593,1,0), +(47594,1,0), +(47596,1,0), +(47597,1,0), +(47598,1,0), +(47599,1,0), +(47616,1,0), +(47617,1,0), +(47618,1,0), +(47619,1,0), +(47634,1,0), +(47669,1,0), +(47670,1,0), +(47681,1,0), +(47682,1,0), +(47683,1,0), +(47684,1,0), +(47685,1,0), +(47691,1,1), +(47711,1,0), +(47712,1,0), +(47713,1,0), +(47747,1,0), +(47771,1,0), +(47787,1,0), +(47799,1,0), +(47911,1,0), +(47913,1,0), +(47916,1,0), +(47933,1,0), +(47935,1,0), +(47939,1,0), +(47959,1,0), +(48009,1,0), +(48021,1,0), +(48028,1,1), +(48035,1,0), +(48115,1,0), +(48117,1,0), +(48183,1,0), +(48185,1,0), +(48188,1,0), +(48194,1,1), +(48199,1,0), +(48201,1,0), +(48202,1,0), +(48213,1,0), +(48218,1,0), +(48222,1,0), +(48223,1,0), +(48227,1,0), +(48246,1,1), +(48252,1,0), +(48293,1,0), +(48306,1,0), +(48315,1,0), +(48329,1,0), +(48344,1,0), +(48345,1,0), +(48362,1,0), +(48363,1,0), +(48375,1,0), +(48385,1,0), +(48398,1,0), +(48399,1,0), +(48425,1,0), +(48426,1,0), +(48455,1,0), +(48490,1,0), +(48497,1,0), +(48508,1,0), +(48530,1,0), +(48551,1,0), +(48597,1,0), +(48600,1,0), +(48605,1,0), +(48620,1,0), +(48623,1,0), +(48627,1,0), +(48641,1,0), +(48642,1,0), +(48646,1,0), +(48649,1,0), +(48685,1,0), +(48724,1,0), +(48726,1,0), +(48728,1,0), +(48730,1,0), +(48732,1,0), +(48748,1,0), +(48764,1,0), +(48771,1,0), +(48773,1,0), +(48790,1,0), +(48793,1,0), +(48799,1,0), +(48808,1,0), +(48811,1,0), +(48896,1,0), +(48901,1,0), +(48904,1,0), +(48929,1,0), +(48974,1,0), +(48975,1,0), +(49022,1,0), +(49030,1,0), +(49058,1,0), +(49062,1,0), +(49075,1,0), +(49080,1,0), +(49083,1,0), +(49118,1,0), +(49125,1,0), +(49128,1,0), +(49129,1,0), +(49131,1,0), +(49134,1,0), +(49135,1,0), +(49159,1,0), +(49166,1,0), +(49210,1,0), +(49211,1,0), +(49262,1,0), +(49291,1,0), +(49292,1,0), +(49313,1,0), +(49319,1,0), +(49325,1,0), +(49330,1,0), +(49332,1,0), +(49333,1,0), +(49334,1,0), +(49367,1,0), +(49370,1,0), +(49404,1,0), +(49405,1,0), +(49428,1,0), +(49434,1,0), +(49515,1,0), +(49517,1,0), +(49519,1,0), +(49524,1,0), +(49525,1,0), +(49552,1,0), +(49554,1,0), +(49555,1,0), +(49557,1,0), +(49590,1,0), +(49625,1,0), +(49634,1,0), +(49679,1,0), +(49682,1,0), +(49683,1,0), +(49684,1,0), +(49731,1,0), +(49751,1,0), +(49762,1,0), +(49825,1,0), +(49826,1,0), +(49829,1,0), +(49858,1,0), +(49862,1,0), +(49870,1,0), +(49899,1,0), +(49947,1,0), +(50036,1,0), +(50087,1,0), +(50133,1,0), +(50173,1,0), +(50174,1,0), +(50176,1,0), +(50177,1,0), +(50178,1,0), +(50179,1,0), +(50312,1,0), +(50315,1,1), +(50331,1,0), +(50350,1,0), +(50382,1,0), +(50383,1,0), +(50398,1,1), +(50430,1,0), +(50440,1,0), +(50492,1,0), +(50515,1,0), +(50524,1,0), +(50546,1,0), +(50547,1,0), +(50548,1,0), +(50554,1,0), +(50556,1,0), +(50562,1,0), +(50563,1,0), +(50568,1,0), +(50569,1,0), +(50592,1,0), +(50628,1,0), +(50669,1,0), +(50674,1,0), +(50682,1,1), +(50742,1,0), +(50775,1,0), +(50793,1,0), +(50794,1,0), +(50817,1,0), +(50835,1,0), +(50878,1,0), +(50883,1,1), +(50892,1,0), +(51001,1,0), +(51022,1,0), +(51023,1,0), +(51024,1,0), +(51025,1,0), +(51039,1,0), +(51049,1,0), +(51122,1,0), +(51136,1,0), +(51139,1,0), +(51152,1,0), +(51171,1,0), +(51172,1,0), +(51202,1,0), +(51213,1,0), +(51215,1,0), +(51234,1,0), +(51239,1,0), +(51247,1,0), +(51256,1,0), +(51276,1,0), +(51288,1,0), +(51318,1,0), +(51331,1,0), +(51332,1,0), +(51333,1,0), +(51343,1,0), +(51366,1,0), +(51368,1,0), +(51381,1,0), +(51384,1,0), +(51393,1,0), +(51396,1,0), +(51403,1,0), +(51420,1,0), +(51448,1,1), +(51516,1,0), +(51518,1,0), +(51577,1,0), +(51579,1,0), +(51590,1,0), +(51603,1,0), +(51606,1,0), +(51607,1,0), +(51616,1,0), +(51639,1,0), +(51641,1,0), +(51642,1,0), +(51643,1,0), +(51644,1,0), +(51645,1,0), +(51649,1,0), +(51650,1,0), +(51651,1,0), +(51652,1,0), +(51670,1,0), +(51694,1,0), +(51697,1,0), +(51727,1,0), +(51737,1,0), +(51739,1,0), +(51743,1,0), +(51754,1,0), +(51767,1,0), +(51769,1,0), +(51773,1,0), +(51774,1,0), +(51791,1,0), +(51794,1,0), +(51825,1,0), +(51840,1,0), +(51843,1,0), +(51858,1,0), +(51859,1,0), +(51861,1,0), +(51866,1,0), +(51870,1,0), +(51902,1,0), +(51904,1,0), +(51907,1,0), +(51910,1,0), +(51925,1,0), +(51927,1,0), +(51931,1,0), +(51932,1,0), +(51933,1,0), +(51942,1,0), +(51959,1,0), +(51964,1,0), +(51965,1,0), +(52011,1,0), +(52037,1,0), +(52059,1,0), +(52064,1,0), +(52089,1,0), +(52106,1,0), +(52122,1,0), +(52124,1,0), +(52140,1,0), +(52151,1,0), +(52164,1,0), +(52170,1,0), +(52173,1,0), +(52185,1,0), +(52227,1,0), +(52229,1,0), +(52238,1,0), +(52239,1,0), +(52242,1,0), +(52247,1,0), +(52254,1,0), +(52257,1,0), +(52259,1,0), +(52264,1,0), +(52294,1,0), +(52313,1,0), +(52322,1,0), +(52335,1,0), +(52336,1,0), +(52337,1,1), +(52340,1,0), +(52343,1,0), +(52349,1,0), +(52365,1,1), +(52369,1,0), +(52371,1,0), +(52381,1,0), +(52387,1,0), +(52388,1,0), +(52407,1,0), +(52412,1,0), +(52414,1,0), +(52427,1,0), +(52438,1,0), +(52446,1,0), +(52449,1,0), +(52452,1,0), +(52453,1,0), +(52454,1,0), +(52457,1,0), +(52458,1,0), +(52512,1,0), +(52514,1,0), +(52528,1,0), +(52576,1,0), +(52577,1,0), +(52585,1,0), +(52607,1,0), +(52632,1,0), +(52638,1,0), +(52654,1,0), +(52661,1,0), +(52676,1,0), +(52681,1,0), +(52686,1,0), +(52687,1,0), +(52688,1,0), +(52725,1,0), +(52726,1,0), +(52727,1,0), +(52728,1,0), +(52729,1,0), +(52730,1,0), +(52731,1,0), +(52732,1,0), +(52774,1,0), +(52791,1,0), +(52793,1,0), +(52805,1,0), +(52811,1,0), +(52816,1,0), +(52833,1,0), +(52834,1,0), +(52837,1,0), +(52838,1,0), +(52844,1,0), +(52850,1,0), +(52884,1,0), +(52908,1,0), +(52920,1,0), +(52930,1,0), +(52934,1,0), +(52935,1,0), +(52936,1,0), +(52937,1,0), +(52953,1,0), +(52955,1,0), +(52956,1,0), +(52981,1,0), +(52989,1,0), +(52990,1,0), +(53010,1,0), +(53020,1,0), +(53024,1,0), +(53029,1,0), +(53038,1,0), +(53083,1,0), +(53093,1,0), +(53096,1,0), +(53106,1,0), +(53110,1,0), +(53163,1,0), +(53170,1,0), +(53177,1,0), +(53185,1,0), +(53206,1,0), +(53210,1,0), +(53242,1,1), +(53272,1,0), +(53441,1,0), +(53464,1,0), +(53465,1,0), +(53466,1,0), +(53570,1,0), +(53609,1,0), +(53613,1,0), +(53626,1,0), +(53644,1,0), +(53680,1,0), +(53683,1,0), +(53684,1,0), +(53685,1,0), +(53701,1,0), +(53714,1,1), +(53717,1,0), +(53730,1,0), +(53745,1,0), +(53757,1,1), +(53778,1,0), +(53798,1,0), +(53826,1,0), +(53827,1,0), +(53828,1,0), +(53829,1,0), +(54040,1,0), +(54047,1,0), +(54089,1,0), +(54090,1,0), +(54097,1,0), +(54108,1,0), +(54112,1,0), +(54128,1,0), +(54142,1,0), +(54209,1,0), +(54236,1,0), +(54245,1,0), +(54250,1,0), +(54258,1,0), +(54264,1,0), +(54265,1,0), +(54266,1,0), +(54267,1,0), +(54269,1,0), +(54323,1,0), +(54325,1,0), +(54327,1,0), +(54328,1,0), +(54377,1,0), +(54423,1,0), +(54426,1,0), +(54430,1,0), +(54464,1,0), +(54510,1,0), +(54522,1,0), +(54539,1,0), +(54548,1,0), +(54643,1,0), +(54656,1,0), +(54664,1,0), +(54685,1,0), +(54699,1,1), +(54725,1,1), +(54728,1,0), +(54744,1,1), +(54746,1,1), +(54773,1,0), +(54796,1,0), +(54798,1,0), +(54806,1,0), +(54878,1,0), +(54899,1,0), +(54984,1,0), +(54985,1,0), +(54988,1,0), +(54991,1,0), +(55063,1,0), +(55089,1,0), +(55127,1,0), +(55134,1,0), +(55137,1,0), +(55138,1,0), +(55141,1,0), +(55145,1,0), +(55161,1,0), +(55223,1,0), +(55227,1,0), +(55229,1,0), +(55231,1,0), +(55244,1,0), +(55257,1,0), +(55287,1,0), +(55288,1,0), +(55290,1,0), +(55406,1,0), +(55418,1,0), +(55419,1,0), +(55423,1,1), +(55432,1,0), +(55465,1,0), +(55468,1,0), +(55510,1,0), +(55516,1,0), +(55519,1,0), +(55524,1,0), +(55526,1,0), +(55527,1,0), +(55571,1,0), +(55578,1,0), +(55616,1,1), +(55647,1,0), +(55660,1,0), +(55661,1,0), +(55662,1,0), +(55693,1,0), +(55720,1,0), +(55721,1,0), +(55722,1,0), +(55723,1,0), +(55724,1,0), +(55725,1,0), +(55726,1,0), +(55727,1,0), +(55785,1,0), +(55796,1,0), +(55801,1,0), +(55803,1,0), +(55805,1,0), +(55811,1,0), +(55844,1,0), +(55853,1,0), +(55868,1,0), +(55872,1,0), +(55875,1,0), +(55878,1,1), +(55881,1,1), +(55882,1,0), +(55885,1,1), +(55886,1,0), +(55887,1,1), +(55888,1,0), +(55954,1,0), +(56047,1,0), +(56066,1,0), +(56099,1,0), +(56103,1,0), +(56114,1,0), +(56117,1,0), +(56150,1,0), +(56152,1,0), +(56189,1,0), +(56227,1,0), +(56253,1,0), +(56263,1,0), +(56264,1,0), +(56265,1,0), +(56266,1,0), +(56275,1,0), +(56312,1,0), +(56387,1,0), +(56388,1,0), +(56393,1,0), +(56429,1,0), +(56458,1,0), +(56505,1,0), +(56523,1,0), +(56560,1,0), +(56563,1,0), +(56567,1,0), +(56575,1,0), +(56621,1,0), +(56622,1,0), +(56652,1,0), +(56661,1,0), +(56663,1,0), +(56665,1,0), +(56667,1,0), +(56669,1,0), +(56673,1,0), +(56677,1,0), +(56680,1,0), +(56683,1,0), +(56688,1,0), +(56691,1,0), +(56693,1,0), +(56695,1,0), +(56696,1,0), +(56711,1,0), +(56713,1,0), +(56722,1,0), +(56723,1,0), +(56724,1,0), +(56725,1,0), +(56738,1,0), +(56763,1,0), +(56764,1,0), +(56865,1,0), +(56905,1,0), +(56917,1,0), +(56941,1,1), +(57042,1,0), +(57068,1,0), +(57071,1,0), +(57072,1,0), +(57410,1,0), +(57417,1,0), +(57420,1,0), +(57422,1,0), +(57469,1,0), +(57471,1,0), +(57495,1,0), +(57523,1,0), +(57534,1,0), +(57632,1,0), +(57637,1,0), +(57638,1,0), +(57639,1,0), +(57642,1,0), +(57650,1,0), +(57659,1,0), +(57666,1,0), +(57667,1,0), +(57682,1,0), +(57732,1,0), +(57734,1,0), +(57735,1,0), +(57736,1,0), +(57737,1,0), +(57738,1,0), +(57797,1,0), +(57806,1,0), +(57809,1,0), +(57828,1,0), +(57852,1,0), +(57853,1,0), +(57885,1,0), +(57891,1,0), +(57912,1,0), +(57930,1,0), +(57962,1,0), +(57963,1,0), +(57980,1,0), +(57983,1,0), +(58036,1,0), +(58040,1,0), +(58064,1,0), +(58084,1,0), +(58103,1,0), +(58108,1,0), +(58109,1,0), +(58112,1,0), +(58114,1,0), +(58121,1,0), +(58123,1,0), +(58124,1,0), +(58131,1,0), +(58152,1,0), +(58178,1,0), +(58195,1,1), +(58196,1,1), +(58197,1,1), +(58198,1,1), +(58225,1,0), +(58350,1,0), +(58416,1,0), +(58493,1,1), +(58515,1,0), +(58533,1,0), +(58542,1,0), +(58552,1,0), +(58593,1,0), +(58641,1,0), +(58658,1,0), +(58672,1,0), +(58685,1,0), +(58793,1,0), +(58836,1,0), +(58838,1,0), +(58846,1,1), +(58858,1,0), +(58873,1,0), +(58916,1,0), +(58917,1,0), +(58945,1,0), +(58949,1,0), +(59078,1,0), +(59091,1,0), +(59098,1,0), +(59115,1,0), +(59125,1,0), +(59189,1,0), +(59190,1,0), +(59284,1,0), +(59335,1,0), +(59363,1,0), +(59375,1,0), +(59383,1,0), +(59386,1,0), +(59396,1,0), +(59449,1,0), +(59456,1,0), +(59461,1,1), +(59528,1,0), +(59534,1,0), +(59552,1,0), +(59554,1,0), +(59556,1,1), +(59579,1,0), +(59595,1,0), +(59643,1,0), +(59655,1,0), +(59668,1,0), +(59677,1,0), +(59678,1,0), +(59704,1,0), +(59729,1,0), +(59730,1,0), +(59764,1,0), +(59780,1,0), +(59781,1,0), +(59807,1,0), +(59847,1,0), +(59867,1,0), +(59871,1,0), +(59897,1,0), +(59925,1,0), +(59930,1,0), +(59951,1,0), +(59952,1,0), +(59977,1,0), +(60038,1,0), +(60045,1,0), +(60046,1,0), +(60088,1,0), +(60104,1,0), +(60178,1,1), +(60207,1,0), +(60208,1,0), +(60224,1,0), +(60243,1,0), +(60256,1,0), +(60285,1,0), +(60288,1,0), +(60291,1,1), +(60292,1,1), +(60293,1,1), +(60294,1,1), +(60295,1,1), +(60296,1,1), +(60297,1,1), +(60298,1,0), +(60310,1,0), +(60315,1,0), +(60316,1,0), +(60342,1,0), +(60422,1,0), +(60456,1,0), +(60476,1,1), +(60496,1,0), +(60499,1,1), +(60507,1,1), +(60508,1,1), +(60511,1,0), +(60516,1,0), +(60522,1,1), +(60528,1,0), +(60535,1,0), +(60536,1,0), +(60561,1,0), +(60612,1,0), +(60614,1,0), +(60713,1,0), +(60810,1,0), +(60829,1,0), +(60831,1,0), +(60834,1,0), +(60836,1,0), +(60863,1,0), +(60909,1,0), +(60912,1,1), +(60967,1,0), +(61007,1,0), +(61026,1,0), +(61028,1,0), +(61071,1,0), +(61072,1,0), +(61073,1,0), +(61074,1,0), +(61075,1,0), +(61114,1,0), +(61121,1,0), +(61151,1,0), +(61152,1,0), +(61180,1,0), +(61210,1,0), +(61219,1,0), +(61245,1,0), +(61254,1,0), +(61353,1,0), +(61355,1,0), +(61397,1,0), +(61408,1,0), +(61416,1,0), +(61487,1,0), +(61488,1,0), +(61492,1,0), +(61524,1,0), +(61537,1,0), +(61588,1,0), +(61602,1,0), +(61647,1,0), +(61652,1,0), +(61665,1,0), +(61710,1,0), +(61738,1,0), +(61764,1,0), +(61765,1,0), +(61766,1,0), +(61771,1,0), +(61816,1,1), +(61863,1,1), +(61901,1,0), +(61934,1,0), +(61942,1,0), +(61964,1,0), +(61975,1,0), +(62002,1,0), +(62016,1,0), +(62034,1,0), +(62037,1,1), +(62072,1,0), +(62082,1,0), +(62083,1,0), +(62084,1,0), +(62091,1,0), +(62102,1,0), +(62195,1,0), +(62223,1,0), +(62266,1,0), +(62272,1,0), +(62278,1,0), +(62284,1,0), +(62304,1,0), +(62323,1,0), +(62343,1,0), +(47129,2,0), +(34395,2,0), +(34387,2,0), +(32440,2,0), +(32439,2,0), +(32205,2,0), +(31538,2,0), +(30740,2,0), +(29831,2,0), +(28806,2,0), +(28353,2,0), +(27517,2,0), +(27203,2,0), +(27202,2,0), +(27201,2,0), +(27191,2,0), +(27190,2,0), +(27184,2,0), +(26560,2,0), +(26063,2,0), +(25005,2,0), +(24934,2,0), +(24871,2,0), +(24721,2,0), +(24390,2,0), +(23208,2,0), +(21127,2,0), +(18431,2,0), +(17731,2,0), +(17016,2,0), +(16613,2,0), +(16447,2,0), +(13489,2,0), +(12139,2,0), +(11792,2,0), +(9224,2,0), +(9223,2,0), +(9222,2,0), +(9221,2,0), +(8674,2,0), +(7729,2,0), +(7728,2,0), +(3921,2,0), +(35683,2,0), +(36066,2,0), +(36546,2,0), +(36851,2,0), +(37754,2,0), +(38439,2,0), +(38782,2,0), +(39050,2,0), +(40055,2,0), +(40165,2,0), +(40166,2,0), +(40167,2,0), +(40328,2,0), +(40447,2,0), +(40468,2,0), +(40632,2,0), +(40640,2,0), +(40642,2,0), +(40644,2,0), +(40675,2,0), +(40774,2,0), +(40785,2,0), +(40964,2,0), +(40965,2,0), +(40968,2,0), +(40970,2,0), +(41004,2,0), +(41145,2,0), +(41146,2,0), +(42020,2,0), +(42022,2,0), +(42323,2,0), +(42788,2,0), +(43418,2,0), +(43552,2,0), +(43723,2,0), +(43753,2,0), +(43768,2,0), +(43950,2,0), +(44307,2,0), +(44498,2,0), +(44499,2,0), +(44611,2,0), +(44686,2,0), +(44874,2,0), +(44885,2,0), +(45149,2,0), +(45222,2,0), +(45226,2,0), +(45795,2,0), +(45877,2,0), +(45971,2,0), +(46072,2,0), +(46350,2,0), +(46360,2,1), +(46584,2,0), +(76006,2,0), +(74179,2,0), +(72869,2,0), +(72868,2,0), +(72608,2,0), +(72456,2,0), +(72405,2,0), +(72340,2,1), +(71284,2,1), +(70598,2,1), +(70446,2,1), +(70346,2,0), +(70227,2,0), +(70199,2,0), +(70175,2,0), +(70173,2,0), +(69402,2,0), +(69400,2,0), +(69294,2,0), +(69157,2,0), +(67815,2,0), +(67814,2,0), +(67813,2,0), +(67812,2,0), +(67798,2,0), +(67459,2,0), +(67458,2,0), +(67448,2,0), +(67439,2,0), +(67436,2,0), +(66676,2,0), +(66672,2,0), +(66655,2,0), +(66531,2,0), +(66289,2,0), +(65209,2,0), +(64871,2,0), +(64570,2,0), +(64436,2,0), +(63618,2,0), +(63381,2,0), +(62776,2,0), +(62714,2,0), +(62635,2,0), +(62397,2,0), +(62363,2,0), +(62357,2,0), +(62355,2,0), +(62307,2,0), +(62086,2,0), +(61999,2,1), +(60289,2,0), +(60101,2,0), +(59790,2,0), +(59732,2,0), +(59576,2,0), +(58596,2,0), +(58231,2,0), +(57945,2,0), +(57619,2,0), +(57610,2,0), +(57607,2,0), +(57583,2,0), +(57575,2,0), +(57544,2,0), +(57517,2,0), +(57415,2,0), +(56790,2,0), +(56570,2,0), +(56385,2,0), +(56350,2,0), +(55934,2,0), +(55820,2,0), +(55367,2,0), +(55197,2,0), +(54712,2,0), +(54666,2,0), +(54530,2,0), +(52510,2,0), +(52408,2,0), +(52339,2,0), +(52277,2,0), +(52274,2,0), +(52115,2,0), +(51383,2,0), +(51328,2,0), +(51327,2,0), +(51326,2,0), +(51325,2,0), +(51241,2,0), +(50999,2,0), +(50319,2,0), +(50026,2,0), +(50003,2,0), +(49867,2,0), +(49860,2,0), +(49765,2,0), +(49728,2,0), +(49693,2,0), +(49689,2,0), +(49158,2,0), +(49123,2,0), +(49109,2,0), +(48794,2,0), +(48738,2,0), +(48347,2,0), +(47978,2,0), +(35246,2,0), +(42576,3,0), +(42492,3,0), +(42475,3,0), +(42433,3,0), +(42350,3,0), +(42348,3,0), +(42242,3,1), +(42228,3,0), +(42220,3,0), +(42114,3,0), +(41221,3,0), +(40961,3,0), +(40960,3,0), +(40959,3,0), +(40957,3,0), +(40885,3,0), +(40603,3,0), +(40495,3,0), +(40401,3,0), +(40380,3,0), +(40341,3,0), +(40307,3,0), +(40286,3,0), +(40285,3,0), +(40284,3,0), +(40283,3,0), +(40268,3,0), +(40247,3,0), +(40246,3,0), +(40245,3,0), +(40244,3,0), +(40240,3,0), +(40222,3,0), +(40179,3,0), +(40178,3,0), +(40177,3,0), +(40176,3,0), +(40105,3,0), +(40076,3,0), +(39932,3,0), +(39887,3,0), +(39844,3,0), +(39832,3,1), +(39831,3,0), +(39558,3,0), +(39401,3,0), +(39399,3,0), +(39398,3,0), +(39393,3,0), +(39384,3,0), +(39364,3,0), +(38866,3,0), +(38680,3,0), +(38173,3,0), +(38046,3,0), +(38044,3,0), +(37970,3,0), +(37954,3,0), +(37942,3,0), +(37919,3,0), +(37913,3,0), +(37793,3,1), +(37789,3,0), +(37750,3,1), +(37504,3,0), +(37489,3,0), +(37473,3,1), +(37366,3,0), +(37134,3,0), +(36821,3,0), +(36811,3,0), +(36450,3,0), +(36449,3,1), +(36325,3,0), +(35958,3,0), +(35776,3,0), +(35734,3,0), +(35599,3,0), +(35596,3,0), +(34303,3,0), +(34200,3,0), +(34186,3,0), +(42578,3,0), +(33814,3,0), +(33783,3,0), +(33670,3,0), +(33664,3,0), +(33365,3,0), +(33240,3,0), +(33111,3,0), +(32785,3,0), +(32314,3,0), +(32307,3,0), +(32241,3,0), +(32148,3,0), +(32067,3,0), +(31927,3,0), +(31543,3,0), +(31364,3,0), +(31363,3,0), +(31333,3,0), +(30758,3,0), +(30741,3,0), +(30284,3,0), +(29945,3,0), +(29866,3,0), +(29820,3,1), +(29460,3,0), +(28373,3,0), +(28250,3,0), +(28054,3,0), +(26521,3,0), +(26519,3,0), +(26518,3,0), +(26517,3,0), +(26516,3,0), +(26490,3,0), +(26488,3,0), +(26393,3,1), +(26373,3,0), +(26338,3,0), +(26337,3,0), +(26336,3,0), +(26335,3,0), +(26334,3,0), +(26333,3,0), +(26329,3,0), +(26328,3,0), +(26327,3,0), +(26326,3,0), +(26325,3,0), +(26304,3,0), +(26295,3,0), +(26294,3,0), +(26293,3,0), +(26292,3,0), +(26291,3,0), +(26286,3,0), +(25687,3,0), +(25183,3,0), +(25181,3,0), +(25180,3,0), +(25178,3,0), +(25177,3,0), +(24973,3,0), +(24731,3,0), +(23024,3,0), +(21086,3,0), +(21014,3,0), +(20038,3,0), +(20037,3,0), +(19873,3,0), +(17179,3,0), +(16629,3,0), +(16452,3,0), +(16337,3,0), +(15998,3,0), +(13488,3,0), +(12151,3,0), +(10860,3,0), +(10836,3,0), +(10835,3,0), +(10834,3,0), +(10805,3,0), +(9257,3,0), +(9232,3,0), +(42868,3,0), +(43233,3,0), +(43539,3,0), +(43664,3,0), +(43898,3,0), +(43954,3,0), +(43963,3,0), +(43986,3,0), +(44013,3,0), +(44132,3,0), +(44213,3,0), +(44249,3,0), +(44320,3,0), +(44321,3,0), +(44375,3,0), +(44465,3,0), +(44554,3,0), +(44565,3,0), +(44603,3,0), +(44678,3,0), +(44844,3,0), +(44884,3,0), +(45030,3,0), +(45050,3,1), +(45201,3,0), +(45203,3,0), +(45404,3,0), +(45502,3,0), +(45585,3,0), +(45633,3,0), +(45635,3,0), +(45653,3,0), +(45839,3,0), +(45885,3,1), +(46417,3,0), +(46574,3,0), +(46638,3,1), +(46852,3,0), +(46896,3,0), +(47030,3,1), +(47328,3,0), +(47510,3,0), +(47628,3,0), +(47745,3,0), +(47775,3,1), +(47800,3,0), +(48198,3,0), +(48212,3,0), +(48331,3,0), +(48431,3,0), +(48882,3,0), +(48972,3,0), +(49197,3,0), +(49300,3,0), +(49308,3,0), +(49453,3,0), +(49735,3,0), +(50313,3,1), +(50348,3,0), +(50443,3,0), +(50501,3,0), +(50626,3,0), +(50639,3,0), +(50640,3,0), +(50716,3,0), +(50790,3,0), +(50791,3,0), +(50802,3,0), +(50803,3,0), +(50825,3,0), +(50826,3,0), +(51212,3,0), +(51246,3,0), +(51395,3,0), +(51511,3,0), +(51742,3,0), +(51748,3,0), +(51805,3,0), +(51846,3,0), +(52067,3,1), +(52271,3,0), +(52305,3,0), +(52479,3,0), +(52480,3,0), +(52497,3,0), +(52603,3,0), +(52683,3,0), +(52685,3,0), +(52812,3,0), +(53677,3,0), +(53679,3,0), +(53694,3,0), +(53705,3,0), +(53706,3,0), +(54272,3,0), +(54517,3,0), +(54914,3,0), +(54961,3,0), +(54990,3,0), +(55037,3,0), +(55083,3,0), +(55365,3,0), +(55479,3,0), +(55715,3,0), +(55800,3,0), +(55889,3,1), +(56095,3,0), +(56140,3,0), +(56386,3,0), +(56389,3,0), +(56578,3,0), +(56747,3,0), +(56765,3,0), +(57586,3,0), +(57800,3,0), +(57824,3,0), +(57835,3,0), +(58766,3,0), +(58825,3,0), +(59008,3,0), +(59462,3,0), +(59464,3,0), +(59564,3,0), +(59629,3,0), +(59694,3,0), +(60639,3,0), +(61126,3,0), +(61224,3,0), +(61699,3,0), +(62000,3,0), +(62056,3,0), +(62385,3,0), +(62387,3,0), +(62399,3,0), +(62565,3,0), +(62709,3,0), +(62973,3,0), +(62991,3,0), +(63019,3,0), +(63122,3,1), +(63292,3,0), +(63294,3,0), +(63295,3,0), +(63317,3,0), +(63414,3,0), +(63528,3,0), +(63766,3,0), +(63983,3,0), +(63985,3,0), +(64021,3,0), +(65044,3,0), +(65045,3,0), +(65101,3,0), +(65585,3,0), +(65586,3,0), +(65690,3,0), +(66129,3,0), +(66170,3,0), +(66598,3,0), +(67398,3,0), +(68378,3,0), +(68902,3,0), +(69007,3,0), +(69095,3,0), +(69096,3,0), +(69708,3,0), +(69783,3,0), +(69797,3,0), +(69799,3,0), +(69802,3,0), +(69985,3,0), +(70028,3,0), +(70037,3,0), +(70194,3,0), +(70521,3,0), +(70564,3,0), +(70590,3,0), +(70997,3,0), +(70998,3,0), +(70999,3,0), +(71278,3,1), +(71621,3,0), +(71704,3,0), +(72155,3,1), +(72162,3,1), +(72274,3,1), +(72297,3,1), +(72460,3,1), +(72548,3,1), +(72549,3,1), +(72550,3,1), +(72619,3,1), +(72620,3,1), +(72679,3,0), +(72771,3,0), +(72850,3,0), +(72851,3,0), +(72852,3,0), +(74318,3,0), +(74319,3,0), +(74320,3,0), +(74472,3,0), +(75509,3,0), +(75553,3,1), +(75766,3,1), +(34012,3,0), +(74271,4,0), +(74270,4,0), +(72096,4,1), +(72034,4,1), +(71615,4,0), +(70827,4,0), +(69425,4,0), +(69164,4,0), +(69162,4,0), +(68981,4,0), +(68788,4,1), +(67816,4,0), +(67796,4,0), +(65370,4,0), +(65333,4,0), +(64626,4,0), +(62826,4,0), +(62489,4,0), +(62466,4,0), +(62457,4,0), +(62345,4,0), +(62308,4,0), +(60206,4,0), +(58185,4,0), +(55896,4,0), +(55349,4,0), +(54109,4,0), +(54107,4,0), +(51678,4,0), +(50652,4,0), +(49556,4,0), +(48610,4,0), +(48277,4,0), +(48224,4,0), +(47674,4,0), +(47109,4,0), +(45922,4,0), +(44969,4,0), +(44737,4,0), +(44687,4,0), +(44626,4,0), +(44233,4,0), +(40647,4,0), +(40259,4,0), +(39246,4,0), +(36904,4,0), +(36460,4,0), +(36374,4,0), +(30532,4,0), +(28995,4,0), +(10451,4,0), +(9735,4,0), +(8900,4,0), +(8899,4,0), +(8898,4,0), +(8202,4,0), +(74272,4,0), +(69767,5,0), +(65590,5,0), +(62386,5,0), +(55588,5,0), +(54713,5,0), +(49464,5,0), +(49460,5,0), +(49346,5,0), +(47310,5,1), +(45676,5,0), +(44217,5,0), +(43977,5,0), +(41962,5,0), +(40789,5,0), +(40503,5,0), +(38729,5,0), +(38312,5,0), +(38106,5,0), +(38105,5,0), +(38104,5,0), +(38103,5,0), +(38102,5,0), +(38101,5,0), +(38100,5,0), +(38099,5,0), +(37206,5,0), +(37205,5,0), +(37204,5,0), +(36817,5,0), +(34630,5,0), +(21866,5,0), +(21794,5,0), +(19832,5,0), +(19250,5,0), +(8913,5,0), +(67308,6,0), +(67307,6,0), +(67306,6,0), +(67305,6,0), +(67304,6,0), +(67303,6,0), +(65876,6,0), +(65875,6,0), +(63041,6,0), +(62560,6,0), +(59099,6,1), +(44608,6,0), +(43702,6,0), +(43080,6,0), +(43056,6,0), +(40902,6,0), +(40657,6,0), +(28803,6,1), +(16054,6,0), +(8712,6,0), +(75863,7,1), +(75448,7,1), +(74412,7,1), +(74323,7,0), +(74322,7,0), +(74321,7,0), +(73028,7,0), +(72622,7,1), +(72621,7,1), +(72459,7,1), +(72273,7,0), +(72272,7,0), +(71618,7,0), +(71614,7,0), +(71279,7,1), +(70982,7,0), +(70981,7,0), +(70952,7,0), +(69540,7,0), +(67751,7,0), +(66905,7,0), +(66667,7,0), +(65126,7,0), +(64218,7,0), +(63059,7,0), +(62942,7,0), +(62705,7,0), +(61920,7,0), +(61715,7,0), +(61714,7,0), +(61632,7,0), +(60532,7,0), +(60430,7,0), +(59474,7,0), +(59465,7,0), +(57409,7,0), +(57405,7,0), +(57056,7,1), +(56694,7,0), +(56454,7,0), +(54160,7,0), +(53605,7,0), +(52319,7,0), +(51719,7,0), +(50747,7,0), +(50646,7,0), +(50645,7,0), +(50627,7,0), +(50218,7,0), +(49889,7,0), +(48742,7,0), +(48552,7,0), +(46158,7,0), +(42287,7,0), +(42265,7,1), +(42079,7,0), +(42004,7,1), +(41284,7,0), +(41113,7,0), +(41112,7,0), +(41111,7,0), +(41110,7,0), +(41071,7,0), +(41064,7,1), +(40931,7,0), +(40929,7,0), +(40905,7,0), +(40900,7,0), +(40851,7,0), +(40370,7,0), +(40172,7,0), +(40171,7,0), +(40170,7,0), +(40169,7,0), +(40075,7,1), +(39698,7,0), +(39686,7,0), +(39218,7,0), +(38920,7,0), +(38774,7,0), +(38484,7,0), +(38449,7,0), +(38371,7,0), +(37076,7,0), +(35957,7,1), +(35754,7,0), +(35289,7,0), +(34350,7,0), +(34187,7,0), +(31625,7,0), +(31624,7,0), +(31617,7,0), +(30939,7,1), +(30659,7,0), +(30657,7,0), +(30531,7,0), +(30098,7,0), +(28681,7,1), +(25790,7,0), +(25029,7,0), +(23015,7,0), +(22710,7,0), +(20553,7,0), +(10732,7,0), +(10348,7,0), +(7082,7,0), +(5628,7,0), +(804,7,0), +(802,7,0), +(54069,1,0), +(56251,1,0), +(58630,1,0); + +-- remove redundant entries +DELETE FROM `conditions` WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 1 AND `ConditionValue2` = 0 AND `SourceEntry` IN (SELECT `id` FROM `temp_convert_spells` WHERE onlyPlayers); + +-- set source group if available in db +UPDATE `conditions` SET `SourceGroup` = `ConditionValue3`, `ConditionValue3` = 0 WHERE `ConditionTypeOrReference` = 18; + +-- set source group in case of old default (not set) source group +UPDATE `conditions` SET `SourceGroup` = (SELECT `effMask` FROM `temp_convert_spells` WHERE `id` = `SourceEntry`) WHERE `SourceGroup` = 0 AND `ConditionTypeOrReference` = 18; + +CREATE TABLE `temp_cond_vals` +( + `sourceGroup` INT(11), + `sourceEntry` INT(11), + `conditionValue1` INT(11), + `conditionValue2` INT(11), + `elseGroup` INT(11) AUTO_INCREMENT, + PRIMARY KEY (`sourceGroup`, `sourceEntry`, `elseGroup`) +) ENGINE=MYISAM; + +INSERT INTO `temp_cond_vals` (`sourceGroup`, `sourceEntry`, `conditionValue1`, `conditionValue2`) SELECT `SourceGroup`, `SourceEntry`, `ConditionValue1`, `ConditionValue2` FROM `conditions` WHERE `ConditionTypeOrReference` = 18; + +-- set correct else group +UPDATE `conditions` SET `ElseGroup` = (SELECT `elseGroup` FROM `temp_cond_vals` WHERE `sourceGroup` = `conditions`.`SourceGroup` AND `sourceEntry` = `conditions`.`SourceEntry` AND `conditionValue1` = `conditions`.`ConditionValue1` AND `conditionValue2` = `conditions`.`ConditionValue2`)-1 WHERE `ConditionTypeOrReference` = 18; + +-- old condition type 3 (caster's minion) +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`) +SELECT `SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, 33, 0, 1, 3 FROM `conditions` WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 3; + +UPDATE `conditions` SET `ConditionTypeOrReference` = 31 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 3; + +-- old condition type 2 (dead creature) +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `NegativeCondition`) +SELECT `SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, 36, 0, 0, 0, 1 FROM `conditions` WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 2; + +UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 3 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 2; + +-- old condition type 1 (creature) +UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 3 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 1 AND `ConditionValue2`; + +-- old condition type 1 (player) +UPDATE `conditions` SET `ConditionTypeOrReference` = 32, `ConditionValue1` = 0x90 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 1 AND NOT `ConditionValue2`; + +-- old condition type 0 (gameobject) +UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 5 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 0; + +DROP TABLE `temp_convert_spells`; +DROP TABLE `temp_cond_vals`; diff --git a/sql/old/3.3.5a/2012_02_21_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..6c6af7ed2a3 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_21_02_world_creature_loot_template.sql @@ -0,0 +1,11 @@ +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (38032,37917,38016,38023,37214,38030,38006,37984); +DELETE FROM `creature_loot_template` WHERE `entry`IN (38032,37917,38016,38023,37214,38030,38006,37984); +INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(38032,1,100,1,0,-45009,1), -- Crown Sprayer +(37917,1,100,1,0,-45009,1), -- Crown Thug +(38016,1,100,1,0,-45009,1), -- Crown Agent +(38023,1,100,1,0,-45009,1), -- Crown Sprinkler +(37214,1,100,1,0,-45009,1), -- Crown Lackey +(38030,1,100,1,0,-45009,1), -- Crown Underling +(38006,1,100,1,0,-45009,1), -- Crown Hoodlum (level 1??) +(37984,1,100,1,0,-45009,1); -- Crown Duster (level 1??) diff --git a/sql/old/3.3.5a/2012_02_21_03_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_03_world_creature_loot_template.sql new file mode 100644 index 00000000000..d7d043cbda9 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_21_03_world_creature_loot_template.sql @@ -0,0 +1,26 @@ +-- Razormane Hunter Warrior's Boots 32% to 3.2% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=3.2996 WHERE `entry`=3265 AND `item`=2967; +-- Razormane Hunter Hunting Cloak 11% to 1.1% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=1.1855 WHERE `entry`=3265 AND `item`=4689; +-- Razormane Defender Pioneer Buckler 87% to 0.8% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.8789 WHERE `entry`=3266 AND `item`=7109; +-- Razormane Defender Spellbinder Belt 77% to 0.7% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7717 WHERE `entry`=3266 AND `item`=4684; +-- Razormane Geomancer Simple Shoes 77% to 0.7% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7791 WHERE `entry`=3269 AND `item`=9743; +-- Razormane Geomancer Veteran Bracers 73% to 0.7% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7364 WHERE `entry`=3269 AND `item`=3213; +-- Venture Co. Supervisor Burnt Leather Belt 85% to 0.8% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.8511 WHERE `entry`=2979 AND `item`=4666; +-- Venture Co. Supervisor Warrior's Gloves 74% to 0.7% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7433 WHERE `entry`=2979 AND `item`=2968; +-- Venture Co. Supervisor Pioneer Bracers 55% to 0.5% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.5593 WHERE `entry`=2979 AND `item`=6519; +-- Venture Co. Supervisor Journeyman's Gloves 43% to 0.4% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.4348 WHERE `entry`=2979 AND `item`=2960; +-- Venture Co. Worker Warrior's Bracers 72% to 0.7% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7226 WHERE `entry`=2978 AND `item`=3214; +-- Venture Co. Worker Fine Scimitar 64% to 0.6% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.6492 WHERE `entry`=2978 AND `item`=4560; +-- Venture Co. Worker Warrior's Girdle 24% to 0.2% +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.2458 WHERE `entry`=2978 AND `item`=4659; diff --git a/sql/old/3.3.5a/2012_02_21_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_04_world_creature_loot_template.sql new file mode 100644 index 00000000000..3deedbf0b0d --- /dev/null +++ b/sql/old/3.3.5a/2012_02_21_04_world_creature_loot_template.sql @@ -0,0 +1,16 @@ +SET @ENTRY := 30409; -- Apprentice Osterkilgr +DELETE FROM `creature_loot_template` WHERE entry=@ENTRY; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Quest related Items +(@ENTRY,43089,-100,1,0,1,1), -- Vrykul Bones +(@ENTRY,42772,-100,1,0,1,1), -- Dr Terrible's "Building a Better Flesh Giant" +(@ENTRY,42422,-50,1,0,1,1), -- Jotunheim Cage Key +-- Other random stuff +(@ENTRY,33470,20,1,0,1,4), -- Frostweave Cloth +(@ENTRY,43851,20,1,0,1,1), -- Fur Clothing Scraps +(@ENTRY,43852,20,1,0,1,1), -- Thick Fur Clothing Scraps +-- References for world drops +(@ENTRY,1,10,1,0,-35063,1), -- Northrend Grey Items +(@ENTRY,2,5,1,0,-35066,1), -- Northrend Green Items +-- hatebook +(@ENTRY,45912,0.1,1,0,1,1); -- Book Glyph of Mastery (honestly screw that thing) diff --git a/sql/old/3.3.5a/2012_02_21_05_world_gossip.sql b/sql/old/3.3.5a/2012_02_21_05_world_gossip.sql new file mode 100644 index 00000000000..1bdccae5c39 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_21_05_world_gossip.sql @@ -0,0 +1,39 @@ +-- SAI for Lothos Riftwaker +SET @ENTRY=14387; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lothos Riftwaker - On Gossip Option select - close gossip'), +(@ENTRY,0,1,0,61,0,100,0,5750,0,0,0,62,409,0,0,0,0,0,7,0,0,0,1096,-467,-104.6,3.64,'Lothos Riftwaker - On Gossip Option select - teleport player'); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (5750); +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 +(5750,0,0,'Teleport me to the Molten Core, Lothos.',1,1,0,0,0,0,''); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (5750); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,5750,0,0,0,8,7848,0,0,0,0,'','Show gossip option if player has quest 7848 completed'); + +-- SAI for Zamael Lunthistle +SET @ENTRY=8436; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,1285,0,0,0,26,3377,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - quest credit'), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - close gossip'); + +DELETE FROM `gossip_menu` WHERE `entry`=1285 AND `text_id`=1920; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1285,1920); +DELETE FROM `gossip_menu` WHERE `entry`=1286 AND `text_id`=1922; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1286,1922); +DELETE FROM `gossip_menu` WHERE `entry`=1287 AND `text_id`=1921; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1287,1921); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1285,1286,1287); +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 +(1285,0,0,'I wish to hear your tale.',1,1,1287,0,0,0,''), +(1286,0,0,'Let me think about it, Zamael.',1,1,1285,0,0,0,''), +(1287,0,0,'Please continue, Zamael.',1,1,1286,0,0,0,''); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (1285); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,1285,0,0,0,9,3377,0,0,0,0,'','Show gossip option if player has quest 3377 but not complete'); diff --git a/sql/old/3.3.5a/2012_02_21_06_world_Gossip.sql b/sql/old/3.3.5a/2012_02_21_06_world_Gossip.sql new file mode 100644 index 00000000000..a59d330c6a3 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_21_06_world_Gossip.sql @@ -0,0 +1,184 @@ +-- Gossip Update from Pitcrawler +-- Creature Gossip_menu_id Update from sniff +UPDATE `creature_template` SET `gossip_menu_id`=7692 WHERE `entry`=18424; +UPDATE `creature_template` SET `gossip_menu_id`=9033 WHERE `entry`=24838; +UPDATE `creature_template` SET `gossip_menu_id`=9038 WHERE `entry`=24833; +UPDATE `creature_template` SET `gossip_menu_id`=9066 WHERE `entry`=25011; +UPDATE `creature_template` SET `gossip_menu_id`=9067 WHERE `entry`=25015; +UPDATE `creature_template` SET `gossip_menu_id`=9068 WHERE `entry`=25009; +UPDATE `creature_template` SET `gossip_menu_id`=9069 WHERE `entry`=25017; +UPDATE `creature_template` SET `gossip_menu_id`=9070 WHERE `entry`=25018; +UPDATE `creature_template` SET `gossip_menu_id`=9071 WHERE `entry`=25016; +UPDATE `creature_template` SET `gossip_menu_id`=9072 WHERE `entry` IN (25013,25014); +UPDATE `creature_template` SET `gossip_menu_id`=9091 WHERE `entry`=25076; +UPDATE `creature_template` SET `gossip_menu_id`=9107 WHERE `entry`=24929; +UPDATE `creature_template` SET `gossip_menu_id`=9109 WHERE `entry`=24927; +UPDATE `creature_template` SET `gossip_menu_id`=9110 WHERE `entry`=24924; +UPDATE `creature_template` SET `gossip_menu_id`=9116 WHERE `entry`=25105; +UPDATE `creature_template` SET `gossip_menu_id`=9117 WHERE `entry`=25100; +UPDATE `creature_template` SET `gossip_menu_id`=9118 WHERE `entry`=25104; +UPDATE `creature_template` SET `gossip_menu_id`=9120 WHERE `entry`=25107; +UPDATE `creature_template` SET `gossip_menu_id`=9121 WHERE `entry` IN (25101,25102,25103); +UPDATE `creature_template` SET `gossip_menu_id`=9122 WHERE `entry`=25106; +UPDATE `creature_template` SET `gossip_menu_id`=9349 WHERE `entry`=26539; +UPDATE `creature_template` SET `gossip_menu_id`=10120 WHERE `entry` IN (31704,31705,31706,31720,31723,31724); +UPDATE `creature_template` SET `gossip_menu_id`=10259 WHERE `entry`=31716; + +-- Gossip Menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=7692 AND `text_id`=9383; +DELETE FROM `gossip_menu` WHERE `entry`=7696 AND `text_id`=9444; +DELETE FROM `gossip_menu` WHERE `entry`=7704 AND `text_id`=9425; +DELETE FROM `gossip_menu` WHERE `entry`=7726 AND `text_id`=9437; +DELETE FROM `gossip_menu` WHERE `entry`=7727 AND `text_id`=9438; +DELETE FROM `gossip_menu` WHERE `entry`=7728 AND `text_id`=9439; +DELETE FROM `gossip_menu` WHERE `entry`=9033 AND `text_id`=12211; +DELETE FROM `gossip_menu` WHERE `entry`=9038 AND `text_id`=12216; +DELETE FROM `gossip_menu` WHERE `entry`=9040 AND `text_id`=12217; +DELETE FROM `gossip_menu` WHERE `entry`=9041 AND `text_id`=12218; +DELETE FROM `gossip_menu` WHERE `entry`=9042 AND `text_id`=12219; +DELETE FROM `gossip_menu` WHERE `entry`=9043 AND `text_id`=12220; +DELETE FROM `gossip_menu` WHERE `entry`=9066 AND `text_id`=12262; +DELETE FROM `gossip_menu` WHERE `entry`=9067 AND `text_id`=12263; +DELETE FROM `gossip_menu` WHERE `entry`=9068 AND `text_id`=12264; +DELETE FROM `gossip_menu` WHERE `entry`=9069 AND `text_id`=12266; +DELETE FROM `gossip_menu` WHERE `entry`=9070 AND `text_id`=12267; +DELETE FROM `gossip_menu` WHERE `entry`=9091 AND `text_id`=12292; +DELETE FROM `gossip_menu` WHERE `entry`=9109 AND `text_id`=12317; +DELETE FROM `gossip_menu` WHERE `entry`=9110 AND `text_id`=12318; +DELETE FROM `gossip_menu` WHERE `entry`=9116 AND `text_id`=12327; +DELETE FROM `gossip_menu` WHERE `entry`=9117 AND `text_id`=12328; +DELETE FROM `gossip_menu` WHERE `entry`=9118 AND `text_id`=12329; +DELETE FROM `gossip_menu` WHERE `entry`=9120 AND `text_id`=12331; +DELETE FROM `gossip_menu` WHERE `entry`=9121 AND `text_id`=12332; +DELETE FROM `gossip_menu` WHERE `entry`=9122 AND `text_id`=12333; +DELETE FROM `gossip_menu` WHERE `entry`=9349 AND `text_id`=12649; +DELETE FROM `gossip_menu` WHERE `entry`=10120 AND `text_id`=14047; +DELETE FROM `gossip_menu` WHERE `entry`=10259 AND `text_id`=14248; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(7692,9383), +(7696,9444), +(7704,9425), +(7726,9437), +(7727,9438), +(7728,9439), +(9033,12211), +(9038,12216), +(9040,12217), +(9041,12218), +(9042,12219), +(9043,12220), +(9066,12262), +(9067,12263), +(9068,12264), +(9069,12266), +(9070,12267), +(9091,12292), +(9109,12317), +(9110,12318), +(9116,12327), +(9117,12328), +(9118,12329), +(9120,12331), +(9121,12332), +(9122,12333), +(9349,12649), +(10120,14047), +(10259,14248); + +-- Insert npc_text from sniff +DELETE FROM `npc_text` WHERE `ID` IN (9437,9438,9439,12211,12266); +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 +(9437,'$B$BZangarmarsh... too close to truth.$B$B$B$BIs he still watching!?','',0,1,1000,1,1000,6,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), +(9438,'What''s that? Zangarmarsh? Why would I want to go there?$B$B$B$BYes, Zangarmarsh... we... the druids there are getting close to figuring out why the water level is dropping. It''s destroying everything!$B$B$B$BDestroyed us all! Bright light! BOOM!!','',0,1,0,6,1000,1,1000,5,'','',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), +(9439,'The Firewing blood elves... for some reason they want to stop us.$B$B$B$BThey... they sent one of the Broken as ... as an emissary.... But he had a bomb!$B$BThey died, they all died! They tried to run away! The lucky ones didn''t even know.$B$BI must have been at the edge of the blast. It was horr...IT''S WATCHING US AGAIN!$B$B','',0,1,0,18,1000,18,1000,5,'','',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), +(12211,'Fine day fer sailin'', innit?','',7,1,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,12340), +(12266,'','I''m almost jealous of our Mr. Wavesinger. Why, he may well be prettier than me!',7,1,0,1,3,11,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); + +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7692,7726,7727) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9038,9040,9041,9042,9043) AND `id` IN (0,1,2); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9038 AND `id`=3; +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 +(7692,0,0,'Treelos, I know that the truth is somewhere inside you. Tell me what it is.',1,1,7726,0,0,0,''), +(7726,0,0,'Keep it together man! What about Zangarmarsh?',1,1,7727,0,0,0,''), +(7727,0,0,'I don''t have time for this! Warden, what happened?!',1,1,7728,0,0,0,''), +(9038,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), +(9038,1,0,'Food & Drink',1,1,9041,0,0,0,''), +(9038,2,0,'Goods & Gear',1,1,9042,0,0,0,''), +(9038,3,0,'"Stash?"',1,1,9043,0,0,0,''), +(9040,0,0,'Food & Drink',1,1,9041,0,0,0,''), +(9040,1,0,'Goods & Gear',1,1,9042,0,0,0,''), +(9040,2,0,'"Stash?',1,1,9043,0,0,0,''), +(9041,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), +(9041,1,0,'Goods & Gear',1,1,9042,0,0,0,''), +(9041,2,0,'"Stash?',1,1,9043,0,0,0,''), +(9042,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), +(9042,1,0,'Food & Drink',1,1,9041,0,0,0,''), +(9042,2,0,'"Stash?',1,1,9043,0,0,0,''), +(9043,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), +(9043,1,0,'Food & Drink',1,1,9041,0,0,0,''), +(9043,2,0,'Goods & Gear',1,1,9042,0,0,0,''); + +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7704 AND `SourceEntry`=9425; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7696 AND `SourceEntry`=9444; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7704,7692); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,7696,9444,0,0,8,10005,0,0,0,0,'','Show different gossip if player has rewarded quest 10005'), +(14,7696,9444,0,1,8,10006,0,0,0,0,'','Show different gossip if player has rewarded quest 10006'), +(14,7704,9425,0,0,8,9978,0,0,0,0,'','Show different gossip if player has rewarded quest 9978'), +(15,7704,0,0,0,9,9978,0,0,0,0,'','Show gossip option if player has quest 9978 but not complete'), +(15,7692,0,0,0,8,10006,0,0,0,0,'','Show gossip option if player has rewarded quest 10006'), +(15,7692,0,0,1,8,10005,0,0,0,0,'','Show gossip option if player has rewarded quest 10005'); + +-- Gossip Update from Malcrom +DELETE FROM `gossip_menu` WHERE `entry` IN (1042,1043,1044,1045,1046,1047,1048,1049,1050,1052,1053); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(1042,1635),(1043,1640),(1044,1644),(1045,1643),(1045,1753), +(1046,1648),(1047,1754),(1048,1650),(1049,1755), +(1050,1651),(1050,1756),(1052,1652),(1053,1653); +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1045,1047,1049,1050); +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 +(1045,0,0,'Acquire Higher Level Access Card',1,1,0,0,0,0,''), +(1047,0,0,'Acquire Higher Level Access Card',1,1,0,0,0,0,''), +(1049,0,0,'Acquire Higher Level Access Card',1,1,0,0,0,0,''), +(1050,0,0,'Acquire high level data card.',1,1,0,0,0,0,''); + +DELETE FROM `gossip_menu` WHERE `entry`=1080 AND `text_id`=1693; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1080,1693); +DELETE FROM `gossip_menu` WHERE `entry`=1100 AND `text_id`=1713; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1100,1713); +DELETE FROM `gossip_menu` WHERE `entry`=1143 AND `text_id`=1759; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1143,1759); +DELETE FROM `gossip_menu` WHERE `entry`=1161 AND `text_id`=1793; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1161,1793); +DELETE FROM `gossip_menu` WHERE `entry`=1162 AND `text_id`=1794; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1162,1794); +DELETE FROM `gossip_menu` WHERE `entry`=1201 AND `text_id`=1833; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1201,1833); +DELETE FROM `gossip_menu` WHERE `entry`=1281 AND `text_id`=1916; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1281,1916); +DELETE FROM `gossip_menu` WHERE `entry`=1282 AND `text_id`=1918; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1282,1918); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1282); +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 +(1282,0,0,'Touch the Suntara stone and call forth Lathoric the Black and his guardian, Obsidion.',1,1,0,0,0,0,''); + +DELETE FROM `gossip_menu` WHERE `entry`=1301 AND `text_id`=1933; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1301,1933); +DELETE FROM `gossip_menu` WHERE `entry`=1301 AND `text_id`=1934; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1301,1934); + +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1301); +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 +(1301,0,0,'I wish to browse your wares.',3,128,0,0,0,0,''); + +DELETE FROM `gossip_menu` WHERE `entry`=1302 AND `text_id`=1935; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1302,1935); +DELETE FROM `gossip_menu` WHERE `entry`=1321 AND `text_id`=1955; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1321,1955); +DELETE FROM `gossip_menu` WHERE `entry`=1322 AND `text_id`=1954; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1322,1954); +DELETE FROM `gossip_menu` WHERE `entry`=1362 AND `text_id`=1994; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1362,1994); diff --git a/sql/old/3.3.5a/2012_02_22_00_world_sai.sql b/sql/old/3.3.5a/2012_02_22_00_world_sai.sql new file mode 100644 index 00000000000..2e392f3a45f --- /dev/null +++ b/sql/old/3.3.5a/2012_02_22_00_world_sai.sql @@ -0,0 +1,39 @@ +-- SAI for Kalaran Windblade +SET @ENTRY=8479; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +-- AI +(@ENTRY,0,0,1,62,0,100,0,1321,0,0,0,26,3441,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - quest credit'), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - close gossip'), +(@ENTRY,0,2,3,62,0,100,0,1323,2,0,0,11,19797,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - cast 19797'), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - close gossip'), +(@ENTRY,0,4,0,62,0,100,0,1323,3,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - run script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - script - close gossip'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - remove npc flags'), +(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,1000,1000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - say 0'), +(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,1000,1000,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - emotestate usestanding'), +(@ENTRY*100,9,4,0,0,0,100,0,60000,60000,60000,60000,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - emotestate none'), +(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,1000,1000,26,3453,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - script - give quest credit'), +(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,1000,1000,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - add npc flags'); +-- npc text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(@ENTRY,0,0,'Please be patient, $N',12,0,100,0,0,0,'Kalaran Windblade'); +-- Gossip options +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1321,1322,1323); +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 +(1321,0,0,'Let me confer with my colleagues.',1,1,0,0,0,0,''), +(1322,0,0,'Continue please.',1,1,1321,0,0,0,''), +(1323,0,0,'Tell me what drives this vengeance?',1,1,1322,0,0,0,''), +(1323,2,0,'Kalaran, I have misplaced my torch. I require another.',1,1,0,0,0,0,''), +(1323,3,0,'Kalaran, please enchant the torch.',1,1,0,0,0,0,''); +-- Gossip option conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (1323); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,1323,0,0,0,9,3441,0,0,0,0,'','Show gossip option if player has quest 3441 but not complete'), +(15,1323,2,0,0,8,3454,0,0,0,0,'','Show gossip option if player has quest 3441 complete'), +(15,1323,2,0,0,2,10515,0,1,0,0,'','Show gossip option if player does not have item 10515'), +(15,1323,3,0,0,9,3453,0,0,0,0,'','Show gossip option if player has quest 3453 but not complete'); diff --git a/sql/old/3.3.5a/2012_02_22_01_world_creature_text.sql b/sql/old/3.3.5a/2012_02_22_01_world_creature_text.sql new file mode 100644 index 00000000000..8b7761e48a0 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_22_01_world_creature_text.sql @@ -0,0 +1,34 @@ +-- Invisible Stalker text for Wintergrasp from sniff +DELETE FROM `creature_text` WHERE `entry`=15214; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(15214,0,0, 'Let the battle begin!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,1,0, 'The Broken Temple siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,2,0, 'The Broken Temple siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,3,0, 'The Broken Temple siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,4,0, 'The Broken Temple siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,5,0, 'The Sunken Ring siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,6,0, 'The Sunken Ring siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,7,0, 'The Sunken Ring siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,8,0, 'The Sunken Ring siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,9,0, 'The Eastspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,10,0, 'The Eastspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,11,0, 'The Eastspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,12,0, 'The Eastspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,13,0, 'The Westspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,14,0, 'The Westspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,15,0, 'The Westspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,16,0, 'The Westspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,17,0, 'The north-western keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,18,0, 'The north-western keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,19,0, 'The south-eastern keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,20,0, 'The south-eastern keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,21,0, 'The western tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,22,0, 'The western tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,23,0, 'The southern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,24,0, 'The southern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,25,0, 'The eastern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,26,0, 'The eastern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,27,0, 'The Horde has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,28,0, 'The Horde has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,29,0, 'The Alliance has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), +(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'); diff --git a/sql/old/3.3.5a/2012_02_22_02_world_misc.sql b/sql/old/3.3.5a/2012_02_22_02_world_misc.sql new file mode 100644 index 00000000000..33bec2a9b78 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_22_02_world_misc.sql @@ -0,0 +1,57 @@ +-- Mounting Hodir's Helm (12987) + +-- cleanup after Discovered +-- clean all related to npc Hodir's Helm KC Bunny +DELETE FROM `smart_scripts` WHERE `entryorguid`=30210 AND `source_type`=0; +DELETE FROM `creature` WHERE `id`=30210; +DELETE FROM `creature_text` WHERE `entry`=30210; + +SET @HELM := 192080; -- Hodir's Helm +SET @TEMP := 300230; -- TEMP Northern Ice Spike +SET @BUNNY_TARGET := 30215; -- Ice Spike Target Bunny +SET @GUID_GO := 270; -- set by TDB +SET @GUID_NPC := 40514; -- set by TDB +SET @SPELL_READ_PRONOUNCEMENT := 56278; +SET @QUEST := 12987; +SET @AREA := 4438; -- Dun Niffelem +SET @SPELL_AREA := 56305; -- See Quest Invisibility 1 (Ice Spike Bunny) +SET @QUEST := 13006; -- Polishing the Helm + +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33554432|256,`InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@BUNNY_TARGET; + +UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=@HELM; +UPDATE `gameobject` SET `phaseMask`=4 WHERE `id`=@TEMP; + +DELETE FROM `gameobject` WHERE `guid`=@GUID_GO; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID_GO,@HELM,571,1,4,7390.143,-2725.382,874.2561,-3.089183,0,0,-0.9996567,0.02620165,600,255,1); + +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID_NPC+0 AND @GUID_NPC+1; +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_NPC+0,@BUNNY_TARGET,571,1,4,0,0,7386.51,-2726.489,872.5089,5.88176,300,0,0,4979,0,0,0,0,0), +(@GUID_NPC+1,@BUNNY_TARGET,571,1,4,0,0,7388.424,-2724.909,869.8643,0.5934119,300,0,0,4979,0,0,0,0,0); + +DELETE FROM `creature_template_addon` WHERE `entry`=@BUNNY_TARGET; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@BUNNY_TARGET,0,0,65536,1,0, '61333 56304 61334'); -- Gigantic Helm Sparkle / Hodir's Helm Bunny: Invisibility / Extra Large Helm Sparkle + +DELETE FROM `spell_script_names` WHERE `spell_id`=@SPELL_READ_PRONOUNCEMENT; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(@SPELL_READ_PRONOUNCEMENT, 'spell_q12987_read_pronouncement'); + +DELETE FROM `spell_area` WHERE `spell`=@SPELL_AREA; +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(@SPELL_AREA,@AREA,@QUEST,1,@QUEST,0,0,2,1); + +-- relation for the daily quest that should be available after finishing Mounting Hodir's Helm + +-- removing flag 4 or else player can't interract with Q giver +UPDATE `gameobject_template` SET `flags`=`flags`&~4 WHERE `entry`=@HELM; + +DELETE FROM `gameobject_questrelation` WHERE `id`=@HELM; +INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES +(@HELM,@QUEST); + +DELETE FROM `gameobject_involvedrelation` WHERE `id`=@HELM; +INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES +(@HELM,@QUEST); diff --git a/sql/old/3.3.5a/2012_02_22_03_world_conditions.sql b/sql/old/3.3.5a/2012_02_22_03_world_conditions.sql new file mode 100644 index 00000000000..9c4d0cdec95 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_22_03_world_conditions.sql @@ -0,0 +1,3 @@ +UPDATE `conditions` SET `SourceTypeOrReferenceId`=13 WHERE `SourceTypeOrReferenceId`=17 AND `SourceGroup`=1; +UPDATE `conditions` SET `ConditionValue2`=1 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1323 AND `SourceEntry`=2 AND `ConditionTypeOrReference`=2; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup`=17465 AND `SourceEntry`=22554 AND `ConditionTypeOrReference`=7; diff --git a/sql/old/3.3.5a/2012_02_23_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_23_00_world_spell_script_names.sql new file mode 100644 index 00000000000..6ea96033091 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_23_00_world_spell_script_names.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` in (11885,11886,11887,11888,11889); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(11885,'spell_item_muisek_vessel'), +(11886,'spell_item_muisek_vessel'), +(11887,'spell_item_muisek_vessel'), +(11888,'spell_item_muisek_vessel'), +(11889,'spell_item_muisek_vessel'); diff --git a/sql/old/3.3.5a/2012_02_24_00_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_02_24_00_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..daecfc02dfc --- /dev/null +++ b/sql/old/3.3.5a/2012_02_24_00_world_gameobject_loot_template.sql @@ -0,0 +1,10 @@ +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Deathbringer's Cache +(28058,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28074,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28088,49908,20,1,0,1,1), -- Primordial Saronite 25H +-- Cache of the Dreamwalker +(28064,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28082,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28096,49908,20,1,0,1,1); -- Primordial Saronite 25H diff --git a/sql/old/3.3.5a/2012_02_24_01_world_sai.sql b/sql/old/3.3.5a/2012_02_24_01_world_sai.sql new file mode 100644 index 00000000000..19e4e8fb772 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_24_01_world_sai.sql @@ -0,0 +1,44 @@ +-- Fix for quest "You've Really Done It This Time, Kul" 14096 Alliance / 14142 Horde +-- SAI for Black Cage +SET @ENTRY=195310; +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=1); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Black Cage - On activate - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,6000,6000,6000,6000,32,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Black Cage - Script - set go state'); +-- SAI for Captive Aspirant +SET @ENTRY=34716; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,8,0,100,0,66531,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - On spellhit - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - Say random text'), +(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Captive Aspirant - Script - Kill credit'), +(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - move 10 yards'), +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - despawn'); +-- SAI for Kul the Reckless +SET @ENTRY=34956; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,8,0,100,0,66531,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - On spellhit - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - Say random text'), +(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kul the Reckless - Script - Kill credit'), +(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - move 10 yards'), +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - despawn'); +-- Captive Aspirant & Kul the Reckless text from sniff +DELETE FROM `creature_text` WHERE `entry` IN (34716,34956); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(34716,0,0, 'Thank you, $c.',12,0,100,5,0,0, 'Captive Aspirant'), +(34716,0,1, 'They''re killing the prisoners! Hurry, help the others.',12,0,100,5,0,0, 'Captive Aspirant'), +(34716,0,2, 'I knew I shouldn''t have come to the tournament!',12,0,100,5,0,0, 'Captive Aspirant'), +(34716,0,3, 'I thought I was going to die in there!',12,0,100,5,0,0, 'Captive Aspirant'), +(34956,0,0, 'They were seconds from strapping me to one of those altars and sucking my soul out. Let''s get out of here!',12,0,100,5,0,0, 'Kul the Reckless'); +-- Target conditions for spell 66531 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=66531; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,2,66531,0,0,31,3,34716,0,0,0,'','Spell 66531 targets npc 34716 or npc 34956'), +(13,2,66531,0,1,31,3,34956,0,0,0,'','Spell 66531 targets npc 34716 or npc 34956'); diff --git a/sql/old/3.3.5a/2012_02_25_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_25_00_world_spell_script_names.sql new file mode 100644 index 00000000000..9619121e982 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_25_00_world_spell_script_names.sql @@ -0,0 +1 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_collision_filter'; diff --git a/sql/old/3.3.5a/2012_02_25_01_world_command.sql b/sql/old/3.3.5a/2012_02_25_01_world_command.sql new file mode 100644 index 00000000000..de708b7a9cc --- /dev/null +++ b/sql/old/3.3.5a/2012_02_25_01_world_command.sql @@ -0,0 +1,6 @@ +DELETE FROM `command` WHERE `name` IN ('group','group leader','group disband','group remove'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES +('group', 3, 'Syntax: .group $subcommand\nType .group to see the list of possible subcommands or .help group $subcommand to see info on subcommands'), +('group leader', 3, 'Syntax: .group leader [$characterName]\n\nSets the given character as his group''s leader.'), +('group disband', 3, 'Syntax: .group disband [$characterName]\n\nDisbands the given character''s group.'), +('group remove', 3, 'Syntax: .group remove [$characterName]\n\nRemoves the given character from his group.'); diff --git a/sql/old/3.3.5a/2012_02_25_01_world_misc.sql b/sql/old/3.3.5a/2012_02_25_01_world_misc.sql new file mode 100644 index 00000000000..deedd50a819 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_25_01_world_misc.sql @@ -0,0 +1,11 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (61698); +INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES +(61698,'spell_gen_ds_flush_knockback'); + +DELETE FROM `spell_dbc` WHERE `id`=61698; +INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES +(61698,0,0,536871296,269058048,67108868,268894272,2048,0,1024,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,-1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,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,'Flush - Knockback effect'); + +UPDATE `battleground_template` SET `HordeStartO`=3.14159 WHERE `id`=10; + +UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry`=28567; diff --git a/sql/old/3.3.5a/2012_02_25_02_world_sai.sql b/sql/old/3.3.5a/2012_02_25_02_world_sai.sql new file mode 100644 index 00000000000..e2ff99534b4 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_25_02_world_sai.sql @@ -0,0 +1,28 @@ +-- Fix for Quest: 12843 "They Took Our Men!" +-- SAI for Rusty Cage +SET @ENTRY=191544; +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=1); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,1,0,1,70,0,100,0,2,0,0,0,45,0,1,0,0,0,0,11,29466,5,0,0,0,0,0,'Rusty Cage - On activate - set data on Goblin Prisoner'), +(@ENTRY,1,1,0,61,0,100,0,0,0,0,0,33,29466,0,0,0,0,0,7,0,0,0,0,0,0,0,'Rusty Cage - On activate - quest credit'); +-- SAI for Goblin Prisoner +SET @ENTRY=29466; +UPDATE `creature` SET `modelid`=0,`spawntimesecs`=120,`curhealth`=1 WHERE `id`=29466; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,32,0,0,0,0,0,0,15,191544,5,0,0,0,0,0,'Goblin Prisoner - On respawn - reset cage'), +(@ENTRY,0,1,0,38,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - On dataset - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - set data 0'), +(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,1000,1000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - Say random text'), +(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - move 10 yards'), +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - despawn'); +-- Goblin Prisoner +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I can''t believe it! I''m free to go!',12,0,100,5,0,0, 'Goblin Prisoner'), +(@ENTRY,0,1, 'I''m free? I''m free!',12,0,100,5,0,0, 'Goblin Prisoner'), +(@ENTRY,0,2, 'Time to hightail it! Thanks, friend!',12,0,100,5,0,0, 'Goblin Prisoner'); diff --git a/sql/old/3.3.5a/2012_02_26_00_world_misc.sql b/sql/old/3.3.5a/2012_02_26_00_world_misc.sql new file mode 100644 index 00000000000..3df42934aa9 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_26_00_world_misc.sql @@ -0,0 +1,13 @@ +UPDATE `spell_area` SET `quest_start`=12987,`quest_end`=12987 WHERE `spell`=56305; + +DELETE FROM `reference_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; -- bad data +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Deathbringer's Cache +(28058,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28074,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28088,49908,20,1,0,1,1), -- Primordial Saronite 25H +-- Cache of the Dreamwalker +(28064,49908,20,1,0,1,1), -- Primordial Saronite 10H +(28082,49908,20,1,0,1,1), -- Primordial Saronite 25N +(28096,49908,20,1,0,1,1); -- Primordial Saronite 25H diff --git a/sql/old/3.3.5a/2012_02_26_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_26_01_world_spell_script_names.sql new file mode 100644 index 00000000000..7bb38d5f2e0 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_26_01_world_spell_script_names.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (48018, 48020); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(48018,'spell_warl_demonic_circle_summon'), +(48020,'spell_warl_demonic_circle_teleport'); diff --git a/sql/old/3.3.5a/2012_02_27_00_world_creature_template.sql b/sql/old/3.3.5a/2012_02_27_00_world_creature_template.sql new file mode 100644 index 00000000000..b8936774e36 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_27_00_world_creature_template.sql @@ -0,0 +1,8 @@ +-- Update gold drops in ICC bosses based on old.wowhead.com data +UPDATE `creature_template` SET `mingold`=250000,`maxgold`=300000 WHERE `entry` IN(36612,37957,37958,37959); -- Lord Marrowgar +UPDATE `creature_template` SET `mingold`=175000,`maxgold`=225000 WHERE `entry` IN (36626,37504,37505,37506); -- Festergut +UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36627,38390,38549,38550); -- Rotface +UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36678,38431,38585,38586); -- Professor Putricide +UPDATE `creature_template` SET `mingold`=300000,`maxgold`=350000 WHERE `entry` IN (37955,38434,38435,38436); -- Blood-Queen Lana'thel +UPDATE `creature_template` SET `mingold`=1330000,`maxgold`=1400000 WHERE `entry` IN (36853,38265,38266,38267); -- Sindragosa +UPDATE `creature_template` SET `mingold`=1300000,`maxgold`=1500000 WHERE `entry` IN (36597,39166,39167,39168); -- The Lich King diff --git a/sql/old/3.3.5a/2012_02_28_00_world_wintergrasp_spawns.sql b/sql/old/3.3.5a/2012_02_28_00_world_wintergrasp_spawns.sql new file mode 100644 index 00000000000..9c07709246f --- /dev/null +++ b/sql/old/3.3.5a/2012_02_28_00_world_wintergrasp_spawns.sql @@ -0,0 +1,366 @@ +-- Delete unused creature_data rows +DELETE FROM `creature_addon` WHERE `guid` IN (131728,131282,131283,131284,131285,131286,131287,131288,131289,131290,131291,131292,131293,131294,131295,131296,131297,131298,131299,131300,131301,131302,131303,131304,131305,131306,131307,131308,131309,131310,131311,131312,131313,131314,131315,131316,131317,131318,131319,131320,131321,131322,131326,131327,131328,131350,131351,131352,131353,131354,131376,131377,131378,131379,131380,131392,131437,131458,131631,131632,131633,131634,131635,131636,131706,131727,13128,131729,131730,131731); + +-- Replace Wintergrasp spawns with properly phased spawns +SET @GUID := 88310; +DELETE FROM `creature` WHERE `id` IN (31841,31842,30400,30499,30489,30869,31036,31051,31052,31054,31108,31109,31153,39172,30870,31053,31091,31101,31102,31106,31107,31151,32294,39173,32296,30488); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +-- Taunka Spirit Guide (Horde) +(@GUID+0,31841,571,1,0x00000010,0,0,4318.436,2408.06738,392.675751,6.23082542,120,0,0,1,0,0), -- Eastspark Workshop +(@GUID+1,31841,571,1,0x00000010,0,0,4336.25439,3235.51978,390.334,0.628318548,120,0,0,1,0,0), -- Westspark Workshop +(@GUID+2,31841,571,1,0x00000010,0,0,5104.753,2300.9458,368.568054,0.7330383,120,0,0,1,0,0), -- The Sunken Ring +(@GUID+3,31841,571,1,0x00000010,0,0,5103.133,3462.128,368.568054,5.270895,120,0,0,1,0,0), -- The Chilled Quagmire "Outside broker Temple" +(@GUID+4,31841,571,1,0x00000040,0,0,5537.482,2898.90674,517.2589,4.86946869,120,0,0,1,0,0), -- Fortress +(@GUID+5,31841,571,1,0x00000001,0,0,5031.84131,3710.74878,372.4835,0,120,5,0,1,0,0), -- Horde Landing Zone +-- Dwarven Spirit Guide (Alliance) +(@GUID+6,31842,571,1,0x00000020,0,0,4318.436,2408.06738,392.675751,6.23082542,120,0,0,1,0,0), -- Eastspark Workshop +(@GUID+7,31842,571,1,0x00000020,0,0,4336.25439,3235.51978,390.334,0.628318548,120,0,0,1,0,0), -- Westspark Workshop +(@GUID+8,31842,571,1,0x00000020,0,0,5104.753,2300.9458,368.568054,0.7330383,120,0,0,1,0,0), -- The Sunken Ring +(@GUID+9,31842,571,1,0x00000020,0,0,5103.133,3462.128,368.568054,5.270895,120,0,0,1,0,0), -- The Chilled Quagmire "Outside The Broken Temple" +(@GUID+10,31842,571,1,0x00000080,0,0,5537.482,2898.90674,517.2589,4.86946869,120,0,0,1,0,0), -- Fortress +(@GUID+11,31842,571,1,0x00000001,0,0,5140.7876,2179.12451,390.9512,1.97222209,120,0,0,1,0,0), -- Aliance Landing Zone +-- Goblin Mechanic (Horde) +(@GUID+12,30400,571,1,0x00000010,0,0,4964.89,3383.06,382.911,6.12611,180,0,0,1,0,0), -- The Broken Temple +(@GUID+13,30400,571,1,0x00000010,0,0,4939.76,2389.06,326.153,3.26377,180,0,0,1,0,0), -- The Sunken Ring +(@GUID+14,30400,571,1,0x00000010,0,0,4357.67,2357.99,382.007,1.67552,180,0,0,1,0,0), -- Eastspark Workshop +(@GUID+15,30400,571,1,0x00000010,0,0,4354.15,3312.82,378.046,1.67552,180,0,0,1,0,0), -- Westspark Workshop +(@GUID+16,30400,571,1,0x00000040,0,0,5391.61,2707.72,415.051,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +(@GUID+17,30400,571,1,0x00000040,0,0,5392.91,2975.26,415.223,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +-- Gnomish Engineer (Alliance) +(@GUID+18,30499,571,1,0x00000020,0,0,4964.89,3383.06,382.911,6.12611,180,0,0,1,0,0), -- The Broken Temple +(@GUID+19,30499,571,1,0x00000020,0,0,4939.76,2389.06,326.153,3.26377,180,0,0,1,0,0), -- The Sunken Ring +(@GUID+20,30499,571,1,0x00000020,0,0,4357.67,2357.99,382.007,1.67552,180,0,0,1,0,0), -- Eastspark Workshop +(@GUID+21,30499,571,1,0x00000020,0,0,4354.15,3312.82,378.046,1.67552,180,0,0,1,0,0), -- Westspark Workshop +(@GUID+22,30499,571,1,0x00000080,0,0,5391.61,2707.72,415.051,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +(@GUID+23,30499,571,1,0x00000080,0,0,5392.91,2975.26,415.223,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress +-- Alliance NPC's +(@GUID+24,30489,571,1,0x00000080,0,0,5369.973,2874.83081,409.3225,3.12413931,120,0,0,1,0,0), -- Morgan Day +(@GUID+25,30869,571,1,0x00000001,0,0,5102.75049,2187.82837,365.707855,3.996804,120,0,0,1,0,0), -- Arzo Safeflight +(@GUID+26,31036,571,1,0x00000040,0,0,5078.281,2183.704,365.028564,1.46607661,120,0,0,1,0,0), -- Commander Zanneth +(@GUID+27,31036,571,1,0x00000080,0,0,5358.641,2841.76416,409.3225,1.13262534,120,0,0,1,0,0), +(@GUID+28,31051,571,1,0x00000040,0,0,5081.697,2173.73,365.8777,0.8552113,120,0,0,1,0,0), -- Sorceress Kaylana +(@GUID+29,31051,571,1,0x00000080,0,0,5296.869,2887.67114,409.274658,5.60250664,120,0,0,1,0,0), +(@GUID+30,31052,571,1,0x00000040,0,0,5100.06543,2168.89,365.7788,1.97222209,120,0,0,1,0,0), -- Bowyer Randolph +(@GUID+31,31052,571,1,0x00000080,0,0,5302.57373,2750.40332,409.274658,5.46288061,120,0,0,1,0,0), +(@GUID+32,31054,571,1,0x00000040,0,0,5088.611,2167.66235,365.688751,0.6806784,120,0,0,1,0,0), -- Anchorite Tessa +(@GUID+33,31054,571,1,0x00000080,0,0,5372.05859,3028.33618,409.206024,0.012565271,120,0,0,1,0,0), +(@GUID+34,31108,571,1,0x00000040,0,0,5095.673,2193.284,365.9236,4.939282,120,0,0,1,0,0), -- Siege Master Stouthandle +(@GUID+35,31108,571,1,0x00000080,0,0,5298.267,2924.97632,409.274658,0.9075712,120,0,0,1,0,0), +(@GUID+36,31109,571,1,0x00000040,0,0,5080.403,2199.00244,359.4894,2.96705961,120,0,0,1,0,0), -- Senior Demolitionist Legoso +(@GUID+37,31109,571,1,0x00000080,0,0,5228.2915,2809.888,409.274658,3.19395256,120,0,0,1,0,0), +(@GUID+38,31153,571,1,0x00000040,0,0,5088.48633,2188.17871,365.646973,5.253441,120,0,0,1,0,0), -- Tactical Officer Ahbramis +(@GUID+39,31153,571,1,0x00000080,0,0,5364.784,2835.135,409.3225,3.12413931,120,0,0,1,0,0), +(@GUID+40,32294,571,1,0x00000080,0,0,5374.568,2790.784,409.3225,2.72271371,120,0,0,1,0,0), -- Knight Dameron +(@GUID+41,39172,571,1,0x00000080,0,0,5372.672,2786.74048,409.4423,2.80998015,120,0,0,1,0,0), -- Marshal Magruder +(@GUID+42,30488,571,1,0x00000080,0,0,5370.428,2814.274,409.3225,3.054326,120,0,0,1,0,0), -- Travis Day +-- Horde NPC's +(@GUID+43,30870,571,1,0x00000001,0,0,5023.4043,3686.03345,363.1192,5.131268,120,0,0,1,0,0), -- Herzo Safeflight +(@GUID+44,31053,571,1,0x00000040,0,0,5379.875,3027.43359,409.206024,0,120,0,0,1,0,0), -- Primalist Mulfort +(@GUID+45,31053,571,1,0x00000080,0,0,5034.703125,3666.703125,363.273865,4.310963,120,0,0,1,0,0), +(@GUID+46,31091,571,1,0x00000040,0,0,5347.7915,2837.38574,409.3466,2.62603331,120,0,0,1,0,0), -- Commander Dardosh +(@GUID+47,31091,571,1,0x00000080,0,0,5018.662109,3672.279541,362.862885,2.209141,120,0,0,1,0,0), +(@GUID+48,31101,571,1,0x00000040,0,0,5296.564,2789.87378,409.274658,0.7330383,120,0,0,1,0,0), -- Hoodoo Master Fu'jin +(@GUID+49,31101,571,1,0x00000080,0,0,5014.065430,3678.846436,362.995575,5.096361,120,0,0,1,0,0), +(@GUID+50,31102,571,1,0x00000040,0,0,5295.455,2732.87549,409.274658,4.7211113,120,0,0,1,0,0), -- Vieron Blazefeather +(@GUID+51,31102,571,1,0x00000080,0,0,5031.676270,3655.820801,362.234558,5.131268,120,0,0,1,0,0), +(@GUID+52,31106,571,1,0x00000040,0,0,5295.56348,2926.67188,409.274658,0.87266463,120,0,0,1,0,0), -- Siegesmith Stronghoof +(@GUID+53,31106,571,1,0x00000080,0,0,5037.602051,3675.459717,363.147888,3.176499,120,0,0,1,0,0), +(@GUID+54,31107,571,1,0x00000040,0,0,5230.09033,2876.635,409.316254,-2.19854617,120,0,0,1,0,0), -- Lieutenant Murp +(@GUID+55,31107,571,1,0x00000080,0,0,5004.455078,3661.089111,361.335785,3.979351,120,0,0,1,0,0), +(@GUID+56,31151,571,1,0x00000040,0,0,5363.2876,2834.52954,409.3606,2.76273036,120,0,0,1,0,0), -- Tactical Officer Kilrath +(@GUID+57,31151,571,1,0x00000080,0,0,5034.698242,3683.268799,363.129120,4.310963,120,0,0,1,0,0), +(@GUID+58,32296,571,1,0x00000040,0,0,5374.568,2790.784,409.3225,2.60054,120,0,0,1,0,0), -- Stone Guard Mukar +-- Missing noc in fortress +(@GUID+60,39173,571,1,0x00000040,0,0,5372.672,2786.74048,409.4423,2.80998015,120,0,0,1,0,0); -- Champion Ros'slai + +-- corrects previously inserted creature +UPDATE `creature` SET `spawndist`=0 WHERE `guid`=88315; + +-- Pathing for Anchorite Tessa Entry: 31054 +SET @NPC := @GUID+33; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5382.507,3028.468,409.206,0,0,0,100,0), +(@PATH,2,5392.744,3028.737,409.206,0,0,0,100,0), +(@PATH,3,5382.507,3028.468,409.206,0,0,0,100,0), +(@PATH,4,5371.491,3028.329,409.206,0,0,0,100,0), +(@PATH,5,5360.032,3028.516,409.3161,0,0,0,100,0), +(@PATH,6,5371.491,3028.329,409.206,0,0,0,100,0); + +-- Pathing for Commander Zanneth Entry: 31036 +SET @NPC := @GUID+27; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5358.854,`position_y`=2859.232,`position_z`=409.5425 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,14337, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5359.788,2846.359,409.3642,0,0,0,100,0), +(@PATH,2,5359.187,2839.211,409.3642,0,0,0,100,0), +(@PATH,3,5360.083,2823.116,409.5381,0,0,0,100,0), +(@PATH,4,5359.187,2839.211,409.3642,0,0,0,100,0), +(@PATH,5,5359.788,2846.359,409.3642,0,0,0,100,0), +(@PATH,6,5358.854,2859.232,409.5425,0,0,0,100,0); + +-- Pathing for Commander Dardosh Entry: 31091 +SET @NPC := @GUID+46; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2,`position_x`=5359.546,`position_y`=2858.049,`position_z`=409.3642 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5359.202,2843.208,409.3642,0,0,0,100,0), +(@PATH,2,5358.997,2827.974,409.3639,0,0,0,100,0), +(@PATH,3,5359.202,2843.208,409.3642,0,0,0,100,0), +(@PATH,4,5359.546,2858.049,409.3642,0,0,0,100,0); + +-- Pathing for Commander Dardosh Entry: 31091 +SET @NPC := @GUID+47; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2,`position_x`=5018.411133,`position_y`=3672.615967,`position_z`=362.863525 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5022.827637,3666.665771,362.205750,0,0,0,100,0), +(@PATH,2,5024.270508,3658.739258,361.705750,0,0,0,100,0), +(@PATH,3,5022.827637,3666.665771,362.205750,0,0,0,100,0), +(@PATH,4,5018.411133,3672.615967,362.863525,0,0,0,100,0); + +-- Pathing for Primalist Mulfort Entry: 31053 +SET @NPC := @GUID+44; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5390.624,3027.994,409.206,0,0,0,100,0), +(@PATH,2,5379.875,3027.434,409.206,0,0,0,100,0), +(@PATH,3,5371.404,3026.511,409.206,0,0,0,100,0), +(@PATH,4,5379.875,3027.434,409.206,0,0,0,100,0); + +-- Pathing for Vieron Blazefeather Entry: 31102 +SET @NPC := @GUID+50; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `MovementType`=2,`position_x`=5296.644,`position_y`=2731.107,`position_z`=409.3163 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5295.544,2722.631,409.3163,0,0,0,100,0), +(@PATH,2,5296.644,2731.107,409.3163,0,0,0,100,0), +(@PATH,3,5297.874,2738.155,409.3163,0,0,0,100,0), +(@PATH,4,5305.192,2746.161,409.3061,0,0,0,100,0), +(@PATH,5,5297.874,2738.155,409.3163,0,0,0,100,0), +(@PATH,6,5296.644,2731.107,409.3163,0,0,0,100,0); + +-- Guards "Alliance" (Valiance Expedition Champion) +SET @GUID := 88371; +DELETE FROM `creature` WHERE `id`=30740; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +-- Fortress +(@GUID+0,30740,571,1,0x00000080,0,0,5150.26855,2786.02173,409.5469,3.22885919,120,0,0,1,0,0), +(@GUID+1,30740,571,1,0x00000080,0,0,5150.657,2777.9502,409.4053,2.94960642,120,0,0,1,0,0), +(@GUID+2,30740,571,1,0x00000080,0,0,5193.632,2734.172,409.272552,4.694936,120,0,0,1,0,0), +(@GUID+3,30740,571,1,0x00000080,0,0,5200.497,2733.88843,409.272552,4.677482,120,0,0,1,0,0), +(@GUID+4,30740,571,1,0x00000080,0,0,5264.64648,2670.1936,409.1819,3.07177949,120,0,0,1,0,0), +(@GUID+5,30740,571,1,0x00000080,0,0,5265.30566,2663.15381,409.1819,3.12413931,120,0,0,1,0,0), +(@GUID+6,30740,571,1,0x00000080,0,0,5307.02051,2613.89771,409.172363,4.694936,120,0,0,1,0,0), +(@GUID+7,30740,571,1,0x00000080,0,0,5311.133,3061.04248,408.809937,1.50098312,120,0,0,1,0,0), +(@GUID+8,30740,571,1,0x00000080,0,0,5315.87354,2614.21924,408.972748,4.677482,120,0,0,1,0,0), +(@GUID+9,30740,571,1,0x00000080,0,0,5318.09,3060.634,408.882782,1.62315619,120,0,0,1,0,0), +(@GUID+10,30740,571,1,0x00000080,0,0,5149.395,2897.044,409.304443,3.03687286,120,0,0,1,0,0), +(@GUID+11,30740,571,1,0x00000080,0,0,5149.51953,2904.19336,409.276062,3.07177949,120,0,0,1,0,0), +(@GUID+12,30740,571,1,0x00000080,0,0,5192.79248,2948.454,409.2746,1.50098312,120,0,0,1,0,0), +(@GUID+13,30740,571,1,0x00000080,0,0,5201.645,2948.77612,409.2746,1.62315619,120,0,0,1,0,0), +(@GUID+14,30740,571,1,0x00000080,0,0,5265.28,3010.10083,408.895782,2.82743335,120,0,0,1,0,0), +(@GUID+15,30740,571,1,0x00000080,0,0,5265.47559,3017.39941,408.582977,3.07177949,120,0,0,1,0,0), +(@GUID+16,30740,571,1,0x00000080,0,0,5367.91455,2826.52026,409.3225,3.33357882,120,0,0,1,0,0), +(@GUID+17,30740,571,1,0x00000080,0,0,5368.71338,2856.36035,409.3225,2.94960642,120,0,0,1,0,0), +(@GUID+18,30740,571,1,0x00000080,0,0,5388.56,2834.76782,418.7585,3.07177949,120,0,0,1,0,0), +(@GUID+19,30740,571,1,0x00000080,0,0,5389.272,2847.36816,418.7585,3.106686,120,0,0,1,0,0), +(@GUID+20,30740,571,1,0x00000080,0,0,4684.475,2414.28979,369.9621,-2.85779858,120,0,0,1,0,0), +(@GUID+21,30740,571,1,0x00000080,0,0,4692.75635,2392.88574,369.0177,-2.82921553,120,0,0,1,0,0), +(@GUID+22,30740,571,1,0x00000080,0,0,5327.264648,2659.455322,409.178711,3.069901,120,0,0,1,0,0), -- F1307814000A2DAD path +(@GUID+23,30740,571,1,0x00000080,0,0,5154.225586,2833.824219,409.262451,3.124139,120,0,0,1,0,0), +(@GUID+24,30740,571,1,0x00000080,0,0,5154.119629,2847.892822,409.247559,3.071779,120,0,0,1,0,0), +(@GUID+25,30740,571,1,0x00000080,0,0,5179.111328,2837.129639,409.274658,3.211406,120,0,0,1,0,0), +(@GUID+26,30740,571,1,0x00000080,0,0,5179.666504,2846.597900,409.274658,3.089233,120,0,0,1,0,0), +(@GUID+27,30740,571,1,0x00000080,0,0,5270.163086,2833.479248,409.274658,3.124139,120,0,0,1,0,0), +(@GUID+28,30740,571,1,0x00000080,0,0,5270.057129,2847.547607,409.274658,3.071779,120,0,0,1,0,0), +(@GUID+29,30740,571,1,0x00000080,0,0,5307.750000,3008.872559,409.193024,4.781681,120,0,0,1,0,0), -- F1307814000A43AE path +(@GUID+30,30740,571,1,0x00000080,0,0,5335.117188,2916.802002,409.443756,1.500983,120,0,0,1,0,0), +(@GUID+31,30740,571,1,0x00000080,0,0,5350.681152,2917.011719,409.274658,1.466077,120,0,0,1,0,0), +(@GUID+32,30740,571,1,0x00000080,0,0,5335.306152,2764.110352,409.274567,4.834562,120,0,0,1,0,0), +(@GUID+33,30740,571,1,0x00000080,0,0,5349.811523,2763.634766,409.333374,4.660029,120,0,0,1,0,0), +-- Eastspark Workshop +(@GUID+34,30740,571,1,0x00000080,0,0,4349.537,2411.25781,374.743317,2.05948853,120,0,0,1,0,0), +(@GUID+35,30740,571,1,0x00000080,0,0,4388.13135,2411.97827,374.743317,1.6406095,120,0,0,1,0,0), +(@GUID+36,30740,571,1,0x00000080,0,0,4391.6665,2300.60913,374.7433,4.92182827,120,0,0,1,0,0), +(@GUID+37,30740,571,1,0x00000080,0,0,4413.42969,2393.44946,376.3599,1.06465089,120,0,0,1,0,0), +(@GUID+38,30740,571,1,0x00000080,0,0,4417.92,2331.237,370.9189,5.846853,120,0,0,1,0,0), +(@GUID+39,30740,571,1,0x00000080,0,0,4349.11768,2299.27954,374.7433,4.904375,120,0,0,1,0,0), +(@GUID+40,30740,571,1,0x00000080,0,0,4418.608,2355.28735,372.4907,6.02138567,120,0,0,1,0,0); + +-- banners +SET @OGUID := 75939; +DELETE FROM `gameobject` WHERE `id` IN (192254,192255,192269,192284,192285,192286,192287,192292,192299,192304,192305,192306,192307,192308,192309,192310,192312,192313,192314,192316,192317,192318,192319,192320,192321, + 192322,192323,192324,192325,192326,192327,192328,192329,192330,192331,192332,192333,192334,192335,192336,192338,192339,192349,192350,192351,192352,192353,192354,192355,192356, + 192357,192358,192359,192360,192361,192362,192363,192364,192366,192367,192368,192369,192370,192371,192372,192373,192374,192375,192376,192377,192378,192379,192487,192488,192501, + 192502); +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+115; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +-- Fortress Banners "Alliance" +(@OGUID+0,192286,571,1,128,5371.44873,2820.79346,409.426575,3.124123,0,0,0,0,120,0,1), +(@OGUID+1,192287,571,1,128,5372.42432,2862.47925,409.3659,3.14159274,0,0,0,0,120,0,1), +(@OGUID+2,192292,571,1,128,5154.35059,2862.08423,445.0105,3.14159274,0,0,0,0,120,0,1), +(@OGUID+3,192299,571,1,128,5155.21631,2820.63013,444.9789,-3.115388,0,0,0,0,120,0,1), +(@OGUID+4,192304,571,1,128,5398.03564,2873.013,455.203552,3.132858,0,0,0,0,120,0,1), +(@OGUID+5,192305,571,1,128,5397.31348,2809.264,455.101624,3.132858,0,0,0,0,120,0,1), +(@OGUID+6,192306,571,1,128,5270.55469,2861.68237,444.917236,-3.124123,0,0,0,0,120,0,1), +(@OGUID+7,192307,571,1,128,5271.16064,2820.10864,445.109,-3.132858,0,0,0,0,120,0,1), +(@OGUID+8,192308,571,1,128,5235.12744,2942.12329,444.2792,1.58824873,0,0,0,0,120,0,1), +(@OGUID+9,192309,571,1,128,5272.549,2976.54175,444.493,3.132858,0,0,0,0,120,0,1), +(@OGUID+10,192310,571,1,128,5352.19775,3055.0166,444.5646,1.57952213,0,0,0,0,120,0,1), +(@OGUID+11,192312,571,1,128,5236.315,2739.21533,444.992828,-1.60570168,0,0,0,0,120,0,1), +(@OGUID+12,192313,571,1,128,5271.634,2704.829,445.182617,-3.124123,0,0,0,0,120,0,1), +(@OGUID+13,192314,571,1,128,5350.905,2622.48,444.649323,-1.56206989,0,0,0,0,120,0,1), +(@OGUID+14,192316,571,1,128,5322.013,2781.13281,435.6727,1.57952213,0,0,0,0,120,0,1), +(@OGUID+15,192317,571,1,128,5363.387,2781.27856,435.634125,1.58824873,0,0,0,0,120,0,1), +(@OGUID+16,192318,571,1,128,5322.24854,2898.94629,435.642975,-1.57952213,0,0,0,0,120,0,1), +(@OGUID+17,192319,571,1,128,5364.30371,2899.216,435.690826,-1.55334139,0,0,0,0,120,0,1), +(@OGUID+18,192320,571,1,128,5289.048,2820.22656,435.6738,0,0,0,0,0,120,0,1), +(@OGUID+19,192321,571,1,128,5288.847,2861.82128,435.590485,0.0261791088,0,0,0,0,120,0,1), +(@OGUID+20,192322,571,1,128,5322.89258,2917.14233,445.1543,1.56206989,0,0,0,0,120,0,1), +(@OGUID+21,192323,571,1,128,5364.283,2917.264,445.332184,1.58824611,0,0,0,0,120,0,1), +(@OGUID+22,192324,571,1,128,5290.514,2976.56177,435.087463,0.008724241,0,0,0,0,120,0,1), +(@OGUID+23,192325,571,1,128,5352.37744,3036.95483,435.111053,-1.56206989,0,0,0,0,120,0,1), +(@OGUID+24,192326,571,1,128,5392.64063,3036.967,433.648682,-1.51843357,0,0,0,0,120,0,1), +(@OGUID+25,192327,571,1,128,5172.336,2862.57544,435.65802,0,0,0,0,0,120,0,1), +(@OGUID+26,192328,571,1,128,5173.12842,2820.95654,435.657623,0.0261791088,0,0,0,0,120,0,1), +(@OGUID+27,192329,571,1,128,5235.32227,2924.31079,434.8981,-1.56206989,0,0,0,0,120,0,1), +(@OGUID+28,192330,571,1,128,5237.02344,2757.35669,435.625641,1.55334139,0,0,0,0,120,0,1), +(@OGUID+29,192331,571,1,128,5289.78125,2704.62158,435.714325,0.008724241,0,0,0,0,120,0,1), +(@OGUID+30,192332,571,1,128,5350.93945,2640.43066,435.2642,1.56206989,0,0,0,0,120,0,1), +(@OGUID+31,192333,571,1,128,5392.28027,2639.84033,435.207916,1.52716041,0,0,0,0,120,0,1), +(@OGUID+32,192334,571,1,128,5322.17041,2763.20142,444.9744,-1.56206715,0,0,0,0,120,0,1), +(@OGUID+33,192335,571,1,128,5363.71631,2763.24731,445.023132,-1.54461551,0,0,0,0,120,0,1), +(@OGUID+34,192487,571,1,128,5145.11133,2934.948,433.254852,-3.10665226,0,0,0,0,120,0,1), +(@OGUID+35,192487,571,1,128,5146.04443,2747.30249,433.527039,3.124123,0,0,0,0,120,0,1), +(@OGUID+36,192487,571,1,128,5158.71,2882.90161,431.27417,3.14159274,0,0,0,0,120,0,1), +(@OGUID+37,192487,571,1,128,5160.28369,2798.59766,430.6037,-3.124123,0,0,0,0,120,0,1), +(@OGUID+38,192487,571,1,128,5162.90674,2952.59766,433.368,1.57079577,0,0,0,0,120,0,1), +(@OGUID+39,192487,571,1,128,5163.85,2729.677,433.327545,-1.60570168,0,0,0,0,120,0,1), +(@OGUID+40,192487,571,1,128,5260.82471,2631.81763,433.181061,3.124123,0,0,0,0,120,0,1), +(@OGUID+41,192487,571,1,128,5262.544,3047.93018,431.96524,3.124123,0,0,0,0,120,0,1), +(@OGUID+42,192487,571,1,128,5278.43066,2613.83276,433.294434,-1.62315571,0,0,0,0,120,0,1), +(@OGUID+43,192487,571,1,128,5280.894,3064.95386,431.9758,1.55334139,0,0,0,0,120,0,1), +-- Fortress Banners "Horde" +(@OGUID+44,192269,571,1,64,4526.46,2810.18,391.2,-2.99322,0,0,0,1,180,0,1), +(@OGUID+45,192284,571,1,64,5372.48,2862.5,409.049,3.14159,0,0,0,1,180,0,1), +(@OGUID+46,192285,571,1,64,5371.49,2820.8,409.177,3.14159,0,0,0,1,180,0,1), +(@OGUID+47,192338,571,1,64,5397.76,2873.08,455.461,3.10665,0,0,0,1,180,0,1), +(@OGUID+48,192339,571,1,64,5397.39,2809.33,455.344,3.10665,0,0,0,1,180,0,1), +(@OGUID+49,192349,571,1,64,5155.31,2820.74,444.979,-3.13286,0,0,0,1,180,0,1), +(@OGUID+50,192350,571,1,64,5270.69,2861.78,445.058,-3.11539,0,0,0,1,180,0,1), +(@OGUID+51,192351,571,1,64,5271.28,2820.16,445.201,-3.13286,0,0,0,1,180,0,1), +(@OGUID+52,192352,571,1,64,5173.02,2820.93,435.72,0.017452,0,0,0,1,180,0,1), +(@OGUID+53,192353,571,1,64,5172.11,2862.57,435.721,0.017452,0,0,0,1,180,0,1), +(@OGUID+54,192354,571,1,64,5288.41,2861.79,435.721,0.017452,0,0,0,1,180,0,1), +(@OGUID+55,192355,571,1,64,5288.92,2820.22,435.721,0.017452,0,0,0,1,180,0,1), +(@OGUID+56,192356,571,1,64,5237.07,2757.03,435.796,1.51844,0,0,0,1,180,0,1), +(@OGUID+57,192357,571,1,64,5235.34,2924.34,435.04,-1.5708,0,0,0,1,180,0,1), +(@OGUID+58,192358,571,1,64,5322.23,2899.43,435.808,-1.58825,0,0,0,1,180,0,1), +(@OGUID+59,192359,571,1,64,5364.35,2899.4,435.839,-1.5708,0,0,0,1,180,0,1), +(@OGUID+60,192360,571,1,64,5352.37,3037.09,435.252,-1.5708,0,0,0,1,180,0,1), +(@OGUID+61,192361,571,1,64,5392.65,3037.11,433.713,-1.52716,0,0,0,1,180,0,1), +(@OGUID+62,192362,571,1,64,5322.12,2763.61,444.974,-1.55334,0,0,0,1,180,0,1), +(@OGUID+63,192363,571,1,64,5363.61,2763.39,445.024,-1.54462,0,0,0,1,180,0,1), +(@OGUID+64,192364,571,1,64,5350.88,2622.72,444.686,-1.5708,0,0,0,1,180,0,1), +(@OGUID+65,192366,571,1,64,5236.27,2739.46,444.992,-1.59698,0,0,0,1,180,0,1), +(@OGUID+66,192367,571,1,64,5271.8,2704.87,445.183,-3.13286,0,0,0,1,180,0,1), +(@OGUID+67,192368,571,1,64,5289.46,2704.68,435.875,-0.017451,0,0,0,1,180,0,1), +(@OGUID+68,192369,571,1,64,5350.95,2640.36,435.408,1.5708,0,0,0,1,180,0,1), +(@OGUID+69,192370,571,1,64,5392.27,2639.74,435.331,1.50971,0,0,0,1,180,0,1), +(@OGUID+70,192371,571,1,64,5364.29,2916.94,445.331,1.57952,0,0,0,1,180,0,1), +(@OGUID+71,192372,571,1,64,5322.86,2916.95,445.154,1.56207,0,0,0,1,180,0,1), +(@OGUID+72,192373,571,1,64,5290.35,2976.56,435.221,0.017452,0,0,0,1,180,0,1), +(@OGUID+73,192374,571,1,64,5272.94,2976.55,444.492,3.12412,0,0,0,1,180,0,1), +(@OGUID+74,192375,571,1,64,5235.19,2941.9,444.278,1.58825,0,0,0,1,180,0,1), +(@OGUID+75,192376,571,1,64,5352.19775,3055.0166,444.5646,1.57952,0,0,0,0,120,0,1), +(@OGUID+76,192377,571,1,64,5414.19,3069.8,415.187,1.64061,0,0,0,1,180,0,1), +(@OGUID+77,192378,571,1,64,5322.02,2781.13,435.811,1.5708,0,0,0,1,180,0,1), +(@OGUID+78,192379,571,1,64,5363.42,2781.03,435.763,1.5708,0,0,0,1,180,0,1), +(@OGUID+79,192254,571,1,64,5154.46,2828.94,409.189,3.14159,0,0,0,1,180,0,1), +(@OGUID+80,192255,571,1,64,5154.52,2853.31,409.183,3.14159,0,0,0,1,180,0,1), +(@OGUID+81,192336,571,1,64,5154.49,2862.15,445.012,3.14159,0,0,0,1,180,0,1), +(@OGUID+82,192488,571,1,64,5160.34,2798.61,430.769,3.14159,0,0,0,1,180,0,1), +(@OGUID+83,192488,571,1,64,5158.81,2883.13,431.618,3.14159,0,0,0,1,180,0,1), +(@OGUID+84,192488,571,1,64,5278.38,2613.83,433.409,-1.58825,0,0,0,1,180,0,1), +(@OGUID+85,192488,571,1,64,5260.82,2631.8,433.324,3.05433,0,0,0,1,180,0,1), +(@OGUID+86,192488,571,1,64,5163.13,2952.59,433.503,1.53589,0,0,0,1,180,0,1), +(@OGUID+87,192488,571,1,64,5145.11,2935,433.386,3.14159,0,0,0,1,180,0,1), +(@OGUID+88,192488,571,1,64,5262.54,3047.95,432.055,3.10665,0,0,0,1,180,0,1), +(@OGUID+89,192488,571,1,64,5146.04,2747.21,433.584,3.07177,0,0,0,1,180,0,1), +(@OGUID+90,192488,571,1,64,5163.78,2729.68,433.394,-1.58825,0,0,0,1,180,0,1), +(@OGUID+91,192488,571,1,64,5280.894,3064.95386,431.9758,1.55334139,0,0,0,0,120,0,1), +-- Tower Banners "Alliance" +(@OGUID+92,192501,571,1,64,4398.82,2804.7,429.792,-1.58825,0,0,0,1,180,0,1), +(@OGUID+93,192501,571,1,64,4416,2822.67,429.851,-0.017452,0,0,0,1,180,0,1), +(@OGUID+94,192501,571,1,64,4559.11,3606.22,419.999,-1.48353,0,0,0,1,180,0,1), +(@OGUID+95,192501,571,1,64,4539.42,3622.49,420.034,-3.07177,0,0,0,1,180,0,1), +(@OGUID+96,192501,571,1,64,4555.26,3641.65,419.974,1.67551,0,0,0,1,180,0,1), +(@OGUID+97,192501,571,1,64,4574.87,3625.91,420.079,0.087266,0,0,0,1,180,0,1), +(@OGUID+98,192501,571,1,64,4466.79,1960.42,459.144,1.15192,0,0,0,1,180,0,1), +(@OGUID+99,192501,571,1,64,4475.35,1937.03,459.07,-0.436332,0,0,0,1,180,0,1), +(@OGUID+100,192501,571,1,64,4451.76,1928.1,459.076,-2.00713,0,0,0,1,180,0,1), +(@OGUID+101,192501,571,1,64,4442.99,1951.9,459.093,2.74016,0,0,0,1,180,0,1), +(@OGUID+102,192501,571,1,64,4380.36328,2822.38013,429.8818,-3.106652,0,0,0,0,120,0,1), +(@OGUID+103,192501,571,1,64,4397.6626,2840.299,429.921661,1.58824873,0,0,0,0,120,0,1), +-- Tower Banners "Horde" +(@OGUID+104,192502,571,1,128,4398.82,2804.7,429.792,-1.58825,0,0,0,1,180,0,1), +(@OGUID+105,192502,571,1,128,4416,2822.67,429.851,-0.017452,0,0,0,1,180,0,1), +(@OGUID+106,192502,571,1,128,4559.11,3606.22,419.999,-1.48353,0,0,0,1,180,0,1), +(@OGUID+107,192502,571,1,128,4539.42,3622.49,420.034,-3.07177,0,0,0,1,180,0,1), +(@OGUID+108,192502,571,1,128,4555.26,3641.65,419.974,1.67551,0,0,0,1,180,0,1), +(@OGUID+109,192502,571,1,128,4574.87,3625.91,420.079,0.087266,0,0,0,1,180,0,1), +(@OGUID+110,192502,571,1,128,4466.79,1960.42,459.144,1.15192,0,0,0,1,180,0,1), +(@OGUID+111,192502,571,1,128,4475.35,1937.03,459.07,-0.436332,0,0,0,1,180,0,1), +(@OGUID+112,192502,571,1,128,4451.76,1928.1,459.076,-2.00713,0,0,0,1,180,0,1), +(@OGUID+113,192502,571,1,128,4442.99,1951.9,459.093,2.74016,0,0,0,1,180,0,1), +(@OGUID+114,192502,571,1,128,4380.36328,2822.38013,429.8818,-3.106652,0,0,0,0,120,0,1), +(@OGUID+115,192502,571,1,128,4397.6626,2840.299,429.921661,1.58824873,0,0,0,0,120,0,1); + +SET @OGUID := 17780; +DELETE FROM `gameobject` WHERE `id` IN (192458,192459,192460,192461,192289,192290,192434,192435,192280,192283,192425,192426,192427,192428,192288,192291,192400,192401,192281,192282); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +-- The Sunken Ring "Horde" +(@OGUID+0,192458,571,1,16,4811.4,2441.9,358.207,-2.0333,0,0,0,1,180,0,1), +(@OGUID+1,192459,571,1,16,4805.67,2407.48,358.191,1.78023,0,0,0,1,180,0,1), +(@OGUID+2,192460,571,1,16,5004.35,2486.36,358.449,2.17294,0,0,0,1,180,0,1), +(@OGUID+3,192461,571,1,16,4983.28,2503.09,358.177,-0.427603,0,0,0,1,180,0,1), +(@OGUID+4,192289,571,1,16,4778.19,2438.06,345.644,-2.94088,0,0,0,1,180,0,1), +(@OGUID+5,192290,571,1,16,5024.57,2532.75,344.023,-1.93732,0,0,0,1,180,0,1), +-- The Sunken Ring "Alliance" +(@OGUID+6,192425,571,1,32,4811.435,2441.84546,357.982483,-2.02457881,0,0,0,0,120,0,1), +(@OGUID+7,192426,571,1,32,4805.514,2407.84375,357.940765,1.7715075,0,0,0,0,120,0,1), +(@OGUID+8,192427,571,1,32,5004.35,2486.36,358.449,2.17294,0,0,0,1,180,0,1), +(@OGUID+9,192428,571,1,32,4983.221,2503.27271,357.959534,-0.43633157,0,0,0,0,120,0,1), +(@OGUID+10,192288,571,1,32,4778.065,2438.02441,345.7063,-2.932139,0,0,0,0,120,0,1), +(@OGUID+11,192291,571,1,32,5024.608,2532.72583,344.4308,-1.94604158,0,0,0,0,120,0,1), +-- The Broken Temple "Horde" +(@OGUID+12,192434,571,1,16,5041.61,3294.4,382.15,-1.63188,0,0,0,1,180,0,1), +(@OGUID+13,192435,571,1,16,4855.63,3297.62,376.739,-3.13286,0,0,0,1,180,0,1), +(@OGUID+14,192280,571,1,16,4857.97,3335.44,368.881,-2.94959,0,0,0,1,180,0,1), +(@OGUID+15,192283,571,1,16,5006.34,3280.4,371.163,2.22529,0,0,0,1,180,0,1), +-- The Broken Temple "Alliance" +(@OGUID+16,192400,571,1,32,5041.650879,3294.318604,381.919952,-1.605702,0,0,0,1,180,0,1), +(@OGUID+17,192401,571,1,32,4855.444336,3297.600830,376.495758,-3.115388,0,0,0,1,180,0,1), +(@OGUID+18,192281,571,1,32,4857.971191,3335.415771,369.291901,-2.888511,0,0,0,1,180,0,1), +(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1); diff --git a/sql/old/3.3.5a/2012_02_29_00_world_conditions_misc.sql b/sql/old/3.3.5a/2012_02_29_00_world_conditions_misc.sql new file mode 100644 index 00000000000..34eb1261ed1 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_29_00_world_conditions_misc.sql @@ -0,0 +1,126 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup` IN(34125,33796,33798,33799,33791,33792,33790, +33795,33793,33800,33794,33843,33842,26421,26477,28161,29856,32788,32790); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`, +`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +-- Stabled Campagin Warhorse Requires Any of the Dailies +(18,34125,63215,1,9,0,13847,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,2,9,0,13851,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,3,9,0,13852,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,4,9,0,13854,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,5,9,0,13855,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,6,9,0,13856,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,7,9,0,13857,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,8,9,0,13858,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,9,9,0,13859,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,10,9,0,13860,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,11,9,0,13861,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,12,9,0,13862,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,13,9,0,13863,0,0,0,'Required quest active for spellclick'), +(18,34125,63215,14,9,0,13864,0,0,0,'Required quest active for spellclick'), +-- Raptor requires (A) Valiant of Sen'Jin +(18,33796,62784,1,8,0,13693,0,0,0,'Required quest rewarded for spellclick'), +(18,33796,62784,2,8,0,13708,0,0,0,'Required quest rewarded for spellclick'), +-- Forsaken Warhorse requires (A) Valiant of Undercity +(18,33798,62787,1,8,0,13695,0,0,0,'Required quest rewarded for spellclick'), +(18,33798,62787,2,8,0,13710,0,0,0,'Required quest rewarded for spellclick'), +-- Orgrimmar Wolf requires (A) Valiant of Orgrimmar +(18,33799,62783,1,8,0,13691,0,0,0,'Required quest rewarded for spellclick'), +(18,33799,62783,2,8,0,13707,0,0,0,'Required quest rewarded for spellclick'), +-- Silvermoon Hawkstrider requires (A) Valiant of Silvermoon +(18,33791,62786,1,8,0,13696,0,0,0,'Required quest rewarded for spellclick'), +(18,33791,62786,2,8,0,13711,0,0,0,'Required quest rewarded for spellclick'), +-- Thunder Bluff Kodo requires (A) Valiant of Thunder Bluff +(18,33792,62785,1,8,0,13694,0,0,0,'Required quest rewarded for spellclick'), +(18,33792,62785,2,8,0,13709,0,0,0,'Required quest rewarded for spellclick'), +-- Exodar Elekk requires (A) Valiant of the Exodar +(18,33790,62781,1,8,0,13690,0,0,0,'Required quest rewarded for spellclick'), +(18,33790,62781,2,8,0,13705,0,0,0,'Required quest rewarded for spellclick'), +-- Ironforge Ram requires (A) Valiant of Ironforge +(18,33795,62779,1,8,0,13685,0,0,0,'Required quest rewarded for spellclick'), +(18,33795,62779,2,8,0,13703,0,0,0,'Required quest rewarded for spellclick'), +-- Gnomeregan Mechanostrider requires (A) Valiant of Gnomeregan +(18,33793,62780,1,8,0,13688,0,0,0,'Required quest rewarded for spellclick'), +(18,33793,62780,2,8,0,13704,0,0,0,'Required quest rewarded for spellclick'), +-- Stormwind Steed requires (A) Valiant of Stormwind +(18,33800,62774,1,8,0,13593,0,0,0,'Required quest rewarded for spellclick'), +(18,33800,62774,2,8,0,13684,0,0,0,'Required quest rewarded for spellclick'), +-- Darnassian Nightsaber requires (A) Valiant of Darnassus +(18,33794,62782,1,8,0,13689,0,0,0,'Required quest rewarded for spellclick'), +(18,33794,62782,2,8,0,13706,0,0,0,'Required quest rewarded for spellclick'), +-- Stabled Quel'Dorei steeds requires The Argent Tournament rewarded +(18,33843,63792,0,8,0,13667,0,0,0,'Required quest rewarded for spellclick'), +-- Stabled Quel'Dorei steed forbids Alliance Eligibility Marker rewarded +(18,33843,63792,0,8,0,13686,0,0,1,'Forbidden rewarded quest for spellclick'), +-- Sunreaver Hawkstrider requires The Argent Tournament rewarded +(18,33842,63791,0,8,0,13668,0,0,0,'Required quest rewarded for spellclick'), +-- Sunreaver Hawkstrider forbids Horde Eligibility Marker rewarded +(18,33842,63791,0,8,0,13687,0,0,1,'Forbidden rewarded quest for spellclick'), +-- Misc +(18,26421,47575,0,8,0,12092,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26421,47575,0,8,0,12096,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26421,47575,1,9,0,12092,0,0,0,'Required quest active for spellclick'), +(18,26421,47575,2,9,0,12096,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,47096,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61832,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61832,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,26477,61286,1,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,61286,2,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,1,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,47096,2,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,26477,61832,1,9,0,11999,0,0,0,'Required quest active for spellclick'), +(18,26477,61832,2,9,0,12000,0,0,0,'Required quest active for spellclick'), +(18,28161,39996,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,39996,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,39996,1,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,39996,2,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,28161,51037,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51037,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51037,1,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,51037,2,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,28161,51961,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51961,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,28161,51961,1,9,0,12532,0,0,0,'Required quest active for spellclick'), +(18,28161,51961,2,9,0,12702,0,0,0,'Required quest active for spellclick'), +(18,29856,55363,0,8,0,12629,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29856,55363,0,8,0,12643,0,0,1,'Forbidden rewarded quest for spellclick'), +(18,29856,55363,1,9,0,12629,0,0,0,'Required quest active for spellclick'), +(18,29856,55363,2,9,0,12643,0,0,0,'Required quest active for spellclick'), +(18,32788,57539,1,8,0,13075,0,0,0,'Required quest rewarded for spellclick'), +(18,32788,57539,2,9,0,13075,0,0,0,'Required quest active for spellclick'), +(18,32790,57654,1,8,0,13073,0,0,0,'Required quest rewarded for spellclick'), +(18,32790,57654,2,9,0,13073,0,0,0,'Required quest active for spellclick'); + +-- Remove duplicate entries in npc_spellclick_spells (leave 1) +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN(34125,26421,26477,28161, +31157,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,34944,29856,30564,29414,31269); +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES +(26477,47096,2,0), +(26477,61286,2,0), +(26477,61832,0,0), +(29414,18277,1,0), +(29856,55363,2,0), +(31269,46598,1,0), +(33794,62782,1,0), +(28161,51037,2,0), +(28161,39996,1,0), +(30564,57401,1,0), +(34125,63215,1,0), +(34944,68458,1,0), +(33790,62781,1,0), +(33793,62780,1,0), +(33795,62779,1,0), +(33800,62774,1,0), +(33798,62787,1,0), +(31157,46598,1,0), +(26421,47575,1,0), +(28161,51961,1,0), +(33791,62786,1,0), +(33792,62785,1,0), +(33796,62784,1,0), +(33799,62783,1,0); + +-- If this query fails, fix your custom content +ALTER TABLE `npc_spellclick_spells` ADD PRIMARY KEY(`npc_entry`,`spell_id`); \ No newline at end of file diff --git a/sql/old/3.3.5a/2012_02_29_01_world_conditions.sql b/sql/old/3.3.5a/2012_02_29_01_world_conditions.sql new file mode 100644 index 00000000000..bae8baf51a9 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_29_01_world_conditions.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, +`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +(18,29488,54568,15,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), +(18,29488,54568,15,9,0,12670,0,0,0,'Required quest active for spellclick'); diff --git a/sql/old/3.3.5a/2012_02_29_02_world_conditions.sql b/sql/old/3.3.5a/2012_02_29_02_world_conditions.sql new file mode 100644 index 00000000000..a28e6d6424f --- /dev/null +++ b/sql/old/3.3.5a/2012_02_29_02_world_conditions.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, +`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +(18,29488,54568,1,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), +(18,29488,54568,2,9,0,12670,0,0,0,'Required quest active for spellclick'); diff --git a/sql/old/3.3.5a/2012_02_29_03_world_creature_text.sql b/sql/old/3.3.5a/2012_02_29_03_world_creature_text.sql new file mode 100644 index 00000000000..2e1d3d77dde --- /dev/null +++ b/sql/old/3.3.5a/2012_02_29_03_world_creature_text.sql @@ -0,0 +1,18 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28923; +DELETE FROM `creature_text` WHERE `entry`=28923; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28923,0,0, 'I have witnessed the rise and fall of empires... the birth and extinction of entire species... Over countless millennia the foolishness of mortals has remained the only constant. Your presence here confirms this.',14,0,100,0,0,14160, 'Loken'), +(28923,1,0, 'My master has shown me the future, and you have no place in it. Azeroth will be reborn in darkness. Yogg-Saron shall be released! The Pantheon shall fall!',14,0,100,0,0,14161, 'Loken'), +(28923,2,0, 'What hope is there for you? None!',14,0,100,0,0,14162, 'Loken'), +(28923,3,0, 'You cannot hide from fate!',14,0,100,0,0,14163, 'Loken'), +(28923,3,1, 'Come closer. I will make it quick.',14,0,100,0,0,14164, 'Loken'), +(28923,3,2, 'Your flesh cannot hold out for long.',14,0,100,0,0,14165, 'Loken'), +(28923,4,0, 'Only mortal...',14,0,100,0,0,14166, 'Loken'), +(28923,4,1, 'I... am... FOREVER!',14,0,100,0,0,14167, 'Loken'), +(28923,4,2, 'What little time you had, you wasted!',14,0,100,0,0,14168, 'Loken'), +(28923,5,0, 'You stare blindly into the abyss!',14,0,100,0,0,14169, 'Loken'), +(28923,6,0, 'Your ignorance is profound. Can you not see where this path leads?',14,0,100,0,0,14170, 'Loken'), +(28923,7,0, 'You cross the precipice of oblivion!',14,0,100,0,0,14171, 'Loken'), +(28923,8,0, 'My death... heralds the end of this world.',14,0,100,0,0,14172, 'Loken'), +(28923,9,0, '%s begins to cast Lightning Nova!',41,0,100,0,0,0, 'Loken'); diff --git a/sql/old/3.3.5a/2012_02_29_04_world_creature_text.sql b/sql/old/3.3.5a/2012_02_29_04_world_creature_text.sql new file mode 100644 index 00000000000..d8b7c2c048a --- /dev/null +++ b/sql/old/3.3.5a/2012_02_29_04_world_creature_text.sql @@ -0,0 +1,11 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28546; +DELETE FROM `creature_text` WHERE `entry`=28546; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28546,0,0, 'You wish to confront the master? You must first weather the storm!',14,0,100,0,0,14453, 'Ionar'), +(28546,1,0, 'The slightest spark shall be your undoing.',14,0,100,0,0,14454, 'Ionar'), +(28546,1,1, 'No one is safe!',14,0,100,0,0,14455, 'Ionar'), +(28546,2,0, 'Shocking ... I know!',14,0,100,0,0,14456, 'Ionar'), +(28546,2,1, 'You atempt the unpossible.',14,0,100,0,0,14457, 'Ionar'), +(28546,2,2, 'Your spark of light is ... extinguish.',14,0,100,0,0,14458, 'Ionar'), +(28546,3,0, 'Master... you have guests.',14,0,100,0,0,14459, 'Ionar'); diff --git a/sql/old/3.3.5a/2012_02_29_05_world_creature_text.sql b/sql/old/3.3.5a/2012_02_29_05_world_creature_text.sql new file mode 100644 index 00000000000..332fecf6326 --- /dev/null +++ b/sql/old/3.3.5a/2012_02_29_05_world_creature_text.sql @@ -0,0 +1,15 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28587; +DELETE FROM `creature_text` WHERE `entry`=28587; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28587,0,0, 'It is you who have destroyed my children? You... shall... pay!',14,0,100,0,0,13960, 'Volkhan'), +(28587,1,0, 'Life from lifelessness... death for you.',14,0,100,0,0,13961, 'Volkhan'), +(28587,1,1, 'Nothing is wasted in the process. You will see....',14,0,100,0,0,13962, 'Volkhan'), +(28587,2,0, 'I will crush you beneath my boots!',14,0,100,0,0,13963, 'Volkhan'), +(28587,2,1, 'All my work... undone!',14,0,100,0,0,13964, 'Volkhan'), +(28587,3,0, 'The armies of iron will conquer all!',14,0,100,0,0,13965, 'Volkhan'), +(28587,3,1, 'Ha, pathetic!',14,0,100,0,0,13966, 'Volkhan'), +(28587,3,2, 'You have cost me too much work!',14,0,100,0,0,13967, 'Volkhan'), +(28587,4,0, 'The master was right... to be concerned.',14,0,100,0,0,13968, 'Volkhan'), +(28587,5,0, '%s runs to his anvil!',41,0,100,0,0,0, 'Volkhan'), +(28587,6,0, '%s prepares to shatter his Brittle Golems!',41,0,100,0,0,0, 'Volkhan'); diff --git a/sql/old/3.3.5a/2012_03_01_00_world_conditions.sql b/sql/old/3.3.5a/2012_03_01_00_world_conditions.sql new file mode 100644 index 00000000000..794a5ce1210 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_01_00_world_conditions.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, +`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES +(18,29488,54568,1,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), +(18,29488,54568,2,28,0,12670,0,0,0,'Required quest completed for spellclick'); diff --git a/sql/old/3.3.5a/2012_03_01_01_world_creature_text.sql b/sql/old/3.3.5a/2012_03_01_01_world_creature_text.sql new file mode 100644 index 00000000000..dd4f6693654 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_01_01_world_creature_text.sql @@ -0,0 +1,15 @@ +-- NPC talk text insert from sniff +DELETE FROM `script_texts` WHERE `npc_entry`=28586; +DELETE FROM `creature_text` WHERE `entry`=28586; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(28586,0,0, 'I am the greatest of my father''s sons! Your end has come!',14,0,100,0,0,14149, 'General Bjarngrim'), +(28586,1,0, 'Give me your worst!',14,0,100,0,0,14150, 'General Bjarngrim'), +(28586,2,0, 'Defend yourself, for all the good it will do!',14,0,100,0,0,14151, 'General Bjarngrim'), +(28586,3,0, 'GRAAAAAH! Behold the fury of iron and steel!',14,0,100,0,0,14152, 'General Bjarngrim'), +(28586,4,0, 'So ends your curse!',14,0,100,0,0,14153, 'General Bjarngrim'), +(28586,4,1, 'Flesh... is... weak!',14,0,100,0,0,14154, 'General Bjarngrim'), +(28586,4,2, '...',14,0,100,0,0,14155, 'General Bjarngrim'), +(28586,5,0, 'How can it be...? Flesh is not... stronger!',14,0,100,0,0,14156, 'General Bjarngrim'), +(28586,6,0, '%s switches to Defensive Stance!',41,0,100,0,0,0, 'General Bjarngrim'), +(28586,7,0, '%s switches to Battle Stance!',41,0,100,0,0,0, 'General Bjarngrim'), +(28586,8,0, '%s switches to Berserker Stance!',41,0,100,0,0,0, 'General Bjarngrim'); diff --git a/sql/old/3.3.5a/2012_03_01_02_world_locales_creature_text.sql b/sql/old/3.3.5a/2012_03_01_02_world_locales_creature_text.sql new file mode 100644 index 00000000000..c44ca191835 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_01_02_world_locales_creature_text.sql @@ -0,0 +1,15 @@ +DROP TABLE IF EXISTS `locales_creature_text`; +CREATE TABLE `locales_creature_text` ( + `entry` int(10) UNSIGNED NOT NULL, + `textGroup` tinyint(3) UNSIGNED NOT NULL, + `id` int(10) UNSIGNED NOT NULL, + `text_loc1` text, + `text_loc2` text, + `text_loc3` text, + `text_loc4` text, + `text_loc5` text, + `text_loc6` text, + `text_loc7` text, + `text_loc8` text, + PRIMARY KEY (`entry`,`textGroup`,`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/sql/old/3.3.5a/2012_03_03_00_world_command.sql b/sql/old/3.3.5a/2012_03_03_00_world_command.sql new file mode 100644 index 00000000000..52938c0b76b --- /dev/null +++ b/sql/old/3.3.5a/2012_03_03_00_world_command.sql @@ -0,0 +1,9 @@ +DELETE FROM `command` WHERE `name` LIKE 'debug moveflags'; +INSERT INTO `command` (`name`,`security`,`help`) VALUES +('debug moveflags',3,'Syntax: .debug moveflags [$newMoveFlags [$newMoveFlags2]]\r\nNo params given will output the current moveflags of the target'); + +DELETE FROM `trinity_string` WHERE `entry` IN(1143,1144); +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(1143,'Target''s moveFlags: %u, moveFlagsExtra: %u.'), +(1144,'Target''s moveFlags set to: %u, moveFlagsExtra to: %u'); + diff --git a/sql/old/3.3.5a/2012_03_04_00_world_misc.sql b/sql/old/3.3.5a/2012_03_04_00_world_misc.sql new file mode 100644 index 00000000000..af556f648b8 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_04_00_world_misc.sql @@ -0,0 +1,13 @@ +-- Spotlight aura for spotlight NPC +DELETE FROM `creature_template_addon` WHERE `entry`=19913; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(19913,0,0,0,0,'39312'); + +-- Scriptnames for areatriggers +SET @AT_AREA_52_SOUTH := 4472; +SET @AT_AREA_52_NORTH := 4466; +SET @AT_AREA_52_WEST := 4471; +SET @AT_AREA_52_EAST := 4422; +DELETE FROM `areatrigger_scripts` WHERE `entry` IN (@AT_AREA_52_SOUTH,@AT_AREA_52_NORTH,@AT_AREA_52_WEST,@AT_AREA_52_EAST); +INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES +(@AT_AREA_52_SOUTH,"at_area_52_entrance"),(@AT_AREA_52_NORTH,"at_area_52_entrance"),(@AT_AREA_52_WEST,"at_area_52_entrance"),(@AT_AREA_52_EAST,"at_area_52_entrance"); diff --git a/sql/old/3.3.5a/2012_03_04_01_world_areatrigger_scripts.sql b/sql/old/3.3.5a/2012_03_04_01_world_areatrigger_scripts.sql new file mode 100644 index 00000000000..ae4a0bc1f77 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_04_01_world_areatrigger_scripts.sql @@ -0,0 +1,7 @@ +-- Add Area trigger scripts +DELETE FROM `areatrigger_scripts` WHERE `entry` IN (4422,4466,4471,4472); +INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES +(4422,'at_area_52_entrance'), +(4466,'at_area_52_entrance'), +(4471,'at_area_52_entrance'), +(4472,'at_area_52_entrance'); diff --git a/sql/old/3.3.5a/2012_03_06_00_world_commands.sql b/sql/old/3.3.5a/2012_03_06_00_world_commands.sql new file mode 100644 index 00000000000..d782a76c70d --- /dev/null +++ b/sql/old/3.3.5a/2012_03_06_00_world_commands.sql @@ -0,0 +1,3 @@ +DELETE FROM `command` WHERE `name` = 'reload locales_creature_text'; +INSERT INTO `command` (`name`, `security`, `help`) VALUES +('reload locales_creature_text', 3, 'Syntax: .reload locales_creature_text\nReload locales_creature_text Table.'); \ No newline at end of file diff --git a/sql/old/3.3.5a/2012_03_06_01_world_misc.sql b/sql/old/3.3.5a/2012_03_06_01_world_misc.sql new file mode 100644 index 00000000000..7eb208a9673 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_06_01_world_misc.sql @@ -0,0 +1,4 @@ +ALTER TABLE `warden_checks` ENGINE=MYISAM; +ALTER TABLE `achievement_dbc` ENGINE=MYISAM; +ALTER TABLE `creature_text` ENGINE=MYISAM; +ALTER TABLE `game_event_seasonal_questrelation` ENGINE=MYISAM; diff --git a/sql/old/3.3.5a/2012_03_06_02_world_queststatus_seasonal.sql b/sql/old/3.3.5a/2012_03_06_02_world_queststatus_seasonal.sql new file mode 100644 index 00000000000..0efbb6609cf --- /dev/null +++ b/sql/old/3.3.5a/2012_03_06_02_world_queststatus_seasonal.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS `character_queststatus_seasonal`; diff --git a/sql/old/3.3.5a/2012_03_06_03_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_06_03_world_smart_scripts.sql new file mode 100644 index 00000000000..cb2468c4d5c --- /dev/null +++ b/sql/old/3.3.5a/2012_03_06_03_world_smart_scripts.sql @@ -0,0 +1,17 @@ +-- SAI for Elrodan +SET @ENTRY=18743; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); +DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,1,0,100,0,5000,8000,15000,25000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Elrodan - OOC - run script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,11,18744,20,0,0,0,0,0,'Elrodan - Script - Aurosalia say random'), +(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,3000,3000,11,32826,0,0,0,0,0,1,0,0,0,0,0,0,0,'Elrodan - Script - cast Polymorph Cast Visual'); +-- Aurosalia fix model +UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid`=18145; +-- Aurosalia text +DELETE FROM `creature_text` WHERE `entry`=18744; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(18744,0,0, 'Stop!',1,0,100,5,0,0, 'Aurosalia'), +(18744,0,1, 'Will you stop--',1,0,100,274,0,0, 'Aurosalia'), +(18744,0,2, '',1,0,100,6,0,0, 'Aurosalia'); diff --git a/sql/old/3.3.5a/2012_03_06_04_world_creature_text.sql b/sql/old/3.3.5a/2012_03_06_04_world_creature_text.sql new file mode 100644 index 00000000000..f49599e1ba0 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_06_04_world_creature_text.sql @@ -0,0 +1,6 @@ +-- Aurosalia text +DELETE FROM `creature_text` WHERE `entry`=18744; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(18744,0,0, 'Stop!',12,1,100,5,0,0, 'Aurosalia'), +(18744,0,1, 'Will you stop--',12,1,100,6,0,0, 'Aurosalia'), +(18744,0,2, '',12,1,100,274,0,0, 'Aurosalia'); diff --git a/sql/old/3.3.5a/2012_03_07_00_world_trinity_string.sql b/sql/old/3.3.5a/2012_03_07_00_world_trinity_string.sql new file mode 100644 index 00000000000..df5afea5d4f --- /dev/null +++ b/sql/old/3.3.5a/2012_03_07_00_world_trinity_string.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry`=175; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.'); diff --git a/sql/old/3.3.5a/2012_03_10_00_world_creature.sql b/sql/old/3.3.5a/2012_03_10_00_world_creature.sql new file mode 100644 index 00000000000..a0143af73c7 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_10_00_world_creature.sql @@ -0,0 +1,21 @@ +-- Add some missing guids +SET @GUID := 42153; +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+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`) VALUES +(@GUID,32666,530,1,1,0,0,9830.201,-7389.711,13.68803,5.532694,120,0,0,1,0,0), +(@GUID+1,32667,530,1,1,0,0,9859.044,-7406.975,13.7113,1.658063,120,0,0,1,0,0), +(@GUID+2,31144,530,1,1,0,0,9869.401,-7389.657,13.69022,3.90953755,120,0,0,1,0,0), +(@GUID+3,31144,530,1,1,0,0,9871.973,-7392.763,13.6818113,3.35103226,120,0,0,1,0,0), +(@GUID+4,31146,530,1,1,0,0,9850.529,-7395.442,13.72216,4.694936,120,0,0,1,0,0); +-- Addons +DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+4; +DELETE FROM `creature_addon` WHERE `guid`=66686; +INSERT INTO `creature_addon` (`guid`,`bytes2`,`auras`) VALUES +(@GUID,1, '7056 61573'), +(@GUID+1,1, '7056 61573'), +(@GUID+2,1, '7056 61573'), +(@GUID+3,1, '7056 61573'), +(@GUID+4,1, '7056 61573'), +(66686,1, '7056'); +-- convert npc to trigger +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=18504; diff --git a/sql/old/3.3.5a/2012_03_10_00_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_10_00_world_smart_scripts.sql new file mode 100644 index 00000000000..aaa02c2e3df --- /dev/null +++ b/sql/old/3.3.5a/2012_03_10_00_world_smart_scripts.sql @@ -0,0 +1,129 @@ +-- SAI for Champion Vranesh +SET @ENTRY=18146; +UPDATE `creature` SET `position_x`=9834.044,`position_y`=-7480.845,`position_z`=14.93467 WHERE `id`=@ENTRY; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +UPDATE `creature_template_addon` SET `mount`=0 WHERE `entry`=@ENTRY; -- 19085 +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2,@ENTRY*100+3,@ENTRY*100+4); +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 +-- AI +(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On respawn - load path'), +(@ENTRY,0,1,2,40,0,100,0,7,@ENTRY,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,3,4,40,0,100,0,11,@ENTRY,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,5,6,40,0,100,0,25,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,7,8,40,0,100,0,34,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,9,10,40,0,100,0,50,@ENTRY,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), +(@ENTRY,0,11,0,40,0,100,0,57,@ENTRY,0,0,54,600000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), +-- Script 0 +(@ENTRY*100,9,0,0,0,0,100,0,3500,3500,3500,3500,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 0 - emote bow'), +-- Script 1 +(@ENTRY*100+1,9,0,0,0,0,100,0,100,100,100,100,43,0,19085,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - mount horse'), +(@ENTRY*100+1,9,1,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - say 0'), +(@ENTRY*100+1,9,2,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian emote bow'), +(@ENTRY*100+1,9,3,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,19,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian say 0'), +-- Script 2 +(@ENTRY*100+2,9,0,0,0,0,100,0,3000,3000,3000,3000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 2 - say 1'), +(@ENTRY*100+2,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian emote bow'), +(@ENTRY*100+2,9,2,0,0,0,100,0,100,100,100,100,1,1,0,0,0,0,0,19,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian say 1'), +-- Script 3 +(@ENTRY*100+3,9,0,0,0,0,100,0,3000,3000,3000,3000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 2'), +(@ENTRY*100+3,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,30,0,0,0,0,0,'Champion Vranesh - Script 3 - Silvermoon City Guardian emote bow'), +-- Script 4 +(@ENTRY*100+4,9,0,0,0,0,100,0,1000,1000,1000,1000,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 4 - dismount horse'), +(@ENTRY*100+4,9,1,0,0,0,100,0,1000,1000,1000,1000,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 3'); + +-- NPC talk text for Champion Vranesh and Silvermoon City Guardian +DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY,16222); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'Champion Vranesh inclines his head slightly to the pair of guardians in greeting.',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,1,0, 'Champion Vranesh arches a scrulpled brow at the guards. a disapproving scowl on his face',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,2,0, 'Champion Vranesh glances from guard to guard.',16,1,100,0,0,0, 'Champion Vranesh'), +(@ENTRY,3,0, 'Champion Vranesh surveys the small ranger practice ground with a condescending smirk.',16,1,100,0,0,0, 'Champion Vranesh'), +(16222,0,0, 'Glory to the Sun K-- ah... Silvermoon!',12,1,100,0,0,0, 'Silvermoon City Guardian'), +(16222,1,0, 'Our lives are yours, Blood Knight.',12,1,100,0,0,0, 'Silvermoon City Guardian'); + +-- Pathing for Champion Vranesh +DELETE FROM `waypoints` WHERE `entry`=@ENTRY; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY,1,9834.044,-7480.845,14.93467, 'Champion Vranesh'), +(@ENTRY,2,9829.106,-7493.609,14.93653, 'Champion Vranesh'), +(@ENTRY,3,9826.172,-7516.15,19.73714, 'Champion Vranesh'), +(@ENTRY,4,9841.332,-7518.849,19.70547, 'Champion Vranesh'), +(@ENTRY,5,9845.063,-7512.885,19.68096, 'Champion Vranesh'), +(@ENTRY,6,9850.942,-7512.470,19.71548, 'Champion Vranesh'), +(@ENTRY,7,9850.934,-7513.604,19.71813, 'Champion Vranesh'), -- pause 6000 +(@ENTRY,8,9872.733,-7517.256,19.75283, 'Champion Vranesh'), +(@ENTRY,9,9872.419,-7489.979,14.91272, 'Champion Vranesh'), +(@ENTRY,10,9851.401,-7490.209,14.93464, 'Champion Vranesh'), +(@ENTRY,11,9850.948,-7470.096,14.91403, 'Champion Vranesh'), -- pause 1000 +(@ENTRY,12,9851.16,-7469.154,14.91319, 'Champion Vranesh'), +(@ENTRY,13,9849.688,-7442.579,13.50931, 'Champion Vranesh'), +(@ENTRY,14,9848.726,-7423.561,13.31949, 'Champion Vranesh'), +(@ENTRY,15,9816.583,-7423.817,13.30332, 'Champion Vranesh'), +(@ENTRY,16,9794.673,-7424.877,13.50989, 'Champion Vranesh'), +(@ENTRY,17,9794.48,-7442.293,14.40225, 'Champion Vranesh'), +(@ENTRY,18,9767.989,-7442.611,14.39258, 'Champion Vranesh'), +(@ENTRY,19,9767.406,-7422.982,13.35852, 'Champion Vranesh'), +(@ENTRY,20,9739.563,-7422.83,13.28878, 'Champion Vranesh'), +(@ENTRY,21,9736.46,-7440.873,13.53963, 'Champion Vranesh'), +(@ENTRY,22,9740.345,-7464.682,13.57483, 'Champion Vranesh'), +(@ENTRY,23,9746.739,-7482.594,13.55744, 'Champion Vranesh'), +(@ENTRY,24,9748.767,-7486.576,13.54981, 'Champion Vranesh'), +(@ENTRY,25,9753.25,-7486.52,13.5461, 'Champion Vranesh'), -- pause 8000 +(@ENTRY,26,9720.037,-7486.478,13.52865, 'Champion Vranesh'), +(@ENTRY,27,9681.502,-7475.868,13.52783, 'Champion Vranesh'), +(@ENTRY,28,9666.59,-7479.547,13.53783, 'Champion Vranesh'), +(@ENTRY,29,9638.033,-7492.629,13.50889, 'Champion Vranesh'), +(@ENTRY,30,9620.123,-7488.486,13.53853, 'Champion Vranesh'), +(@ENTRY,31,9605.795,-7475.276,13.55774, 'Champion Vranesh'), +(@ENTRY,32,9597.921,-7460.307,13.54336, 'Champion Vranesh'), +(@ENTRY,33,9594.605,-7450.369,13.5353, 'Champion Vranesh'), +(@ENTRY,34,9592.944,-7450.381,13.53116, 'Champion Vranesh'), -- pause 8000 +(@ENTRY,35,9594.605,-7450.369,13.5353, 'Champion Vranesh'), +(@ENTRY,36,9615.793,-7419.515,13.30549, 'Champion Vranesh'), +(@ENTRY,37,9654.939,-7420.383,13.29342, 'Champion Vranesh'), +(@ENTRY,38,9673.072,-7429.818,13.2933, 'Champion Vranesh'), +(@ENTRY,39,9689.373,-7431.429,13.2933, 'Champion Vranesh'), +(@ENTRY,40,9709.577,-7422.25,13.2933, 'Champion Vranesh'), +(@ENTRY,41,9722.3,-7415.217,13.39988, 'Champion Vranesh'), +(@ENTRY,42,9748.049,-7414.597,13.32135, 'Champion Vranesh'), +(@ENTRY,43,9766.792,-7413.542,13.38617, 'Champion Vranesh'), +(@ENTRY,44,9767.26,-7396.828,14.43101, 'Champion Vranesh'), +(@ENTRY,45,9793.145,-7395.393,14.3936, 'Champion Vranesh'), +(@ENTRY,46,9794.217,-7415.122,13.48684, 'Champion Vranesh'), +(@ENTRY,47,9817.575,-7415.299,13.30596, 'Champion Vranesh'), +(@ENTRY,48,9837.021,-7414.861,13.30863, 'Champion Vranesh'), +(@ENTRY,49,9848.048,-7414.794,13.31137, 'Champion Vranesh'), +(@ENTRY,50,9848.199,-7414.07,13.31068, 'Champion Vranesh'), -- pause 7000 +(@ENTRY,51,9847.695,-7415.903,13.31243, 'Champion Vranesh'), +(@ENTRY,52,9848.259,-7428.576,13.33225, 'Champion Vranesh'), +(@ENTRY,53,9846.748,-7446.964,13.56501, 'Champion Vranesh'), +(@ENTRY,54,9850.373,-7465.03,14.9097, 'Champion Vranesh'), +(@ENTRY,55,9850.84,-7480.409,14.93768, 'Champion Vranesh'), +(@ENTRY,56,9840.165,-7480.267,14.92917, 'Champion Vranesh'), +(@ENTRY,57,9843.284,-7480.133,14.92655, 'Champion Vranesh'); -- pause 60000 + +-- SAI for Silvermoon Farstrider +SET @ENTRY=18507; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - Reset - Set Phase 1'), +(@ENTRY,0,1,2,1,1,100,0,3000,3000,5000,5000,11,36802,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 1)'), +(@ENTRY,0,2,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 2 (Phase 1)'), +(@ENTRY,0,3,4,1,2,100,0,3000,3000,5000,5000,11,36803,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 2)'), +(@ENTRY,0,4,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 1 (Phase 2)'); +-- SAI for Silvermoon Ranger +SET @ENTRY=18147; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-64950,-64951,-64952,-64953); +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 +(-64950,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64951,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64952,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29120,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), +(-64953,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29122,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'); diff --git a/sql/old/3.3.5a/2012_03_10_00_world_waypoint_data.sql b/sql/old/3.3.5a/2012_03_10_00_world_waypoint_data.sql new file mode 100644 index 00000000000..01c2bc50402 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_10_00_world_waypoint_data.sql @@ -0,0 +1,25 @@ +-- Silvermoon City Guardian pathing +SET @NPC := 56902; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=9595.755,`position_y`=-7366.754,`position_z`=13.50131 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,9595.755,-7366.754,13.50131,0,0,0,100,0), +(@PATH,2,9594.553,-7336.536,14.15131,0,0,0,100,0), +(@PATH,3,9586.897,-7325.241,14.1312,0,0,0,100,0), +(@PATH,4,9561.705,-7326.179,14.05934,0,0,0,100,0), +(@PATH,5,9519.901,-7327.064,14.12175,0,0,0,100,0), +(@PATH,6,9508.228,-7352.014,14.33403,0,0,0,100,0), +(@PATH,7,9505.697,-7394.406,14.32095,0,0,0,100,0), +(@PATH,8,9535.751,-7396.176,16.8303,0,0,0,100,0), +(@PATH,9,9564.451,-7396.184,16.84703,0,0,0,100,0), +(@PATH,10,9563.777,-7415.961,19.47212,0,0,0,100,0), +(@PATH,11,9559.149,-7418.953,19.47643,0,0,0,100,0), +(@PATH,12,9563.34,-7432.895,15.4851,0,0,0,100,0), +(@PATH,13,9564.645,-7464.229,15.51088,0,0,0,100,0), +(@PATH,14,9588.409,-7464.643,13.52051,0,0,0,100,0), +(@PATH,15,9603.896,-7430.126,13.30448,0,0,0,100,0), +(@PATH,16,9595.137,-7387.862,13.52731,0,0,0,100,0), +(@PATH,17,9572.599,-7384.971,14.39343,0,0,0,100,0), +(@PATH,18,9573.106,-7369.531,14.40827,0,0,0,100,0); diff --git a/sql/old/3.3.5a/2012_03_11_00_world_sai.sql b/sql/old/3.3.5a/2012_03_11_00_world_sai.sql new file mode 100644 index 00000000000..a8cab265ac0 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_11_00_world_sai.sql @@ -0,0 +1,60 @@ +-- Coilfang Guardian + +DELETE FROM `smart_scripts` WHERE `entryorguid`=21873 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 +(21873, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 15000, 11, 28168, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Arcing Smash'), +(21873, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 9080, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Harmstring'), +(21873, 0, 2, 0, 0, 0, 50, 0, 3000, 4000, 10000, 20000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Say 0'); -- randomly guessed timers + +DELETE FROM `creature_text` WHERE `entry`=21873; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(21873, 0, 0, 'By Nazjatar''s Depths!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 1, 'Die, warmblood!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 2, 'For the Master!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 3, 'Illidan reigns!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), +(21873, 0, 4, 'My blood is like venom!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=21873; + +-- Coilfang Strider + +DELETE FROM `smart_scripts` WHERE `entryorguid`=22056 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 +(22056, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 11, 38257, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - On Reset - Cast Panic Periodic'), +(22056, 0, 1, 0, 0, 0, 0, 0, 8000, 8000, 30000, 40000, 11, 38259, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - IC - Cast Mind Blast'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22056; + +-- Coilfang Elite + +DELETE FROM `smart_scripts` WHERE `entryorguid`=22055 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 +(22055, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 20000, 11, 38260, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Cleave'), +(22055, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 38262, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Harmstring'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22055; + +-- Core Hound + +DELETE FROM `smart_scripts` WHERE `entryorguid`=11673 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 11673*100+0 AND 11673*100+5 AND `source_type`=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 +(11673, 0, 0, 0, 0, 0, 0, 0, 10000, 10000, 7000, 7000, 11, 19272, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Lava Breath'), +(11673, 0, 1, 0, 0, 0, 0, 0, 4000, 4000, 6000, 6000, 11, 19319, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Vicious Bite'), +(11673, 0, 2, 0, 0, 0, 0, 0, 15000, 15000, 24000, 24000, 88, 11673*100+0, 11673*100+5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Call random script'), +(11673*100+0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19364, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 0 - Cast Ground Stomp'), +(11673*100+1, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19366, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 1 - Cast Cauterizing Flames'), +(11673*100+2, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19367, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 2 - Cast Withering Heat'), +(11673*100+3, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19369, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 3 - Cast Ancient Despair'), +(11673*100+4, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19372, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 4 - Cast Ancient Hysteria'), +(11673*100+5, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19365, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 5 - Cast Ancient Dread'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=11673; + +-- Shadow of Aran + +DELETE FROM `smart_scripts` WHERE `entryorguid`=18254 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 +(18254, 0, 0, 0, 0, 0, 0, 0, 1000, 1000, 5000, 5000, 11, 29978, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Shadow of Aran - IC - Cast Pyro Blast'); + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=18254; diff --git a/sql/old/3.3.5a/2012_03_12_00_world_creature_template.sql b/sql/old/3.3.5a/2012_03_12_00_world_creature_template.sql new file mode 100644 index 00000000000..cc70ff7a557 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_12_00_world_creature_template.sql @@ -0,0 +1 @@ +ALTER TABLE `creature_template` ADD COLUMN `HoverHeight` FLOAT NOT NULL DEFAULT 1 AFTER `InhabitType`; diff --git a/sql/old/3.3.5a/2012_03_12_01_world_conditions.sql b/sql/old/3.3.5a/2012_03_12_01_world_conditions.sql new file mode 100644 index 00000000000..d58d8f54ddf --- /dev/null +++ b/sql/old/3.3.5a/2012_03_12_01_world_conditions.sql @@ -0,0 +1,3 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=72257; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,72257,0,0,32,0,144,0,0,0,0,'','Remove Marks of the Fallen Champion - target player'); diff --git a/sql/old/3.3.5a/2012_03_12_01_world_gameobject.sql b/sql/old/3.3.5a/2012_03_12_01_world_gameobject.sql new file mode 100644 index 00000000000..38c615a3b0a --- /dev/null +++ b/sql/old/3.3.5a/2012_03_12_01_world_gameobject.sql @@ -0,0 +1,4 @@ +UPDATE `gameobject_template` SET `flags`=0x32 WHERE `entry` IN (202239,202240,202238,202241,201959,202339,202338,202340); + +-- Set Deathbringer's Cache spawned by default +UPDATE `gameobject` SET `spawntimesecs`=604800 WHERE `id` IN (202239,202240,202238,202241); diff --git a/sql/old/3.3.5a/2012_03_12_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_03_12_01_world_spell_script_names.sql new file mode 100644 index 00000000000..db98aa0fbea --- /dev/null +++ b/sql/old/3.3.5a/2012_03_12_01_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_deathbringer_remove_marks'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(72257,'spell_deathbringer_remove_marks'); diff --git a/sql/old/3.3.5a/2012_03_14_00_world_creature_addon.sql b/sql/old/3.3.5a/2012_03_14_00_world_creature_addon.sql new file mode 100644 index 00000000000..c7e4edb97ed --- /dev/null +++ b/sql/old/3.3.5a/2012_03_14_00_world_creature_addon.sql @@ -0,0 +1,2 @@ +UPDATE `creature_addon` SET `bytes1`=0x3000000 WHERE `guid`=207210; +UPDATE `creature_addon` SET `bytes1`=0x3000000 WHERE `guid`=207211; diff --git a/sql/old/3.3.5a/2012_03_19_00_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_19_00_world_smart_scripts.sql new file mode 100644 index 00000000000..20241efa9cc --- /dev/null +++ b/sql/old/3.3.5a/2012_03_19_00_world_smart_scripts.sql @@ -0,0 +1,21 @@ +-- SAI for Unrestrained Dragonhawk +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=25236; +DELETE FROM `smart_scripts` WHERE (`entryorguid`=25236 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 +(25236,0,0,1,62,0,100,0,9143,0,0,0,11,45353,0,0,0,0,0,7,0,0,0,0,0,0,0,'Unrestrained Dragonhawk - On Gossip option select - cast "Quest - Sunwell Daily - Ship Bombing Run Return" on player'), +(25236,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Unrestrained Dragonhawk - On Gossip option select - Close Gossip'); +-- Unrestrained Dragonhawk Gossip +UPDATE `creature_template` SET `gossip_menu_id`=9143 WHERE `entry`=25236; +-- Gossip_menu from UDB +DELETE FROM `gossip_menu` WHERE `entry`=9143; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9143,12371); +-- Gossip_menu_option Update from UDB +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9143; +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 +(9143,0,0, '',1,1,0,0,0,0, ''); +-- Gossip option Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9143; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,9143,0,0,9,11542,0,0,0,'','Show gossip option if player has quest 11542 but not complete'), +(15,9143,0,1,9,11543,0,0,0,'','Show gossip option if player has quest 11543 but not complete'); diff --git a/sql/old/3.3.5a/2012_03_20_00_world_gossip.sql b/sql/old/3.3.5a/2012_03_20_00_world_gossip.sql new file mode 100644 index 00000000000..00214d805e7 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_20_00_world_gossip.sql @@ -0,0 +1,88 @@ +-- Creature Gossip_menu_id Update from sniff +UPDATE `creature_template` SET `gossip_menu_id`=9052 WHERE `entry`=24965; -- Vindicator Xayann +UPDATE `creature_template` SET `gossip_menu_id`=9050 WHERE `entry`=24975; -- Mar'nah +UPDATE `creature_template` SET `gossip_menu_id`=9126 WHERE `entry`=25032; -- Eldara Dawnrunner +UPDATE `creature_template` SET `gossip_menu_id`=9087 WHERE `entry`=25046; -- Smith Hauthaa +UPDATE `creature_template` SET `gossip_menu_id`=9064 WHERE `entry`=25057; -- Battlemage Arynna +UPDATE `creature_template` SET `gossip_menu_id`=9062, `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=25059; -- Ayren Cloudbreaker +UPDATE `creature_template` SET `gossip_menu_id`=9063 WHERE `entry`=25061; -- Harbinger Inuuro +UPDATE `creature_template` SET `gossip_menu_id`=9127 WHERE `entry`=25069; -- Magister Ilastar +UPDATE `creature_template` SET `gossip_menu_id`=9115 WHERE `entry`=25112; -- Anchorite Ayuri +UPDATE `creature_template` SET `gossip_menu_id`=9105 WHERE `entry`=25169; -- Archmage Ne'thul +UPDATE `creature_template` SET `gossip_menu_id`=9286 WHERE `entry`=25632; -- Vindicator Moorba +UPDATE `creature_template` SET `gossip_menu_id`=9285 WHERE `entry`=25638; -- Captain Selana +UPDATE `creature_template` SET `gossip_menu_id`=9198 WHERE `entry`=25950; -- Shaani + +-- Gossip Menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=9050 AND `text_id`=12237; +DELETE FROM `gossip_menu` WHERE `entry`=9052 AND `text_id`=12241; +DELETE FROM `gossip_menu` WHERE `entry`=9062 AND `text_id`=12252; +DELETE FROM `gossip_menu` WHERE `entry`=9063 AND `text_id`=12256; +DELETE FROM `gossip_menu` WHERE `entry`=9064 AND `text_id`=12258; +DELETE FROM `gossip_menu` WHERE `entry`=9087 AND `text_id`=12286; +DELETE FROM `gossip_menu` WHERE `entry`=9115 AND `text_id`=12323; +DELETE FROM `gossip_menu` WHERE `entry`=9126 AND `text_id`=12338; +DELETE FROM `gossip_menu` WHERE `entry`=9127 AND `text_id`=12340; +DELETE FROM `gossip_menu` WHERE `entry`=9198 AND `text_id`=12497; +DELETE FROM `gossip_menu` WHERE `entry`=9285 AND `text_id`=12596; +DELETE FROM `gossip_menu` WHERE `entry`=9286 AND `text_id`=12597; +DELETE FROM `gossip_menu` WHERE `entry`=9287 AND `text_id`=12598; +DELETE FROM `gossip_menu` WHERE `entry`=9288 AND `text_id`=12599; +DELETE FROM `gossip_menu` WHERE `entry`=9289 AND `text_id`=12600; +DELETE FROM `gossip_menu` WHERE `entry`=9290 AND `text_id`=12601; +DELETE FROM `gossip_menu` WHERE `entry`=9293 AND `text_id`=12604; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9050,12237), +(9052,12241), +(9062,12252), +(9063,12256), +(9064,12258), +(9087,12286), +(9115,12323), +(9126,12338), +(9127,12340), +(9198,12497), +(9285,12596), +(9286,12597), +(9287,12598), +(9288,12599), +(9289,12600), +(9290,12601), +(9293,12604); + +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9050,9087,9126,9198,9285,9287,9288,9289) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9062 AND `id` IN (0,1); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9286 AND `id`=2; +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 +(9050,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9062,0,0,'Speaking of action, I''ve been ordered to undertake an air strike.',1,1,0,0,0,0,''), +(9062,1,0,'I need to intercept the Dawnblade reinforcements.',1,1,0,0,0,0,''), +(9087,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9126,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9198,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(9285,0,0,'Give me a situation report, Captain.',1,1,9287,0,0,0,''), +(9286,2,0,'What is the current state of the Sunwell''s Gates?',1,1,9293,0,0,0,''), +(9287,0,0,'What went wrong?',1,1,9288,0,0,0,''), +(9288,0,0,'Why did they stop?',1,1,9289,0,0,0,''), +(9289,0,0,'Your insight is appreciated.',1,1,9290,0,0,0,''); + +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9062 AND `SourceEntry` IN (0,1); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,9062,0,0,0,9,11532,0,0,0,0,'','Show gossip option only if player has taken quest 11532'), +(15,9062,0,0,1,9,11533,0,0,0,0,'','Show gossip option only if player has taken quest 11533'), +(15,9062,1,0,0,9,11542,0,0,0,0,'','Show gossip option only if player has taken quest 11542'), +(15,9062,1,0,1,9,11543,0,0,0,0,'','Show gossip option only if player has taken quest 11543'); + +-- SmartAI +DELETE FROM `smart_scripts` WHERE `entryorguid`=25059 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 +(25059,0,0,2,62,0,100,0,9062,0,0,0,11,45071,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Cast "Quest - Sunwell Daily - Dead Scar Bombing Run" on player'), +(25059,0,1,2,62,0,100,0,9062,1,0,0,11,45113,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Cast "Quest - Sunwell Daily - Ship Bombing Run" on player'), +(25059,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Close Gossip'); + +-- Spell scripts from sniff +DELETE FROM `spell_scripts` WHERE `id`=45071; +INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(45071,2,0,16,12318,1,0,0,0,0,0); -- Play sound diff --git a/sql/old/3.3.5a/2012_03_21_00_world_creature.sql b/sql/old/3.3.5a/2012_03_21_00_world_creature.sql new file mode 100644 index 00000000000..def72f74cd6 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_21_00_world_creature.sql @@ -0,0 +1,71 @@ +-- ToC missing trigger spawns + +SET @GUID := 88412; +SET @NPC_TRIGGER1 := 34704; -- Val'kyr Twins Bullet Stalker Dark +SET @NPC_TRIGGER2 := 34720; -- Val'kyr Twins Bullet Stalker Light + +UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (@NPC_TRIGGER1,@NPC_TRIGGER2); +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+61; +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,@NPC_TRIGGER1,649,15,1,0,0,619.771,143.71,395.244,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+1,@NPC_TRIGGER1,649,15,1,0,0,515.352,115.349,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+2,@NPC_TRIGGER1,649,15,1,0,0,605.514,103.863,395.29,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+3,@NPC_TRIGGER1,649,15,1,0,0,615.137,156.997,395.28,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+4,@NPC_TRIGGER1,649,15,1,0,0,539.179,184.132,395.282,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+5,@NPC_TRIGGER1,649,15,1,0,0,547.76,184.634,395.289,2.93215,7200,0,0,1,0,0,0,0,0), +(@GUID+6,@NPC_TRIGGER1,649,15,1,0,0,549.764,86.4444,395.266,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+7,@NPC_TRIGGER1,649,15,1,0,0,511.417,127.158,395.266,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+8,@NPC_TRIGGER1,649,15,1,0,0,597.38,183.672,395.28,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+9,@NPC_TRIGGER1,649,15,1,0,0,573.578,187.665,395.492,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+10,@NPC_TRIGGER1,649,15,1,0,0,620.465,134.66,395.233,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+11,@NPC_TRIGGER1,649,15,1,0,0,560.484,187.743,395.959,2.93215,7200,0,0,1,0,0,0,0,0), +(@GUID+12,@NPC_TRIGGER1,649,15,1,0,0,577.299,186.854,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+13,@NPC_TRIGGER1,649,15,1,0,0,563.467,81.9323,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+14,@NPC_TRIGGER1,649,15,1,0,0,534.748,92.6424,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+15,@NPC_TRIGGER1,649,15,1,0,0,518.503,170.649,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+16,@NPC_TRIGGER1,649,15,1,0,0,514.566,159.918,395.287,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+17,@NPC_TRIGGER1,649,15,1,0,0,568.049,187.67,395.563,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+18,@NPC_TRIGGER1,649,15,1,0,0,522.955,102.127,395.29,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+19,@NPC_TRIGGER1,649,15,1,0,0,611.656,114.281,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+20,@NPC_TRIGGER1,649,15,1,0,0,616.432,126.418,395.264,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+21,@NPC_TRIGGER1,649,15,1,0,0,526.833,181.783,395.285,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+22,@NPC_TRIGGER1,649,15,1,0,0,578.722,87.4444,395.272,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+23,@NPC_TRIGGER1,649,15,1,0,0,509.743,149.005,395.253,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+24,@NPC_TRIGGER1,649,15,1,0,0,592.736,93.6667,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+25,@NPC_TRIGGER1,649,15,1,0,0,506.038,139.517,395.288,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+26,@NPC_TRIGGER1,649,15,1,0,0,608.116,171.731,395.289,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+27,@NPC_TRIGGER1,649,15,1,0,0,586.344,184.078,395.283,4.60767,7200,0,0,1,0,0,0,0,0), +(@GUID+28,@NPC_TRIGGER1,649,15,1,0,0,554.818,187.568,395.288,2.93215,7200,0,0,1,0,0,0,0,0), +(@GUID+29,@NPC_TRIGGER2,649,15,1,0,0,557.743,187.729,395.915,0,7200,0,0,1,0,0,0,0,0), +(@GUID+30,@NPC_TRIGGER2,649,15,1,0,0,544.094,184.648,395.286,0,7200,0,0,1,0,0,0,0,0), +(@GUID+31,@NPC_TRIGGER2,649,15,1,0,0,551.328,187.646,395.596,0,7200,0,0,1,0,0,0,0,0), +(@GUID+32,@NPC_TRIGGER2,649,15,1,0,0,615.137,150.818,395.269,0,7200,0,0,1,0,0,0,0,0), +(@GUID+33,@NPC_TRIGGER2,649,15,1,0,0,571.158,187.691,395.629,0,7200,0,0,1,0,0,0,0,0), +(@GUID+34,@NPC_TRIGGER2,649,15,1,0,0,606.686,106.731,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+35,@NPC_TRIGGER2,649,15,1,0,0,612.118,118.844,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+36,@NPC_TRIGGER2,649,15,1,0,0,546.057,88.7691,395.284,0,7200,0,0,1,0,0,0,0,0), +(@GUID+37,@NPC_TRIGGER2,649,15,1,0,0,517.722,169.069,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+38,@NPC_TRIGGER2,649,15,1,0,0,507.181,142.285,395.255,0,7200,0,0,1,0,0,0,0,0), +(@GUID+39,@NPC_TRIGGER2,649,15,1,0,0,515.399,159.75,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+40,@NPC_TRIGGER2,649,15,1,0,0,592.151,183.8,395.279,0,7200,0,0,1,0,0,0,0,0), +(@GUID+41,@NPC_TRIGGER2,649,15,1,0,0,510.759,127.333,395.263,0,7200,0,0,1,0,0,0,0,0), +(@GUID+42,@NPC_TRIGGER2,649,15,1,0,0,524.257,178.134,395.29,0,7200,0,0,1,0,0,0,0,0), +(@GUID+43,@NPC_TRIGGER2,649,15,1,0,0,570.779,86.2986,395.253,0,7200,0,0,1,0,0,0,0,0), +(@GUID+44,@NPC_TRIGGER2,649,15,1,0,0,588.675,93.0938,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+45,@NPC_TRIGGER2,649,15,1,0,0,603.528,175.476,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+46,@NPC_TRIGGER2,649,15,1,0,0,509.639,133.26,395.247,0,7200,0,0,1,0,0,0,0,0), +(@GUID+47,@NPC_TRIGGER2,649,15,1,0,0,618.965,139.174,395.288,0,7200,0,0,1,0,0,0,0,0), +(@GUID+48,@NPC_TRIGGER2,649,15,1,0,0,514.785,118.731,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+49,@NPC_TRIGGER2,649,15,1,0,0,581.243,184.062,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+50,@NPC_TRIGGER2,649,15,1,0,0,577.757,184.436,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+51,@NPC_TRIGGER2,649,15,1,0,0,580.486,89.691,395.287,0,7200,0,0,1,0,0,0,0,0), +(@GUID+52,@NPC_TRIGGER2,649,15,1,0,0,511.132,151.156,395.264,0,7200,0,0,1,0,0,0,0,0), +(@GUID+53,@NPC_TRIGGER2,649,15,1,0,0,615.401,130.816,395.263,0,7200,0,0,1,0,0,0,0,0), +(@GUID+54,@NPC_TRIGGER2,649,15,1,0,0,599.307,98.8003,395.29,0,7200,0,0,1,0,0,0,0,0), +(@GUID+55,@NPC_TRIGGER2,649,15,1,0,0,520.212,108.429,395.289,0,7200,0,0,1,0,0,0,0,0), +(@GUID+56,@NPC_TRIGGER2,649,15,1,0,0,610.983,164.696,395.288,0,7200,0,0,1,0,0,0,0,0), +(@GUID+57,@NPC_TRIGGER2,649,15,1,0,0,526.337,99.5556,395.29,0,7200,0,0,1,0,0,0,0,0), +(@GUID+58,@NPC_TRIGGER2,649,15,1,0,0,563.997,187.644,395.489,0,7200,0,0,1,0,0,0,0,0), +(@GUID+59,@NPC_TRIGGER2,649,15,1,0,0,555.695,86.0208,395.253,0,7200,0,0,1,0,0,0,0,0), +(@GUID+60,@NPC_TRIGGER2,649,15,1,0,0,535.924,184.207,395.279,0,7200,0,0,1,0,0,0,0,0), +(@GUID+61,@NPC_TRIGGER2,649,15,1,0,0,538.024,92.441,395.289,0,7200,0,0,1,0,0,0,0,0); diff --git a/sql/old/3.3.5a/2012_03_22_00_world_creature_template.sql b/sql/old/3.3.5a/2012_03_22_00_world_creature_template.sql new file mode 100644 index 00000000000..e6c03ed589c --- /dev/null +++ b/sql/old/3.3.5a/2012_03_22_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Flame Sphere should not be visible to players(only their visual) +UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (30106,31686,31687); diff --git a/sql/old/3.3.5a/2012_03_22_01_world_conditions.sql b/sql/old/3.3.5a/2012_03_22_01_world_conditions.sql new file mode 100644 index 00000000000..074328137a5 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_22_01_world_conditions.sql @@ -0,0 +1,2 @@ +-- Manual: Heavy Frostweave Bandage should be lootable if you have at least 390 skills in First Aid +UPDATE `conditions` SET `ConditionValue2`=390 WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry`=39152 AND `ConditionTypeOrReference`=7 AND `ConditionValue1`=129; diff --git a/sql/old/3.3.5a/2012_03_23_00_world_ip2nation.sql b/sql/old/3.3.5a/2012_03_23_00_world_ip2nation.sql new file mode 100644 index 00000000000..dadeaddf85a --- /dev/null +++ b/sql/old/3.3.5a/2012_03_23_00_world_ip2nation.sql @@ -0,0 +1,21 @@ +DROP TABLE IF EXISTS ip2nation; + +CREATE TABLE ip2nation ( + ip int(11) unsigned NOT NULL default '0', + country char(2) NOT NULL default '', + KEY ip (ip) +); + +DROP TABLE IF EXISTS ip2nationCountries; + +CREATE TABLE ip2nationCountries ( + code varchar(4) NOT NULL default '', + iso_code_2 varchar(2) NOT NULL default '', + iso_code_3 varchar(3) default '', + iso_country varchar(255) NOT NULL default '', + country varchar(255) NOT NULL default '', + lat float NOT NULL default '0', + lon float NOT NULL default '0', + PRIMARY KEY (code), + KEY code (code) +); diff --git a/sql/old/3.3.5a/2012_03_24_00_world_misc.sql b/sql/old/3.3.5a/2012_03_24_00_world_misc.sql new file mode 100644 index 00000000000..e6f6ce77307 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_24_00_world_misc.sql @@ -0,0 +1,22 @@ +-- Beam Visual +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=60342; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,60342,0,0,31,0,3,29308,0,0,0,'','Beam Visual target Prince Taldaram'); + +-- script texts for Prince Taldaram +DELETE FROM `creature_text` WHERE `entry`=29308; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(29308,0,0,'The hum of magic energy in the air diminishes...',16,0,100,0,0,0,'prince taldaram SAY_1'), +(29308,1,0,'Intruders! Who trespasses in the Old Kingdom?',14,0,100,0,0,0,'prince taldaram SAY_WARNING'), +(29308,2,0,'I will feast on your remains.',14,0,100,0,0,14360,'prince taldaram SAY_AGGRO'), +(29308,3,0,'',14,10,100,0,0,14365,'prince taldaram SAY_SLAY_0'), +(29308,3,1,'I will drink no blood before it''s time.',14,0,100,0,0,14366,'prince taldaram SAY_SLAY_1'), +(29308,3,2,'One final embrace.',14,0,100,0,0,14367,'prince taldaram SAY_SLAY_2'), +(29308,4,0,'Still I hunger. Still... I... thirst.',14,0,100,0,0,14368,'prince taldaram SAY_DEATH'), +(29308,5,0,'So... appetizing.',14,0,100,0,0,14363,'prince taldaram SAY_FEED1'), +(29308,5,1,'Fresh, warm blood. It has been too long.',14,0,100,0,0,14364,'prince taldaram SAY_FEED2'), +(29308,6,0,'Your heartbeat is... music to my ears.',14,0,100,0,0,14361,'prince taldaram SAY_VANISH1'), +(29308,6,1,'I am nowhere... I am everywhere. I am the watcher, unseen.',14,0,100,0,0,14362,'prince taldaram SAY_VANISH2'); + +-- cleanup +DELETE FROM `script_texts` WHERE `npc_entry`=29308; diff --git a/sql/old/3.3.5a/2012_03_24_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_03_24_01_world_creature_loot_template.sql new file mode 100644 index 00000000000..078c48a47b7 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_24_01_world_creature_loot_template.sql @@ -0,0 +1,290 @@ +-- ----------------------------------- +-- -- Loot for The Siege of Ulduar -- +-- ----------------------------------- + +-- Old Cleanups: +DELETE FROM `reference_loot_template` WHERE `entry` IN ( 34116,34117,34118,34119,34120,34121,34157,34158,34159,34160,34161,34162); +-- ------------------- +-- -- Set Variables -- +-- ------------------- +-- 10 man mode npcids +SET @FlameLevi10 :=33113; +SET @IgnisFM10 :=33118; +SET @Razorscale10 :=33186; +SET @XT002_10 :=33293; +-- 25 man mode npcids (via procedure) +call `sp_get_npc_diffentry`(@FlameLevi10,1,@FlameLevi25); +call `sp_get_npc_diffentry`(@IgnisFM10,1,@IgnisFM25); +call `sp_get_npc_diffentry`(@Razorscale10,1,@Razorscale25); +call `sp_get_npc_diffentry`(@XT002_10,1,@XT002_25); + +SET @Emblem := 47241; +SET @Orb := 45087; +-- ------------------------------------- +-- -- Set Reference Loot Template ids -- +-- ------------------------------------- + +SET @EmblemRef := 34349; -- First Free ID +SET @OrbRef := @EmblemRef+1; +SET @Flame10Ref := @EmblemRef+2; +SET @Flame25Ref := @EmblemRef+3; +SET @Ignis10Ref := @EmblemRef+4; +SET @Ignis25Ref := @EmblemRef+5; +SET @Razor10Ref := @EmblemRef+6; +SET @Razor25Ref := @EmblemRef+7; +SET @XT002_10Ref := @EmblemRef+8; +SET @XT002_25Ref := @EmblemRef+9; +-- Flame Levithian +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @EmblemRef AND @EmblemRef+9; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Emblem Ref +(@EmblemRef,47241,0,1,1,1,1), -- Emblem of Triumph 1x +-- OrbRef +(@OrbRef,45087,0,1,1,1,1), -- Runed Orb 1x +-- Flame Levithian 10man +(@Flame10Ref,45286,0,1,1,1,1), -- Pyrite Infuser +(@Flame10Ref,45287,0,1,1,1,1), -- Firesoul +(@Flame10Ref,45288,0,1,1,1,1), -- Firestrider Chestguard +(@Flame10Ref,45289,0,1,1,1,1), -- Lifespark Visage +(@Flame10Ref,45291,0,1,1,1,1), -- Combustion Bracers +(@Flame10Ref,45284,0,1,1,1,1), -- Kinetic Ripper +(@Flame10Ref,45282,0,1,1,1,1), -- Ironsoul +(@Flame10Ref,45285,0,1,1,1,1), -- Might of the Leviathan +(@Flame10Ref,45292,0,1,1,1,1), -- Energy Siphon +(@Flame10Ref,45283,0,1,1,1,1), -- Flamewatch Armguards +-- Flame Levithian 25man +(@Flame25Ref,45117,0,1,1,1,1), -- Constructors Handwraps +(@Flame25Ref,45119,0,1,1,1,1), -- Embrace of the Leviathan +(@Flame25Ref,45113,0,1,1,1,1), -- Glowing Ring of Reclamation +(@Flame25Ref,45115,0,1,1,1,1), -- Leviathan Fueling Manual +(@Flame25Ref,45108,0,1,1,1,1), -- Mechanists Bindings +(@Flame25Ref,45106,0,1,1,1,1), -- Strenght of the Automaton +(@Flame25Ref,45109,0,1,1,1,1), -- Gloves of the Fiery Behemoth +(@Flame25Ref,45114,0,1,1,1,1), -- Steamcallers Totem +(@Flame25Ref,45118,0,1,1,1,1), -- Steamworkers Goggles +(@Flame25Ref,45116,0,1,1,1,1), -- Freya's Choker of Warding +(@Flame25Ref,45111,0,1,1,1,1), -- Mimiron's Inferno Couplings +(@Flame25Ref,45112,0,1,1,1,1), -- The Leviathan's Coil +(@Flame25Ref,45107,0,1,1,1,1), -- Iron Riveted War Helm + +-- Ignis the Furnace Master 10man +(@Ignis10Ref,45309,0,1,1,1,1), -- Rifle of the Platinum Guard +(@Ignis10Ref,45310,0,1,1,1,1), -- Gauntlets of the Iron Furnace +(@Ignis10Ref,45311,0,1,1,1,1), -- Relentless Edge +(@Ignis10Ref,45312,0,1,1,1,1), -- Gloves of Smoldering Touch +(@Ignis10Ref,45313,0,1,1,1,1), -- Furnace Stone +(@Ignis10Ref,45314,0,1,1,1,1), -- Igniter Rod +(@Ignis10Ref,45316,0,1,1,1,1), -- Armbraces of the Vibrant Flame +(@Ignis10Ref,45317,0,1,1,1,1), -- Shawl of the Caretaker +(@Ignis10Ref,45318,0,1,1,1,1), -- Drape of Fuming Anger +(@Ignis10Ref,45321,0,1,1,1,1), -- Pauldrons of Tempered Will +-- Ignis the Furnace Master 25man +(@Ignis25Ref,45157,0,1,1,1,1), -- Cindershard Ring +(@Ignis25Ref,45158,0,1,1,1,1), -- Heart of Iron +(@Ignis25Ref,45161,0,1,1,1,1), -- Girdle of Embers +(@Ignis25Ref,45162,0,1,1,1,1), -- Flamestalker Boots +(@Ignis25Ref,45164,0,1,1,1,1), -- Helm of the Furnace Master +(@Ignis25Ref,45165,0,1,1,1,1), -- Worldcarver +(@Ignis25Ref,45166,0,1,1,1,1), -- Charred Saronite Greaves +(@Ignis25Ref,45167,0,1,1,1,1), -- Lifeforge Breastplate +(@Ignis25Ref,45168,0,1,1,1,1), -- Pyrelight Circle +(@Ignis25Ref,45169,0,1,1,1,1), -- Totem of the Dancing Flame +(@Ignis25Ref,45170,0,1,1,1,1), -- Scepter of Creation +(@Ignis25Ref,45171,0,1,1,1,1), -- Intensity +(@Ignis25Ref,45185,0,1,1,1,1), -- Flamewrought Cinch +(@Ignis25Ref,45186,0,1,1,1,1), -- Soot-Covered Mantle +(@Ignis25Ref,45187,0,1,1,1,1), -- Wristguards of the Firetender + +-- Razorscale 10man +(@Razor10Ref,45298,0,1,1,1,1), -- RazoRazorcale Talon +(@Razor10Ref,45299,0,1,1,1,1), -- Dragonsteel Faceplate +(@Razor10Ref,45301,0,1,1,1,1), -- BraceRazor of the Smothering Inferno +(@Razor10Ref,45302,0,1,1,1,1), -- Treads of the Invader +(@Razor10Ref,45303,0,1,1,1,1), -- Band of Draconic Guile +(@Razor10Ref,45304,0,1,1,1,1), -- Stormtempered Girdle +(@Razor10Ref,45305,0,1,1,1,1), -- Breastplate of the Afterlife +(@Razor10Ref,45306,0,1,1,1,1), -- Binding of the Dragon Matriarch +(@Razor10Ref,45307,0,1,1,1,1), -- Ironscale Leggings +(@Razor10Ref,45308,0,1,1,1,1), -- Eye of the Broodmother +-- Razorscale 25man +(@Razor25Ref,45137,0,1,1,1,1), -- Veranus' Bane +(@Razor25Ref,45138,0,1,1,1,1), -- Drape of the Drakerider +(@Razor25Ref,45139,0,1,1,1,1), -- Dragonslayer's Brace +(@Razor25Ref,45140,0,1,1,1,1), -- RazoRazorcale Shoulderguards +(@Razor25Ref,45141,0,1,1,1,1), -- Proto-hide Leggings +(@Razor25Ref,45142,0,1,1,1,1), -- RemoRazore +(@Razor25Ref,45143,0,1,1,1,1), -- Saronite Mesh Legguards +(@Razor25Ref,45144,0,1,1,1,1), -- Sigil of Deflection +(@Razor25Ref,45146,0,1,1,1,1), -- Shackles of the Odalisque +(@Razor25Ref,45147,0,1,1,1,1), -- Guiding Star +(@Razor25Ref,45148,0,1,1,1,1), -- Living Flame +(@Razor25Ref,45149,0,1,1,1,1), -- BraceRazor of the Broodmother +(@Razor25Ref,45150,0,1,1,1,1), -- Collar of the Wyrmhunter +(@Razor25Ref,45151,0,1,1,1,1), -- Belt of the Fallen Wyrm +(@Razor25Ref,45510,0,1,1,1,1), -- Libram of Discord + +-- XT-002 Deconstructor 10man +(@XT002_10Ref,45675,0,1,1,1,1), -- Power Enchancing Loop +(@XT002_10Ref,45676,0,1,1,1,1), -- Chestplate of Vicious Potency +(@XT002_10Ref,45677,0,1,1,1,1), -- Treacherous shoulderpads +(@XT002_10Ref,45679,0,1,1,1,1), -- Gloves of Taut grip +(@XT002_10Ref,45680,0,1,1,1,1), -- Armbands of the construct +(@XT002_10Ref,45682,0,1,1,1,1), -- Pulsing spellshield +(@XT002_10Ref,45685,0,1,1,1,1), -- Plasma Foil +(@XT002_10Ref,45686,0,1,1,1,1), -- Vest of the glowing Cresent +(@XT002_10Ref,45687,0,1,1,1,1), -- Helm of Veiled Energies +(@XT002_10Ref,45694,0,1,1,1,1), -- Conductive cord +(@XT002_10Ref,45867,0,2,2,1,1), -- Breasktplate of the Stoneshaper +(@XT002_10Ref,45868,0,2,2,1,1), -- Aesir's Edge +(@XT002_10Ref,45869,0,2,2,1,1), -- Fluxing Energy Coils +(@XT002_10Ref,45870,0,2,2,1,1), -- Magnetized Projectile Emitter +(@XT002_10Ref,45871,0,2,2,1,1), -- Seal of Ulduar +-- XT-002 Deconstructor 25man +(@XT002_25Ref,45254,0,1,1,1,1), -- Sigil of the Vengeful Heart +(@XT002_25Ref,45251,0,1,1,1,1), -- Shoulderplates of the Deconstructor +(@XT002_25Ref,45247,0,1,1,1,1), -- Signet of the Earthshaker +(@XT002_25Ref,45256,0,1,1,1,1), -- Twisted Visage +(@XT002_25Ref,45250,0,1,1,1,1), -- Crazed Construct Ring +(@XT002_25Ref,45257,0,1,1,1,1), -- Quartz Crystal Wand +(@XT002_25Ref,45260,0,1,1,1,1), -- Boots of Hasty Revival +(@XT002_25Ref,45252,0,1,1,1,1), -- Horologist's Wristguards +(@XT002_25Ref,45253,0,1,1,1,1), -- Mantle of Wavering Calm +(@XT002_25Ref,45258,0,1,1,1,1), -- Sandals of Rash Temperament +(@XT002_25Ref,45249,0,1,1,1,1), -- Brass-lined Boots +(@XT002_25Ref,45246,0,1,1,1,1), -- Golem-Shard Sticker +(@XT002_25Ref,45248,0,1,1,1,1), -- Clockwork Legplates +(@XT002_25Ref,45259,0,1,1,1,1), -- Quartz-studded Harness +(@XT002_25Ref,45255,0,1,1,1,1); -- Thunderfall Totem +-- ----------------------------------------------------------------------------------------------- +-- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- +-- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- +-- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- +-- ----------------------------------------------------------------------------------------------- + +-- Flame Levithian 10Man: +-- NORMAL MODE : 2x [Normal Loot Item] + 1x [Emblem of Valor] +-- ONE TOWER : 2x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Recipe] +-- TWO TOWERS : 2x [Normal Loot Item] + 2x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] +-- THREE TOWERS: 2x [Normal Loot Item] + 3x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] + 1x [Recipe] +-- FOUR TOWERS : 2x [Normal Loot Item] + 3x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] + 1x [Recipe] + 1x [Hard Loot Item] +-- Flame Levithian 25 man +-- NORMAL MODE : 3x [Normal Loot Item] + 1x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] +-- ONE TOWER : 3x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] +-- TWO TOWERS : 3x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] +-- THREE TOWERS: 3x [Normal Loot Item] + 3x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] + [Recipe] +-- FOUR TOWERS : 3x [Normal Loot Item] + 3x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] + [Recipe] + 1x [Hard Loot Item] + +DELETE FROM `creature_loot_template` WHERE `entry` IN (@FlameLevi10,@FlameLevi25,@IgnisFM10,@IgnisFM25,@Razorscale10,@Razorscale25,@XT002_10,@XT002_25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- --------------------------- +-- -- Flame Levithian 10man -- +-- --------------------------- +(@FlameLevi10,1,100,1,0,-@EmblemRef,1), -- 1x emblem +(@FlameLevi10,2,100,1,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 1 tower left +(@FlameLevi10,3,100,2,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi10,4,100,2,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 2 towers left +(@FlameLevi10,5,100,4,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi10,6,100,4,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 3 towers left +(@FlameLevi10,7,100,8,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi10,8,100,8,0,-@Flame10Ref,2), -- 2 from 10man reference +-- Hardmode: 4 towers left +(@FlameLevi10,9,100,16,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi10,10,100,16,0,-@Flame10Ref,2), -- 2 from 10man reference +-- one from hardmodeloot: +(@FlameLevi10,45296,0,16,1,1,1), -- Twirling Blades +(@FlameLevi10,45293,0,16,1,1,1), -- Handguards of Potent Cures +(@FlameLevi10,45295,0,16,1,1,1), -- Gilded Steel Legplates +(@FlameLevi10,45300,0,16,1,1,1), -- Mantle of Fiery Vengeance +(@FlameLevi10,45297,0,16,1,1,1), -- Shimmering Seal +-- Shared Loot over the modes (masked) +-- Non-Normal (Modes 2|4|8|16) +(@FlameLevi10,11,5,30,0,-34154,1), -- 1 from recepies (chanced) +-- More then 1 tower up (Modes 4|8|16) +(@FlameLevi10,@Orb,100,28,0,1,3), -- Runed Orb (1-3) +-- More then 2 towers up (Modes 8|16) +(@FlameLevi10,12,100,24,0,-34154,1), -- 1 from recepies +-- --------------------------- +-- -- Flame Levithian 25man -- +-- --------------------------- +(@FlameLevi25,1,100,1,0,-@EmblemRef,1), -- 1x emblem +(@FlameLevi25,2,100,1,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 1 tower left +(@FlameLevi25,3,100,2,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi25,4,100,2,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 2 towers left +(@FlameLevi25,5,100,4,0,-@EmblemRef,2), -- 2x emblem +(@FlameLevi25,6,100,4,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 3 towers left +(@FlameLevi25,7,100,8,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi25,8,100,8,0,-@Flame25Ref,3), -- 3 from 25man reference +-- Hardmode: 4 towers left +(@FlameLevi25,9,100,16,0,-@EmblemRef,3), -- 3x emblem +(@FlameLevi25,10,100,16,0,-@Flame25Ref,3), -- 3 from 25man reference +-- one from hardmodeloot: +(@FlameLevi25,45132,0,16,1,1,1), -- Golden Saronite Dragon +(@FlameLevi25,45133,0,16,1,1,1), -- Pendant of Fiery Havoc +(@FlameLevi25,45134,0,16,1,1,1), -- Plated Leggings of Ruination +(@FlameLevi25,45135,0,16,1,1,1), -- Boots of Fiery Resolution +(@FlameLevi25,45136,0,16,1,1,1), -- Shoulderpads of Dormant Energies +(@FlameLevi25,45086,0,16,1,1,1), -- Rising Sun +(@FlameLevi25,45110,0,16,1,1,1), -- Titanguard +-- Shared Loot over the modes (masked) +-- All Modes (1|2|4|8|16): +(@FlameLevi25,11,5,31,0,-@OrbRef,1), -- Runed Orb (1x Chanced) +(@FlameLevi25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@FlameLevi25,12,5,31,0,-34154,1), -- 1 from recepies (chanced) +-- More then 1 tower up (Modes 4|8|16) +(@FlameLevi25,13,100,28,0,-@OrbRef,2), -- Runed Orb (2x garanteed) +-- More then 2 towers up (Modes 8|16) +(@FlameLevi25,14,100,24,0,-34154,1), -- 1 from recepies +-- ------------------------------ +-- -- IGNIS THE FURNACE MASTER -- +-- ------------------------------ +-- Ignis the Furnace Master 10man +(@IgnisFM10,1,100,1,0,-@Ignis10Ref,2), -- 2 items from Ref loot +(@IgnisFM10,@Emblem,100,1,0,1,1), -- 1 Emblem +-- Ignis the Furnace Master 25man +(@IgnisFM25,1,100,1,0,-@Ignis25Ref,3), -- 3 items from Ref loot +(@IgnisFM25,@Emblem,100,1,0,2,2), -- 2 Emblem +(@IgnisFM25,3,10,1,0,-34154,1), -- 1 from recepies +(@IgnisFM25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@IgnisFM25,45087,75,1,0,1,1), -- Runed Orb +-- ---------------- +-- -- RAZORSCALE -- +-- ---------------- +-- Razorscale 10man +(@Razorscale10,1,100,1,0,-@Razor10Ref ,2), -- 2 items from ref loot +(@Razorscale10,@Emblem,100,1,0,1,1), -- Emblem of Triumph +-- Razorscale 25man +(@Razorscale25,1,100,1,0,-@Razor25Ref,3), -- 3 items from Ref loot +(@Razorscale25,@Emblem,100,1,0,1,2), -- 2 Emblems +(@Razorscale25,2,10,1,0,-34154,1), -- 1 from recepies +(@Razorscale25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@Razorscale25,45087,75,1,0,1,1), -- Runed Orb +-- ------------------------- +-- -- XT002 DECONSTRUCTOR -- +-- ------------------------- +-- X002 Deconstructor 10man (and hardmode) +(@XT002_10,1,100,3,0,-@XT002_10Ref,2), -- 2items from Ref loot +(@XT002_10,@Emblem,100,3,0,1,1), -- 1x Emblem +-- Hard mode 10man only: +(@XT002_10,45442,0,2,1,1,1), -- Sorthalis,Hammer of the Watchers +(@XT002_10,45443,0,2,1,1,1), -- Charm of Meticulous Timing +(@XT002_10,45444,0,2,1,1,1), -- Gloves of the Steady Hand +(@XT002_10,45445,0,2,1,1,1), -- Breastplate of the Devoted +(@XT002_10,45446,0,2,1,1,1), -- Grasps of Reason +-- X002 Deconstructor 25man (and hardmode) +(@XT002_25,1,100,3,0,-@XT002_25Ref,3), -- 3 items from Ref loot +(@XT002_25,2,10,3,0,-34154,1), -- 1 from recepies +(@XT002_25,45038,8,3,0,1,1), -- Fragment of Val'anyr (quest only!?) +(@XT002_25,45087,75,3,0,1,1), -- Runed Orb +(@XT002_25,47241,100,3,0,1,2), -- 2 Emblem of Triumph +-- Hard Mode 25man only: +(@XT002_25,45442,0,2,1,1,1), -- Sorthalis,Hammer of the Watchers +(@XT002_25,45443,0,2,1,1,1), -- Charm of Meticulous Timing +(@XT002_25,45444,0,2,1,1,1), -- Gloves of the Steady Hand +(@XT002_25,45445,0,2,1,1,1), -- Breastplate of the Devoted +(@XT002_25,45446,0,2,1,1,1); -- Grasps of Reason diff --git a/sql/old/3.3.5a/2012_03_24_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_03_24_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..cdac3335aed --- /dev/null +++ b/sql/old/3.3.5a/2012_03_24_02_world_creature_loot_template.sql @@ -0,0 +1,136 @@ +-- (re) Add reference 26042 +SET @NEC := 26042; -- Northrend Emotion Cooking Recipe Reference +DELETE FROM `reference_loot_template` WHERE `entry`=@NEC; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@NEC,43507,0,1,1,1,1), -- Recipe: Tasty cupcake +(@NEC,43508,0,1,1,1,1), -- Recipe: Last Week's Mammoth +(@NEC,43509,0,1,1,1,1), -- Recipe: Bad Clams +(@NEC,43510,0,1,1,1,1); -- Recipe: Haunted Herring + +DELETE FROM `creature_loot_template` WHERE `entry` IN (2436,5928,5936,12239,12240,12241,12242,12243,14527,14529,14531,16506,16836,17307,21166,23809,23954,23963,23964,23983,24175,25234,28027,28113,28138,28494,29554,30177,30954,31779,40419); +UPDATE `creature_template`SET `lootid`=entry WHERE `entry` IN (2436,5928,5936,12239,12240,12241,12242,12243,14527,14529,14531,16506,16836,21166,23809,23963,23964,23983,25234,28027,28138,28494,29554,30954,31779,40419); +UPDATE `creature_template` SET `lootid`=0 WHERE `entry` IN (17307,23954,24175,28113,30177); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Farmer Kent (friendly?) +(2436,3692,-100,1,0,1,1), -- Hilsbrad Human Skull +-- Sorrow Wing +(5928,5808,-50,1,0,1,1), -- Pridewing Venom Sac +(5928,5137,80,1,0,1,1), -- Bright Eyeball +(5928,5136,10,1,0,1,1), -- Torn Furry Ear +(5928,1,100,1,0,-@NEC,1), -- Random world green drop ilvl 25-30 +-- Orca +(5936,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(5936,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(5936,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(5936,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(5936,26005,1,1,1,-26005,1), -- Northrend World Green Reference #3 +(5936,26006,1,1,1,-26006,1), -- Northrend World Green Reference #4 +(5936,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(5936,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(5936,26019,0.5,1,1,-26019,1), -- Northrend World Blue Reference #3 +(5936,26020,0.5,1,1,-26020,1), -- Northrend World Blue Reference #4 +-- Add Theradric Crystal Carving (17684) to the following creatures +(12239,17684,-25,1,0,1,1), -- Spirit of Gelk +(12240,17684,-25,1,0,1,1), -- Spirit of Kolk +(12241,17684,-25,1,0,1,1), -- Spirit of Magra +(12242,17684,-25,1,0,1,1), -- Spirit of Maraudos +(12243,17684,-25,1,0,1,1), -- Spirit of Veng +(14527,18952,-100,1,0,1,1), -- Simone the Inconspicuous - Simone's Head +(14529,18953,-100,1,0,1,1), -- Franklin the Friendly - Klinfran's Head +(14531,18955,-100,1,0,1,1), -- Artorius the Amiable - Artorius's Head +(16506,22708,-100,1,0,1,1), -- Naxxramas Worshipper - Fate of Ramaladni +(16836,23460,-100,1,0,1,1), -- Escaped Dreghood - Broken Blood Sample +(21166,30451,-15,1,0,1,1), -- Illidari Dreadlord - Lohn'goron, Bow of the Torn-heart +-- Vengeance Landing Cannoneer +(23809,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23809,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23809,26005,1,1,1,-26005,1), -- Northrend World Green Reference #3 +-- Sergeant Lorric +(23963,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23963,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23963,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(23963,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(23963,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(23963,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(23963,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +-- Lieutenant Celeyne +(23964,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23964,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23964,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(23964,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(23964,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(23964,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(23964,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +-- North Fleet Marine +(23983,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(23983,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(23983,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +(23983,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 +(23983,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 +(23983,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 +(23983,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +-- Stormfleet Deckhand +(25234,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 +(25234,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 +-- High-Oracle Soo-say +(28027,17058,50,1,0,1,1), -- Fish Oil +(28027,17057,30,1,0,1,1), -- Shiny Fish Scales +(28027,33470,15,1,0,2,4), -- Frostweave Cloth +(28027,35951,10,1,0,1,3), -- Poached Emperor Salmon +(28027,38642,-1,1,0,1,1), -- Golden Engagement Ring +-- Elder Harkek +(28138,33470,40,1,0,2,4), -- Frostweave Cloth +(28138,33447,4,1,0,1,1), -- Runic Healing Potion +(28138,38642,-1,1,0,1,1), -- Golden Engagement Ring +-- Kutube'sa +(28494,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(28494,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 +(28494,26010,1,1,1,-26010,1), -- Northrend World Green Reference #4 +(28494,26011,1,1,1,-26011,1), -- Northrend World Green Reference #5 +(28494,26012,1,1,1,-26012,1), -- Northrend World Green Reference #6 +(28494,26023,0.5,1,1,-26023,1), -- Northrend World Blue Reference #3 +(28494,26025,0.5,1,1,-26025,1), -- Northrend World Blue Reference #4 +(28494,26026,0.5,1,1,-26026,1), -- Northrend World Blue Reference #5 +(28494,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +(28494,39152,35,1,0,1,1), -- Manual: Heavy Frostweave Bandage +(28494,43297,1,1,0,1,1), -- Damaged Necklace +-- Snowblind Devotee +(29554,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(29554,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 +(29554,26009,1,1,1,-26009,1), -- Northrend World Green Reference #3 +(29554,26010,1,1,1,-26010,1), -- Northrend World Green Reference #4 +(29554,26011,1,1,1,-26011,1), -- Northrend World Green Reference #5 +(29554,26012,1,1,1,-26012,1), -- Northrend World Green Reference #6 +(29554,26013,1,1,1,-26013,1), -- Northrend World Green Reference #7 +(29554,26023,0.5,1,1,-26023,1), -- Northrend World Blue Reference #3 +(29554,26024,0.5,1,1,-26024,1), -- Northrend World Blue Reference #4 +(29554,26025,0.5,1,1,-26025,1), -- Northrend World Blue Reference #5 +(29554,26026,0.5,1,1,-26026,1), -- Northrend World Blue Reference #6 +(29554,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes +(29554,39152,35,1,0,1,1), -- Manual: Heavy Frostweave Bandage +(29554,43297,1,1,0,1,1), -- Damaged Necklace +-- Rokir +(30954,26001,6,1,1,-26001,1), -- Northrend World Grey Reference #2 +(30954,26002,6,1,1,-26002,1), -- Northrend World Grey Reference #3 +(30954,26014,2,1,1,-26014,1), -- Northrend World Green Reference #8 +(30954,26015,2,1,1,-26015,1), -- Northrend World Green Reference #9 +-- Skeletal Archmage +(31779,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 +(31779,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 +(31779,26013,1,1,1,-26013,1), -- Northrend World Green Reference #7 +(31779,26014,1,1,1,-26014,1), -- Northrend World Green Reference #8 +(31779,26015,1,1,1,-26015,1), -- Northrend World Green Reference #9 +(31779,26028,0.5,1,1,-26028,1), -- Northrend World Blue Reference #8 +(31779,39152,50,1,0,1,1), -- Manual: Heavy Frostweave Bandage +(31779,43297,1,1,0,1,1), -- Damaged Necklace +-- Charscale Assaulter +(40419,26001,6,1,1,-26001,1), -- Northrend World Grey Reference #2 +(40419,26002,6,1,1,-26002,1), -- Northrend World Grey Reference #3 +(40419,26015,2,1,1,-26015,1), -- Northrend World Green Reference #9 +(40419,26016,2,1,1,-26016,1); -- Northrend World Green Reference #10 +-- conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 1 AND `SourceGroup` IN (28494,29554,31779); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(1,28494,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'), +(1,29554,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'), +(1,31779,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'); diff --git a/sql/old/3.3.5a/2012_03_25_00_auth_misc.sql b/sql/old/3.3.5a/2012_03_25_00_auth_misc.sql new file mode 100644 index 00000000000..f34882af8f6 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_25_00_auth_misc.sql @@ -0,0 +1,8 @@ +ALTER TABLE `account_banned` + CHANGE `bandate` `bandate` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `unbandate` `unbandate` INT(10) UNSIGNED DEFAULT 0 NOT NULL; + +ALTER TABLE `ip_banned` + CHANGE `ip` `ip` VARCHAR(15) CHARSET utf8 COLLATE utf8_general_ci DEFAULT '127.0.0.1' NOT NULL, + CHANGE `bandate` `bandate` INT(10) UNSIGNED NOT NULL, + CHANGE `unbandate` `unbandate` INT(10) UNSIGNED NOT NULL; diff --git a/sql/old/3.3.5a/2012_03_25_00_world_game_event.sql b/sql/old/3.3.5a/2012_03_25_00_world_game_event.sql new file mode 100644 index 00000000000..82dfaa3f494 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_25_00_world_game_event.sql @@ -0,0 +1,4 @@ +-- darkmoon faerie resync, again +UPDATE `game_event` SET `start_time`='2012-04-01 00:01:00' WHERE `eventEntry`=5; +UPDATE `game_event` SET `start_time`='2012-05-06 00:01:00' WHERE `eventEntry`=3; +UPDATE `game_event` SET `start_time`='2012-06-03 00:01:00' WHERE `eventEntry`=4; diff --git a/sql/old/3.3.5a/2012_03_26_00_auth_realmlist.sql b/sql/old/3.3.5a/2012_03_26_00_auth_realmlist.sql new file mode 100644 index 00000000000..0a570a31773 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_26_00_auth_realmlist.sql @@ -0,0 +1,2 @@ +ALTER TABLE `realmlist` + CHANGE `color` `flag` tinyint(3) unsigned NOT NULL DEFAULT '2'; diff --git a/sql/old/3.3.5a/2012_03_26_00_world_creature_template.sql b/sql/old/3.3.5a/2012_03_26_00_world_creature_template.sql new file mode 100644 index 00000000000..f60849476bd --- /dev/null +++ b/sql/old/3.3.5a/2012_03_26_00_world_creature_template.sql @@ -0,0 +1,73 @@ +UPDATE `creature_template` SET `HoverHeight`=10.8, `VehicleId`=232 WHERE `entry`=30393; +UPDATE `creature_template` SET `HoverHeight`=10.8, `VehicleId`=237 WHERE `entry`=30461; +UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=27530; +UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=26277; +UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=26276; +UPDATE `creature_template` SET `HoverHeight`=1.2 WHERE `entry`=31070; +UPDATE `creature_template` SET `HoverHeight`=12 WHERE `entry`=37126; +UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=27608; +UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=27608; +UPDATE `creature_template` SET `HoverHeight`=1.6 WHERE `entry`=38392; +UPDATE `creature_template` SET `HoverHeight`=2.25 WHERE `entry`=30272; +UPDATE `creature_template` SET `HoverHeight`=2.58, `Scale`=1.72 WHERE `entry`=26607; +UPDATE `creature_template` SET `HoverHeight`=25 WHERE `entry`=37755; +UPDATE `creature_template` SET `HoverHeight`=26 WHERE `entry`=29790; +UPDATE `creature_template` SET `HoverHeight`=2.7 WHERE `entry`=25451; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=29048; +UPDATE `creature_template` SET `HoverHeight`=2, `VehicleId`=234 WHERE `entry`=30228; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25445; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=26761; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=26761; +UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25721; +UPDATE `creature_template` SET `HoverHeight`=35 WHERE `entry`=27789; +UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=34567; +UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=26668; +UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=390 WHERE `entry`=34120; +UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=108 WHERE `entry`=24083; +UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=270 WHERE `entry`=31137; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=24272; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=37098; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=28534; +UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=28511; +UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=32534; +UPDATE `creature_template` SET `HoverHeight`=5, `VehicleId`=348 WHERE `entry`=33214; +UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=27693; +UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=34203; +UPDATE `creature_template` SET `HoverHeight`=6.25 WHERE `entry`=40083; +UPDATE `creature_template` SET `HoverHeight`=6.25 WHERE `entry`=40100; +UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34496; +UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34496; +UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34497; +UPDATE `creature_template` SET `HoverHeight`=7.5 WHERE `entry`=26933; +UPDATE `creature_template` SET `HoverHeight`=8.4, `VehicleId`=232 WHERE `entry`=30420; +UPDATE `creature_template` SET `HoverHeight`=8 WHERE `entry`=33186; +UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=26933; +UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37528; +UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37230; +UPDATE `creature_template` SET `HoverHeight`=9, `VehicleId`=375 WHERE `entry`=33687; +UPDATE `creature_template` SET `HoverHeight`=9, `VehicleId`=535 WHERE `entry`=36661; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10.8, `VehicleId`=232 WHERE `entry`=30393; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10 WHERE `entry`=27608; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10 WHERE `entry`=27608; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=15 WHERE `entry`=32630; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=1.6 WHERE `entry`=38391; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2.25, `VehicleId`=247 WHERE `entry`=30564; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2.25 WHERE `entry`=30272; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=25721; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=29570; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=26761; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3.12, `Scale`=2.08 WHERE `entry`=26607; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3 WHERE `entry`=26668; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3, `VehicleId`=108 WHERE `entry`=24083; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=4 WHERE `entry`=37098; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=4 WHERE `entry`=30945; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5.85 WHERE `entry`=26736; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5, `VehicleId`=276 WHERE `entry`=31432; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=6 WHERE `entry`=30501; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=7.5 WHERE `entry`=26933; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=8.4, `VehicleId`=232 WHERE `entry`=30420; +UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=9 WHERE `entry`=26933; + diff --git a/sql/old/3.3.5a/2012_03_26_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_03_26_01_world_spell_script_names.sql new file mode 100644 index 00000000000..0a5c90f798f --- /dev/null +++ b/sql/old/3.3.5a/2012_03_26_01_world_spell_script_names.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (34477, 35079); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(34477,'spell_hun_misdirection'), +(35079,'spell_hun_misdirection_proc'); diff --git a/sql/old/3.3.5a/2012_03_27_00_world_misc.sql b/sql/old/3.3.5a/2012_03_27_00_world_misc.sql new file mode 100644 index 00000000000..132c91b81d7 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_27_00_world_misc.sql @@ -0,0 +1,49 @@ +ALTER TABLE `battleground_template` CHANGE `Weight` `Weight` tinyint(3) unsigned NOT NULL DEFAULT '1'; +ALTER TABLE `conditions` CHANGE `SourceId` `SourceId` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `creature` CHANGE `equipment_id` `equipment_id` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_addon` CHANGE `path_id` `path_id` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_ai_scripts` CHANGE `id` `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier'; +ALTER TABLE `creature_ai_scripts` CHANGE `creature_id` `creature_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Creature Template Identifier'; +ALTER TABLE `creature_ai_scripts` CHANGE `event_type` `event_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event Type'; +ALTER TABLE `creature_ai_scripts` CHANGE `event_chance` `event_chance` int(10) unsigned NOT NULL DEFAULT '100'; +ALTER TABLE `creature_ai_scripts` CHANGE `event_flags` `event_flags` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_ai_scripts` CHANGE `action1_type` `action1_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; +ALTER TABLE `creature_ai_scripts` CHANGE `action2_type` `action2_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; +ALTER TABLE `creature_ai_scripts` CHANGE `action3_type` `action3_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; +ALTER TABLE `creature_ai_summons` CHANGE `id` `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Location Identifier'; +ALTER TABLE `creature_ai_summons` CHANGE `spawntimesecs` `spawntimesecs` int(10) unsigned NOT NULL DEFAULT '120'; +ALTER TABLE `creature_classlevelstats` CHANGE `level` `level` tinyint(4) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `class` `class` tinyint(4) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basehp0` `basehp0` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basehp1` `basehp1` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basehp2` `basehp2` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basemana` `basemana` smallint(6) NOT NULL; +ALTER TABLE `creature_classlevelstats` CHANGE `basearmor` `basearmor` smallint(6) NOT NULL; +ALTER TABLE `creature_formations` CHANGE `leaderGUID` `leaderGUID` int(10) unsigned NOT NULL; +ALTER TABLE `creature_formations` CHANGE `memberGUID` `memberGUID` int(10) unsigned NOT NULL; +ALTER TABLE `creature_formations` CHANGE `groupAI` `groupAI` int(10) unsigned NOT NULL; +ALTER TABLE `creature_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `creature_onkill_reputation` CHANGE `RewOnKillRepValue1` `RewOnKillRepValue1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `KillCredit1` `KillCredit1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `KillCredit2` `KillCredit2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `exp` `exp` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance1` `resistance1` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance2` `resistance2` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance3` `resistance3` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance4` `resistance4` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance5` `resistance5` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `resistance6` `resistance6` smallint(6) NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem1` `questItem1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem2` `questItem2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem3` `questItem3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem4` `questItem4` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem5` `questItem5` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `questItem6` `questItem6` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `creature_template_addon` CHANGE `path_id` `path_id` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `creature_transport` CHANGE `guid` `guid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'GUID of NPC on transport - not the same as creature.guid'; +ALTER TABLE `creature_transport` CHANGE `transport_entry` `transport_entry` int(11) NOT NULL COMMENT 'Transport entry'; +ALTER TABLE `creature_transport` CHANGE `npc_entry` `npc_entry` int(11) NOT NULL COMMENT 'NPC entry'; +ALTER TABLE `creature_transport` CHANGE `emote` `emote` int(11) NOT NULL; +ALTER TABLE `db_script_string` CHANGE `entry` `entry` int(10) unsigned NOT NULL DEFAULT '0'; + \ No newline at end of file diff --git a/sql/old/3.3.5a/2012_03_27_01_world_misc.sql b/sql/old/3.3.5a/2012_03_27_01_world_misc.sql new file mode 100644 index 00000000000..38c11c8ae65 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_27_01_world_misc.sql @@ -0,0 +1,15 @@ +ALTER TABLE `exploration_basexp` CHANGE `level` `level` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `exploration_basexp` CHANGE `basexp` `basexp` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `fishing_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `game_event_creature` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; +ALTER TABLE `game_event_gameobject` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; +ALTER TABLE `game_event_model_equip` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.'; +ALTER TABLE `game_event_npc_vendor` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.'; +ALTER TABLE `game_event_pool` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; +ALTER TABLE `gameobject_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `gameobject_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `gossip_menu` CHANGE `entry` `entry` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `menu_id` `menu_id` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `id` `id` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `box_money` `box_money` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `gossip_menu_option` CHANGE `action_menu_id` `action_menu_id` int(10) unsigned NOT NULL DEFAULT '0'; diff --git a/sql/old/3.3.5a/2012_03_27_02_world_misc.sql b/sql/old/3.3.5a/2012_03_27_02_world_misc.sql new file mode 100644 index 00000000000..f83a98b8100 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_27_02_world_misc.sql @@ -0,0 +1,78 @@ +ALTER TABLE `instance_template` CHANGE `allowMount` `allowMount` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `ip2nation` CHANGE `ip` `ip` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `item_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `item_set_names` CHANGE `WDBVerified` `WDBVerified` smallint(6) NOT NULL DEFAULT '1'; +ALTER TABLE `item_template` CHANGE `spellcharges_1` `spellcharges_1` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_2` `spellcharges_2` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_3` `spellcharges_3` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_4` `spellcharges_4` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `spellcharges_5` `spellcharges_5` smallint(6) NULL DEFAULT NULL; +ALTER TABLE `item_template` CHANGE `BagFamily` `BagFamily` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `TotemCategory` `TotemCategory` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketContent_1` `socketContent_1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketContent_2` `socketContent_2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketContent_3` `socketContent_3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `socketBonus` `socketBonus` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `GemProperties` `GemProperties` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `item_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `item_template` CHANGE `ScalingStatValue` `ScalingStatValue` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `mail_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `milling_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `npc_spellclick_spells` CHANGE `user_type` `user_type` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'relation with summoner: 0-no 1-friendly 2-raid 3-party player can click'; +ALTER TABLE `outdoorpvp_template` CHANGE `TypeId` `TypeId` tinyint(3) unsigned NOT NULL; +ALTER TABLE `page_text` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; +ALTER TABLE `pet_name_generation` CHANGE `half` `half` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `pickpocketing_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `player_factionchange_achievement` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_achievement` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `race_A` `race_A` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `race_H` `race_H` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_items` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_reputations` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_reputations` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_spells` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_factionchange_spells` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned +ALTER TABLE `player_xp_for_level` CHANGE `lvl` `lvl` tinyint(3) unsigned NOT NULL; -- also changed from int to tinyint +ALTER TABLE `playercreateinfo_action` CHANGE `action` `action` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `playercreateinfo_item` CHANGE `amount` `amount` tinyint(4) NOT NULL DEFAULT '1'; +ALTER TABLE `playercreateinfo_spell_custom` DROP `Active`; -- delete field, it's not used anywhere +ALTER TABLE `prospecting_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `quest_poi` CHANGE `objIndex` `objIndex` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_poi_points` CHANGE `x` `x` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_poi_points` CHANGE `y` `y` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredFactionValue1` `RequiredFactionValue1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredFactionValue2` `RequiredFactionValue2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredMinRepValue` `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredMinRepValue` `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredMaxRepValue` `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `PrevQuestId` `PrevQuestId` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `NextQuestId` `NextQuestId` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `ExclusiveGroup` `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardSpellCast` `RewardSpellCast` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardHonor` `RewardHonor` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardXPId` `RewardXPId` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId1` `RewardFactionValueId1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId2` `RewardFactionValueId2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId3` `RewardFactionValueId3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId4` `RewardFactionValueId4` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueId5` `RewardFactionValueId5` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride1` `RewardFactionValueIdOverride1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride2` `RewardFactionValueIdOverride2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride3` `RewardFactionValueIdOverride3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride4` `RewardFactionValueIdOverride4` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride5` `RewardFactionValueIdOverride5` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo1` `RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo2` `RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo3` `RequiredNpcOrGo3` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo4` `RequiredNpcOrGo4` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `Unknown0` `Unknown0` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay1` `DetailsEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay2` `DetailsEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay3` `DetailsEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay4` `DetailsEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay1` `OfferRewardEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay2` `OfferRewardEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay3` `OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay4` `OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `quest_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NOT NULL DEFAULT '1'; diff --git a/sql/old/3.3.5a/2012_03_27_03_world_misc.sql b/sql/old/3.3.5a/2012_03_27_03_world_misc.sql new file mode 100644 index 00000000000..aba847dbc3f --- /dev/null +++ b/sql/old/3.3.5a/2012_03_27_03_world_misc.sql @@ -0,0 +1,59 @@ +ALTER TABLE `reference_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction` `faction` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction entry'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction1` `faction1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction to give spillover for'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction2` `faction2` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction3` `faction3` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `reputation_spillover_template` CHANGE `faction4` `faction4` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `skinning_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `spell_area` CHANGE `quest_start_active` `quest_start_active` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_area` CHANGE `gender` `gender` tinyint(3) unsigned NOT NULL DEFAULT '2'; +ALTER TABLE `spell_area` CHANGE `autocast` `autocast` tinyint(3) unsigned NOT NULL DEFAULT '0'; +-- All the fields in spell_dbc where changed to full int32 since the DBC structure is used +ALTER TABLE `spell_dbc` CHANGE `Dispel` `Dispel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `Mechanic` `Mechanic` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `CastingTimeIndex` `CastingTimeIndex` int(10) unsigned NOT NULL DEFAULT '1'; +ALTER TABLE `spell_dbc` CHANGE `DurationIndex` `DurationIndex` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `ProcChance` `ProcChance` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `ProcCharges` `ProcCharges` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `BaseLevel` `BaseLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `MaxLevel` `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `SpellLevel` `SpellLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `RangeIndex` `RangeIndex` int(10) unsigned NOT NULL DEFAULT '1'; +ALTER TABLE `spell_dbc` CHANGE `Effect1` `Effect1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `Effect2` `Effect2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `Effect3` `Effect3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectMechanic1` `EffectMechanic1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectMechanic2` `EffectMechanic2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectMechanic3` `EffectMechanic3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA1` `EffectImplicitTargetA1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA2` `EffectImplicitTargetA2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA3` `EffectImplicitTargetA3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB1` `EffectImplicitTargetB1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB2` `EffectImplicitTargetB2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB3` `EffectImplicitTargetB3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex1` `EffectRadiusIndex1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex2` `EffectRadiusIndex2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex3` `EffectRadiusIndex3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName1` `EffectApplyAuraName1` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName2` `EffectApplyAuraName2` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName3` `EffectApplyAuraName3` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `MaxTargetLevel` `MaxTargetLevel` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `SpellFamilyName` `SpellFamilyName` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `MaxAffectedTargets` `MaxAffectedTargets` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `DmgClass` `DmgClass` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_dbc` CHANGE `PreventionType` `PreventionType` int(10) unsigned NOT NULL DEFAULT '0'; +-- +ALTER TABLE `spell_group` CHANGE `id` `id` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `spell_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; +ALTER TABLE `spell_proc` CHANGE `spellPhaseMask` `spellPhaseMask` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_proc` CHANGE `hitMask` `hitMask` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_enchant_proc_data` CHANGE `procEx` `procEx` int(10) unsigned NOT NULL DEFAULT '0'; -- changed from float to int +ALTER TABLE `spell_required` CHANGE `spell_id` `spell_id` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_required` CHANGE `req_spell` `req_spell` mediumint(8) NOT NULL DEFAULT '0'; +ALTER TABLE `spell_threat` CHANGE `flatMod` `flatMod` int(11) NULL DEFAULT NULL; +ALTER TABLE `vehicle_accessory` CHANGE `seat_id` `seat_id` tinyint(4) NOT NULL DEFAULT '0'; +ALTER TABLE `vehicle_accessory` CHANGE `minion` `minion` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `vehicle_template_accessory` CHANGE `seat_id` `seat_id` tinyint(4) NOT NULL DEFAULT '0'; +ALTER TABLE `vehicle_template_accessory` CHANGE `minion` `minion` tinyint(3) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `version` CHANGE `cache_id` `cache_id` int(11) NULL DEFAULT '0'; +ALTER TABLE `waypoint_data` CHANGE `move_flag` `move_flag` tinyint(4) NOT NULL DEFAULT '0'; diff --git a/sql/old/3.3.5a/2012_03_27_04_world_misc.sql b/sql/old/3.3.5a/2012_03_27_04_world_misc.sql new file mode 100644 index 00000000000..e85350476c9 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_27_04_world_misc.sql @@ -0,0 +1,3 @@ +ALTER TABLE `spell_dbc` CHANGE `StackAmount` `StackAmount` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `waypoint_data` CHANGE `action_chance` `action_chance` smallint(6) NOT NULL DEFAULT '100'; +ALTER TABLE `item_loot_template` CHANGE `maxcount` `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1'; diff --git a/sql/old/3.3.5a/2012_03_28_00_auth_account.sql b/sql/old/3.3.5a/2012_03_28_00_auth_account.sql new file mode 100644 index 00000000000..199baac5178 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_00_auth_account.sql @@ -0,0 +1,13 @@ +ALTER TABLE `account` + CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Identifier', + CHANGE `sessionkey` `sessionkey` VARCHAR(80) NOT NULL DEFAULT '', + CHANGE `v` `v` VARCHAR(64) NOT NULL DEFAULT '', + CHANGE `s` `s` VARCHAR(64) NOT NULL DEFAULT '', + CHANGE `email` `email` VARCHAR(254) NOT NULL DEFAULT '', + CHANGE `last_ip` `last_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1', + CHANGE `failed_logins` `failed_logins` INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE `online` `online` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', + CHANGE `mutetime` `mutetime` BIGINT(20) NOT NULL DEFAULT '0', + CHANGE `os` `os` VARCHAR(3) NOT NULL DEFAULT '', + CHANGE `recruiter` `recruiter` INT(10) UNSIGNED NOT NULL DEFAULT '0', + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_28_01_auth_account_access.sql b/sql/old/3.3.5a/2012_03_28_01_auth_account_access.sql new file mode 100644 index 00000000000..456dbf6c104 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_01_auth_account_access.sql @@ -0,0 +1,3 @@ +ALTER TABLE `account_access` + CHANGE `id` `id` INT(10) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_28_01_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_03_28_01_world_spell_bonus_data.sql new file mode 100644 index 00000000000..e150cad1c2e --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_01_world_spell_bonus_data.sql @@ -0,0 +1,2 @@ +-- Hunter Volley +UPDATE `spell_bonus_data` SET `ap_bonus`=0.0837 WHERE `entry`=42243; diff --git a/sql/old/3.3.5a/2012_03_28_02_auth_account_banned.sql b/sql/old/3.3.5a/2012_03_28_02_auth_account_banned.sql new file mode 100644 index 00000000000..917cea1a684 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_02_auth_account_banned.sql @@ -0,0 +1,4 @@ +ALTER TABLE `account_banned` + CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Account id', + CHANGE `active` `active` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_28_03_auth_ip_banned.sql b/sql/old/3.3.5a/2012_03_28_03_auth_ip_banned.sql new file mode 100644 index 00000000000..2e754effc60 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_03_auth_ip_banned.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ip_banned` + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_28_04_auth_logs.sql b/sql/old/3.3.5a/2012_03_28_04_auth_logs.sql new file mode 100644 index 00000000000..4c837a47ed1 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_04_auth_logs.sql @@ -0,0 +1,5 @@ +ALTER TABLE `logs` + CHANGE `time` `time` INT(10) UNSIGNED NOT NULL, + CHANGE `realm` `realm` INT(10) UNSIGNED NOT NULL, + CHANGE `type` `type` TINYINT(3) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_28_05_auth_realmcharacters.sql b/sql/old/3.3.5a/2012_03_28_05_auth_realmcharacters.sql new file mode 100644 index 00000000000..e50b3c3f331 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_05_auth_realmcharacters.sql @@ -0,0 +1,4 @@ +ALTER TABLE `realmcharacters` + CHANGE `realmid` `realmid` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `acctid` `acctid` INT(10) UNSIGNED NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_28_06_auth_realmlist.sql b/sql/old/3.3.5a/2012_03_28_06_auth_realmlist.sql new file mode 100644 index 00000000000..725702a9803 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_06_auth_realmlist.sql @@ -0,0 +1,6 @@ +ALTER TABLE `realmlist` + CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + CHANGE `address` `address` VARCHAR(15) DEFAULT '127.0.0.1' NOT NULL, + CHANGE `port` `port` SMALLINT(5) UNSIGNED DEFAULT '8085' NOT NULL, + CHANGE `gamebuild` `gamebuild` INT(10) UNSIGNED DEFAULT '12340' NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_28_07_auth_uptime.sql b/sql/old/3.3.5a/2012_03_28_07_auth_uptime.sql new file mode 100644 index 00000000000..0ea4e3321df --- /dev/null +++ b/sql/old/3.3.5a/2012_03_28_07_auth_uptime.sql @@ -0,0 +1,6 @@ +ALTER TABLE `uptime` + DROP COLUMN `startstring`, + CHANGE `realmid` `realmid` INT(10) UNSIGNED NOT NULL, + CHANGE `starttime` `starttime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `uptime` `uptime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/old/3.3.5a/2012_03_30_00_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_30_00_world_smart_scripts.sql new file mode 100644 index 00000000000..3ec709d76c1 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_30_00_world_smart_scripts.sql @@ -0,0 +1,94 @@ +-- revised from Unholys original works +-- quest 12702 chicken party! +-- quest 12532 flown the coop! +-- +SET @ENTRY := 28161; -- the chicken +SET @PARTY := 12702; -- chicken party quest +SET @COOP := 12532; -- flown the coop quest +SET @LIFE := 900000; -- minutes + +-- set up required spells for the spells to work as they should +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@ENTRY; +INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES +(@ENTRY,39996,1,0), -- cover spell (dummy) +(@ENTRY,51037,2,0); -- creates item in players back pack + +-- set npc up to use event script +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; + +-- convert over to smart script +DELETE FROM `creature_ai_scripts` WHERE `id`=@ENTRY; -- delete old eai scripts +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,0,1000,1000,2000,3000,89,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'create random movement every 2-3 secs'), +(@ENTRY,0,1,0,8,0,100,0,51951,0,0,0,11,50839,0,0,0,0,0,1,0,0,0,0,0,0,0, 'when hit with net cast self stun'), +(@ENTRY,0,2,0,8,0,100,0,39996,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'force despawn @1 sec when hit with dummy spell'); + +-- Remove previous scripts that may interfere with this work +DELETE FROM `quest_start_scripts` WHERE `id` IN (@PARTY,@COOP); + +-- start script for quest chicken party (they do not all spawn at same time) +UPDATE `quest_template` SET `StartScript`=@PARTY WHERE `id`=@PARTY; -- 12072 +INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(@PARTY,1,10,@ENTRY,@LIFE, 0,5251.09,4413.76,-96.086,4.8714), +(@PARTY,2,10,@ENTRY,@LIFE, 0,5251.22,4419.74,-95.8995,3.58335), +(@PARTY,23,10,@ENTRY,@LIFE, 0,5257.58,4421.77,-95.9072,2.62124), +(@PARTY,4,10,@ENTRY,@LIFE,0, 5255.97,4420.37,-95.9999,0.0451326), +(@PARTY,5,10,@ENTRY,@LIFE,0, 5256.78,4420.63,-95.9957,0.320021), +(@PARTY,6,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,0.956194), +(@PARTY,27,10,@ENTRY,@LIFE,0, 5258.54,4420.49,-96.0195,0.551714), +(@PARTY,8,10,@ENTRY,@LIFE,0, 5250.67,4417.98,-95.9787,4.39231), +(@PARTY,9,10,@ENTRY,@LIFE,0, 5273.53,4430.32,-96.0241,1.0897), +(@PARTY,40,10,@ENTRY,@LIFE,0, 5158.3,4605.25,-130.988,3.7522), +(@PARTY,21,10,@ENTRY,@LIFE,0, 5164.6,4609.43,-130.427,3.70115), +(@PARTY,22,10,@ENTRY,@LIFE,0, 5169.53,4612.44,-130.817,4.05065), +(@PARTY,23,10,@ENTRY,@LIFE,0, 5188.49,4627.85,-132.485,3.60691), +(@PARTY,44,10,@ENTRY,@LIFE,0, 5203.19,4631.63,-132.611,2.849), +(@PARTY,25,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.378917), +(@PARTY,26,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.66166), +(@PARTY,27,10,@ENTRY,@LIFE,0, 5203.5,4595.02,-111.327,5.51542), +(@PARTY,48,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,0.579192), +(@PARTY,29,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,1.09756), +(@PARTY,30,10,@ENTRY,@LIFE,0, 5172.43,4533.25,-97.3836,1.15253), +(@PARTY,41,10,@ENTRY,@LIFE,0, 5186.29,4522.69,-91.0957,3.02571), +(@PARTY,32,10,@ENTRY,@LIFE,0, 5214.67,4485.22,-91.3113,2.40524), +(@PARTY,33,10,@ENTRY,@LIFE,0, 5221.85,4475.99,-96.8801,4.89495), +(@PARTY,34,10,@ENTRY,@LIFE,0, 5222.95,4438.1,-96.8062,1.6277), +(@PARTY,35,10,@ENTRY,@LIFE,0, 5224.36,4427.83,-96.9221,2.63301), +(@PARTY,36,10,@ENTRY,@LIFE,0, 5234.72,4406.44,-95.2917,0.0647549), +(@PARTY,47,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,3.79933), +(@PARTY,38,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,4.29414), +(@PARTY,39,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,3.90536), +(@PARTY,40,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,4.36089); + +-- start script for quest flown the coop (they do not all spawn at same time) +UPDATE `quest_template` SET `StartScript`=@COOP WHERE `id`=@COOP; -- 12532 +INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(@COOP,23,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,2.62124), +(@COOP,4,10,@ENTRY,@LIFE,0, 5255.97,4420.37,-95.9999,0.0451326), +(@COOP,5,10,@ENTRY,@LIFE,0, 5256.78,4420.63,-95.9957,0.320021), +(@COOP,6,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,0.956194), +(@COOP,27,10,@ENTRY,@LIFE,0, 5258.54,4420.49,-96.0195,0.551714), +(@COOP,8,10,@ENTRY,@LIFE,0, 5250.67,4417.98,-95.9787,4.39231), +(@COOP,9,10,@ENTRY,@LIFE,0, 5273.53,4430.32,-96.0241,1.0897), +(@COOP,40,10,@ENTRY,@LIFE,0, 5158.3,4605.25,-130.988,3.7522), +(@COOP,21,10,@ENTRY,@LIFE,0, 5164.6,4609.43,-130.427,3.70115), +(@COOP,22,10,@ENTRY,@LIFE,0, 5169.53,4612.44,-130.817,4.05065), +(@COOP,23,10,@ENTRY,@LIFE,0, 5188.49,4627.85,-132.485,3.60691), +(@COOP,44,10,@ENTRY,@LIFE,0, 5203.19,4631.63,-132.611,2.849), +(@COOP,25,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.378917), +(@COOP,26,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.66166), +(@COOP,27,10,@ENTRY,@LIFE,0, 5203.5,4595.02,-111.327,5.51542), +(@COOP,48,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,0.579192), +(@COOP,29,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,1.09756), +(@COOP,30,10,@ENTRY,@LIFE,0, 5172.43,4533.25,-97.3836,1.15253), +(@COOP,41,10,@ENTRY,@LIFE,0, 5186.29,4522.69,-91.0957,3.02571), +(@COOP,32,10,@ENTRY,@LIFE,0, 5214.67,4485.22,-91.3113,2.40524), +(@COOP,33,10,@ENTRY,@LIFE,0, 5221.85,4475.99,-96.8801,4.89495), +(@COOP,34,10,@ENTRY,@LIFE,0, 5222.95,4438.1,-96.8062,1.6277), +(@COOP,35,10,@ENTRY,@LIFE,0, 5224.36,4427.83,-96.9221,2.63301), +(@COOP,36,10,@ENTRY,@LIFE,0, 5234.72,4406.44,-95.2917,0.0647549), +(@COOP,47,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,3.79933), +(@COOP,38,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,4.29414), +(@COOP,39,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,3.90536), +(@COOP,40,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,4.36089); diff --git a/sql/old/3.3.5a/2012_03_31_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_03_31_00_world_creature_loot_template.sql new file mode 100644 index 00000000000..a817cdccf50 --- /dev/null +++ b/sql/old/3.3.5a/2012_03_31_00_world_creature_loot_template.sql @@ -0,0 +1,191 @@ +-- ------------------------------- +-- -- The Antechamber of Ulduar -- +-- ------------------------------- +-- Creatures +SET @Brundir10 :=32857; +call `sp_get_npc_diffentry`(@Brundir10,1,@Brundir25); -- Get 25man id using procedure +SET @Molgeim10 :=32927; +call `sp_get_npc_diffentry`(@Molgeim10,1,@Molgeim25); -- Get 25man id using procedure +SET @Steelbreaker10 :=32867; +call `sp_get_npc_diffentry`(@Steelbreaker10,1,@Steelbreaker25); -- Get 25man id using procedure +SET @Auriaya10 :=33515; +call `sp_get_npc_diffentry`(@Auriaya10,1,@Auriaya25); -- Get 25man id using procedure +-- Gameobjects +SET @Kologarn10 := 195046; -- Cache of the Living Stone 10man +CALL `sp_get_go_lootid`(@Kologarn10,@CacheLivingStone10); -- Get Lootid from data1 field using procedure +SET @Kologarn25 := 195047; -- Cache of the Living Stone 25man +CALL `sp_get_go_lootid`(@Kologarn25,@CacheLivingStone25); -- Get Lootid from data1 field using procedure +-- bosses +SET @Assembly10Ref := 34359; +SET @Assembly25Ref := @Assembly10Ref+1; +SET @Kologarn10Ref := @Assembly10Ref+2; +SET @Kologarn25Ref := @Assembly10Ref+3; +SET @Auriaya10Ref := @Assembly10Ref+4; +SET @Auriaya25Ref := @Assembly10Ref+5; + +-- ------------------------------ +-- -- Reference Loot Templates -- +-- ------------------------------ +-- Delete previous templates if existing +DELETE FROM `reference_loot_template` WHERE `entry` IN (12019,34122,34123,34124,34163,34216); +-- Delete the current if existing & add +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Assembly10Ref AND @Assembly10Ref+5; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Assembly Of Iron 10man +(@Assembly10Ref,45322,0,1,1,1,1), -- Cloak of the Iron Council +(@Assembly10Ref,45324,0,1,1,1,1), -- Leggings of Swift Reflexes +(@Assembly10Ref,45329,0,1,1,1,1), -- Circlet of True Sight +(@Assembly10Ref,45330,0,1,1,1,1), -- Greaves of Iron Intensity +(@Assembly10Ref,45331,0,1,1,1,1), -- Rune-Etched Nightblade +(@Assembly10Ref,45332,0,1,1,1,1), -- Stormtip +(@Assembly10Ref,45333,0,1,1,1,1), -- Belt of the Iron Servant +(@Assembly10Ref,45378,0,1,1,1,1), -- Boots of the Petrified Forest +(@Assembly10Ref,45418,0,1,1,1,1), -- Lady Maye's Sapphire Ring +(@Assembly10Ref,45423,0,1,1,1,1), -- Runetouch Wristwraps +-- Assembly Of Iron 25man +(@Assembly25Ref,45233,0,1,1,1,1), -- Stormrune Edge +(@Assembly25Ref,45234,0,1,1,1,1), -- Rapture +(@Assembly25Ref,45237,0,1,1,1,1), -- Phaelia's Vestments of the Sprouting Seed +(@Assembly25Ref,45193,0,1,1,1,1), -- Insurmountable Fervor +(@Assembly25Ref,45236,0,1,1,1,1), -- Unblinking Eye +(@Assembly25Ref,45225,0,1,1,1,1), -- Steelbreaker's Embrace +(@Assembly25Ref,45240,0,1,1,1,1), -- Raiments of the Iron Council +(@Assembly25Ref,45226,0,1,1,1,1), -- Ancient Iron Heaume +(@Assembly25Ref,45235,0,1,1,1,1), -- Radiant Seal +(@Assembly25Ref,45227,0,1,1,1,1), -- Iron-studded Mantle +(@Assembly25Ref,45239,0,1,1,1,1), -- Runeshaper's Gloves +(@Assembly25Ref,45224,0,1,1,1,1), -- Drape of the Lithe +(@Assembly25Ref,45232,0,1,1,1,1), -- Runed Ironhide Boots +(@Assembly25Ref,45228,0,1,1,1,1), -- Handguards of the Enclave +(@Assembly25Ref,45238,0,1,1,1,1), -- Overload Legwraps +-- Cache of Living Stone 10man +(@Kologarn10Ref,45701,0,1,1,1,1), -- Greaves of the Earthbinder +(@Kologarn10Ref,45965,0,1,1,1,1), -- Spire of Withering Dreams +(@Kologarn10Ref,45702,0,1,1,1,1), -- Emerald Signet Ring +(@Kologarn10Ref,45696,0,1,1,1,1), -- Mark of the Unyielding +(@Kologarn10Ref,45698,0,1,1,1,1), -- Sabatons of the Iron Watcher +(@Kologarn10Ref,45697,0,1,1,1,1), -- Shoulderguards of the Solemn Watch +(@Kologarn10Ref,45703,0,2,2,1,1), -- Spark of Hope +(@Kologarn10Ref,45700,0,2,2,1,1), -- Stoneguard +(@Kologarn10Ref,45699,0,2,2,1,1), -- Pendant of the Piercing Glare +(@Kologarn10Ref,45704,0,2,2,1,1), -- Shawl of the Shattered Giant +-- Cache of Living Stone 25man +(@Kologarn25Ref,45261,0,1,1,1,1), -- Giant's Bane +(@Kologarn25Ref,45266,0,1,1,1,1), -- Malice +(@Kologarn25Ref,45274,0,1,1,1,1), -- Leggings of the Stoneweaver +(@Kologarn25Ref,45269,0,1,1,1,1), -- Unfaltering Armguards +(@Kologarn25Ref,45268,0,1,1,1,1), -- Gloves of the Pythonic Guardian +(@Kologarn25Ref,45262,0,1,1,1,1), -- Necklace of Unerring Mettle +(@Kologarn25Ref,45275,0,1,1,1,1), -- Bracers of Unleashed Magic +(@Kologarn25Ref,45272,0,1,1,1,1), -- Robes of the Umbral Brute +(@Kologarn25Ref,45267,0,1,1,1,1), -- Saronite Plated Legguards +(@Kologarn25Ref,45263,0,1,1,1,1), -- Wrathstone +(@Kologarn25Ref,45271,0,1,1,1,1), -- Ironmender +(@Kologarn25Ref,45264,0,1,1,1,1), -- Decimator's Armguards +(@Kologarn25Ref,45265,0,1,1,1,1), -- Shoulderpads of the Monolith +(@Kologarn25Ref,45273,0,1,1,1,1), -- Handwraps of Plentiful Recovery +(@Kologarn25Ref,45270,0,1,1,1,1), -- Idol of the Crying Wind +-- Auriaya 10man +(@Auriaya10Ref,45707,0,1,1,1,1), -- Shieldwall of the Breaker +(@Auriaya10Ref,45708,0,1,1,1,1), -- Archaedas' Lost Legplates +(@Auriaya10Ref,45709,0,1,1,1,1), -- Nimble Climber's Belt +(@Auriaya10Ref,45711,0,1,1,1,1), -- Ironaya's Discarded Mantle +(@Auriaya10Ref,45712,0,1,1,1,1), -- Chestplate of Titanic Fury +(@Auriaya10Ref,45713,0,1,1,1,1), -- Nurturing Touch +(@Auriaya10Ref,45832,0,1,1,1,1), -- Mantle of the Preserver +(@Auriaya10Ref,45864,0,1,1,1,1), -- Cover of the Keepers +(@Auriaya10Ref,45865,0,1,1,1,1), -- Raiments of the Corrupted +(@Auriaya10Ref,45866,0,1,1,1,1), -- Elemental Focus Stone +-- Auriaya 25man +(@Auriaya25Ref,45327,0,1,1,1,1), -- Siren's Cry +(@Auriaya25Ref,45437,0,1,1,1,1), -- Runescribed Blade +(@Auriaya25Ref,45315,0,1,1,1,1), -- Stonerender +(@Auriaya25Ref,45439,0,1,1,1,1), -- Unwavering Stare +(@Auriaya25Ref,45326,0,1,1,1,1), -- Platinum Band of the Aesir +(@Auriaya25Ref,45441,0,1,1,1,1), -- Sandals of the Ancient Keeper +(@Auriaya25Ref,45435,0,1,1,1,1), -- Cowl of the Absolute +(@Auriaya25Ref,45438,0,1,1,1,1), -- Ring of the Faithful Servant +(@Auriaya25Ref,45434,0,1,1,1,1), -- Greaves of the Rockmender +(@Auriaya25Ref,45320,0,1,1,1,1), -- Shoulderplates of the Eternal +(@Auriaya25Ref,45325,0,1,1,1,1), -- Gloves of the Stonereaper +(@Auriaya25Ref,45440,0,1,1,1,1), -- Amice of the Stoic Watch +(@Auriaya25Ref,45334,0,1,1,1,1), -- Unbreakable Chestguard +(@Auriaya25Ref,45319,0,1,1,1,1), -- Cloak of the Makers +(@Auriaya25Ref,45436,0,1,1,1,1); -- Libram of the Resolute + +-- --------------------------- +-- -- ASSIGN CREATURE LOOTS -- +-- --------------------------- +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (@Brundir10,@Molgeim10,@Steelbreaker10,@Brundir25,@Molgeim25,@Steelbreaker25,@Auriaya10,@Auriaya25); +DELETE FROM `creature_loot_template` WHERE `entry` IN (@Brundir10,@Molgeim10,@Steelbreaker10,@Brundir25,@Molgeim25,@Steelbreaker25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ASSEMBLY OF IRON 10-man +-- Stormcaller Brundir killed last +(@Brundir10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot +(@Brundir10,47241,100,1,0,1,1), -- 1 Emblem of Triumph +-- Runemaster Molgeim killed last +(@Molgeim10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot +(@Molgeim10,47241,100,1,0,2,2), -- 2 Emblem of Triumph +(@Molgeim10,45506,100,2,0,1,1), -- Archivum Data Disc +(@Molgeim10,45087,75,1,0,1,1), -- Runed Orb +-- Steelbreaker killed last +(@Steelbreaker10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot +(@Steelbreaker10,47241,100,1,0,2,2), -- 2 Emblem of Triumph +(@Steelbreaker10,45087,75,1,0,1,1), -- Runed Orb +(@Steelbreaker10,45506,100,1,0,1,1), -- Archivum Data Disc for Quest +(@Steelbreaker10,25455,0,1,1,1,1), -- Belt fo the Crystal Tree +(@Steelbreaker10,45447,0,1,1,1,1), -- Watchful Eye of Fate +(@Steelbreaker10,45456,0,1,1,1,1), -- Loop of the Agile +(@Steelbreaker10,45449,0,1,1,1,1), -- The Masticator +(@Steelbreaker10,45448,0,1,1,1,1), -- Perilous Bite +-- ASSEMBLY OF IRON 25-man +-- Stormcaller Brundir killed last +(@Brundir25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot +(@Brundir25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Brundir25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@Brundir25,45087,75,1,0,1,1), -- Runed Orb +(@Brundir25,47241,100,1,0,1,2), -- 2 Emblems of Triumph +-- Runemaster Molgeim killed last +(@Molgeim25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot +(@Molgeim25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Molgeim25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@Molgeim25,45087,75,1,0,1,1), -- Runed Orb +(@Molgeim25,47241,100,1,0,2,2), -- 2 Emblems of Triumph +(@Molgeim25,45506,100,1,0,1,1), -- Archivum Data Disc +-- Steelbreaker killed last +(@Steelbreaker25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot +(@Steelbreaker25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Steelbreaker25,45038,18,1,0,1,1), -- Fragment of Val'anyr +(@Steelbreaker25,45087,75,1,0,2,2), -- 2x Runed Orb +(@Steelbreaker25,47241,100,1,0,2,2), -- 2 Emblems of Triumph +(@Steelbreaker25,45506,100,1,0,1,1), -- Archivum Data Disc +(@Steelbreaker25,45241,0,1,1,1,1), -- Belt of Colossal Rage +(@Steelbreaker25,45242,0,1,1,1,1), -- Drape of Mortal Downfall +(@Steelbreaker25,45607,0,1,1,1,1), -- Fang of Oblivion +(@Steelbreaker25,45244,0,1,1,1,1), -- Greaves of Swift Vengeance +(@Steelbreaker25,45243,0,1,1,1,1), -- Sapphire Amulet of Renewal +(@Steelbreaker25,45245,0,1,1,1,1); -- Shoulderpads of the Intruder + +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@CacheLivingStone10,@CacheLivingStone25); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- KOLOGARN 10-man +(@CacheLivingStone10,1,100,1,0,-@Kologarn10Ref,2), -- 2 items from reference loot +(@CacheLivingStone10,47241,100,1,0,1,1), -- 1 Emblem of Triumph +-- KOLOGARN 25-Man +(@CacheLivingStone25,1,100,1,0,-@Kologarn25Ref,3), -- 3 items from reference loot +(@CacheLivingStone25,2,10,1,0,-34154,1), -- Chance on Recipe +(@CacheLivingStone25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@CacheLivingStone25,45087,50,1,0,1,1), -- Runed Orb +(@CacheLivingStone25,47241,100,1,0,1,2); -- 2 Emblems of Triumph + +DELETE FROM `creature_loot_template` WHERE `entry` IN (@Auriaya10,@Auriaya25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- AURIAYA 10-man +(@Auriaya10,1,100,1,0,-@Auriaya10Ref,2), -- 2 items from reference loot +(@Auriaya10,47241,100,1,0,1,1), -- 1 Emblem of Triumph +-- AURIAYA 25-man +(@Auriaya25,1,100,1,0,-@Auriaya25Ref,3), -- 3 items from reference loot +(@Auriaya25,2,10,1,0,-34154,1), -- Chance on Recipe +(@Auriaya25,45038,8,1,0,1,1), -- Fragment of Val'anyr +(@Auriaya25,45087,75,1,0,1,1), -- Runed Orb +(@Auriaya25,47241,100,1,0,1,2); -- 2 Emblems of Triumph diff --git a/sql/old/3.3.5a/2012_04_01_00_auth_realmlist.sql b/sql/old/3.3.5a/2012_04_01_00_auth_realmlist.sql new file mode 100644 index 00000000000..e2e1efaf993 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_00_auth_realmlist.sql @@ -0,0 +1 @@ +ALTER TABLE `realmlist` CHANGE `address` `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; diff --git a/sql/old/3.3.5a/2012_04_01_00_world_creature.sql b/sql/old/3.3.5a/2012_04_01_00_world_creature.sql new file mode 100644 index 00000000000..f6a42a6ef08 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_00_world_creature.sql @@ -0,0 +1,17 @@ +-- Add missing spawns to db +DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `curhealth`) VALUES +(4764,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,9156), -- Alchemy +(28648,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,9156), -- Blacksmithing +(40266,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,9156), -- Enchanting +(40267,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,9156), -- Engineering +(40470,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,9156), -- Leatherworking +(40471,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,9156), -- Tailoring +(40510,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,9156), -- Jewelcrafting +(40516,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,9156), -- Inscription +(40517,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,9156), -- Herbalism +(40518,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,9156), -- Mining +(40601,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,9156), -- Skinning +(40602,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,9156), -- Cooking +(40603,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,9156), -- First Aid +(41320,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,9156); -- Fishing diff --git a/sql/old/3.3.5a/2012_04_01_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_01_00_world_spell_script_names.sql new file mode 100644 index 00000000000..9d37f6ad4cb --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_00_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_spinning_pain_spike'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(66316,'spell_spinning_pain_spike'), +(67100,'spell_spinning_pain_spike'), +(67101,'spell_spinning_pain_spike'), +(67102,'spell_spinning_pain_spike'); diff --git a/sql/old/3.3.5a/2012_04_01_01_world_creature.sql b/sql/old/3.3.5a/2012_04_01_01_world_creature.sql new file mode 100644 index 00000000000..f6dff34cfa9 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_01_world_creature.sql @@ -0,0 +1,26 @@ +-- Re-add deleted data +DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); +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 +(4764,26796,576,2,1,0,0,424.547,185.962,-34.9367,4.72984,3600,0,0,1,0,0,0,0,0), +(28648,17148,530,1,1,0,0,-2910.22,6473.03,82.4898,2.49669,300,0,0,5914,0,0,0,0,0), +(40267,37671,1,1,1,0,0,1391.2,-4486.23,31.4544,3.3355,300,0,0,42,0,0,0,0,0), +(40470,37671,1,1,1,0,0,1392.66,-4481.87,31.3782,1.97284,300,0,0,42,0,0,0,0,0), +(40471,37671,1,1,1,0,0,1393.92,-4489.57,31.4737,4.93701,300,0,0,42,0,0,0,0,0); + +-- Add missing spawns to db (trainers) +DELETE FROM `creature` WHERE `guid` IN (40266,40510,40516,40517,40518,40601,40602,40603,41320,41674,41723,41775,41779,41780); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`curhealth`) VALUES +(40266,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,1), -- Alchemy +(40510,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,1), -- Blacksmithing +(40516,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,1), -- Enchanting +(40517,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,1), -- Engineering +(40518,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,1), -- Leatherworking +(40601,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,1), -- Tailoring +(40602,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,1), -- Jewelcrafting +(40603,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,1), -- Inscription +(41320,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,1), -- Herbalism +(41674,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,1), -- Mining +(41723,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,1), -- Skinning +(41775,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,1), -- Cooking +(41779,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,1), -- First Aid +(41780,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,1); -- Fishing diff --git a/sql/old/3.3.5a/2012_04_01_02_world_spell_group_stack_rules.sql b/sql/old/3.3.5a/2012_04_01_02_world_spell_group_stack_rules.sql new file mode 100644 index 00000000000..d42afd1d955 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_02_world_spell_group_stack_rules.sql @@ -0,0 +1,9 @@ +-- Greater Blessing of Wisdom and Mana Spring Totem should not stack (hotfix) +SET @GROUP := 1117; +DELETE FROM `spell_group` WHERE id=@GROUP; +INSERT INTO `spell_group`(`id`,`spell_id`) VALUES +(@GROUP,25894), -- Greater Blessing of Wisdom +(@GROUP,5677); -- Mana Spring (cast by Mana Spring Totem) +DELETE FROM `spell_group_stack_rules` WHERE `group_id`=@GROUP; +INSERT INTO `spell_group_stack_rules`(`group_id`,`stack_rule`) VALUES +(@GROUP,3); -- Make them SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT diff --git a/sql/old/3.3.5a/2012_04_01_03_world_trainers.sql b/sql/old/3.3.5a/2012_04_01_03_world_trainers.sql new file mode 100644 index 00000000000..1edc9ae09af --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_03_world_trainers.sql @@ -0,0 +1,83 @@ +-- Template updates +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33608; -- Alchemy +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16/*80*/,`trainer_type`=2 WHERE `entry`=33609; -- Blacksmithing +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33610; -- Enchanting +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33611; -- Engineering +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33612; -- Leatherworking +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33613; -- Tailoring +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33614; -- Jewelcrafting +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33616; -- Herbalism +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33618; -- Skinning (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33617; -- Mining (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33619; -- Cooking (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33621; -- First Aid (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33615; -- Inscription (guessed) +UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33623; -- Fishing (guessed) + +-- Model data +UPDATE `creature_model_info` SET `bounding_radius`=0.11,`combat_reach`=0,`gender`=2 WHERE `modelid`=28738; -- shared by many +UPDATE `creature_model_info` SET `bounding_radius`=0.14,`combat_reach`=0,`gender`=2 WHERE `modelid`=28758; -- shared by many + +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(33608,0,0,1,0, NULL), -- Alchemy +(33609,0,0,1,0, NULL), -- Blacksmithing +(33610,0,0,1,0, NULL), -- Enchanting +(33611,0,0,1,0, NULL), -- Engineering +(33612,0,0,1,0, NULL), -- Leatherworking +(33613,0,0,1,0, NULL), -- Tailoring +(33614,0,0,1,0, NULL), -- Jewelcrafting +(33616,0,0,1,0, NULL), -- Herbalism +(33618,0,0,1,0, NULL), -- Skinning (guessed) +(33617,0,0,1,0, NULL), -- Mining (guessed) +(33619,0,0,1,0, NULL), -- Cooking (guessed) +(33621,0,0,1,0, NULL), -- First Aid (guessed) +(33615,0,0,1,0, NULL), -- Inscription (guessed) +(33623,0,0,1,0, NULL); -- Fishing (guessed) + +-- Trainer spells +DELETE FROM `npc_trainer` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); +INSERT INTO `npc_trainer` (`entry`, `spell`, `spellcost`, `reqskill`, `reqskillvalue`, `reqlevel`) VALUES +(33608, -201001, 0, 0, 0, 0), -- Alchemy +(33608, -201002, 0, 0, 0, 0), -- Alchemy +(33608, -201003, 0, 0, 0, 0), -- Alchemy +(33609, -201004, 0, 0, 0, 0), -- Blacksmithing +(33609, -201005, 0, 0, 0, 0), -- Blacksmithing +(33609, -201006, 0, 0, 0, 0), -- Blacksmithing +(33610, -201009, 0, 0, 0, 0), -- Enchanting +(33610, -201010, 0, 0, 0, 0), -- Enchanting +(33610, -201011, 0, 0, 0, 0), -- Enchanting +(33611, -201012, 0, 0, 0, 0), -- Engineering +(33611, -201013, 0, 0, 0, 0), -- Engineering +(33611, -201014, 0, 0, 0, 0), -- Engineering +(33612, -201027, 0, 0, 0, 0), -- Leatherworking +(33612, -201028, 0, 0, 0, 0), -- Leatherworking +(33612, -201029, 0, 0, 0, 0), -- Leatherworking +(33613, -201039, 0, 0, 0, 0), -- Tailoring +(33613, -201040, 0, 0, 0, 0), -- Tailoring +(33613, -201041, 0, 0, 0, 0), -- Tailoring +(33614, -201024, 0, 0, 0, 0), -- Jewelcrafting +(33614, -201025, 0, 0, 0, 0), -- Jewelcrafting +(33614, -201026, 0, 0, 0, 0), -- Jewelcrafting +(33616, -201018, 0, 0, 0, 0), -- Herbalism +(33616, -201019, 0, 0, 0, 0), -- Herbalism +(33616, -201020, 0, 0, 0, 0), -- Herbalism +(33618, -201036, 0, 0, 0, 0), -- Skinning +(33618, -201037, 0, 0, 0, 0), -- Skinning +(33618, -201038, 0, 0, 0, 0), -- Skinning +(33617, -201033, 0, 0, 0, 0), -- Mining +(33617, -201034, 0, 0, 0, 0), -- Mining +(33617, -201035, 0, 0, 0, 0), -- Mining +(33619, -202004, 0, 0, 0, 0), -- Cooking +(33619, -202005, 0, 0, 0, 0), -- Cooking +(33619, -202006, 0, 0, 0, 0), -- Cooking +(33621, -202007, 0, 0, 0, 0), -- First Aid +(33621, -202008, 0, 0, 0, 0), -- First Aid +(33621, -202009, 0, 0, 0, 0), -- First Aid +(33615, -201021, 0, 0, 0, 0), -- Inscription +(33615, -201022, 0, 0, 0, 0), -- Inscription +(33615, -201023, 0, 0, 0, 0), -- Inscription +(33623, -202001, 0, 0, 0, 0), -- Fishing +(33623, -202002, 0, 0, 0, 0), -- Fishing +(33623, -202003, 0, 0, 0, 0); -- Fishing diff --git a/sql/old/3.3.5a/2012_04_01_04_world_conditions.sql b/sql/old/3.3.5a/2012_04_01_04_world_conditions.sql new file mode 100644 index 00000000000..e84307e0b05 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_04_world_conditions.sql @@ -0,0 +1,5 @@ +-- Quest: Blending In (11633) +-- Spell from Cape only Appliable in City Area +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=45614; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,45614,11633,23,4125,0,0,0, '', 'Shroud of the Scourge - Temple City of En''kilah'); diff --git a/sql/old/3.3.5a/2012_04_01_05_world_creature_template.sql b/sql/old/3.3.5a/2012_04_01_05_world_creature_template.sql new file mode 100644 index 00000000000..a4d13f1513a --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_05_world_creature_template.sql @@ -0,0 +1,2 @@ +-- CREATURE_FLAG_EXTRA_NO_XP_AT_KILL +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64 WHERE `entry`=21267; -- Mana Beast diff --git a/sql/old/3.3.5a/2012_04_01_06_world_sai.sql b/sql/old/3.3.5a/2012_04_01_06_world_sai.sql new file mode 100644 index 00000000000..9b8857da1e4 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_06_world_sai.sql @@ -0,0 +1,7 @@ +-- Fix quest 11468 - Falcon versus hawk +SET @entry := 24747; -- Fjord Hawk +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,1,8,0,100,0,44407,0,0,0,11,44408,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fjord Hawk - On Spellhit - Cast spell on invoker'), +(@entry,0,1,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fjord Hawk - On Spellhit - Despawn'); diff --git a/sql/old/3.3.5a/2012_04_01_07_world_misc.sql b/sql/old/3.3.5a/2012_04_01_07_world_misc.sql new file mode 100644 index 00000000000..346627fd88b --- /dev/null +++ b/sql/old/3.3.5a/2012_04_01_07_world_misc.sql @@ -0,0 +1,4 @@ +UPDATE `conditions` SET `ElseGroup`=0 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=45614; -- typo fix for previous commit +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=47431; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,47431,0,23,4195,0,0,64,'','Capture Jormungar Spawn can only be used in Ice Heart Cavern'); diff --git a/sql/old/3.3.5a/2012_04_03_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_03_00_world_spell_script_names.sql new file mode 100644 index 00000000000..70f675daa20 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_03_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 36444; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(36444, 'spell_gen_wg_water'); diff --git a/sql/old/3.3.5a/2012_04_04_00_auth_realmlist.sql b/sql/old/3.3.5a/2012_04_04_00_auth_realmlist.sql new file mode 100644 index 00000000000..18f2d7b3d4c --- /dev/null +++ b/sql/old/3.3.5a/2012_04_04_00_auth_realmlist.sql @@ -0,0 +1 @@ +ALTER TABLE `realmlist` CHANGE `address` `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; diff --git a/sql/old/3.3.5a/2012_04_04_00_world_conditions.sql b/sql/old/3.3.5a/2012_04_04_00_world_conditions.sql new file mode 100644 index 00000000000..55cab4ca730 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_04_00_world_conditions.sql @@ -0,0 +1,7 @@ +-- Will of Sartharion should only target the drakes and Sartharion +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=61254; +INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13, 1, 61254, 0, 0, 31, 0, 3, 30449, 0, 0, 0, '', 'Will of Sartharion'), +(13, 1, 61254, 0, 1, 31, 0, 3, 30451, 0, 0, 0, '', 'Will of Sartharion'), +(13, 1, 61254, 0, 2, 31, 0, 3, 30452, 0, 0, 0, '', 'Will of Sartharion'), +(13, 1, 61254, 0, 3, 31, 0, 3, 28860, 0, 0, 0, '', 'Will of Sartharion'); diff --git a/sql/old/3.3.5a/2012_04_04_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_04_01_world_spell_dbc.sql new file mode 100644 index 00000000000..7eccdf811e4 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_04_01_world_spell_dbc.sql @@ -0,0 +1 @@ +UPDATE `spell_dbc` SET `EffectApplyAuraName1`=4 WHERE `Id`=56817; diff --git a/sql/old/3.3.5a/2012_04_05_00_world_gameobject_template.sql b/sql/old/3.3.5a/2012_04_05_00_world_gameobject_template.sql new file mode 100644 index 00000000000..d50c4ad8d1c --- /dev/null +++ b/sql/old/3.3.5a/2012_04_05_00_world_gameobject_template.sql @@ -0,0 +1,32 @@ +DELETE FROM `gameobject_template` WHERE `entry`=202931; +INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `data0`, `data1`, `data2`, `data3`, `data4`, `data5`, `data6`, `data7`, `data8`, `data9`, `data10`, `data11`, `data12`, `data13`, `data14`, `data15`, `data16`, `data17`, `data18`, `data19`, `data20`, `data21`, `data22`, `data23`, `size`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `WDBVerified`) VALUES +(202931, 5, 9463, 'Serpent Offering', '', '', '', 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.17, 0, 0, 0, 0, 0, 0, 12340); -- -Unknown- + +UPDATE `gameobject_template` SET `questItem1`=30527, `questItem2`=30524, `questItem3`=30525, `questItem4`=30526 WHERE `entry`=184815; -- Sealed Coffin +-- UPDATE `gameobject_template` SET `data0`=2061, `WDBVerified`=12340 WHERE `entry`=151951; -- Idol Oven Fire +-- UPDATE `gameobject_template` SET `type`=5, `data3`=0, `data5`=0 WHERE `entry`=188187; -- Snow Pile +UPDATE `gameobject_template` SET `size`=0.45 WHERE `entry`=190169; -- Tiger Lily +UPDATE `gameobject_template` SET `unk1`='' WHERE `entry`=190549; -- The Zephyr +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=191300; -- Fire +UPDATE `gameobject_template` SET `displayId`=7836 WHERE `entry`=196485; -- Saronite Rock +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126337; -- 126337 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126338; -- 126338 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126339; -- 126339 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126340; -- 126340 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126341; -- 126341 +-- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126345; -- 126345 +UPDATE `gameobject_template` SET `data2`=23787, `data7`=3605, `data19`=0 WHERE `entry`=202443; -- Dedication of Honor +UPDATE `gameobject_template` SET `type`=10 WHERE `entry`=166872; -- Supply Crate +UPDATE `gameobject_template` SET `data6`=-1000 WHERE `entry`=178559; -- Larva Spewer + +/* +GameObject (Entry: 126337 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126338 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126339 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126340 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126341 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 126345 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 151951 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +GameObject (Entry: 191300 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. +Gameobject (Entry: 188192 GoType: 3) have data7=188187 but GO (Entry 188187) have not GAMEOBJECT_TYPE_TRAP (6) type. +*/ diff --git a/sql/old/3.3.5a/2012_04_05_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_05_00_world_spell_script_names.sql new file mode 100644 index 00000000000..43f6760e8d6 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_05_00_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` in (7384,7887,11584,11585); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(7384, 'spell_warr_overpower'), +(7887, 'spell_warr_overpower'), +(11584, 'spell_warr_overpower'), +(11585, 'spell_warr_overpower'); diff --git a/sql/old/3.3.5a/2012_04_05_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_05_01_world_spell_proc_event.sql new file mode 100644 index 00000000000..076f97b8736 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_05_01_world_spell_proc_event.sql @@ -0,0 +1,2 @@ +UPDATE `spell_proc_event` SET `SpellFamilyMask0`=0x80000000, `SpellFamilyMask1`=0 WHERE `entry`=67363; -- Fixes Libram of Veracity proc + diff --git a/sql/old/3.3.5a/2012_04_06_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_06_00_world_spell_proc_event.sql new file mode 100644 index 00000000000..0fba3bb46d6 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_06_00_world_spell_proc_event.sql @@ -0,0 +1 @@ +UPDATE `spell_proc_event` SET `SpellFamilyMask0`=0x10 WHERE `entry`=60132; -- Oblit/Scourge Strike Runic Power Up (T7 4s) diff --git a/sql/old/3.3.5a/2012_04_06_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_06_01_world_spell_dbc.sql new file mode 100644 index 00000000000..c0dc38ebf83 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_06_01_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=64748; -- Item - Death Knight T8 Tank 4P Bonus +INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(64748,1,0,384,0,0,0,0,131080,0,0,0,0,0,1,0,0,101,0,0,80,80,28,1,0,-1,0,0,6,0,0,1,0,1,'0','0','0',-11,0,-11,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16777829,0,0,0,15,0,0,0,0,0,0,'1','1','1',0,32,'Item - Death Knight T8 Tank 4P Bonus'); diff --git a/sql/old/3.3.5a/2012_04_06_02_world_gameobject_template.sql b/sql/old/3.3.5a/2012_04_06_02_world_gameobject_template.sql new file mode 100644 index 00000000000..5089579998d --- /dev/null +++ b/sql/old/3.3.5a/2012_04_06_02_world_gameobject_template.sql @@ -0,0 +1,4 @@ +-- GO required by spell 70477 - Cleanse Quel'Delar +DELETE FROM `gameobject_template` WHERE `entry`=300246; +INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `faction`, `flags`, `size`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `data0`, `data1`, `data2`, `data3`, `data4`, `data5`, `data6`, `data7`, `data8`, `data9`, `data10`, `data11`, `data12`, `data13`, `data14`, `data15`, `data16`, `data17`, `data18`, `data19`, `data20`, `data21`, `data22`, `data23`, `AIName`, `ScriptName`, `WDBVerified`) VALUES +(300246, 8, 0, 'TEMP Sunwell', '', '', '', 0, 0, 1, 0, 0, 0, 0, 0, 0, 1641, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', 1); diff --git a/sql/old/3.3.5a/2012_04_06_03_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_06_03_world_spell_dbc.sql new file mode 100644 index 00000000000..90ac4ac0f51 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_06_03_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=64934; -- Item - Warrior T8 Protection 4P Bonus +INSERT INTO `spell_dbc`(`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(64934,1,0,384,0,0,0,0,131080,0,0,0,0,0,1,0,0,101,0,0,80,80,28,1,0,-1,0,0,6,0,0,1,0,1,'0','0','0',-21,0,-11,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16777829,0,0,0,4,0,0,0,0,0,0,'1','1','1',0,32, 'Item - Warrior T8 Protection 4P Bonus'); diff --git a/sql/old/3.3.5a/2012_04_06_04_world_page_text.sql b/sql/old/3.3.5a/2012_04_06_04_world_page_text.sql new file mode 100644 index 00000000000..97c0d9afe2d --- /dev/null +++ b/sql/old/3.3.5a/2012_04_06_04_world_page_text.sql @@ -0,0 +1,25 @@ +DELETE FROM `page_text` WHERE entry IN (2177,2295,2296,2297,2301,2302,2303,2308,2309,3036,3045,3046,3047,3049,3050,3051,3052,3053,3378,3544,3563,3564,3565); +INSERT INTO `page_text` (`entry`, `text`, `next_page`) VALUES +(2177, 'Valea Twinblades \nWarrior of the Scarlet Crusade\nCitizen of Alterac \nLast seen deep in the Eastern Plaguelands', 0), +(2295, 'Before the Age of Memory, the gentle Earthmother breathed upon the golden mists of dawn. Where the amber clouds came to rest, there were endless fields of flowing wheat and barley. This was the basin of her works - the great basket of life and hope.', 2296), +(2296, 'The Earthmother\'s eyes shone down upon the lands she had breathed into creation. Her right eye, An\'she (the sun), gave warmth and light to the land. Her left eye, Mu\'sha (the moon), gave peace and sleep to the stirring creatures of the dawning. Such was the power of her gaze that the Earthmother closed one dreaming eye for every turning of the sky. Thus, her loving gaze turned day into night for the first dawning of the world. $B', 2297), +(2297, 'While the right eye shone down upon the golden dawn, the Earthmother\'s gentle hands spread out across the golden plains. Wherever the shadow of her arms passed, a noble people arose from the rich soil. The Shu\'halo (the tauren) arose to give thanks and prayer to their loving mother. There, in the endless fields of dawn, the children of the earth swore themselves to her grace and vowed to bless her name until the final darkening of the world.', 0), +(2301, 'Into the brave hearts of her pure children, the Earthmother placed the love of the hunt. For the creatures of the first dawn were savage and fierce. They hid from the Earthmother, finding solace in the shadows and the wild places of the land. The Shu\'halo hunted these beasts wherever they could be found and tamed them with the Earthmother\'s blessing. ', 2302), +(2302, 'One great spirit eluded them, however. Apa\'ro (known as Malorne to the night elves), was a proud stag of snow white fur. His antlers scraped the roof of the heavens and his mighty hooves stamped out the deep places of the world. The Shu\'halo hunted Apa\'ro to the corners of the dawning world - and closed in to snare the proud stag.', 2303), +(2303, 'Seeking to escape, the great stag leapt into the sky. Yet, as his escape seemed assured, his mighty antlers tangled in the stars which held him fast. Though he kicked and struggled, Apa\'ro could not loose himself from the heavens. It was then that Mu\'sha found him as she chased her brother, An\'she, towards the dawn. Mu\'sha saw the mighty stag as he struggled and fell in love with him immediately. ', 2304), +(2308, 'As the mists of dawn faded and the Age of Memory advanced, the demigod, Cenarius, went his own way through the fields of the world. The Shu\'halo (tauren) were sorrowful at his passing and forgot much of the druidism he had taught them. As the generations passed, they forgot how to speak with the trees and the wild things of the land. The dark whispers from the deeps of the world drifted up to their ears once again.', 2309), +(2309, 'Though the children of the earth closed out the evil whisperings, a terrible curse befell their roaming tribes. Out of the black lands of the west came a horde of murderous creatures - the centaur. Cannibals and ravagers, the centaur fell upon the Shu\'halo like a plague. Though the braves and hunters fought with the Earthmother\'s blessing in their hearts, the centaur could not be defeated.', 2310), +(3544, 'You have found the wreckage of a mysterious object. Beyond the flames, you are able to make out an insignia marked "M:1815212085". You wonder what world this object must be from...', 0), +(3378, 'INVINCIBLE$B$BBeloved steed of Prince Arthas Menethil$B$BLoyal and great of heart in life, may you find peace in death.$B$BPure streams and green pastures, devoted friend.', 0), +(3565, 'Gritting his teeth, Marcus gestured as light flashed over him, restoring his strength.$B$BTavi stared anxiously as he rose to his full height, engulfing her in his shadow. He thrust his hand forward, sending a wave of righteous force through her. Eyes rolled back as she wavered for several seconds before regaining consciousness.$B$B"I\'ve recently taken the path of... retribution."$B$BThe mischievous smirk returned to her face, "Well then, this is going to be fun."$B$B', 0), +(3564, 'Marcus took both her hands in one of his as he reassured her, "It\'s fine. What is your specialization?"$B$BHer head snapped up, eyes burning with renewed life as shadowy energy channeled through her hands into Marcus, dropping him to his knees in agony.$B$B"Affliction, actually."$B', 3565), +(3563, '"Interested in some more company?" she purred as her hands weaved through a complex summoning ritual, stopping only when she felt the warmth of a new presence behind her.$B$BAll color drained from Marcus\'s face as he struggled to protest. "I... I don\'t think that\'s appropriate."$B$BConfused, Tavi turned to see what was wrong. A hideous fel hound stood ready, drooling onto the floor as it stared intently at the half-armored paladin.$B$B"No! No that\'s not what I meant." she stammered as she dispelled the hungry demon. "I\'m sorry, that\'s not really my specialization...."', 3564), +(3045, 'First Watch, Eight Bells$BWatches changed. All is well.', 3046), +(3046, 'Middle Watch, One Bell$BCedric found attempting to break into Captain\'s wine cabinet. Disciplined.', 3047), +(3047, 'Middle Watch, Two Bells$BCedric climbed rigging, became tangled and fell. Attended by ship\'s surgeon. Sent below to sober up.', 3049), +(3049, 'Middle Watch, Four Bells$BBottle of rum found in Cedric\'s pants. Disciplined.', 3050), +(3050, 'Middle Watch, Five Bells$BCedric\'s clothes found. Cedric found separately. Cedric disciplined.', 3051), +(3051, 'Middle Watch, Six Bells$BCedric singing loudly. Woke Captain. Cedric disciplined by Captain.', 3052), +(3052, 'Middle Watch, Eight Bells$BWatches changed. All quiet. Two men sent to locate Cedric.$B', 3053), +(3053, 'Morning Watch, One Bell$BFire in Captain\'s quarters. All hands roused. Throwing powder overboard. ', 0), +(3036, 'The mighty creature\'s maw opened wide, tossing bolts of icy water toward our vessel. Those terrible jaws clamped down upon the bow of our ship, tearing it from the hull. Sailors and cargo were thrown violently into the sea as the remnants of the ship disappeared beneath the waves.$B$BThe last thing I remember was flying from the broken hull, hitting the inky waters, and plunging beneath the waves. The world went dark and I thought for certain I\'d drawn my last breath. When I awoke in Theramore\'s infirmary, I knew someone had to tell our story.', 0); diff --git a/sql/old/3.3.5a/2012_04_07_00_characters_lag_reports.sql b/sql/old/3.3.5a/2012_04_07_00_characters_lag_reports.sql new file mode 100644 index 00000000000..151ace1c976 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_07_00_characters_lag_reports.sql @@ -0,0 +1,2 @@ +ALTER TABLE `lag_reports` ADD `latency` int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `lag_reports` ADD `createTime` int(10) unsigned NOT NULL DEFAULT '0'; diff --git a/sql/old/3.3.5a/2012_04_07_00_world_gameobject.sql b/sql/old/3.3.5a/2012_04_07_00_world_gameobject.sql new file mode 100644 index 00000000000..c63fc753d32 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_07_00_world_gameobject.sql @@ -0,0 +1,5 @@ +UPDATE `gameobject_template` SET `faction`=54 WHERE `entry`=178164; +SET @GUID := 247; +DELETE FROM `gameobject` WHERE `guid`=@GUID; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,178164,409,1,1,736.6528,-1176.32,-118.0967,-0.6806787,0,0,0,1,120,255,1); -- Hot Coal, damage diff --git a/sql/old/3.3.5a/2012_04_07_01_world_game_event.sql b/sql/old/3.3.5a/2012_04_07_01_world_game_event.sql new file mode 100644 index 00000000000..7b74a90b49d --- /dev/null +++ b/sql/old/3.3.5a/2012_04_07_01_world_game_event.sql @@ -0,0 +1,2 @@ +UPDATE `game_event` SET `start_time` = '2012-04-08 00:01:00' WHERE `eventEntry` =9; -- Noblegarden +UPDATE `game_event` SET `start_time` = '2012-04-29 00:01:00' WHERE `eventEntry` =10; -- Children's Week diff --git a/sql/old/3.3.5a/2012_04_07_02_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_07_02_world_spell_proc_event.sql new file mode 100644 index 00000000000..62ef49bc657 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_07_02_world_spell_proc_event.sql @@ -0,0 +1 @@ +UPDATE `spell_proc_event` SET `procFlags`=0 WHERE `entry`=70805; diff --git a/sql/old/3.3.5a/2012_04_08_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_08_00_world_spell_script_names.sql new file mode 100644 index 00000000000..ca97f419e11 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_08_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb_dummy'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(69712,'spell_sindragosa_ice_tomb_dummy'); diff --git a/sql/old/3.3.5a/2012_04_08_01_world_creature_template.sql b/sql/old/3.3.5a/2012_04_08_01_world_creature_template.sql new file mode 100644 index 00000000000..c6665729b75 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_08_01_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Gymer +UPDATE `creature_template` SET `unit_class`=4,`spell1`=55426,`spell2`=55429,`spell3`=55516,`spell4`=55421,`VehicleId`=205 WHERE `entry`=29884; diff --git a/sql/old/3.3.5a/2012_04_08_02_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_08_02_world_spell_dbc.sql new file mode 100644 index 00000000000..5775428668d --- /dev/null +++ b/sql/old/3.3.5a/2012_04_08_02_world_spell_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=31934; -- Blessed Life +INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(31934,0,0,384,0,0,0,0,0,0,0,131072,0,0,1,0,1048576,100,1,0,0,0,21,1,0,-1,0,0,6,0,0,1,0,0,'0','0','0',-51,0,0,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',127,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,'1','0','0',0,0,'Blessed Life'); diff --git a/sql/old/3.3.5a/2012_04_08_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_08_02_world_spell_script_names.sql new file mode 100644 index 00000000000..dd23c9ef560 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_08_02_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_mystic_buffet'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(70127,'spell_sindragosa_mystic_buffet'), +(72528,'spell_sindragosa_mystic_buffet'), +(72529,'spell_sindragosa_mystic_buffet'), +(72530,'spell_sindragosa_mystic_buffet'); diff --git a/sql/old/3.3.5a/2012_04_08_03_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_08_03_world_spell_script_names.sql new file mode 100644 index 00000000000..744a8bad10d --- /dev/null +++ b/sql/old/3.3.5a/2012_04_08_03_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=-1064; +INSERT INTO `spell_script_names` VALUES +(-1064, 'spell_sha_chain_heal'); diff --git a/sql/old/3.3.5a/2012_04_12_00_world_creature_template.sql b/sql/old/3.3.5a/2012_04_12_00_world_creature_template.sql new file mode 100644 index 00000000000..ef4596939f5 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_12_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Update proper modelid for Celestial Steed (31957 is wrong) +UPDATE `creature_template` SET `modelid1`=31958,`modelid2`=0 WHERE `entry`=40625; diff --git a/sql/old/3.3.5a/2012_04_12_01_world_creature_template.sql b/sql/old/3.3.5a/2012_04_12_01_world_creature_template.sql new file mode 100644 index 00000000000..bfe7b698ae9 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_12_01_world_creature_template.sql @@ -0,0 +1,6 @@ +UPDATE `creature_template` SET `WDBVerified`=12340 WHERE `entry`=40624; -- Verified + +-- Remove temp entry 68686 and replace with wdb verified 38686 +UPDATE `creature_template` SET `difficulty_entry_3`=38686 WHERE `entry`=36950; +UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`exp`=2,`faction_A`=84,`faction_H`=84,`mindmg`=488,`maxdmg`=642,`attackpower`=782,`unit_flags`=32832,`dynamicflags`=8,`minrangedmg`=363,`maxrangedmg`=521,`rangedattackpower`=121 WHERE `entry`=38686; +DELETE FROM `creature_template` WHERE `entry`=68686; diff --git a/sql/old/3.3.5a/2012_04_12_02_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_04_12_02_world_spell_bonus_data.sql new file mode 100644 index 00000000000..db35f5d97ee --- /dev/null +++ b/sql/old/3.3.5a/2012_04_12_02_world_spell_bonus_data.sql @@ -0,0 +1,29 @@ +-- Druid +UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (779,1822,60089); +DELETE FROM `spell_bonus_data` WHERE `entry` IN (1079,9007,22568); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(1079,0,0,-1,-1, 'Druid - Rip'), +(9007,0,0,-1,-1, 'Druid - Pounce Bleed'), +(22568,0,0,-1,-1, 'Druid - Ferocious Bite'); + +-- Hunter +UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (3044,3674,53352,13812,13797,1978,42243); +UPDATE `spell_bonus_data` SET `ap_dot_bonus`=0.1 WHERE `entry`=13812; +DELETE FROM `spell_bonus_data` WHERE `entry` IN (24131,53353); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(24131,0,0,-1,-1, 'Hunter - Wyvern Sting (triggered)'), +(53353,0,0,-1,-1, 'Hunter - Chimera Shot (Serpent)'); +DELETE FROM `spell_ranks` WHERE `first_spell_id`=24131; +INSERT INTO `spell_ranks` VALUES +(24131,24131,1), +(24131,24134,2), +(24131,24135,3), +(24131,27069,4), +(24131,49009,5), +(24131,49010,6); + +-- Rogue +UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (2818,2819,11353,11354,25349,26968,27187,57969,57970); + +-- Howling blast +UPDATE `spell_bonus_data` SET `ap_bonus`=0.2 WHERE `entry`=49184; diff --git a/sql/old/3.3.5a/2012_04_12_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_04_12_03_world_spell_bonus_data.sql new file mode 100644 index 00000000000..d2262e52e98 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_12_03_world_spell_bonus_data.sql @@ -0,0 +1,8 @@ +-- Fixes some spell power stacking exploits +DELETE FROM `spell_bonus_data` WHERE `entry` IN (44525,18798,16614,7712,13897); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(44525,0,0,-1,-1, 'Enchant Weapon - Icebreaker'), +(18798,0,0,-1,-1, 'Item - Freezing Band'), +(16614,0,0,-1,-1, 'Item - Storm Gauntlets'), +(7712,0,0,-1,-1, 'Item - Fiery Retributer | Blazefury Medallion'), +(13897,0,0,-1,-1, 'Enchant Weapon - Fiery Weapon'); diff --git a/sql/old/3.3.5a/2012_04_12_04_world_creature_template.sql b/sql/old/3.3.5a/2012_04_12_04_world_creature_template.sql new file mode 100644 index 00000000000..35664ec5198 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_12_04_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Update modelid for Invincible (with not bugged animation) +UPDATE `creature_template` SET `modelid1`=31007,`modelid2`=0,`WDBVerified`=-12340 WHERE `entry`=38545; diff --git a/sql/old/3.3.5a/2012_04_12_05_world_command.sql b/sql/old/3.3.5a/2012_04_12_05_world_command.sql new file mode 100644 index 00000000000..8eb87155cb2 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_12_05_world_command.sql @@ -0,0 +1,2 @@ +DELETE FROM `trinity_string` WHERE `entry` IN(555,556); +DELETE FROM `command` WHERE `name`='hover'; diff --git a/sql/old/3.3.5a/2012_04_13_00_world_sai.sql b/sql/old/3.3.5a/2012_04_13_00_world_sai.sql new file mode 100644 index 00000000000..0fd4bdddd9b --- /dev/null +++ b/sql/old/3.3.5a/2012_04_13_00_world_sai.sql @@ -0,0 +1,25 @@ +UPDATE `smart_scripts` SET `target_type`=`action_param6` WHERE +(`entryorguid`=369200 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=369201 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=4) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=2) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=1) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=911700 AND `source_type`=9 AND `id`=3); + +UPDATE `smart_scripts` SET `action_param6`=0 WHERE +(`entryorguid`=369200 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=369201 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=3692 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=3) OR +(`entryorguid`=3584 AND `source_type`=0 AND `id`=4) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=2) OR +(`entryorguid`=954600 AND `source_type`=9 AND `id`=3) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=1) OR +(`entryorguid`=7207 AND `source_type`=0 AND `id`=2) OR +(`entryorguid`=911700 AND `source_type`=9 AND `id`=3); diff --git a/sql/old/3.3.5a/2012_04_13_01_world_misc.sql b/sql/old/3.3.5a/2012_04_13_01_world_misc.sql new file mode 100644 index 00000000000..e4d04449a3f --- /dev/null +++ b/sql/old/3.3.5a/2012_04_13_01_world_misc.sql @@ -0,0 +1,219 @@ +-- Gnomish Playback Device (item 52709) Targeting condition -- by norfik closes #2169 +DELETE FROM `conditions` WHERE `SourceEntry`=74222 AND `ConditionValue2` IN (1268, 7955, 6119); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 74222, 1, 31, 3, 1268, 0, 63, '', 'Gnomish Playback Device on Ozzie Togglevolt'), +(17, 0, 74222, 2, 31, 3, 7955, 0, 63, '', 'Gnomish Playback Device on Milli Featherwhistle'), +(17, 0, 74222, 3, 31, 3, 6119, 0, 63, '', 'Gnomish Playback Device on Tog Rustsprocket'); + +-- fix revenge ap coeff -- by ric101 closes #3344 +UPDATE `spell_bonus_data` SET `ap_bonus` = 0.310 WHERE `entry` = 6572; + +-- fix life seed sp coeff -- by warpten closes #4162 +DELETE FROM `spell_bonus_data` WHERE `entry`=48503; +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(48503,0,0,0,0, 'Druid - Living Seed Heal'); + +-- fix glyph of shadowflame proc only allow on damage. by kandera closes #3530 +UPDATE `spell_proc_event` SET `procEx` = procEx|262144 WHERE`entry` = 63310; -- Glyph of shadowflame fix + +-- Disable deprecated quests /in 2.4/ from Midsummer Festival - The Festival of Fire {A/H} by trista closes #5982 +DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (9367,9368); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,9367,0,0,0,'Disable quest The Festival of Fire {A}/Deprecated after 2.4 Midsummer Festival revamp/'), +(1,9368,0,0,0,'Disable quest The Festival of Fire {H}/Deprecated after 2.4 Midsummer Festival revamp/'); + +-- fix gameobject spawn for just maces sign -- by mrsmite closes #5849 +DELETE FROM `gameobject` WHERE `guid` = 10714; +UPDATE `gameobject` SET `guid` = 10714 WHERE `guid` = 61895 AND `id` = 2157; + +-- update npc texts. by helias closes #6098 +DELETE FROM `npc_text` WHERE `ID` IN (10719,10782,10783,10787,10788,2838,9072,9110,10310,13293,13641,14089,15077,15155,15240,15412,15866,15873,15877,8663,8244,8254,8255,8282,8291,8296,8298,11093,3464,4776,4713,12130,13002,9984,12977,12978,10918,10999,10986,10991); +INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `lang0`, `prob0`, `em0_0`, `em0_1`, `em0_2`, `em0_3`, `em0_4`, `em0_5`) VALUES +(10719, '$B$BWorry not, child. Look in your pack and you will find it once more.', NULL, 0, 1, 0, 0, 0, 0, 0, 0), +(10782, 'Sayoc, da ugly orc here, teach you daggers. You want teaching in other places, you talk to Ileda in da Farstrider Square of Silvermoon or Archibald in the War Quarter of Undercity, hokay?', 'Sayoc, da ugly orc here, teach you daggers. You want teaching in other places, you talk to Ileda in da Farstrider Square of Silvermoon or Archibald in the War Quarter of Undercity, hokay?', 1, 1, 0, 0, 0, 0, 0, 0), +(10783, 'You want to punch things, yah? Talk to Sayoc right here. He teach you.', 'You want to punch things, yah? Talk to Sayoc right here. He teach you.', 1, 1, 0, 0, 0, 0, 0, 0), +(10787, 'Ileda of da blood elves, in Farstrider Square of Silvermoon, train her students in both one and two-handed swords. Archibald, da Undercity"s weapon master, also train you, mon. He in da War Quarter.', 'Ileda of da blood elves, in Farstrider Square of Silvermoon, train her students in both one and two-handed swords. Archibald, da Undercity"s weapon master, also train you, mon. He in da War Quarter.', 1, 1, 0, 0, 0, 0, 0, 0), +(10788, 'Hanashi here knows staves. If you want a sturdier instructor, go to Thunder Bluff. Ansekhwa will teach you on the lower central rise there.', '', 1, 1, 0, 0, 0, 0, 0, 0), +(2838, '', 'Sure thing, $N. Here"s another for you.', 0, 1, 0, 0, 0, 0, 0, 0), +(9072, 'A search of the corpse"s clothing and equipment reveals the insignia you need, undamaged by the battle and foul environment.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(9110, 'Say, you happen to see that arch in the lake to the west? I wonder where that goes? I should go divin" over there.', '', 0, 1, 0, 1, 0, 0, 0, 0), +(10310, 'You must be exalted with the blood elves before I will teach you a riding skill, $c.', '', 1, 1, 0, 1, 0, 0, 0, 0), +(13293, 'Please hurry, $N. I am in a great deal of pain and time is running out.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(13641, '', '', 0, 1, 0, 0, 0, 0, 0, 0), +(14089, 'I"ve got a lead on Norgannon"s keystone, which guards access to Ulduar"s archives, but the Titans divided it into two pieces and secreted them away.$B$BOne of the pieces, the keystone"s shell, is held within the Inventor"s Library on the northern coast, south of Ulduar itself. The first thing you"ll need to do is retrieve the fragments of an access disk from the library"s guardians.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15077, 'There you are! I was beginning to think that the Sunreavers had intercepted you. Are you ready to deliver the tome to our representatives in Icecrown?', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15155, 'These appear to be the remains of Thalorien Dawnseeker, the last wielder of Quel"Delar.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15240, 'I will escort you into the Sunwell when you"re ready.', 'I will escort you into the Sunwell when you"re ready.', 0, 1, 0, 0, 0, 0, 0, 0), +(15412, 'We got the final barrier blockin" entry to Frostwing Halls down, $g lad:lass;. Only Sindragosa stands between the Lich King and divine retribution! What are ye waitin" for?!', '', 0, 1, 0, 5, 0, 0, 0, 0), +(15866, 'De Darkspears have a home again! An" we couldn"t have done it wit"out ya helpin", $N. Now, we celebrate!', '', 0, 1, 0, 1, 0, 1, 0, 0), +(15873, 'Vol"jin told me ta keep hittin" da drum till he gets back. If ya be waitin" for him, he"d be back soon to take back da Isles.$B$BJust wait here and enjoy da music!', '', 0, 1, 0, 0, 0, 0, 0, 0), +(15877, 'We require da help of allies on da islands.$B$BZen"tabra has been watching over da animals of de Islands for some time now. We"d need her help and da help of da animal creatures.$B$BBwonsamdi is a powerful loa dat controls de spirits of de dead on da islands. His blessing is crucial for our attack.$B$BOnce our allies have joined us, Zalazane and his army of mind-controlled trolls will have no chance! Then, da Echo Isles will be de Darkspears!', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8663, 'Thank you for delivering that list! My leg is almost recovered enough that I"ll be able to walk back to the crash site.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8244, 'We"ve been so wrapped up in this war, some of us forgot to make time for love.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8254, 'You work with machines for so long, sometimes you forget about real hearts.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(8255, '', 'When you have lived as long as I, it becomes easy to forget about love for years. It is always good to be reminded.', 0, 1, 0, 0, 0, 0, 0, 0), +(8282, '', 'You look like you"ve had your heart broken. Come back when you"re not so sad.', 0, 1, 0, 25, 0, 153, 0, 0), +(8291, 'What, you don"t have a token to give me? Don"t you love me?', '', 0, 1, 0, 18, 0, 0, 0, 0), +(8296, 'It looks like you"ve already found love. You can give me a love token, but I"m not giving you anything nice. I"m waiting for someone special.', 'It looks like you"ve already found love. You can give me a love token, but I"m not giving you anything nice. I"m waiting for someone special.', 0, 1, 0, 1, 0, 0, 0, 0), +(8298, 'I"d like you better if you would apply some perfume.', 'I"d like you better if you would apply some perfume.', 0, 1, 0, 24, 0, 0, 0, 0), +(11093, 'Let"s get out of here!', '', 0, 1, 0, 5, 0, 0, 0, 0), +(3464, '', 'You do fine work, but it"s a bit rough around the edges. Don"t worry about it, it will come with practice. Speaking of which, how about we see what you"ve been working on?', 7, 1, 0, 0, 0, 0, 0, 0), +(4776, 'The battle is over, and the people of Darrowshire are saved.', '', 0, 1, 0, 0, 0, 0, 0, 0), +(4713, 'The Nightmare is finally over! Darrowshire, forgive me!', '', 0, 1, 0, 15, 0, 0, 0, 0), +(12130, '', '', 0, 1, 0, 0, 0, 0, 0, 0), +(13002, 'There ya go, mon. Try ta be more careful with this one, won"t ya?$b$bNow head down ta Drak"Zin Ruins and drink it near the pedestal!', NULL, 0, 1, 0, 0, 0, 0, 0, 0), +(9984, 'What are ye doin" here?! Get yer chatty self ta Alterac Vallery, where ye"re needed!', '', 7, 1, 1, 5, 0, 0, 0, 0), +(12977, 'Blight, Blight, Blight... that"s all I hear about around here. I miss the diversity!$b$bHere, here. You have pets, yes? Of course you do. Of course. Little pets. I have a mixture for them. It will make them ca-- ah, clever and strong creatures, yes. Yes. ', '', 1, 1, 396, 5, 0, 0, 0, 0), +(12978, 'Careful with it. It"s unstable and loses its potency quickly. Use it soon! And... preferably within eyesight, yes...', '', 1, 1, 5, 0, 0, 0, 0, 0), +(10918, 'The boy"s too stupid still to say it -- not enough crystal exposure yet -- but, he"s thankful for what you did in getting him those flasks.$B$BNow, only nine more sons to go. Gah!$B$B$B$BWant to take one of them off of our hands? We"ll sell him to you cheap.', '', 0, 1, 0, 1, 0, 5, 0, 6), +(10999, 'Friend! It"s been too long. What can we get for you?', '', 0, 1, 1, 1, 0, 0, 0, 0), +(10986, 'Our drinks should quench even the mightiest of thirsts.', '', 0, 1, 1, 396, 0, 0, 0, 0), +(10991, 'What can I say, $N? Yer the finest o" the Sha"tari Skyguard!$B$BJust don"t be lettin" that go ta yer head. I can still teach ya a thing or two, $G lad : lass;!$B$B', '', 0, 0, 0, 0, 0, 0, 0, 0); + +-- Fix Kor'kron War Rider flying by trista closes #5569 +UPDATE `creature_template` SET `inhabittype`=5,`speed_walk`=1, `speed_run`=1 WHERE `entry`=26813; + +-- Gretta the Arbiter (Storm Peaks, Brunhilldar) by mweinelt closes #5493 +-- Daily Quest Pooling +-- Source: http://www.wowwiki.com/Gretta_the_Arbiter +SET @pool_id := 354; + +DELETE FROM `pool_template` WHERE `entry` = @pool_id; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES +(@pool_id, 1, 'Gretta the Arbiter - Daily Quests'); + +DELETE FROM `pool_quest` WHERE `entry` IN (13424, 13423, 13422, 13425); +INSERT INTO `pool_quest` (`entry`, `pool_entry`, `description`) VALUES +(13424, @pool_id, 'Back to the Pit'), +(13423, @pool_id, 'Defending Your Title'), +(13422, @pool_id, 'Maintaining Discipline'), +(13425, @pool_id, 'The Aberrations Must Die'); + +-- Pathing for Arzeth the Merciless Entry: 19354 by kiperr closes #5510 +SET @NPC := 69051; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-617.6182,`position_y`=4800.323,`position_z`=38.53064 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-546.5514,4799.893,33.83914,0,0,0,100,0), +(@PATH,2,-512.5808,4799.929,32.09928,0,0,0,100,0), +(@PATH,3,-480.9247,4799.97,28.25657,0,0,0,100,0), +(@PATH,4,-512.6269,4799.873,32.09928,0,0,0,100,0), +(@PATH,5,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,6,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,7,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,8,-617.6182,4800.323,38.53064,0,0,0,100,0), +(@PATH,9,-659.4124,4799.819,49.09505,0,0,0,100,0), +(@PATH,10,-582.4199,4800.242,34.97715,0,0,0,100,0), +(@PATH,11,-546.5514,4799.893,33.83914,0,0,0,100,0), +(@PATH,12,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,13,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,14,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,15,-617.6182,4800.323,38.53064,0,0,0,100,0), +(@PATH,16,-659.4124,4799.819,49.09505,0,0,0,100,0), +(@PATH,17,-512.5808,4799.929,32.09928,0,0,0,100,0), +(@PATH,18,-480.9247,4799.97,28.25657,0,0,0,100,0), +(@PATH,19,-512.6269,4799.873,32.09928,0,0,0,100,0), +(@PATH,20,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,21,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,22,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,23,-617.6182,4800.323,38.53064,0,0,0,100,0), +(@PATH,24,-659.4124,4799.819,49.09505,0,0,0,100,0), +(@PATH,25,-582.4199,4800.242,34.97715,0,0,0,100,0), +(@PATH,26,-512.6269,4799.873,32.09928,0,0,0,100,0), +(@PATH,27,-542.1885,4799.724,33.71414,0,0,0,100,0), +(@PATH,28,-570.3811,4800.449,34.60215,0,0,0,100,0), +(@PATH,29,-592.3809,4800.299,35.85215,0,0,0,100,0), +(@PATH,30,-617.6182,4800.323,38.53064,0,0,0,100,0); + +-- Dark Portal - corrects the entry position and orientation by cdawg closes #5470 +UPDATE `areatrigger_teleport` SET `target_position_x`=-248.149292, `target_position_y`=921.874953, `target_position_z`=84.388448, `target_orientation`=1.584155 WHERE `id`=4354; + +-- Add pamphlets to mail loot by gecko32 closes #5408 +DELETE FROM `mail_loot_template` WHERE `entry` BETWEEN 224 AND 233; +INSERT INTO `mail_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(224, 46875, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Elwynn Forest +(225, 46876, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Darnassus +(226, 46877, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Dun Morogh drawf +(227, 46879, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Azuremyst Isle +(228, 46878, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Dun Morogh gnome +(229, 46884, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Mulgore +(230, 46883, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Durator +(231, 46880, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Orgrimmar +(232, 46882, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Eversong Woods +(233, 46881, 100, 1, 0, 1, 1); -- Riding Training Pamphlet Tirisfal Glades + +-- fix coordinates for cannoneer whessan by mosoo closes #5406 +UPDATE `creature` SET `position_x`=-2093.53, `position_y`=-3496.47, `position_z`=130.084, `orientation`=3.008 WHERE `id`=3455 LIMIT 1; + +-- fix quest requirement for the last of her kind by shlomi 1515 closes #4875 +UPDATE `quest_template` SET `PrevQuestID` = 12900 WHERE `id` = 12983; + +-- Add rep reward to ICC25 Trash by gecko32 closes #5457 +DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (37655,38031,38057,38058,38059,38061,38062,38063,38064,38072,38073,38074,38075,38076,38098,38099,38100,38101,38102,38103,38105,38108,38110,38126,38130,38131,38132,38133,38139,38151,38219,38220,38418,38445,38446,38479,38480,38481); +INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES +(37655, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Decaying colossus +(38031, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Deathbound Ward +(38057, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Servant of the throne +(38058, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Nerub'ar Broodkeeper +(38059, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ancient Skeletal Soldier +(38061, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- The Damned +(38062, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Plague Scientist +(38063, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Vengeful Fleshreaper +(38064, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Stinky +(38072, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Attedent +(38073, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Disciple +(38074, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Deathspeacker High Preist +(38075, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Servant +(38076, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Zealot +(38098, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Advisor +(38099, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Archmage +(38100, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Blood Knight +(38101, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Lieutenant +(38102, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Commander +(38103, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Precious +(38105, 1156, 0, 7, 0, 2, 0, 0, 0, 0), -- Plagued Zombie +(38108, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Blighted Abomination +(38110, 1156, 0, 7, 0, 30, 0, 0, 0, 0), -- Pustulating Horror +(38126, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Frostbinder +(38130, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Deathbringer +(38131, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Huntress +(38132, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Battle-Maiden +(38133, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Warlord +(38139, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frostwarden Handler +(38151, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frostwing Whelp +(38219, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Spinestalker +(38220, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Rimefang +(38418, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Val'kyr Herald +(38445, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Spire Minion +(38446, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frenzied Abomination +(38479, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Tactician +(38480, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Noble +(38481, 1156, 0, 7, 0, 15, 0, 0, 0, 0); -- Spire Gargoyle + +-- fix procs by warpten closes #4467 for +-- Needle-Encrusted Scorpion +DELETE FROM `spell_proc_event` WHERE `entry`=71404; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(71404,0,0,0,0,0,0,2,0,0,50); + +-- Black Magic +DELETE FROM `spell_proc_event` WHERE `entry`=59630; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(59630,0,0,0,0,0,0,0,0,0,35); + +-- Environment Creature Hight Update by shlomi1515 closes #4043 +UPDATE `creature` SET `position_z`=558.210022 WHERE `guid` IN (85141,85143,85154,85153,85142,85151,85152,85150); +UPDATE `creature` SET `position_z`=586.302 WHERE `guid` IN (85145,85144,85146); +UPDATE `creature` SET `position_z`=586.263 WHERE `guid` IN (85147,85148,85149); + +-- fix winterskorn raider not landing by nayd closes #3899 +UPDATE `creature_template` SET `InhabitType`=`InhabitType`|1 WHERE `entry`=23665; + +-- fix head of onyxia's loot closes by kandera #3851 +UPDATE `item_template` SET `flags` = flags|4096 WHERE `entry` IN (18422,18423,49644,49643); + +-- fix visual for plagued dragonsflayer tribesman by shlomi1515 closes #3518 +DELETE FROM `creature_addon` WHERE `guid` = 97540; diff --git a/sql/old/3.3.5a/2012_04_13_02_world_misc.sql b/sql/old/3.3.5a/2012_04_13_02_world_misc.sql new file mode 100644 index 00000000000..7c71af78cd7 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_13_02_world_misc.sql @@ -0,0 +1,18 @@ +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (38308,38309,37824); -- Professor Putricide triggers +UPDATE `creature_template` SET `ScriptName`='npc_gas_cloud' WHERE `entry`=37562; -- Gas Cloud +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_putricide_ooze_summon'; +DELETE FROM `spell_target_position` WHERE `id` IN (71413,71414); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(71414,631,4335.00,3206.75,389.399,0), +(71413,631,4380.43,3206.55,389.398,0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (71615,71618,71412,71415); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(13,4,71615,31,3,37690,'Putricide - Tear Gas on Slime Puddle'), +(13,1,71618,31,3,37562,'Putricide - Tear Gas on Gas Cloud'), +(13,2,71618,31,3,37697,'Putricide - Tear Gas on Volatile Ooze'), +(13,4,71618,31,3,38159,'Putricide - Tear Gas on Choking Gas Bomb'); + +UPDATE `spell_script_names` SET `ScriptName`='spell_putricide_clear_aura_effect_value' WHERE `ScriptName`='spell_putricide_clear_mutated_plague'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(71620,'spell_putricide_clear_aura_effect_value'); diff --git a/sql/old/3.3.5a/2012_04_13_03_world_bg_template.sql b/sql/old/3.3.5a/2012_04_13_03_world_bg_template.sql new file mode 100644 index 00000000000..a426d7c6831 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_13_03_world_bg_template.sql @@ -0,0 +1,7 @@ +ALTER TABLE `battleground_template` ADD `StartMaxDist` float NOT NULL DEFAULT 0 AFTER `HordeStartO`; + +UPDATE `battleground_template` SET `StartMaxDist`=200 WHERE `id`=30; -- IC +UPDATE `battleground_template` SET `StartMaxDist`=100 WHERE `id`=1; -- AV +UPDATE `battleground_template` SET `StartMaxDist`=75 WHERE `id` IN (2,3,7); -- WSG, AB, EotS + +UPDATE `battleground_template` SET `MinLvl`=1 WHERE `id`=32; diff --git a/sql/old/3.3.5a/2012_04_13_04_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_13_04_world_spell_proc_event.sql new file mode 100644 index 00000000000..3ea68187687 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_13_04_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +-- Blackened Naaru Silver proc cooldown +DELETE FROM `spell_proc_event` WHERE `entry`=45355; +INSERT INTO `spell_proc_event`(`entry`,`schoolmask`,`spellfamilyname`,`spellfamilymask0`,`spellfamilymask1`,`spellfamilymask2`,`procflags`,`procex`,`ppmrate`,`customchance`,`cooldown`) VALUES +(45355,0,0,0,0,0,0,0,0,0,45); \ No newline at end of file diff --git a/sql/old/3.3.5a/2012_04_14_00_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_04_14_00_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..dea4b771068 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_14_00_world_gameobject_loot_template.sql @@ -0,0 +1,3 @@ +-- Add Bogblossom to this Bogblossom object for the druid quest (other one already contains it) +DELETE FROM `gameobject_loot_template` WHERE (`entry`=10961) AND (`item`=31950); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES (10961,31950,-100,0,0,1,1); diff --git a/sql/old/3.3.5a/2012_04_14_01_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_04_14_01_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..a3dd0c39865 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_14_01_world_gameobject_loot_template.sql @@ -0,0 +1,11 @@ +-- Add missing gameobject_loot_templates to prevent startup errors +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (3458,3459,3460,3461,15920,16841,26878,27725); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(3458,4594,100,0,0,1,1), -- Rockscale Cod on Feast Fish +(3459,3771,100,0,0,1,1), -- Wild Hog Shank On Feast Boar +(3460,4538,100,0,0,1,1), -- Snapvine Watermelon on Feast Fruit +(3461,1708,100,0,0,1,1), -- Sweet Nectar on Feast Goblet +(15920,17822,-100,0,0,1,1), -- Weird Map on weird object +(16841,18950,-100,0,0,1,1), -- Chambermaid Pillaclenchers Pillow on Pillaclencher's Ornate Pillow +(26878,45062,100,0,0,1,1), -- Dusty Journal on Dusty Journal (different ID) +(27725,49648,100,0,0,1,1); -- Borrowed Tabard on Clean Laundry (might need condition!) diff --git a/sql/old/3.3.5a/2012_04_14_02_world_creature_template_addon.sql b/sql/old/3.3.5a/2012_04_14_02_world_creature_template_addon.sql new file mode 100644 index 00000000000..6aaa7da383e --- /dev/null +++ b/sql/old/3.3.5a/2012_04_14_02_world_creature_template_addon.sql @@ -0,0 +1,3 @@ +UPDATE `creature_template_addon` SET `auras`='50453' WHERE `entry`=28017; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=28017; +UPDATE `creature_template` SET `ainame` = '' WHERE `entry`=28017; \ No newline at end of file diff --git a/sql/old/3.3.5a/2012_04_14_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_04_14_03_world_spell_bonus_data.sql new file mode 100644 index 00000000000..ee081c17078 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_14_03_world_spell_bonus_data.sql @@ -0,0 +1 @@ +UPDATE `spell_bonus_data` SET `direct_bonus`=0.8930 WHERE `entry`=51505; diff --git a/sql/old/3.3.5a/2012_04_14_04_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_14_04_world_spell_proc_event.sql new file mode 100644 index 00000000000..78a869e655a --- /dev/null +++ b/sql/old/3.3.5a/2012_04_14_04_world_spell_proc_event.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_proc_event` WHERE `entry`=53601; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(53601, 0, 0, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0, 0, 6); diff --git a/sql/old/3.3.5a/2012_04_14_05_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_14_05_world_spell_proc_event.sql new file mode 100644 index 00000000000..8cb2b1d3d2b --- /dev/null +++ b/sql/old/3.3.5a/2012_04_14_05_world_spell_proc_event.sql @@ -0,0 +1 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (51486,51485,51483); diff --git a/sql/old/3.3.5a/2012_04_16_00_world_game_event.sql b/sql/old/3.3.5a/2012_04_16_00_world_game_event.sql new file mode 100644 index 00000000000..1dc3fe3ad91 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_16_00_world_game_event.sql @@ -0,0 +1,4 @@ +SET @Event = 26; -- Pilgrim's Bounty +DELETE FROM `game_event` WHERE `eventEntry`=@Event; +INSERT INTO `game_event` (`eventEntry`,`start_time`,`end_time`,`occurence`,`length`,`holiday`,`description`,`world_event`) VALUES +(@Event,'2012-11-18 01:00:00','2020-12-31 05:00:00',525600,10020,404,'Pilgrim\'s Bounty',0); diff --git a/sql/old/3.3.5a/2012_04_17_00_world_creature.sql b/sql/old/3.3.5a/2012_04_17_00_world_creature.sql new file mode 100644 index 00000000000..ebf0fb42a59 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_17_00_world_creature.sql @@ -0,0 +1,28 @@ +SET @GUID1 := 41781; +SET @GUID2 := 41783; + +DELETE FROM creature WHERE guid IN (@GUID1,@GUID2); +INSERT INTO `creature` +(`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`) +VALUES +(@GUID1 ,38453,571,1,1,3561.821,-2736.367,136.0317,0), -- Arcturis in Grizzly Hills +(@GUID2,35189,571,1,1,7101.845,-1443.734,924.2609,0.178631); -- Skoll in The Storm Peaks + +UPDATE `creature_template` SET `faction_A` = 190, `faction_H`=190 WHERE `entry` IN (38453,35189); + +SET @NPC= @GUID1*10; +-- Add pathing for Arcturis +DELETE FROM `creature_addon` WHERE `guid` = @GUID1; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@GUID1,@NPC,0,0,0,0,''); -- Add path for Acturis +-- Add waypoint data for the path: +DELETE FROM `waypoint_data` WHERE `id`=@NPC; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES +(@NPC,1,3563.499,-2737.698,137.1898), +(@NPC,2,3565.249,-2738.698,138.4398), +(@NPC,3,3566.749,-2739.948,139.9398), +(@NPC,4,3568.249,-2740.698,140.6898), +(@NPC,5,3567.839,-2741.380,141.9256), +(@NPC,6,3569.999,-2741.948,142.1898), +(@NPC,7,3570.749,-2742.448,143.1898), +(@NPC,8,3572.676,-2743.528,144.8479); diff --git a/sql/old/3.3.5a/2012_04_18_00_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2012_04_18_00_world_npc_spellclick_spells.sql new file mode 100644 index 00000000000..3bad860290b --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_00_world_npc_spellclick_spells.sql @@ -0,0 +1,2 @@ +UPDATE `npc_spellclick_spells` SET `spell_id`=57053 WHERE `npc_entry`=30066 AND `spell_id`=56678; +UPDATE `creature_template` SET `spell1`=55812 WHERE `entry`=30066; diff --git a/sql/old/3.3.5a/2012_04_18_01_world_creature.sql b/sql/old/3.3.5a/2012_04_18_01_world_creature.sql new file mode 100644 index 00000000000..e2d6bdac95b --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_01_world_creature.sql @@ -0,0 +1 @@ +UPDATE `creature` SET `spawntimesecs`=39600 WHERE `guid` IN (41781,41783); -- Set the spawntime to 11 hours for Arcturis & Skoll diff --git a/sql/old/3.3.5a/2012_04_18_02_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_04_18_02_world_reference_loot_template.sql new file mode 100644 index 00000000000..4ed922060d9 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_02_world_reference_loot_template.sql @@ -0,0 +1,377 @@ +-- ---------------------- +-- -- Various Cleanups -- +-- ---------------------- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=10 AND `SourceGroup`=34105; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceGroup` IN (27081,27085,27073,26963,26955); +DELETE FROM `reference_loot_template` WHERE `entry` IN (12020,12021,12022,34105,34125,34126,34127,34128,34129,34130); +DELETE FROM `gameobject_loot_template` WHERE `entry`=10961; -- Bad Bogblossom fix was bad +UPDATE `gameobject_template` SET `data1`=26956 WHERE `entry`=194315; +-- ------------------------------- +-- -- Variables and definitions -- +-- ------------------------------- +-- Freya 10 man +SET @Freya10k0ID := 194324; -- Freyas Gift 10man ALL elders alive +SET @Freya10k1ID := 194326; -- Freyas Gift 10man killed 1 elder +SET @Freya10k2ID := 194328; -- Freyas Gift 10man killed 2 elder +SET @Freya10k3ID := 194330; -- Freyas Gift 10man killed 3 elder +-- Freya 25 man +SET @Freya25k0ID := 194325; -- Freyas Gift 25man ALL elders alive +SET @Freya25k1ID := 194327; -- Freyas Gift 25man killed 1 elder +SET @Freya25k2ID := 194329; -- Freyas Gift 25man killed 2 elder +SET @Freya25k3ID := 194331; -- Freyas Gift 25man killed 3 elder +-- Hodir +SET @Hodir10nID := 194307; -- Cache of Winter 10man +SET @Hodir10hID := 194200; -- Rare Cache of Winter 10man +SET @Hodir25nID := 194308; -- Cache of Winter 25man +SET @Hodir25hID := 194201; -- Rare Cache of Winter 25man +-- Mimiron +SET @Mimiron10nID := 194789; -- Cache of Innovations 10man +SET @Mimiron25nID := 194956; -- Cache of Innovations 25man +SET @Mimiron10hID := 194957; -- Cache of Innovation 10 man Hardmode +SET @Mimiron25hID := 194958; -- Cache of Innovation 25 man Hardmode +-- Thorim +SET @Thorim10nID := 194312; -- Cache of Storms 10man +SET @Thorim10hID := 194313; -- Cache of Storms 10 man Hardmode +SET @Thorim25nID := 194314; -- Cache of Storms 25man +SET @Thorim25hID := 194315; -- Cache of Storms 25 man Hardmode + +-- Use procedure to get Lootid from data1 field and assign it to a variable +-- Freya 10 +CALL `sp_get_go_lootid`(@Freya10k0ID,@Freya10k0); +CALL `sp_get_go_lootid`(@Freya10k1ID,@Freya10k1); +CALL `sp_get_go_lootid`(@Freya10k2ID,@Freya10k2); +CALL `sp_get_go_lootid`(@Freya10k3ID,@Freya10k3); +-- Freya 25 +CALL `sp_get_go_lootid`(@Freya25k0ID,@Freya25k0); +CALL `sp_get_go_lootid`(@Freya25k1ID,@Freya25k1); +CALL `sp_get_go_lootid`(@Freya25k2ID,@Freya25k2); +CALL `sp_get_go_lootid`(@Freya25k3ID,@Freya25k3); +-- Hodir 10 +CALL `sp_get_go_lootid`(@Hodir10nID,@Hodir10n); +CALL `sp_get_go_lootid`(@Hodir10hID,@Hodir10h); +-- Hodir 25 +CALL `sp_get_go_lootid`(@Hodir25nID,@Hodir25n); +CALL `sp_get_go_lootid`(@Hodir25hID,@Hodir25h); +-- Mimiron +CALL `sp_get_go_lootid`(@Mimiron10nID,@Mimiron10n); +CALL `sp_get_go_lootid`(@Mimiron10hID,@Mimiron10h); +CALL `sp_get_go_lootid`(@Mimiron25nID,@Mimiron25n); +CALL `sp_get_go_lootid`(@Mimiron25hID,@Mimiron25h); +-- Thorim +CALL `sp_get_go_lootid`(@Thorim10nID,@Thorim10n); +CALL `sp_get_go_lootid`(@Thorim10hID,@Thorim10h); +CALL `sp_get_go_lootid`(@Thorim25nID,@Thorim25n); +CALL `sp_get_go_lootid`(@Thorim25hID,@Thorim25h); +-- Set References +SET @Freya10Ref := 34365; +SET @Freya25Ref := @Freya10Ref+1; +SET @Hodir10Ref := @Freya10Ref+2; +SET @Hodir25Ref := @Freya10Ref+3; +SET @Mimiron10Ref := @Freya10Ref+4; +SET @Mimiron25Ref := @Freya10Ref+5; +SET @Thorim10Ref := @Freya10Ref+6; +SET @Thorim25Ref := @Freya10Ref+7; +SET @HandToken := 12026; +SET @LegToken := @HandToken+1; +SET @LegsToken := @HandToken+2; +SET @ChestToken := @HandToken+3; +SET @HeadToken := @HandToken+4; +SET @GloveToken := @HandToken+5; +SET @ShoulderToken := @HandToken+6; +SET @HelmToken := @HandToken+7; +SET @Recipe := 34154; +-- ------------------------- +-- -- Reference Templates -- +-- ------------------------- +-- Delete previous templates if existing +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Freya10Ref AND @Freya10Ref+7; +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @HandToken AND @HandToken+7; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Freya 10 man +(@Freya10Ref,45934,0,1,1,1,1), -- Unraveling Reach +(@Freya10Ref,45935,0,1,1,1,1), -- Ironbark Faceguard +(@Freya10Ref,45941,0,1,1,1,1), -- Chestguard of the Lasher +(@Freya10Ref,45936,0,1,1,1,1), -- Legplates of Flourishing Resolve +(@Freya10Ref,45940,0,1,1,1,1), -- Tunic of the Limber Stalker +-- Freya 25 man +(@Freya25Ref,45483,0,1,1,1,1), -- Boots of the Servant +(@Freya25Ref,45482,0,1,1,1,1), -- Leggings of the Lifetender +(@Freya25Ref,45481,0,1,1,1,1), -- Gauntlets of Ruthless Reprisal +(@Freya25Ref,45480,0,1,1,1,1), -- Nymph Heart Charm +(@Freya25Ref,45479,0,1,1,1,1), -- The Lifebinder +-- Freya Tokens +(@HandToken,45644,0,1,1,1,1), -- Gloves of the Wayward Conqueror +(@HandToken,45645,0,1,1,1,1), -- Gloves of the Wayward Protector +(@HandToken,45646,0,1,1,1,1), -- Gloves of the Wayward Vanquisher +(@LegToken,45653,0,1,1,1,1), -- Legplates of the Wayward Conqueror +(@LegToken,45654,0,1,1,1,1), -- Legplates of the Wayward Protector +(@LegToken,45655,0,1,1,1,1), -- Legplates of the Wayward Vanquisher +-- Hodir 10 man +(@Hodir10Ref,45874,0,1,1,1,1), -- Signet of Winter +(@Hodir10Ref,45458,0,1,1,1,1), -- Stormedge +(@Hodir10Ref,45873,0,1,1,1,1), -- Winter's Frigid Embrace +(@Hodir10Ref,45872,0,1,1,1,1), -- Avalanche +(@Hodir10Ref,45454,0,1,1,1,1), -- Cowl of Icy Breaths +-- Hodir 25 man +(@Hodir25Ref,45452,0,1,1,1,1), -- Frostplate Greaves +(@Hodir25Ref,45454,0,1,1,1,1), -- Frost-Bound Chain Bracers +(@Hodir25Ref,45453,0,1,1,1,1), -- Winter's Icy Embrace +(@Hodir25Ref,45450,0,1,1,1,1), -- Northern Barrier +(@Hodir25Ref,45451,0,1,1,1,1), -- Frozen Loop +-- Hodir Tokens +(@LegsToken,45650,0,1,1,1,1), -- Leggings of the Wayward Conqueror +(@LegsToken,45651,0,1,1,1,1), -- Leggings of the Wayward Protector +(@LegsToken,45652,0,1,1,1,1), -- Leggings of the Wayward Vanquisher +(@ChestToken,45632,0,1,1,1,1), -- Breastplate of the Wayward Conqueror +(@ChestToken,45633,0,1,1,1,1), -- Breastplate of the Wayward Protector +(@ChestToken,45634,0,1,1,1,1), -- Breastplate of the Wayward Vanquisher +-- Mimiron 10 man +(@Mimiron10Ref,45974,0,1,1,1,1), -- Shoulderguards of Assimilation +(@Mimiron10Ref,45976,0,1,1,1,1), -- Static Charge Handwraps +(@Mimiron10Ref,45972,0,1,1,1,1), -- Pulse Baton +(@Mimiron10Ref,45973,0,1,1,1,1), -- Stylish Power Cape +(@Mimiron10Ref,45975,0,1,1,1,1), -- Cable of the Metrognome +-- Mimiron 25 man +(@Mimiron25Ref,45492,0,1,1,1,1), -- Malleable Steelweave Mantle +(@Mimiron25Ref,45493,0,1,1,1,1), -- Asimov's Drape +(@Mimiron25Ref,45490,0,1,1,1,1), -- Pandora's Plea +(@Mimiron25Ref,45491,0,1,1,1,1), -- Waistguard of the Creator +(@Mimiron25Ref,45489,0,1,1,1,1), -- Insanity's Grip +-- Mimiron Tokens +(@HeadToken,45647,0,1,1,1,1), -- Helm of the Wayward Conqueror +(@HeadToken,45648,0,1,1,1,1), -- Helm of the Wayward Protector +(@HeadToken,45649,0,1,1,1,1), -- Helm of the Wayward Vanquisher +(@GloveToken,45641,0,1,1,1,1), -- Gauntlets of the Wayward Conqueror +(@GloveToken,45642,0,1,1,1,1), -- Gauntlets of the Wayward Protector +(@GloveToken,45643,0,1,1,1,1), -- Gauntlets of the Wayward Vanquisher +-- Thorim 10 man +(@Thorim10Ref,45927,0,1,1,1,1), -- Handwraps of Resonance +(@Thorim10Ref,45894,0,1,1,1,1), -- Leggings of Unstable Discharge +(@Thorim10Ref,45895,0,1,1,1,1), -- Belt of the Blood Pit +(@Thorim10Ref,45893,0,1,1,1,1), -- Guise of the Midgard Serpent +(@Thorim10Ref,45892,0,1,1,1,1), -- Legacy of Thunder +-- Throim 25 man +(@Thorim25Ref,45468,0,1,1,1,1), -- Leggings of Lost Love +(@Thorim25Ref,45466,0,1,1,1,1), -- Scale of Fates +(@Thorim25Ref,45467,0,1,1,1,1), -- Belt of the Betrayed +(@Thorim25Ref,45469,0,1,1,1,1), -- Sif's Promise +(@Thorim25Ref,45463,0,1,1,1,1), -- Vulmir, the Northern Tempest +-- Thorim Tokens +(@ShoulderToken,45659,0,1,1,1,1), -- Spaulders of the Wayward Conqueror +(@ShoulderToken,45660,0,1,1,1,1), -- Spaulders of the Wayward Protector +(@ShoulderToken,45661,0,1,1,1,1), -- Spaulders of the Wayward Vanquisher +(@HelmToken,45638,0,1,1,1,1), -- Crown of the Wayward Conqueror +(@HelmToken,45639,0,1,1,1,1), -- Crown of the Wayward Protector +(@HelmToken,45640,0,1,1,1,1); -- Crown of the Wayward Vanquisher +-- ------------------------------- +-- -- Gameobject Loot Templates -- +-- ------------------------------- +-- Delete previous templates if existing +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Freya10k3,@Freya10k2,@Freya10k1,@Freya10k0,@Freya25k3,@Freya25k2,@Freya25k1,@Freya25k0,@Hodir10n,@Hodir10h,@Hodir25n,@Hodir25h,@Mimiron10n,@Mimiron10h,@Mimiron25n,@Mimiron25h,@Thorim10n,@Thorim10h,@Thorim25n,@Thorim25h); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------ +-- -- Freya 10 man -- +-- ------------------ +-- Normal Mode: +(@Freya10k3,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k3,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k3,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k3,47241,100,1,0,1,1), -- 1x Emblem of Triumph +-- Hard Mode: 1 elder alive +(@Freya10k2,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k2,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k2,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k2,47241,100,1,0,2,2), -- 2x Emblem of Triumph +(@Freya10k2,45087,100,1,0,1,1), -- Runed Orb +(@Freya10k2,3,100,1,0,-34349,1), -- 1x Emblem of Triumph for Alive Elders +-- Hard Mode: 2 elders alive +(@Freya10k1,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k1,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k1,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k1,47241,100,1,0,3,3), -- 3x Emblem of Triumph +(@Freya10k1,45087,100,1,0,1,1), -- Runed Orb +(@Freya10k1,3,100,1,0,-@Recipe,1), -- 1 from Recipe +(@Freya10k1,4,100,1,0,-34349,2), -- 2x Emblem of Triumph for Alive Elders +-- Hard Mode: 3 elders alive +(@Freya10k0,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot +(@Freya10k0,2,100,1,0,-@HandToken,1), -- 1 from tokens +(@Freya10k0,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya10k0,47241,100,1,0,3,3), -- 3x Emblem of Triumph (self) +(@Freya10k0,45087,100,1,0,1,1), -- Runed Orb +(@Freya10k0,3,100,1,0,-@Recipe,1), -- 1 from Recipe +(@Freya10k0,45788,-100,1,0,1,1), -- Freya's Sigil 10 man QUEST ONLY +(@Freya10k0,4,100,1,0,-34349,1), -- 3x Emblem of Triumph for Alive Elders +-- 1 from Hardmode items: +(@Freya10k0,45943,0,1,1,1,1), -- Gloves of Whispering Winds +(@Freya10k0,45946,0,1,1,1,1), -- Fire Orchid Signet +(@Freya10k0,45945,0,1,1,1,1), -- Seed of Budding Carnage +(@Freya10k0,45947,0,1,1,1,1), -- Serilas, Blood Blade of Invar One-Arm +(@Freya10k0,45294,0,1,1,1,1), -- Petrified Ivy Sprig +-- ------------------ +-- -- Freya 25 man -- +-- ------------------ +-- Normal Mode: +(@Freya25k3,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k3,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k3,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Freya25k3,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k3,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k3,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Freya25k3,45083,5,1,0,1,1), -- Fragment of Val'anyr +-- Hard Mode: 1 elder alive +(@Freya25k2,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k2,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k2,47241,100,1,0,2,2), -- 2x Emblem of Triumph +(@Freya25k2,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k2,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k2,4,10,1,0,-34350,1), -- Chance on Runed Orb +(@Freya25k2,45087,100,1,0,2,2), -- 2x Runed Orb +(@Freya25k2,45083,7,1,0,1,1), -- Fragment of Val'anyr +(@Freya25k2,5,100,1,0,-34349,1), -- 1x Emblem of Triumph for Alive Elder +-- Hard Mode: 2 elders alive +(@Freya25k1,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k1,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k1,47241,100,1,0,3,3), -- 3x Emblem of Triumph +(@Freya25k1,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k1,3,10,1,0,-34350,1), -- Chance on Runed Orb +(@Freya25k1,45087,100,1,0,2,2), -- 2x Runed Orb +(@Freya25k1,4,100,1,0,-@Recipe,1), -- Recipe +(@Freya25k1,5,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k1,45083,9,1,0,1,1), -- Fragment of Val'anyr +(@Freya25k1,6,100,1,0,-34349,2), -- 2x Emblem of Triumph for Alive Elder +-- Hard Mode: 3 elders alive +(@Freya25k0,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot +(@Freya25k0,2,100,1,0,-@LegToken,2), -- 2 from tokens +(@Freya25k0,47241,100,1,0,3,3), -- 3x Emblem of Triumph +(@Freya25k0,46110,100,1,0,1,1), -- Alchemist's Cache +(@Freya25k0,3,10,1,0,-34350,1), -- Chance on Runed Orb +(@Freya25k0,45087,100,1,0,2,2), -- 2x Runed Orb +(@Freya25k0,4,100,1,0,-@Recipe,1), -- Recipe +(@Freya25k0,5,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Freya25k0,45814,-100,1,0,1,1), -- Freya's Sigil 25 man QUEST ONLY +(@Freya25k0,45083,20,1,0,1,1), -- Fragment of Val'anyr +(@Freya25k2,6,100,1,0,-34349,3), -- 3x Emblem of Triumph for Alive Elder +-- 1 from Hardmode items +(@Freya25k0,45484,0,1,1,1,1), -- Bladetwister +(@Freya25k0,45486,0,1,1,1,1), -- Drape of the Sullen Goddess +(@Freya25k0,45487,0,1,1,1,1), -- Handguards of Revitalization +(@Freya25k0,45488,0,1,1,1,1), -- Leggings of the Enslaved Idol +(@Freya25k0,45613,0,1,1,1,1), -- Dreambinder +(@Freya25k0,45485,0,1,1,1,1), -- Bronze Pendant of the Vanir +-- ------------------ +-- -- Hodir 10 man -- +-- ------------------ +(@Hodir10n,1,100,1,0,-@Hodir10Ref,1), -- 1x Normal Loot Item +(@Hodir10n,2,100,1,0,-@LegsToken,1), -- 1x Token +(@Hodir10n,47241,100,1,0,1,1), -- Emblem of Triumph +-- Hard mode: +(@Hodir10h,1,100,1,0,-@Hodir10Ref,1), -- 1x Normal Loot Item +(@Hodir10h,2,100,1,0,-@LegsToken,1), -- 1x Token +(@Hodir10h,47241,100,1,0,1,1), -- Emblem of Triumph +(@Hodir10h,45786,-100,1,0,1,1), -- Hodir's Sigil +-- 1 from Hardmode items +(@Hodir10h,45887,0,1,1,1,1), -- Ice Layered Barrier +(@Hodir10h,45888,0,1,1,1,1), -- Bitter Cold Armguards +(@Hodir10h,45886,0,1,1,1,1), -- Icecore Staff +(@Hodir10h,45876,0,1,1,1,1), -- Shiver +(@Hodir10h,45877,0,1,1,1,1), -- The Boreal Guard +-- ------------------ +-- -- Hodir 25 man -- +-- ------------------ +(@Hodir25n,1,100,1,0,-@Hodir25Ref,1), -- 1x Normal Loot Item +(@Hodir25n,2,100,1,0,-@ChestToken,1), -- 1x Token +(@Hodir25n,47241,100,1,0,1,1), -- Emblem of Triumph +(@Hodir25n,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Hodir25n,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Hodir25n,45083,10,1,0,1,1), -- Fragment of Val'anyr +-- Hard mode: +(@Hodir25h,1,100,1,0,-@Hodir25Ref,1), -- 1x Normal Loot Item +(@Hodir25h,2,100,1,0,-@ChestToken,2), -- 2x Token +(@Hodir25h,47241,100,1,0,1,1), -- Emblem of Triumph +(@Hodir25h,45815,-100,1,0,1,1), -- Hodir's Sigil +(@Hodir25h,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Hodir25h,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Hodir25h,45083,20,1,0,1,1), -- Fragment of Val'anyr +-- -------------------- +-- -- Mimiron 10 man -- +-- -------------------- +(@Mimiron10n,1,100,1,0,-@Mimiron10Ref,1), -- 1x Normal Loot Item +(@Mimiron10n,2,100,1,0,-@HeadToken,1), -- 1x Token +(@Mimiron10n,47241,100,1,0,1,1), -- 1x Emblem of Triumph +-- Hardmode 10 man +(@Mimiron10h,1,100,1,0,-@Mimiron10Ref,1), -- 1x Normal Loot Item +(@Mimiron10h,2,100,1,0,-@HeadToken,1), -- 1x Token +(@Mimiron10h,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Mimiron10h,45787,-100,1,0,1,1), -- Mimiron's Sigel (QUEST ONLY, HARDMODE ONLY) +-- 1 from Hardmode items +(@Mimiron10h,45989,0,1,1,1,1), -- Tempered Mercury Greaves +(@Mimiron10h,45982,0,1,1,1,1), -- Fused Alloy Legplates +(@Mimiron10h,45993,0,1,1,1,1), -- Mimiron's Flight Goggles +(@Mimiron10h,45988,0,1,1,1,1), -- Greaves of the Iron Army +(@Mimiron10h,45990,0,1,1,1,1), -- Fusion Blade +-- -------------------- +-- -- Mimiron 25 man -- +-- -------------------- +(@Mimiron25n,1,100,1,0,-@Mimiron25Ref,1), -- 1x Normal Loot Item +(@Mimiron25n,2,100,1,0,-@GloveToken,2), -- 2x Token +(@Mimiron25n,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Mimiron25n,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Mimiron25n,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Mimiron25n,45083,8,1,0,1,1), -- Fragment of Val'anyr Normal +-- Hard Mode 25 man +(@Mimiron25h,1,100,1,0,-@Mimiron25Ref,1), -- 1x Normal Loot Item +(@Mimiron25h,2,100,1,0,-@GloveToken,2), -- 2x Token +(@Mimiron25h,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Mimiron25h,3,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Mimiron25h,45087,10,1,0,1,1), -- Chance on Runed Orb +(@Mimiron25h,45816,-100,1,0,1,1), -- Mimiron's Sigel (QUEST ONLY, HARDMODE ONLY) +(@Mimiron25h,45083,18,1,0,1,1), -- Fragment of Val'anyr Hardmode +-- 1 from Hardmode items +(@Mimiron25h,45496,0,1,1,1,1), -- Titanskin Cloak +(@Mimiron25h,45494,0,1,1,1,1), -- Delirium's Touch +(@Mimiron25h,45663,0,1,1,1,1), -- Armbands of Bedlam +(@Mimiron25h,45620,0,1,1,1,1), -- Starshard Edge +(@Mimiron25h,45495,0,1,1,1,1), -- Conductive Seal +(@Mimiron25h,45497,0,1,1,1,1), -- Crown of Luminescence +-- ------------------- +-- -- Thorim 10 man -- +-- ------------------- +(@Thorim10n,1,100,1,0,-@Thorim10Ref,1), -- 1x Normal Loot Item +(@Thorim10n,2,100,1,0,-@ShoulderToken,1), -- 1x Token +(@Thorim10n,47241,100,1,0,1,1), -- 1x Emblem of Triumph +-- Hardmode 10 man +(@Thorim10h,1,100,1,0,-@Thorim10Ref,1), -- 1x Normal Loot Item +(@Thorim10h,2,100,1,0,-@ShoulderToken,1), -- 1x Token +(@Thorim10h,47241,100,1,0,1,1), -- 1x Emblem of Triumph +(@Thorim10h,45784,-100,2,0,1,1), -- Thorim's Sigil (QUEST ONLY, HARDMODE ONLY) +-- 1 from Hardmode items +(@Thorim10h,45933,0,2,1,1,1), -- Pendant of the Shallow Grave +(@Thorim10h,45929,0,2,1,1,1), -- Sif's Remembrance +(@Thorim10h,45928,0,2,1,1,1), -- Gauntlets of the Thunder God +(@Thorim10h,45931,0,2,1,1,1), -- Mjolnir Runestone +(@Thorim10h,45930,0,2,1,1,1), -- Combatant's Bootblade +-- ------------------- +-- -- Thorim 25 man -- +-- ------------------- +(@Thorim25n,1,100,3,0,-@Thorim25Ref,1), -- 1x Normal Loot Item +(@Thorim25n,2,100,3,0,-@HelmToken,2), -- 2x Token +(@Thorim25n,47241,100,3,0,1,1), -- 1x Emblem of Triumph +(@Thorim25n,3,10,3,0,-@Recipe,1), -- Chance on Recipe +(@Thorim25n,45087,10,3,0,1,1), -- Chance on Runed Orb +(@Thorim25n,45083,8,1,0,1,1), -- Fragment of Val'anyr Normal +-- Hardmode 25 man +(@Thorim25h,1,100,3,0,-@Thorim25Ref,1), -- 1x Normal Loot Item +(@Thorim25h,2,100,3,0,-@HelmToken,2), -- 2x Token +(@Thorim25h,47241,100,3,0,1,1), -- 1x Emblem of Triumph +(@Thorim25h,3,10,3,0,-@Recipe,1), -- Chance on Recipe +(@Thorim25h,45087,10,3,0,1,1), -- Chance on Runed Orb +(@Thorim25h,45817,-100,1,0,1,1), -- Thorim's Sigil (QUEST ONLY, HARDMODE ONLY) +(@Thorim25h,45083,18,1,0,1,1), -- Fragment of Val'anyr Hardmode +-- 1 from Hardmode items +(@Thorim25h,45471,0,1,1,1,1), -- Fate's Clutch +(@Thorim25h,45570,0,1,1,1,1), -- Skyforge Crossbow +(@Thorim25h,45472,0,1,1,1,1), -- Warhelm of the Champion +(@Thorim25h,45474,0,1,1,1,1), -- Pauldrons of the Combatant +(@Thorim25h,45470,0,1,1,1,1), -- Wisdom's Hold +(@Thorim25h,45473,0,1,1,1,1); -- Embrace of the Gladiator + diff --git a/sql/old/3.3.5a/2012_04_18_03_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_18_03_world_creature_loot_template.sql new file mode 100644 index 00000000000..5ad26809cdf --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_03_world_creature_loot_template.sql @@ -0,0 +1,2 @@ +-- Increase dropchance for Venture Co. Explosives +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-10 WHERE `entry` IN(28123,28124) AND `item`=39651; diff --git a/sql/old/3.3.5a/2012_04_18_04_world_pickpocketing_loot_template.sql b/sql/old/3.3.5a/2012_04_18_04_world_pickpocketing_loot_template.sql new file mode 100644 index 00000000000..ab1c562f7dd --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_04_world_pickpocketing_loot_template.sql @@ -0,0 +1,501 @@ +-- implement missing Northrend pickpocket loot +-- reference IDs +SET @NEWREF0 := 10026; +SET @NEWREF1 := @NEWREF0+1; +SET @NEWREF2 := @NEWREF0+2; +SET @NEWREF3 := @NEWREF0+3; +SET @NEWREF4 := @NEWREF0+4; +SET @NEWREF5 := @NEWREF0+5; +SET @NEWREF6 := @NEWREF0+6; +SET @NEWREF7 := @NEWREF0+7; +SET @NEWREF8 := @NEWREF0+8; +SET @NEWREF9 := @NEWREF0+9; +-- new references +DELETE FROM `reference_loot_template` WHERE entry IN (@NEWREF0, @NEWREF1, @NEWREF2, @NEWREF3, @NEWREF4, @NEWREF5, @NEWREF6, @NEWREF7, @NEWREF8, @NEWREF9); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`mincountOrRef`,`maxcount`) VALUES +(@NEWREF0,33447,25,1,1),-- Runic Healing Potion +(@NEWREF0,35953,30,1,1),-- Mead Basted Caribou +(@NEWREF0,38260,50,1,1),-- Empty Tobacco Pouch +(@NEWREF0,43575,80,1,1),-- Reinforced Junkbox +(@NEWREF1,36862,4,1,1),-- Wrogn Troll Dice +(@NEWREF1,40202,20,1,1),-- Sizzling Grizzly Flank +(@NEWREF2,33452,30,1,1),-- Honey-Spiced Lichen +(@NEWREF2,38269,35,1,1),-- Soggy Handkerchief +(@NEWREF3,33454,15,1,1),-- Salted Venison +(@NEWREF3,38261,13,1,1),-- Ben House Key +(@NEWREF4,38263,19,1,1),-- Too-Small Amband +(@NEWREF4,38264,18,1,1),-- A Very Pretty Rock +(@NEWREF5,29448,9,1,1),-- Mag'har Mild Cheese +(@NEWREF5,29450,13,1,1),-- Telaari Grapes +(@NEWREF5,37467,40,1,1),-- A Steamy Romance Novel: Forbidden Love +(@NEWREF6,35947,25,1,1),-- Sparkling Frostcap +(@NEWREF6,38269,40,1,1),-- Soggy Handkerchief +(@NEWREF7,33447,25,1,1),-- Runic Healing Potion +(@NEWREF7,35947,25,1,1),-- Sparkling Frostcap +(@NEWREF7,38269,40,1,1),-- Soggy Handkerchief +(@NEWREF7,43575,80,1,1),-- Reinforced Junkbox +(@NEWREF8,35948,11,1,1),-- Savory Snowplum +(@NEWREF8,35950,9,1,1),-- Sweet Potato Bread +(@NEWREF8,35952,8,1,1),-- Briny Hardcheese +(@NEWREF9,33447,25,1,1),-- Runic Healing Potion +(@NEWREF9,38260,50,1,1),-- Empty Tobacco Pouch +(@NEWREF9,43575,80,1,1); -- Reinforced Junkbox +-- implement pickpokect loot +UPDATE `creature_template` SET `pickpocketloot`=entry WHERE `entry` IN (25800,23667,23674,23760,23796,23865,23875,23963,24069,24262,24400,24460,25351,25427,25428,25429,25430,25601,25801,26073,26202,26334,26413,26447,26480,26481,26620,26621,26624,26626,26635,26636,26637,26639,26658,26681,26696,26727,26729,26800,26802,26836,26948,27105,27210,27211,/**/27234,27235,27247,27278,27289,27334,27342,27431,27533,27580,27639,27640,27699,27800,27859,27860,27961,27964,27965,28494,28496,28565,28803,28837,28838,28848,28961,28965,29369,29407,29553,29554,29656,29793,29820,29822,29836,29874,29875,29885,29920,30283,30319,30856,30868,31396,31554,32263); +UPDATE `creature_template` SET `pickpocketloot`=25430 WHERE `entry` IN (23654,23656,23663,23665,25434,26728,26827,26926,27554,32572); +UPDATE `creature_template` SET `pickpocketloot`=26481 WHERE `entry` IN (23662,23940,24016,24161,26493,26655,27007,27009); +UPDATE `creature_template` SET `pickpocketloot`=25351 WHERE `entry` IN (23993,24540,25224,25383,26343,26492,26891,26946,27224,27226,27283,27360,27552,27799,27823,27826,28564,28750); +UPDATE `creature_template` SET `pickpocketloot`=27533 WHERE `entry` IN (26555,26669,26670,26694,26830,27871,28022,28108,28242,28268,28419,29123,29133,29722,29738,30701,30894,30922,30949,31139,31150,31779,31847,32278,32505); +UPDATE `creature_template` SET `pickpocketloot`=30319 WHERE `entry` IN (30111,30179); +DELETE FROM `pickpocketing_loot_template` WHERE entry IN (25800,23656,23662,23663,23665,23667,23674,23760,23796,23865,23875,23940,23963,23993,24016,24069,24161,24262,24400,24460,24540,25224,25351,25383,25427,25428,25429,25430,25434,25601,25801,26073,26202,26334,26343,26413,26447,26480,26481,26492,26493,26555,26620,26621,26624,26626,26635,26636,26637,26639,26655,26658,26669,26670,26681,26694,26696,26727,26728,26729,26800,26802,26827,26830,26836,26891,26926,26946,26948,27007,27009,27105,27210,27211,27224,27226,27234,27235,27247,27278,27283,27289,27334,27342,27360,27431,27533,27552,27554,27580,27639,27640,27699,27799,27800,27823,27826,27859,27860,27871,27961,27964,27965,28022,28108,28242,28268,28419,28494,28496,28564,28565,28750,28803,28837,28838,28848,28961,28965,29123,29133,29369,29407,29553,29554,29656,29722,29738,29793,29820,29822,29836,29874,29875,29885,29920,30111,30179,30283,30319,30701,30856,30868,30894,30922,30949,31139,31150,31396,31554,31779,31847,32263,32278,32505,32572); +INSERT INTO `pickpocketing_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Plague Walker +(30283,43575,100,0,1,1),-- Reinforced Junkbox +(30283,0,100,0,-@NEWREF6,1), +-- Twilight Darkcaster +(30319,0,100,0,-@NEWREF0,1), +(30319,33449,11,0,1,1),-- Crusty Flatbread +(30319,1,100,0,-@NEWREF1,1), +(30319,2,100,0,-@NEWREF3,1), +-- High Priest Talet-Kha +(26073,43575,58,0,1,1),-- Reinforced Junkbox +(26073,0,100,0,-@NEWREF5,1), +(26073,33449,8,0,1,1),-- Crusty Flatbread +(26073,33447,8,0,1,1),-- Runic Healing Potion +-- Nedar, Lord of Rhinos +(25801,0,100,0,-@NEWREF5,1), +(25801,33447,6,0,1,1),-- Runic Healing Potion +(25801,38261,6,0,1,1),-- Bent House Key +-- Clam Master K +(25800,43575,47,0,1,1),-- Reinforced Junkbox +(25800,0,100,0,-@NEWREF5,1), +(25800,38261,15,0,1,1),-- Bent House Key +(25800,33449,5,0,1,1),-- Crusty Flatbread +(25800,33447,5,0,1,1),-- Runic Healing Potion +-- Magmothregar +(25430,0,100,0,-@NEWREF3,1), +(25430,1,100,0,-@NEWREF9,1), +(25430,33449,7,0,1,1),-- Crusty Flatbread +(25430,36862,4,0,1,1),-- Wrogn Troll Dice +-- Kaganishu +(25427,43575,43,0,1,1),-- Reinforced Junkbox +(25427,33454,35,0,1,1),-- Salted Venison +(25427,0,100,0,-@NEWREF4,1), +(25427,33447,8,0,1,1),-- Runic Healing Potion +-- Prince Valanar +(25601,43575,43,0,1,1),-- Reinforced Junkbox +(25601,37467,39,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(25601,33447,9,0,1,1),-- Runic Healing Potion +(25601,38261,9,0,1,1),-- Bent House Key +(25601,33449,4,0,1,1),-- Crusty Flatbread +(25601,29450,4,0,1,1),-- Telaari Grapes +-- Ghostly Sage +(25351,43575,42,0,1,1),-- Reinforced Junkbox +(25351,0,100,0,-@NEWREF2,1), +(25351,33447,10,0,1,1),-- Runic Healing Potion +-- Luthion the Vile +(27860,43575,42,0,1,1),-- Reinforced Junkbox +(27860,0,100,0,-@NEWREF5,1), +(27860,38261,13,0,1,1),-- Bent House Key +(27860,33449,6,0,1,1),-- Crusty Flatbread +(27860,33447,6,0,1,1),-- Runic Healing Potion +-- Reckless Scavenger +(26658,0,100,0,-@NEWREF2,1), +(26658,43575,40,0,1,1),-- Reinforced Junkbox +-- Ziggurat Defender +(26202,43575,40,0,1,1),-- Reinforced Junkbox +(26202,0,100,0,-@NEWREF2,1), +(26202,33447,7,0,1,1),-- Runic Healing Potion +(26202,29569,3,0,1,1),-- Strong Junkbox +-- Magmoth Forager +(25429,43575,39,0,1,1),-- Reinforced Junkbox +(25429,33454,27,0,1,1),-- Salted Venison +(25429,0,100,0,-@NEWREF4,1), +(25429,33447,10,0,1,1),-- Runic Healing Potion +(25429,38266,0.5,0,1,1),-- Rotund Relic +-- Magmoth Shaman +(25428,43575,39,0,1,1),-- Reinforced Junkbox +(25428,33454,28,0,1,1),-- Salted Venison +(25428,0,100,0,-@NEWREF4,1), +(25428,33447,9,0,1,1),-- Runic Healing Potion +(25428,38266,0.5,0,1,1),-- Rotund Relic +-- Vanthryn the Merciless +(27859,43575,39,0,1,1),-- Reinforced Junkbox +(27859,0,100,0,-@NEWREF5,1), +(27859,33449,12,0,1,1),-- Crusty Flatbread +(27859,38261,12,0,1,1),-- Bent House Key +(27859,33447,3,0,1,1),-- Runic Healing Potion +-- Unbound Corrupter +(30868,43575,47,0,1,1),-- Reinforced Junkbox +(30868,40202,18,0,1,1),-- Sizzling Grizzly Flank +(30868,33447,16,0,1,1),-- Runic Healing Potion +(30868,0,100,0,-@NEWREF4,1), +-- Unbound Trickster +(30856,43575,38,0,1,1),-- Reinforced Junkbox +(30856,0,100,0,-@NEWREF4,1), +(30856,33447,19,0,1,1),-- Runic Healing Potion +(30856,40202,14,0,1,1),-- Sizzling Grizzly Flank +-- Kreug Oathbreaker +(27105,43575,63,0,1,1),-- Reinforced Junkbox +(27105,33447,25,0,1,1),-- Runic Healing Potion +(27105,38269,13,0,1,1),-- Soggy Handkerchief +-- Lead Cannoneer Zierhut +(27235,43575,53,0,1,1),-- Reinforced Junkbox +(27235,0,100,0,-@NEWREF5,1), +(27235,33447,8,0,1,1),-- Runic Healing Potion +(27235,38261,8,0,1,1),-- Bent House Key +-- Devout Bodyguard +(27247,43575,50,0,1,1),-- Reinforced Junkbox +(27247,37467,42,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27247,33447,8,0,1,1),-- Runic Healing Potion +(27247,29450,8,0,1,1),-- Telaari Grapes +(27247,38261,8,0,1,1),-- Bent House Key +-- Magnataur Alpha +(26481,0,100,0,-@NEWREF9,1), +(26481,1,100,0,-@NEWREF3,1), +(26481,33449,5,0,1,1),-- Crusty Flatbread +-- High General Abbendis +(27210,43575,48,0,1,1),-- Reinforced Junkbox +(27210,0,100,0,-@NEWREF5,1), +(27210,33449,10,0,1,1),-- Crusty Flatbread +(27210,33447,10,0,1,1),-- Runic Healing Potion +(27210,38261,8,0,1,1),-- Bent House Key +-- Anub'ar Dreadweaver +(26413,43575,44,0,1,1),-- Reinforced Junkbox +(26413,43576,22,0,1,1),-- Chitin Polish +(26413,33452,11,0,1,1),-- Honey-Spiced Lichen +(26413,33447,11,0,1,1),-- Runic Healing Potion +(26413,43577,11,0,1,1),-- Carapace Cleanser +-- Naxxramas Necrolord +(27289,33452,44,0,1,1),-- Honey-Spiced Lichen +(27289,43575,44,0,1,1),-- Reinforced Junkbox +(27289,33447,11,0,1,1),-- Runic Healing Potion +-- Onslaught Commander Iustus +(27334,37467,50,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27334,43575,44,0,1,1),-- Reinforced Junkbox +(27334,29448,13,0,1,1),-- Mag'har Mild Cheese +(27334,38261,6,0,1,1),-- Bent House Key +-- Blacksmith Goodman +(27234,43575,41,0,1,1),-- Reinforced Junkbox +(27234,0,100,0,-@NEWREF5,1), +(27234,38261,13,0,1,1),-- Bent House Key +(27234,33447,9,0,1,1),-- Runic Healing Potion +(27234,33449,7,0,1,1),-- Crusty Flatbread +-- Magnataur Youngling +(26480,33449,19,0,1,1),-- Crusty Flatbread +(26480,0,100,0,-@NEWREF3,1), +(26480,1,100,0,-@NEWREF9,1), +-- Bloodpaw Warrior +(27342,43575,40,0,1,1),-- Reinforced Junkbox +(27342,33454,26,0,1,1),-- Salted Venison +(27342,0,100,0,-@NEWREF4,1), +(27342,33447,11,0,1,1),-- Runic Healing Potion +(27342,38266,0.6,0,1,1),-- Rotund Relic +-- Frigid Geist +(27533,0,100,0,-@NEWREF7,1), +-- Snowplain Zealot +(27278,43575,40,0,1,1),-- Reinforced Junkbox +(27278,33454,22,0,1,1),-- Salted Venison +(27278,0,100,0,-@NEWREF4,1), +(27278,33447,12,0,1,1),-- Runic Healing Potion +(27278,38266,0.3,0,1,1),-- Rotund Relic +-- Hulking Atrocity +(26948,43575,39,0,1,1),-- Reinforced Junkbox +(26948,0,100,0,-@NEWREF2,1), +(26948,33447,9,0,1,1),-- Runic Healing Potion +(26948,29569,0.3,0,1,1),-- Strong Junkbox +(26948,38268,0.3,0,1,1),-- Spare Hand +-- Onslaught Executioner +(27211,43575,39,0,1,1),-- Reinforced Junkbox +(27211,0,100,0,-@NEWREF5,1), +(27211,33449,12,0,1,1),-- Crusty Flatbread +(27211,38261,11,0,1,1),-- Bent House Key +(27211,33447,5,0,1,1),-- Runic Healing Potion +-- Gigantaur +(26836,0,100,0,-@NEWREF9,1), +(26836,1,100,0,-@NEWREF3,1), +(26836,33449,12,0,1,1),-- Crusty Flatbread +-- Leprous Servant +(27800,43575,38,0,1,1),-- Reinforced Junkbox +(27800,0,100,0,-@NEWREF2,1), +(27800,33447,7,0,1,1),-- Runic Healing Potion +(27800,38268,2,0,1,1),-- Spare Hand +-- Wretched Belcher +(26624,43575,100,0,1,1),-- Reinforced Junkbox +(26624,0,100,0,-@NEWREF2,1), +(26624,33447,25,0,1,1),-- Runic Healing Potion +(26624,35947,25,0,1,1),-- Sparkling Frostcap +-- Drakkari Commander +(27431,43575,90,0,1,1),-- Reinforced Junkbox +(27431,0,100,0,-@NEWREF2,1), +(27431,33447,26,0,1,1),-- Runic Healing Potion +(27431,35947,10,0,1,1),-- Sparkling Frostcap +-- Drakkari Guardian +(26620,0,100,0,-@NEWREF0,1), +(26620,33454,17,0,1,1),-- Salted Venison +(26620,33449,9,0,1,1),-- Crusty Flatbread +(26620,38261,9,0,1,1),-- Bent House Key +(26620,1,100,0,-@NEWREF1,1), +-- Risen Drakkari Soulmage +(26636,43575,85,0,1,1),-- Reinforced Junkbox +(26636,0,100,0,-@NEWREF2,1), +(26636,35947,21,0,1,1),-- Sparkling Frostcap +(26636,33447,16,0,1,1),-- Runic Healing Potion +-- Ghoul Tormentor +(26621,43575,81,0,1,1),-- Reinforced Junkbox +(26621,0,100,0,-@NEWREF2,1), +(26621,35947,24,0,1,1),-- Sparkling Frostcap +(26621,33447,14,0,1,1),-- Runic Healing Potion +-- Risen Drakkari Warrior +(26635,43575,71,0,1,1),-- Reinforced Junkbox +(26635,0,100,0,-@NEWREF2,1), +(26635,33447,29,0,1,1),-- Runic Healing Potion +(26635,35947,18,0,1,1),-- Sparkling Frostcap +(26635,38268,0.8,0,1,1),-- Spare Hand +-- Risen Drakkari Handler +(26637,0,100,0,-@NEWREF2,1), +(26637,43575,67,0,1,1),-- Reinforced Junkbox +(26637,33447,30,0,1,1),-- Runic Healing Potion +(26637,35947,18,0,1,1),-- Sparkling Frostcap +-- Scourge Reanimator +(26626,0,100,0,-@NEWREF2,1), +(26626,43575,67,0,1,1),-- Reinforced Junkbox +(26626,33447,21,0,1,1),-- Runic Healing Potion +(26626,35947,21,0,1,1),-- Sparkling Frostcap +-- Drakkari Shaman +(26639,0,100,0,-@NEWREF0,1), +(26639,33449,18,0,1,1),-- Crusty Flatbread +(26639,1,100,0,-@NEWREF3,1), +(26639,40202,11,0,1,1),-- Sizzling Grizzly Flank +-- Selas +(27580,43575,50,0,1,1),-- Reinforced Junkbox +(27580,0,100,0,-@NEWREF3,1), +(27580,38260,20,0,1,1),-- Empty Tobacco Pouch +-- Forgemaster Damrath +(26334,43575,48,0,1,1),-- Reinforced Junkbox +(26334,0,100,0,-@NEWREF5,1), +(26334,33447,9,0,1,1),-- Runic Healing Potion +(26334,38261,9,0,1,1),-- Bent House Key +-- Grumbald One-Eye +(26681,43575,39,0,1,1),-- Reinforced Junkbox +(26681,33454,28,0,1,1),-- Salted Venison +(26681,0,100,0,-@NEWREF4,1), +(26681,33447,9,0,1,1),-- Runic Healing Potion +-- Drakkari Shaman +(26447,0,100,0,-@NEWREF9,1), +(26447,1,100,0,-@NEWREF3,1), +(26447,33449,10,0,1,1),-- Crusty Flatbread +(26447,35799,0.2,0,1,1),-- Frozen Mojo +(26447,36862,0.2,0,1,1),-- Wrogn Troll Dice +-- Drakkari God Hunter +(29820,0,100,0,-@NEWREF0,1), +(29820,1,100,0,-@NEWREF1,1), +-- Drakkari Battle Rider +(29836,0,100,0,-@NEWREF0,1), +(29836,40202,18,0,1,1),-- Sizzling Grizzly Flank +-- Ruins Dweller +(29920,43575,71,0,1,1),-- Reinforced Junkbox +(29920,37452,69,0,1,1),-- Fatty Bluefin +(29920,38274,58,0,1,1),-- Large Snail Shell +(29920,38273,35,0,1,1),-- Brain Coral +(29920,33447,16,0,1,1),-- Runic Healing Potion +-- Drakkari Fire Weaver +(29822,0,100,0,-@NEWREF0,1), +(29822,40202,24,0,1,1),-- Sizzling Grizzly Flank +-- Drakkari Inciter +(29874,0,100,0,-@NEWREF0,1), +(29874,36862,16,0,1,1),-- Wrogn Troll Dice +(29874,40202,12,0,1,1),-- Sizzling Grizzly Flank +-- Titanium Siegebreaker +(28961,0,100,0,-@NEWREF0,1), +(28961,40202,35,0,1,1),-- Sizzling Grizzly Flank +-- Stormforged Sentinel +(28837,0,100,0,-@NEWREF0,1), +(28837,40202,16,0,1,1),-- Sizzling Grizzly Flank +-- Titanium Thunderer +(28965,0,100,0,-@NEWREF0,1), +(28965,40202,44,0,1,1),-- Sizzling Grizzly Flank +-- Titanium Vanguard +(28838,0,100,0,-@NEWREF0,1), +(28838,40202,27,0,1,1),-- Sizzling Grizzly Flank +-- Dark Rune Scholar +(27964,0,100,0,-@NEWREF9,1), +(27964,1,100,0,-@NEWREF1,1), +-- Dark Rune Worker +(27961,0,100,0,-@NEWREF0,1), +(27961,40202,29,0,1,1),-- Sizzling Grizzly Flank +(27961,36862,4,0,1,1),-- Wrogn Troll Dice +-- Dark Rune Shaper +(27965,0,100,0,-@NEWREF0,1), +(27965,40202,28,0,1,1),-- Sizzling Grizzly Flank +-- Steel Gate Archaeologist +(24400,0,100,0,-@NEWREF0,1), +(24400,1,100,0,-@NEWREF5,1), +(24400,33449,7,0,1,1),-- Crusty Flatbread +(24400,38261,9,0,1,1),-- Bent House Key +-- Blacksouled Keeper +(23875,0,100,0,-@NEWREF0,1), +(23875,1,100,0,-@NEWREF3,1), +(23875,33449,14,0,1,1),-- Crusty Flatbread +-- Winterskorn Rune-Seer +(23667,0,100,0,-@NEWREF0,1), +(23667,33449,7,0,1,1),-- Crusty Flatbread +(23667,33454,7,0,1,1),-- Salted Venison +-- Sergeant Lorric +(23963,43575,45,0,1,1),-- Reinforced Junkbox +(23963,0,100,0,-@NEWREF5,1), +(23963,33447,13,0,1,1),-- Runic Healing Potion +(23963,38261,11,0,1,1),-- Bent House Key +(23963,33449,7,0,1,1),-- Crusty Flatbread +-- Gjalerhorn Scavenger +(27699,0,100,0,-@NEWREF4,1), +(27699,43575,43,0,1,1),-- Reinforced Junkbox +(27699,33454,22,0,1,1),-- Salted Venison +(27699,33447,7,0,1,1),-- Runic Healing Potion +(27699,29569,0.8,0,1,1),-- Strong Junkbox +-- Iron Rune Binder +(23796,0,100,0,-@NEWREF5,1), +(23796,43575,42,0,1,1),-- Reinforced Junkbox +(23796,38261,12,0,1,1),-- Bent House Key +(23796,33449,11,0,1,1),-- Crusty Flatbread +(23796,33447,9,0,1,1),-- Runic Healing Potion +(23796,29569,0.5,0,1,1),-- Strong Junkbox +-- Forsaken Plaguebringer +(23760,0,100,0,-@NEWREF2,1), +(23760,43575,41,0,1,1),-- Reinforced Junkbox +(23760,33447,10,0,1,1),-- Runic Healing Potion +(23760,38268,0.3,0,1,1),-- Spare Hand +-- Chillmere Tidehunter +(24460,43575,40,0,1,1),-- Reinforced Junkbox +(24460,38274,33,0,1,1),-- Large Snail Shell +(24460,37452,18,0,1,1),-- Fatty Bluefin +(24460,38273,15,0,1,1),-- Brain Coral +(24460,33447,7,0,1,1),-- Runic Healing Potion +-- Vrykul Soul +(24262,0,100,0,-@NEWREF2,1), +(24262,43575,40,0,1,1),-- Reinforced Junkbox +(24262,33447,3,0,1,1),-- Runic Healing Potion +-- Iron Rune Sage +(23674,0,100,0,-@NEWREF5,1), +(23674,43575,39,0,1,1),-- Reinforced Junkbox +(23674,38261,13,0,1,1),-- Bent House Key +(23674,33449,9,0,1,1),-- Crusty Flatbread +(23674,33447,6,0,1,1),-- Runic Healing Potion +-- Vengeance Bringer +(23865,43575,39,0,1,1),-- Reinforced Junkbox +(23865,0,100,0,-@NEWREF2,1), +-- Restless Lookout +(31554,43575,80,0,1,1),-- Reinforced Junkbox +(31554,35947,40,0,1,1),-- Sparkling Frostcap +-- Val'kyr Taskmistress +(31396,43575,56,0,1,1),-- Reinforced Junkbox +(31396,35947,38,0,1,1),-- Sparkling Frostcap +(31396,33447,15,0,1,1),-- Runic Healing Potion +-- Overseer Veraj +(32263,43575,42,0,1,1),-- Reinforced Junkbox +(32263,37467,28,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(32263,38261,15,0,1,1),-- Bent House Key +(32263,33447,13,0,1,1),-- Runic Healing Potion +(32263,0,100,0,-@NEWREF8,1), +-- Steward +(26729,0,100,0,-@NEWREF0,1), +(26729,1,100,0,-@NEWREF3,1), +(26729,33449,31,0,1,1),-- Crusty Flatbread +(26729,29569,0.5,0,1,1),-- Strong Junkbox +-- Alliance Berserker +(26800,43575,62,0,1,1),-- Reinforced Junkbox +(26800,33449,19,0,1,1),-- Crusty Flatbread +(26800,38261,16,0,1,1),-- Bent House Key +(26800,33447,10,0,1,1),-- Runic Healing Potion +(26800,0,100,0,-@NEWREF5,1), +-- Alliance Ranger +(26802,0,100,0,-@NEWREF5,1), +(26802,43575,60,0,1,1),-- Reinforced Junkbox +(26802,38261,34,0,1,1),-- Bent House Key +(26802,33449,24,0,1,1),-- Crusty Flatbread +(26802,33447,12,0,1,1),-- Runic Healing Potion +-- Mage Hunter Ascendant +(26727,0,100,0,-@NEWREF0,1), +(26727,1,100,0,-@NEWREF3,1), +(26727,33449,29,0,1,1),-- Crusty Flatbread +-- Ring-Lord Sorceress +(27639,43575,87,0,1,1),-- Reinforced Junkbox +(27639,37467,46,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27639,38261,28,0,1,1),-- Bent House Key +(27639,33447,19,0,1,1),-- Runic Healing Potion +(27639,0,100,0,-@NEWREF8,1), +(27639,36863,1.6,0,1,1),-- Decahedral Dwarven Dice +-- Ring-Lord Conjurer +(27640,37467,67,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(27640,43575,64,0,1,1),-- Reinforced Junkbox +(27640,33447,30,0,1,1),-- Runic Healing Potion +(27640,38261,26,0,1,1),-- Bent House Key +(27640,0,100,0,-@NEWREF8,1), +-- Mildred the Cruel +(29885,0,100,0,-@NEWREF0,1), +(29885,40202,13,0,1,1),-- Sizzling Grizzly Flank +-- Snowblind Devotee +(29407,43575,42,0,1,1),-- Reinforced Junkbox +(29407,40202,29,0,1,1),-- Sizzling Grizzly Flank +(29407,0,100,0,-@NEWREF4,1), +(29407,33447,12,0,1,1),-- Runic Healing Potion +-- Snowblind Devotee +(29554,43575,43,0,1,1),-- Reinforced Junkbox +(29554,40202,27,0,1,1),-- Sizzling Grizzly Flank +(29554,0,100,0,-@NEWREF4,1), +(29554,33447,12,0,1,1),-- Runic Healing Potion +(29554,38266,0.2,0,1,1),-- Rotund Relic +-- Frostfeather Witch +(29793,43575,40,0,1,1),-- Reinforced Junkbox +(29793,40202,21,0,1,1),-- Sizzling Grizzly Flank +(29793,0,100,0,-@NEWREF4,1), +(29793,33447,16,0,1,1),-- Runic Healing Potion +-- Icemane Yeti +(29875,43575,39,0,1,1),-- Reinforced Junkbox +(29875,40202,23,0,1,1),-- Sizzling Grizzly Flank +(29875,0,100,0,-@NEWREF4,1), +(29875,33447,15,0,1,1),-- Runic Healing Potion +(29875,38266,0.3,0,1,1),-- Rotund Relic +-- Garm Watcher +(29553,0,100,0,-@NEWREF0,1), +(29553,1,100,0,-@NEWREF1,1), +(29553,24231,0.3,0,2,2),-- Coarse Snuff +-- Stormforged Taskmaster +(29369,43575,38,0,1,1),-- Reinforced Junkbox +(29369,37467,34,0,1,1),-- A Steamy Romance Novel: Forbidden Love +(29369,33447,13,0,1,1),-- Runic Healing Potion +(29369,38261,6,0,1,1),-- Bent House Key +(29369,0,100,0,-@NEWREF8,1), +-- Dragonflayer Bonecrusher +(24069,0,100,0,-@NEWREF0,1), +(24069,1,100,0,-@NEWREF1,1), +(24069,29569,47,0,1,1),-- Strong Junkbox +(24069,29570,34,0,1,1),-- A Gnome Effigy +(24069,27855,22,0,1,1),-- Mag'har Grainbread +(24069,27854,19,0,1,1),-- Smoked Talbuk Venison +(24069,22829,10,0,1,1),-- Super Healing Potion +(24069,23438,1.2,0,1,1),-- Star of Elune +-- Ymirjar Berserker +(26696,0,100,0,-@NEWREF7,1), +(26696,29569,1.1,0,1,1),-- Strong Junkbox +-- Kutube'sa +(28494,0,100,0,-@NEWREF0,1), +(28494,1,100,0,-@NEWREF1,1), +-- Chulo the Mad +(28496,0,100,0,-@NEWREF0,1), +(28496,40202,6,0,1,1),-- Sizzling Grizzly Flank +-- Drakuru's Guard +(28803,43575,50,0,1,1),-- Reinforced Junkbox +(28803,33447,33,0,1,1),-- Runic Healing Potion +(28803,38269,17,0,1,1),-- Soggy Handkerchief +-- Prophet of Har'koa +(28848,0,100,0,-@NEWREF0,1), +(28848,40202,3,0,1,1),-- Sizzling Grizzly Flank +-- Decaying Ghoul +(28565,0,100,0,-@NEWREF7,1), +(28565,22829,0.9,0,1,1),-- Super Healing Potion +-- Drakuru Berserker +(29656,0,100,0,-@NEWREF0,1), +(29656,1,100,0,-@NEWREF3,1), +(29656,33449,11,0,1,1),-- Crusty Flatbread +(29656,29569,0.9,0,1,1); -- Strong Junkbox diff --git a/sql/old/3.3.5a/2012_04_18_05_world_conditions.sql b/sql/old/3.3.5a/2012_04_18_05_world_conditions.sql new file mode 100644 index 00000000000..ecf80f270a3 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_05_world_conditions.sql @@ -0,0 +1,4 @@ +-- Add condition to the Lovely Charm aura +DELETE FROM conditions WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`= 69511; +INSERT INTO conditions (SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, COMMENT) VALUES +(17,0,69511,0,12,8,0,0,0, '', 'Lovely Charm - Only during event'); diff --git a/sql/old/3.3.5a/2012_04_18_06_world_creature_template.sql b/sql/old/3.3.5a/2012_04_18_06_world_creature_template.sql new file mode 100644 index 00000000000..8c167c2ffa1 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_06_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Remove Skinning loot from Blackwing Spellbinder +UPDATE `creature_template` SET `skinloot`=0 WHERE `entry`=12457; diff --git a/sql/old/3.3.5a/2012_04_18_07_world_fishing_loot_template.sql b/sql/old/3.3.5a/2012_04_18_07_world_fishing_loot_template.sql new file mode 100644 index 00000000000..6c39cc95b48 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_07_world_fishing_loot_template.sql @@ -0,0 +1,2 @@ +-- update wrong area. +UPDATE `fishing_loot_template` SET `entry`=4560 WHERE `entry`=4395 AND `item`=11026; diff --git a/sql/old/3.3.5a/2012_04_18_08_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_18_08_world_creature_loot_template.sql new file mode 100644 index 00000000000..4b00685ed55 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_18_08_world_creature_loot_template.sql @@ -0,0 +1,22 @@ +-- Add loot for Hrothgar's Landing +DELETE FROM `creature_loot_template` WHERE `entry` IN (34980,34838,34839,34965); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- AURIAYA 10-man +-- Drottinn Hrothgar - http://old.wowhead.com/npc=34980 +(34980,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg +-- Kvaldir Reaver +(34838,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg +(34838,49676,5,1,0,1,1), -- Kvaldir Attack Plans +(34838,33470,35,1,0,1,4), -- 1-4x Frostweave Cloth +(34838,1,10,1,0,-24727,1), -- 1 of Northrend scrolls +(34838,2,10,1,0,-26002,1), -- Northrend Grey Item Reference1 +(34838,3,2,1,0,-35080,1), -- Northrend Green Item Reference +-- Kvaldir Mist Binder +(34839,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg +(34839,49676,5,1,0,1,1), -- Kvaldir Attack Plans +(34839,33470,35,1,0,1,4), -- 1-4x Frostweave Cloth +(34839,1,10,1,0,-24727,1), -- 1 of Northrend scrolls +(34839,2,10,1,0,-26002,1), -- Northrend Grey Item Reference1 +(34839,3, 2,1,0,-35080,1), -- Northrend Green Item Reference +-- Mistcaller Yngvar +(34965,46859,-100,1,0,1,1); -- Stolen Tallstrider Leg diff --git a/sql/old/3.3.5a/2012_04_19_00_world_creature_template.sql b/sql/old/3.3.5a/2012_04_19_00_world_creature_template.sql new file mode 100644 index 00000000000..e9abd40095e --- /dev/null +++ b/sql/old/3.3.5a/2012_04_19_00_world_creature_template.sql @@ -0,0 +1,7 @@ +-- update Plague Slime & Marauding Geist to naxx25 trash lootid +UPDATE `creature_template` SET `lootid`=100005 WHERE `entry` IN(29575,30424); +-- update Plague Slime & Marauding Geist to naxx10 trash lootid +UPDATE `creature_template` SET `lootid`=100003 WHERE `entry` IN(16243,30083); +DELETE FROM `creature_loot_template` WHERE `entry` IN(30424,29575,16243,30083); +-- Remove scraps for naxx10 from creature creature_loot_template +DELETE FROM `creature_loot_template` WHERE `item` IN (22373,22374,22375,22376); diff --git a/sql/old/3.3.5a/2012_04_19_01_world_pickpocketing_loot_template.sql b/sql/old/3.3.5a/2012_04_19_01_world_pickpocketing_loot_template.sql new file mode 100644 index 00000000000..997b16ff65d --- /dev/null +++ b/sql/old/3.3.5a/2012_04_19_01_world_pickpocketing_loot_template.sql @@ -0,0 +1,202 @@ +-- Fix to add pickpocketing loot for humoniods in borean tundra +SET @GORLOCREF := 25100; +SET @BERYLREF := @GORLOCREF+1; +SET @BLOODREF := @GORLOCREF+2; +SET @CHIEFREF := @GORLOCREF+3; +SET @CULTREF := @GORLOCREF+4; +SET @KVALDIRREF := @GORLOCREF+5; +SET @CLAXREF := @GORLOCREF+6; +SET @MAGMOTHREF := @GORLOCREF+7; +-- Create reference templates +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GORLOCREF AND @GORLOCREF+7; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@GORLOCREF,29576,57,1,0,1,1), -- Shark Bait +(@GORLOCREF,29569,30,1,0,1,1), -- Strong Junkbox +(@GORLOCREF,27858,8,1,0,1,1), -- Sunspring Carp +(@GORLOCREF,22829,3,1,0,1,1), -- Super Healing Potion +(@GORLOCREF,23436,0.5,1,0,1,1), -- Living Ruby +(@GORLOCREF,23437,0.5,1,0,1,1), -- Talasite +(@GORLOCREF,23440,0.5,1,0,1,1), -- Dawnstone +(@GORLOCREF,23438,0.5,1,0,1,1), -- Star of Elune +(@GORLOCREF,23439,0.5,1,0,1,1), -- Noble Topaz +-- -------------------------------------------------- +(@BERYLREF,37467,32.5,1,0,1,1), -- A Steamy Romance Novel: Forbidden Love +(@BERYLREF,43575,31,1,0,1,1), -- Reinforced Junkbox +(@BERYLREF,38261,10,1,0,1,1), -- Bent House Key +(@BERYLREF,29448,7,1,0,1,1), -- Mag'har Mild Cheese +(@BERYLREF,29450,7,1,0,1,1), -- Telaari Grapes +(@BERYLREF,33447,6,1,0,1,1), -- Runic Healing Potion +(@BERYLREF,33449,6,1,0,1,1), -- Crusty Flatbread +(@BERYLREF,36863,0.5,1,0,1,1), -- Decahedral Dwarven Dice +-- -------------------------------------------------- +(@BLOODREF,29572,37,1,0,1,1), -- Aboriginal Carvings +(@BLOODREF,29569,33,1,0,1,1), -- Strong Junkbox +(@BLOODREF,8952,20,1,0,1,1), -- Roasted Quail +(@BLOODREF,22829,8,1,0,1,1), -- Super Healing Potion +(@BLOODREF,23438,0.5,1,0,1,1), -- Star of Elune +(@BLOODREF,23436,0.5,1,0,1,1), -- Living Ruby +(@BLOODREF,23441,0.5,1,0,1,1), -- Nightseye +(@BLOODREF,23437,0.5,1,0,1,1), -- Talasite +(@BLOODREF,23440,0.5,1,0,1,1), -- Dawnstone +-- -------------------------------------------------- +(@CHIEFREF,29569,50,1,0,1,1), -- Strong Junkbox +(@CHIEFREF,27858,20,1,0,1,1), -- Sunspring Carp +(@CHIEFREF,29576,20,1,0,1,1), -- Shark Bait +(@CHIEFREF,22829,10,1,0,1,1), -- Super Healing Potion +-- -------------------------------------------------- +(@CULTREF,29569,40,1,0,1,1), -- Strong Junkbox +(@CULTREF,29571,37,1,0,1,1), -- A Steamy Romance Novel +(@CULTREF,30458,8,1,0,1,1), -- Stromgarde Muenster +(@CULTREF,27855,7,1,0,1,1), -- Mag'har Grainbread +(@CULTREF,27856,6,1,0,1,1), -- Skethyl Berries +(@CULTREF,22829,2,1,0,1,1), -- Super Healing Potion +(@CULTREF,36863,0.5,1,0,1,1), -- Decahedral Dwarven Dice +-- -------------------------------------------------- +(@KVALDIRREF,29569,39,1,0,1,1), -- Strong Junkbox +(@KVALDIRREF,29570,28,1,0,1,1), -- A Gnome Effigy +(@KVALDIRREF,27855,12,1,0,1,1), -- Mag'har Grainbread +(@KVALDIRREF,27854,12,1,0,1,1), -- Smoked Talbuk Venison +(@KVALDIRREF,22829,7,1,0,1,1), -- Super Healing Potion +(@KVALDIRREF,23436,0.5,1,0,1,1), -- Living Ruby +(@KVALDIRREF,23441,0.5,1,0,1,1), -- Nightseye +(@KVALDIRREF,23440,0.5,1,0,1,1), -- Dawnstone +(@KVALDIRREF,23439,0.5,1,0,1,1), -- Noble Topaz +(@KVALDIRREF,23437,0.5,1,0,1,1), -- Talasite +-- -------------------------------------------------- +(@CLAXREF,43575,28,1,0,1,1), -- Reinforced Junkbox +(@CLAXREF,38273,26,1,0,1,1), -- Brain Coral +(@CLAXREF,38274,23,1,0,1,1), -- Large Snail Shell +(@CLAXREF,37452,17,1,0,1,1), -- Fatty Bluefin +(@CLAXREF,33447,6,1,0,1,1), -- Runic Healing Potion +-- -------------------------------------------------- +(@MAGMOTHREF,38260,33,1,0,1,1), -- Empty Tobacco Pouch +(@MAGMOTHREF,38261,21,1,0,1,1), -- Bent House Key +(@MAGMOTHREF,33449,16,1,0,1,1), -- Crusty Flatbread +(@MAGMOTHREF,43575,16,1,0,1,1), -- Reinforced Junkbox +(@MAGMOTHREF,33454,9,1,0,1,1), -- Salted Venison +(@MAGMOTHREF,33447,5,1,0,1,1), -- Runic Healing Potion +(@MAGMOTHREF,36862,1,1,0,1,1); -- Worn Troll Dice +-- ------------------- +-- -- NPC Variables -- +-- ------------------- +SET @NPC := 25686; +SET @NPC1 := 25700; +SET @NPC2 := 25687; +SET @NPC3 := 25685; +SET @NPC4 := 25449; +SET @NPC5 := 25316; +SET @NPC6 := 25353; +SET @NPC7 := 25719; +SET @NPC8 := 25804; +SET @NPC9 := 25392; +SET @NPC10 := 25651; +SET @NPC11 := 25836; +SET @NPC12 := 25979; +SET @NPC13 := 25806; +SET @NPC14 := 25720; +SET @NPC15 := 25803; +SET @NPC16 := 25880; +SET @NPC17 := 25618; +SET @NPC18 := 25839; +SET @NPC19 := 25470; +SET @NPC20 := 24567; +SET @NPC21 := 25467; +SET @NPC22 := 25468; +SET @NPC23 := 25501; +SET @NPC24 := 25726; +SET @NPC25 := 25701; +SET @NPC26 := 25725; +SET @NPC27 := 25699; +SET @NPC28 := 24576; +SET @NPC29 := 25605; +SET @NPC30 := 25609; +SET @NPC31 := 25378; +SET @NPC32 := 25843; +SET @NPC33 := 25496; +SET @NPC34 := 25479; +SET @NPC35 := 25760; +SET @NPC36 := 26266; +SET @NPC37 := 26451; +SET @NPC38 := 25521; +SET @NPC39 := 25613; +SET @NPC40 := 25522; +SET @NPC41 := 25520; +SET @NPC42 := 25209; +SET @NPC43 := 25210; +SET @NPC44 := 25216; +SET @NPC45 := 25215; +SET @NPC46 := 25217; +SET @NPC47 := 25789; +SET @NPC48 := 24469; +SET @NPC49 := 25432; +SET @NPC50 := 25433; +SET @NPC51 := 25615; +SET @NPC52 := 25523; +-- ---------------------- +-- -- Assign the loots -- +-- ---------------------- +UPDATE `creature_template` SET `pickpocketloot`=`entry` WHERE `entry` IN (@NPC,@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6,@NPC7,@NPC8,@NPC9,@NPC10,@NPC11,@NPC12,@NPC13,@NPC14,@NPC15,@NPC16,@NPC17,@NPC18,@NPC19,@NPC20,@NPC21,@NPC22,@NPC23,@NPC24,@NPC25,@NPC26,@NPC27,@NPC28,@NPC29,@NPC30,@NPC31,@NPC32,@NPC33,@NPC34,@NPC35,@NPC36,@NPC37,@NPC38,@NPC39,@NPC40,@NPC41,@NPC42,@NPC43,@NPC44,@NPC45,@NPC46,@NPC47,@NPC48,@NPC49,@NPC50,@NPC51,@NPC52); +DELETE FROM `pickpocketing_loot_template` WHERE `entry` IN (@NPC,@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6,@NPC7,@NPC8,@NPC9,@NPC10,@NPC11,@NPC12,@NPC13,@NPC14,@NPC15,@NPC16,@NPC17,@NPC18,@NPC19,@NPC20,@NPC21,@NPC22,@NPC23,@NPC24,@NPC25,@NPC26,@NPC27,@NPC28,@NPC29,@NPC30,@NPC31,@NPC32,@NPC33,@NPC34,@NPC35,@NPC36,@NPC37,@NPC38,@NPC39,@NPC40,@NPC41,@NPC42,@NPC43,@NPC44,@NPC45,@NPC46,@NPC47,@NPC48,@NPC49,@NPC50,@NPC51,@NPC52); +INSERT INTO `pickpocketing_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ----------------------------------------------------------------------------------------------- +(@NPC,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Gibberer +(@NPC1,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Hunter +(@NPC2,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Steam Belcher +(@NPC3,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Waddler +-- ----------------------------------------------------------------------------------------------- +(@NPC4,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Reclaimer +(@NPC5,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Sorcerer +(@NPC6,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Treasure Hunter +(@NPC7,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Coldarra Spellbinder +(@NPC8,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Harold Lane +(@NPC9,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on High Priest Andorath +(@NPC10,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Cultist Necrolyte +(@NPC11,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Diver +(@NPC12,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Hunter +(@NPC13,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Poacher +(@NPC14,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Inquisitor Caleras +(@NPC15,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Karen "I Don't Caribou" the Culler +(@NPC16,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Minion of Kaw +(@NPC17,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Varidus the Flenser +(@NPC18,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Northsea Mercenary +-- ----------------------------------------------------------------------------------------------- +(@NPC19,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Firestarter +(@NPC20,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Den Vermin +(@NPC21,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Harvester +(@NPC22,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Roaster +(@NPC23,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Gammoth Tender +-- ----------------------------------------------------------------------------------------------- +(@NPC24,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Chieftain Burblegobble +(@NPC25,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Gorloc Dredger +(@NPC26,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Chieftain GurgleBoggle +(@NPC27,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Gorloc Mud Splasher +(@NPC28,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Riplash Myrmidon +-- ----------------------------------------------------------------------------------------------- +(@NPC29,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on Clandestine Cultist +(@NPC30,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on En'kilah Necrolord +(@NPC31,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on En'kilah Necromancer +(@NPC32,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on Northsea Thug +-- ----------------------------------------------------------------------------------------------- +(@NPC33,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Mist Lord +(@NPC34,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Mistweaver +(@NPC35,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Raider +(@NPC36,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Heigarr the Horrible +(@NPC37,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Ragnar Drakkarlund +(@NPC37,35774,-100,1,0,1,1), -- Trident of Naz'jan on Ragnar Drakkarlund +(@NPC38,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Longboatsman +(@NPC39,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Mistweaver +(@NPC40,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Raider +(@NPC41,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Runecaster +-- ----------------------------------------------------------------------------------------------- +(@NPC42,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Claximus +(@NPC43,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Keymaster Urmgrgl +(@NPC44,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Oracle +(@NPC45,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Shorestriker +(@NPC46,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Warrior +-- ----------------------------------------------------------------------------------------------- +(@NPC47,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth2 ref loot template on Gammothra the Tormentor +(@NPC48,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Magnataur Huntress +(@NPC49,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Mate of Magmothregar +(@NPC50,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Offspring of Magmothregar +(@NPC51,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Plagued Magnataur +(@NPC52,1,100,1,0,-@MAGMOTHREF,1); -- Magmoth ref loot template on Skadir Mariner diff --git a/sql/old/3.3.5a/2012_04_19_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_19_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..336cd61c0eb --- /dev/null +++ b/sql/old/3.3.5a/2012_04_19_02_world_creature_loot_template.sql @@ -0,0 +1,2 @@ +-- fix DB-error on startup +DELETE FROM `creature_loot_template` WHERE `entry` IN (34965,34980); diff --git a/sql/old/3.3.5a/2012_04_19_03_world_instance_ulduar.sql b/sql/old/3.3.5a/2012_04_19_03_world_instance_ulduar.sql new file mode 100644 index 00000000000..a39ed9c01d5 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_19_03_world_instance_ulduar.sql @@ -0,0 +1,174 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1603019 AND -1603000; +UPDATE `creature_template` SET `ScriptName`='' WHERE `ScriptName` IN ('boss_algalon','mob_collapsing_star'); + +-- Difficulty linking +UPDATE `creature_template` SET `difficulty_entry_1`=34296 WHERE `entry`=32953; -- Black Hole + +UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`faction_A`=35,`faction_H`=35,`unit_flags`=0x8300,`equipment_id`=2478 WHERE `entry`=34064; -- Brann Bronzebeard +UPDATE `creature_template` SET `speed_walk`=4,`speed_run`=2.14286,`exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=190,`faction_H`=190,`unit_flags`=0x8100,`BaseAttackTime`=1000,`equipment_id`=2479 WHERE `entry` IN (32871,33070); -- Algalon the Observer +UPDATE `creature_template` SET `faction_A`=190,`faction_H`=190,`exp`=2,`minlevel`=83,`maxlevel`=83,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry`=34246; -- Azeroth +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33086; -- Algalon Stalker +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2008000,`speed_run`=1,`equipment_id`=2480,`InhabitType`=4 WHERE `entry` IN (33052,33116); -- Living Constellation +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`speed_run`=1,`RegenHealth`=0 WHERE `entry` IN (32955,34215); -- Collapsing Star +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=80,`maxlevel`=80,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry` IN (32953,34296); -- Black Hole +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`minlevel`=81,`maxlevel`=81,`unit_flags`=0x8000,`speed_walk`=4,`speed_run`=1.42857,`InhabitType`=4 WHERE `entry` IN(33089,34097,34221,34222); -- Dark Matter +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`flags_extra`=0x80 WHERE `entry`=34100; -- Algalon Void Zone Visual Stalker +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry`=34099; -- Worm Hole +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33104; -- Algalon Stalker Asteroid Target 01 +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33105; -- Algalon Stalker Asteroid Target 02 + +UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=9,`gender`=0 WHERE `modelid`=28641; -- Algalon the Observer +UPDATE `creature_model_info` SET `bounding_radius`=0.02,`combat_reach`=0.2,`gender`=2 WHERE `modelid`=29133; -- Azeroth +UPDATE `creature_model_info` SET `bounding_radius`=0.62,`combat_reach`=0,`gender`=2 WHERE `modelid`=28741; -- Living Constellation +UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28988; -- Collapsing Star +UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28460; -- Black Hole + +UPDATE `gameobject_template` SET `faction`=114,`flags`=32 WHERE `entry`=194910; -- Doodad_UL_SigilDoor_03 +UPDATE `gameobject_template` SET `data0`=579 WHERE `entry`=194628; -- Celestial Planetarium Access + +UPDATE `creature_template` SET `ScriptName`='boss_algalon_the_observer' WHERE `entry`=32871; -- Algalon the Observer +UPDATE `creature_template` SET `ScriptName`='npc_living_constellation' WHERE `entry`=33052; -- Living Constellation +UPDATE `creature_template` SET `ScriptName`='npc_collapsing_star' WHERE `entry`=32955; -- Collapsing Star +UPDATE `creature_template` SET `ScriptName`='npc_brann_bronzebeard_algalon' WHERE `entry`=34064; -- Brann Bronzebeard +UPDATE `gameobject_template` SET `ScriptName`='go_celestial_planetarium_access' WHERE `entry` IN (194628,194752); -- Celestial Planetarium Access +UPDATE `creature_template` SET `AIName`='NullCreatureAI' WHERE `entry` IN (32953,34099); -- Black Hole + +DELETE FROM `creature` WHERE `guid` IN (41781,41783,41790,41811,41812,41814,41819,41820,41821,41822,41823,41875); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES +(41781,33086,603,3,1,1627.400,-339.4133,417.4044,1.378810,7200,0,0), -- Algalon Stalker +(41783,33086,603,3,1,1622.681,-344.2576,417.3955,1.378810,7200,0,0), -- Algalon Stalker +(41790,33086,603,3,1,1629.984,-271.4798,417.4045,4.782202,7200,0,0), -- Algalon Stalker +(41811,33086,603,3,1,1630.005,-345.5189,417.3955,1.378810,7200,0,0), -- Algalon Stalker +(41812,33089,603,3,16,1622.451,-321.1563,417.6188,4.677482,7200,20,1), -- Dark Matter +(41814,33089,603,3,16,1649.438,-319.8127,418.3941,1.082104,7200,20,1), -- Dark Matter +(41819,33089,603,3,16,1615.060,-291.6816,417.7796,3.490659,7200,20,1), -- Dark Matter +(41820,33089,603,3,16,1647.005,-288.6790,417.3955,3.490659,7200,20,1), -- Dark Matter +(41821,33089,603,3,16,1622.451,-321.1563,417.6188,4.677482,7200,20,1), -- Dark Matter +(41822,33089,603,3,16,1649.438,-319.8127,418.3941,1.082104,7200,20,1), -- Dark Matter +(41823,33089,603,3,16,1615.060,-291.6816,417.7796,3.490659,7200,20,1), -- Dark Matter +(41875,33089,603,3,16,1647.005,-288.6790,417.3955,3.490659,7200,20,1); -- Dark Matter + +SET @OGUID := 252; +DELETE FROM `gameobject` WHERE `id` IN (194767,194910,194911,194715,194716,194148,194253,194628,194752,194821,194822); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@OGUID+00,194767,603,3,17,1632.024,-182.9211,427.6681,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_SigilDoor_01 +(@OGUID+04,194911,603,3,17,1632.024,-182.9211,408.4224,3.141593,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_SigilDoor_02 +(@OGUID+10,194910,603,3,17,1632.053,-266.1495,438.5608,0.000000,0,0,8.742278E-08,1, 604800,255,0), -- Doodad_UL_SigilDoor_03 +(@OGUID+12,194715,603,3,17,1632.053,-307.6541,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,0), -- Doodad_UL_UniverseFloor_01 +(@OGUID+19,194716,603,3,17,1632.251,-307.5483,416.2641,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_UniverseFloor_02 +(@OGUID+22,194148,603,3,17,1632.053,-307.6541,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_UniverseGlobe01 +(@OGUID+24,194253,603,3,17,1631.908,-246.4970,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_Ulduar_Trapdoor_03 +(@OGUID+29,194628,603,1, 1,1646.182,-174.6881,427.2536,1.553341,0,0,0.000000E-00,1, 604800,255,1), -- Celestial Planetarium Access +(@OGUID+33,194752,603,2, 1,1646.182,-174.6881,427.2536,1.553341,0,0,0.000000E-00,1, 604800,255,1), -- Celestial Planetarium Access +(@OGUID+37,194821,603,1, 1,1632.099,-306.5609,417.3210,4.694937,0,0,0.000000E-00,1,-604800,255,1), -- Gift of the Observer (10 man) +(@OGUID+46,194822,603,2, 1,1632.099,-306.5609,417.3210,4.694937,0,0,0.000000E-00,1,-604800,255,1); -- Gift of the Observer (25 man) + +DELETE FROM `creature_equip_template` WHERE `entry` IN (2478,2479,2480); +INSERT INTO `creature_equip_template` (`entry`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(2478,1903,25972,0), +(2479,45985,45985,0), +(2480,44952,0,0); + +DELETE FROM `creature_template_addon` WHERE `entry` IN (32871,33070,33052,33116,33089,34221,34097,34222,33105); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES +(32871,0,0x0000000,0x0,NULL), -- Algalon the Observer +(33070,0,0x0000000,0x0,NULL), -- Algalon the Observer +(33052,0,0x3000000,0x1,NULL), -- Living Constellation +(33116,0,0x3000000,0x1,NULL), -- Living Constellation +(33089,0,0x3000000,0x1,NULL), -- Dark Matter +(34221,0,0x3000000,0x1,NULL), -- Dark Matter +(34097,0,0x3000000,0x1,NULL), -- Unleashed Dark Matter +(34222,0,0x3000000,0x1,NULL), -- Unleashed Dark Matter +(33105,0,0x3000000,0x1,NULL); -- Algalon Stalker Asteroid Target 02 + +DELETE FROM `creature_text` WHERE `entry` IN (32871,34064); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`sound`,`emote`,`comment`) VALUES +(34064,0,0,'We did it, lads! We got here before Algalon''s arrival. Maybe we can rig the systems to interfere with his analysis--',14,15824,0,'Brann Bronzebeard - SAY_BRANN_ALGALON_INTRO_1'), +(34064,1,0,'I''ll head back to the Archivum and see if I can jam his signal. I might be able to buy us some time while you take care of him.',12,15825,0,'Brann Bronzebeard - SAY_BRANN_ALGALON_INTRO_2'), +(34064,2,0,'I know just the place. Will you be all right?',14,15823,6,'Brann Bronzebeard - SAY_BRANN_ALGALON_OUTRO'), +(32871,0,0,'Translocation complete. Commencing planetary analysis of Azeroth.',12,15405,0,'Algalon the Observer - SAY_ALGALON_INTRO_1'), +(32871,1,0,'Stand back, mortals. I''m not here to fight you.',12,15406,0,'Algalon the Observer - SAY_ALGALON_INTRO_2'), +(32871,2,0,'It is in the universe''s best interest to re-originate this planet should my analysis find systemic corruption. Do not interfere.',12,15407,0,'Algalon the Observer - SAY_ALGALON_INTRO_3'), +(32871,3,0,'Your actions are illogical. All possible results for this encounter have been calculated. The Pantheon will receive the Observer''s message regardless of outcome.',14,15386,0,'Algalon the Observer - SAY_ALGALON_START_TIMER'), +(32871,4,0,'See your world through my eyes: A universe so vast as to be immeasurable - incomprehensible even to your greatest minds.',14,15390,1,'Algalon the Observer - SAY_ALGALON_AGGRO'), +(32871,5,0,'The stars come to my aid!',14,15392,0,'Algalon the Observer - SAY_ALGALON_COLLAPSING_STAR'), +(32871,6,0,'%s begins to Summon Collapsing Stars!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_COLLAPSING_STAR'), +(32871,7,0,'Witness the fury of the cosmos!',14,15396,0,'Algalon the Observer - SAY_ALGALONG_BIG_BANG'), +(32871,8,0,'%s begins to cast Big Bang!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_BIG_BANG'), +(32871,9,0,'You are out of time.',14,15394,0,'Algalon the Observer - SAY_ALGALON_ASCEND'), +(32871,10,0,'%s begins to cast Cosmic Smash!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_COSMIC_SMASH'), +(32871,11,0,'Behold the tools of creation!',14,15397,0,'Algalon the Observer - SAY_ALGALON_PHASE_TWO'), +(32871,12,0,'I have seen worlds bathed in the Makers'' flames, their denizens fading without as much as a whimper. Entire planetary systems born and razed in the time that it takes your mortal hearts to beat once. Yet all throughout, my own heart devoid of emotion... of empathy. I. Have. Felt. Nothing. A million-million lives wasted. Had they all held within them your tenacity? Had they all loved life as you do?',14,15393,1,'Algalon the Observer - SAY_ALGALON_OUTRO_1'), +(32871,13,0,'Perhaps it is your imperfections... that which grants you free will... that allows you to persevere against all cosmically calculated odds. You prevail where the Titan''s own perfect creations have failed.',14,15401,1,'Algalon the Observer - SAY_ALGALON_OUTRO_2'), +(32871,14,0,'I''ve rearranged the reply code - your planet will be spared. I cannot be certain of my own calculations anymore.',14,15402,1,'Algalon the Observer - SAY_ALGALON_OUTRO_3'), +(32871,15,0,'I lack the strength to transmit the signal. You must... hurry... find a place of power... close to the skies.',14,15403,1,'Algalon the Observer - SAY_ALGALON_OUTRO_4'), +(32871,16,0,'Do not worry about my fate, Bronzen. If the signal is not transmitted in time, re-origination will proceed regardless. Save... your world...',14,15404,1,'Algalon the Observer - SAY_ALGALON_OUTRO_5'), +(32871,17,0,'Analysis complete. There is partial corruption in the planet''s life-support systems as well as complete corruption in most of the planet''s defense mechanisms.',12,15398,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_1'), +(32871,18,0,'Begin uplink: Reply Code: ''Omega''. Planetary re-origination requested.',12,15399,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_2'), +(32871,19,0,'Farewell, mortals. Your bravery is admirable, for such flawed creatures.',12,15400,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_3'), +(32871,20,0,'Loss of life unavoidable.',14,15387,0,'Algalon the Observer - SAY_ALGALON_KILL'), +(32871,20,1,'I do what I must.',14,15388,0,'Algalon the Observer - SAY_ALGALON_KILL'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (64996,62266,65509,62304,64597); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(13,1,64996,31,3,34246,'Algalon the Observer - Reorigination on Azeroth'), +(13,1,62266,31,3,33052,'Algalon Stalker - target Living Constellation'), +(13,1,65509,31,3,33052,'Black Hole - target Living Constellation'), +(13,1,62304,31,3,33104,'Cosmic Smash - target trigger'), +(13,1,64597,31,3,33104,'Cosmic Smash - target trigger'); + +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_phase_punch'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_arcane_barrage'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_trigger_3_adds'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_collapse'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_big_bang'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_remove_phase'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_cosmic_smash'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_cosmic_smash_damage'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_supermassive_fail'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(64412,'spell_algalon_phase_punch'), +(64599,'spell_algalon_arcane_barrage'), +(64607,'spell_algalon_arcane_barrage'), +(62266,'spell_algalon_trigger_3_adds'), +(62018,'spell_algalon_collapse'), +(64443,'spell_algalon_big_bang'), +(64584,'spell_algalon_big_bang'), +(64445,'spell_algalon_remove_phase'), +(62295,'spell_algalon_cosmic_smash'), +(62311,'spell_algalon_cosmic_smash_damage'), +(64596,'spell_algalon_cosmic_smash_damage'), +(65311,'spell_algalon_supermassive_fail'); + +SET @DIFF_ID := 3262; +DELETE FROM `spelldifficulty_dbc` WHERE `id` BETWEEN @DIFF_ID AND @DIFF_ID+5; +INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`) VALUES +(@DIFF_ID+0,64395,64592), +(@DIFF_ID+1,64599,64607), +(@DIFF_ID+2,64443,64584), +(@DIFF_ID+3,64122,65108), +(@DIFF_ID+4,62301,64598), +(@DIFF_ID+5,62304,64597); + +UPDATE `instance_encounters` SET `creditType`=1,`creditEntry`=65184 WHERE `entry` IN (757,771); -- Algalon the Observer + +DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (10565,10566,10678,9990,9991,10567,10569,10698,10780,10781,10782,10783,10568,10570); +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10565,10566,10678,9990,9991,10567,10569,10698,10780,10781,10782,10783,10568,10570); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +(10565,12,0,0,''), -- Algalon the Observer kills (Ulduar 10 player) +(10566,12,1,0,''), -- Algalon the Observer kills (Ulduar 25 player) +(10678,12,0,0,''), -- Herald of the Titans +(10678,18,0,0,''), -- Herald of the Titans +(9990,12,0,0,''), -- Lich King 10-player bosses killed +(9991,12,1,0,''), -- Lich King 25-player bosses killed +(10567,12,0,0,''), -- Observed (10 player) +(10569,12,1,0,''), -- Observed (25 player) +(10698,12,1,0,''), -- Realm First! Celestial Defender +(10780,12,0,0,''), -- Supermassive (10 player) +(10781,12,0,0,''), -- Supermassive (10 player) +(10782,12,1,0,''), -- Supermassive (25 player) +(10783,12,1,0,''), -- Supermassive (25 player) +(10568,11,0,0,'achievement_he_feeds_on_your_tears'), -- He Feeds On Your Tears (10 player) +(10568,12,0,0,''), -- He Feeds On Your Tears (10 player) +(10570,11,0,0,'achievement_he_feeds_on_your_tears'), -- He Feeds On Your Tears (25 player) +(10570,12,1,0,''); -- He Feeds On Your Tears (25 player) diff --git a/sql/old/3.3.5a/2012_04_20_00_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_04_20_00_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..47a22d519d0 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_20_00_world_gameobject_loot_template.sql @@ -0,0 +1,15 @@ +SET @Ref := 12002; +DELETE FROM `reference_loot_template` WHERE `entry`=@Ref; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Ref,47242,100,1,0,1,1); +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (195668,195667,195666,195665,195672,195671,195670,195669) AND `item`=47242; +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (195668,195667,195666,195665,195672,195671,195670,195669) AND `mincountOrRef` = -@Ref; +INSERT INTO gameobject_loot_template (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(195665,5,100,1,0,-@Ref,4), -- 10 man,50 attempts +(195666,3,100,1,0,-@Ref,4), -- 10 man,45+ attempts +(195667,3,100,1,0,-@Ref,2), -- 10 man,25+ attempts +(195668,1,100,1,0,-@Ref,2), -- 10 man,0+ attempts +(195669,6,100,1,0,-@Ref,4), -- 25 man,50 attempts +(195670,4,100,1,0,-@Ref,4), -- 25 man,45+ attempts +(195671,4,100,1,0,-@Ref,2), -- 25 man,25+ attempts +(195672,2,100,1,0,-@Ref,2); -- 25 man,0+ attempts diff --git a/sql/old/3.3.5a/2012_04_20_01_world_item_loot_template.sql b/sql/old/3.3.5a/2012_04_20_01_world_item_loot_template.sql new file mode 100644 index 00000000000..af52ade0b25 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_20_01_world_item_loot_template.sql @@ -0,0 +1,10 @@ +SET @Bag := 52676; +DELETE FROM `item_loot_template` WHERE `entry`=@Bag; +INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Bag,36933,0,1,1,1,3),-- Forest Emerald +(@Bag,36918,0,1,1,1,3),-- Scarlet Ruby +(@Bag,36921,0,1,1,1,3),-- Autumn's Glow +(@Bag,36930,0,1,1,1,3),-- Monarch Topaz +(@Bag,36924,0,1,1,1,3),-- Sky Sapphire +(@Bag,36927,0,1,1,1,3),-- Twilight Opal +(@Bag,43953,5,1,0,1,1); -- Reins of the Blue Drake diff --git a/sql/old/3.3.5a/2012_04_20_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_20_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..09b5beee75c --- /dev/null +++ b/sql/old/3.3.5a/2012_04_20_02_world_creature_loot_template.sql @@ -0,0 +1,4 @@ +DELETE FROM `creature_loot_template` WHERE `entry` IN (31702,32297) AND `item`=44564; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(31702,44564,0.5,1,0,1,1), -- Recipe: Mighty Arcane Protection Potion on Frostbrood Spawn +(32297,44564,0.5,1,0,1,1); -- Recipe: Mighty Arcane Protection Potion on Cult Researcher diff --git a/sql/old/3.3.5a/2012_04_20_03_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_20_03_world_creature_loot_template.sql new file mode 100644 index 00000000000..a0b586ee0d9 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_20_03_world_creature_loot_template.sql @@ -0,0 +1,7 @@ +SET @ITEM := 50406; -- Formula: Enchant Gloves - Angler +UPDATE `creature_template` SET `lootid` = `entry` WHERE `entry` IN(26343,26344,26336); +DELETE FROM `creature_loot_template` WHERE `item`=@ITEM; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(26343, @ITEM, 1.1, 1, 0, 1, 1), -- Indu'Le Fisherman +(26336, @ITEM, 0.9, 1, 0, 1, 1), -- Indu'Le Mystic +(26344, @ITEM, 1, 1, 0, 1, 1); -- Indu'Le Warrior diff --git a/sql/old/3.3.5a/2012_04_20_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_20_04_world_creature_loot_template.sql new file mode 100644 index 00000000000..73e01efa23e --- /dev/null +++ b/sql/old/3.3.5a/2012_04_20_04_world_creature_loot_template.sql @@ -0,0 +1,3 @@ +-- Make Grimscale Murlocs drop their heads faster... +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-66 WHERE `item`=21757; + diff --git a/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql b/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql new file mode 100644 index 00000000000..24400b16a5c --- /dev/null +++ b/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql @@ -0,0 +1,8 @@ +-- Restore horrible mistake in UP34 from myself +UPDATE `gameobject_template` SET `data1`=27512 WHERE `entry`=195669; +UPDATE `gameobject_template` SET `data1`=27517 WHERE `entry`=195670; +UPDATE `gameobject_template` SET `data1`=27518 WHERE `entry`=195671; +-- Fix loottemplates along with it +UPDATE `gameobject_loot_template` SET `entry`=27512 WHERE `entry`=195669; +UPDATE `gameobject_loot_template` SET `entry`=27517 WHERE `entry`=195670; +UPDATE `gameobject_loot_template` SET `entry`=27518 WHERE `entry`=195671; diff --git a/sql/old/3.3.5a/2012_04_21_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_21_00_world_spell_script_names.sql new file mode 100644 index 00000000000..e61ef4aec74 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_21_00_world_spell_script_names.sql @@ -0,0 +1,14 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (20625,29142,35139,42393,49882,55269,56578,38441,66316,67100,67101,67102); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(20625,'spell_gen_default_count_pct_from_max_hp'), -- Ritual of Doom Sacrifice +(29142,'spell_gen_default_count_pct_from_max_hp'), -- Eyesore Blaster +(35139,'spell_gen_default_count_pct_from_max_hp'), -- Throw Boom's Doom +(42393,'spell_gen_default_count_pct_from_max_hp'), -- Brewfest - Attack Keg +(49882,'spell_gen_default_count_pct_from_max_hp'), -- Leviroth Self-Impale +(55269,'spell_gen_default_count_pct_from_max_hp'), -- Deathly Stare +(56578,'spell_gen_default_count_pct_from_max_hp'), -- Rapid-Fire Harpoon +(38441,'spell_gen_50pct_count_pct_from_max_hp'), -- Cataclysmic Bolt +(66316,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 10m +(67100,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 25m +(67101,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 10m heroic +(67102,'spell_gen_50pct_count_pct_from_max_hp'); -- Spinning Pain Spike 25m heroic diff --git a/sql/old/3.3.5a/2012_04_22_00_world_sai.sql b/sql/old/3.3.5a/2012_04_22_00_world_sai.sql new file mode 100644 index 00000000000..f223883c8a7 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_22_00_world_sai.sql @@ -0,0 +1,63 @@ +-- SAI for Tabard Vendor Elizabeth Ross +SET @ROSS := 28776; +SET @GOSSIP := 9832; + +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ROSS; + +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id`>0 AND `id`<11; +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 +(@GOSSIP, 1, 0, 'I''ve lost my Blood Knight Tabard.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 2, 0, 'I''ve lost my Tabard of the Hand.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 3, 0, 'I''ve lost my Tabard of the Protector.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 4, 0, 'I''ve lost my Green Trophy Tabard of the Illidari.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 5, 0, 'I''ve lost my Purple Trophy Tabard of the Illidari.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 6, 0, 'I''ve lost my Tabard of Summer Skies.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 7, 0, 'I''ve lost my Tabard of Summer Flames.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 8, 0, 'I''ve lost my Loremaster''s Colors.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 9, 0, 'I''ve lost my Tabard of the Explorer.', 1, 1, 0, 0, 0, 0, ''), +(@GOSSIP, 10, 0, 'I''ve lost my Tabard of the Achiever.', 1, 1, 0, 0, 0, 0, ''); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ROSS 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 +(@ROSS, 0, 0, 10, 62, 0, 100, 0, @GOSSIP, 1, 0, 0, 11, 54974, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Blood Knight Tabard'), +(@ROSS, 0, 1, 10, 62, 0, 100, 0, @GOSSIP, 2, 0, 0, 11, 54976, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Hand'), +(@ROSS, 0, 2, 10, 62, 0, 100, 0, @GOSSIP, 3, 0, 0, 11, 55008, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Protector'), +(@ROSS, 0, 3, 10, 62, 0, 100, 0, @GOSSIP, 4, 0, 0, 11, 54977, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Green Trophy Tabard of the Illidari'), +(@ROSS, 0, 4, 10, 62, 0, 100, 0, @GOSSIP, 5, 0, 0, 11, 54982, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Purple Trophy Tabard of the Illidari'), +(@ROSS, 0, 5, 10, 62, 0, 100, 0, @GOSSIP, 6, 0, 0, 11, 62768, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Skies'), +(@ROSS, 0, 6, 10, 62, 0, 100, 0, @GOSSIP, 7, 0, 0, 11, 62769, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Flames'), +(@ROSS, 0, 7, 10, 62, 0, 100, 0, @GOSSIP, 8, 0, 0, 11, 58194, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Loremaster''s Colors'), +(@ROSS, 0, 8, 10, 62, 0, 100, 0, @GOSSIP, 9, 0, 0, 11, 58224, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Explorer'), +(@ROSS, 0, 9, 10, 62, 0, 100, 0, @GOSSIP, 10, 0, 0, 11, 55006, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Achiever'), +(@ROSS, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,@GOSSIP,1,0,2,25549,1,1,1,0,'','Only show gossip if player doesn''t have Blood Knight Tabard'), +(15,@GOSSIP,1,0,8,9737,0,0,0,0,'','Only show gossip if player already finished quest True Masters of Light'), +(15,@GOSSIP,2,0,2,24344,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Hand'), +(15,@GOSSIP,2,0,8,9762,0,0,0,0,'','Only show gossip if player already finished quest The Unwritten Prophecy'), +(15,@GOSSIP,3,0,2,28788,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the protector'), +(15,@GOSSIP,3,0,8,10259,0,0,0,0,'','Only show gossip if player already finished quest Into the Breach'), +(15,@GOSSIP,4,0,2,31404,1,1,1,0,'','Only show gossip if player doesn''t have Green Trophy Tabard of Illidari'), +(15,@GOSSIP,4,0,2,31405,1,1,1,0,'','Only show gossip if player doesn''t have Purple Trophy Tabard of Illidari'), +(15,@GOSSIP,4,0,2,31408,1,1,1,0,'','Only show gossip if player doesn''t have Offering of the Sha''tar'), +(15,@GOSSIP,4,0,8,10781,0,0,0,0,'','Only show gossip if player already finished quest Battle of the Crimson Watch'), +(15,@GOSSIP,5,0,2,31404,1,1,1,0,'','Only show gossip if player doesn''t have Green Trophy Tabard of Illidari'), +(15,@GOSSIP,5,0,2,31405,1,1,1,0,'','Only show gossip if player doesn''t have Purple Trophy Tabard of Illidari'), +(15,@GOSSIP,5,0,2,31408,1,1,1,0,'','Only show gossip if player doesn''t have Offering of the Sha''tar'), +(15,@GOSSIP,5,0,8,10781,0,0,0,0,'','Only show gossip if player already finished quest Battle of the Crimson Watch'), +(15,@GOSSIP,6,0,2,35279,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Skies'), +(15,@GOSSIP,6,0,2,35280,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Flames'), +(15,@GOSSIP,6,0,8,11972,0,0,0,0,'','Only show gossip if player already finished quest Shards of Ahune'), +(15,@GOSSIP,7,0,2,35279,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Skies'), +(15,@GOSSIP,7,0,2,35280,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Flames'), +(15,@GOSSIP,7,0,8,11972,0,0,0,0,'','Only show gossip if player already finished quest Shards of Ahune'), +(15,@GOSSIP,8,0,2,43300,1,1,1,0,'','Only show gossip if player doesn''t have Loremaster''s Colors'), +(15,@GOSSIP,8,0,17,1681,0,0,0,0,'','Only show gossip if player have achievement Loremaster (A)'), +(15,@GOSSIP,8,1,2,43300,1,1,1,0,'','Only show gossip if player doesn''t have Loremaster''s Colors'), +(15,@GOSSIP,8,1,17,1682,0,0,0,0,'','Only show gossip if player have achievement Loremaster (H)'), +(15,@GOSSIP,9,0,2,43348,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Explorer'), +(15,@GOSSIP,9,0,17,45,0,0,0,0,'','Only show gossip if player have achievement Explore Northrend'), +(15,@GOSSIP,10,0,2,40643,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Explorer'), +(15,@GOSSIP,10,0,17,1021,0,0,0,0,'','Only show gossip if player have achievement Twenty-Five Tabards'); diff --git a/sql/old/3.3.5a/2012_04_23_00_world_creatures.sql b/sql/old/3.3.5a/2012_04_23_00_world_creatures.sql new file mode 100644 index 00000000000..3730fabf552 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_23_00_world_creatures.sql @@ -0,0 +1,12 @@ +UPDATE `creature_template` SET `flags_extra`=0x82,`ModelId1`=1126,`ModelId2`=16925 WHERE `entry` IN (38008,38641,38773,38774); -- Blood Orb Controller +UPDATE `creature_template` SET `flags_extra`=0x80,`ModelId1`=19725,`ModelId2`=31095,`baseattacktime`=2000,`speed_walk`=0.8,`speed_run`=0.28571 WHERE `entry` IN (38454,38775,38776,38777); -- Kinetic Bomb +UPDATE `creature_template` SET `exp`=2,`baseattacktime`=2000,`ModelId1`=19725,`ModelId2`=21342 WHERE `entry`=38458; -- Kinetic Bomb Target +UPDATE `creature_template` SET `baseattacktime`=2000,`speed_walk`=4.4,`ModelId1`=19725,`ModelId2`=26767 WHERE `entry` IN (38332,38451); -- Ball of Flame +UPDATE `creature_template` SET `flags_extra`=0x80 WHERE `entry`=37950; -- Valithria Dreamwalker +UPDATE `creature_template` SET `InhabitType`=4 WHERE `InhabitType`&4 AND `flags_extra`&0x80; -- make flying triggers fly +UPDATE `creature_template` SET `InhabitType`=4,`HoverHeight`=12 WHERE `entry`=37126; -- Sister Svalna +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=37950; -- Valithria Dreamwalker +UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=0,`gender`=0 WHERE `modelid`=31095; -- Kinetic Bomb +UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=0 WHERE `modelid`=21342; -- Kinetic Bomb Target +UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=0 WHERE `modelid`=26767; -- Ball of Flame +UPDATE `creature_template_addon` SET `bytes1`=50331648,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=38454; -- Kinetic Bomb diff --git a/sql/old/3.3.5a/2012_04_23_01_world_conditions.sql b/sql/old/3.3.5a/2012_04_23_01_world_conditions.sql new file mode 100644 index 00000000000..c731426aa3f --- /dev/null +++ b/sql/old/3.3.5a/2012_04_23_01_world_conditions.sql @@ -0,0 +1,5 @@ +-- setup alternate conditions for spell 46488 +DELETE FROM `conditions` WHERE `SourceEntry` = 46488 AND `ElseGroup` = 1; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,46488,0,1,31,1,3,26817,0,0,0,'',''), +(13,1,46488,0,1,36,1,0,0,0,1,0,'',''); diff --git a/sql/old/3.3.5a/2012_04_23_02_world_prospecting_loot_template.sql b/sql/old/3.3.5a/2012_04_23_02_world_prospecting_loot_template.sql new file mode 100644 index 00000000000..6ea44d92722 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_23_02_world_prospecting_loot_template.sql @@ -0,0 +1,112 @@ +SET @TinRef := 13000; +SET @TBC1 := @TinRef+1; +SET @TBC2 := @TinRef+2; +SET @WOTLK1 := @TinRef+3; +SET @WOTLK2 := @TinRef+4; +SET @WOTLK3 := @TinRef+5; + +SET @Copper := 2770; +SET @Tin := 2771; +SET @Iron := 2772; +SET @Mithril := 3858; +SET @Thorium := 10620; +SET @FelIron := 23424; +SET @Adamantite := 23425; +SET @Cobalt := 36909; +SET @Saronite := 36912; +SET @Titanium := 36910; + +-- Reference Loot Templates +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @TinRef AND @TinRef+5; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Stupid Tin +(@TinRef,1529,0,1,1,1,1), -- Jade +(@TinRef,3864,0,1,1,1,1), -- Citrine +(@TinRef,7909,0,1,1,1,1), -- Aquamarine +-- TBC Greens +(@TBC1,21929,0,1,1,1,2), -- Flame Spessarite +(@TBC1,23077,0,1,1,1,2), -- Blood Garnet +(@TBC1,23079,0,1,1,1,2), -- Deep Peridot +(@TBC1,23107,0,1,1,1,2), -- Shadow Draenite +(@TBC1,23112,0,1,1,1,2), -- Golden Draenite +(@TBC1,23117,0,1,1,1,2), -- Azure Moonstone +-- TBC Blues +(@TBC2,23436,0,1,1,1,1), -- Living Ruby +(@TBC2,23437,0,1,1,1,1), -- Talasite +(@TBC2,23438,0,1,1,1,1), -- Star of Elune +(@TBC2,23439,0,1,1,1,1), -- Noble Topaz +(@TBC2,23440,0,1,1,1,1), -- Dawnstone +(@TBC2,23441,0,1,1,1,1), -- Nightseye +-- WOTLK Greens +(@WOTLK1,36917,0,1,1,1,2), -- Bloodstone +(@WOTLK1,36920,0,1,1,1,2), -- Sun Crystal +(@WOTLK1,36923,0,1,1,1,2), -- Chalcedony +(@WOTLK1,36926,0,1,1,1,2), -- Shadow Crystal +(@WOTLK1,36929,0,1,1,1,2), -- Huge Citrine +(@WOTLK1,36932,0,1,1,1,2), -- Dark Jade +-- WOTLK Blues +(@WOTLK2,36918,0,1,1,1,2), -- Scarlet Ruby +(@WOTLK2,36921,0,1,1,1,2), -- Autumn's Glow +(@WOTLK2,36924,0,1,1,1,2), -- Sky Sapphire +(@WOTLK2,36927,0,1,1,1,2), -- Twilight Opal +(@WOTLK2,36930,0,1,1,1,2), -- Monarch Topaz +(@WOTLK2,36933,0,1,1,1,2), -- Forest Emerald +-- WOTLK Epics +(@WOTLK3,36919,0,1,1,1,1), -- Cardinal Ruby +(@WOTLK3,36922,0,1,1,1,1), -- King's Amber +(@WOTLK3,36925,0,1,1,1,1), -- Majestic Zircon +(@WOTLK3,36928,0,1,1,1,1), -- Dreadstone +(@WOTLK3,36931,0,1,1,1,1), -- Ametrine +(@WOTLK3,36934,0,1,1,1,1); -- Eye of Zul +-- -------------------------------------------------------- +-- Prospecting Loot Templates +DELETE FROM `prospecting_loot_template` WHERE `entry` IN (@Copper,@Tin,@Iron,@Mithril,@Thorium,@FelIron,@Adamantite,@Cobalt,@Saronite,@Titanium); +INSERT INTO `prospecting_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Copper Ore +(@Copper,774,0,1,1,1,1), -- Malachite +(@Copper,818,0,1,1,1,1), -- Tigerseye +(@Copper,1210,10,1,0,1,1), -- Shadowgem +-- Tin Ore +(@Tin,1210,0,1,1,1,2), -- Shadowgem +(@Tin,1705,0,1,1,1,2), -- Lesser Moonstone +(@Tin,1206,0,1,1,1,2), -- Moss Agate +(@Tin,1,10,1,0,-@TinRef,1), -- One Rare gem chance +-- Iron Ore +(@Iron,1529,30,1,1,1,2), -- Jade +(@Iron,1705,30,1,1,1,2), -- Lesser Moonstone +(@Iron,3864,30,1,1,1,2), -- Citrine +(@Iron,7909,5,1,1,1,1), -- Aquamarine +(@Iron,7910,5,1,1,1,1), -- Star Ruby +-- Mithril Ore +(@Mithril,3864,30,1,1,1,2), -- Citrine +(@Mithril,7909,30,1,1,1,2), -- Aquamarine +(@Mithril,7910,30,1,1,1,2), -- Star Ruby +(@Mithril,12361,2.5,1,1,1,1), -- Blue Sapphire +(@Mithril,12364,2.5,1,1,1,1), -- Huge Emerald +(@Mithril,12799,2.5,1,1,1,1), -- Large Opal +(@Mithril,12800,2.5,1,1,1,1), -- Azerothian Diamond +-- Thorium Ore +(@Thorium,7910,30,1,1,1,2), -- Star Ruby +(@Thorium,12361,15,1,1,1,2), -- Blue Sapphire +(@Thorium,12364,15,1,1,1,2), -- Huge Emerald +(@Thorium,12799,15,1,1,1,2), -- Large Opal +(@Thorium,12800,15,1,1,1,2), -- Azerothian Diamond +(@Thorium,1,10,1,1,-@TBC1,1), -- one from TBC Greens +-- Fel Iron Ore +(@FelIron,1,95,1,1,-@TBC1,1), -- One from TBC Greens +(@FelIron,2,05,1,1,-@TBC2,1), -- One from TBC Blues +-- Adamantite Ore +(@Adamantite,24243,100,1,0,1,1), -- Adamantite Powder +(@Adamantite,1,100,1,1,-@TBC1,1), -- One from TBC Greens +(@Adamantite,2, 10,1,1,-@TBC2,1), -- One from TBC Blues +-- Cobalt Ore +(@Cobalt,1,95,1,1,-@WOTLK1,1), -- One from WOTLK Greens +(@Cobalt,2,05,1,1,-@WOTLK2,1), -- One from WOTLK Blues +-- Saronite Ore +(@Saronite,1,85,1,1,-@WOTLK1,2), -- One from WOTLK Greens +(@Saronite,2,15,1,1,-@WOTLK2,1), -- One from WOTLK Blues +-- Titanium Ore +(@Titanium,46849,75,1,0,1,1), -- Titanium Powder +(@Titanium,1,75,1,1,-@WOTLK1,2), -- Two from WOTLK Greens +(@Titanium,2,25,1,1,-@WOTLK2,1), -- One from WOTLK Blues +(@Titanium,3,20,1,0,-@WOTLK3,1); -- One from WOTLK Epics diff --git a/sql/old/3.3.5a/2012_04_23_03_world_skinning_loot_template.sql b/sql/old/3.3.5a/2012_04_23_03_world_skinning_loot_template.sql new file mode 100644 index 00000000000..a1aa9e070f2 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_23_03_world_skinning_loot_template.sql @@ -0,0 +1,44 @@ +UPDATE `creature_template` SET `skinloot`=entry WHERE `entry` IN (30260, 32517, 27641, 28860); +UPDATE `creature_template` SET `skinloot`=70202 WHERE `entry` IN (25774,29693); +UPDATE `creature_template` SET `skinloot`=70203 WHERE `entry`=28257; +UPDATE `creature_template` SET `skinloot`=70207 WHERE `entry`=34137; +UPDATE `creature_template` SET `skinloot`=70208 WHERE `entry` IN (32572,25448,25716,25713); +UPDATE `creature_template` SET `skinloot`=70210 WHERE `entry` IN (33528,40419,26723,31134,36891); +UPDATE `creature_template` SET `skinloot`=70211 WHERE `entry` IN (28847,30206,29875,29931,28203,30432); +UPDATE `creature_template` SET `skinloot`=70212 WHERE `entry` IN (27645,32377,29838,26628,26622,32490,38453,32485,26633,32400,32361,29768,29735,26641,27644,27642,26735,26730,26722,33776,35189,26716,26672,29664,29774); +UPDATE `creature_template` SET `skinloot`=70213 WHERE `entry` IN (27483,29312); +UPDATE `creature_template` SET `skinloot`=70214 WHERE `entry` IN (37217,34564); +UPDATE `creature_template` SET `skinloot`=27641 WHERE `entry` IN (31385,34269,34270,27641,30905,30353); + +DELETE FROM `skinning_loot_template` WHERE entry IN (30260,32517,70212,70213,70214,28860,27641); +INSERT INTO `skinning_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +-- Stoic Mammoth +(30260,33568,100,0,1,3), -- Borean Leather +(30260,42542,-50,0,1,1), -- Stoic Mammoth Hide +-- Loque'nahak +(32517,33568,0,1,1,3), -- Borean Leather +(32517,44128,2,1,1,1), -- Arctic Fur +(32517,44687,100,0,1,1), -- Loque'Nahak's Pelt +-- skinloot 70212 +(70212,33568,0,1,1,3), -- Borean Leather +(70212,44128,1,1,1,1), -- Arctic Fur +-- skinloot 70213 +(70213,33568,0,1,5,12), -- Borean Leather +(70213,44128,1,1,1,1), -- Arctic Fur +-- skinloot 70214 +(70214,33568,0,1,12,16), -- Borean Leather +(70214,44128,25,1,1,1), -- Arctic Fur +-- Sartharion +(28860,33568,0,1,8,12), -- Borean Leather +(28860,38557,0,1,8,12),-- Icy Dragonscale +(28860,44128,1,1,1,1), -- Arctic Fur +-- Centrifuge Construct +(27641,41337,85,0,1,3), -- Whizzed-Out Gizmo +(27641,41338,80,0,1,3), -- Sprung Whirlygig +(27641,39690,15,0,1,3), -- Volatile Blasting Trigger +(27641,39684,8,0,1,1), -- Hair Trigger +(27641,36813,8,0,1,3), -- Sprung Sprocket +(27641,39681,8,0,2,4), -- Handful of Cobalt Bolts +(27641,49050,2,0,1,1), -- Schematic: Jeeves +(27641,39682,1,0,1,1), -- Overcharged Capacitor +(27641,39685,1,0,1,1); -- Indestructible Frame diff --git a/sql/old/3.3.5a/2012_04_23_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_23_04_world_creature_loot_template.sql new file mode 100644 index 00000000000..94d2b092d12 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_23_04_world_creature_loot_template.sql @@ -0,0 +1,2 @@ +-- Correct dropchance for Mote of Life, wowhead was wrong (as usual) +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=18.5307 WHERE `entry`=22307 AND `item`=22575; diff --git a/sql/old/3.3.5a/2012_04_23_05_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_23_05_world_creature_loot_template.sql new file mode 100644 index 00000000000..ddf0780d362 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_23_05_world_creature_loot_template.sql @@ -0,0 +1,3 @@ +-- Update the dropchance to 100% if on quest +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=21477 AND `item`=31372; -- Rocknail Flayer Carcass +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=21478 AND `item`=31373; -- Rocknail Flayer Giblets diff --git a/sql/old/3.3.5a/2012_04_24_00_world_command.sql b/sql/old/3.3.5a/2012_04_24_00_world_command.sql new file mode 100644 index 00000000000..25912392347 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_24_00_world_command.sql @@ -0,0 +1,10 @@ +DELETE FROM `command` WHERE `name` IN ('modify tp','modify bwalk','modify swim','modify fly','modify arena','modify aspeed','modify morph'); +INSERT INTO `command` (`name`, `security`, `help`) VALUES ('modify speed all', 1, 'Syntax: .modify aspeed #rate\r\n\r\nModify all speeds -run,swim,run back,swim back- of the selected player to "normalbase speed for this move type"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed backwalk', 1, 'Syntax: .modify speed backwalk #rate\r\n\r\nModify the speed of the selected player while running backwards to "normal walk back speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed fly', 1, '.modify speed fly #rate\nModify the flying speed of the selected player to "normal flying speed"*rate. If no player is selected, modify your speed.\n #rate may range from 0.1 to 50.'), +('modify speed swim', 1, 'Syntax: .modify speed swim #rate\r\n\r\nModify the swim speed of the selected player to "normal swim speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify speed walk', 1, 'Syntax: .modify speed bwalk #rate\r\n\r\nModify the speed of the selected player while running to "normal walk speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), +('modify talentpoints', 1, 'Syntax: .modify talentpoints #amount\r\n\r\nSet free talent points for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.'), +('morph', 2, 'Syntax: .morph #displayid\r\n\r\nChange your current model id to #displayid.'), +('modify arenapoints', 1, 'Syntax: .modify arenapoints #value\r\nAdd $amount arena points to the selected player.'); +UPDATE `command` SET `help`='Syntax: .modify speed $speedtype #rate\r\n\r\nModify the running speed of the selected player to "normal base run speed"= 1. If no player is selected, modify your speed.\r\n\r\n$speedtypes may be fly, all, walk, backwalk, or swim.\r\n\r\n #rate may range from 0.1 to 50.' WHERE `name`='modify speed' LIMIT 1; diff --git a/sql/old/3.3.5a/2012_04_24_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_24_01_world_spell_proc_event.sql new file mode 100644 index 00000000000..6e997931bb5 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_24_01_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +-- Honor Among Thieves proc chance +UPDATE `spell_proc_event` SET `CustomChance`=33 WHERE `entry`=51698; -- Rank 1 +UPDATE `spell_proc_event` SET `CustomChance`=66 WHERE `entry`=51700; -- Rank 2 +UPDATE `spell_proc_event` SET `CustomChance`=100 WHERE `entry`=51701; -- Rank 3 diff --git a/sql/old/3.3.5a/2012_04_24_02_world_warden_checks.sql b/sql/old/3.3.5a/2012_04_24_02_world_warden_checks.sql new file mode 100644 index 00000000000..74539f99fb3 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_24_02_world_warden_checks.sql @@ -0,0 +1,8 @@ +UPDATE `warden_checks` SET `comment`='Swimming_FallCalc - movement state' WHERE `id`=15; +UPDATE `warden_checks` SET `comment`='CreateMovementStatus' WHERE `id`=72; +UPDATE `warden_checks` SET `comment`='OnStartSwim OnSplineStartSwim - movement state' WHERE `id`=170; +UPDATE `warden_checks` SET `comment`='DefaultServerLogin - account name' WHERE `id`=198; +UPDATE `warden_checks` SET `comment`='Login Checksum - authentication process' WHERE `id`=320; +UPDATE `warden_checks` SET `comment`='CalcFallStartElevation - (some kind of wall climb)' WHERE `id`=329; +UPDATE `warden_checks` SET `comment`='Code injection at 0x40100A' WHERE `id`=381; +UPDATE `warden_checks` SET `comment`='Login State - (May be false positive)' WHERE `id`=437; diff --git a/sql/old/3.3.5a/2012_04_24_03_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_24_03_world_spell_script_names.sql new file mode 100644 index 00000000000..a53d8bd585c --- /dev/null +++ b/sql/old/3.3.5a/2012_04_24_03_world_spell_script_names.sql @@ -0,0 +1,4 @@ +-- Earthen Power +DELETE FROM `spell_script_names` WHERE `spell_id`=59566; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(59566,'spell_sha_earthen_power'); diff --git a/sql/old/3.3.5a/2012_04_24_04_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_24_04_world_spell_proc_event.sql new file mode 100644 index 00000000000..5ba6f24ccf8 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_24_04_world_spell_proc_event.sql @@ -0,0 +1,4 @@ + -- Rogue T9 2P - Should proc only from Rupture ticks. +DELETE FROM `spell_proc_event` WHERE `entry` IN(67209); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `procFlags`) VALUES +(67209, 0x01, 8, 0x100000, 0x50000); diff --git a/sql/old/3.3.5a/2012_04_24_05_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_24_05_world_creature_loot_template.sql new file mode 100644 index 00000000000..c524999b492 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_24_05_world_creature_loot_template.sql @@ -0,0 +1,9 @@ +-- Apply same loot template to below mentioned Bloodsail NPCs as that of Bloodsail Raider 1561 +-- (Mage 1562, Swashbuckler 1563, Warlock 1564, Sea Dog 1565) +UPDATE `creature_template` SET `lootid`=1561 WHERE `entry` IN (1562,1563,1564,1565); +-- Remove Loot from `creature_loot_template` for above mentioned NPCs because it contains only 2 items. +-- Those 2 items, along with complete loot template for these mobs is applied in query above. +DELETE FROM `creature_loot_template` WHERE `entry` IN (1562,1563,1564,1565); +-- Remove loot and gold drop from Bloodsail Warlock's Minions +UPDATE `creature_template` SET `lootid`=0, `mingold`=0 AND `maxgold`=0 WHERE `entry` IN (10928,12922); +DELETE FROM `creature_loot_template` WHERE `entry` IN (10928,12922); diff --git a/sql/old/3.3.5a/2012_04_24_06_world_misc.sql b/sql/old/3.3.5a/2012_04_24_06_world_misc.sql new file mode 100644 index 00000000000..2e095a76cd9 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_24_06_world_misc.sql @@ -0,0 +1,31 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 46485; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(46485,'spell_item_greatmothers_soulcatcher'); + +DELETE FROM `conditions` WHERE `SourceEntry` IN (46485,46488); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,46485,0,1,31,1,3,26817,0,0,0,'',''), +(13,1,46485,0,1,36,1,0,0,0,1,0,'',''), +(13,1,46488,0,1,31,1,3,26817,0,0,0,'',''), +(13,1,46488,0,1,36,1,0,0,0,1,0,'',''); + +-- Gnome Soul SAI +SET @ENTRY := 26096; +SET @SPELL_ARCANE_EXPLOSION := 35426; +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,1,54,0,100,0,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gnome Soul - On Just Summoned - Quest Credit"), +(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,25814,10,1,0,0,0,0,"Gnome Soul - On Just Summoned - Set Data Fizzcrank Mechagnome"), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,69,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gnome Soul - On Just Summoned - Move to Summoner"), + +(@ENTRY,0,3,4,34,0,100,0,1,0,0,0,11,@SPELL_ARCANE_EXPLOSION,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gnome Soul - Reached Summoner - Cast Arcane Explosion Visual"), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gnome Soul - Reached Summoner - Forced Despawn"); + +-- Fizzcrank Mechagnome SAI +SET @ENTRY := 25814; +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,4,0,100,0,0,0,0,0,1,1,10000,0,0,0,0,0,0,0,0,0,0,0,0,"Fizzcrank Mechagnome - Chance Say on Aggro"), +(@ENTRY,1,0,0,38,0,100,0,1,1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Fizzcrank Mechagnome - On Data Set - Forced Despawn"); diff --git a/sql/old/3.3.5a/2012_04_25_00_world_misc.sql b/sql/old/3.3.5a/2012_04_25_00_world_misc.sql new file mode 100644 index 00000000000..3d2f20fdc8c --- /dev/null +++ b/sql/old/3.3.5a/2012_04_25_00_world_misc.sql @@ -0,0 +1,3 @@ +UPDATE `smart_scripts` SET `source_type`=0,`id`=1 WHERE `entryorguid`=24814 AND `source_type`=1 AND `event_type`=38; +UPDATE `conditions` SET `SourceTypeOrReferenceId`=17 WHERE `SourceEntry` IN (46485,46488); +UPDATE `conditions` SET `ElseGroup`=0 WHERE `SourceEntry` IN (46485,46488) AND `ConditionValue1`=26817; diff --git a/sql/old/3.3.5a/2012_04_25_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_25_01_world_spell_script_names.sql new file mode 100644 index 00000000000..7b7135860ab --- /dev/null +++ b/sql/old/3.3.5a/2012_04_25_01_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 33110; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(33110,'spell_pri_prayer_of_mending_heal'); diff --git a/sql/old/3.3.5a/2012_04_25_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_25_02_world_spell_script_names.sql new file mode 100644 index 00000000000..ad63bc87837 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_25_02_world_spell_script_names.sql @@ -0,0 +1,11 @@ +DELETE FROM `spell_scripts` WHERE `id` IN (15998,25952,29435,45980,51592,51910,52267,54420); +DELETE FROM `spell_script_names` WHERE `spell_id` IN (15998,25952,29435,45980,51592,51910,52267,54420); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(15998, 'spell_gen_despawn_self'), +(25952, 'spell_gen_despawn_self'), +(29435, 'spell_gen_despawn_self'), +(45980, 'spell_gen_despawn_self'), +(51592, 'spell_gen_despawn_self'), +(51910, 'spell_gen_despawn_self'), +(52267, 'spell_gen_despawn_self'), +(54420, 'spell_gen_despawn_self'); diff --git a/sql/old/3.3.5a/2012_04_25_03_world_spell_group.sql b/sql/old/3.3.5a/2012_04_25_03_world_spell_group.sql new file mode 100644 index 00000000000..a6fa90ad41d --- /dev/null +++ b/sql/old/3.3.5a/2012_04_25_03_world_spell_group.sql @@ -0,0 +1,11 @@ +DELETE FROM `spell_group` WHERE `id` IN (1117,1118); +INSERT INTO `spell_group` (`id`,`spell_id`) VALUES +(1117,25898), +(1117,25899), +(1118,20911), +(1118,20217); + +DELETE FROM `spell_group_stack_rules` WHERE `group_id` in (1117,1118); +INSERT INTO `spell_group_stack_rules` (`group_id`,`stack_rule`) VALUES +(1117,3), +(1118,3); diff --git a/sql/old/3.3.5a/2012_04_26_00_world_conditions.sql b/sql/old/3.3.5a/2012_04_26_00_world_conditions.sql new file mode 100644 index 00000000000..8d525cad057 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_26_00_world_conditions.sql @@ -0,0 +1 @@ +UPDATE `conditions` SET `ElseGroup` = 0, `SourceGroup` = 0 WHERE `SourceEntry` IN (46485,46488); diff --git a/sql/old/3.3.5a/2012_04_26_01_world_smart_scripts.sql b/sql/old/3.3.5a/2012_04_26_01_world_smart_scripts.sql new file mode 100644 index 00000000000..e90e7b58433 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_26_01_world_smart_scripts.sql @@ -0,0 +1 @@ +UPDATE `smart_scripts` SET `source_type` = 0, `id` = 1 WHERE `entryorguid` = 25814 AND `source_type` = 1 AND `id` = 0; diff --git a/sql/old/3.3.5a/2012_04_27_00_world_instance_icc.sql b/sql/old/3.3.5a/2012_04_27_00_world_instance_icc.sql new file mode 100644 index 00000000000..6738e4904ab --- /dev/null +++ b/sql/old/3.3.5a/2012_04_27_00_world_instance_icc.sql @@ -0,0 +1,5 @@ +DELETE FROM `creature_text` WHERE `entry`=37813 AND `groupid`=14; +INSERT INTO `creature_text` (`entry`,`groupid`,`text`,`type`,`comment`) VALUES (37813,14,'%s''s Blood Beasts gain the scent of blood!',41,'Deathbringer Saurfang - EMOTE_SCENT_OF_BLOOD'); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=72771; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES +(13,3,72771,31,3,38508,'Deathbringer Saurfang - Scent of Blood on Blood Beast'); diff --git a/sql/old/3.3.5a/2012_04_28_00_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_04_28_00_world_reference_loot_template.sql new file mode 100644 index 00000000000..07c53a8f7c9 --- /dev/null +++ b/sql/old/3.3.5a/2012_04_28_00_world_reference_loot_template.sql @@ -0,0 +1,158 @@ +-- The Descent into Madness +-- References +-- ------------------------------- +-- -- Variables and definitions -- +-- ------------------------------- +-- Set References +SET @Vezax10Ref := 34373; +SET @Vezax25Ref := @Vezax10Ref+1; +SET @Yogg10Ref := @Vezax10Ref+2; +SET @Yogg25Ref := @Vezax10Ref+3; +SET @Chest := 12034; +SET @Shoulder := 12035; +SET @EmblemRef := 34349; +SET @Recipe := 34154; +SET @Vezax10 := 33271; +SET @Vezax25 := 33449; +SET @Yogg10 := 33288; +SET @Yogg25 := 33955; + +-- ------------------------- +-- -- Reference Templates -- +-- ------------------------- +-- Delete previous templates if existing +DELETE FROM `reference_loot_template` WHERE `entry` IN (34131,34132,34133,34164,34165); +DELETE FROM `reference_loot_template` WHERE `entry` IN (@Vezax10Ref,@Vezax25Ref,@Yogg10Ref,@Yogg25Ref,@Chest,@Shoulder); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Vezax 10 man +(@Vezax10Ref,46014,0,1,1,1,1), -- Saronite Animus Cloak +(@Vezax10Ref,46008,0,1,1,1,1), -- Choker of the Abyss +(@Vezax10Ref,46010,0,1,1,1,1), -- Darkstone Ring +(@Vezax10Ref,45996,0,1,1,1,1), -- Hoperender +(@Vezax10Ref,46015,0,1,1,1,1), -- Pendant of Endless Despair +(@Vezax10Ref,46013,0,1,1,1,1), -- Underworld Mantle +(@Vezax10Ref,46012,0,1,1,1,1), -- Vestments of the Piercing Light +(@Vezax10Ref,46009,0,1,1,1,1), -- Bindings of the Depths +(@Vezax10Ref,45997,0,1,1,1,1), -- Gauntlets of the Wretched +(@Vezax10Ref,46011,0,1,1,1,1), -- Shadowbite +-- Vezax 25 man +(@Vezax25Ref,45513,0,1,1,1,1), -- Boots of the Forgotten Dephts +(@Vezax25Ref,45509,0,1,1,1,1), -- Idol of the Corruptor +(@Vezax25Ref,45501,0,1,1,1,1), -- Boots of the Underdweller +(@Vezax25Ref,45512,0,1,1,1,1), -- Grips of the Unbroken +(@Vezax25Ref,45503,0,1,1,1,1), -- Metallic Loop of the Sufferer +(@Vezax25Ref,45505,0,1,1,1,1), -- Belt of Clinging Hope +(@Vezax25Ref,45502,0,1,1,1,1), -- Helm of the Faceless +(@Vezax25Ref,45145,0,1,1,1,1), -- Libram of the Sacred Shield +(@Vezax25Ref,45508,0,1,1,1,1), -- Belt of the Darkspeaker +(@Vezax25Ref,45504,0,1,1,1,1), -- Darkcore Leggings +(@Vezax25Ref,45514,0,1,1,1,1), -- Mantle of the Unknowing +(@Vezax25Ref,45515,0,1,1,1,1), -- Ring of the Vacant Eye +(@Vezax25Ref,45507,0,1,1,1,1), -- The General's Heart +-- Yogg 10 man +(@Yogg10Ref,46016,0,1,1,1,1), -- Abaddon +(@Yogg10Ref,46018,0,1,1,1,1), -- Deliverance +(@Yogg10Ref,46019,0,1,1,1,1), -- Leggings of the Insatiable +(@Yogg10Ref,46021,0,1,1,1,1), -- Royal Seal of King Llane +(@Yogg10Ref,46022,0,1,1,1,1), -- Pendant of a Thousand Maws +(@Yogg10Ref,46024,0,1,1,1,1), -- Kingsbane +(@Yogg10Ref,46025,0,1,1,1,1), -- Devotion +(@Yogg10Ref,46028,0,1,1,1,1), -- Faceguard of the Eyeless Horror +(@Yogg10Ref,46030,0,1,1,1,1), -- Threads of the Dragon Council +(@Yogg10Ref,46031,0,1,1,1,1), -- Touch of Madness +-- Yogg 25 man +(@Yogg25Ref,45521,0,1,1,1,1), -- Earthshaper +(@Yogg25Ref,45522,0,1,1,1,1), -- Blood of the Old God +(@Yogg25Ref,45523,0,1,1,1,1), -- Garona's Guise +(@Yogg25Ref,45524,0,1,1,1,1), -- Chestguard of Insidious Intent +(@Yogg25Ref,45525,0,1,1,1,1), -- Godbane Signet +(@Yogg25Ref,45527,0,1,1,1,1), -- Soulscribe +(@Yogg25Ref,45529,0,1,1,1,1), -- Shawl of Haunted Memories +(@Yogg25Ref,45530,0,1,1,1,1), -- Sanity's Bond +(@Yogg25Ref,45531,0,1,1,1,1), -- Chestguard of the Fallen God +(@Yogg25Ref,45532,0,1,1,1,1), -- Cowl of Dark Whispers +-- Chest for Yogg +(@Chest,45635,0,1,1,1,1), -- Chestguard of the Wayward Conqueror +(@Chest,45636,0,1,1,1,1), -- Chestguard of the Wayward Protector +(@Chest,45637,0,1,1,1,1), -- Chestguard of the Wayward Vanquisher +(@Shoulder,45656,0,1,1,1,1), -- Mantle of the Wayward Conqueror +(@Shoulder,45657,0,1,1,1,1), -- Mantle of the Wayward Protector +(@Shoulder,45658,0,1,1,1,1); -- Mantle of the Wayward Vanquisher + +DELETE FROM `creature_loot_template` WHERE `entry` IN(@Vezax10,@Vezax25,@Yogg10,@Yogg25); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ---------------------------------------------------------- +-- General Vezax +-- ---------------------------------------------------------- +-- 10 man mode +(@Vezax10,1,100,3,0,-@Vezax10Ref,2), -- 2x Normal Loot Item +(@Vezax10,47241,100,3,0,1,1), -- 1x Emblem of Triumph +-- hardmode loot 10 +(@Vezax10,46032,0,2,1,1,1), -- Drape of the Faceless General +(@Vezax10,46034,0,2,1,1,1), -- Leggings of Profound Darkness +(@Vezax10,46033,0,2,1,1,1), -- Tortured Earth +(@Vezax10,46035,0,2,1,1,1), -- Aesuga, Hand of the Ardent Champion +(@Vezax10,46036,0,2,1,1,1), -- Void Sabre +-- 25 man mode +(@Vezax25,1,100,3,0,-@Vezax25Ref,3), -- 3x Normal Loot Item +(@Vezax25,47241,100,3,0,1,1), -- 1x Emblem of Triumph +(@Vezax25,2,10,1,0,-@Recipe,1), -- Chance on Recipe +(@Vezax25,3,10,1,0,-34350,1), -- Chance on Runed Orb +-- hardmode loot 25 +(@Vezax25,45498,0,2,1,1,1), -- Lotrafen, Spear of the Damned +(@Vezax25,45511,0,2,1,1,1), -- Scepter of Lost Souls +(@Vezax25,45516,0,2,1,1,1), -- Voldrethar, Dark Blade of Oblivion +(@Vezax25,45517,0,2,1,1,1), -- Pendulum of Infinity +(@Vezax25,45519,0,2,1,1,1), -- Vestments of the Blind Denizen +(@Vezax25,45518,0,2,1,1,1), -- Flare of the Heavens +(@Vezax25,45520,0,2,1,1,1), -- Handwraps of the Vigilant +-- ---------------------------------------------------------- +-- Yogg Saron +-- ---------------------------------------------------------- +-- 10 man +-- All modes +(@Yogg10,1,100,31,0,-@Yogg10Ref,1), -- 1x Normal Loot item for modes 0&1&2&3&4 +(@Yogg10,2,100,31,0,-@Chest,1), -- 1x Tier token for modes 0&1&2&3&4 +(@Yogg10,47241,100,31,0,1,1), -- 1x Emblem of Triumph for modes 0&1&2&3&4 +-- Extra for <3 watchers +(@Yogg10,3,100,30,0,-@EmblemRef,1), -- additional Emblem for modes2&3 +-- Extra for <2 watchers +(@Yogg10,4,100,28,0,-34350,1), -- Runed Orb for 0&1&2 +(@Yogg10,5,10,28,0,-@Recipe,1), -- Chance on Recipe for 0&1&2 +-- Extra for <1 watchers +(@Yogg10,6,100,24,0,-@EmblemRef,1), -- additional Emblem for 0&1 +(@Yogg10,7,100,24,0,-@Recipe,1), -- Garanteed Recipe for 0&1 +-- Hardmode 10 loot +(@Yogg10,46067,0,24,1,1,1), -- Hammer of Crushing Whispers +(@Yogg10,46068,0,24,1,1,1), -- Amice of Inconceivable Horror +(@Yogg10,46095,0,24,1,1,1), -- Soul-Devouring Cinch +(@Yogg10,46096,0,24,1,1,1), -- Signet of Soft Lament +(@Yogg10,46097,0,24,1,1,1), -- Caress of Insanity +-- Extra for 0 watchers +(@Yogg10,46312,100,16,0,1,1), -- Vanquished Clutches of Yogg-Saron +-- 25 man mode +-- All modes +(@Yogg25,1,100,31,0,-@Yogg25Ref,2), -- 2x Normal Loot item for modes 0&1&2&3&4 +(@Yogg25,2,100,31,0,-@Shoulder,2), -- 2x Tier token for modes 0&1&2&3&4 +(@Yogg25,47241,100,31,0,1,1), -- 1x Emblem of Triumph for modes 0&1&2&3&4 +(@Yogg25,3,10,31,0,-34350,1), -- Chance on Runed Orb for modes 0&1&2&3&4 +(@Yogg25,4,10,31,0,-@Recipe,1), -- Chance on Recipe for 0&1&2&3&4 +(@Yogg25,45897,100,31,0,1,1), -- Fragment of Val'anyr +-- Extra for <3 watchers +(@Yogg25,5,100,30,0,-@EmblemRef,1), -- additional Emblem for modes2&3 +-- Extra for <2 watchers +(@Yogg25,6,100,28,0,-34350,1), -- Runed Orb for 0&1&2 +-- Extra for <1 watchers +(@Yogg25,7,100,24,0,-@EmblemRef,1), -- additional Emblem for 0&1 +(@Yogg25,8,100,24,0,-@Recipe,1), -- Garanteed Recipe for 0&1 +-- Hardmode 25 loot +(@Yogg25,45533,0,24,1,1,1), -- Dark Edge of Depravity +(@Yogg25,45534,0,24,1,1,1), -- Seal of the Betrayed King +(@Yogg25,45535,0,24,1,1,1), -- Show of Faith +(@Yogg25,45536,0,24,1,1,1), -- Legguards of Cunning Deception +(@Yogg25,45537,0,24,1,1,1), -- Threads of the False Oracle +-- Extra for 0 watchers +(@Yogg25,45693,100,16,0,1,1); -- Mimiron's Head + +-- Cleanups +DELETE FROM `conditions` WHERE `SourceEntry`=45897 AND `SourceGroup`=33955; diff --git a/sql/old/3.3.5a/2012_04_28_01_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_04_28_01_world_reference_loot_template.sql new file mode 100644 index 00000000000..e46c45e497a --- /dev/null +++ b/sql/old/3.3.5a/2012_04_28_01_world_reference_loot_template.sql @@ -0,0 +1,22 @@ +SET @Triumph :=47241; +-- Cleanup some unneeded references +DELETE FROM `reference_loot_template` WHERE `entry` IN (34167,34168,34169); +UPDATE `creature_loot_template` SET `mincountOrRef`=-34349 WHERE `mincountOrRef` IN (-34167,-34168,-34169); +-- Fix this weird defined reference for ulduar +UPDATE `reference_loot_template` SET `ChanceOrQuestChance`=100,`groupid`=0 WHERE `entry`=34349; +-- Remove Emblem of Triumph from reference_loot +DELETE FROM `reference_loot_template` WHERE `item`=@Triumph AND `entry`IN (12025,35034,35040,35049); +-- Actual Emblem on creature as it should be +DELETE FROM `creature_loot_template` WHERE `entry` IN (30397,30398,31365,31367,31656,31679) AND `item`=@Triumph; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(30397,@Triumph,100,1,0,1,1), -- Commander Kolurg (1) +(30398,@Triumph,100,1,0,1,1), -- Commander Stoutbeard (1) +(31365,@Triumph,100,1,0,1,1), -- Drakkari Colossus (1) +(31367,@Triumph,100,1,0,1,1), -- Drakkari Elemental (1) +(31656,@Triumph,100,1,0,1,1), -- Dalronn the Controller (1) +(31679,@Triumph,100,1,0,1,1); -- Skarvald the Constructor (1) +-- Similar action for gameobjects +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (27416,27417) AND `item`=@Triumph; +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(27417,@Triumph,100,1,0,1,1), -- Confessor's Cache +(27416,@Triumph,100,1,0,1,1); -- Eadric's Cache diff --git a/sql/old/3.3.5a/2012_05_01_00_world_creature.sql b/sql/old/3.3.5a/2012_05_01_00_world_creature.sql new file mode 100644 index 00000000000..c0509d0d132 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_01_00_world_creature.sql @@ -0,0 +1,9 @@ +-- Add missing Challe & Orphan Matron Aria Spawns +SET @GUID := 41876; +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,23101,530,1,1,0,0,-480.4989,7499.029,181.2889,3.560472,120,0,0,1,0,0), +(@GUID+1,34365,571,1,1,0,0,5716.604,642.8611,646.2927,5.88176,120,0,0,1,0,0); +-- Add to game event creature +DELETE FROM `game_event_creature` WHERE `guid`=@GUID+1; +INSERT INTO `game_event_creature` (`eventEntry`,`guid`) VALUES (10,@GUID+1); diff --git a/sql/old/3.3.5a/2012_05_02_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_05_02_00_world_creature_loot_template.sql new file mode 100644 index 00000000000..f0721e63635 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_02_00_world_creature_loot_template.sql @@ -0,0 +1,8 @@ +DELETE FROM `creature_loot_template` WHERE `entry` IN(38064,38103); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Precious 25 man +(38103,1,100,1,0,-35069,2), -- Two From ICC Trashgenerated on Precious +(38103,52019,30,1,0,1,1), -- Precious Ribbon on Precious +(38064,1,100,1,0,-35069,2); -- Two From ICC Trashgenerated on Stinky +-- add skinning loot for Stinky & Precious +UPDATE `creature_template` SET `skinloot`=70214 WHERE `entry` IN (37025,38064,37217,38103); diff --git a/sql/old/3.3.5a/2012_05_03_00_world_creature.sql b/sql/old/3.3.5a/2012_05_03_00_world_creature.sql new file mode 100644 index 00000000000..d906dba78bc --- /dev/null +++ b/sql/old/3.3.5a/2012_05_03_00_world_creature.sql @@ -0,0 +1,29 @@ +SET @GUID1 := 42158; +SET @GUID2 := 42159; +-- add creature +DELETE FROM creature WHERE guid IN (@GUID1,@GUID2); +INSERT INTO `creature` +(`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`) +VALUES +(@GUID1 ,38453,571,1,1,3561.821,-2736.367,136.0317,0), -- Arcturis in Grizzly Hills +(@GUID2,35189,571,1,1,7101.845,-1443.734,924.2609,0.178631); -- Skoll in The Storm Peaks +-- Update template +UPDATE `creature_template` SET `faction_A` = 190, `faction_H`=190 WHERE `entry` IN (38453,35189); +SET @NPC= @GUID1*10; +-- Add pathing for Arcturis +DELETE FROM `creature_addon` WHERE `guid` = @GUID1; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@GUID1,@NPC,0,0,0,0,''); -- Add path for Acturis +-- Add waypoint data for the path: +DELETE FROM `waypoint_data` WHERE `id`=@NPC; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES +(@NPC,1,3563.499,-2737.698,137.1898), +(@NPC,2,3565.249,-2738.698,138.4398), +(@NPC,3,3566.749,-2739.948,139.9398), +(@NPC,4,3568.249,-2740.698,140.6898), +(@NPC,5,3567.839,-2741.380,141.9256), +(@NPC,6,3569.999,-2741.948,142.1898), +(@NPC,7,3570.749,-2742.448,143.1898), +(@NPC,8,3572.676,-2743.528,144.8479); +-- Spawntimefix +UPDATE `creature` SET `spawntimesecs`=39600 WHERE `guid` IN (@GUID1,@GUID2); -- Set the spawntime to 11 hours for Arcturis & Skoll diff --git a/sql/old/3.3.5a/2012_05_03_01_world_cos_misc.sql b/sql/old/3.3.5a/2012_05_03_01_world_cos_misc.sql new file mode 100644 index 00000000000..6c2ea6d3a95 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_03_01_world_cos_misc.sql @@ -0,0 +1,153 @@ +UPDATE `script_texts` SET `emote` = 432 WHERE `entry` IN (-1595111); +UPDATE `script_texts` SET `emote` = 396 WHERE `entry` IN (-1595070,-1595075,-1595078,-1595079,-1595088,-1595103,-1595106,-1595107,-1595108,-1595109,-1595113,-1595114,-1595115,-1595116); +UPDATE `script_texts` SET `emote` = 397 WHERE `entry` IN (-1595071,-1595084,-1595093); +UPDATE `script_texts` SET `emote` = 274 WHERE `entry` IN (-1595091); +UPDATE `script_texts` SET `emote` = 5 WHERE `entry` IN (-1595073,-1595118); +UPDATE `script_texts` SET `emote` = 6 WHERE `entry` IN (-1595076); +UPDATE `script_texts` SET `emote` = 1 WHERE `entry` IN (-1595083,-1595100,-1595104,-1595120); +UPDATE `script_texts` SET `emote` = 0 WHERE `entry` IN (-1595009,-1595010,-1595081,-1595082,-1595085,-1595119); + +UPDATE `script_texts` SET `type` = 1 WHERE `entry` IN (-1595009,-1595010,-1595087,-1595094,-1595095,-1595093); +UPDATE `script_texts` SET `type` = 0 WHERE `entry` IN (-1595077,-1595078,-1595119); + +UPDATE `script_texts` SET `content_default` = "Champions, meet me at the Town Hall at once. We must take the fight to Mal'Ganis." WHERE `entry` = -1595095; +UPDATE `script_texts` SET `content_default` = "Follow me, I know the way through." WHERE `entry` = -1595096; +UPDATE `script_texts` SET `content_default` = "Take position here, and I will lead a small force inside Stratholme to begin the culling. We must contain and purge the infected for the sake of all of Lordaeron!" WHERE entry = -1595087; +UPDATE `script_texts` SET `content_default` = "Ah, you've finally arrived Prince Arthas. You're here just in the nick of time." WHERE `entry` = -1595097; +UPDATE `script_texts` SET `content_default` = "Yes, I'm glad I could get to you before the plague." WHERE `entry` = -1595098; +UPDATE `script_texts` SET `content_default` = "As if I could forget. Listen, Uther, there's something about the plague you should know..." WHERE `entry` = -1595072; +UPDATE `script_texts` SET `content_default` = "There's no need for you to understand, Arthas. All you need to do is die." WHERE `entry` = -1595100; +UPDATE `script_texts` SET `content_default` = "More vile sorcery! Be ready for anything!" WHERE `entry` = -1595102; +UPDATE `script_texts` SET `content_default` = "Watch your backs: they have us surrounded in this hall." WHERE `entry` = -1595104; +UPDATE `script_texts` SET `content_default` = "Mal'Ganis is not making this easy." WHERE `entry` = -1595106; +UPDATE `script_texts` SET `content_default` = "What else can he put in my way?" WHERE `entry` = -1595108; +UPDATE `script_texts` SET `content_default` = "I do what I must for Lordaeron, and neither your words nor your actions will stop me." WHERE `entry` = -1595109; +UPDATE `script_texts` SET `content_default` = "The quickest path to Mal'Ganis lies behind that bookshelf ahead." WHERE `entry` = -1595110; +UPDATE `script_texts` SET `content_default` = "I'm relieved this secret passage still works." WHERE `entry` = -1595112; +UPDATE `script_texts` SET `content_default` = "Let's move through here as quickly as possible. If the undead don't kill us, the fires might." WHERE `entry` = -1595113; +UPDATE `script_texts` SET `content_default` = "Rest a moment and clear your lungs, but we must move again soon." WHERE `entry` = -1595114; +UPDATE `script_texts` SET `content_default` = "That's enough; we must move again. Mal'Ganis awaits." WHERE `entry` = -1595115; +UPDATE `script_texts` SET `content_default` = "At last some good luck. Market Row has not caught fire yet. Mal'Ganis is supposed to be in Crusaders' Square, which is just ahead. Tell me when you're ready to move forward." WHERE `entry` = -1595116; +UPDATE `script_texts` SET `content_default` = "Justice will be done." WHERE `entry` = -1595117; +UPDATE `script_texts` SET `content_default` = "We're going to finish this right now, Mal'Ganis. Just you... and me." WHERE `entry` = -1595118; + +UPDATE `script_texts` SET `comment` = concat(`comment`,". NEEDS VERIFICATION") WHERE `entry` IN (-1595101,-1595105); + +SET @GUID := 88474; +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+00,27737,595,3,1,25543,0,2319.89,1285.78,131.407,1.72169,60,10,0,630,0,1,0,0,0), +(@GUID+01,27737,595,3,1,10979,0,2308.12,1304.21,127.601,4.39662,60,10,0,630,0,1,0,0,0), +(@GUID+02,27737,595,3,1,25542,0,2335.47,1262.04,132.921,1.42079,60,10,0,630,0,1,0,0,0), +(@GUID+03,27737,595,3,1,25543,0,2297.73,1338.75,124.622,2.5574,60,10,0,630,0,1,0,0,0), +(@GUID+04,27737,595,3,1,10979,0,2322.65,1265.39,133.033,5.6524,60,10,0,630,0,1,0,0,0), +(@GUID+05,27737,595,3,1,10973,0,2277.83,1331.92,124.19,3.48045,60,10,0,630,0,1,0,0,0), +(@GUID+06,27737,595,3,1,25543,0,2294.18,1316.93,125.672,6.05649,60,10,0,630,0,1,0,0,0), +(@GUID+07,27737,595,3,1,10973,0,2310.56,1369,128.372,5.03364,60,10,0,630,0,1,0,0,0), +(@GUID+08,27737,595,3,1,10979,0,2306.15,1322.85,125.708,4.99133,60,10,0,630,0,1,0,0,0), +(@GUID+09,27737,595,3,1,10973,0,2320.14,1297.48,129.694,1.35248,60,10,0,630,0,1,0,0,0), +(@GUID+10,27737,595,3,1,25542,0,2291.57,1327.27,124.545,5.32358,60,10,0,630,0,1,0,0,0), +(@GUID+11,27737,595,3,1,25542,0,2308.04,1352.65,126.907,5.83741,60,10,0,630,0,1,0,0,0), +(@GUID+12,27737,595,3,1,10979,0,2329.44,1281.11,132.636,2.25207,60,10,0,630,0,1,0,0,0), +(@GUID+13,27737,595,3,1,0,0,2407.32,1423.8,131.522,6.24743,60,10,0,706,0,1,0,0,0), +(@GUID+14,27737,595,3,1,0,0,2417.26,1428.41,131.652,6.20423,60,10,0,730,0,1,0,0,0), +(@GUID+15,27737,595,3,1,0,0,2420.48,1419.99,130.716,0.0977616,60,10,0,706,0,1,0,0,0), +(@GUID+16,27737,595,3,1,0,0,2426.63,1413.41,130.464,0.404064,60,10,0,730,0,1,0,0,0), +(@GUID+17,27737,595,3,1,0,0,2430.46,1417.6,130.557,0.125247,60,10,0,730,0,1,0,0,0), +(@GUID+18,27737,595,3,1,0,0,2433.94,1427.03,131.18,0.0584885,60,10,0,706,0,1,0,0,0), +(@GUID+19,27737,595,3,1,0,0,2446.5,1428.37,131.013,6.10606,60,10,0,756,0,1,0,0,0), +(@GUID+20,27737,595,3,1,0,0,2449.49,1423.35,130.588,5.77619,60,10,0,706,0,1,0,0,0), +(@GUID+21,27737,595,3,1,0,0,2441.92,1424.41,130.606,6.07857,60,10,0,706,0,1,0,0,0), +(@GUID+22,27737,595,3,1,0,0,2450.6,1438.61,132.213,4.74889,60,10,0,730,0,1,0,0,0), +(@GUID+23,27737,595,3,1,0,0,2460.17,1436.46,131.501,4.73711,60,10,0,756,0,1,0,0,0), +(@GUID+24,27737,595,3,1,0,0,2444.68,1421.68,130.324,6.01338,60,10,0,756,0,1,0,0,0), +(@GUID+25,27737,595,3,1,0,0,2456.87,1419.07,130.488,5.39763,60,10,0,706,0,1,0,0,0), +(@GUID+26,27737,595,3,1,0,0,2464.27,1422.15,130.976,5.22092,60,10,0,756,0,1,0,0,0), +(@GUID+27,27737,595,3,1,0,0,2468.21,1403.06,130.39,5.6364,60,10,0,756,0,1,0,0,0), +(@GUID+28,27737,595,3,1,0,0,2460.88,1406.8,130.508,5.96234,60,10,0,756,0,1,0,0,0), +(@GUID+29,27737,595,3,1,0,0,2485.77,1398.35,130.795,4.71591,60,10,0,756,0,1,0,0,0), +(@GUID+30,27737,595,3,1,0,0,2485.79,1380.46,130.15,5.02928,60,10,0,730,0,1,0,0,0), +(@GUID+31,27737,595,3,1,0,0,2475.77,1396.31,130.124,4.84079,60,10,0,730,0,1,0,0,0), +(@GUID+32,27737,595,3,1,0,0,2476.92,1387.21,129.401,5.05128,60,10,0,730,0,1,0,0,0), +(@GUID+33,27737,595,3,1,0,0,2483.24,1389.37,130.123,4.74104,60,10,0,730,0,1,0,0,0), +(@GUID+34,27737,595,3,1,0,0,2480.2,1370.15,129.533,5.79583,60,10,0,706,0,1,0,0,0), +(@GUID+35,27737,595,3,1,0,0,2481.54,1375.11,129.642,5.4644,60,10,0,730,0,1,0,0,0), +(@GUID+36,27737,595,3,1,0,0,2489.44,1359.42,131.233,5.378,60,10,0,730,0,1,0,0,0), +(@GUID+37,27737,595,3,1,0,0,2486.59,1356.19,131.876,5.7275,60,10,0,756,0,1,0,0,0), +(@GUID+38,27737,595,3,1,0,0,2495.53,1348.61,133.072,5.52722,60,10,0,730,0,1,0,0,0), +(@GUID+39,27737,595,3,1,0,0,2504.48,1349.65,132.856,5.11881,60,10,0,730,0,1,0,0,0), +(@GUID+40,27737,595,3,1,0,0,2493.11,1380.29,130.24,4.93189,60,10,0,706,0,1,0,0,0), +(@GUID+41,27737,595,3,1,0,0,2487.18,1392.64,130.512,4.93818,60,10,0,706,0,1,0,0,0), +(@GUID+42,27737,595,3,1,0,0,2506.49,1336.89,132.794,5.19343,60,10,0,756,0,1,0,0,0), +(@GUID+43,27737,595,3,1,0,0,2518.2,1306.39,130.623,4.81723,60,10,0,756,0,1,0,0,0), +(@GUID+44,27737,595,3,1,0,0,2513.4,1299.67,130.868,4.4206,60,10,0,756,0,1,0,0,0), +(@GUID+45,27737,595,3,1,0,0,2511.45,1291.47,130.808,5.00729,60,10,0,756,0,1,0,0,0), +(@GUID+46,27737,595,3,1,0,0,2518.56,1292.32,130.528,5.16438,60,10,0,756,0,1,0,0,0), +(@GUID+47,27737,595,3,1,0,0,2515.49,1279.85,129.214,5.28847,60,10,0,730,0,1,0,0,0), +(@GUID+48,27737,595,3,1,0,0,2514.37,1285.92,129.934,5.70473,60,10,0,706,0,1,0,0,0), +(@GUID+49,27737,595,3,1,0,0,2522.65,1274.29,128.576,5.44634,60,10,0,706,0,1,0,0,0), +(@GUID+50,27737,595,3,1,0,0,2535.38,1275.77,127.42,5.49817,60,10,0,756,0,1,0,0,0), +(@GUID+51,27737,595,3,1,0,0,2537.59,1273.1,127.05,5.02693,60,10,0,730,0,1,0,0,0), +(@GUID+52,27737,595,3,1,0,0,2547.49,1261.7,126.44,4.78425,60,10,0,730,0,1,0,0,0), +(@GUID+53,27737,595,3,1,0,0,2534.36,1261.06,127.125,4.3994,60,10,0,756,0,1,0,0,0), +(@GUID+54,27737,595,3,1,0,0,2532.69,1251.44,127.452,5.4479,60,10,0,730,0,1,0,0,0), +(@GUID+55,27737,595,3,1,0,0,2551.84,1252.35,125.455,5.04342,60,10,0,706,0,1,0,0,0), +(@GUID+56,27737,595,3,1,0,0,2536.1,1244,126.928,5.16515,60,10,0,756,0,1,0,0,0), +(@GUID+57,27737,595,3,1,0,0,2543.63,1247.23,126.131,5.19735,60,10,0,706,0,1,0,0,0), +(@GUID+58,27737,595,3,1,0,0,2554.21,1238.95,125.475,4.64836,60,10,0,730,0,1,0,0,0), +(@GUID+59,27737,595,3,1,0,0,2548.89,1227.37,126.375,5.31517,60,10,0,756,0,1,0,0,0), +(@GUID+60,27737,595,3,1,0,0,2560.46,1225.4,125.496,4.85335,60,10,0,706,0,1,0,0,0), +(@GUID+61,27737,595,3,1,0,0,2555.11,1218.55,125.944,5.11646,60,10,0,730,0,1,0,0,0), +(@GUID+62,27737,595,3,1,0,0,2561.91,1211.56,125.38,5.5877,60,10,0,730,0,1,0,0,0), +(@GUID+63,27737,595,3,1,0,0,2568.67,1202.96,125.509,4.96095,60,10,0,756,0,1,0,0,0), +(@GUID+64,27737,595,3,1,0,0,2571.93,1193.48,125.619,5.07641,60,10,0,756,0,1,0,0,0), +(@GUID+65,27737,595,3,1,0,0,2577.77,1180.88,125.562,4.64522,60,10,0,756,0,1,0,0,0), +(@GUID+66,27737,595,3,1,0,0,2574.2,1166.63,126.089,4.44966,60,10,0,706,0,1,0,0,0), +(@GUID+67,27737,595,3,1,0,0,2564.78,1166.82,127.092,4.2266,60,10,0,756,0,1,0,0,0), +(@GUID+68,27737,595,3,1,0,0,2577.56,1158.41,126.385,4.07738,60,10,0,756,0,1,0,0,0), +(@GUID+69,27737,595,3,1,0,0,2567.93,1176.56,126.2,4.7489,60,10,0,706,0,1,0,0,0), +(@GUID+70,27737,595,3,1,0,0,2559.28,1189.46,126.642,4.73319,60,10,0,756,0,1,0,0,0), +(@GUID+71,27737,595,3,1,0,0,2554.14,1213.37,126.599,5.13845,60,10,0,706,0,1,0,0,0), +(@GUID+72,27737,595,3,1,0,0,2560.58,1218.48,125.281,4.97351,60,10,0,730,0,1,0,0,0), +(@GUID+73,27737,595,3,1,0,0,2570.2,1170.58,126.311,4.64365,60,10,0,756,0,1,0,0,0), +(@GUID+74,27729,595,3,1,0,0,2496.57,1354.66,132.217,5.13691,120,5,0,63000,0,1,0,0,0), +(@GUID+75,27729,595,3,1,0,0,2494.22,1365.17,130.812,5.15654,120,5,0,63000,0,1,0,0,0), +(@GUID+76,27729,595,3,1,0,0,2440.41,1434.46,131.456,5.69372,120,5,0,63000,0,1,0,0,0), +(@GUID+77,27729,595,3,1,0,0,2433.18,1421.13,130.644,0.046706,120,5,0,63000,0,1,0,0,0), +(@GUID+78,27734,595,3,1,0,0,2546.07,1239.17,125.945,5.07801,120,5,0,63000,0,1,0,0,0), +(@GUID+79,27734,595,3,1,0,0,2458.58,1426.22,131.056,5.42984,120,5,0,63000,0,1,0,0,0), +(@GUID+80,27736,595,3,1,0,0,2488.11,1364.91,130.402,5.35524,120,5,0,130330,0,1,0,0,0), +(@GUID+81,28199,595,3,1,0,0,2527.63,1267.59,128.168,5.12906,120,5,0,63000,0,1,0,0,0), +(@GUID+82,28199,595,3,1,0,0,2528.06,1284.34,128.877,5.14869,120,5,0,63000,0,1,0,0,0), +(@GUID+83,28199,595,3,1,0,0,2466.27,1414.57,130.977,5.18637,120,5,0,63000,0,1,0,0,0), +(@GUID+84,28200,595,3,1,0,0,2570.51,1181.4,125.809,4.61855,120,5,0,50400,44070,1,0,0,0), +(@GUID+85,28200,595,3,1,0,0,2560.45,1202.05,126.031,4.85417,120,5,0,50400,44070,1,0,0,0), +(@GUID+86,28200,595,3,1,0,0,2487.85,1373.29,130.236,5.078,120,5,0,50400,44070,1,0,0,0), +(@GUID+87,28200,595,3,1,0,0,2416.7,1416.52,130.379,0.191224,120,5,0,50400,44070,1,0,0,0), +(@GUID+88,28200,595,3,1,0,0,2424.42,1422.68,130.868,0.25327,120,5,0,50400,44070,1,0,0,0), +(@GUID+89,28201,595,3,1,0,0,2540.67,1254.82,126.274,4.97198,120,5,0,130330,0,1,0,0,0), +(@GUID+90,28201,595,3,1,0,0,2410.03,1417.19,130.577,0.191229,120,5,0,130330,0,1,0,0,0), +(@GUID+91,28249,595,3,1,0,0,2562.66,1177.9,126.716,4.77171,120,5,0,63000,0,1,0,0,0), +(@GUID+92,28249,595,3,1,0,0,2566.72,1190.41,125.837,4.7992,120,5,0,63000,0,1,0,0,0), +(@GUID+93,28249,595,3,1,0,0,2472.34,1404.76,130.752,5.20601,120,5,0,63000,0,1,0,0,0), +(@GUID+94,28249,595,3,1,0,0,2460.59,1413.26,130.46,5.4377,120,5,0,63000,0,1,0,0,0), +(@GUID+95,28249,595,3,1,0,0,2415.04,1423.52,131.111,0.214785,120,5,0,63000,0,1,0,0,0); + +DELETE FROM `script_texts` WHERE entry BETWEEN -1595052 AND -1595048; +INSERT INTO `script_texts` (npc_entry,entry, content_default, comment) VALUES +(27913,-1595048, "Scourge forces have been spotted near the Elder's Square Gate!","Spawns near elder's square gate."), +(27913,-1595059, "Scourge forces have been spotted near the Town Hall!","Spawns near town hall."), +(27913,-1595050, "Scourge forces have been spotted near the King's Square fountain!","Spawns near king's square."), +(27913,-1595051, "Scourge forces have been spotted near the Market Row Gate!", "Spawns near market row gate."), +(27913,-1595052, "Scourge forces have been spotted near the Festival Lane Gate!", "Spawns near festval lane gate."); + +UPDATE `creature_template` SET `dynamicflags` = 0 WHERE `entry` IN (32273,32313); +UPDATE `areatrigger_teleport` SET id = 5181 WHERE id = 5148; +UPDATE `creature_template` SET `flags_extra` = 128 WHERE `entry` = 20562; +UPDATE `script_waypoint` SET location_x = 2449.32, location_y = 1191.09 WHERE entry = 26499 AND pointid = 26; + +UPDATE `creature_template` SET `lootid` = 32273 WHERE `entry` IN (32273, 32313); + +-- thx warpten (fix for credit spell) +UPDATE `spell_dbc` SET `Attributes` = '8388992', `AttributesEx2` = '5', `AttributesEx3` = '269484288' WHERE `Id` = 58630; diff --git a/sql/old/3.3.5a/2012_05_03_02_world_quest_template.sql b/sql/old/3.3.5a/2012_05_03_02_world_quest_template.sql new file mode 100644 index 00000000000..49953bd2166 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_03_02_world_quest_template.sql @@ -0,0 +1,28 @@ +-- Wolvar Orphan quest order +UPDATE `quest_template` SET `prevquestid`=13927,`exclusivegroup`=-13930 WHERE `id` IN (13930,13934,13951); +UPDATE `quest_template` SET `prevquestid`=13930,`exclusivegroup`=-13955 WHERE `id` IN (13955,13957); +UPDATE `quest_template` SET `prevquestid`=13955,`exclusivegroup`=0 WHERE `id`=13938; +UPDATE `quest_template` SET `prevquestid`=13938,`exclusivegroup`=0 WHERE `id`=13960; +-- Oracle Orphan quest order +UPDATE `quest_template` SET `prevquestid`=13926,`exclusivegroup`=-13929 WHERE `id` IN (13929,13933,13950); +UPDATE `quest_template` SET `prevquestid`=13929,`exclusivegroup`=-13954 WHERE `id` IN (13954,13956); +UPDATE `quest_template` SET `prevquestid`=13954,`exclusivegroup`=0 WHERE `id`=13937; +UPDATE `quest_template` SET `prevquestid`=13937,`exclusivegroup`=0 WHERE `id`=13959; +-- Human Orphan quest order +UPDATE `quest_template` SET `prevquestid`=1468,`exclusivegroup`=-1479 WHERE `id` IN (1479,1558,1687); +UPDATE `quest_template` SET `prevquestid`=1479,`exclusivegroup`=-558 WHERE `id` IN (558,4822); +UPDATE `quest_template` SET `prevquestid`=558,`exclusivegroup`=0 WHERE `id`=171; +-- Orcish Orphan quest order +UPDATE `quest_template` SET `prevquestid`=172,`exclusivegroup`=-910 WHERE `id` IN (910,911,1800); +UPDATE `quest_template` SET `prevquestid`=910,`exclusivegroup`=-915 WHERE `id` IN (915,925); +UPDATE `quest_template` SET `prevquestid`=915,`exclusivegroup`=0 WHERE `id`=5502; +-- Draenei Orphan quest order +UPDATE `quest_template` SET `prevquestid`=10943,`exclusivegroup`=-10950 WHERE `id` IN (10950,10952,10954); +UPDATE `quest_template` SET `prevquestid`=10950,`exclusivegroup`=-10956 WHERE `id` IN (10956,10962); +UPDATE `quest_template` SET `NextQuestIdChain`=10968 WHERE `id`=10956; +UPDATE `quest_template` SET `prevquestid`=10968,`exclusivegroup`=0 WHERE `id`=10966; +-- Blood Elf Orphan quest order +UPDATE `quest_template` SET `prevquestid`=10942,`exclusivegroup`=-10945 WHERE `id` IN (10945,10951,10953); +UPDATE `quest_template` SET `prevquestid`=10945,`exclusivegroup`=-10960 WHERE `id` IN (10960,10963); +UPDATE `quest_template` SET `prevquestid`=10960,`exclusivegroup`=0 WHERE `id`=11975; +UPDATE `quest_template` SET `prevquestid`=11975,`exclusivegroup`=0 WHERE `id`=10967; diff --git a/sql/old/3.3.5a/2012_05_03_03_world_creature_questrelation.sql b/sql/old/3.3.5a/2012_05_03_03_world_creature_questrelation.sql new file mode 100644 index 00000000000..1da4f6d29ad --- /dev/null +++ b/sql/old/3.3.5a/2012_05_03_03_world_creature_questrelation.sql @@ -0,0 +1,2 @@ +-- Set correct NPC for A Warden of the Alliance +UPDATE `creature_questrelation` SET `id`=14305 WHERE `quest`=171; diff --git a/sql/old/3.3.5a/2012_05_03_04_world_game_event_creature_quest.sql b/sql/old/3.3.5a/2012_05_03_04_world_game_event_creature_quest.sql new file mode 100644 index 00000000000..62fd4415549 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_03_04_world_game_event_creature_quest.sql @@ -0,0 +1,57 @@ +DELETE FROM `creature_questrelation` WHERE `id` IN (14305,14444,22817,22818,33532,33533,34365); +DELETE FROM `game_event_creature_quest` WHERE `eventEntry`=10; +INSERT INTO `game_event_creature_quest` (`eventEntry`,`id`,`quest`) VALUES +-- Alliance +(10,14450,1468), -- Orphan Matron Nightingale - Children's Week +(10,14305,1479), -- Human Orphan - The Bough of the Eternals +(10,14305,1558), -- Human Orphan - The Stonewrought Dam +(10,14305,1687), -- Human Orphan - Spooky Lighthouse +(10,14305,558), -- Human Orphan - Jaina's Autograph +(10,14305,4822), -- Human Orphan - You Scream, I Scream... +-- Horde +(10,14451,172), -- Orphan Matron Battlewail - Children's Week +(10,14444,910), -- Orcish Orphan - Down at the Docks +(10,14444,911), -- Orcish Orphan - Gateway to the Frontier +(10,14444,1800), -- Orcish Orphan - Lordaeron Throne Room +(10,14444,915), -- Orcish Orphan - You Scream, I Scream... +(10,14444,925), -- Orcish Orphan - Cairne's Hoofprint +(10,14444,5502), -- Orcish Orphan - A Warden of the Horde +-- Outlands: Blood Elfs +(10,22819,10942), -- Orphan Matron Mercy - Children's Week +(10,22817,10945), -- Blood Elf Orphan - Hch'uu and the Mushroom People +(10,22817,10951), -- Blood Elf Orphan - A Trip to the Dark Portal +(10,22817,10953), -- Blood Elf Orphan - Visit the Throne of the Elements +(10,22817,11975), -- Blood Elf Orphan - Now, When I Grow Up... +(10,22817,10963), -- Blood Elf Orphan - Time to Visit the Caverns +(10,22817,10967), -- Blood Elf Orphan - Back to the Orphanage +-- Outlands: Draenei +(10,22819,10943), -- Orphan Matron Mercy - Children's Week +(10,22818,10950), -- Draenei Orphan - Auchindoun and the Ring of Observance +(10,22818,10952), -- Draenei Orphan - A Trip to the Dark Portal +(10,22818,10954), -- Draenei Orphan - Jheel is at Aeris Landing! +(10,22818,10956), -- Draenei Orphan - The Seat of the Naaru +(10,22818,10962), -- Draenei Orphan - Time to Visit the Caverns +(10,22818,10966), -- Draenei Orphan - Back to the Orphanage +-- Northrend: Wolvar +(10,34365,13927), -- Orphan Matron Aria - Little Orphan Kekek Of The Wolvar +(10,33532,13930), -- Wolvar Orphan - Home Of The Bear-Men +(10,33532,13934), -- Wolvar Orphan - The Bronze Dragonshrine +(10,33532,13951), -- Wolvar Orphan - Playmates! +(10,33532,13955), -- Wolvar Orphan - The Dragon Queen +(10,33532,13957), -- Wolvar Orphan - The Mighty Hemet Nesingwary +(10,33532,13960), -- Wolvar Orphan - Back To The Orphanage +-- Northrend: Oracles +(10,34365,13926), -- Orphan Matron Aria - Little Orphan Roo Of The Oracles +(10,33533,13929), -- Oracle Orphan - The Biggest Tree Ever! +(10,33533,13933), -- Oracle Orphan - The Bronze Dragonshrine +(10,33533,13937), -- Oracle Orphan - A Trip To The Wonderworks +(10,33533,13950), -- Oracle Orphan - Playmates! +(10,33533,13954), -- Oracle Orphan - The Dragon Queen +(10,33533,13956), -- Oracle Orphan - Meeting a Great One +(10,33533,13959); -- Oracle Orphan - Back To The Orphanage + +-- Removed "When I Grow Up..." and replace it with "Now, When I Grow Up..." +UPDATE `quest_template` SET `prevquestid`=10945,`exclusivegroup`=-11975 WHERE `id` IN (11975,10963); +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=10960; +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,10960,0,'','','Deprecated quest: When I grow up...'); diff --git a/sql/old/3.3.5a/2012_05_04_00_world_waypoints.sql b/sql/old/3.3.5a/2012_05_04_00_world_waypoints.sql new file mode 100644 index 00000000000..a07bde59d49 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_04_00_world_waypoints.sql @@ -0,0 +1,137 @@ +-- Thrallmar Grunt pathing +SET @NPC := 57505; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=168.3949,`position_y`=2641.357,`position_z`=86.32077 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,168.3949,2641.357,86.32077,0,0,0,100,0), +(@PATH,2,186.5067,2615.882,87.28357,0,0,0,100,0), +(@PATH,3,188.9113,2601.655,87.28357,0,0,0,100,0), +(@PATH,4,198.3909,2602.661,87.28357,0,0,0,100,0), +(@PATH,5,201.5686,2609.845,87.28357,0,0,0,100,0), +(@PATH,6,187.2484,2616.44,87.28357,0,0,0,100,0), +(@PATH,7,168.7871,2641.268,86.32077,0,0,0,100,0), +(@PATH,8,155.2003,2681.998,84.82113,0,0,0,100,0), +(@PATH,9,194.6133,2692.07,90.61374,0,0,0,100,0), +(@PATH,10,215.4427,2693.589,90.69872,0,0,0,100,0), +(@PATH,11,219.0203,2692.25,90.69665,0,0,0,100,0), +(@PATH,12,225.5117,2680.063,90.68996,0,0,0,100,0), +(@PATH,13,235.309,2679.308,90.69373,0,0,0,100,0), +(@PATH,14,246.9184,2682.646,90.70419,0,0,0,100,0), +(@PATH,15,252.4411,2688.479,90.70386,0,0,0,100,0), +(@PATH,16,255.0155,2699.197,90.70283,0,0,0,100,0), +(@PATH,17,251.5234,2707.998,90.70486,0,0,0,100,0), +(@PATH,18,243.2346,2712.791,90.70392,0,0,0,100,0), +(@PATH,19,231.9871,2713.626,90.70399,0,0,0,100,0), +(@PATH,20,221.1457,2709.591,90.69753,0,0,0,100,0), +(@PATH,21,218.8803,2695.845,90.69318,0,0,0,100,0), +(@PATH,22,215.4517,2693.612,90.69869,0,0,0,100,0), +(@PATH,23,194.7944,2692.039,90.65273,0,0,0,100,0), +(@PATH,24,175.8115,2687.591,86.68189,0,0,0,100,0), +(@PATH,25,155.2143,2682.375,84.82113,0,0,0,100,0), +(@PATH,26,131.8727,2679.832,84.56969,0,0,0,100,0), +(@PATH,27,130.0859,2666.262,84.1262,0,0,0,100,0), +(@PATH,28,153.1291,2650.22,86.15128,0,0,0,100,0); + +-- Remove dup Thrallmar Grunt spawn +DELETE FROM `creature` WHERE `guid`=57532; +DELETE FROM `creature_addon` WHERE `guid`=57532; + +-- Bat Rider Guard pathing +SET @NPC := 54840; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=156.9029,`position_y`=2554.784,`position_z`=170.8949 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,156.9029,2554.784,170.8949,0,0,0,100,0), +(@PATH,2,52.51677,2602.816,139.7838,0,0,0,100,0), +(@PATH,3,42.10146,2627.056,139.7838,0,0,0,100,0), +(@PATH,4,37.17329,2663.729,139.7838,0,0,0,100,0), +(@PATH,5,62.91933,2687.96,139.7838,0,0,0,100,0), +(@PATH,6,96.1871,2688.141,148.4226,0,0,0,100,0), +(@PATH,7,129.818,2690.786,151.256,0,0,0,100,0), +(@PATH,8,165.6888,2715.398,170.8949,0,0,0,100,0), +(@PATH,9,199.7751,2744.93,170.8949,0,0,0,100,0), +(@PATH,10,246.0857,2761.154,170.8949,0,0,0,100,0), +(@PATH,11,295.0904,2757.991,170.8949,0,0,0,100,0), +(@PATH,12,309.3468,2726.089,170.8949,0,0,0,100,0), +(@PATH,13,303.8448,2682.588,170.8949,0,0,0,100,0), +(@PATH,14,289.3104,2650.866,170.8949,0,0,0,100,0), +(@PATH,15,261.2743,2618.831,170.8949,0,0,0,100,0), +(@PATH,16,233.6436,2578.997,170.8949,0,0,0,100,0), +(@PATH,17,199.3375,2546.226,170.8949,0,0,0,100,0); + +-- Bat Rider Guard pathing +SET @NPC := 54841; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=65.97776,`position_y`=2661.205,`position_z`=163.6752 WHERE `guid`=@NPC; +UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,65.97776,2661.205,163.6752,0,0,0,100,0), +(@PATH,2,85.52612,2668.312,163.6752,0,0,0,100,0), +(@PATH,3,119.9537,2689.26,163.6752,0,0,0,100,0), +(@PATH,4,121.8238,2721.88,163.6752,0,0,0,100,0), +(@PATH,5,142.6907,2750.891,163.6752,0,0,0,100,0), +(@PATH,6,149.9812,2788.504,163.6752,0,0,0,100,0), +(@PATH,7,142.9353,2830.464,163.6752,0,0,0,100,0), +(@PATH,8,115.1711,2822.444,163.6752,0,0,0,100,0), +(@PATH,9,57.16672,2791.644,163.6752,0,0,0,100,0), +(@PATH,10,38.80463,2758.823,163.6752,0,0,0,100,0), +(@PATH,11,19.69282,2714.784,163.6752,0,0,0,100,0), +(@PATH,12,23.22027,2677.714,163.6752,0,0,0,100,0); + +-- Bat Rider Guard pathing +SET @NPC := 54842; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=263.5968,`position_y`=2694.818,`position_z`=169.7312 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,4097); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,263.5968,2694.818,169.7312,0,0,0,100,0), +(@PATH,2,184.0861,2784.899,154.4534,0,0,0,100,0), +(@PATH,3,154.2815,2754.787,154.3701,0,0,0,100,0), +(@PATH,4,127.0308,2740.488,154.3701,0,0,0,100,0), +(@PATH,5,118.0444,2706.509,154.3701,0,0,0,100,0), +(@PATH,6,115.7577,2669.386,158.6756,0,0,0,100,0), +(@PATH,7,131.4314,2622.531,162.1478,0,0,0,100,0), +(@PATH,8,154.8241,2607.207,164.4812,0,0,0,100,0), +(@PATH,9,176.3283,2571.343,168.5645,0,0,0,100,0), +(@PATH,10,221.6267,2559.683,172.1201,0,0,0,100,0), +(@PATH,11,245.392,2593.423,169.8978,0,0,0,100,0), +(@PATH,12,251.0069,2617.749,169.7312,0,0,0,100,0), +(@PATH,13,263.0581,2644.614,169.7312,0,0,0,100,0); + +-- Bat Rider Guard pathing +SET @NPC := 54843; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=62.42025,`position_y`=2785.719,`position_z`=192.1124 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,4097); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,62.42025,2785.719,192.1124,0,0,0,100,0), +(@PATH,2,159.9371,2842.977,208.279,0,0,0,100,0), +(@PATH,3,183.0578,2845.035,208.279,0,0,0,100,0), +(@PATH,4,211.2432,2864.757,214.2235,0,0,0,100,0), +(@PATH,5,238.1182,2871.979,220.9457,0,0,0,100,0), +(@PATH,6,252.9173,2853.913,220.9457,0,0,0,100,0), +(@PATH,7,255.0203,2812.634,220.9457,0,0,0,100,0), +(@PATH,8,240.4993,2780.929,220.9457,0,0,0,100,0), +(@PATH,9,195.4901,2773.965,209.3901,0,0,0,100,0), +(@PATH,10,162.1341,2742.294,212.9179,0,0,0,100,0), +(@PATH,11,125.4935,2720.611,197.9457,0,0,0,100,0), +(@PATH,12,93.49241,2699.757,192.1124,0,0,0,100,0), +(@PATH,13,58.35324,2681.49,192.1124,0,0,0,100,0), +(@PATH,14,22.8833,2715.123,192.1124,0,0,0,100,0), +(@PATH,15,30.10514,2764.5,192.1124,0,0,0,100,0); + +-- Fix Bat Rider Guard InhabitType +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=15242; + +-- Remove dup Bat Rider Guard spawns +DELETE FROM `creature` WHERE `guid` IN (54839,54844,54845); +DELETE FROM `creature_addon` WHERE `guid` IN (54839,54844,54845); diff --git a/sql/old/3.3.5a/2012_05_04_01_world_sai.sql b/sql/old/3.3.5a/2012_05_04_01_world_sai.sql new file mode 100644 index 00000000000..7021fc92548 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_04_01_world_sai.sql @@ -0,0 +1,32 @@ +-- Speech by Martik Tor'seldoi, Thrallmar +SET @ENTRY := 16577; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; +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,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldoi - OOC - Load script every 6 min ooc'), +(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,18100,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldoi - Reset - Cast Frost Armor'), +(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 0'), +(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), +(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), +(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 0'), +(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim emote'), +(@ENTRY*100,9,5,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Martik Tor''seldoi turn to'), +(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 1'), +(@ENTRY*100,9,7,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 1'), +(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 2'), +(@ENTRY*100,9,9,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), +(@ENTRY*100,9,10,0,0,0,100,0,3000,3000,0,0,5,273,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), +(@ENTRY*100,9,11,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 2'), +(@ENTRY*100,9,12,0,0,0,100,0,1000,1000,0,0,5,15,0,0,0,0,0,9,16578,0,20,0,0,0,0,'Blood Elf Pilgrim emote'), +(@ENTRY*100,9,13,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi turn to'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry` IN (16577,16578); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(16577,0,0, 'Brothers and sisters, I have been to the promised land. I have tasted in the sublim energy. I have felt bliss - bliss so engrossing and all encompassing that I was left wondering if I had stumbled upon the dreams of gods.!',12,0,100,5,0,0, 'Martik Tor''seldoi'), +(16577,1,0, 'In paradise, you merely reach out and take from the Nether.',12,0,100,1,0,0, 'Martik Tor''seldoi'), +(16577,2,0, 'From the very air! Tendrils of arcane energy light up the obsidian sky as plumes of raw magic rise up from fissures in the land. Kneel and drink from the fissure as you do from a stream or well. Pluck a tendril from the heavens as if it were an apple hanging from a branch.',12,0,100,5,0,0, 'Martik Tor''seldoi'), +(16578,0,0, 'Tell us more, Martik. What is it? What does it feel like?',12,0,100,1,0,0, 'Blood Elf Pilgrim'), +(16578,1,0, 'But how?',12,0,100,6,0,0, 'Blood Elf Pilgrim'), +(16578,2,0, '%s smiles/gasps.',16,0,100,0,0,0, 'Blood Elf Pilgrim'); diff --git a/sql/old/3.3.5a/2012_05_05_00_world_sai.sql b/sql/old/3.3.5a/2012_05_05_00_world_sai.sql new file mode 100644 index 00000000000..e03c36337af --- /dev/null +++ b/sql/old/3.3.5a/2012_05_05_00_world_sai.sql @@ -0,0 +1,205 @@ +-- Forge of Souls Trash update + +-- Npc Updates + +-- Spiteful Apparition +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36551; +UPDATE `creature` SET `spawndist`=20,`MovementType`=1,`curhealth`=1,`curmana`=0 WHERE `id`=36551; +DELETE FROM `creature_template_addon` WHERE `entry`=36551; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (36551,1, '69105 69136'); +-- Spiteful Apparition (Ambient) +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36967; +UPDATE `creature` SET `spawndist`=20,`MovementType`=1,`curhealth`=1,`curmana`=0 WHERE `id`=36967; +DELETE FROM `creature_template_addon` WHERE `entry`=36967; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (36967,1, '69663 69658'); +-- Spectral Warden +UPDATE `creature_addon` SET `auras`='69144' WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=36666); + +-- SAI Updates + +-- Spiteful Apparition SAI +SET @ENTRY := 36551; -- NPC entry +SET @SPELL1 := 41253; -- Greater Invisibility +SET @SPELL2 := 68895; -- Spite (Normal) +SET @SPELL3 := 70212; -- Spite (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,25,0,100,6,0,0,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Spiteful Apparition - On Reset - Cast Greater Invisibility'), +(@ENTRY,0,1,0,10,0,100,6,0,10,3000,4000,28,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Spiteful Apparition - OOC range - Remove Greater Invisibility'), +(@ENTRY,0,2,0,0,0,100,2,7000,9000,7000,9000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spiteful Apparition - Combat - Cast Spite "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,7000,9000,7000,9000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spiteful Apparition - Combat - Cast Spite "Heroic"'); + +-- Soulguard Reaper SAI +SET @ENTRY := 36499; -- NPC entry +SET @SPELL1 := 68797; -- Soulguard Channel +SET @SPELL2 := 69058; -- Shadow Lance +SET @SPELL3 := 69060; -- Frost Nova (Normal) +SET @SPELL4 := 70209; -- Frost Nova (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,0,0,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Reaper - OOC - Cast Soulguard Channel'), +(@ENTRY,0,1,0,0,0,100,6,5000,6000,7000,9000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Shadow Lance'), +(@ENTRY,0,2,0,0,0,100,2,7000,9000,8000,10000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Frost Nova "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,7000,9000,8000,10000,11,@SPELL4,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Frost Nova "Heroic"'), +(@ENTRY,0,4,0,4,0,100,6,0,0,0,0,39,30,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Reaper - Aggro - Call for help'); + +-- Soulguard Beam Focus Target +SET @ENTRY := 36508; -- NPC entry +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-201770,-201785,-201741); +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 +(-201770,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), +(-201785,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), +(-201741,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), +(-201741,0,1,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36564,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Bonecaster'); + +-- Spectral Warden SAI +SET @ENTRY := 36666; -- NPC entry +SET @SPELL1 := 69633; -- Veil of Shadow +SET @SPELL2 := 69148; -- Wail of Souls (Normal) +SET @SPELL3 := 70210; -- Wail of Souls (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,5000,6000,9000,10000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Veil of Shadow'), +(@ENTRY,0,1,0,0,0,100,2,9000,11000,5000,6000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Wail of Souls'), +(@ENTRY,0,2,0,0,0,100,4,9000,11000,5000,6000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Wail of Souls'); + +-- Soulguard Watchman SAI +SET @ENTRY := 36478; -- NPC entry +SET @SPELL1 := 69056; -- Shroud of Runes +SET @SPELL2 := 69053; -- Unholy Rage +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,50,6,0,10000,16000,20000,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Combat - Cast Shroud of Runes'), +(@ENTRY,0,1,2,0,0,100,6,8000,16000,32000,40000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Combat - Cast Unholy Rage'), +(@ENTRY,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, 'Soulguard Watchman - Combat - Say 0'), +(@ENTRY,0,3,0,4,0,100,6,0,0,0,0,39,20,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Aggro - Call for help'); +-- NPC talk text insert +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, '%s goes into a frenzy!',16,0,100,0,0,0, 'Soulguard Watchman'); + +-- Soul Horror SAI +SET @ENTRY := 36522; -- NPC entry +SET @SPELL1 := 69088; -- Soul Strike (Normal) +SET @SPELL2 := 70211; -- Soul Strike (Heroic) +SET @SPELL3 := 69107; -- Killing Spree Invis Aura +SET @SPELL4 := 69106; -- Killing Spree Aura +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,2,5000,6000,5000,6000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soul Horror - Combat - Cast Soul Strike'), +(@ENTRY,0,1,0,0,0,100,4,5000,6000,5000,6000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soul Horror - Combat - Cast Soul Strike'), +(@ENTRY,0,4,0,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soul Horror - Aggro - Call for help'); + +-- Soulguard Animator SAI +SET @ENTRY := 36516; -- NPC entry +SET @SPELL1 := 68834; -- Soulguard Channel Beam02 +SET @SPELL2 := 69562; -- Raise Dead +SET @SPELL3 := 69131; -- Soul Sickness +SET @SPELL4 := 69128; -- Soul Siphon +SET @SPELL5 := 69068; -- Shadow Bolt (Normal) +SET @SPELL6 := 70208; -- Shadow Bolt (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Animator - OOC - Cast Soulguard Channel Beam02'), +(@ENTRY,0,1,0,0,1,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Raise Dead'), +(@ENTRY,0,2,0,0,0,100,6,7000,9000,9000,11000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Soul Sickness'), +(@ENTRY,0,3,0,0,0,100,6,9000,11000,7000,9000,11,@SPELL4,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Soul Siphon'), +(@ENTRY,0,4,0,0,0,100,2,4000,5000,3500,4500,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Shadow Bolt "Normal"'), +(@ENTRY,0,5,0,0,0,100,4,4000,5000,3500,4500,11,@SPELL6,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Shadow Bolt "Heroic"'), +(@ENTRY,0,6,7,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Aggro - Call for help'), +(@ENTRY,0,7,0,61,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Aggro - Set phase 1'), +(@ENTRY,0,8,9,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 2 - Set data'), +(@ENTRY,0,9,0,61,0,100,6,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 2 - Set phase 2'), +(@ENTRY,0,10,11,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 3 - Set data'), +(@ENTRY,0,11,0,61,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 3 - Set phase 1'); + +-- Soulguard Adept SAI +SET @ENTRY := 36620; -- NPC entry +SET @SPELL1 := 68834; -- Soulguard Channel Beam02 +SET @SPELL2 := 69562; -- Raise Dead +SET @SPELL3 := 69068; -- Shadow Bolt (Normal) +SET @SPELL4 := 70208; -- Shadow Bolt (Heroic) +SET @SPELL5 := 69066; -- Drain Life (Normal) +SET @SPELL6 := 70213; -- Drain Life (Heroic) +SET @SPELL7 := 69564; -- Shadow Mend (Normal) +SET @SPELL8 := 70205; -- Shadow Mend (Heroic) +SET @SPELL9 := 68797; -- Soulguard Channel +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Adept - OOC - Cast Soulguard Channel Beam02'), +(@ENTRY,0,1,0,0,4,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Raise Dead'), +(@ENTRY,0,2,0,0,0,100,2,7000,8000,3500,4500,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Bolt "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,7000,8000,3500,4500,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Bolt "Heroic"'), +(@ENTRY,0,4,0,0,0,100,2,6000,7000,8000,10000,11,@SPELL5,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Drain Life "Normal"'), +(@ENTRY,0,5,0,0,0,100,4,6000,7000,8000,10000,11,@SPELL6,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Drain Life "Heroic"'), +(@ENTRY,0,6,0,0,0,100,2,30000,35000,18000,22000,11,@SPELL7,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Mend "Normal"'), +(@ENTRY,0,7,0,0,0,100,4,30000,35000,18000,22000,11,@SPELL8,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Mend "Heroic"'), +(@ENTRY,0,8,0,25,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - On Reset - Set phase 1'), +(@ENTRY,0,9,0,38,1,100,6,0,1,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - On dataset 0 1 - Set phase 2'), +(@ENTRY,0,10,0,1,2,100,7,0,0,0,0,11,@SPELL9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - OOC - Cast Soulguard Channel'), +(@ENTRY,0,11,12,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Aggro - Call for help'), +(@ENTRY,0,12,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Aggro - Set phase 3'), +(@ENTRY,0,13,14,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 2 - Set data'), +(@ENTRY,0,14,0,61,0,100,6,0,0,0,0,22,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 2 - Set phase 4'), +(@ENTRY,0,15,16,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 3 - Set data'), +(@ENTRY,0,16,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 3 - Set phase 3'); + +-- Soulguard Bonecaster SAI +SET @ENTRY := 36564; -- NPC entry +SET @SPELL1 := 68834; -- Soulguard Channel Beam02 +SET @SPELL2 := 69562; -- Raise Dead +SET @SPELL3 := 69080; -- Bone Volley (Normal) +SET @SPELL4 := 70206; -- Bone Volley (Heroic) +SET @SPELL5 := 69069; -- Shield of Bones (Normal) +SET @SPELL6 := 70207; -- Shield of Bones (Heroic) +SET @SPELL7 := 68797; -- Soulguard Channel +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Bonecaster - OOC - Cast Soulguard Channel Beam02'), +(@ENTRY,0,1,0,0,4,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Raise Dead'), +(@ENTRY,0,2,0,0,0,100,2,5000,7000,6000,8000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Bone Volley "Normal"'), +(@ENTRY,0,3,0,0,0,100,4,5000,7000,6000,8000,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Bone Volley "Heroic"'), +(@ENTRY,0,4,0,0,0,100,2,5000,7000,7000,9000,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Shield of Bones "Normal"'), +(@ENTRY,0,5,0,0,0,100,4,5000,7000,7000,9000,11,@SPELL6,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Shield of Bones "Heroic"'), +(@ENTRY,0,6,0,25,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - On Reset - Set phase 1'), +(@ENTRY,0,7,0,38,1,100,6,0,1,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - On dataset 0 1 - Set phase 2'), +(@ENTRY,0,8,0,1,2,100,7,0,0,0,0,11,@SPELL7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - OOC - Cast Soulguard Channel'), +(@ENTRY,0,9,10,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Aggro - Call for help'), +(@ENTRY,0,10,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Aggro - Set phase 3'), +(@ENTRY,0,11,12,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 2 - Set data'), +(@ENTRY,0,12,0,61,0,100,6,0,0,0,0,22,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 2 - Set phase 4'), +(@ENTRY,0,13,14,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 3 - Set data'), +(@ENTRY,0,14,0,61,0,100,6,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 3 - Set phase 3'); + +-- Ghoul Minion SAI +SET @ENTRY := 36916; -- NPC entry +SET @SPELL1 := 69088; -- Soul Strike (Normal) +SET @SPELL2 := 70211; -- Soul Strike (Heroic) +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,54,0,100,6,0,0,0,0,45,0,2,0,0,0,0,23,0,0,0,0,0,0,0, 'Ghoul Minion - Just Summoned - Set Data Summoner'), +(@ENTRY,0,1,0,61,0,100,6,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - Just Summoned - Set Random Movement'), +(@ENTRY,0,2,0,0,0,100,6,115000,115000,115000,115000,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - combat - die after 2 min'), +(@ENTRY,0,3,0,1,0,100,6,15000,15000,15000,15000,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - OOC - die after 15 sec'), +(@ENTRY,0,4,5,6,0,100,6,15000,15000,15000,15000,45,0,3,0,0,0,0,23,0,0,0,0,0,0,0, 'Ghoul Minion - on Death - Set data summoner'), +(@ENTRY,0,5,0,61,0,100,6,15000,15000,15000,15000,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - on Death - despawn after 3 sec'); diff --git a/sql/old/3.3.5a/2012_05_05_01_world_creature_template.sql b/sql/old/3.3.5a/2012_05_05_01_world_creature_template.sql new file mode 100644 index 00000000000..2eeaf2f40d2 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_05_01_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Set proper faction for Ymirjar Skycaller (Heroic) +UPDATE `creature_template` SET `faction_A`=1885,`faction_H`=1885 WHERE `entry`=37643; diff --git a/sql/old/3.3.5a/2012_05_05_02_world_gameobject.sql b/sql/old/3.3.5a/2012_05_05_02_world_gameobject.sql new file mode 100644 index 00000000000..c0b2c6b147b --- /dev/null +++ b/sql/old/3.3.5a/2012_05_05_02_world_gameobject.sql @@ -0,0 +1,10 @@ +-- Add some missing Blood of Heroes spawns +SET @GUID := 5276; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+5; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,176213,0,1,1,1529.10242,-1427.06946,65.49049,-3.001947,0,0,-0.9975634,0.06976615,7200,100,1), +(@GUID+1,176213,0,1,1,1705.87439,-4690.138,48.9742165,-3.08918333,0,0,-0.9996567,0.02620165,7200,100,1), +(@GUID+2,176213,0,1,1,1846.79382,-3825.265,135.5159,1.83259487,0,0,0.7933531,0.6087617,7200,100,1), +(@GUID+3,176213,0,1,1,1748.16333,-4453.13525,74.26272,-2.0594883,0,0,0,0,7200,100,1), +(@GUID+4,176213,0,1,1,2159.835,-2442.754,62.0804,-0.4886912,0,0,-0.2419214,0.9702958,7200,100,1), +(@GUID+5,176213,0,1,1,1342.557,-1382.568,46.89193,2.775069,0,0,0.9832544,0.182238,7200,100,1); diff --git a/sql/old/3.3.5a/2012_05_05_03_world_sai.sql b/sql/old/3.3.5a/2012_05_05_03_world_sai.sql new file mode 100644 index 00000000000..fce3b5bc957 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_05_03_world_sai.sql @@ -0,0 +1,17 @@ +-- Wrathbone Laborer SAI +SET @ENTRY := 36830; -- NPC entry +SET @SPELL1 := 70302; -- Blinding Dirt +SET @SPELL2 := 70278; -- Puncture Wound (Normal) +SET @SPELL3 := 70279; -- Puncture Wound (Heroic) +SET @SPELL4 := 69572; -- Shovelled! (Normal) +SET @SPELL5 := 70280; -- Shovelled! (Heroic) +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), +(@ENTRY,0,1,0,0,0,100,2,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), +(@ENTRY,0,2,0,0,0,100,4,8000,9000,9000,10000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Heroic)'), +(@ENTRY,0,3,0,0,0,100,2,5000,6000,7000,8000,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'), +(@ENTRY,0,4,0,0,0,100,4,5000,6000,7000,8000,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Heroic)'), +(@ENTRY,0,5,0,1,0,100,6,1000,3000,3000,3000,5,38,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Wrathbone Laborer - OOC - emote'); diff --git a/sql/old/3.3.5a/2012_05_05_04_world_creature_template.sql b/sql/old/3.3.5a/2012_05_05_04_world_creature_template.sql new file mode 100644 index 00000000000..7c4f13dd667 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_05_04_world_creature_template.sql @@ -0,0 +1,27 @@ +-- Fix InhabitType for Eye of the Lich King +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36913; +-- Updates From CDawg +-- Wrathbone Laborer (heroic) - fix hostility and adds equipment +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`equipment_id`=104 WHERE `entry`=37638; +-- Wrathbone Siegesmith (Heroic) add equipment +UPDATE `creature_template` SET `equipment_id`=122 WHERE `entry`=37639; +-- Fallen Warrior add equipment +UPDATE `creature_template` SET `equipment_id`=2328 WHERE `entry`=37612; +-- Forgemaster Garfrost add equipment +UPDATE `creature_template` SET `equipment_id`=2325 WHERE `entry`=37613; +-- Deathwhisper Necrolyte add equipment +UPDATE `creature_template` SET `equipment_id`=2365 WHERE `entry`=37609; +-- Deathwhisper Shadowcaster - add equipment +UPDATE `creature_template` SET `equipment_id`=2365 WHERE `entry`=38025; +-- Alliance slaves add equipments +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37645; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37646; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37647; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37648; +-- horde slaves add equipments +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37649; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37650; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37651; +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37652; +-- Ymirjar Skycaller (heroic) - Fix unit flags and add equipment +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32832,`equipment_id`=2438 WHERE `entry`=37643; diff --git a/sql/old/3.3.5a/2012_05_05_05_world_creature_template.sql b/sql/old/3.3.5a/2012_05_05_05_world_creature_template.sql new file mode 100644 index 00000000000..a2f2a217252 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_05_05_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Fix skillup on some target dummys +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|262144 WHERE `entry` IN (31144,2674,2673); diff --git a/sql/old/3.3.5a/2012_05_05_06_world_sai.sql b/sql/old/3.3.5a/2012_05_05_06_world_sai.sql new file mode 100644 index 00000000000..7b064af4a4e --- /dev/null +++ b/sql/old/3.3.5a/2012_05_05_06_world_sai.sql @@ -0,0 +1,13 @@ +-- Wrathbone Laborer SAI +SET @ENTRY := 36830; -- NPC entry +SET @SPELL1 := 70302; -- Blinding Dirt +SET @SPELL2 := 70278; -- Puncture Wound +SET @SPELL3 := 69572; -- Shovelled! +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), +(@ENTRY,0,1,0,0,0,100,6,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), +(@ENTRY,0,2,0,0,0,100,6,5000,6000,7000,8000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'), +(@ENTRY,0,3,0,1,0,100,6,1000,3000,3000,3000,5,38,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Wrathbone Laborer - OOC - emote'); diff --git a/sql/old/3.3.5a/2012_05_06_00_world_creature_template.sql b/sql/old/3.3.5a/2012_05_06_00_world_creature_template.sql new file mode 100644 index 00000000000..30dbf85c28d --- /dev/null +++ b/sql/old/3.3.5a/2012_05_06_00_world_creature_template.sql @@ -0,0 +1,5 @@ +-- Gold for Toc based on old.wowhead +UPDATE `creature_template` SET `mingold`=850000,`maxgold`=950000 WHERE `entry` IN(34797,35447,35448,35449); -- Icehowl +UPDATE `creature_template` SET `mingold`=550000,`maxgold`=650000 WHERE `entry` IN(34780,35216,35268,35269); -- Lord Jaraxxus +UPDATE `creature_template` SET `mingold`=650000,`maxgold`=700000 WHERE `entry` IN(34497,35350,35351,35352,34496,35347,35348,35359); -- Fjola Lightbane & Eydis Darkbane +UPDATE `creature_template` SET `mingold`=500000,`maxgold`=600000 WHERE `entry` IN(34564,34566,35615,35616); -- Anub'arak diff --git a/sql/old/3.3.5a/2012_05_06_01_world_creature_template.sql b/sql/old/3.3.5a/2012_05_06_01_world_creature_template.sql new file mode 100644 index 00000000000..fa0c9af5805 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_06_01_world_creature_template.sql @@ -0,0 +1,11 @@ +-- Based on old.wowhead.com +UPDATE `creature_template` SET `mingold`=1600000,`maxgold`=1800000 WHERE `entry` IN (33113,34003); -- Flame Levithian +UPDATE `creature_template` SET `mingold`=1100000,`maxgold`=1300000 WHERE `entry` IN (33118,33190); -- Ignis the Furnace Master +UPDATE `creature_template` SET `mingold`=280000,`maxgold`=360000 WHERE `entry` IN (33186,33724); -- Razorscale +UPDATE `creature_template` SET `mingold`=670000,`maxgold`=750000 WHERE `entry` IN (33293,33885); -- XT-002 Deconstructor +UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32857,33694); -- Stormcaller Brundir +UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32927,33692); -- Runemaster Molgeim +UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32867,33693); -- Steelbreaker +UPDATE `creature_template` SET `mingold`=1220000,`maxgold`=1500000 WHERE `entry` IN (33515,34175); -- Auriaya +UPDATE `creature_template` SET `mingold`=1650000,`maxgold`=1950000 WHERE `entry` IN (33271,33449); -- General Vezax +UPDATE `creature_template` SET `mingold`=2020000,`maxgold`=2220000 WHERE `entry` IN (33288,33955); -- Yogg-Saron diff --git a/sql/old/3.3.5a/2012_05_07_00_world_waypoints.sql b/sql/old/3.3.5a/2012_05_07_00_world_waypoints.sql new file mode 100644 index 00000000000..f24b7c9c254 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_07_00_world_waypoints.sql @@ -0,0 +1,73 @@ +-- Wrathbone Siegesmith pathing +SET @NPC := 202159; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=646.5851,`position_y`=-191.1892,`position_z`=526.8476 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,646.5851,-191.1892,526.8476,0,0,0,100,0), +(@PATH,2,648.8837,-181.967,526.7226,0,0,0,100,0), +(@PATH,3,649.4167,-179.4531,526.7226,14000,0,0,100,0), +(@PATH,4,652.1736,-183.3594,526.7226,0,0,0,100,0), +(@PATH,5,648.5643,-188.309,526.8476,0,0,0,100,0), +(@PATH,6,642.5313,-193.4826,527.3874,0,0,0,100,0), +(@PATH,7,633.688,-200.741,528.941,12000,0,0,100,0), +(@PATH,8,641.9254,-196.5747,528.9726,0,0,0,100,0); + +-- Wrathbone Siegesmith pathing +SET @NPC := 201855; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=723.5469,`position_y`=-170.9497,`position_z`=527.5121 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,723.5469,-170.9497,527.5121,13000,0,0,100,0), +(@PATH,2,726.6484,-173.3438,527.1627,0,0,0,100,0), +(@PATH,3,726.6484,-174.3438,527.1627,0,0,0,100,0), +(@PATH,4,725.25,-175.2379,526.8134,0,0,0,100,0), +(@PATH,5,722.0521,-181.5122,526.8134,0,0,0,100,0), +(@PATH,6,721.2031,-187.8142,526.8134,0,0,0,100,0), +(@PATH,7,717.7917,-194.4358,526.8134,0,0,0,100,0), +(@PATH,8,719.3073,-202.2691,527.1509,0,0,0,100,0), +(@PATH,9,720.3403,-206.1198,527.7932,12000,0,0,100,0), +(@PATH,10,717.6111,-199.5035,526.9384,0,0,0,100,0), +(@PATH,11,717.566,-189.0642,526.8134,0,0,0,100,0), +(@PATH,12,718.5764,-182.3958,526.8134,0,0,0,100,0), +(@PATH,13,719.9531,-176.0729,526.8134,0,0,0,100,0); + +-- Forgemaster Garfrost pathing +SET @NPC := 201992; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=712.1371,`position_y`=-215.7014,`position_z`=527.066 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`auras`) VALUES (@NPC,@PATH,1,'68792'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,712.1371,-215.7014,527.066,0,0,0,100,0), +(@PATH,2,719.507,-227.8559,527.066,3000,0,0,100,0), +(@PATH,3,712.1371,-215.7014,527.066,0,0,0,100,0), +(@PATH,4,685.1805,-207.349,526.8424,0,0,0,100,0), +(@PATH,5,664.5191,-203.3472,526.816,0,0,0,100,0), +(@PATH,6,645.033,-208.5295,528.941,0,0,0,100,0), +(@PATH,7,653.0729,-194.3681,526.7226,0,0,0,100,0), +(@PATH,8,664.8646,-195.2135,526.7226,0,0,0,100,0), +(@PATH,9,686.0816,-213.8264,526.8424,0,0,0,100,0), +(@PATH,10,697.9757,-221.6215,526.8424,0,0,0,100,0), +(@PATH,11,708.0903,-211.908,527.066,0,0,0,100,0), +(@PATH,12,717.8924,-204.6979,527.191,0,0,0,100,0), +(@PATH,13,699.0504,-201.3438,526.8424,0,0,0,100,0), +(@PATH,14,672.066,-201.1493,526.8424,0,0,0,100,0), +(@PATH,15,655.9496,-203.4931,526.816,0,0,0,100,0), +(@PATH,16,672.066,-201.1493,526.8424,0,0,0,100,0), +(@PATH,17,699.0504,-201.3438,526.8424,0,0,0,100,0), +(@PATH,18,717.8924,-204.6979,527.191,0,0,0,100,0), +(@PATH,19,708.0903,-211.908,527.066,0,0,0,100,0), +(@PATH,20,697.9757,-221.6215,526.8424,0,0,0,100,0), +(@PATH,21,686.0816,-213.8264,526.8424,0,0,0,100,0), +(@PATH,22,664.8646,-195.2135,526.7226,0,0,0,100,0), +(@PATH,23,653.0729,-194.3681,526.7226,0,0,0,100,0), +(@PATH,24,645.033,-208.5295,528.941,0,0,0,100,0), +(@PATH,25,664.5191,-203.3472,526.816,0,0,0,100,0), +(@PATH,26,685.1805,-207.349,526.8424,0,0,0,100,0); diff --git a/sql/old/3.3.5a/2012_05_07_01_world_sai.sql b/sql/old/3.3.5a/2012_05_07_01_world_sai.sql new file mode 100644 index 00000000000..83676d31df9 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_07_01_world_sai.sql @@ -0,0 +1,51 @@ +-- Ymirjar Skycaller SAI addition +SET @ENTRY := 31260; -- NPC entry +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY AND `id`=2; +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,2,0,25,0,100,6,0,0,0,0,11,46598,0,0,0,0,0,19,36891,20,0,0,0,0,0, 'Ymirjar Skycaller - Reset - Cast Ride Vehicle Hardcoded'); + +-- Wrathbone Laborer SAI +SET @ENTRY := -201800; -- NPC entry +SET @SPELL1 := 70302; -- Blinding Dirt +SET @SPELL2 := 70278; -- Puncture Wound +SET @SPELL3 := 69572; -- Shovelled! +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), +(@ENTRY,0,1,0,0,0,100,6,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), +(@ENTRY,0,2,0,0,0,100,6,5000,6000,7000,8000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'); + +-- Wrathbone Laborer pathing +SET @NPC := 201800; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=584.4202,`position_y`=188.9149,`position_z`=509.6726 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,584.4202,188.9149,509.6726,0,0,0,100,0), +(@PATH,2,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,3,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,4,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,5,583.6736,193.9653,509.7404,3000,0,48,100,0), +(@PATH,6,594.0781,190.2622,508.8613,0,0,0,100,0), +(@PATH,7,604.9809,191.5451,507.6583,0,0,0,100,0), +(@PATH,8,617.8438,191.3455,507.5206,0,0,0,100,0), +(@PATH,9,633.1597,186.8281,508.6275,3000,0,48,100,0), +(@PATH,10,633.1597,186.8281,508.6275,3000,0,48,100,0), +(@PATH,11,624.3472,190.9705,507.7706,0,0,0,100,0), +(@PATH,12,613.3229,189.9236,507.3956,0,0,0,100,0), +(@PATH,13,604.5156,189.651,507.3956,0,0,0,100,0), +(@PATH,14,593.9844,187.4479,508.9778,0,0,0,100,0), +(@PATH,15,584.4202,188.9149,509.6726,0,0,0,100,0); +DELETE FROM `waypoint_scripts` WHERE `id`=48; +INSERT INTO `waypoint_scripts` (`id`,`delay`,`command`,`datalong`,`guid`) VALUES +(48,0,1,38,67); + +-- Add Overlord Drakuru riders to Stonespine Gargoyle +UPDATE creature_template SET InhabitType=4,`flags_extra`=`flags_extra`|128 WHERE entry=28717; +DELETE FROM `creature` WHERE `id`=28717 AND `map`=658; +DELETE FROM `vehicle_template_accessory` WHERE `entry`=36896; +INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`) VALUES +(36896,28717,1,0, 'Overlord Drakuru on Stonespine Gargoyle',6,30000); diff --git a/sql/old/3.3.5a/2012_05_08_00_world_sai.sql b/sql/old/3.3.5a/2012_05_08_00_world_sai.sql new file mode 100644 index 00000000000..8a776b5f2d2 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_08_00_world_sai.sql @@ -0,0 +1,89 @@ +-- [Q] Arelion's Mistress +-- Viera Sunwhisper SAI +-- Twinkle SAI +SET @ENTRY_VIERA := 17226; +SET @ENTRY_TWINKLE := 17230; +SET @QUEST_PLEASURES := 9483; +SET @SPELL_RETRIBUTION := 30077; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_TWINKLE); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_VIERA,@ENTRY_TWINKLE,@ENTRY_VIERA*100,@ENTRY_VIERA*100+1); +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_VIERA,0,0,0,20,0,100,0,@QUEST_PLEASURES,0,0,0,80,@ENTRY_VIERA*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Quest Finish - Run Script'), +(@ENTRY_VIERA*100,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Viera Sunwhisper - On Script - Remove Quest Flag"), +(@ENTRY_VIERA*100,9,1,0,0,0,100,0,2000,2000,0,0,53,0,@ENTRY_VIERA,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Start WP 1'), +(@ENTRY_VIERA*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 0'), +(@ENTRY_VIERA*100,9,3,0,0,0,100,0,0,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Stand Up'), +(@ENTRY_VIERA*100,9,4,0,0,0,100,0,6500,6500,0,0,45,0,1,0,0,0,0,10,61963,@ENTRY_TWINKLE,0,0,0,0,0,'Viera Sunwhisper - On Script - Set Data 0 1 Twinkle'), +(@ENTRY_VIERA,0,1,2,40,0,100,0,10,@ENTRY_VIERA,0,0,66,0,0,0,0,0,0,11,@ENTRY_TWINKLE,15,0,0,0,0,0,'Viera Sunwhisper - On WP 10 - Face Twinkle'), +(@ENTRY_VIERA,0,2,0,61,0,100,0,0,0,0,0,54,1000000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 10 - Pause WP'), + +(@ENTRY_TWINKLE,0,0,0,38,0,100,0,0,1,0,0,53,1,@ENTRY_TWINKLE,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On Data 0 1 Set - Start WP 1 (run)'), +(@ENTRY_TWINKLE,0,1,0,40,0,100,0,13,@ENTRY_TWINKLE,0,0,54,1000000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On WP 13 - Pause WP'), +(@ENTRY_TWINKLE,0,2,0,38,0,100,0,1,2,0,0,53,1,@ENTRY_TWINKLE*10,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On Data Set 1 2 - Start WP 2 (run)'), +(@ENTRY_TWINKLE,0,3,0,40,0,100,0,4,@ENTRY_TWINKLE*10,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 4 (2) - Force Despawn'), + +(@ENTRY_VIERA,0,3,0,8,0,100,0,@SPELL_RETRIBUTION,0,0,0,80,@ENTRY_VIERA*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Spellhit - Run Second Script'), +(@ENTRY_VIERA*100+1,9,0,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 1'), +(@ENTRY_VIERA*100+1,9,1,0,0,0,100,0,0,0,0,0,33,@ENTRY_VIERA,0,0,0,0,0,7,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Quest Credit'), +(@ENTRY_VIERA*100+1,9,2,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 2'), +(@ENTRY_VIERA*100+1,9,3,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,9,@ENTRY_TWINKLE,0,25,0,0,0,0,'Twinkle - On Script - Say Line 0'), +(@ENTRY_VIERA*100+1,9,4,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 3'), +(@ENTRY_VIERA*100+1,9,5,0,0,0,100,0,0,0,0,0,45,1,2,0,0,0,0,10,61963,@ENTRY_TWINKLE,0,0,0,0,0,'Viera Sunwhisper - On Script - Set Data 1 2 Twinkle'), +(@ENTRY_VIERA*100+1,9,6,0,0,0,100,0,0,0,0,0,53,1,@ENTRY_VIERA*10,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Start WP 2 (run)'), +(@ENTRY_VIERA,0,4,0,40,0,100,0,4,@ENTRY_VIERA*10,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 4 (2) - Force Despawn'); + +-- Waypoints for Viera Sunwhisper +DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_VIERA*10); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY_VIERA,1,-653.739197,4145.138184,64.200729,'Viera Sunwhisper'), +(@ENTRY_VIERA,2,-658.875732,4147.715332,64.168304,'Viera Sunwhisper'), +(@ENTRY_VIERA,3,-681.465088,4147.636230,64.118073,'Viera Sunwhisper'), +(@ENTRY_VIERA,4,-686.400696,4161.865234,59.707859,'Viera Sunwhisper'), +(@ENTRY_VIERA,5,-695.956909,4179.237305,57.618931,'Viera Sunwhisper'), +(@ENTRY_VIERA,6,-699.832153,4189.959473,57.503750,'Viera Sunwhisper'), +(@ENTRY_VIERA,7,-708.518616,4184.436035,55.275894,'Viera Sunwhisper'), +(@ENTRY_VIERA,8,-716.137268,4178.130371,52.637508,'Viera Sunwhisper'), +(@ENTRY_VIERA,9,-719.865295,4174.992676,51.554867,'Viera Sunwhisper'), +(@ENTRY_VIERA,10,-720.839417,4162.232422,50.805923,'Viera Sunwhisper'), + +(@ENTRY_VIERA*10,1,-722.323486,4147.936523,50.337898,'Viera Sunwhisper'), +(@ENTRY_VIERA*10,2,-726.639343,4125.156250,48.479683,'Viera Sunwhisper'), +(@ENTRY_VIERA*10,3,-727.648315,4109.684082,47.528461,'Viera Sunwhisper'), +(@ENTRY_VIERA*10,4,-727.874329,4093.438721,46.446579,'Viera Sunwhisper'); + +-- Waypoints for Twinkle +DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY_TWINKLE,@ENTRY_TWINKLE*10); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY_TWINKLE,1,-605.445190,4165.205078,64.081802,'Twinkle'), +(@ENTRY_TWINKLE,2,-619.293335,4161.776855,63.217815,'Twinkle'), +(@ENTRY_TWINKLE,3,-629.536560,4153.708984,64.067123,'Twinkle'), +(@ENTRY_TWINKLE,4,-644.773438,4151.062988,64.174675,'Twinkle'), +(@ENTRY_TWINKLE,5,-658.875732,4147.715332,64.168304,'Twinkle'), +(@ENTRY_TWINKLE,6,-681.465088,4147.636230,64.118073,'Twinkle'), +(@ENTRY_TWINKLE,7,-686.400696,4161.865234,59.707859,'Twinkle'), +(@ENTRY_TWINKLE,8,-695.956909,4179.237305,57.618931,'Twinkle'), +(@ENTRY_TWINKLE,9,-699.832153,4189.959473,57.503750,'Twinkle'), +(@ENTRY_TWINKLE,10,-708.518616,4184.436035,55.275894,'Twinkle'), +(@ENTRY_TWINKLE,11,-716.137268,4178.130371,52.637508,'Twinkle'), +(@ENTRY_TWINKLE,12,-719.865295,4174.992676,51.554867,'Twinkle'), +(@ENTRY_TWINKLE,13,-720.636292,4166.637695,50.815567,'Twinkle'), + +(@ENTRY_TWINKLE*10,1,-722.323486,4147.936523,50.337898,'Twinkle'), +(@ENTRY_TWINKLE*10,2,-726.639343,4125.156250,48.479683,'Twinkle'), +(@ENTRY_TWINKLE*10,3,-727.648315,4109.684082,47.528461,'Twinkle'), +(@ENTRY_TWINKLE*10,4,-727.874329,4093.438721,46.446579,'Twinkle'); + +-- Spawn spell focus object on correct position +DELETE FROM `gameobject` WHERE `id`=300071 AND `guid`=303; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(303,300071,530,1,1,-720.803,4162.77,50.7916,4.61029,0,0,0.742267,-0.670104,300,0,1); + +-- Texts +DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_TWINKLE); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY_VIERA,0,0,"Ok, let's go. I know just the perfect spot!",12,0,100,0,0,0,'Viera Sunwhisper'), +(@ENTRY_VIERA,1,0,"I can't wait to try this wine!",12,0,100,0,0,0,'Viera Sunwhisper'), +(@ENTRY_VIERA,2,0,"What... is happening... to me? Get this cat away from me!",12,0,100,0,0,0,'Viera Sunwhisper'), +(@ENTRY_VIERA,3,0,"%s scurries away, attempting to flee from Twinkle",16,0,100,0,0,0,'Viera Sunwhisper'), + +(@ENTRY_TWINKLE,0,0,"%s looks at Viera Sunwhisper with very hungry eyes",16,0,100,0,0,0,'Twinkle'); diff --git a/sql/old/3.3.5a/2012_05_08_01_world_gameobject.sql b/sql/old/3.3.5a/2012_05_08_01_world_gameobject.sql new file mode 100644 index 00000000000..b83d02b4762 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_08_01_world_gameobject.sql @@ -0,0 +1,5 @@ +-- Add Missing Ice Wall, Pit of Saron +SET @GUID := 305; +DELETE FROM `gameobject` WHERE `guid`=@GUID; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,201885,658,3,1,932.2674,-80.6684,591.6761,2.286379,0,0,0,0,300,100,1); diff --git a/sql/old/3.3.5a/2012_05_08_01_world_misc.sql b/sql/old/3.3.5a/2012_05_08_01_world_misc.sql new file mode 100644 index 00000000000..8f19132fa27 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_08_01_world_misc.sql @@ -0,0 +1,9 @@ +-- Spell area spells for entering POS +DELETE FROM `spell_area` WHERE `spell` IN (70056,70057); +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(70056,4904,0,0,0,0,690,2,1), -- Send Script Event (22717) +(70057,4904,0,0,0,0,1101,2,1); -- Send Script Event (22718) + +-- Fix flags and equipment for Ymirjar Deathbringer +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256 WHERE `entry` IN (36892,37641); +UPDATE `creature_template` SET `equipment_id`=2444 WHERE `entry`=37641; diff --git a/sql/old/3.3.5a/2012_05_09_00_world_spell_target_position.sql b/sql/old/3.3.5a/2012_05_09_00_world_spell_target_position.sql new file mode 100644 index 00000000000..a6e9d7289b7 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_09_00_world_spell_target_position.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_target_position` WHERE `id` IN (67834, 68081); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(67834, 571, 3167.01, 5586.04, 880.067, 0), +(68081, 571, 5857.252, 516.8015, 599.82, 2.987); + +UPDATE `spell_target_position` SET `target_position_x`=6136.89,`target_position_y`=4785.55,`target_position_z`=100.673 WHERE `id`=67835; +UPDATE `spell_target_position` SET `target_position_x`=8301.39,`target_position_y`=1501.34,`target_position_z`=870.555 WHERE `id`=67836; diff --git a/sql/old/3.3.5a/2012_05_09_01_world_commands.sql b/sql/old/3.3.5a/2012_05_09_01_world_commands.sql new file mode 100644 index 00000000000..dcd4c9130eb --- /dev/null +++ b/sql/old/3.3.5a/2012_05_09_01_world_commands.sql @@ -0,0 +1,8 @@ +DELETE FROM `trinity_string` WHERE `entry` = 555; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(555,"SetData performed on [GUID: %u, entry: %u, name: %s] Field: %u, Data: %u, with %s"); + +DELETE FROM `command` WHERE `name` = "npc set data"; +INSERT INTO `command` (`name`,`security`,`help`) VALUES +("npc set data", 3, "Syntax: .npc set data $field $data +Sets data for the selected creature. Used for testing Scripting"); diff --git a/sql/old/3.3.5a/2012_05_09_02_world_sai.sql b/sql/old/3.3.5a/2012_05_09_02_world_sai.sql new file mode 100644 index 00000000000..01004b23505 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_09_02_world_sai.sql @@ -0,0 +1,116 @@ +-- Fixup for Quest Quest:The Path to the Citadel "Alliance and Horde" + +-- Alliance slave add missing equipments +UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=36767; + +-- Horde Slave SAI +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36770,36771,36772,36773); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36770,36771,36772,36773); +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3677000); +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 +(36770,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36771,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36772,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36773,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), +(36770,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +(36771,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +(36772,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +(36773,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), +-- Script +(3677000,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - Turnto envoker'), +(3677000,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - say text'), +(3677000,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set unitflag'), +(3677000,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set faction'), +(3677000,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set Emotestate'), +(3677000,9,5,0,0,0,100,0,100,100,100,100,33,36770,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - give quest credit'), +(3677000,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set run on'), +(3677000,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Horde Slave - Script - move to closest trigger'), +(3677000,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - despawn'); + +-- Alliance Slave SAI +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36764,36765,36766,36767); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36764,36765,36766,36767); +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3676400); +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 +(36764,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36765,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36766,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36767,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), +(36764,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +(36765,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +(36766,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +(36767,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), +-- Script +(3676400,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - Turnto envoker'), +(3676400,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - say text'), +(3676400,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set unitflag'), +(3676400,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set faction'), +(3676400,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set Emotestate'), +(3676400,9,5,0,0,0,100,0,100,100,100,100,33,36764,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - give quest credit'), +(3676400,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set run on'), +(3676400,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Alliance Slave - Script - move to closest trigger'), +(3676400,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - despawn'); + +-- Ball and chain SAI +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (201969); +DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid` IN (201969); +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 +(201969,1,0,0,64,0,100,6,0,0,0,0,85,71281,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Ball and chain - On Gossip Hello - Envoker cast on self'); + +-- Spell Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=71281; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,71281,0,31,3,36770,0,0,'','Spell 71281 targets entry 36770'), +(13,1,71281,1,31,3,36771,0,0,'','Spell 71281 targets entry 36771'), +(13,1,71281,2,31,3,36772,0,0,'','Spell 71281 targets entry 36772'), +(13,1,71281,3,31,3,36773,0,0,'','Spell 71281 targets entry 36773'), +(13,1,71281,4,31,3,36764,0,0,'','Spell 71281 targets entry 36764'), +(13,1,71281,5,31,3,36765,0,0,'','Spell 71281 targets entry 36765'), +(13,1,71281,6,31,3,36766,0,0,'','Spell 71281 targets entry 36766'), +(13,1,71281,7,31,3,36767,0,0,'','Spell 71281 targets entry 36767'); + +-- Creature text from sniff +DELETE FROM `creature_text` WHERE `entry` IN (36770,36771,36772,36773,36764,36765,36766,36767); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +-- Alliance Slaves +(36764,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36764,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36764,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36764,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36764,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36765,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36765,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36766,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36766,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), +(36767,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), +(36767,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), +-- Horde Slaves +(36770,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36770,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36770,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36770,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36770,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36771,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36771,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36772,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36772,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), +(36773,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), +(36773,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'); diff --git a/sql/old/3.3.5a/2012_05_09_03_world_misc.sql b/sql/old/3.3.5a/2012_05_09_03_world_misc.sql new file mode 100644 index 00000000000..63e162fcfce --- /dev/null +++ b/sql/old/3.3.5a/2012_05_09_03_world_misc.sql @@ -0,0 +1,56 @@ +-- Update Scourgelord Tyrannus "Make him fly" +UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36794; + +-- Put Rimefang in the air and make him fly +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36661; +UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36661; + +-- Deathwhisper Necrolyte SAI +SET @ENTRY := 36788; -- NPC entry +SET @SPELL1 := 69577; -- Shadow Bolt +SET @SPELL2 := 69578; -- Conversion Beam +SET @SPELL3 := 45104; -- Shadow Channelling +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,6,100,100,3000,3000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Shadow Bolt'), +(@ENTRY,0,1,0,0,0,100,6,9000,9000,24000,24000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Conversion Beam'); + +-- Deathwhisper Necrolyte pathing +SET @NPC := 202231; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=592.975,`position_y`=176.104,`position_z`=508.746 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,596.0208,175.5243,508.3654,0,0,0,100,0), +(@PATH,2,605.2656,157.7101,507.2126,0,0,0,100,0), +(@PATH,3,604.4063,146.283,507.3376,0,0,0,100,0), +(@PATH,4,592.2899,131.4271,507.8163,0,0,0,100,0), +(@PATH,5,577.4531,118.224,508.3163,0,0,0,100,0), +(@PATH,6,563.0695,103.7309,514.1504,0,0,0,100,0), +(@PATH,7,557.7743,89.41319,523.1727,0,0,0,100,0), +(@PATH,8,560.9583,77.65278,525.4227,0,0,0,100,0), +(@PATH,9,560.9583,77.65278,525.4227,0,0,0,100,0), +(@PATH,10,571.0139,69.43403,525.2753,0,0,0,100,0), +(@PATH,11,560.9583,77.65278,525.4227,0,0,0,100,0), +(@PATH,12,557.7743,89.41319,523.1727,0,0,0,100,0), +(@PATH,13,563.0695,103.7309,514.1504,0,0,0,100,0), +(@PATH,14,577.4531,118.224,508.3163,0,0,0,100,0), +(@PATH,15,592.2899,131.4271,507.8163,0,0,0,100,0), +(@PATH,16,604.4063,146.283,507.3376,0,0,0,100,0), +(@PATH,17,605.2656,157.7101,507.2126,0,0,0,100,0), +(@PATH,18,596.0208,175.5243,508.3654,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID`=202231; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(202231,202231,0,0,2), +(202231,202099,7,288,2), +(202231,202282,7,324,2), +(202231,202125,7,360,2), +(202231,202203,7,36,2), +(202231,201960,7,72,2); + +-- Remove a dupe spawn +DELETE FROM `creature` WHERE `guid`=201998; +DELETE FROM `creature_addon` WHERE `guid`=201998; diff --git a/sql/old/3.3.5a/2012_05_10_00_world_sai.sql b/sql/old/3.3.5a/2012_05_10_00_world_sai.sql new file mode 100644 index 00000000000..c6d6e914345 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_10_00_world_sai.sql @@ -0,0 +1,42 @@ +-- [Q] See You on the Other Side + +-- Gan'jo SAI +SET @ENTRY := 26924; +SET @QUEST := 12121; +SET @GOSSIP := 10220; +SET @SPELL_RESURRECT := 61613; +UPDATE `creature_template` SET `npcflag`=3,`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,1,62,0,100,0,@GOSSIP,0,0,0,11,@SPELL_RESURRECT,1,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Cast Ganjo Resurrection"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Close Gossip"); + +-- Essence of Warlord Jin'arrak SAI +SET @ENTRY := 26902; +SET @SPELL_DIE_EFFECT := 61611; +SET @SPELL_CAMERA_SHAKE := 47533; +UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=128 WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100) 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 +(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Just Summoned - Run Script"), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"), +(@ENTRY*100,9,1,0,0,0,100,0,4000,4000,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Killed Monster Credit"), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Monster Whisper Line 0"), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"), +(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,85,@SPELL_DIE_EFFECT,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast On The Other Side"); + +-- Essence of Warlord Jin'arrak text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"How dare you summon me without an offering!",42,0,0,0,0,0,"Essence of Warlord Jin'arrak"); + +-- Ganjo's Resurrection removes On The Other Side +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=@SPELL_RESURRECT; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +(@SPELL_RESURRECT,-@SPELL_DIE_EFFECT,1,"Ganjo's Resurrection removes On The Other Side"); + +-- Conditions for Gan'jo's gossip option +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTarget`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`comment`) VALUES +(15,@GOSSIP,0,0,0,1,@SPELL_DIE_EFFECT,0,"Ganjo's Gossip - requires aura See You On The Other Side"), +(15,@GOSSIP,0,0,1,9,@QUEST,0,"Ganjo's Gossip - requires quest See You On The Other Side to be rewarded"); diff --git a/sql/old/3.3.5a/2012_05_10_01_world_misc.sql b/sql/old/3.3.5a/2012_05_10_01_world_misc.sql new file mode 100644 index 00000000000..a7a30d518a2 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_10_01_world_misc.sql @@ -0,0 +1,37 @@ +-- [Q] Leave Nothing to Chance + +-- Lower Wintergarde Mine Shaft and Upper Wintergarde Mine Shaft +UPDATE `creature_template` SET `MovementType`=0,`flags_extra`=`flags_extra`|128 WHERE `entry`IN (27437,27436); +UPDATE `creature` SET `MovementType`=0,`spawndist`=0 WHERE `id` IN (27437,27436); + +-- Wintergarde Mine Bomb SAI +SET @ENTRY := 27435; +SET @SPELL_EXPLOSION := 48742; +UPDATE `creature_template` SET `AIName`='SmartAI' 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,1,1,0,100,1,14000,14000,0,0,11,@SPELL_EXPLOSION,2,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - Out of Combat - Cast Wintergarde Mine Explosion"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - On Wintergarde Mine Explosion Cast - Forced Despawn"); + +-- Spawn missing spell focus object for upper mine +DELETE FROM `gameobject` WHERE `id`=188711 AND `guid`=370; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(370,188711,571,1,1,3898.18,-881.748,119.533,0.421023,0,0,0.20896,0.977924,300,0,1); + +-- Spawn missing Upper Wintergarde Mine Shaft +DELETE FROM `creature` WHERE `id`=27436 AND `guid`=42576; +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 +(42576,27436,571,1,1,0,0,3899.86,-883.613,119.536,0.0636665,300,0,0,42,0,0,0,0,0); + +-- Spellscriptname +DELETE FROM `spell_script_names` WHERE `spell_id`=@SPELL_EXPLOSION; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(@SPELL_EXPLOSION,'spell_q12277_wintergarde_mine_explosion'); + +-- The conditions will make it works exactly like it should. Thanks a lot Josh. +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_EXPLOSION; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,@SPELL_EXPLOSION,0,31,3,27437,0,0,'',"Wintergarde Mine Explosion - Lower Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY +(13,1,@SPELL_EXPLOSION,1,31,3,27436,0,0,'',"Wintergarde Mine Explosion - Upper Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY +(13,2,@SPELL_EXPLOSION,0,31,4,0,0,0,'',"Wintergarde Mine Explosion - Targets Players"), -- Effect 1 - SPELL_EFFECT_KNOCK_BACK +(13,4,@SPELL_EXPLOSION,0,31,5,188712,0,0,'',"Wintergarde Mine Explosion - Wintergarde Mine Cave In (2)"); -- Effect 2 - SPELL_EFFECT_ACTIVATE_OBJECT diff --git a/sql/old/3.3.5a/2012_05_10_02_world_creature_template.sql b/sql/old/3.3.5a/2012_05_10_02_world_creature_template.sql new file mode 100644 index 00000000000..28893f24fdf --- /dev/null +++ b/sql/old/3.3.5a/2012_05_10_02_world_creature_template.sql @@ -0,0 +1,2 @@ +-- fix creauture_template loot id for infinite corruptor. could have sworn this was already in the db. +UPDATE `creature_template` SET `lootid` = 0 WHERE `entry` IN (32313,32273); diff --git a/sql/old/3.3.5a/2012_05_10_03_world_misc.sql b/sql/old/3.3.5a/2012_05_10_03_world_misc.sql new file mode 100644 index 00000000000..339f52ac0bb --- /dev/null +++ b/sql/old/3.3.5a/2012_05_10_03_world_misc.sql @@ -0,0 +1,129 @@ + -- Remove obsolete requirement 'cooking profession' from quest 'Beer Basted Boar Ribs' (thx tifkat) closes #5198 +UPDATE `quest_template` SET `RequiredSkillId`=0, `RequiredSkillPoints`=0 WHERE `Id`=384; + +-- Fix proc for Death's Verdict/Choice (author: kandera) closes #6041 +UPDATE `spell_proc_event` SET `procFlags` = 0, `procEx` = `procEx`|262144 WHERE `entry` in (67702, 67771); + +-- Disables quest "Desperate Research" for all factions author trista closes #5285 +DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12782,12783,12811,12784,12752,12775,12777,12753,12808,12772); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,12782,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'), +(1,12783,0,0,0,'Disable quest from Scourge Invasion for Orcs'), +(1,12811,0,0,0,'Disable quest from Scourge Invasion for Trolls'), +(1,12784,0,0,0,'Disable quest from Scourge Invasion for Tauren'), +(1,12752,0,0,0,'Disable quest from Scourge Invasion for undead'), +(1,12775,0,0,0,'Disable quest from Scourge Invasion for Human'), +(1,12777,0,0,0,'Disable quest from Scourge Invasion for Draenei'), +(1,12753,0,0,0,'Disable quest from Scourge Invasion for Dwarves'), +(1,12808,0,0,0,'Disable quest from Scourge Invasion for Gnomes'), +(1,12772,0,0,0,'Disable quest from Scourge Invasion for Night Elves'); +-- Disables scourge invasion connected quests listed below +DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12788,12812,12785,12786,12787,12774,12776,12771,12809,12773); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,12788,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'), +(1,12812,0,0,0,'Disable quest from Scourge Invasion for Orcs'), +(1,12785,0,0,0,'Disable quest from Scourge Invasion for Trolls'), +(1,12786,0,0,0,'Disable quest from Scourge Invasion for Tauren'), +(1,12787,0,0,0,'Disable quest from Scourge Invasion for undead'), +(1,12774,0,0,0,'Disable quest from Scourge Invasion for Human'), +(1,12776,0,0,0,'Disable quest from Scourge Invasion for Draenei'), +(1,12771,0,0,0,'Disable quest from Scourge Invasion for Dwarves'), +(1,12809,0,0,0,'Disable quest from Scourge Invasion for Gnomes'), +(1,12773,0,0,0,'Disable quest from Scourge Invasion for Night Elves'); + +-- Limit Bloodgem Shard use to Netherstorm Cristal Target author: nelegalno closes #4165 +DELETE FROM `conditions` WHERE (`SourceEntry`=34367 AND `SourceTypeOrReferenceId`=17 AND `ConditionTypeOrReference`=29); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,34367,0,29,19421,15,0,64,'','Limit Bloodgem Shard use to Netherstorm Cristal Target'); + +-- Path of xx and A Change of Heart (Ashen Band rings) author: studioworks closes #2544 +UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `id` IN +(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831,24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN +-- Paths +(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831, +-- A Change of Heart +24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES +-- Path of Courage +(19,0,24827,0,2,50375,1,0,'Path of Courage 1'), +(19,0,24834,0,2,50388,1,0,'Path of Courage 2'), +(19,0,24835,0,2,50403,1,0,'Path of Courage 3'), +-- Path of Destruction +(19,0,24823,0,2,50384,1,0,'Path of Destruction 1'), +(19,0,24828,0,2,50377,1,0,'Path of Destruction 2'), +(19,0,24829,0,2,50397,1,0,'Path of Destruction 3'), +-- Path of Might +(19,0,25239,0,2,52569,1,0,'Path of Might 1'), +(19,0,25240,0,2,52570,1,0,'Path of Might 2'), +(19,0,25242,0,2,52571,1,0,'Path of Might 3'), +-- Path of Vengeance +(19,0,24826,0,2,50376,1,0,'Path of Vengeance 1'), +(19,0,24832,0,2,50387,1,0,'Path of Vengeance 2'), +(19,0,24833,0,2,50401,1,0,'Path of Vengeance 3'), +-- Path of Wisdom +(19,0,24825,0,2,50378,1,0,'Path of Wisdom 1'), +(19,0,24830,0,2,50386,1,0,'Path of Wisdom 2'), +(19,0,24831,0,2,50399,1,0,'Path of Wisdom 3'), +-- A Change of Heart +(19,0,24819,0,2,50377,1,0,'A Change of Heart'), +(19,0,24820,0,2,50376,1,0,'A Change of Heart'), +(19,0,24821,0,2,50375,1,0,'A Change of Heart'), +(19,0,24822,0,2,50378,1,0,'A Change of Heart'), +(19,0,24836,0,2,50384,1,0,'A Change of Heart'), +(19,0,24837,0,2,50386,1,0,'A Change of Heart'), +(19,0,24838,0,2,50387,1,0,'A Change of Heart'), +(19,0,24839,0,2,50388,1,0,'A Change of Heart'), +(19,0,24840,0,2,50397,1,0,'A Change of Heart'), +(19,0,24841,0,2,50399,1,0,'A Change of Heart'), +(19,0,24842,0,2,50401,1,0,'A Change of Heart'), +(19,0,24843,0,2,50403,1,0,'A Change of Heart'), +(19,0,24844,0,2,50398,1,0,'A Change of Heart'), +(19,0,24845,0,2,50400,1,0,'A Change of Heart'), +(19,0,24846,0,2,50402,1,0,'A Change of Heart'), +(19,0,24847,0,2,50404,1,0,'A Change of Heart'), +(19,0,25246,0,2,52572,1,0,'A Change of Heart'), +(19,0,25247,0,2,52569,1,0,'A Change of Heart'), +(19,0,25248,0,2,52570,1,0,'A Change of Heart'), +(19,0,25249,0,2,52571,1,0,'A Change of Heart'); + +-- spawn farmer torp author: zxbiohazardzx closes #6256 +SET @guid := 42652; +DELETE FROM `creature` WHERE `guid`=@guid; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`) +VALUES +(@guid,25607,571,1,1,2886.325,6385.55,92.96985,1.4512,120); -- Farmer Torp + +-- Disgusting Oozeling aura author: gecko32 closes #6197 +UPDATE `creature_template_addon` SET `auras`='25163' WHERE `entry`=15429; +-- Mr. Chilly +-- Add aura chilly for Periodic slide +DELETE FROM `creature_template_addon` WHERE `entry`=29726; +INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES +(29726, 0, 0, 0, 0, 0, '61811'); + +-- Update to Change to $n in page text author: gecko32 closes #5930 +UPDATE `page_text` SET `text`='This proof of deed is to verify that $n slew Margol the Rager, scourge of the searing gorge.$B$BThe Ironforge museum recognizes this achievement and thanks the bearer for their generous contribution.$B$B-Head Curator Thorius Stonetender' WHERE `entry`=1231; + +-- Update frost shock and you to only be for shamans. author: whit33r closes #4727 +UPDATE `quest_template` SET `RequiredClasses`=64 WHERE `id` = 7505; + +-- fixes ashen band of destruction proc author: kandera +DELETE FROM `spell_proc_event` WHERE `entry` = 72417; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(72417,0,0,0,0,0,327680,0,0,0,60); + +-- fixes quest credit from Fel reaver no thanks! author: tREAk & shlomi1515 closes #3715 +UPDATE `spell_dbc` SET `Effect1`=16,`EffectMiscValue1`=10855 WHERE `id`=38758; +DELETE FROM `creature_ai_scripts` WHERE creature_id=22293; + +-- fix areatrigger for wickerman camp author: boomper closes #3549 +DELETE FROM `areatrigger_involvedrelation` WHERE `id` =3991; +INSERT INTO `areatrigger_involvedrelation` (`id`, `quest`) +VALUES (3991,1658); + +-- yous have da darkrune should be daily author: kaelima closes #3457 +UPDATE `quest_template` SET `SpecialFlags` = `SpecialFlags` | 1 WHERE `id` = 11027; + +-- fix infinite corruptor loot id author: vincent-michael +UPDATE `creature_template` SET `lootid` = 32313 WHERE `entry` =32313; diff --git a/sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql b/sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql new file mode 100644 index 00000000000..5f01e951c4b --- /dev/null +++ b/sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql @@ -0,0 +1,14 @@ +-- Spawn Disturbed Glacial Revenant +DELETE FROM `creature` WHERE `guid`=201998; +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 +(201998,36874,658,2,1,0,0,1053.894,-93.05556,632.8575,4.223697,86400,0,0,1,0,0,0,0,0); +DELETE FROM `creature_addon` WHERE `guid`=201998; +INSERT INTO `creature_addon` (`guid`,`bytes2`) VALUES +(201998,1); + +-- Disturbed Glacial Revenant SAI +SET @ENTRY := 36874; -- NPC entry +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,4,0,0,12000,15000,11,55216,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Disturbed Glacial Revenant - Combat - Cast Avalanche'); diff --git a/sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql b/sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql new file mode 100644 index 00000000000..1677d74c4a7 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql @@ -0,0 +1,88 @@ +-- Deathwhisper Necrolyte pathing +SET @NPC := 202103; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,555.3976,303.5347,507.6232,0,0,0,100,0), +(@PATH,2,568.4896,297.9913,506.9572,0,0,0,100,0), +(@PATH,3,586.1476,292.5486,506.3322,0,0,0,100,0), +(@PATH,4,598.5833,292.6007,506.3322,0,0,0,100,0), +(@PATH,5,602.3438,300.2135,506.9457,0,0,0,100,0), +(@PATH,6,603.0573,307.5399,507.6957,0,0,0,100,0), +(@PATH,7,611.7239,316.1129,508.4457,0,0,0,100,0), +(@PATH,8,620.0677,312.684,508.1957,0,0,0,100,0), +(@PATH,9,622.184,305.0868,508.3207,0,0,0,100,0), +(@PATH,10,616.684,295.2083,507.8819,0,0,0,100,0), +(@PATH,11,613.9236,287.4288,507.0737,0,0,0,100,0), +(@PATH,12,618.5174,272.882,507.6097,0,0,0,100,0), +(@PATH,13,621.4445,263.4861,507.9438,0,0,0,100,0), +(@PATH,14,618.5174,272.882,507.6097,0,0,0,100,0), +(@PATH,15,613.9236,287.4288,507.0737,0,0,0,100,0), +(@PATH,16,616.684,295.2083,507.8819,0,0,0,100,0), +(@PATH,17,622.184,305.0868,508.3207,0,0,0,100,0), +(@PATH,18,620.0677,312.684,508.1,0,0,0,100,0), +(@PATH,19,611.7239,316.1129,508.4457,0,0,0,100,0), +(@PATH,20,603.0573,307.5399,507.6629,0,0,0,100,0), +(@PATH,21,602.3438,300.2135,506.8405,0,0,0,100,0), +(@PATH,22,598.5833,292.6007,506.3498,0,0,0,100,0), +(@PATH,23,586.1476,292.5486,506.3322,0,0,0,100,0), +(@PATH,24,568.4896,297.9913,506.9572,0,0,0,100,0); +DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@NPC,@NPC,0,0,2), +(@NPC,201819,7,270,2), +(@NPC,201934,7,306,2), +(@NPC,202121,7,342,2), +(@NPC,202196,7,18,2), +(@NPC,202098,7,54,2), +(@NPC,201954,7,90,2); + +-- Deathwhisper Necrolyte pathing +SET @NPC := 202273; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,611.9375,117.441,508.0308,0,0,0,100,0), +(@PATH,2,620.9531,139.3004,506.531,0,0,0,100,0), +(@PATH,3,624.3854,153.9531,507.3376,0,0,0,100,0), +(@PATH,4,625.8316,167.6233,507.4478,0,0,0,100,0), +(@PATH,5,622.8368,183.6788,507.7706,0,0,0,100,0), +(@PATH,6,625.8316,167.6233,507.4478,0,0,0,100,0), +(@PATH,7,624.3854,153.9531,507.3376,0,0,0,100,0), +(@PATH,8,620.9531,139.3004,506.531,0,0,0,100,0), +(@PATH,9,611.9375,117.441,508.0308,0,0,0,100,0), +(@PATH,10,610.8828,99.47656,510.0737,0,0,0,100,0); +DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@NPC,@NPC,0,0,2), +(@NPC,202054,7,270,2), +(@NPC,201845,7,306,2), +(@NPC,201914,7,342,2), +(@NPC,202145,7,18,2), +(@NPC,202227,7,54,2), +(@NPC,201988,7,90,2); + +-- Fix previous creature removal +DELETE FROM `creature` WHERE `id`=42160; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`, `position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(42160,36881,658,3,1,0,0,592.975,176.104,510.1582,508.746,86400,0,0,1,0,0); +UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988); +DELETE FROM `creature_formations` WHERE `leaderGUID`=202231; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(202231,202231,0,0,2), +(202231,202099,7,270,2), +(202231,202282,7,306,2), +(202231,202125,7,342,2), +(202231,202203,7,18,2), +(202231,201960,7,54,2), +(202231,42160,7,90,2); + +-- Update Scourgelord Tyrannus "Make him fly" +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36794; diff --git a/sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql b/sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql new file mode 100644 index 00000000000..6fd04d0e4da --- /dev/null +++ b/sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql @@ -0,0 +1,40 @@ +-- Deathwhisper Necrolyte pathing +SET @NPC := 202063; +SET @PATH := @NPC*10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +UPDATE `creature` SET `position_x`=631.8229,`position_y`=229.7292,`position_z`=508.0604 WHERE `guid` IN (202028,202000,201957,201820,202122,202199); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,631.8229,229.7292,508.0604,0,0,0,100,0), +(@PATH,2,643.8733,215.2674,508.2268,0,0,0,100,0), +(@PATH,3,659.0139,215.9635,507.8518,0,0,0,100,0), +(@PATH,4,674.184,213.5833,508.8467,0,0,0,100,0), +(@PATH,5,678.8004,201.066,508.4717,0,0,0,100,0), +(@PATH,6,662.4636,183.0694,507.9585,0,0,0,100,0), +(@PATH,7,650.8941,171.5642,507.7085,0,0,0,100,0), +(@PATH,8,637.7292,155.2569,507.9196,0,0,0,100,0), +(@PATH,9,644.6389,130.2639,510.4212,0,0,0,100,0), +(@PATH,10,654.9896,121.3038,511.9212,0,0,0,100,0), +(@PATH,11,677.7448,136.6528,512.7715,0,0,0,100,0), +(@PATH,12,678.2847,149.1233,507.8965,0,0,0,100,0), +(@PATH,13,677.7448,136.6528,512.7715,0,0,0,100,0), +(@PATH,14,654.9896,121.3038,511.9212,0,0,0,100,0), +(@PATH,15,644.6389,130.2639,510.4212,0,0,0,100,0), +(@PATH,16,637.7292,155.2569,507.9196,0,0,0,100,0), +(@PATH,17,650.8941,171.5642,507.7085,0,0,0,100,0), +(@PATH,18,662.4636,183.0694,507.9585,0,0,0,100,0), +(@PATH,19,678.8004,201.066,508.4717,0,0,0,100,0), +(@PATH,20,674.184,213.5833,508.8467,0,0,0,100,0), +(@PATH,21,659.0139,215.9635,507.8518,0,0,0,100,0), +(@PATH,22,643.8733,215.2674,508.2268,0,0,0,100,0); +DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@NPC,@NPC,0,0,2), +(@NPC,202028,7,270,2), +(@NPC,202000,7,306,2), +(@NPC,201957,7,342,2), +(@NPC,201820,7,18,2), +(@NPC,202122,7,54,2), +(@NPC,202199,7,90,2); diff --git a/sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql b/sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql new file mode 100644 index 00000000000..fa4e18f6468 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql @@ -0,0 +1,31 @@ +-- Scourgelord Tyrannus pathing +SET @NPC := 201951; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=873.783,`position_y`=136.9774,`position_z`=623.6115,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,873.783,136.9774,623.6115,0,0,0,100,0), +(@PATH,2,872.9045,139.2743,622.4446,0,0,0,100,0), +(@PATH,3,888.7917,171.3403,591.3615,0,0,0,100,0), +(@PATH,4,861.3073,209.8455,591.3615,0,0,0,100,0), +(@PATH,5,830.4913,254.5556,591.3615,0,0,0,100,0), +(@PATH,6,780.4844,277.6406,591.3615,0,0,0,100,0), +(@PATH,7,732.6771,272.4635,591.3615,0,0,0,100,0), +(@PATH,8,683.9028,265.276,591.3615,0,0,0,100,0), +(@PATH,9,612.3368,284.7934,553.4998,0,0,0,100,0), +(@PATH,10,554.816,303.1858,553.4998,0,0,0,100,0), +(@PATH,11,498.1024,309.0625,553.4998,0,0,0,100,0), +(@PATH,12,470.4167,230.0174,553.4998,0,0,0,100,0), +(@PATH,13,454.0087,175.2135,553.4998,0,0,0,100,0), +(@PATH,14,492.4288,127.1806,583.1108,0,0,0,100,0), +(@PATH,15,551.2604,121.6354,583.1108,0,0,0,100,0), +(@PATH,16,647.5573,126.3542,583.1108,0,0,0,100,0), +(@PATH,17,766.2222,130.9254,583.1108,0,0,0,100,0), +(@PATH,18,829.408,42.33854,583.1108,0,0,0,100,0), +(@PATH,19,746.7101,-53.03299,583.1108,0,0,0,100,0), +(@PATH,20,663.2379,-77.32291,583.1108,0,0,0,100,0), +(@PATH,21,618.6389,3.369792,583.1108,0,0,0,100,0), +(@PATH,22,641.8559,89.27604,583.1108,0,0,0,100,0), +(@PATH,23,794.1667,115.6858,583.1108,0,0,0,100,0); diff --git a/sql/old/3.3.5a/2012_05_11_01_world_gameobject_template.sql b/sql/old/3.3.5a/2012_05_11_01_world_gameobject_template.sql new file mode 100644 index 00000000000..630a166276b --- /dev/null +++ b/sql/old/3.3.5a/2012_05_11_01_world_gameobject_template.sql @@ -0,0 +1,4 @@ +-- Lock Ice Wall and make untargetable +UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201885; +-- Saronite Rock Should be untargetable +UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=196485; diff --git a/sql/old/3.3.5a/2012_05_11_02_world_conditions.sql b/sql/old/3.3.5a/2012_05_11_02_world_conditions.sql new file mode 100644 index 00000000000..a10c27a0ef5 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_11_02_world_conditions.sql @@ -0,0 +1,23 @@ +-- Spell Conditions for spell Necromantic Power 69347 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=69347; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,69347,0,31,3,37496,0,0,'','Spell 69347 targets entry 37496'), +(13,1,69347,1,31,3,37497,0,0,'','Spell 69347 targets entry 37497'), +(13,1,69347,2,31,3,37498,0,0,'','Spell 69347 targets entry 37498'), +(13,1,69347,3,31,3,37584,0,0,'','Spell 69347 targets entry 37584'), +(13,1,69347,4,31,3,37587,0,0,'','Spell 69347 targets entry 37587'), +(13,1,69347,5,31,3,37588,0,0,'','Spell 69347 targets entry 37588'); + +-- Spell Conditions for spell Shriek of the Highborne 70512 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70512; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,70512,3,31,3,37584,0,0,'','Spell 70512 targets entry 37584'), +(13,1,70512,4,31,3,37587,0,0,'','Spell 70512 targets entry 37587'), +(13,1,70512,5,31,3,37588,0,0,'','Spell 70512 targets entry 37588'); + +-- Spell Conditions for spell Empowered Blizzard 70130 +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70130; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,70130,0,31,3,37496,0,0,'','Spell 70130 targets entry 37496'), +(13,1,70130,1,31,3,37497,0,0,'','Spell 70130 targets entry 37497'), +(13,1,70130,2,31,3,37498,0,0,'','Spell 70130 targets entry 37498'); diff --git a/sql/old/3.3.5a/2012_05_12_00_world_gameobject_template.sql b/sql/old/3.3.5a/2012_05_12_00_world_gameobject_template.sql new file mode 100644 index 00000000000..ffa932c8640 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_12_00_world_gameobject_template.sql @@ -0,0 +1,2 @@ +-- Lock Halls of Reflection Portcullis +UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201848; diff --git a/sql/old/3.3.5a/2012_05_12_01_world_item_loot_template.sql b/sql/old/3.3.5a/2012_05_12_01_world_item_loot_template.sql new file mode 100644 index 00000000000..052b749c48c --- /dev/null +++ b/sql/old/3.3.5a/2012_05_12_01_world_item_loot_template.sql @@ -0,0 +1,92 @@ +DELETE FROM `item_loot_template` WHERE `entry` BETWEEN 51999 AND 52005; +INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Satchel of Helpfull Goods (level 0-25) +(51999,51964,0,1,1,1,1), -- Vigorous Belt +(51999,51968,0,1,1,1,1), -- Enumerated Wrap +(51999,51978,0,1,1,1,1), -- Earthbound Girdle +(51999,51994,25,1,1,1,1), -- Tumultuous Cloak +-- Satchel of Helpfull Goods (level 26-35) +(52000,51965,0,1,1,1,1), -- Vigorous Handguards +(52000,51973,0,1,1,1,1), -- Enumerated Handwraps +(52000,51980,0,1,1,1,1), -- Earthbound Handgrips +(52000,51996,25,1,1,1,1), -- Tumultuous Necklace +-- Satchel of Helpfull Goods (level 36-45) +(52001,51966,0,1,1,1,1), -- Vigorous Spaulders +(52001,51974,0,1,1,1,1), -- Enumerated Shoulderpads +(52001,51976,0,1,1,1,1), -- Earthbound Shoulderguards +(52001,51984,0,1,1,1,1), -- Stalwart Shoulderpads +(52001,51992,25,1,1,1,1), -- Tumultuous Ring +-- Satchel of Helpfull Goods (level 46-55) +(52002,51962,0,1,1,1,1), -- Vigorous Bracers +(52002,51963,0,1,1,1,1), -- Vigorous Stompers +(52002,51967,0,1,1,1,1), -- Enumerated Sandals +(52002,51972,0,1,1,1,1), -- Enumerated Bracers +(52002,51981,0,1,1,1,1), -- Earthbound Wristguards +(52002,51982,0,1,1,1,1), -- Earthbound Boots +(52002,51989,0,1,1,1,1), -- Stalwart Bands +(52002,51990,0,1,1,1,1), -- Stalwart Treads +-- Satchel of Helpfull Goods (level 56-60) +(52003,51959,0,1,1,1,1), -- Vigorous Belt +(52003,51971,0,1,1,1,1), -- Enumerated Belt +(52003,51977,0,1,1,1,1), -- Earthbound Girdle +(52003,51985,0,1,1,1,1), -- Stalwart Belt +(52003,51993,25,1,1,1,1), -- Turbulent Cloak +-- Satchel of Helpfull Goods (level 61-64) +(52004,51960,0,1,1,1,1), -- Vigorous Gloves +(52004,51970,0,1,1,1,1), -- Enumerated Gloves +(52004,51979,0,1,1,1,1), -- Earthbound Grips +(52004,51987,0,1,1,1,1), -- Stalwart Grips +(52004,51995,25,1,1,1,1), -- Turbulent Necklace +-- Satchel of Helpfull Goods (level 65-70) +(52005,51961,0,1,1,1,1), -- Vigorous Shoulderguards +(52005,51969,0,1,1,1,1), -- Enumerated Shoulders +(52005,51975,0,1,1,1,1), -- Earthbound Shoulders +(52005,51983,0,1,1,1,1), -- Stalwart Shoulderguards +(52005,51991,25,1,0,1,1); -- Turbulent Signet +-- ------------------------------------------------------------------- +-- Set some Parameters +-- ------------------------------------------------------------------- +SET @Cloth := 400; -- Class Bitmask: 16 (Priest) +128 (Mage) +256 (Warlock) +SET @Leather1 := 1100; -- Class Bitmask: 4 (Hunter) +8 (Rogue) +64 (Shaman) +1024 (Druid) +SET @Leather2 := 1032; -- Class Bitmask: 8 (Rogue) +1024 (Druid) +SET @Mail1 := 3; -- Class Bitmask: 1 (Warrior) +2 (Paladin) +SET @Mail2 := 68; -- Class Bitmask: 4 (Hunter) +8 (Shaman) +SET @Plate := 35; -- Class Bitmask: 1 (Warrior) +2 (Paladin) +32 (DeathKnight) +-- Add conditions to make sure everyone gets beneficial loot for their class +-- ------------------------------------------------------------------- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=5 AND `SourceGroup` BETWEEN 51999 AND 52005 ; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +-- Cloth Items +(5,51999,51968,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Wrap only for clothusers'), +(5,52000,51973,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Handwraps only for clothusers'), +(5,52001,51974,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulderpads only for clothusers'), +(5,52002,51967,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Sandals only for clothusers'), +(5,52002,51972,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Bracers only for clothusers'), +(5,52003,51971,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Belt only for clothusers'), +(5,52004,51970,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Gloves only for clothusers'), +(5,52005,51969,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulders only for clothusers'), +-- Leather Items +(5,51999,51964,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'), +(5,52000,51965,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Handguards only for leatherusers'), +(5,52001,51966,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Spaulders only for leatherusers'), +(5,52002,51962,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Bracers only for leatherusers'), +(5,52002,51963,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Stompers only for leatherusers'), +(5,52003,51959,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'), +(5,52004,51960,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Gloves only for leatherusers'), +(5,52005,51961,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Shoulderguards only for leatherusers'), +-- Mail Items +(5,51999,51978,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'), +(5,52000,51980,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Handgrips only for mail users'), +(5,52001,51976,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulderguards only for mail users'), +(5,52002,51982,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Boots only for mail users'), +(5,52002,51981,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Wristguards only for mail users'), +(5,52003,51977,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'), +(5,52004,51979,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Grips only for mail users'), +(5,52005,51975,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulders only for mail users'), +-- Plate Items +(5,52001,51984,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderpads only for plate users'), +(5,52002,51989,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Bands only for plate users'), +(5,52002,51990,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Treads only for plate users'), +(5,52003,51985,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Belt only for plate users'), +(5,52004,51987,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Grips only for plate users'), +(5,52005,51983,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderguards only for plate users'); diff --git a/sql/old/3.3.5a/2012_05_12_02_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_05_12_02_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..b1f445faa59 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_12_02_world_gameobject_loot_template.sql @@ -0,0 +1,37 @@ +-- Add Reference Loots +SET @RefNormal := 35091; +SET @RefHeroic := 35092; +DELETE FROM `reference_loot_template` WHERE `entry` IN (@RefNormal,@RefHeroic); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Normal Loot +(@RefNormal,49839,0,1,1,1,1), -- Mourning Malice +(@RefNormal,49840,0,1,1,1,1), -- Hate-Forged Cleaver +(@RefNormal,49841,0,1,1,1,1), -- Blackened Geist Ribs +(@RefNormal,49842,0,1,1,1,1), -- Tapestry of the Frozen Throne +(@RefNormal,49843,0,1,1,1,1), -- Crystalline Citadel Gauntlets +(@RefNormal,49844,0,1,1,1,1), -- Crypt Fiend Slayer +(@RefNormal,49845,0,1,1,1,1), -- Bone Golem Scapula +(@RefNormal,49846,0,1,1,1,1), -- Chilled Heart of the Glacier +(@RefNormal,49847,0,1,1,1,1), -- Legguards of Untimely Demise +(@RefNormal,49848,0,1,1,1,1), -- Grim Lasher Shoulderguards +(@RefNormal,49849,0,1,1,1,1), -- Tattered Glacial-Woven Hood +(@RefNormal,49851,0,1,1,1,1), -- Greathelm of the Silver Hand +-- Heroic Loot +(@RefHeroic,50303,0,1,1,1,1), -- Black Icicle +(@RefHeroic,50302,0,1,1,1,1), -- Liar's Tongue +(@RefHeroic,50311,0,1,1,1,1), -- Second Helm of the Executioner +(@RefHeroic,50312,0,1,1,1,1), -- Chestguard of Broken Branches +(@RefHeroic,50310,0,1,1,1,1), -- Fossilized Ammonite Choker +(@RefHeroic,50313,0,1,1,1,1), -- Oath of Empress Zoe +(@RefHeroic,50309,0,1,1,1,1), -- Shriveled Heart +(@RefHeroic,50314,0,1,1,1,1), -- Strip of Remorse +(@RefHeroic,50308,0,1,1,1,1), -- Blighted Leather Footpads +(@RefHeroic,50305,0,1,1,1,1), -- Grinning Skull Boots +(@RefHeroic,50306,0,1,1,1,1), -- The Lady's Promise +(@RefHeroic,50304,0,1,1,1,1); -- Hoarfrost Gauntlets +-- Assign to the chest +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (27985,27993); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(27985,1,100,1,0,-@RefNormal,2), -- Two from Normal Reference Loot +(27993,1,100,1,0,-@RefHeroic,2), -- Two from Heroic Reference Loot +(27993,43102,85,1,0,1,1); -- Frozen Orb diff --git a/sql/old/3.3.5a/2012_05_13_00_world_creature_text.sql b/sql/old/3.3.5a/2012_05_13_00_world_creature_text.sql new file mode 100644 index 00000000000..8d083156fb0 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_13_00_world_creature_text.sql @@ -0,0 +1,13 @@ +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=36494; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(36494,0,0, 'Tiny creatures under feet, you bring Garfrost something good to eat!',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,1,0, 'Axe too weak. Garfrost make better and CRUSH YOU.',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,2,0, 'Garfrost tired of puny mortals. Now your bones will freeze!',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,3,0, 'Garfrost hope giant underpants clean. Save boss great shame. For later.',14,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,4,0, 'Will save for snack. For later.',12,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,4,1, 'That one maybe not so good to eat now. Stupid Garfrost! BAD! BAD!',12,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,5,0, '%s hurls a massive saronite boulder at you!',16,0,100,0,0,0, 'Forgemaster Garfrost'), +(36494,6,0, '%s casts |cFF00AACCDeep Freeze|r at $n.',41,0,100,0,0,0, 'Forgemaster Garfrost'); +-- Remove old script text +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1658006 AND -1658001; diff --git a/sql/old/3.3.5a/2012_05_13_01_world_creature_text.sql b/sql/old/3.3.5a/2012_05_13_01_world_creature_text.sql new file mode 100644 index 00000000000..8e983fd9a73 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_13_01_world_creature_text.sql @@ -0,0 +1,14 @@ +-- NPC talk text insert for Sara +DELETE FROM `creature_text` WHERE `entry`=33134; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(33134,0,0, 'Help me! Please get them off me!',14,0,100,0,0,15771, 'Sara YELL_PREFIGHT'), +(33134,0,1, 'What do you want from me? Leave me alone!',14,0,100,0,0,15772, 'Sara YELL_PREFIGHT'), +(33134,1,0, 'Yes! YES! Show them no mercy! Give no pause to your attacks!',14,0,100,0,0,15773, 'Sara YELL_COMBAT_PHASE_1'), +(33134,1,1, 'Let hatred and rage guide your blows!',14,0,100,0,0,15774, 'Sara YELL_COMBAT_PHASE_1'), +(33134,1,2, 'The time to strike at the head of the beast will soon be upon us! Focus your anger and hatred on his minions!',14,0,100,457,0,15775, 'Sara YELL_COMBAT_PHASE_1'), +(33134,2,0, 'Suffocate upon your own hate!',14,0,100,0,0,15776, 'Sara YELL_COMBAT_PHASE_2'), +(33134,2,1, 'Tremble, mortals, before the coming of the end!',14,0,100,0,0,15777, 'Sara YELL_COMBAT_PHASE_2'), +(33134,3,0, 'Powerless to act...',14,0,100,0,0,15778, 'Sara YELL_SLAY'), +(33134,3,1, 'Could they have been saved?',14,0,100,0,0,15779, 'YELL SAY_SLAY'); +-- remove script text +DELETE FROM script_texts WHERE entry BETWEEN -1603319 AND -1603310; diff --git a/sql/old/3.3.5a/2012_05_16_00_world_scripts.sql b/sql/old/3.3.5a/2012_05_16_00_world_scripts.sql new file mode 100644 index 00000000000..9997c09bd8d --- /dev/null +++ b/sql/old/3.3.5a/2012_05_16_00_world_scripts.sql @@ -0,0 +1,2 @@ +-- Add script to Dragonspire Hall Runes "UBRS" +UPDATE `gameobject_template` SET `ScriptName`= 'go_dragonspire_hall_rune' WHERE `entry` BETWEEN 175194 AND 175200; diff --git a/sql/old/3.3.5a/2012_05_17_00_world_creature_text.sql b/sql/old/3.3.5a/2012_05_17_00_world_creature_text.sql new file mode 100644 index 00000000000..d7df0f94c0b --- /dev/null +++ b/sql/old/3.3.5a/2012_05_17_00_world_creature_text.sql @@ -0,0 +1,7 @@ +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=9816; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(9816,0,0, '%s begins to regain its strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'), +(9816,1,0, '%s is nearly at full strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'), +(9816,2,0, '%s regains its power and breaks free of its bonds!',16,0,100,0,0,0, 'Pyroguard Emberseer'), +(9816,3,0, 'Ha! Ha! Ha! Thank you for freeing me, fools. Now let me repay you by charring the flesh from your bones.',14,0,100,0,0,0, 'Pyroguard Emberseer'); diff --git a/sql/old/3.3.5a/2012_05_18_00_world_conditions.sql b/sql/old/3.3.5a/2012_05_18_00_world_conditions.sql new file mode 100644 index 00000000000..ad18a6c65ef --- /dev/null +++ b/sql/old/3.3.5a/2012_05_18_00_world_conditions.sql @@ -0,0 +1,3 @@ +DELETE FROM `conditions` WHERE `SourceEntry` = 52264; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,0,52264,0,0,29,0,28653,5,0,0,97,"","Creature conditions for spell 52264 (Deliver stolen horse)"); diff --git a/sql/old/3.3.5a/2012_05_18_01_world_misc.sql b/sql/old/3.3.5a/2012_05_18_01_world_misc.sql new file mode 100644 index 00000000000..bded6fae447 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_18_01_world_misc.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_proc_event` WHERE `entry` = 70656; + +UPDATE `quest_template` SET `NextQuestId` = 3761 WHERE `id` IN (936,3784,3762); + +DELETE FROM `spell_proc_event` WHERE `entry` = 63611; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(63611,0,0,0,0,0,51154,0,0,0,0); diff --git a/sql/old/3.3.5a/2012_05_18_01_world_spell_target_position.sql b/sql/old/3.3.5a/2012_05_18_01_world_spell_target_position.sql new file mode 100644 index 00000000000..72ebc409d9d --- /dev/null +++ b/sql/old/3.3.5a/2012_05_18_01_world_spell_target_position.sql @@ -0,0 +1,9 @@ +DELETE FROM `spell_target_position` WHERE `id` IN (30719,53140,53141,53360,54406,68328,71512); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(30719,571,5807.75,588.347,661.505,1.663), +(53140,571,5807.75,588.347,661.505,1.663), +(53141,571,5807.75,588.347,661.505,1.663), +(53360,571,5807.75,588.347,661.505,1.663), +(54406,571,5807.75,588.347,661.505,1.663), +(68328,571,5807.75,588.347,661.505,1.663), +(71512,571,5807.75,588.347,661.505,1.663); diff --git a/sql/old/3.3.5a/2012_05_19_00_world_quest_template.sql b/sql/old/3.3.5a/2012_05_19_00_world_quest_template.sql new file mode 100644 index 00000000000..f18172ed836 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_19_00_world_quest_template.sql @@ -0,0 +1,2 @@ +-- Change Flags for the Body and Heart Quest +UPDATE `quest_template` SET `Flags`=`Flags`&~2, `SpecialFlags`=`SpecialFlags`|2 WHERE `id` IN (6001,6002); diff --git a/sql/old/3.3.5a/2012_05_19_01_world_smart_scripts.sql b/sql/old/3.3.5a/2012_05_19_01_world_smart_scripts.sql new file mode 100644 index 00000000000..06169d8610a --- /dev/null +++ b/sql/old/3.3.5a/2012_05_19_01_world_smart_scripts.sql @@ -0,0 +1,7 @@ +-- Fix Quest 9962,9967,9970,9972,9973 +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18398 AND `id`=1; -- Brokentoe +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18399 AND `id`=4; -- Murkblood Twin +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18400 AND `id`=5; -- Rokdar the Sundered Lord +UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18401 AND `id`=3; -- Skra'gath +UPDATE `smart_scripts` SET `id`=5,`link`=6,`target_type`=16 WHERE `entryorguid`=18402 AND `action_type`=15; -- Warmaul Champion +UPDATE `smart_scripts` SET `id`=6 WHERE `entryorguid`=18402 AND `action_type`=45; -- Warmaul Champion diff --git a/sql/old/3.3.5a/2012_05_19_02_world_misc.sql b/sql/old/3.3.5a/2012_05_19_02_world_misc.sql new file mode 100644 index 00000000000..97a77ac0ab3 --- /dev/null +++ b/sql/old/3.3.5a/2012_05_19_02_world_misc.sql @@ -0,0 +1,6 @@ +-- 2012-05-19 12:48:24 SourceEntry 52264 in `condition` table, has incorrect SourceGroup 0 (spell effectMask) set , ignoring. +UPDATE `conditions` SET `SourceGroup`=1 WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=0 AND `SourceEntry`=52264 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=29 AND `ConditionTarget`=0 AND `ConditionValue1`=28653 AND `ConditionValue2`=5 AND `ConditionValue3`=0; + +-- 2012-05-19 12:48:18 Quest 384 has `ZoneOrSort` = -304 but `RequiredSkillId` does not have a corresponding value (185). +-- It is not clear if cooking was required on 3.3.5, so reverting it to its original state (however we are sure it is not required in Cata) +UPDATE `quest_template` SET `RequiredSkillId`=185, `RequiredSkillPoints`=1 WHERE `Id`=384; diff --git a/sql/updates/auth/2012_02_19_00_auth_account.sql b/sql/updates/auth/2012_02_19_00_auth_account.sql deleted file mode 100644 index a5b48ede3b4..00000000000 --- a/sql/updates/auth/2012_02_19_00_auth_account.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `account` - ADD COLUMN `os` VARCHAR(4) DEFAULT '' NOT NULL AFTER `locale`; diff --git a/sql/updates/auth/2012_03_25_00_auth_misc.sql b/sql/updates/auth/2012_03_25_00_auth_misc.sql deleted file mode 100644 index f34882af8f6..00000000000 --- a/sql/updates/auth/2012_03_25_00_auth_misc.sql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE `account_banned` - CHANGE `bandate` `bandate` INT(10) UNSIGNED DEFAULT 0 NOT NULL, - CHANGE `unbandate` `unbandate` INT(10) UNSIGNED DEFAULT 0 NOT NULL; - -ALTER TABLE `ip_banned` - CHANGE `ip` `ip` VARCHAR(15) CHARSET utf8 COLLATE utf8_general_ci DEFAULT '127.0.0.1' NOT NULL, - CHANGE `bandate` `bandate` INT(10) UNSIGNED NOT NULL, - CHANGE `unbandate` `unbandate` INT(10) UNSIGNED NOT NULL; diff --git a/sql/updates/auth/2012_03_26_00_auth_realmlist.sql b/sql/updates/auth/2012_03_26_00_auth_realmlist.sql deleted file mode 100644 index 0a570a31773..00000000000 --- a/sql/updates/auth/2012_03_26_00_auth_realmlist.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `realmlist` - CHANGE `color` `flag` tinyint(3) unsigned NOT NULL DEFAULT '2'; diff --git a/sql/updates/auth/2012_03_28_00_auth_account.sql b/sql/updates/auth/2012_03_28_00_auth_account.sql deleted file mode 100644 index 199baac5178..00000000000 --- a/sql/updates/auth/2012_03_28_00_auth_account.sql +++ /dev/null @@ -1,13 +0,0 @@ -ALTER TABLE `account` - CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Identifier', - CHANGE `sessionkey` `sessionkey` VARCHAR(80) NOT NULL DEFAULT '', - CHANGE `v` `v` VARCHAR(64) NOT NULL DEFAULT '', - CHANGE `s` `s` VARCHAR(64) NOT NULL DEFAULT '', - CHANGE `email` `email` VARCHAR(254) NOT NULL DEFAULT '', - CHANGE `last_ip` `last_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1', - CHANGE `failed_logins` `failed_logins` INT(10) UNSIGNED NOT NULL DEFAULT '0', - CHANGE `online` `online` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', - CHANGE `mutetime` `mutetime` BIGINT(20) NOT NULL DEFAULT '0', - CHANGE `os` `os` VARCHAR(3) NOT NULL DEFAULT '', - CHANGE `recruiter` `recruiter` INT(10) UNSIGNED NOT NULL DEFAULT '0', - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_01_auth_account_access.sql b/sql/updates/auth/2012_03_28_01_auth_account_access.sql deleted file mode 100644 index 456dbf6c104..00000000000 --- a/sql/updates/auth/2012_03_28_01_auth_account_access.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE `account_access` - CHANGE `id` `id` INT(10) UNSIGNED NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_02_auth_account_banned.sql b/sql/updates/auth/2012_03_28_02_auth_account_banned.sql deleted file mode 100644 index 917cea1a684..00000000000 --- a/sql/updates/auth/2012_03_28_02_auth_account_banned.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `account_banned` - CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Account id', - CHANGE `active` `active` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql b/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql deleted file mode 100644 index 2e754effc60..00000000000 --- a/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `ip_banned` - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_04_auth_logs.sql b/sql/updates/auth/2012_03_28_04_auth_logs.sql deleted file mode 100644 index 4c837a47ed1..00000000000 --- a/sql/updates/auth/2012_03_28_04_auth_logs.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE `logs` - CHANGE `time` `time` INT(10) UNSIGNED NOT NULL, - CHANGE `realm` `realm` INT(10) UNSIGNED NOT NULL, - CHANGE `type` `type` TINYINT(3) UNSIGNED NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql b/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql deleted file mode 100644 index e50b3c3f331..00000000000 --- a/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `realmcharacters` - CHANGE `realmid` `realmid` INT(10) UNSIGNED DEFAULT 0 NOT NULL, - CHANGE `acctid` `acctid` INT(10) UNSIGNED NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_06_auth_realmlist.sql b/sql/updates/auth/2012_03_28_06_auth_realmlist.sql deleted file mode 100644 index 725702a9803..00000000000 --- a/sql/updates/auth/2012_03_28_06_auth_realmlist.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE `realmlist` - CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, - CHANGE `address` `address` VARCHAR(15) DEFAULT '127.0.0.1' NOT NULL, - CHANGE `port` `port` SMALLINT(5) UNSIGNED DEFAULT '8085' NOT NULL, - CHANGE `gamebuild` `gamebuild` INT(10) UNSIGNED DEFAULT '12340' NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_03_28_07_auth_uptime.sql b/sql/updates/auth/2012_03_28_07_auth_uptime.sql deleted file mode 100644 index 0ea4e3321df..00000000000 --- a/sql/updates/auth/2012_03_28_07_auth_uptime.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE `uptime` - DROP COLUMN `startstring`, - CHANGE `realmid` `realmid` INT(10) UNSIGNED NOT NULL, - CHANGE `starttime` `starttime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, - CHANGE `uptime` `uptime` INT(10) UNSIGNED DEFAULT 0 NOT NULL, - ROW_FORMAT=DEFAULT ENGINE=INNODB; diff --git a/sql/updates/auth/2012_04_01_00_auth_realmlist.sql b/sql/updates/auth/2012_04_01_00_auth_realmlist.sql deleted file mode 100644 index e2e1efaf993..00000000000 --- a/sql/updates/auth/2012_04_01_00_auth_realmlist.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `realmlist` CHANGE `address` `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; diff --git a/sql/updates/auth/2012_04_04_00_auth_realmlist.sql b/sql/updates/auth/2012_04_04_00_auth_realmlist.sql deleted file mode 100644 index 18f2d7b3d4c..00000000000 --- a/sql/updates/auth/2012_04_04_00_auth_realmlist.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `realmlist` CHANGE `address` `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '127.0.0.1'; diff --git a/sql/updates/characters/2012_02_19_00_characters_warden_action.sql b/sql/updates/characters/2012_02_19_00_characters_warden_action.sql deleted file mode 100644 index 587f65fedc5..00000000000 --- a/sql/updates/characters/2012_02_19_00_characters_warden_action.sql +++ /dev/null @@ -1,7 +0,0 @@ -DROP TABLE IF EXISTS `warden_action`; - -CREATE TABLE `warden_action` ( - `wardenId` smallint(5) unsigned NOT NULL, - `action` tinyint(3) unsigned DEFAULT NULL, - PRIMARY KEY (`wardenId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql b/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql deleted file mode 100644 index 151ace1c976..00000000000 --- a/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `lag_reports` ADD `latency` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `lag_reports` ADD `createTime` int(10) unsigned NOT NULL DEFAULT '0'; diff --git a/sql/updates/world/2012_02_13_00_world_version.sql b/sql/updates/world/2012_02_13_00_world_version.sql deleted file mode 100644 index 2dd7ab92ddb..00000000000 --- a/sql/updates/world/2012_02_13_00_world_version.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `version` SET `db_version`='TDB 335.11.46' LIMIT 1; diff --git a/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql b/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql deleted file mode 100644 index e7993726132..00000000000 --- a/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Criteria conditions for Once Bitten, Twice Shy achievement -DELETE FROM `achievement_criteria_data` WHERE `type`=12 AND `criteria_id` IN (13013, 13012, 13011, 12780); -INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`scriptname`) VALUES -(13013, 12, 1, 0, ""), -- heroic -(13012, 12, 1, 0, ""), -- heroic -(13011, 12, 0, 0, ""), -- normal -(12780, 12, 0, 0, ""); -- normal diff --git a/sql/updates/world/2012_02_15_00_world_quest_template.sql b/sql/updates/world/2012_02_15_00_world_quest_template.sql deleted file mode 100644 index e26f52fd0fe..00000000000 --- a/sql/updates/world/2012_02_15_00_world_quest_template.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `quest_template` SET `OfferRewardText` = 'Good, $C. You have done well in serving the Dark Lady. Your continued perseverance and ambition will be of great use to the Lady''s subjects. Return to me again in the future. Perhaps I will have other tasks for you that will aid the Dark Lady in her attempts at overtaking the Lich King and completely freeing the Scourge.', `RequestItemsText` = 'There are a hundred other tasks awaiting my attention, $C. Do you have the books?' WHERE `Id` = 14356; diff --git a/sql/updates/world/2012_02_15_01_world_areatrigger_tavern.sql b/sql/updates/world/2012_02_15_01_world_areatrigger_tavern.sql deleted file mode 100644 index 1c3d45dc490..00000000000 --- a/sql/updates/world/2012_02_15_01_world_areatrigger_tavern.sql +++ /dev/null @@ -1,13 +0,0 @@ -DELETE FROM `areatrigger_tavern` WHERE `id` IN (98, 4109, 4300, 4378, 4380, 4498, 4608, 5314, 5315, 5316, 5317); -INSERT INTO `areatrigger_tavern` (`id`, `name`) VALUES -(98, 'Nesingwary''s Expedition'), -(4109, 'Tranquillen - Upper level Inn'), -(4300, 'Cenarion Refugee - Outside Inn'), -(4378, 'Stonebreaker Hold Inn'), -(4380, 'Falcon Watch Inn'), -(4498, 'Old Hillsbrad Foothills Inn'), -(4608, 'Sanctum Of The Stars - Upper level Inn'), -(5314, 'Wyrmrest Temple'), -(5315, 'Wyrmrest Temple'), -(5316, 'Wyrmrest Temple'), -(5317, 'Wyrmrest Temple'); diff --git a/sql/updates/world/2012_02_15_02_world_item_template.sql b/sql/updates/world/2012_02_15_02_world_item_template.sql deleted file mode 100644 index 463d43368cd..00000000000 --- a/sql/updates/world/2012_02_15_02_world_item_template.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `item_template` WHERE `entry`=49867; -INSERT INTO `item_template` (`entry`, `class`, `subclass`, `unk0`, `name`, `displayid`, `Quality`, `Flags`, `FlagsExtra`, `BuyCount`, `BuyPrice`, `SellPrice`, `InventoryType`, `AllowableClass`, `AllowableRace`, `ItemLevel`, `RequiredLevel`, `RequiredSkill`, `RequiredSkillRank`, `requiredspell`, `requiredhonorrank`, `RequiredCityRank`, `RequiredReputationFaction`, `RequiredReputationRank`, `maxcount`, `stackable`, `ContainerSlots`, `StatsCount`, `stat_type1`, `stat_value1`, `stat_type2`, `stat_value2`, `stat_type3`, `stat_value3`, `stat_type4`, `stat_value4`, `stat_type5`, `stat_value5`, `stat_type6`, `stat_value6`, `stat_type7`, `stat_value7`, `stat_type8`, `stat_value8`, `stat_type9`, `stat_value9`, `stat_type10`, `stat_value10`, `ScalingStatDistribution`, `ScalingStatValue`, `dmg_min1`, `dmg_max1`, `dmg_type1`, `dmg_min2`, `dmg_max2`, `dmg_type2`, `armor`, `holy_res`, `fire_res`, `nature_res`, `frost_res`, `shadow_res`, `arcane_res`, `delay`, `ammo_type`, `RangedModRange`, `spellid_1`, `spelltrigger_1`, `spellcharges_1`, `spellppmRate_1`, `spellcooldown_1`, `spellcategory_1`, `spellcategorycooldown_1`, `spellid_2`, `spelltrigger_2`, `spellcharges_2`, `spellppmRate_2`, `spellcooldown_2`, `spellcategory_2`, `spellcategorycooldown_2`, `spellid_3`, `spelltrigger_3`, `spellcharges_3`, `spellppmRate_3`, `spellcooldown_3`, `spellcategory_3`, `spellcategorycooldown_3`, `spellid_4`, `spelltrigger_4`, `spellcharges_4`, `spellppmRate_4`, `spellcooldown_4`, `spellcategory_4`, `spellcategorycooldown_4`, `spellid_5`, `spelltrigger_5`, `spellcharges_5`, `spellppmRate_5`, `spellcooldown_5`, `spellcategory_5`, `spellcategorycooldown_5`, `bonding`, `description`, `PageText`, `LanguageID`, `PageMaterial`, `startquest`, `lockid`, `Material`, `sheath`, `RandomProperty`, `RandomSuffix`, `block`, `itemset`, `MaxDurability`, `area`, `Map`, `BagFamily`, `TotemCategory`, `socketColor_1`, `socketContent_1`, `socketColor_2`, `socketContent_2`, `socketColor_3`, `socketContent_3`, `socketBonus`, `GemProperties`, `RequiredDisenchantSkill`, `ArmorDamageModifier`, `Duration`, `ItemLimitCategory`, `HolidayId`, `ScriptName`, `DisenchantID`, `FoodType`, `minMoneyLoot`, `maxMoneyLoot`, `WDBVerified`) VALUES -(49867, 12, 0, -1, 'Crown Chemical Co. Supplies', 11448, 1, 0, 8192, 1, 0, 0, 0, -1, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 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, 1000, 0, 0, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 0, 0, NULL, 0, -1, 0, -1, 4, 'You can hear the clink of glass... dont drop it!', 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 423, 0, 0, 0, 0, 14545); diff --git a/sql/updates/world/2012_02_15_03_world_quest_template.sql b/sql/updates/world/2012_02_15_03_world_quest_template.sql deleted file mode 100644 index 833d36b246c..00000000000 --- a/sql/updates/world/2012_02_15_03_world_quest_template.sql +++ /dev/null @@ -1,18 +0,0 @@ --- Love is in the Air --- Quests Missing Text ... By Albis - -UPDATE `quest_template` SET `RequestItemsText` ='The cologne isn''t going to give itself out, you know.$B$BGet spraying!' , `OfferRewardText` ='Nice work, $N! People will be buying Crown colognes by the crate-load now that they''ve had a chance to try them.$B$BHere''s a little something for helping us out.' WHERE `Id` = 24635; -UPDATE `quest_template` SET `RequestItemsText` ='That perfume''s not going to spray itself, you know.$B$BGet going!' , `OfferRewardText` ='Great work, $N! People will come running to buy Crown perfumes now that they''ve had a chance to sample their wonders.$B$BHere''s a little something for helping us out.' WHERE `Id` = 24629; -UPDATE `quest_template` SET `RequestItemsText` ='You know, those chocolates aren''t going to fling themselves at people.$B$BYou need to get to work!' , `OfferRewardText` ='Lovely work, $N! People will be tripping over one another to get Crown chocolates now that they''ve had a chance to taste those sweet, romantic treats.$B$BHere''s a little something for helping us out.' WHERE `Id` = 24636; -UPDATE `quest_template` SET `OfferRewardText` ='Hey. You got some time on your hands? I could use someone like you.' WHERE `Id` IN (24804,24805); -UPDATE `quest_template` SET `RequestItemsText` ='You analyze that reek yet, kid?' , `OfferRewardText` ='Hey, thanks, kid. Give it over, let''s take a look.$B$B$B$BOh, that ain''t good.' WHERE `Id` IN (24655,24536); -UPDATE `quest_template` SET `RequestItemsText` ='Did they toss ya a crate to deliver?' , `OfferRewardText` ='You got it, huh? Good job, kid. Top notch. Let''s see what we what we got here.$B$B$B$BThat''s not like my Snivel, but what choice is there?' WHERE `Id` = 24848; -UPDATE `quest_template` SET `OfferRewardText` ='You''re not Snivel. He was supposed to be here an hour ago! What have you done with him?$B$B$B$BThis isn''t like my Snivel. Do you think something''s happened to him?' WHERE `Id` = 24850; -UPDATE `quest_template` SET `RequestItemsText` ='Who are you?' , `OfferRewardText` ='All he talked about was leaving town with all his money? Then he really has abandoned me, hasn''t he?$B$BOh, $N. I was such a fool to fall for him, but how could I help myself? He was so irresistible!' WHERE `Id` = 24849; -UPDATE `quest_template` SET `RequestItemsText` ='Who are you?' , `OfferRewardText` ='All he talked about was leaving town with all his money? Then he really has abandoned me, hasn''t he?$B$BI can''t believe I fell for such a horrible goblin! But he was so irresistible when we first met.' WHERE `Id` = 24851; -UPDATE `quest_template` SET `RequestItemsText` ='Did you find the guy, or did he crawl under a rock?' , `OfferRewardText` ='You got his ledger? Really? That''s great, $N. There''s probably loads of good information in here.' WHERE `Id` IN (24657,24576); -UPDATE `quest_template` SET `OfferRewardText` ='Fantastic. Help is exactly what I need.' WHERE `Id` IN (24792,24793); -UPDATE `quest_template` SET `RequestItemsText` ='I don''t remember ordering a cleaing service... why yes, I am Apothecary Hummel.$B$B...wait, what is the meaning of this? You think these meaningless papers can stop me? Hah!' , `OfferRewardText` ='What we do here is none of your business...' WHERE `Id` = 11488; -UPDATE `quest_template` SET `RequestItemsText` ='Did you take care of those no-good scheming villains?' , `OfferRewardText` ='What''ve you got there?$B$BOh hey, this is big. Real big. Most of the crazy details in one little package. Thanks - you really helped us reel this all in. Good working with ya.' WHERE `Id` IN (24745,14483); -UPDATE `quest_template` SET `RequestItemsText` ='Did you teach ''em a lesson?' , `OfferRewardText` ='Good job, kid. You deserve a little somethin''. And hey, come back tomorrow if you get the time; I might have a job for ya.' WHERE `Id` IN (24658,24665,24666,24664,24663,24659,24660,24662,24647,24638,24651,24652,24650,24649,24645,24648); diff --git a/sql/updates/world/2012_02_15_04_world_quest_template.sql b/sql/updates/world/2012_02_15_04_world_quest_template.sql deleted file mode 100644 index 8b6ad1d2cf9..00000000000 --- a/sql/updates/world/2012_02_15_04_world_quest_template.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Horde -UPDATE `quest_template` SET `PrevQuestId`=24805 WHERE `Id`=24536; -- Uncommon Scents completed before starting Something Stinks -UPDATE `quest_template` SET `PrevQuestId`=24536 WHERE `Id`=24541; -- Something Stinks completed before starting Pilfering Perfume -UPDATE `quest_template` SET `PrevQuestId`=24541 WHERE `Id`=24850; -- Pilfering Perfume completed before starting Snivel's Sweetheart -UPDATE `quest_template` SET `PrevQuestId`=24850 WHERE `Id`=24851; -- Snivel's Sweetheart completed before starting Hot On The Trail -UPDATE `quest_template` SET `PrevQuestId`=24851 WHERE `Id`=24576; -- Hot On The Trail completed before starting A Friendly Chat... - -UPDATE `quest_template` SET `PrevQuestId`=24576 WHERE `Id` IN (24638,24645,24647,24648,24649,24650,24651,24652); -- A Friendly Chat... completed before starting Crushing the Crown - --- Alliance -UPDATE `quest_template` SET `PrevQuestId`=24804 WHERE `Id`=24655; -- Uncommon Scents completed before starting Something Stinks -UPDATE `quest_template` SET `PrevQuestId`=24655 WHERE `Id`=24656; -- Something Stinks completed before starting Pilfering Perfume -UPDATE `quest_template` SET `PrevQuestId`=24656 WHERE `Id`=24848; -- Pilfering Perfume completed before starting Snivel's Sweetheart -UPDATE `quest_template` SET `PrevQuestId`=24848 WHERE `Id`=24849; -- Snivel's Sweetheart completed before starting Hot On The Trail -UPDATE `quest_template` SET `PrevQuestId`=24849 WHERE `Id`=24657; -- Hot On The Trail completed before starting A Friendly Chat... - -UPDATE `quest_template` SET `PrevQuestId`=24657 WHERE `Id` IN (24658,24659,24660,24662,24663,24664,24665,24666); -- A Friendly Chat... completed before starting Crushing the Crown diff --git a/sql/updates/world/2012_02_15_06_world_creature_involvedrelation.sql b/sql/updates/world/2012_02_15_06_world_creature_involvedrelation.sql deleted file mode 100644 index 431e23b53b8..00000000000 --- a/sql/updates/world/2012_02_15_06_world_creature_involvedrelation.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `creature_involvedrelation` WHERE `quest`=24745; -INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES -(38066, 24745); -- A - Something is in the Air (and it Ain't Love) - Inspector Snip Snagglebolt diff --git a/sql/updates/world/2012_02_15_07_00_world_creature.sql b/sql/updates/world/2012_02_15_07_00_world_creature.sql deleted file mode 100644 index 75beec97d67..00000000000 --- a/sql/updates/world/2012_02_15_07_00_world_creature.sql +++ /dev/null @@ -1,57 +0,0 @@ -SET @GUID := 40489; -SET @NPC :=3254; - -DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+7; -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 ,@NPC,1,1,1,0,0, 10.3997021, -2316.43555, 92.1945343, 2.91896486,120,0,0,1,0,0,0,0,0), -(@GUID+1,@NPC,1,1,1,0,0,346.736572 , -2606.38916, 91.7916641, 1.58010352,120,0,0,1,0,0,0,0,0), -(@GUID+2,@NPC,1,1,1,0,0, 83.07206 , -2545.2085 , 98.107666 , 1.86412442,120,0,0,1,0,0,0,0,0), -(@GUID+3,@NPC,1,1,1,0,0,-93.53362 , -2287.0835 , 92.35358 , 0.8518014 ,120,0,0,1,0,0,0,0,0), -(@GUID+4,@NPC,1,1,1,0,0,-618.9995,-2738.234,91.91664,4.303216,120,0,0,1,0,0,0,0,0), -(@GUID+5,@NPC,1,1,1,0,0,-491.2982,-2473.443,93.66666,2.670027,120,0,0,1,0,0,0,0,0), -(@GUID+6,@NPC,1,1,1,0,0,-614.9523,-2721.66 ,93.85735,1.412064,120,0,0,1,0,0,0,0,0), -(@GUID+7,@NPC,1,1,1,0,0,-617.4864,-2710.463,96.7657 ,1.582084,120,0,0,1,0,0,0,0,0); - -SET @NPC1=@GUID*10; -SET @NPC2=(@GUID+1)*10; -SET @NPC3=(@GUID+2)*10; -SET @NPC4=(@GUID+3)*10; -SET @NPC5=(@GUID+6)*10; -SET @NPC6=(@GUID+7)*10; - -DELETE FROM `waypoint_data` WHERE `id` IN (@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6); -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES --- 1st -(@NPC1,1,6.336712,-2322.309,92.16663,0,0,0,0,100,0), --- 2nd -(@NPC2,1,346.4289,-2573.332,91.79166,0,0,0,0,100,0), --- 3rd -(@NPC3,1,81.53384,-2540.826,97.38716,0,0,0,0,100,0), -(@NPC3,2,80.28384,-2537.076,96.63716,0,0,0,0,100,0), -(@NPC3,3,79.03384,-2533.326,95.38716,0,0,0,0,100,0), -(@NPC3,4,78.28384,-2530.326,94.63716,0,0,0,0,100,0), -(@NPC3,5,77.03384,-2526.576,93.63716,0,0,0,0,100,0), -(@NPC3,6,76.49564,-2523.443,93.66665,0,0,0,0,100,0), --- 4th -(@NPC4,1,-88.46167,-2281.137,92.69763,0,0,0,0,100,0), -(@NPC4,2,-92.46167,-2285.637,91.94763,0,0,0,0,100,0), --- 5th -(@NPC5,1,-614.9318,-2720.435,94.01199,0,0,0,0,100,0), --- 6th -(@NPC6,1,-617.2921,-2722.99,93.41664,0,0,0,0,100,0), -(@NPC6,2,-617.3077,-2721.99,93.41664,0,0,0,0,100,0), -(@NPC6,3,-617.3398,-2719.99,94.16664,0,0,0,0,100,0), -(@NPC6,4,-617.3867,-2716.99,95.04164,0,0,0,0,100,0), -(@NPC6,5,-617.4336,-2713.99,95.91664,0,0,0,0,100,0), -(@NPC6,6,-617.4805,-2710.99,96.66664,0,0,0,0,100,0), -(@NPC6,7,-617.503,-2708.995,97.04164,0,0,0,0,100,0), -(@NPC6,8,-617.503,-2708.995,97.04164,0,0,0,0,100,0); - -DELETE FROM `creature_addon` WHERE `guid` IN (@GUID,@GUID+1,@GUID+2,@GUID+3,@GUID+6,@GUID+7); -INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(@GUID ,@NPC1,0,0,0,0,''), -(@GUID+1,@NPC2,0,0,0,0,''), -(@GUID+2,@NPC3,0,0,0,0,''), -(@GUID+3,@NPC4,0,0,0,0,''), -(@GUID+6,@NPC5,0,0,0,0,''), -(@GUID+7,@NPC6,0,0,0,0,''); diff --git a/sql/updates/world/2012_02_15_07_01_world_waypoint_data.sql b/sql/updates/world/2012_02_15_07_01_world_waypoint_data.sql deleted file mode 100644 index e47572b2074..00000000000 --- a/sql/updates/world/2012_02_15_07_01_world_waypoint_data.sql +++ /dev/null @@ -1,147 +0,0 @@ -SET @NPC := 26841; -SET @GUID := 40497; -- need 9 - -SET @SPAWN0 := (@GUID )*10; -SET @SPAWN1 := (@GUID+1)*10; -SET @SPAWN2 := (@GUID+2)*10; -SET @SPAWN3 := (@GUID+3)*10; -SET @SPAWN4 := (@GUID+4)*10; -SET @SPAWN5 := (@GUID+5)*10; -SET @SPAWN6 := (@GUID+6)*10; -SET @SPAWN7 := (@GUID+7)*10; -SET @SPAWN8 := (@GUID+8)*10; - -DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+8; -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 ,@NPC,571,1,1,0,0,4690.292,859.291,154.1271,2.914072,120,0,0,1,0,0,0,0,0), -(@GUID+1,@NPC,571,1,1,0,0,4362.418,750.5102,123.7846,6.194367,120,0,0,1,0,0,0,0,0), -(@GUID+2,@NPC,571,1,1,0,0,4191.03,645.8215,109.6868,0.4027403,120,0,0,1,0,0,0,0,0), -(@GUID+3,@NPC,571,1,1,0,0,4098.345,657.0866,99.36436,5.185792,120,0,0,1,0,0,0,0,0), -(@GUID+4,@NPC,571,1,1,0,0,4065.753,709.2308,108.47,1.153499,120,0,0,1,0,0,0,0,0), -(@GUID+5,@NPC,571,1,1,0,0,4012.895,495.4877,82.1595,0.8684024,120,0,0,1,0,0,0,0,0), -(@GUID+6,@NPC,571,1,1,0,0,3941.605,552.9745,144.0994,0.06546114,120,0,0,1,0,0,0,0,0), -(@GUID+7,@NPC,571,1,1,0,0,3995.586,447.6094,88.55691,1.320955,120,0,0,1,0,0,0,0,0), -(@GUID+8,@NPC,571,1,1,0,0,3869.004,707.384,134.3378,4.695541,120,0,0,1,0,0,0,0,0); - -DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+8; -INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(@GUID ,@SPAWN0,0,0,0,0,''), -(@GUID+1,@SPAWN1,0,0,0,0,''), -(@GUID+2,@SPAWN2,0,0,0,0,''), -(@GUID+3,@SPAWN3,0,0,0,0,''), -(@GUID+4,@SPAWN4,0,0,0,0,''), -(@GUID+5,@SPAWN5,0,0,0,0,''), -(@GUID+6,@SPAWN6,0,0,0,0,''), -(@GUID+7,@SPAWN7,0,0,0,0,''), -(@GUID+8,@SPAWN8,0,0,0,0,''); - -DELETE FROM `waypoint_data` WHERE `id` IN (@SPAWN0,@SPAWN1,@SPAWN2,@SPAWN3,@SPAWN4,@SPAWN5,@SPAWN6,@SPAWN7,@SPAWN8); -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES --- 1st -(@SPAWN0,0,4716.777,833.6211,169.0006,0,0,0,0,100,0), -(@SPAWN0,1,4643.756,855.9798,132.5562,0,0,0,0,100,0), -(@SPAWN0,2,4550.864,812.4362,133.6673,0,0,0,0,100,0), -(@SPAWN0,3,4532.678,762.772,130.1951,0,0,0,0,100,0), -(@SPAWN0,4,4566.182,662.6984,132.7506,0,0,0,0,100,0), -(@SPAWN0,5,4592.511,595.6938,130.1674,0,0,0,0,100,0), -(@SPAWN0,6,4732.632,631.5569,164.584,0,0,0,0,100,0), -(@SPAWN0,7,4716.777,833.6211,169.0006,0,0,0,0,100,0), -(@SPAWN0,8,4643.756,855.9798,132.5562,0,0,0,0,100,0), -(@SPAWN0,9,4550.864,812.4362,133.6673,0,0,0,0,100,0), --- 2nd -(@SPAWN1,0,4431.805,596.8371,157.1775,0,0,0,0,100,0), -(@SPAWN1,1,4128.16,507.4055,198.8118,0,0,0,0,100,0), -(@SPAWN1,2,4102.405,567.1112,198.8118,0,0,0,0,100,0), -(@SPAWN1,3,4112.486,636.6321,86.95068,0,0,0,0,100,0), -(@SPAWN1,4,4141.771,704.1605,67.97847,0,0,0,0,100,0), -(@SPAWN1,5,4191.388,726.6014,98.11736,0,0,0,0,100,0), -(@SPAWN1,6,4247.502,724.9836,182.4229,0,0,0,0,100,0), -(@SPAWN1,7,4295.807,746.8245,210.1174,0,0,0,0,100,0), -(@SPAWN1,8,4387.15,744.5955,93.08962,0,0,0,0,100,0), -(@SPAWN1,9,4428.509,680.8868,91.33962,0,0,0,0,100,0), -(@SPAWN1,10,4431.805,596.8371,157.1775,0,0,0,0,100,0), -(@SPAWN1,11,4128.16,507.4055,198.8118,0,0,0,0,100,0), -(@SPAWN1,12,4102.405,567.1112,198.8118,0,0,0,0,100,0), --- 3rd -(@SPAWN2,0,4170.111,627.0887,100.283,0,0,0,0,100,0), -(@SPAWN2,1,4265.816,644.1154,136.2274,0,0,0,0,100,0), -(@SPAWN2,2,4272.799,551.5093,50.92185,0,0,0,0,100,0), -(@SPAWN2,3,4378.531,451.3199,54.28299,0,0,0,0,100,0), -(@SPAWN2,4,4277.019,345.219,121.2274,0,0,0,0,100,0), -(@SPAWN2,5,4185.893,458.5754,118.5608,0,0,0,0,100,0), -(@SPAWN2,6,4170.111,627.0887,100.283,0,0,0,0,100,0), -(@SPAWN2,7,4265.816,644.1154,136.2274,0,0,0,0,100,0), -(@SPAWN2,8,4272.799,551.5093,50.92185,0,0,0,0,100,0), --- 4th -(@SPAWN3,0,4464.15,712.9612,99.36437,0,0,0,0,100,0), -(@SPAWN3,1,4466.412,769.1019,99.36437,0,0,0,0,100,0), -(@SPAWN3,2,4427.949,785.3342,99.36437,0,0,0,0,100,0), -(@SPAWN3,3,4382.415,794.0613,99.36437,0,0,0,0,100,0), -(@SPAWN3,4,4312.128,808.5213,99.36437,0,0,0,0,100,0), -(@SPAWN3,5,4206.404,817.2534,99.36437,0,0,0,0,100,0), -(@SPAWN3,6,4089.363,771.5425,99.36437,0,0,0,0,100,0), -(@SPAWN3,7,4114.452,637.4808,99.36437,0,0,0,0,100,0), -(@SPAWN3,8,4265.095,661.3358,99.36437,0,0,0,0,100,0), -(@SPAWN3,9,4366.876,678.4272,99.36437,0,0,0,0,100,0), -(@SPAWN3,10,4433.122,674.1555,99.36437,0,0,0,0,100,0), -(@SPAWN3,11,4464.15,712.9612,99.36437,0,0,0,0,100,0), -(@SPAWN3,12,4466.412,769.1019,99.36437,0,0,0,0,100,0), -(@SPAWN3,13,4427.949,785.3342,99.36437,0,0,0,0,100,0), --- 5th -(@SPAWN4,0,4331.604,778.9,114.7446,0,0,0,0,100,0), -(@SPAWN4,1,4270.823,698.3784,130.4668,0,0,0,0,100,0), -(@SPAWN4,2,4232.598,681.8058,126.7724,0,0,0,0,100,0), -(@SPAWN4,3,4156.661,638.471,129.439,0,0,0,0,100,0), -(@SPAWN4,4,4062.89,681.9251,102.9113,0,0,0,0,100,0), -(@SPAWN4,5,4096.761,758.9566,123.5501,0,0,0,0,100,0), -(@SPAWN4,6,4134.598,799.989,109.8835,0,0,0,0,100,0), -(@SPAWN4,7,4189.475,840.5444,114.6335,0,0,0,0,100,0), -(@SPAWN4,8,4274.875,812.3191,101.3001,0,0,0,0,100,0), -(@SPAWN4,9,4331.604,778.9,114.7446,0,0,0,0,100,0), -(@SPAWN4,10,4270.823,698.3784,130.4668,0,0,0,0,100,0), -(@SPAWN4,11,4232.598,681.8058,126.7724,0,0,0,0,100,0), --- 6th -(@SPAWN5,0,3769.598,454.0081,82.1595,0,0,0,0,100,0), -(@SPAWN5,1,3879.825,441.5815,82.1595,0,0,0,0,100,0), -(@SPAWN5,2,3926.388,447.295,82.1595,0,0,0,0,100,0), -(@SPAWN5,3,4017.082,501.3171,82.1595,0,0,0,0,100,0), -(@SPAWN5,4,4015.132,597.8423,82.1595,0,0,0,0,100,0), -(@SPAWN5,5,3923.788,576.8113,82.1595,0,0,0,0,100,0), -(@SPAWN5,6,3865.991,561.2335,82.1595,0,0,0,0,100,0), -(@SPAWN5,7,3795.942,538.189,82.1595,0,0,0,0,100,0), -(@SPAWN5,8,3769.598,454.0081,82.1595,0,0,0,0,100,0), -(@SPAWN5,9,3879.825,441.5815,82.1595,0,0,0,0,100,0), -(@SPAWN5,10,3926.388,447.295,82.1595,0,0,0,0,100,0), --- 7th -(@SPAWN6,0,3886.876,810.7806,134.3378,0,0,0,0,100,0), -(@SPAWN6,1,3868.72,688.4549,134.3378,0,0,0,0,100,0), -(@SPAWN6,2,3883.254,607.1956,134.3378,0,0,0,0,100,0), -(@SPAWN6,3,3904.998,559.2425,134.3378,0,0,0,0,100,0), -(@SPAWN6,4,3969.396,561.8792,148.5877,0,0,0,0,100,0), -(@SPAWN6,5,4010.678,638.0726,130.6155,0,0,0,0,100,0), -(@SPAWN6,6,3976.813,756.3585,134.3378,0,0,0,0,100,0), -(@SPAWN6,7,3886.876,810.7806,134.3378,0,0,0,0,100,0), -(@SPAWN6,8,3868.72,688.4549,134.3378,0,0,0,0,100,0), -(@SPAWN6,9,3883.254,607.1956,134.3378,0,0,0,0,100,0), --- 8th -(@SPAWN7,0,4187.318,438.9777,88.55692,0,0,0,0,100,0), -(@SPAWN7,1,4151.397,351.4095,88.55692,0,0,0,0,100,0), -(@SPAWN7,2,4106.679,347.3126,88.55692,0,0,0,0,100,0), -(@SPAWN7,3,4056.414,373.3088,88.55692,0,0,0,0,100,0), -(@SPAWN7,4,3994.193,440.1974,88.55692,0,0,0,0,100,0), -(@SPAWN7,5,4076.892,564.8895,88.55692,0,0,0,0,100,0), -(@SPAWN7,6,4178.652,558.3406,88.55692,0,0,0,0,100,0), -(@SPAWN7,7,4187.318,438.9777,88.55692,0,0,0,0,100,0), -(@SPAWN7,8,4151.397,351.4095,88.55692,0,0,0,0,100,0), -(@SPAWN7,9,4106.679,347.3126,88.55692,0,0,0,0,100,0), --- 9th -(@SPAWN8,0,3886.876,810.7806,134.3378,0,0,0,0,100,0), -(@SPAWN8,1,3868.72,688.4549,134.3378,0,0,0,0,100,0), -(@SPAWN8,2,3883.254,607.1956,134.3378,0,0,0,0,100,0), -(@SPAWN8,3,3904.998,559.2425,134.3378,0,0,0,0,100,0), -(@SPAWN8,4,3969.396,561.8792,148.5877,0,0,0,0,100,0), -(@SPAWN8,5,4010.678,638.0726,130.6155,0,0,0,0,100,0), -(@SPAWN8,6,3976.813,756.3585,134.3378,0,0,0,0,100,0), -(@SPAWN8,7,3886.876,810.7806,134.3378,0,0,0,0,100,0), -(@SPAWN8,8,3868.72,688.4549,134.3378,0,0,0,0,100,0), -(@SPAWN8,9,3883.254,607.1956,134.3378,0,0,0,0,100,0); diff --git a/sql/updates/world/2012_02_15_07_02_world_misc.sql b/sql/updates/world/2012_02_15_07_02_world_misc.sql deleted file mode 100644 index e7ffe54e922..00000000000 --- a/sql/updates/world/2012_02_15_07_02_world_misc.sql +++ /dev/null @@ -1,120 +0,0 @@ --- Love is in the Air -SET @OGUID := 24399; -SET @CGUID := 40506; -SET @OLDGUID := 40489; -- wrong guids -SET @EVENT := 8; - --- Quest chain -DELETE FROM `creature_questrelation` WHERE `quest` IN (24804,24657,24656,24848,24849); -INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES -(38293, 24804), -- A - Uncommon Scents - Junior Inspector -(38325, 24657), -- A - Friendly Chat... - Marion Sutton -(38066, 24656), -- A - Pilfering Perfume - Inspector Snip Snagglebolt -(38066, 24848), -- A - Fireworks At The Gilded Rose - Inspector Snip Snagglebolt -(38325, 24849); -- A - Hot On The Trail - Marion Sutton - -DELETE FROM `creature_involvedrelation` WHERE `quest` IN (24804,24657,24656,24848,24849); -INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES -(38066, 24804), -- A - Uncommon Scents - Inspector Snip Snagglebolt -(38066, 24657), -- A - Friendly Chat... - Inspector Snip Snagglebolt -(38066, 24656), -- A - Pilfering Perfume - Inspector Snip Snagglebolt -(38325, 24848), -- A - Fireworks At The Gilded Rose - Marion Sutton -(38325, 24849); -- A - Hot On The Trail - Marion Sutton - --- Loot: Crown Chemical Co. Supplies -DELETE FROM `gameobject_loot_template` WHERE `entry`=27766; -INSERT INTO `gameobject_loot_template` VALUES -(27766, 49867, -100, 1, 0, 1, 1); -- Crown Chemical Co. Supplies - --- GO spawns -DELETE FROM `gameobject` WHERE `id` IN (181086,201752,201778) AND `guid` BETWEEN @OGUID+0 AND @OGUID+42; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES --- Valentine Arch -(@OGUID+0, 181086, 1, 1, 1, 9869.12, 2493.13, 1315.88, 6.16653, 0, 0, 0.0582931, -0.9983, 300, 0, 1), -(@OGUID+1, 181086, 530, 1, 1, -4004.66, -11844.5, 0.19541, 4.93701, 0, 0, 0.623403, -0.7819, 300, 0, 1), -(@OGUID+2, 181086, 0, 1, 1, -4918.78, -983.208, 501.455, 2.30465, 0, 0, 0.913711, 0.406364, 300, 0, 1), -(@OGUID+3, 181086, 0, 1, 1, -8869.51, 636.686, 95.7873, 0.794388, 0, 0, 0.386832, 0.92215, 300, 0, 1), -(@OGUID+4, 181086, 1, 1, 1, 1653.44, -4437.37, 18.1863, 1.72627, 0, 0, 0.759883, 0.65006, 300, 0, 1), -(@OGUID+5, 181086, 1, 1, 1, -1224.34, 68.3642, 129.71, 3.17285, 0, 0, 0.999878, -0.015627, 300, 0, 1), -(@OGUID+6, 181086, 530, 1, 1, 9612.28, -7184.77, 14.285, 1.82938, 0, 0, 0.792374, 0.610036, 300, 0, 1), -(@OGUID+7, 181086, 0, 1, 1, 1629.62, 240.116, 63.8516, 0.155664, 0, 0, 0.0777534, 0.996973, 300, 0, 1), --- Large Crate -(@OGUID+8, 201752, 0, 1, 1, -9029.77, 353.325, 92.923, 0.8808, 0, 0, 0.426301, 0.904581, 300, 0, 1), -(@OGUID+9, 201752, 0, 1, 1, -9029.87, 351.542, 92.9248, 0.489671, 0, 0, 0.242397, 0.970177, 300, 0, 1), -(@OGUID+10, 201752, 0, 1, 1, -9028.41, 352.69, 92.9163, 0.721364, 0, 0, 0.352912, 0.935656, 300, 0, 1), -(@OGUID+11, 201752, 0, 1, 1, -9027.7, 351.062, 92.9193, 0.689162, 0, 0, 0.337803, 0.941217, 300, 0, 1), -(@OGUID+12, 201752, 0, 1, 1, -9029.08, 349.917, 92.932, 0.657746, 0, 0, 0.322977, 0.946407, 300, 0, 1), -(@OGUID+13, 201752, 0, 1, 1, -9028.77, 352.62, 94.1596, 6.02202, 0, 0, 0.130214, -0.991486, 300, 0, 1), -(@OGUID+14, 201752, 0, 1, 1, -9028.84, 350.443, 94.1755, 0.771628, 0, 0, 0.376314, 0.926492, 300, 0, 1), -(@OGUID+15, 201752, 0, 1, 1, -9026.5, 348.864, 93.0359, 2.17356, 0, 0, 0.885134, 0.465337, 300, 0, 1), -(@OGUID+16, 201752, 0, 1, 1, -9028.21, 348.744, 93.024, 0.889436, 0, 0, 0.430203, 0.902732, 300, 0, 1), -(@OGUID+17, 201752, 1, 1, 1, 1381.97, -4431.17, 30.6588, 5.49617, 0, 0, 0.383432, -0.923569, 300, 0, 1), -(@OGUID+18, 201752, 1, 1, 1, 1380.98, -4432.28, 30.6586, 5.55507, 0, 0, 0.356069, -0.93446, 300, 0, 1), -(@OGUID+19, 201752, 1, 1, 1, 1379.73, -4433.4, 30.6569, 5.69644, 0, 0, 0.28918, -0.957275, 300, 0, 1), -(@OGUID+20, 201752, 1, 1, 1, 1377.96, -4432.16, 30.6489, 5.58649, 0, 0, 0.341345, -0.939938, 300, 0, 1), -(@OGUID+21, 201752, 1, 1, 1, 1379.23, -4431.41, 30.6768, 5.559, 0, 0, 0.354231, -0.935158, 300, 0, 1), -(@OGUID+22, 201752, 1, 1, 1, 1379.85, -4432.91, 31.8999, 5.66896, 0, 0, 0.302309, -0.95321, 300, 0, 1), -(@OGUID+23, 201752, 1, 1, 1, 1380.81, -4431.58, 31.902, 5.64147, 0, 0, 0.315381, -0.948965, 300, 0, 1), -(@OGUID+24, 201752, 1, 1, 1, 1377.67, -4434.36, 30.6055, 5.36265, 0, 0, 0.444186, -0.895935, 300, 0, 1), --- Crown Chemical Co. Supplies -(@OGUID+25, 201778, 0, 1, 1, -9031.18, 354.399, 92.9752, 6.12019, 0, 0, 0.0814081, -0.996681, 300, 0, 1), -(@OGUID+26, 201778, 0, 1, 1, -9028.76, 352.525, 95.4034, 0.503804, 0, 0, 0.249246, 0.96844, 300, 0, 1), -(@OGUID+27, 201778, 0, 1, 1, -9030.19, 351.409, 94.1683, 0.134668, 0, 0, 0.067283, 0.997734, 300, 0, 1), -(@OGUID+28, 201778, 0, 1, 1, -9031.52, 349.739, 92.9068, 0.338872, 0, 0, 0.168626, 0.98568, 300, 0, 1), -(@OGUID+29, 201778, 0, 1, 1, -9030.55, 347.899, 92.9635, 0.751206, 0, 0, 0.366833, 0.930287, 300, 0, 1), -(@OGUID+30, 201778, 0, 1, 1, -9027.59, 348.911, 94.2683, 1.784, 0, 0, 0.77833, 0.627855, 300, 0, 1), -(@OGUID+31, 201778, 0, 1, 1, -9028.87, 349.971, 95.4191, 1.82327, 0, 0, 0.790507, 0.612452, 300, 0, 1), -(@OGUID+32, 201778, 0, 1, 1, -9031.75, 354.82, 92.9939, 6.0605, 0, 0, 0.111113, -0.993808, 300, 0, 1), -(@OGUID+33, 201778, 0, 1, 1, -9032.22, 352.779, 92.9627, 6.0605, 0, 0, 0.111113, -0.993808, 300, 0, 1), -(@OGUID+34, 201778, 1, 1, 1, 1375.84, -4432.46, 30.5735, 5.69645, 0, 0, 0.289178, -0.957275, 300, 0, 1), -(@OGUID+35, 201778, 1, 1, 1, 1377.99, -4431.81, 31.8923, 5.5001, 0, 0, 0.381614, -0.924322, 300, 0, 1), -(@OGUID+36, 201778, 1, 1, 1, 1379.21, -4430.58, 31.9198, 4.81681, 0, 0, 0.669241, -0.743045, 300, 0, 1), -(@OGUID+37, 201778, 1, 1, 1, 1379.35, -4432.78, 33.143, 5.61791, 0, 0, 0.326536, -0.945185, 300, 0, 1), -(@OGUID+38, 201778, 1, 1, 1, 1380.87, -4431.5, 33.1452, 4.66994, 0, 0, 0.721955, -0.69194, 300, 0, 1), -(@OGUID+39, 201778, 1, 1, 1, 1380.96, -4429.36, 30.6772, 4.6503, 0, 0, 0.728713, -0.68482, 300, 0, 1), -(@OGUID+40, 201778, 1, 1, 1, 1383.08, -4429.42, 30.651, 4.53642, 0, 0, 0.766505, -0.642238, 300, 0, 1), -(@OGUID+41, 201778, 1, 1, 1, 1378.64, -4428.42, 30.6846, 5.23543, 0, 0, 0.500243, -0.865885, 300, 0, 1), -(@OGUID+42, 201778, 1, 1, 1, 1377.05, -4429.39, 30.6467, 5.31397, 0, 0, 0.465863, -0.884857, 300, 0, 1); - -DELETE FROM `game_event_gameobject` WHERE `eventEntry`=@EVENT AND `guid` BETWEEN @OGUID AND @OGUID+42; -INSERT INTO `game_event_gameobject` (`guid`, `eventEntry`) VALUES -(@OGUID, @EVENT),(@OGUID+1, @EVENT),(@OGUID+2, @EVENT), -(@OGUID+3, @EVENT),(@OGUID+4, @EVENT),(@OGUID+5, @EVENT), -(@OGUID+6, @EVENT),(@OGUID+7, @EVENT),(@OGUID+8, @EVENT), -(@OGUID+9, @EVENT),(@OGUID+10, @EVENT),(@OGUID+11, @EVENT), -(@OGUID+12, @EVENT),(@OGUID+13, @EVENT),(@OGUID+14, @EVENT), -(@OGUID+15, @EVENT),(@OGUID+16, @EVENT),(@OGUID+17, @EVENT), -(@OGUID+18, @EVENT),(@OGUID+19, @EVENT),(@OGUID+20, @EVENT), -(@OGUID+21, @EVENT),(@OGUID+22, @EVENT),(@OGUID+23, @EVENT), -(@OGUID+24, @EVENT),(@OGUID+25, @EVENT),(@OGUID+26, @EVENT), -(@OGUID+27, @EVENT),(@OGUID+28, @EVENT),(@OGUID+29, @EVENT), -(@OGUID+30, @EVENT),(@OGUID+31, @EVENT),(@OGUID+32, @EVENT), -(@OGUID+33, @EVENT),(@OGUID+34, @EVENT),(@OGUID+35, @EVENT), -(@OGUID+36, @EVENT),(@OGUID+37, @EVENT),(@OGUID+38, @EVENT), -(@OGUID+39, @EVENT),(@OGUID+40, @EVENT),(@OGUID+41, @EVENT), -(@OGUID+42, @EVENT); - --- [Q]: Pilfering Perfume --- Note: this is EndText (misleading field name), NOT ObjectiveText1 -UPDATE `quest_template` SET `EndText` = 'Steal perfume package from Crown Chemical Co. outside Stormind' WHERE `Id` = 24656; -- Alliance -UPDATE `quest_template` SET `EndText` = 'Steal perfume package from Crown Chemical Co. outside Orgrimmar' WHERE `Id` = 24541; -- Horde - --- Creature templates and spawns -UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=75 WHERE `entry`=37671; -- Crown Supply Guard -UPDATE `creature_template` SET `npcflag`=`npcflag`|1, `gossip_menu_id`=10991 WHERE `entry`=38293; -- Junior Inspector (gossip menu not confirmed) - -DELETE FROM `creature` WHERE `id` IN (38293,38065,37671) AND `guid` BETWEEN @CGUID+0 AND @CGUID+3; -DELETE FROM `creature` WHERE `id` IN (38293,38065,37671) AND `guid` BETWEEN @OLDGUID+0 AND @OLDGUID+3; -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 -(@CGUID+0, 38293, 530, 1, 1, 0, 0, -4022.81, -11842.7, 0.0062171, 5.89912, 300, 0, 0, 955, 0, 0, 0, 0, 0), -- Junior Inspector -(@CGUID+1, 38065, 1, 1, 1, 0, 0, 1380.22, -4426.79, 30.6681, 2.03572, 300, 0, 0, 12600, 0, 0, 0, 0, 0), -- Crown Supply Sentry -(@CGUID+2, 37671, 0, 1, 1, 30912, 0, -9033.01, 356.408, 93.1543, 2.09345, 300, 0, 0, 42, 0, 0, 0, 0, 0), -- Crown Supply Guard -(@CGUID+3, 37671, 0, 1, 1, 30912, 0, -9028.63, 344.994, 93.2389, 3.37679, 300, 0, 0, 42, 0, 0, 0, 0, 0); -- Crown Supply Guard - -DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+3 AND `eventEntry`=@EVENT; -DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @OLDGUID+0 AND @OLDGUID+3 AND `eventEntry`=@EVENT; -INSERT INTO `game_event_creature` (`guid`, `eventEntry`) VALUES -(@CGUID+0, @EVENT), -(@CGUID+1, @EVENT), -(@CGUID+2, @EVENT), -(@CGUID+3, @EVENT); diff --git a/sql/updates/world/2012_02_15_08_world_sai.sql b/sql/updates/world/2012_02_15_08_world_sai.sql deleted file mode 100644 index ef49ff484f3..00000000000 --- a/sql/updates/world/2012_02_15_08_world_sai.sql +++ /dev/null @@ -1,9 +0,0 @@ -SET @Pinata := 34632; - -DELETE FROM `smart_scripts` WHERE `entryorguid`=@Pinata 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 -(@Pinata, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 11, 65788, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Ogre Pinata - On death cast Pile of Candy'), -(@Pinata, 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, 'Ogre Pinata - On reset set react state passive'); - --- same faction of the GO that is spawned by spell 65788 (not sniffed) -UPDATE `creature_template` SET `faction_A`=7,`faction_H`=7,`exp`=0,`AIName`='SmartAI' WHERE `entry`=@Pinata; diff --git a/sql/updates/world/2012_02_15_09_world_spell_proc_event.sql b/sql/updates/world/2012_02_15_09_world_spell_proc_event.sql deleted file mode 100644 index 4811e5d66fe..00000000000 --- a/sql/updates/world/2012_02_15_09_world_spell_proc_event.sql +++ /dev/null @@ -1,6 +0,0 @@ --- Corrected proc of Misery -DELETE FROM `spell_proc_event` WHERE `entry` IN (33191, 33192, 33193); -INSERT INTO `spell_proc_event` VALUES -(33191, 0x00, 0x06, 0x00008000, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0), -(33192, 0x00, 0x06, 0x00008000, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0), -(33193, 0x00, 0x06, 0x00008000, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0, 0, 0); diff --git a/sql/updates/world/2012_02_16_00_world_conditions.sql b/sql/updates/world/2012_02_16_00_world_conditions.sql deleted file mode 100644 index 5bef38fc485..00000000000 --- a/sql/updates/world/2012_02_16_00_world_conditions.sql +++ /dev/null @@ -1,12800 +0,0 @@ -CREATE TABLE `temp_convert_spells` -( - `id` INT(11), - PRIMARY KEY (`id`) -); - --- spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534 --- those spells are the ones which require explicit unit target to cast -INSERT INTO `temp_convert_spells` VALUES -(5), -(11), -(12), -(14), -(15), -(17), -(25), -(49), -(50), -(53), -(56), -(58), -(59), -(60), -(61), -(67), -(68), -(72), -(75), -(78), -(89), -(91), -(96), -(100), -(101), -(113), -(116), -(118), -(131), -(132), -(133), -(134), -(139), -(142), -(143), -(145), -(172), -(184), -(205), -(228), -(246), -(260), -(271), -(284), -(285), -(339), -(348), -(355), -(370), -(403), -(408), -(421), -(453), -(457), -(467), -(475), -(512), -(514), -(526), -(527), -(528), -(529), -(530), -(546), -(548), -(550), -(552), -(585), -(589), -(591), -(592), -(594), -(596), -(598), -(600), -(603), -(605), -(606), -(633), -(635), -(639), -(647), -(676), -(686), -(689), -(692), -(694), -(695), -(699), -(700), -(701), -(702), -(703), -(705), -(707), -(709), -(710), -(720), -(731), -(744), -(745), -(746), -(770), -(772), -(774), -(782), -(785), -(812), -(835), -(837), -(845), -(851), -(853), -(879), -(915), -(921), -(930), -(932), -(943), -(970), -(974), -(976), -(980), -(984), -(988), -(992), -(996), -(1004), -(1010), -(1014), -(1026), -(1035), -(1042), -(1044), -(1058), -(1062), -(1075), -(1079), -(1082), -(1088), -(1090), -(1094), -(1098), -(1106), -(1108), -(1120), -(1121), -(1126), -(1130), -(1139), -(1152), -(1159), -(1194), -(1196), -(1210), -(1214), -(1225), -(1228), -(1234), -(1241), -(1243), -(1244), -(1245), -(1249), -(1250), -(1251), -(1266), -(1267), -(1329), -(1330), -(1350), -(1364), -(1373), -(1413), -(1430), -(1446), -(1459), -(1460), -(1461), -(1462), -(1464), -(1467), -(1472), -(1473), -(1474), -(1475), -(1481), -(1485), -(1490), -(1495), -(1513), -(1515), -(1516), -(1536), -(1579), -(1588), -(1604), -(1608), -(1609), -(1650), -(1664), -(1665), -(1666), -(1669), -(1671), -(1672), -(1714), -(1715), -(1752), -(1753), -(1754), -(1755), -(1756), -(1757), -(1758), -(1759), -(1760), -(1766), -(1767), -(1768), -(1769), -(1770), -(1776), -(1777), -(1795), -(1796), -(1797), -(1798), -(1800), -(1809), -(1810), -(1811), -(1822), -(1823), -(1824), -(1831), -(1833), -(1852), -(1906), -(1908), -(1943), -(1950), -(1966), -(1978), -(1991), -(2000), -(2020), -(2021), -(2050), -(2052), -(2053), -(2054), -(2055), -(2060), -(2061), -(2070), -(2090), -(2091), -(2094), -(2096), -(2098), -(2110), -(2118), -(2119), -(2124), -(2125), -(2136), -(2137), -(2138), -(2139), -(2141), -(2142), -(2143), -(2147), -(2148), -(2154), -(2155), -(2275), -(2280), -(2313), -(2372), -(2373), -(2400), -(2425), -(2442), -(2443), -(2444), -(2446), -(2552), -(2589), -(2590), -(2591), -(2601), -(2602), -(2606), -(2607), -(2608), -(2609), -(2610), -(2626), -(2629), -(2630), -(2633), -(2634), -(2636), -(2637), -(2643), -(2647), -(2649), -(2650), -(2653), -(2691), -(2764), -(2767), -(2782), -(2791), -(2800), -(2816), -(2817), -(2818), -(2819), -(2834), -(2850), -(2855), -(2860), -(2871), -(2880), -(2893), -(2908), -(2912), -(2941), -(2944), -(2948), -(2949), -(2969), -(2972), -(2973), -(2974), -(2995), -(3007), -(3009), -(3010), -(3011), -(3018), -(3029), -(3034), -(3043), -(3044), -(3105), -(3108), -(3110), -(3120), -(3121), -(3130), -(3131), -(3132), -(3137), -(3140), -(3145), -(3147), -(3148), -(3150), -(3205), -(3206), -(3207), -(3229), -(3233), -(3234), -(3237), -(3242), -(3243), -(3246), -(3247), -(3252), -(3261), -(3263), -(3267), -(3268), -(3279), -(3280), -(3286), -(3332), -(3355), -(3356), -(3358), -(3360), -(3387), -(3388), -(3393), -(3396), -(3405), -(3409), -(3427), -(3429), -(3436), -(3442), -(3446), -(3465), -(3466), -(3472), -(3510), -(3514), -(3539), -(3542), -(3551), -(3553), -(3571), -(3578), -(3583), -(3584), -(3586), -(3602), -(3603), -(3604), -(3606), -(3607), -(3609), -(3627), -(3635), -(3636), -(3650), -(3674), -(3715), -(3716), -(3747), -(3812), -(3911), -(3912), -(3913), -(3921), -(4011), -(4039), -(4040), -(4041), -(4058), -(4060), -(4089), -(4090), -(4091), -(4101), -(4102), -(4130), -(4131), -(4132), -(4150), -(4159), -(4164), -(4165), -(4166), -(4167), -(4168), -(4169), -(4209), -(4221), -(4240), -(4243), -(4244), -(4262), -(4280), -(4281), -(4282), -(4285), -(4286), -(4294), -(4316), -(4362), -(4423), -(4500), -(4504), -(4505), -(4506), -(4538), -(4630), -(4659), -(4805), -(4877), -(4940), -(4961), -(4962), -(4974), -(4979), -(4980), -(4984), -(4987), -(4996), -(4997), -(4998), -(4999), -(5000), -(5003), -(5019), -(5025), -(5103), -(5105), -(5116), -(5133), -(5137), -(5138), -(5143), -(5144), -(5145), -(5164), -(5165), -(5171), -(5176), -(5177), -(5178), -(5179), -(5180), -(5185), -(5186), -(5187), -(5188), -(5189), -(5195), -(5196), -(5201), -(5208), -(5211), -(5213), -(5221), -(5232), -(5234), -(5246), -(5255), -(5259), -(5260), -(5263), -(5271), -(5276), -(5306), -(5308), -(5320), -(5321), -(5322), -(5323), -(5324), -(5325), -(5337), -(5374), -(5375), -(5376), -(5401), -(5413), -(5416), -(5422), -(5424), -(5433), -(5480), -(5503), -(5507), -(5508), -(5509), -(5513), -(5514), -(5547), -(5565), -(5566), -(5567), -(5570), -(5588), -(5589), -(5595), -(5597), -(5598), -(5614), -(5615), -(5648), -(5649), -(5676), -(5679), -(5696), -(5697), -(5703), -(5726), -(5727), -(5739), -(5760), -(5781), -(5782), -(5862), -(5884), -(5917), -(5918), -(5938), -(5940), -(5951), -(5967), -(6000), -(6016), -(6027), -(6028), -(6041), -(6060), -(6061), -(6063), -(6064), -(6065), -(6066), -(6074), -(6075), -(6076), -(6077), -(6078), -(6121), -(6128), -(6130), -(6132), -(6136), -(6142), -(6144), -(6146), -(6178), -(6199), -(6203), -(6205), -(6213), -(6215), -(6217), -(6222), -(6223), -(6245), -(6252), -(6253), -(6254), -(6255), -(6257), -(6273), -(6277), -(6278), -(6304), -(6327), -(6346), -(6348), -(6349), -(6350), -(6351), -(6352), -(6353), -(6357), -(6358), -(6359), -(6360), -(6362), -(6409), -(6435), -(6460), -(6465), -(6466), -(6483), -(6484), -(6509), -(6530), -(6531), -(6533), -(6546), -(6547), -(6548), -(6552), -(6554), -(6555), -(6572), -(6574), -(6576), -(6580), -(6581), -(6595), -(6607), -(6647), -(6655), -(6660), -(6664), -(6685), -(6713), -(6716), -(6719), -(6726), -(6728), -(6730), -(6742), -(6743), -(6744), -(6745), -(6746), -(6747), -(6748), -(6751), -(6753), -(6754), -(6756), -(6760), -(6761), -(6762), -(6766), -(6767), -(6768), -(6770), -(6774), -(6778), -(6780), -(6785), -(6787), -(6788), -(6789), -(6795), -(6798), -(6800), -(6807), -(6808), -(6809), -(6814), -(6866), -(6870), -(6873), -(6894), -(6907), -(6909), -(6917), -(6922), -(6927), -(6942), -(6946), -(6949), -(6950), -(6951), -(6957), -(6958), -(6960), -(6963), -(6965), -(6979), -(6980), -(6984), -(7001), -(7033), -(7054), -(7057), -(7068), -(7079), -(7081), -(7084), -(7092), -(7093), -(7098), -(7099), -(7101), -(7102), -(7105), -(7120), -(7122), -(7124), -(7125), -(7127), -(7140), -(7145), -(7154), -(7159), -(7160), -(7162), -(7211), -(7266), -(7288), -(7289), -(7290), -(7295), -(7321), -(7322), -(7329), -(7357), -(7365), -(7367), -(7369), -(7372), -(7373), -(7379), -(7384), -(7386), -(7399), -(7400), -(7402), -(7405), -(7414), -(7415), -(7416), -(7439), -(7482), -(7485), -(7588), -(7621), -(7638), -(7641), -(7645), -(7646), -(7648), -(7651), -(7655), -(7656), -(7712), -(7714), -(7715), -(7716), -(7717), -(7718), -(7719), -(7736), -(7761), -(7763), -(7764), -(7799), -(7800), -(7801), -(7802), -(7806), -(7807), -(7808), -(7809), -(7810), -(7811), -(7813), -(7814), -(7815), -(7816), -(7821), -(7829), -(7853), -(7874), -(7875), -(7876), -(7877), -(7878), -(7879), -(7880), -(7881), -(7882), -(7883), -(7884), -(7885), -(7887), -(7891), -(7896), -(7901), -(7914), -(7922), -(7925), -(7926), -(7927), -(7932), -(7933), -(7938), -(7947), -(7951), -(7967), -(7992), -(7994), -(7997), -(8004), -(8008), -(8010), -(8012), -(8014), -(8016), -(8026), -(8028), -(8029), -(8034), -(8037), -(8040), -(8042), -(8044), -(8045), -(8046), -(8050), -(8052), -(8053), -(8056), -(8058), -(8068), -(8070), -(8091), -(8092), -(8094), -(8095), -(8096), -(8097), -(8098), -(8099), -(8100), -(8101), -(8102), -(8103), -(8104), -(8105), -(8106), -(8112), -(8113), -(8114), -(8115), -(8116), -(8117), -(8118), -(8119), -(8120), -(8121), -(8129), -(8137), -(8138), -(8139), -(8140), -(8151), -(8208), -(8211), -(8221), -(8222), -(8242), -(8246), -(8255), -(8256), -(8257), -(8272), -(8275), -(8277), -(8282), -(8288), -(8289), -(8292), -(8295), -(8312), -(8313), -(8314), -(8318), -(8319), -(8344), -(8345), -(8346), -(8347), -(8352), -(8353), -(8355), -(8362), -(8363), -(8365), -(8379), -(8380), -(8382), -(8383), -(8384), -(8385), -(8391), -(8400), -(8401), -(8402), -(8406), -(8407), -(8408), -(8412), -(8413), -(8414), -(8415), -(8416), -(8417), -(8425), -(8426), -(8428), -(8440), -(8441), -(8442), -(8444), -(8445), -(8446), -(8447), -(8448), -(8449), -(8452), -(8453), -(8456), -(8459), -(8460), -(8463), -(8464), -(8493), -(8496), -(8497), -(8552), -(8554), -(8555), -(8595), -(8598), -(8600), -(8613), -(8615), -(8616), -(8617), -(8618), -(8619), -(8620), -(8621), -(8623), -(8624), -(8627), -(8629), -(8631), -(8632), -(8633), -(8637), -(8639), -(8640), -(8643), -(8645), -(8646), -(8647), -(8649), -(8650), -(8654), -(8673), -(8676), -(8680), -(8682), -(8685), -(8689), -(8699), -(8716), -(8721), -(8724), -(8725), -(8733), -(8735), -(8788), -(8806), -(8818), -(8820), -(8903), -(8905), -(8907), -(8910), -(8914), -(8921), -(8924), -(8925), -(8926), -(8927), -(8928), -(8929), -(8936), -(8938), -(8939), -(8940), -(8941), -(8946), -(8947), -(8949), -(8950), -(8951), -(8955), -(8972), -(8983), -(8992), -(8994), -(8998), -(9000), -(9005), -(9007), -(9034), -(9053), -(9057), -(9080), -(9159), -(9176), -(9234), -(9268), -(9275), -(9347), -(9373), -(9454), -(9455), -(9456), -(9459), -(9462), -(9472), -(9473), -(9474), -(9481), -(9482), -(9483), -(9484), -(9485), -(9487), -(9488), -(9492), -(9493), -(9532), -(9552), -(9574), -(9591), -(9612), -(9613), -(9614), -(9654), -(9658), -(9672), -(9734), -(9735), -(9739), -(9745), -(9750), -(9752), -(9756), -(9758), -(9771), -(9775), -(9786), -(9789), -(9790), -(9791), -(9796), -(9806), -(9823), -(9824), -(9826), -(9827), -(9829), -(9830), -(9833), -(9834), -(9835), -(9839), -(9840), -(9841), -(9849), -(9850), -(9852), -(9853), -(9856), -(9857), -(9858), -(9866), -(9867), -(9875), -(9876), -(9880), -(9881), -(9884), -(9885), -(9888), -(9889), -(9892), -(9894), -(9896), -(9901), -(9904), -(9910), -(9912), -(9949), -(9977), -(9991), -(9999), -(10055), -(10056), -(10060), -(10073), -(10101), -(10136), -(10141), -(10142), -(10143), -(10146), -(10147), -(10148), -(10149), -(10150), -(10151), -(10156), -(10157), -(10158), -(10162), -(10163), -(10164), -(10171), -(10172), -(10175), -(10176), -(10178), -(10179), -(10180), -(10181), -(10188), -(10189), -(10190), -(10194), -(10195), -(10196), -(10197), -(10198), -(10199), -(10200), -(10203), -(10204), -(10205), -(10206), -(10207), -(10208), -(10209), -(10210), -(10211), -(10212), -(10217), -(10218), -(10221), -(10222), -(10224), -(10226), -(10227), -(10231), -(10239), -(10244), -(10245), -(10246), -(10277), -(10308), -(10310), -(10312), -(10313), -(10314), -(10321), -(10326), -(10328), -(10329), -(10346), -(10370), -(10371), -(10373), -(10391), -(10392), -(10412), -(10413), -(10414), -(10435), -(10436), -(10444), -(10445), -(10447), -(10448), -(10452), -(10458), -(10466), -(10467), -(10468), -(10472), -(10473), -(10577), -(10578), -(10605), -(10617), -(10651), -(10653), -(10657), -(10659), -(10661), -(10663), -(10689), -(10730), -(10767), -(10768), -(10769), -(10771), -(10833), -(10838), -(10839), -(10843), -(10847), -(10851), -(10855), -(10863), -(10872), -(10892), -(10893), -(10894), -(10898), -(10899), -(10900), -(10901), -(10908), -(10909), -(10915), -(10916), -(10917), -(10921), -(10927), -(10928), -(10929), -(10933), -(10934), -(10937), -(10938), -(10945), -(10946), -(10947), -(10955), -(10957), -(10958), -(10960), -(10961), -(10963), -(10964), -(10965), -(10966), -(11014), -(11016), -(11020), -(11021), -(11027), -(11084), -(11085), -(11131), -(11132), -(11196), -(11197), -(11198), -(11203), -(11204), -(11205), -(11267), -(11268), -(11269), -(11273), -(11274), -(11275), -(11279), -(11280), -(11281), -(11285), -(11286), -(11289), -(11290), -(11293), -(11294), -(11297), -(11299), -(11300), -(11303), -(11335), -(11336), -(11337), -(11353), -(11354), -(11362), -(11366), -(11374), -(11391), -(11397), -(11409), -(11428), -(11430), -(11431), -(11436), -(11442), -(11443), -(11444), -(11446), -(11469), -(11470), -(11471), -(11512), -(11519), -(11520), -(11522), -(11525), -(11528), -(11538), -(11539), -(11545), -(11564), -(11565), -(11566), -(11567), -(11572), -(11573), -(11574), -(11578), -(11584), -(11585), -(11595), -(11596), -(11597), -(11600), -(11601), -(11604), -(11605), -(11608), -(11609), -(11610), -(11612), -(11639), -(11640), -(11641), -(11642), -(11650), -(11658), -(11659), -(11660), -(11661), -(11665), -(11667), -(11668), -(11671), -(11672), -(11675), -(11699), -(11700), -(11707), -(11708), -(11711), -(11712), -(11713), -(11719), -(11721), -(11722), -(11725), -(11726), -(11762), -(11763), -(11772), -(11773), -(11774), -(11775), -(11776), -(11777), -(11778), -(11779), -(11780), -(11781), -(11782), -(11783), -(11784), -(11785), -(11786), -(11787), -(11791), -(11820), -(11821), -(11824), -(11825), -(11835), -(11836), -(11839), -(11877), -(11879), -(11885), -(11886), -(11887), -(11888), -(11889), -(11918), -(11920), -(11921), -(11922), -(11960), -(11962), -(11963), -(11971), -(11972), -(11974), -(11976), -(11977), -(11978), -(11980), -(11981), -(11985), -(11986), -(11994), -(11998), -(12021), -(12023), -(12024), -(12039), -(12054), -(12057), -(12058), -(12096), -(12097), -(12098), -(12118), -(12127), -(12128), -(12130), -(12131), -(12160), -(12161), -(12162), -(12166), -(12167), -(12170), -(12174), -(12175), -(12176), -(12177), -(12178), -(12179), -(12181), -(12242), -(12245), -(12246), -(12248), -(12251), -(12279), -(12280), -(12289), -(12294), -(12355), -(12461), -(12466), -(12471), -(12479), -(12480), -(12484), -(12485), -(12486), -(12491), -(12492), -(12493), -(12494), -(12505), -(12509), -(12510), -(12521), -(12522), -(12523), -(12524), -(12525), -(12526), -(12531), -(12538), -(12540), -(12541), -(12542), -(12545), -(12548), -(12551), -(12553), -(12555), -(12578), -(12579), -(12654), -(12657), -(12668), -(12675), -(12693), -(12699), -(12705), -(12721), -(12723), -(12738), -(12739), -(12742), -(12747), -(12798), -(12809), -(12821), -(12824), -(12825), -(12826), -(12850), -(12868), -(12885), -(12888), -(12890), -(12998), -(13003), -(13005), -(13006), -(13009), -(13013), -(13022), -(13029), -(13044), -(13099), -(13119), -(13120), -(13138), -(13140), -(13142), -(13180), -(13181), -(13218), -(13222), -(13223), -(13224), -(13278), -(13279), -(13281), -(13298), -(13318), -(13319), -(13321), -(13322), -(13323), -(13325), -(13326), -(13327), -(13338), -(13339), -(13340), -(13341), -(13342), -(13374), -(13375), -(13398), -(13424), -(13438), -(13439), -(13440), -(13441), -(13442), -(13443), -(13444), -(13445), -(13446), -(13459), -(13480), -(13482), -(13486), -(13490), -(13491), -(13496), -(13518), -(13519), -(13524), -(13526), -(13527), -(13528), -(13530), -(13534), -(13549), -(13550), -(13551), -(13552), -(13553), -(13554), -(13555), -(13566), -(13567), -(13579), -(13583), -(13584), -(13585), -(13608), -(13619), -(13692), -(13728), -(13729), -(13737), -(13738), -(13748), -(13752), -(13797), -(13860), -(13864), -(13878), -(13880), -(13884), -(13897), -(13901), -(13902), -(13907), -(13921), -(13952), -(13953), -(13977), -(14030), -(14032), -(14033), -(14034), -(14053), -(14087), -(14099), -(14102), -(14103), -(14105), -(14106), -(14109), -(14110), -(14112), -(14118), -(14119), -(14120), -(14122), -(14126), -(14129), -(14130), -(14134), -(14145), -(14156), -(14157), -(14160), -(14178), -(14180), -(14183), -(14189), -(14200), -(14247), -(14251), -(14253), -(14260), -(14261), -(14262), -(14263), -(14264), -(14265), -(14266), -(14269), -(14270), -(14271), -(14278), -(14281), -(14282), -(14283), -(14284), -(14285), -(14286), -(14287), -(14288), -(14289), -(14290), -(14298), -(14299), -(14300), -(14301), -(14308), -(14309), -(14323), -(14324), -(14325), -(14326), -(14327), -(14331), -(14443), -(14515), -(14516), -(14517), -(14518), -(14537), -(14752), -(14792), -(14795), -(14818), -(14819), -(14867), -(14868), -(14873), -(14874), -(14875), -(14890), -(14892), -(14893), -(14894), -(14895), -(14897), -(14902), -(14903), -(14914), -(14916), -(14917), -(14918), -(14919), -(14920), -(14921), -(15037), -(15039), -(15040), -(15042), -(15043), -(15057), -(15065), -(15089), -(15090), -(15095), -(15096), -(15117), -(15120), -(15122), -(15123), -(15124), -(15128), -(15187), -(15207), -(15208), -(15211), -(15228), -(15229), -(15230), -(15232), -(15234), -(15235), -(15236), -(15238), -(15241), -(15242), -(15247), -(15248), -(15249), -(15250), -(15254), -(15257), -(15261), -(15262), -(15263), -(15264), -(15265), -(15266), -(15267), -(15277), -(15279), -(15280), -(15283), -(15284), -(15288), -(15305), -(15306), -(15331), -(15332), -(15342), -(15343), -(15344), -(15346), -(15357), -(15359), -(15362), -(15363), -(15366), -(15398), -(15407), -(15451), -(15471), -(15472), -(15487), -(15493), -(15495), -(15496), -(15497), -(15498), -(15499), -(15500), -(15501), -(15505), -(15530), -(15534), -(15535), -(15536), -(15537), -(15539), -(15547), -(15549), -(15570), -(15572), -(15574), -(15575), -(15580), -(15581), -(15582), -(15583), -(15586), -(15587), -(15592), -(15598), -(15605), -(15607), -(15608), -(15610), -(15611), -(15612), -(15614), -(15615), -(15616), -(15617), -(15618), -(15619), -(15620), -(15621), -(15643), -(15651), -(15652), -(15653), -(15654), -(15655), -(15656), -(15657), -(15659), -(15661), -(15662), -(15664), -(15665), -(15667), -(15691), -(15692), -(15695), -(15698), -(15699), -(15702), -(15708), -(15712), -(15713), -(15729), -(15730), -(15732), -(15734), -(15735), -(15736), -(15749), -(15752), -(15753), -(15784), -(15785), -(15790), -(15791), -(15793), -(15795), -(15797), -(15798), -(15801), -(15802), -(15848), -(15850), -(15859), -(15860), -(15876), -(15878), -(15968), -(15969), -(15970), -(15976), -(15980), -(15981), -(15982), -(16000), -(16001), -(16006), -(16007), -(16029), -(16031), -(16033), -(16034), -(16044), -(16045), -(16050), -(16053), -(16067), -(16071), -(16075), -(16095), -(16100), -(16101), -(16128), -(16143), -(16144), -(16145), -(16168), -(16170), -(16172), -(16176), -(16177), -(16186), -(16231), -(16235), -(16236), -(16237), -(16240), -(16243), -(16247), -(16249), -(16333), -(16336), -(16343), -(16344), -(16351), -(16352), -(16353), -(16366), -(16373), -(16375), -(16391), -(16392), -(16393), -(16400), -(16401), -(16402), -(16403), -(16405), -(16406), -(16407), -(16408), -(16409), -(16410), -(16411), -(16412), -(16413), -(16414), -(16415), -(16427), -(16429), -(16430), -(16431), -(16433), -(16448), -(16449), -(16451), -(16454), -(16455), -(16456), -(16458), -(16460), -(16461), -(16472), -(16495), -(16496), -(16498), -(16508), -(16509), -(16511), -(16527), -(16528), -(16530), -(16536), -(16549), -(16552), -(16553), -(16554), -(16555), -(16561), -(16564), -(16565), -(16568), -(16569), -(16570), -(16573), -(16583), -(16587), -(16588), -(16603), -(16608), -(16610), -(16612), -(16614), -(16618), -(16627), -(16628), -(16636), -(16697), -(16707), -(16708), -(16709), -(16711), -(16712), -(16713), -(16714), -(16716), -(16722), -(16782), -(16783), -(16784), -(16788), -(16790), -(16793), -(16798), -(16799), -(16804), -(16805), -(16827), -(16828), -(16829), -(16830), -(16831), -(16832), -(16844), -(16856), -(16857), -(16868), -(16869), -(16871), -(16898), -(16908), -(16921), -(16922), -(16927), -(16928), -(16953), -(16979), -(16997), -(17008), -(17009), -(17011), -(17012), -(17013), -(17105), -(17134), -(17137), -(17138), -(17139), -(17140), -(17141), -(17142), -(17143), -(17144), -(17146), -(17147), -(17148), -(17149), -(17150), -(17151), -(17153), -(17156), -(17157), -(17158), -(17159), -(17160), -(17165), -(17168), -(17170), -(17171), -(17172), -(17173), -(17174), -(17175), -(17183), -(17194), -(17195), -(17198), -(17201), -(17213), -(17227), -(17230), -(17233), -(17234), -(17238), -(17243), -(17244), -(17246), -(17253), -(17255), -(17256), -(17257), -(17258), -(17259), -(17260), -(17261), -(17273), -(17274), -(17276), -(17281), -(17284), -(17287), -(17289), -(17290), -(17292), -(17293), -(17307), -(17308), -(17311), -(17312), -(17313), -(17314), -(17315), -(17330), -(17331), -(17333), -(17334), -(17347), -(17348), -(17353), -(17364), -(17368), -(17393), -(17405), -(17407), -(17434), -(17435), -(17439), -(17445), -(17451), -(17452), -(17470), -(17483), -(17484), -(17492), -(17494), -(17496), -(17500), -(17503), -(17504), -(17505), -(17506), -(17509), -(17510), -(17511), -(17529), -(17547), -(17607), -(17608), -(17609), -(17610), -(17611), -(17613), -(17615), -(17620), -(17630), -(17633), -(17639), -(17648), -(17649), -(17672), -(17682), -(17692), -(17734), -(17736), -(17738), -(17744), -(17745), -(17749), -(17753), -(17754), -(17755), -(17776), -(17777), -(17794), -(17797), -(17798), -(17799), -(17800), -(17843), -(17855), -(17856), -(17857), -(17859), -(17860), -(17863), -(17877), -(17883), -(17919), -(17920), -(17921), -(17922), -(17923), -(17924), -(17925), -(17926), -(17939), -(17943), -(17944), -(17946), -(17948), -(17950), -(17961), -(17962), -(17963), -(18070), -(18072), -(18075), -(18077), -(18078), -(18081), -(18082), -(18083), -(18084), -(18085), -(18086), -(18088), -(18089), -(18090), -(18091), -(18092), -(18101), -(18103), -(18104), -(18105), -(18106), -(18107), -(18108), -(18111), -(18112), -(18118), -(18138), -(18145), -(18149), -(18151), -(18152), -(18153), -(18159), -(18164), -(18165), -(18172), -(18173), -(18187), -(18197), -(18199), -(18200), -(18202), -(18203), -(18204), -(18205), -(18206), -(18208), -(18209), -(18210), -(18211), -(18214), -(18217), -(18223), -(18266), -(18267), -(18270), -(18276), -(18278), -(18289), -(18347), -(18362), -(18367), -(18368), -(18375), -(18381), -(18387), -(18389), -(18390), -(18395), -(18396), -(18398), -(18425), -(18469), -(18476), -(18498), -(18502), -(18503), -(18543), -(18545), -(18557), -(18561), -(18562), -(18608), -(18610), -(18631), -(18632), -(18633), -(18647), -(18649), -(18651), -(18652), -(18654), -(18656), -(18657), -(18658), -(18663), -(18670), -(18702), -(18761), -(18763), -(18796), -(18798), -(18802), -(18805), -(18807), -(18809), -(18812), -(18813), -(18817), -(18819), -(18833), -(18867), -(18868), -(18869), -(18870), -(18871), -(18945), -(18952), -(18958), -(18968), -(18972), -(18980), -(18988), -(18996), -(19027), -(19128), -(19130), -(19131), -(19132), -(19133), -(19134), -(19136), -(19179), -(19196), -(19213), -(19244), -(19260), -(19276), -(19277), -(19278), -(19279), -(19280), -(19306), -(19319), -(19362), -(19386), -(19391), -(19393), -(19395), -(19397), -(19411), -(19434), -(19437), -(19439), -(19444), -(19445), -(19446), -(19447), -(19448), -(19450), -(19452), -(19460), -(19463), -(19469), -(19471), -(19472), -(19476), -(19481), -(19486), -(19501), -(19503), -(19505), -(19512), -(19548), -(19595), -(19597), -(19632), -(19633), -(19637), -(19639), -(19642), -(19643), -(19644), -(19647), -(19648), -(19650), -(19652), -(19653), -(19654), -(19658), -(19661), -(19662), -(19663), -(19664), -(19674), -(19675), -(19676), -(19677), -(19678), -(19679), -(19680), -(19681), -(19682), -(19683), -(19684), -(19685), -(19686), -(19687), -(19688), -(19689), -(19692), -(19693), -(19694), -(19696), -(19697), -(19699), -(19700), -(19701), -(19725), -(19727), -(19728), -(19729), -(19730), -(19731), -(19734), -(19736), -(19737), -(19738), -(19739), -(19740), -(19742), -(19750), -(19755), -(19767), -(19770), -(19771), -(19775), -(19776), -(19777), -(19779), -(19785), -(19797), -(19801), -(19816), -(19820), -(19834), -(19835), -(19836), -(19837), -(19838), -(19850), -(19852), -(19853), -(19854), -(19869), -(19872), -(19874), -(19881), -(19901), -(19931), -(19938), -(19939), -(19940), -(19941), -(19942), -(19943), -(19970), -(19971), -(19972), -(19973), -(19974), -(19975), -(19983), -(20000), -(20004), -(20005), -(20006), -(20019), -(20066), -(20170), -(20184), -(20185), -(20186), -(20187), -(20211), -(20217), -(20220), -(20221), -(20223), -(20228), -(20233), -(20236), -(20240), -(20243), -(20252), -(20253), -(20271), -(20276), -(20279), -(20294), -(20295), -(20297), -(20298), -(20367), -(20368), -(20369), -(20370), -(20371), -(20372), -(20373), -(20374), -(20410), -(20420), -(20424), -(20425), -(20463), -(20467), -(20473), -(20474), -(20475), -(20477), -(20508), -(20511), -(20534), -(20535), -(20536), -(20537), -(20539), -(20541), -(20543), -(20547), -(20559), -(20560), -(20564), -(20565), -(20569), -(20586), -(20604), -(20605), -(20614), -(20615), -(20616), -(20617), -(20618), -(20623), -(20625), -(20627), -(20629), -(20630), -(20647), -(20655), -(20656), -(20657), -(20658), -(20660), -(20661), -(20662), -(20663), -(20664), -(20665), -(20666), -(20668), -(20677), -(20678), -(20679), -(20682), -(20684), -(20685), -(20688), -(20690), -(20691), -(20692), -(20695), -(20696), -(20698), -(20700), -(20714), -(20720), -(20726), -(20733), -(20735), -(20736), -(20740), -(20751), -(20787), -(20788), -(20790), -(20791), -(20792), -(20793), -(20795), -(20797), -(20800), -(20801), -(20802), -(20804), -(20805), -(20806), -(20807), -(20808), -(20811), -(20812), -(20815), -(20816), -(20819), -(20820), -(20821), -(20822), -(20823), -(20824), -(20825), -(20826), -(20829), -(20830), -(20831), -(20832), -(20869), -(20882), -(20883), -(20893), -(20900), -(20901), -(20902), -(20903), -(20904), -(20909), -(20910), -(20911), -(20929), -(20930), -(20989), -(21008), -(21027), -(21030), -(21047), -(21049), -(21050), -(21055), -(21056), -(21059), -(21060), -(21062), -(21063), -(21064), -(21066), -(21067), -(21068), -(21072), -(21074), -(21077), -(21081), -(21100), -(21128), -(21140), -(21141), -(21150), -(21151), -(21159), -(21162), -(21163), -(21164), -(21170), -(21179), -(21183), -(21187), -(21330), -(21332), -(21335), -(21337), -(21343), -(21356), -(21357), -(21368), -(21369), -(21372), -(21388), -(21390), -(21398), -(21401), -(21402), -(21463), -(21464), -(21465), -(21541), -(21542), -(21543), -(21546), -(21549), -(21551), -(21552), -(21553), -(21647), -(21654), -(21667), -(21668), -(21669), -(21670), -(21731), -(21732), -(21734), -(21735), -(21737), -(21745), -(21787), -(21794), -(21807), -(21829), -(21832), -(21834), -(21835), -(21840), -(21847), -(21866), -(21889), -(21892), -(21898), -(21912), -(21939), -(21949), -(21952), -(21953), -(21960), -(21961), -(21971), -(21979), -(21987), -(21990), -(21992), -(22009), -(22012), -(22048), -(22068), -(22088), -(22108), -(22109), -(22110), -(22111), -(22112), -(22113), -(22114), -(22115), -(22116), -(22117), -(22118), -(22119), -(22120), -(22121), -(22127), -(22128), -(22167), -(22168), -(22187), -(22189), -(22207), -(22227), -(22272), -(22273), -(22274), -(22284), -(22289), -(22290), -(22291), -(22312), -(22335), -(22336), -(22355), -(22357), -(22371), -(22373), -(22411), -(22412), -(22414), -(22415), -(22416), -(22418), -(22423), -(22426), -(22427), -(22428), -(22429), -(22433), -(22438), -(22482), -(22565), -(22568), -(22570), -(22572), -(22574), -(22575), -(22582), -(22591), -(22592), -(22639), -(22641), -(22646), -(22651), -(22661), -(22662), -(22666), -(22667), -(22677), -(22678), -(22682), -(22687), -(22689), -(22690), -(22691), -(22692), -(22695), -(22709), -(22713), -(22715), -(22742), -(22744), -(22745), -(22751), -(22752), -(22784), -(22785), -(22799), -(22800), -(22814), -(22816), -(22817), -(22818), -(22820), -(22822), -(22823), -(22827), -(22828), -(22829), -(22856), -(22858), -(22859), -(22864), -(22883), -(22885), -(22886), -(22887), -(22893), -(22901), -(22907), -(22909), -(22911), -(22916), -(22919), -(22920), -(22935), -(22947), -(22950), -(22951), -(22959), -(22968), -(22993), -(22994), -(22995), -(22997), -(23015), -(23038), -(23059), -(23064), -(23065), -(23073), -(23102), -(23104), -(23106), -(23114), -(23115), -(23122), -(23123), -(23124), -(23125), -(23135), -(23139), -(23153), -(23154), -(23155), -(23169), -(23170), -(23174), -(23205), -(23206), -(23224), -(23256), -(23262), -(23267), -(23268), -(23275), -(23278), -(23298), -(23301), -(23304), -(23333), -(23335), -(23337), -(23340), -(23359), -(23379), -(23380), -(23381), -(23391), -(23392), -(23402), -(23416), -(23417), -(23451), -(23452), -(23454), -(23460), -(23490), -(23491), -(23493), -(23504), -(23505), -(23546), -(23552), -(23567), -(23568), -(23569), -(23577), -(23580), -(23590), -(23592), -(23601), -(23604), -(23605), -(23620), -(23621), -(23622), -(23623), -(23625), -(23626), -(23627), -(23658), -(23661), -(23675), -(23687), -(23693), -(23694), -(23695), -(23696), -(23699), -(23702), -(23735), -(23736), -(23737), -(23738), -(23765), -(23766), -(23767), -(23768), -(23769), -(23774), -(23775), -(23786), -(23848), -(23850), -(23853), -(23859), -(23860), -(23862), -(23865), -(23881), -(23892), -(23893), -(23894), -(23895), -(23921), -(23922), -(23923), -(23924), -(23925), -(23947), -(23948), -(23952), -(23953), -(23958), -(23959), -(23960), -(23961), -(23962), -(23963), -(23964), -(23967), -(23970), -(23978), -(23979), -(24002), -(24003), -(24016), -(24017), -(24020), -(24023), -(24042), -(24049), -(24053), -(24061), -(24064), -(24097), -(24109), -(24111), -(24131), -(24132), -(24133), -(24134), -(24135), -(24178), -(24179), -(24185), -(24187), -(24193), -(24199), -(24201), -(24208), -(24210), -(24212), -(24213), -(24238), -(24239), -(24241), -(24248), -(24251), -(24253), -(24254), -(24257), -(24259), -(24261), -(24267), -(24274), -(24275), -(24300), -(24306), -(24314), -(24315), -(24316), -(24317), -(24327), -(24331), -(24332), -(24333), -(24335), -(24336), -(24337), -(24339), -(24341), -(24374), -(24378), -(24379), -(24388), -(24393), -(24394), -(24407), -(24408), -(24412), -(24413), -(24414), -(24423), -(24435), -(24458), -(24466), -(24530), -(24573), -(24577), -(24578), -(24579), -(24583), -(24585), -(24586), -(24587), -(24596), -(24600), -(24601), -(24611), -(24617), -(24618), -(24619), -(24637), -(24640), -(24648), -(24649), -(24668), -(24671), -(24672), -(24674), -(24680), -(24684), -(24685), -(24686), -(24690), -(24705), -(24708), -(24709), -(24710), -(24711), -(24712), -(24713), -(24714), -(24715), -(24723), -(24725), -(24726), -(24727), -(24730), -(24732), -(24735), -(24736), -(24740), -(24742), -(24745), -(24747), -(24750), -(24751), -(24752), -(24753), -(24755), -(24757), -(24759), -(24761), -(24762), -(24766), -(24767), -(24769), -(24771), -(24773), -(24776), -(24785), -(24787), -(24791), -(24792), -(24793), -(24802), -(24803), -(24816), -(24817), -(24819), -(24824), -(24825), -(24826), -(24829), -(24831), -(24832), -(24844), -(24857), -(24872), -(24873), -(24875), -(24923), -(24928), -(24935), -(24937), -(24942), -(24950), -(24951), -(24952), -(24953), -(24954), -(24955), -(24957), -(24960), -(24961), -(24962), -(24963), -(24964), -(24965), -(24966), -(24974), -(24975), -(24976), -(24977), -(24982), -(24993), -(25006), -(25008), -(25009), -(25010), -(25011), -(25012), -(25021), -(25022), -(25025), -(25028), -(25050), -(25051), -(25052), -(25054), -(25055), -(25058), -(25104), -(25139), -(25140), -(25143), -(25165), -(25174), -(25185), -(25187), -(25189), -(25190), -(25191), -(25208), -(25210), -(25212), -(25213), -(25217), -(25218), -(25221), -(25222), -(25225), -(25231), -(25233), -(25234), -(25235), -(25236), -(25241), -(25242), -(25245), -(25246), -(25248), -(25251), -(25258), -(25262), -(25263), -(25266), -(25269), -(25272), -(25273), -(25274), -(25275), -(25281), -(25282), -(25286), -(25288), -(25290), -(25291), -(25292), -(25294), -(25295), -(25297), -(25298), -(25299), -(25300), -(25302), -(25304), -(25306), -(25307), -(25308), -(25309), -(25311), -(25312), -(25314), -(25315), -(25316), -(25345), -(25349), -(25363), -(25364), -(25367), -(25368), -(25371), -(25372), -(25373), -(25375), -(25383), -(25384), -(25387), -(25389), -(25391), -(25396), -(25420), -(25424), -(25433), -(25439), -(25442), -(25448), -(25449), -(25454), -(25457), -(25462), -(25464), -(25465), -(25467), -(25471), -(25488), -(25497), -(25501), -(25504), -(25514), -(25515), -(25530), -(25531), -(25595), -(25602), -(25603), -(25605), -(25645), -(25646), -(25650), -(25651), -(25652), -(25668), -(25671), -(25673), -(25677), -(25678), -(25686), -(25710), -(25712), -(25721), -(25725), -(25742), -(25748), -(25755), -(25760), -(25761), -(25762), -(25771), -(25772), -(25777), -(25778), -(25779), -(25781), -(25788), -(25800), -(25802), -(25803), -(25806), -(25807), -(25808), -(25809), -(25810), -(25811), -(25816), -(25821), -(25838), -(25840), -(25843), -(25845), -(25847), -(25848), -(25852), -(25854), -(25856), -(25861), -(25902), -(25903), -(25911), -(25912), -(25913), -(25914), -(25947), -(25992), -(25995), -(25997), -(25999), -(26001), -(26004), -(26005), -(26006), -(26007), -(26008), -(26012), -(26013), -(26017), -(26035), -(26044), -(26050), -(26077), -(26078), -(26079), -(26081), -(26082), -(26090), -(26095), -(26097), -(26098), -(26100), -(26108), -(26125), -(26126), -(26134), -(26141), -(26143), -(26170), -(26181), -(26194), -(26195), -(26196), -(26197), -(26198), -(26206), -(26207), -(26211), -(26218), -(26226), -(26233), -(26258), -(26259), -(26275), -(26281), -(26282), -(26339), -(26350), -(26363), -(26364), -(26365), -(26366), -(26367), -(26368), -(26369), -(26370), -(26371), -(26372), -(26374), -(26375), -(26377), -(26406), -(26408), -(26409), -(26410), -(26412), -(26414), -(26415), -(26419), -(26446), -(26448), -(26470), -(26476), -(26548), -(26556), -(26561), -(26565), -(26572), -(26584), -(26601), -(26610), -(26613), -(26616), -(26622), -(26623), -(26624), -(26625), -(26636), -(26639), -(26641), -(26649), -(26654), -(26663), -(26679), -(26688), -(26693), -(26740), -(26742), -(26748), -(26791), -(26796), -(26799), -(26800), -(26839), -(26861), -(26862), -(26863), -(26864), -(26865), -(26866), -(26867), -(26884), -(26890), -(26899), -(26923), -(26924), -(26968), -(26978), -(26979), -(26980), -(26981), -(26982), -(26984), -(26985), -(26986), -(26987), -(26988), -(26989), -(26990), -(26992), -(26995), -(26996), -(27000), -(27001), -(27002), -(27003), -(27004), -(27005), -(27006), -(27007), -(27008), -(27010), -(27013), -(27014), -(27016), -(27019), -(27021), -(27024), -(27030), -(27031), -(27047), -(27048), -(27049), -(27050), -(27051), -(27060), -(27065), -(27067), -(27068), -(27069), -(27070), -(27071), -(27072), -(27073), -(27074), -(27075), -(27078), -(27079), -(27126), -(27132), -(27135), -(27136), -(27137), -(27138), -(27140), -(27142), -(27154), -(27174), -(27175), -(27176), -(27177), -(27180), -(27187), -(27189), -(27209), -(27210), -(27211), -(27215), -(27216), -(27217), -(27218), -(27219), -(27220), -(27223), -(27224), -(27228), -(27243), -(27254), -(27255), -(27258), -(27261), -(27263), -(27267), -(27270), -(27274), -(27275), -(27276), -(27277), -(27281), -(27286), -(27288), -(27290), -(27360), -(27375), -(27376), -(27378), -(27379), -(27380), -(27381), -(27384), -(27385), -(27386), -(27387), -(27389), -(27390), -(27391), -(27392), -(27393), -(27395), -(27396), -(27397), -(27398), -(27441), -(27448), -(27486), -(27526), -(27527), -(27532), -(27541), -(27547), -(27548), -(27549), -(27550), -(27552), -(27553), -(27554), -(27555), -(27556), -(27557), -(27559), -(27565), -(27567), -(27571), -(27572), -(27573), -(27576), -(27577), -(27580), -(27581), -(27582), -(27584), -(27605), -(27606), -(27608), -(27609), -(27611), -(27613), -(27615), -(27620), -(27624), -(27626), -(27632), -(27633), -(27634), -(27635), -(27636), -(27637), -(27638), -(27640), -(27648), -(27655), -(27662), -(27673), -(27677), -(27686), -(27752), -(27754), -(27755), -(27756), -(27760), -(27765), -(27794), -(27806), -(27814), -(27819), -(27841), -(27849), -(27852), -(27860), -(27861), -(27863), -(27864), -(27865), -(27868), -(27873), -(27874), -(27891), -(27907), -(27909), -(27910), -(27915), -(27919), -(27931), -(27937), -(27983), -(27991), -(27992), -(27994), -(27995), -(28030), -(28099), -(28133), -(28147), -(28149), -(28167), -(28169), -(28239), -(28251), -(28252), -(28253), -(28254), -(28255), -(28256), -(28257), -(28258), -(28259), -(28260), -(28261), -(28262), -(28263), -(28265), -(28271), -(28272), -(28276), -(28287), -(28293), -(28299), -(28301), -(28303), -(28306), -(28308), -(28310), -(28314), -(28318), -(28319), -(28320), -(28321), -(28329), -(28336), -(28337), -(28342), -(28350), -(28351), -(28375), -(28393), -(28394), -(28396), -(28397), -(28410), -(28412), -(28418), -(28419), -(28420), -(28428), -(28431), -(28434), -(28439), -(28444), -(28445), -(28467), -(28470), -(28478), -(28516), -(28522), -(28597), -(28601), -(28608), -(28614), -(28624), -(28674), -(28676), -(28678), -(28684), -(28685), -(28689), -(28690), -(28691), -(28692), -(28696), -(28698), -(28702), -(28715), -(28718), -(28720), -(28722), -(28723), -(28724), -(28734), -(28750), -(28772), -(28776), -(28783), -(28788), -(28790), -(28791), -(28793), -(28795), -(28810), -(28824), -(28825), -(28826), -(28827), -(28836), -(28839), -(28858), -(28859), -(28872), -(28873), -(28880), -(28882), -(28883), -(28887), -(28896), -(28899), -(28900), -(28901), -(28902), -(28913), -(28969), -(28993), -(29001), -(29002), -(29003), -(29006), -(29044), -(29054), -(29058), -(29060), -(29098), -(29117), -(29126), -(29127), -(29128), -(29129), -(29134), -(29135), -(29136), -(29137), -(29138), -(29139), -(29151), -(29155), -(29157), -(29158), -(29160), -(29164), -(29166), -(29168), -(29170), -(29175), -(29182), -(29185), -(29188), -(29194), -(29196), -(29198), -(29228), -(29290), -(29295), -(29300), -(29306), -(29314), -(29317), -(29319), -(29320), -(29341), -(29362), -(29364), -(29380), -(29386), -(29395), -(29405), -(29407), -(29408), -(29425), -(29426), -(29427), -(29428), -(29435), -(29436), -(29443), -(29473), -(29487), -(29492), -(29494), -(29495), -(29497), -(29500), -(29502), -(29515), -(29516), -(29519), -(29522), -(29528), -(29539), -(29540), -(29543), -(29544), -(29546), -(29555), -(29560), -(29561), -(29562), -(29563), -(29564), -(29567), -(29570), -(29572), -(29574), -(29575), -(29576), -(29577), -(29578), -(29580), -(29581), -(29582), -(29583), -(29585), -(29586), -(29587), -(29607), -(29609), -(29638), -(29639), -(29640), -(29641), -(29644), -(29646), -(29647), -(29652), -(29653), -(29655), -(29661), -(29665), -(29666), -(29667), -(29670), -(29673), -(29675), -(29676), -(29677), -(29679), -(29684), -(29690), -(29703), -(29704), -(29707), -(29711), -(29712), -(29716), -(29722), -(29765), -(29768), -(29815), -(29832), -(29845), -(29847), -(29848), -(29850), -(29879), -(29881), -(29896), -(29901), -(29903), -(29906), -(29907), -(29909), -(29915), -(29916), -(29917), -(29925), -(29926), -(29927), -(29928), -(29930), -(29953), -(29954), -(29955), -(29956), -(29964), -(29990), -(29991), -(30010), -(30013), -(30014), -(30016), -(30019), -(30022), -(30036), -(30039), -(30044), -(30050), -(30053), -(30055), -(30069), -(30070), -(30077), -(30081), -(30099), -(30100), -(30102), -(30103), -(30104), -(30105), -(30108), -(30112), -(30113), -(30115), -(30121), -(30127), -(30128), -(30130), -(30131), -(30151), -(30153), -(30164), -(30173), -(30175), -(30177), -(30178), -(30180), -(30194), -(30195), -(30197), -(30198), -(30202), -(30213), -(30218), -(30219), -(30223), -(30238), -(30253), -(30269), -(30270), -(30271), -(30280), -(30285), -(30324), -(30330), -(30335), -(30351), -(30353), -(30356), -(30357), -(30358), -(30383), -(30395), -(30400), -(30401), -(30402), -(30404), -(30405), -(30412), -(30421), -(30422), -(30423), -(30424), -(30430), -(30433), -(30435), -(30448), -(30449), -(30451), -(30455), -(30459), -(30463), -(30464), -(30465), -(30466), -(30467), -(30468), -(30471), -(30474), -(30478), -(30479), -(30481), -(30493), -(30495), -(30500), -(30501), -(30504), -(30505), -(30507), -(30512), -(30520), -(30528), -(30530), -(30545), -(30546), -(30601), -(30605), -(30606), -(30607), -(30608), -(30609), -(30614), -(30615), -(30619), -(30621), -(30637), -(30638), -(30639), -(30641), -(30643), -(30646), -(30647), -(30648), -(30651), -(30652), -(30653), -(30654), -(30661), -(30686), -(30687), -(30688), -(30689), -(30691), -(30695), -(30719), -(30736), -(30740), -(30751), -(30753), -(30755), -(30756), -(30768), -(30817), -(30822), -(30830), -(30832), -(30838), -(30839), -(30846), -(30849), -(30850), -(30854), -(30875), -(30876), -(30877), -(30878), -(30888), -(30889), -(30890), -(30900), -(30901), -(30909), -(30910), -(30923), -(30926), -(30932), -(30936), -(30937), -(30942), -(30943), -(30944), -(30945), -(30967), -(30971), -(30977), -(30980), -(30981), -(30984), -(30986), -(30989), -(30990), -(30992), -(31008), -(31009), -(31012), -(31015), -(31016), -(31018), -(31022), -(31041), -(31042), -(31043), -(31046), -(31069), -(31117), -(31125), -(31139), -(31249), -(31257), -(31262), -(31263), -(31270), -(31271), -(31272), -(31274), -(31275), -(31279), -(31280), -(31281), -(31282), -(31284), -(31286), -(31287), -(31288), -(31289), -(31290), -(31292), -(31295), -(31296), -(31305), -(31306), -(31312), -(31316), -(31319), -(31330), -(31334), -(31337), -(31339), -(31345), -(31366), -(31367), -(31368), -(31376), -(31378), -(31381), -(31387), -(31389), -(31390), -(31394), -(31397), -(31399), -(31400), -(31401), -(31402), -(31404), -(31405), -(31406), -(31407), -(31410), -(31415), -(31416), -(31417), -(31418), -(31419), -(31420), -(31423), -(31425), -(31426), -(31427), -(31436), -(31445), -(31446), -(31457), -(31464), -(31477), -(31481), -(31486), -(31513), -(31516), -(31535), -(31547), -(31551), -(31552), -(31553), -(31566), -(31589), -(31595), -(31596), -(31600), -(31601), -(31602), -(31604), -(31609), -(31610), -(31618), -(31620), -(31622), -(31623), -(31626), -(31627), -(31629), -(31651), -(31662), -(31664), -(31703), -(31705), -(31707), -(31709), -(31713), -(31715), -(31717), -(31718), -(31721), -(31724), -(31729), -(31733), -(31734), -(31739), -(31740), -(31741), -(31742), -(31743), -(31747), -(31751), -(31754), -(31758), -(31759), -(31764), -(31766), -(31772), -(31779), -(31782), -(31784), -(31789), -(31790), -(31803), -(31804), -(31807), -(31808), -(31810), -(31811), -(31812), -(31813), -(31814), -(31815), -(31816), -(31819), -(31827), -(31843), -(31863), -(31864), -(31865), -(31893), -(31898), -(31907), -(31911), -(31916), -(31923), -(31935), -(31939), -(31942), -(31946), -(31948), -(31955), -(31956), -(31961), -(31965), -(31966), -(31971), -(31972), -(31973), -(31975), -(31976), -(31977), -(31978), -(31984), -(31988), -(31994), -(31996), -(31999), -(32000), -(32001), -(32002), -(32004), -(32005), -(32006), -(32009), -(32010), -(32011), -(32012), -(32013), -(32015), -(32017), -(32018), -(32019), -(32020), -(32021), -(32022), -(32024), -(32025), -(32026), -(32039), -(32049), -(32055), -(32056), -(32063), -(32065), -(32071), -(32076), -(32077), -(32080), -(32082), -(32092), -(32093), -(32094), -(32095), -(32103), -(32104), -(32105), -(32110), -(32120), -(32125), -(32126), -(32129), -(32131), -(32132), -(32133), -(32139), -(32154), -(32168), -(32175), -(32176), -(32190), -(32197), -(32202), -(32211), -(32224), -(32231), -(32247), -(32248), -(32261), -(32268), -(32270), -(32300), -(32306), -(32315), -(32317), -(32319), -(32320), -(32321), -(32323), -(32325), -(32328), -(32329), -(32330), -(32337), -(32338), -(32346), -(32361), -(32363), -(32364), -(32369), -(32370), -(32376), -(32378), -(32379), -(32386), -(32388), -(32389), -(32390), -(32391), -(32405), -(32414), -(32415), -(32416), -(32417), -(32418), -(32422), -(32428), -(32430), -(32431), -(32441), -(32445), -(32474), -(32491), -(32546), -(32550), -(32578), -(32583), -(32588), -(32593), -(32594), -(32595), -(32605), -(32606), -(32639), -(32643), -(32645), -(32652), -(32654), -(32666), -(32674), -(32675), -(32677), -(32678), -(32679), -(32682), -(32683), -(32684), -(32689), -(32690), -(32691), -(32693), -(32699), -(32700), -(32707), -(32709), -(32716), -(32721), -(32733), -(32734), -(32735), -(32736), -(32738), -(32739), -(32740), -(32741), -(32742), -(32747), -(32748), -(32749), -(32751), -(32752), -(32759), -(32769), -(32770), -(32771), -(32772), -(32774), -(32778), -(32779), -(32784), -(32797), -(32829), -(32830), -(32831), -(32835), -(32846), -(32858), -(32860), -(32862), -(32863), -(32864), -(32889), -(32897), -(32901), -(32902), -(32903), -(32904), -(32905), -(32906), -(32907), -(32908), -(32909), -(32913), -(32915), -(32916), -(32917), -(32919), -(32921), -(32922), -(32924), -(32926), -(32935), -(32940), -(32950), -(32959), -(32960), -(32962), -(32967), -(32969), -(32971), -(32984), -(32996), -(33031), -(33040), -(33044), -(33045), -(33047), -(33049), -(33051), -(33055), -(33056), -(33068), -(33069), -(33072), -(33073), -(33074), -(33077), -(33078), -(33079), -(33080), -(33081), -(33082), -(33086), -(33096), -(33098), -(33126), -(33129), -(33130), -(33144), -(33173), -(33175), -(33196), -(33197), -(33198), -(33206), -(33227), -(33230), -(33246), -(33247), -(33324), -(33326), -(33331), -(33335), -(33346), -(33360), -(33382), -(33383), -(33385), -(33387), -(33389), -(33392), -(33401), -(33404), -(33417), -(33419), -(33462), -(33463), -(33480), -(33482), -(33483), -(33487), -(33493), -(33502), -(33526), -(33527), -(33528), -(33529), -(33534), -(33535), -(33542), -(33552), -(33553), -(33554), -(33619), -(33620), -(33625), -(33626), -(33628), -(33631), -(33632), -(33640), -(33641), -(33643), -(33659), -(33661), -(33665), -(33684), -(33688), -(33689), -(33698), -(33699), -(33700), -(33709), -(33723), -(33728), -(33731), -(33745), -(33750), -(33763), -(33768), -(33781), -(33786), -(33787), -(33789), -(33792), -(33793), -(33794), -(33813), -(33824), -(33825), -(33827), -(33832), -(33833), -(33837), -(33844), -(33849), -(33850), -(33865), -(33871), -(33876), -(33878), -(33899), -(33907), -(33910), -(33911), -(33912), -(33913), -(33914), -(33925), -(33938), -(33947), -(33951), -(33960), -(33964), -(33969), -(33970), -(33975), -(33982), -(33983), -(33985), -(33986), -(33987), -(33988), -(33989), -(34014), -(34020), -(34025), -(34036), -(34071), -(34073), -(34083), -(34087), -(34088), -(34089), -(34092), -(34093), -(34095), -(34097), -(34099), -(34107), -(34108), -(34110), -(34112), -(34113), -(34120), -(34130), -(34132), -(34135), -(34138), -(34139), -(34143), -(34149), -(34150), -(34163), -(34171), -(34172), -(34176), -(34177), -(34213), -(34214), -(34215), -(34216), -(34217), -(34218), -(34219), -(34232), -(34243), -(34259), -(34298), -(34344), -(34345), -(34346), -(34347), -(34348), -(34351), -(34352), -(34353), -(34354), -(34357), -(34361), -(34363), -(34366), -(34370), -(34379), -(34389), -(34390), -(34391), -(34394), -(34400), -(34411), -(34412), -(34413), -(34414), -(34415), -(34416), -(34417), -(34418), -(34419), -(34423), -(34425), -(34428), -(34432), -(34437), -(34438), -(34439), -(34445), -(34446), -(34447), -(34451), -(34463), -(34490), -(34510), -(34520), -(34578), -(34580), -(34587), -(34613), -(34614), -(34615), -(34616), -(34618), -(34620), -(34625), -(34626), -(34629), -(34637), -(34639), -(34640), -(34641), -(34643), -(34644), -(34645), -(34650), -(34653), -(34654), -(34655), -(34661), -(34665), -(34672), -(34694), -(34695), -(34696), -(34697), -(34709), -(34714), -(34715), -(34719), -(34722), -(34745), -(34752), -(34784), -(34786), -(34787), -(34788), -(34789), -(34793), -(34794), -(34797), -(34798), -(34799), -(34800), -(34802), -(34809), -(34811), -(34812), -(34820), -(34824), -(34828), -(34829), -(34841), -(34852), -(34856), -(34875), -(34879), -(34881), -(34883), -(34886), -(34889), -(34891), -(34893), -(34906), -(34907), -(34913), -(34914), -(34916), -(34917), -(34920), -(34922), -(34924), -(34925), -(34930), -(34931), -(34940), -(34941), -(34942), -(34945), -(34969), -(34974), -(34975), -(34976), -(34984), -(34996), -(35004), -(35010), -(35011), -(35012), -(35013), -(35033), -(35034), -(35039), -(35047), -(35049), -(35054), -(35055), -(35056), -(35062), -(35065), -(35066), -(35067), -(35069), -(35071), -(35072), -(35088), -(35089), -(35092), -(35096), -(35101), -(35105), -(35106), -(35107), -(35112), -(35115), -(35117), -(35120), -(35144), -(35147), -(35161), -(35178), -(35179), -(35180), -(35182), -(35183), -(35185), -(35189), -(35195), -(35201), -(35207), -(35229), -(35231), -(35234), -(35238), -(35243), -(35244), -(35263), -(35267), -(35273), -(35280), -(35290), -(35291), -(35292), -(35293), -(35294), -(35295), -(35313), -(35314), -(35316), -(35317), -(35318), -(35321), -(35323), -(35325), -(35326), -(35328), -(35329), -(35331), -(35332), -(35333), -(35334), -(35335), -(35339), -(35346), -(35353), -(35371), -(35376), -(35377), -(35382), -(35387), -(35389), -(35392), -(35395), -(35401), -(35410), -(35412), -(35424), -(35460), -(35466), -(35472), -(35473), -(35493), -(35499), -(35501), -(35506), -(35507), -(35510), -(35511), -(35514), -(35518), -(35519), -(35556), -(35570), -(35621), -(35686), -(35718), -(35727), -(35728), -(35735), -(35741), -(35742), -(35748), -(35759), -(35760), -(35771), -(35772), -(35780), -(35783), -(35839), -(35846), -(35851), -(35853), -(35857), -(35871), -(35873), -(35877), -(35913), -(35914), -(35916), -(35918), -(35919), -(35920), -(35927), -(35928), -(35932), -(35944), -(35945), -(35946), -(35949), -(35954), -(35955), -(35963), -(35964), -(35965), -(35966), -(35967), -(35968), -(35969), -(35970), -(35971), -(35972), -(35973), -(35974), -(35975), -(35976), -(35977), -(35978), -(35979), -(35980), -(35981), -(35982), -(35983), -(35984), -(35985), -(35986), -(35987), -(35988), -(35989), -(35990), -(35997), -(35998), -(35999), -(36002), -(36020), -(36021), -(36023), -(36025), -(36033), -(36052), -(36054), -(36073), -(36088), -(36093), -(36094), -(36095), -(36099), -(36100), -(36102), -(36115), -(36123), -(36138), -(36140), -(36141), -(36145), -(36152), -(36153), -(36170), -(36173), -(36176), -(36181), -(36207), -(36208), -(36224), -(36227), -(36228), -(36237), -(36238), -(36246), -(36247), -(36250), -(36276), -(36277), -(36279), -(36288), -(36295), -(36296), -(36299), -(36310), -(36312), -(36314), -(36328), -(36332), -(36333), -(36339), -(36340), -(36341), -(36342), -(36343), -(36344), -(36345), -(36348), -(36380), -(36398), -(36399), -(36401), -(36402), -(36404), -(36414), -(36415), -(36416), -(36417), -(36433), -(36434), -(36435), -(36436), -(36438), -(36439), -(36441), -(36447), -(36448), -(36457), -(36458), -(36461), -(36464), -(36469), -(36470), -(36475), -(36478), -(36482), -(36483), -(36488), -(36500), -(36507), -(36508), -(36509), -(36516), -(36517), -(36518), -(36527), -(36534), -(36536), -(36538), -(36539), -(36540), -(36541), -(36554), -(36558), -(36570), -(36571), -(36578), -(36586), -(36590), -(36594), -(36601), -(36604), -(36606), -(36608), -(36609), -(36612), -(36622), -(36623), -(36624), -(36625), -(36627), -(36628), -(36632), -(36638), -(36641), -(36642), -(36645), -(36646), -(36647), -(36650), -(36655), -(36656), -(36659), -(36664), -(36671), -(36677), -(36678), -(36679), -(36710), -(36711), -(36712), -(36713), -(36714), -(36732), -(36739), -(36778), -(36779), -(36780), -(36781), -(36787), -(36789), -(36791), -(36796), -(36801), -(36805), -(36806), -(36807), -(36810), -(36812), -(36814), -(36822), -(36825), -(36831), -(36832), -(36833), -(36836), -(36838), -(36839), -(36840), -(36841), -(36842), -(36843), -(36844), -(36863), -(36864), -(36866), -(36872), -(36876), -(36877), -(36886), -(36891), -(36894), -(36905), -(36906), -(36909), -(36913), -(36914), -(36916), -(36917), -(36919), -(36920), -(36921), -(36924), -(36927), -(36929), -(36947), -(36956), -(36957), -(36965), -(36966), -(36971), -(36972), -(36974), -(36979), -(36980), -(36983), -(36984), -(36986), -(36987), -(36988), -(36990), -(36991), -(37027), -(37028), -(37030), -(37031), -(37054), -(37057), -(37067), -(37073), -(37074), -(37082), -(37089), -(37104), -(37110), -(37111), -(37112), -(37113), -(37121), -(37122), -(37123), -(37126), -(37132), -(37133), -(37136), -(37138), -(37154), -(37156), -(37162), -(37176), -(37208), -(37216), -(37221), -(37249), -(37250), -(37251), -(37252), -(37254), -(37255), -(37257), -(37259), -(37260), -(37271), -(37272), -(37273), -(37274), -(37275), -(37276), -(37277), -(37320), -(37321), -(37322), -(37323), -(37328), -(37329), -(37330), -(37331), -(37332), -(37334), -(37335), -(37359), -(37361), -(37369), -(37372), -(37387), -(37389), -(37412), -(37417), -(37421), -(37450), -(37455), -(37456), -(37460), -(37462), -(37463), -(37470), -(37479), -(37486), -(37500), -(37506), -(37511), -(37527), -(37532), -(37537), -(37540), -(37548), -(37551), -(37552), -(37554), -(37563), -(37566), -(37572), -(37577), -(37578), -(37579), -(37580), -(37581), -(37589), -(37591), -(37592), -(37596), -(37597), -(37599), -(37602), -(37621), -(37628), -(37629), -(37630), -(37632), -(37634), -(37646), -(37647), -(37654), -(37661), -(37662), -(37664), -(37667), -(37668), -(37675), -(37681), -(37685), -(37695), -(37700), -(37711), -(37717), -(37718), -(37719), -(37727), -(37749), -(37770), -(37777), -(37778), -(37798), -(37800), -(37801), -(37802), -(37803), -(37804), -(37805), -(37806), -(37807), -(37808), -(37809), -(37810), -(37811), -(37813), -(37823), -(37834), -(37838), -(37839), -(37840), -(37841), -(37847), -(37850), -(37851), -(37856), -(37862), -(37865), -(37867), -(37871), -(37892), -(37894), -(37906), -(37908), -(37910), -(37921), -(37922), -(37930), -(37933), -(37937), -(37940), -(37945), -(37946), -(37950), -(37956), -(37958), -(37962), -(37965), -(37967), -(37968), -(37972), -(37973), -(37974), -(37975), -(37978), -(37979), -(37986), -(37988), -(37992), -(37998), -(38002), -(38007), -(38009), -(38010), -(38023), -(38024), -(38025), -(38027), -(38029), -(38030), -(38032), -(38034), -(38035), -(38047), -(38048), -(38051), -(38052), -(38053), -(38056), -(38058), -(38059), -(38063), -(38065), -(38066), -(38067), -(38074), -(38075), -(38076), -(38078), -(38083), -(38084), -(38085), -(38093), -(38094), -(38095), -(38107), -(38109), -(38113), -(38120), -(38122), -(38125), -(38127), -(38129), -(38133), -(38134), -(38135), -(38136), -(38145), -(38146), -(38147), -(38148), -(38149), -(38153), -(38154), -(38155), -(38167), -(38177), -(38178), -(38182), -(38183), -(38187), -(38193), -(38203), -(38204), -(38205), -(38208), -(38209), -(38210), -(38213), -(38223), -(38226), -(38233), -(38234), -(38238), -(38239), -(38240), -(38243), -(38245), -(38246), -(38252), -(38253), -(38254), -(38259), -(38260), -(38262), -(38263), -(38264), -(38265), -(38267), -(38274), -(38275), -(38276), -(38277), -(38279), -(38280), -(38285), -(38295), -(38310), -(38313), -(38324), -(38328), -(38329), -(38330), -(38333), -(38338), -(38340), -(38342), -(38344), -(38363), -(38366), -(38370), -(38372), -(38374), -(38377), -(38378), -(38383), -(38386), -(38387), -(38391), -(38400), -(38401), -(38441), -(38446), -(38461), -(38465), -(38470), -(38474), -(38495), -(38496), -(38505), -(38509), -(38510), -(38520), -(38523), -(38526), -(38534), -(38535), -(38538), -(38543), -(38554), -(38556), -(38557), -(38558), -(38559), -(38560), -(38561), -(38562), -(38563), -(38564), -(38565), -(38566), -(38567), -(38568), -(38569), -(38570), -(38572), -(38580), -(38582), -(38584), -(38585), -(38586), -(38588), -(38591), -(38595), -(38598), -(38606), -(38616), -(38617), -(38621), -(38625), -(38626), -(38628), -(38630), -(38631), -(38634), -(38636), -(38641), -(38643), -(38645), -(38657), -(38658), -(38661), -(38663), -(38669), -(38692), -(38697), -(38699), -(38704), -(38708), -(38721), -(38723), -(38731), -(38739), -(38742), -(38753), -(38760), -(38762), -(38764), -(38765), -(38767), -(38768), -(38770), -(38772), -(38775), -(38777), -(38791), -(38797), -(38798), -(38801), -(38804), -(38806), -(38807), -(38808), -(38815), -(38816), -(38817), -(38821), -(38822), -(38823), -(38824), -(38825), -(38826), -(38827), -(38846), -(38848), -(38849), -(38851), -(38852), -(38858), -(38859), -(38861), -(38863), -(38864), -(38875), -(38879), -(38880), -(38881), -(38882), -(38883), -(38884), -(38887), -(38894), -(38895), -(38896), -(38897), -(38899), -(38904), -(38907), -(38909), -(38913), -(38914), -(38915), -(38918), -(38919), -(38921), -(38923), -(38926), -(38930), -(38935), -(38940), -(38941), -(38942), -(38943), -(38945), -(38946), -(38950), -(38952), -(38959), -(38967), -(38971), -(38985), -(38986), -(38987), -(38988), -(38989), -(38990), -(38992), -(38995), -(39000), -(39002), -(39006), -(39009), -(39015), -(39016), -(39017), -(39019), -(39020), -(39021), -(39022), -(39023), -(39025), -(39026), -(39029), -(39032), -(39039), -(39044), -(39046), -(39047), -(39053), -(39054), -(39058), -(39060), -(39061), -(39062), -(39064), -(39065), -(39066), -(39068), -(39069), -(39070), -(39076), -(39077), -(39078), -(39079), -(39083), -(39087), -(39097), -(39098), -(39099), -(39101), -(39116), -(39119), -(39120), -(39121), -(39122), -(39123), -(39125), -(39129), -(39135), -(39136), -(39145), -(39153), -(39157), -(39159), -(39160), -(39164), -(39165), -(39171), -(39172), -(39174), -(39176), -(39182), -(39192), -(39196), -(39197), -(39198), -(39202), -(39204), -(39207), -(39210), -(39212), -(39214), -(39215), -(39226), -(39229), -(39230), -(39252), -(39258), -(39262), -(39267), -(39268), -(39270), -(39271), -(39285), -(39293), -(39297), -(39299), -(39309), -(39322), -(39328), -(39329), -(39332), -(39337), -(39339), -(39349), -(39367), -(39371), -(39378), -(39386), -(39396), -(39412), -(39413), -(39415), -(39419), -(39435), -(39436), -(39445), -(39449), -(39456), -(39457), -(39460), -(39474), -(39475), -(39476), -(39477), -(39512), -(39513), -(39528), -(39529), -(39544), -(39560), -(39566), -(39574), -(39582), -(39587), -(39590), -(39592), -(39595), -(39600), -(39609), -(39621), -(39622), -(39661), -(39665), -(39668), -(39669), -(39670), -(39674), -(39675), -(39676), -(39697), -(39703), -(39794), -(39796), -(39810), -(39812), -(39826), -(39830), -(39835), -(39837), -(39838), -(39857), -(39865), -(39883), -(39886), -(39901), -(39904), -(39908), -(39920), -(39928), -(39945), -(39948), -(39955), -(39956), -(39967), -(39972), -(39979), -(39980), -(39995), -(39996), -(40011), -(40019), -(40032), -(40041), -(40055), -(40057), -(40063), -(40066), -(40071), -(40074), -(40081), -(40084), -(40086), -(40097), -(40099), -(40102), -(40109), -(40119), -(40123), -(40124), -(40146), -(40157), -(40165), -(40166), -(40167), -(40173), -(40185), -(40191), -(40193), -(40197), -(40198), -(40199), -(40220), -(40225), -(40227), -(40228), -(40239), -(40248), -(40251), -(40254), -(40259), -(40279), -(40290), -(40293), -(40303), -(40310), -(40311), -(40312), -(40313), -(40317), -(40321), -(40322), -(40325), -(40327), -(40334), -(40337), -(40339), -(40344), -(40346), -(40347), -(40348), -(40351), -(40356), -(40357), -(40358), -(40363), -(40366), -(40367), -(40368), -(40384), -(40385), -(40392), -(40400), -(40406), -(40411), -(40412), -(40413), -(40414), -(40415), -(40416), -(40420), -(40423), -(40427), -(40429), -(40430), -(40431), -(40434), -(40449), -(40450), -(40471), -(40472), -(40481), -(40486), -(40489), -(40491), -(40493), -(40497), -(40504), -(40505), -(40507), -(40508), -(40509), -(40525), -(40536), -(40542), -(40554), -(40560), -(40563), -(40564), -(40565), -(40569), -(40571), -(40581), -(40585), -(40595), -(40597), -(40602), -(40604), -(40605), -(40608), -(40616), -(40620), -(40633), -(40635), -(40639), -(40641), -(40643), -(40645), -(40646), -(40651), -(40652), -(40671), -(40672), -(40685), -(40726), -(40728), -(40736), -(40739), -(40740), -(40742), -(40751), -(40758), -(40770), -(40772), -(40777), -(40778), -(40787), -(40796), -(40801), -(40810), -(40814), -(40822), -(40827), -(40835), -(40837), -(40838), -(40842), -(40843), -(40844), -(40846), -(40856), -(40859), -(40860), -(40861), -(40864), -(40872), -(40873), -(40876), -(40877), -(40881), -(40886), -(40888), -(40890), -(40892), -(40893), -(40894), -(40895), -(40901), -(40903), -(40906), -(40909), -(40917), -(40926), -(40928), -(40930), -(40935), -(40945), -(40951), -(40954), -(40958), -(40964), -(40965), -(40968), -(40969), -(40970), -(40972), -(40976), -(40991), -(41001), -(41003), -(41028), -(41029), -(41032), -(41035), -(41044), -(41047), -(41050), -(41052), -(41054), -(41055), -(41060), -(41063), -(41065), -(41069), -(41070), -(41072), -(41075), -(41080), -(41082), -(41083), -(41084), -(41092), -(41093), -(41103), -(41109), -(41115), -(41116), -(41121), -(41137), -(41139), -(41152), -(41169), -(41170), -(41171), -(41177), -(41178), -(41179), -(41180), -(41182), -(41183), -(41184), -(41186), -(41187), -(41188), -(41189), -(41190), -(41192), -(41197), -(41198), -(41213), -(41214), -(41225), -(41226), -(41227), -(41228), -(41229), -(41230), -(41231), -(41238), -(41241), -(41247), -(41250), -(41255), -(41256), -(41259), -(41264), -(41265), -(41270), -(41272), -(41278), -(41279), -(41280), -(41281), -(41283), -(41291), -(41299), -(41302), -(41332), -(41334), -(41335), -(41336), -(41338), -(41345), -(41346), -(41351), -(41352), -(41353), -(41355), -(41360), -(41363), -(41368), -(41370), -(41372), -(41373), -(41374), -(41375), -(41377), -(41378), -(41383), -(41384), -(41388), -(41389), -(41390), -(41392), -(41394), -(41395), -(41396), -(41407), -(41410), -(41411), -(41419), -(41421), -(41426), -(41439), -(41440), -(41442), -(41448), -(41450), -(41451), -(41456), -(41461), -(41467), -(41468), -(41470), -(41471), -(41472), -(41473), -(41483), -(41484), -(41485), -(41486), -(41487), -(41489), -(41490), -(41491), -(41492), -(41519), -(41526), -(41528), -(41533), -(41540), -(41543), -(41544), -(41546), -(41547), -(41548), -(41549), -(41558), -(41559), -(41563), -(41564), -(41565), -(41567), -(41568), -(41571), -(41578), -(41579), -(41580), -(41581), -(41586), -(41588), -(41592), -(41596), -(41597), -(41598), -(41601), -(41621), -(41622), -(41625), -(41626), -(41633), -(41637), -(41911), -(41914), -(41916), -(41917), -(41926), -(41931), -(41932), -(41933), -(41936), -(41937), -(41939), -(41940), -(41957), -(41958), -(41959), -(41960), -(41961), -(41964), -(41965), -(41978), -(41980), -(41984), -(41985), -(41990), -(42002), -(42003), -(42013), -(42018), -(42020), -(42021), -(42024), -(42025), -(42053), -(42058), -(42129), -(42131), -(42132), -(42133), -(42139), -(42142), -(42144), -(42149), -(42150), -(42152), -(42161), -(42165), -(42169), -(42185), -(42203), -(42246), -(42299), -(42313), -(42315), -(42319), -(42320), -(42322), -(42324), -(42325), -(42326), -(42328), -(42329), -(42330), -(42331), -(42332), -(42333), -(42337), -(42349), -(42360), -(42363), -(42368), -(42369), -(42370), -(42371), -(42372), -(42380), -(42382), -(42383), -(42384), -(42385), -(42389), -(42395), -(42396), -(42397), -(42399), -(42400), -(42401), -(42402), -(42411), -(42414), -(42426), -(42434), -(42435), -(42441), -(42443), -(42447), -(42455), -(42463), -(42476), -(42483), -(42485), -(42486), -(42488), -(42489), -(42502), -(42512), -(42514), -(42516), -(42518), -(42535), -(42537), -(42540), -(42560), -(42561), -(42574), -(42579), -(42580), -(42583), -(42587), -(42611), -(42628), -(42632), -(42633), -(42634), -(42635), -(42653), -(42658), -(42670), -(42671), -(42672), -(42696), -(42702), -(42710), -(42711), -(42717), -(42719), -(42721), -(42724), -(42725), -(42730), -(42733), -(42739), -(42740), -(42741), -(42746), -(42747), -(42756), -(42762), -(42767), -(42772), -(42780), -(42781), -(42782), -(42783), -(42785), -(42789), -(42790), -(42791), -(42793), -(42799), -(42802), -(42803), -(42804), -(42811), -(42826), -(42832), -(42833), -(42834), -(42841), -(42842), -(42843), -(42846), -(42853), -(42858), -(42859), -(42867), -(42869), -(42870), -(42872), -(42873), -(42878), -(42879), -(42880), -(42889), -(42890), -(42891), -(42894), -(42895), -(42896), -(42897), -(42902), -(42903), -(42904), -(42907), -(42908), -(42913), -(42914), -(42953), -(42964), -(42972), -(42978), -(42995), -(42999), -(43003), -(43004), -(43006), -(43036), -(43037), -(43043), -(43044), -(43058), -(43061), -(43063), -(43064), -(43065), -(43067), -(43075), -(43077), -(43083), -(43084), -(43086), -(43087), -(43090), -(43093), -(43094), -(43097), -(43100), -(43103), -(43104), -(43107), -(43108), -(43122), -(43123), -(43125), -(43128), -(43130), -(43131), -(43132), -(43133), -(43137), -(43138), -(43140), -(43150), -(43151), -(43153), -(43156), -(43157), -(43159), -(43178), -(43187), -(43191), -(43192), -(43193), -(43194), -(43195), -(43196), -(43197), -(43198), -(43199), -(43202), -(43205), -(43206), -(43225), -(43228), -(43235), -(43243), -(43245), -(43246), -(43256), -(43259), -(43260), -(43261), -(43262), -(43267), -(43268), -(43270), -(43273), -(43286), -(43287), -(43288), -(43292), -(43297), -(43298), -(43299), -(43300), -(43301), -(43303), -(43305), -(43309), -(43315), -(43325), -(43330), -(43334), -(43337), -(43340), -(43341), -(43345), -(43346), -(43347), -(43348), -(43352), -(43353), -(43354), -(43356), -(43357), -(43358), -(43359), -(43361), -(43362), -(43364), -(43365), -(43368), -(43370), -(43379), -(43380), -(43381), -(43384), -(43393), -(43398), -(43399), -(43409), -(43410), -(43411), -(43413), -(43415), -(43416), -(43417), -(43419), -(43427), -(43428), -(43433), -(43435), -(43439), -(43441), -(43445), -(43451), -(43456), -(43461), -(43469), -(43470), -(43471), -(43472), -(43473), -(43474), -(43475), -(43477), -(43483), -(43484), -(43488), -(43489), -(43492), -(43495), -(43496), -(43497), -(43501), -(43505), -(43507), -(43511), -(43512), -(43515), -(43516), -(43517), -(43518), -(43519), -(43520), -(43522), -(43523), -(43524), -(43525), -(43526), -(43528), -(43529), -(43532), -(43535), -(43543), -(43545), -(43553), -(43556), -(43560), -(43564), -(43565), -(43567), -(43569), -(43571), -(43572), -(43574), -(43575), -(43577), -(43578), -(43579), -(43581), -(43584), -(43585), -(43586), -(43591), -(43592), -(43593), -(43612), -(43613), -(43619), -(43621), -(43622), -(43644), -(43646), -(43648), -(43649), -(43650), -(43651), -(43660), -(43661), -(43663), -(43665), -(43666), -(43667), -(43671), -(43673), -(43680), -(43682), -(43683), -(43684), -(43690), -(43693), -(43695), -(43701), -(43709), -(43714), -(43715), -(43720), -(43726), -(43727), -(43728), -(43729), -(43732), -(43746), -(43767), -(43769), -(43785), -(43786), -(43789), -(43794), -(43795), -(43799), -(43804), -(43807), -(43809), -(43821), -(43834), -(43869), -(43895), -(43903), -(43906), -(43923), -(43928), -(43931), -(43932), -(43933), -(43937), -(43941), -(43948), -(43951), -(43952), -(43969), -(43971), -(43974), -(43976), -(43984), -(43988), -(43993), -(43996), -(43997), -(44000), -(44005), -(44008), -(44015), -(44016), -(44030), -(44031), -(44038), -(44053), -(44078), -(44079), -(44081), -(44082), -(44089), -(44093), -(44095), -(44120), -(44121), -(44126), -(44127), -(44137), -(44138), -(44139), -(44141), -(44142), -(44144), -(44148), -(44149), -(44152), -(44156), -(44159), -(44164), -(44165), -(44168), -(44169), -(44170), -(44171), -(44173), -(44174), -(44176), -(44181), -(44185), -(44188), -(44189), -(44202), -(44211), -(44212), -(44216), -(44219), -(44220), -(44221), -(44222), -(44223), -(44237), -(44241), -(44242), -(44247), -(44248), -(44256), -(44258), -(44262), -(44267), -(44268), -(44271), -(44274), -(44280), -(44285), -(44286), -(44289), -(44294), -(44304), -(44308), -(44310), -(44318), -(44319), -(44323), -(44325), -(44327), -(44328), -(44332), -(44339), -(44351), -(44357), -(44358), -(44361), -(44364), -(44368), -(44370), -(44382), -(44407), -(44408), -(44415), -(44424), -(44425), -(44429), -(44430), -(44454), -(44455), -(44457), -(44464), -(44473), -(44477), -(44478), -(44479), -(44481), -(44482), -(44503), -(44504), -(44512), -(44518), -(44519), -(44525), -(44530), -(44532), -(44533), -(44534), -(44536), -(44541), -(44542), -(44547), -(44553), -(44563), -(44564), -(44572), -(44577), -(44583), -(44586), -(44600), -(44602), -(44606), -(44614), -(44617), -(44618), -(44619), -(44620), -(44622), -(44639), -(44640), -(44641), -(44642), -(44654), -(44657), -(44658), -(44685), -(44732), -(44753), -(44755), -(44765), -(44780), -(44781), -(44787), -(44788), -(44789), -(44790), -(44791), -(44796), -(44808), -(44811), -(44812), -(44813), -(44817), -(44818), -(44823), -(44843), -(44848), -(44868), -(44871), -(44872), -(44876), -(44881), -(44934), -(44937), -(44945), -(44956), -(44957), -(44961), -(44966), -(44985), -(44997), -(45012), -(45017), -(45023), -(45026), -(45029), -(45031), -(45036), -(45055), -(45064), -(45071), -(45075), -(45088), -(45089), -(45090), -(45096), -(45101), -(45102), -(45105), -(45108), -(45110), -(45113), -(45123), -(45124), -(45129), -(45130), -(45133), -(45134), -(45141), -(45145), -(45185), -(45189), -(45192), -(45195), -(45197), -(45199), -(45200), -(45204), -(45205), -(45206), -(45209), -(45214), -(45215), -(45221), -(45228), -(45235), -(45251), -(45256), -(45269), -(45271), -(45274), -(45276), -(45280), -(45284), -(45286), -(45287), -(45288), -(45289), -(45290), -(45291), -(45292), -(45293), -(45294), -(45295), -(45296), -(45297), -(45298), -(45299), -(45300), -(45301), -(45302), -(45314), -(45321), -(45324), -(45327), -(45328), -(45334), -(45337), -(45344), -(45350), -(45352), -(45353), -(45356), -(45362), -(45409), -(45417), -(45419), -(45420), -(45421), -(45425), -(45428), -(45429), -(45430), -(45442), -(45444), -(45447), -(45456), -(45458), -(45462), -(45463), -(45468), -(45469), -(45472), -(45476), -(45477), -(45485), -(45487), -(45491), -(45493), -(45497), -(45504), -(45505), -(45507), -(45509), -(45511), -(45516), -(45524), -(45534), -(45537), -(45543), -(45544), -(45573), -(45576), -(45577), -(45578), -(45580), -(45587), -(45588), -(45589), -(45590), -(45600), -(45603), -(45604), -(45611), -(45625), -(45627), -(45628), -(45629), -(45632), -(45639), -(45645), -(45646), -(45647), -(45648), -(45649), -(45650), -(45659), -(45660), -(45661), -(45664), -(45693), -(45696), -(45716), -(45717), -(45719), -(45724), -(45725), -(45730), -(45739), -(45742), -(45744), -(45748), -(45773), -(45777), -(45778), -(45798), -(45799), -(45800), -(45803), -(45804), -(45815), -(45820), -(45833), -(45837), -(45854), -(45866), -(45873), -(45874), -(45875), -(45889), -(45897), -(45898), -(45899), -(45900), -(45902), -(45906), -(45913), -(45919), -(45924), -(45926), -(45931), -(45940), -(45943), -(45946), -(45947), -(45964), -(45967), -(45975), -(45980), -(45981), -(45983), -(45989), -(45992), -(46010), -(46012), -(46014), -(46015), -(46016), -(46023), -(46027), -(46028), -(46029), -(46031), -(46032), -(46033), -(46035), -(46042), -(46043), -(46044), -(46045), -(46047), -(46049), -(46057), -(46062), -(46065), -(46067), -(46070), -(46074), -(46080), -(46081), -(46083), -(46084), -(46092), -(46093), -(46098), -(46099), -(46101), -(46104), -(46119), -(46145), -(46152), -(46153), -(46155), -(46161), -(46164), -(46166), -(46167), -(46180), -(46181), -(46182), -(46183), -(46187), -(46188), -(46189), -(46190), -(46191), -(46192), -(46194), -(46198), -(46200), -(46202), -(46206), -(46221), -(46231), -(46232), -(46239), -(46260), -(46266), -(46276), -(46279), -(46280), -(46283), -(46285), -(46288), -(46291), -(46292), -(46305), -(46315), -(46323), -(46331), -(46333), -(46341), -(46357), -(46361), -(46362), -(46364), -(46365), -(46366), -(46368), -(46380), -(46381), -(46394), -(46406), -(46411), -(46420), -(46421), -(46422), -(46429), -(46430), -(46432), -(46433), -(46434), -(46440), -(46443), -(46444), -(46447), -(46448), -(46449), -(46459), -(46460), -(46466), -(46468), -(46469), -(46479), -(46480), -(46481), -(46483), -(46485), -(46486), -(46487), -(46543), -(46550), -(46556), -(46557), -(46558), -(46559), -(46560), -(46561), -(46562), -(46563), -(46566), -(46567), -(46568), -(46572), -(46579), -(46580), -(46582), -(46587), -(46590), -(46591), -(46595), -(46598), -(46602), -(46607), -(46611), -(46612), -(46613), -(46614), -(46615), -(46616), -(46617), -(46618), -(46620), -(46621), -(46624), -(46629), -(46630), -(46641), -(46642), -(46651), -(46654), -(46661), -(46664), -(46665), -(46667), -(46671), -(46672), -(46673), -(46674), -(46677), -(46681), -(46686), -(46691), -(46693), -(46696), -(46702), -(46704), -(46709), -(46711), -(46716), -(46717), -(46718), -(46719), -(46720), -(46721), -(46722), -(46723), -(46724), -(46725), -(46726), -(46727), -(46728), -(46729), -(46730), -(46731), -(46734), -(46745), -(46762), -(46764), -(46770), -(46772), -(46773), -(46787), -(46791), -(46801), -(46813), -(46816), -(46824), -(46825), -(46826), -(46841), -(46845), -(46846), -(46856), -(46857), -(46877), -(46879), -(46880), -(46887), -(46906), -(46956), -(46960), -(46962), -(46978), -(46982), -(46983), -(46987), -(46988), -(46990), -(47001), -(47003), -(47009), -(47011), -(47012), -(47014), -(47020), -(47021), -(47028), -(47029), -(47033), -(47034), -(47042), -(47043), -(47057), -(47059), -(47062), -(47063), -(47064), -(47066), -(47068), -(47069), -(47070), -(47071), -(47072), -(47074), -(47076), -(47077), -(47079), -(47081), -(47084), -(47093), -(47096), -(47098), -(47107), -(47117), -(47122), -(47139), -(47143), -(47144), -(47145), -(47146), -(47148), -(47149), -(47151), -(47152), -(47153), -(47155), -(47156), -(47157), -(47158), -(47160), -(47161), -(47162), -(47163), -(47164), -(47165), -(47166), -(47168), -(47171), -(47173), -(47176), -(47206), -(47208), -(47219), -(47244), -(47248), -(47249), -(47257), -(47272), -(47277), -(47282), -(47293), -(47299), -(47305), -(47307), -(47308), -(47316), -(47321), -(47322), -(47323), -(47326), -(47333), -(47334), -(47337), -(47338), -(47339), -(47340), -(47345), -(47380), -(47382), -(47390), -(47392), -(47394), -(47403), -(47405), -(47410), -(47413), -(47414), -(47422), -(47424), -(47431), -(47432), -(47442), -(47447), -(47449), -(47450), -(47451), -(47453), -(47465), -(47467), -(47468), -(47470), -(47471), -(47472), -(47474), -(47475), -(47476), -(47480), -(47481), -(47482), -(47485), -(47486), -(47487), -(47488), -(47489), -(47497), -(47498), -(47504), -(47516), -(47517), -(47519), -(47520), -(47528), -(47530), -(47534), -(47540), -(47541), -(47550), -(47575), -(47601), -(47604), -(47610), -(47611), -(47614), -(47629), -(47632), -(47633), -(47635), -(47637), -(47664), -(47665), -(47673), -(47674), -(47676), -(47679), -(47689), -(47695), -(47697), -(47698), -(47700), -(47702), -(47703), -(47718), -(47721), -(47722), -(47723), -(47724), -(47729), -(47739), -(47740), -(47741), -(47744), -(47749), -(47751), -(47753), -(47757), -(47758), -(47761), -(47767), -(47768), -(47777), -(47778), -(47780), -(47781), -(47782), -(47783), -(47785), -(47788), -(47808), -(47809), -(47810), -(47811), -(47812), -(47813), -(47814), -(47815), -(47824), -(47825), -(47826), -(47827), -(47835), -(47836), -(47837), -(47838), -(47841), -(47843), -(47848), -(47850), -(47851), -(47852), -(47853), -(47855), -(47857), -(47859), -(47860), -(47863), -(47864), -(47865), -(47867), -(47902), -(47914), -(47917), -(47920), -(47926), -(47928), -(47930), -(47938), -(47948), -(47960), -(47961), -(47962), -(47964), -(47968), -(47976), -(47984), -(47991), -(47992), -(47993), -(47994), -(47995), -(47996), -(48011), -(48013), -(48039), -(48045), -(48046), -(48047), -(48048), -(48053), -(48060), -(48062), -(48063), -(48065), -(48066), -(48067), -(48068), -(48070), -(48071), -(48072), -(48073), -(48084), -(48085), -(48098), -(48099), -(48100), -(48101), -(48102), -(48103), -(48104), -(48105), -(48119), -(48120), -(48122), -(48123), -(48124), -(48125), -(48126), -(48127), -(48130), -(48132), -(48133), -(48134), -(48135), -(48137), -(48140), -(48147), -(48155), -(48156), -(48157), -(48158), -(48159), -(48160), -(48161), -(48163), -(48164), -(48165), -(48169), -(48181), -(48184), -(48187), -(48192), -(48208), -(48210), -(48232), -(48245), -(48249), -(48250), -(48261), -(48262), -(48264), -(48267), -(48268), -(48282), -(48283), -(48285), -(48286), -(48287), -(48288), -(48290), -(48291), -(48292), -(48296), -(48298), -(48299), -(48300), -(48301), -(48307), -(48309), -(48310), -(48316), -(48330), -(48334), -(48360), -(48365), -(48374), -(48376), -(48377), -(48378), -(48400), -(48417), -(48423), -(48424), -(48440), -(48441), -(48442), -(48443), -(48450), -(48451), -(48459), -(48461), -(48462), -(48463), -(48464), -(48465), -(48468), -(48469), -(48479), -(48480), -(48489), -(48490), -(48491), -(48504), -(48532), -(48533), -(48540), -(48541), -(48542), -(48543), -(48548), -(48549), -(48563), -(48564), -(48565), -(48566), -(48567), -(48568), -(48569), -(48570), -(48571), -(48572), -(48573), -(48574), -(48575), -(48576), -(48577), -(48578), -(48579), -(48583), -(48585), -(48598), -(48599), -(48601), -(48603), -(48606), -(48617), -(48622), -(48628), -(48637), -(48638), -(48639), -(48640), -(48648), -(48652), -(48656), -(48657), -(48658), -(48659), -(48660), -(48661), -(48662), -(48663), -(48664), -(48665), -(48666), -(48667), -(48668), -(48669), -(48671), -(48672), -(48673), -(48674), -(48675), -(48676), -(48678), -(48679), -(48680), -(48689), -(48690), -(48691), -(48693), -(48696), -(48697), -(48698), -(48699), -(48700), -(48712), -(48714), -(48737), -(48738), -(48746), -(48747), -(48749), -(48750), -(48752), -(48753), -(48754), -(48755), -(48756), -(48759), -(48760), -(48765), -(48770), -(48772), -(48774), -(48775), -(48781), -(48782), -(48784), -(48785), -(48788), -(48800), -(48801), -(48802), -(48805), -(48806), -(48812), -(48813), -(48815), -(48820), -(48821), -(48822), -(48823), -(48824), -(48825), -(48826), -(48827), -(48828), -(48829), -(48830), -(48831), -(48832), -(48845), -(48850), -(48851), -(48852), -(48854), -(48862), -(48871), -(48872), -(48873), -(48876), -(48877), -(48878), -(48880), -(48881), -(48883), -(48895), -(48917), -(48920), -(48931), -(48932), -(48935), -(48936), -(48953), -(48960), -(48974), -(48981), -(48984), -(48995), -(48996), -(48998), -(48999), -(49000), -(49001), -(49005), -(49009), -(49010), -(49011), -(49012), -(49020), -(49021), -(49026), -(49028), -(49029), -(49037), -(49044), -(49045), -(49047), -(49048), -(49049), -(49050), -(49051), -(49052), -(49053), -(49054), -(49078), -(49084), -(49089), -(49090), -(49091), -(49092), -(49093), -(49099), -(49106), -(49110), -(49111), -(49113), -(49119), -(49124), -(49125), -(49127), -(49138), -(49143), -(49158), -(49161), -(49165), -(49177), -(49184), -(49204), -(49206), -(49213), -(49215), -(49230), -(49231), -(49232), -(49233), -(49235), -(49236), -(49237), -(49238), -(49239), -(49240), -(49242), -(49243), -(49256), -(49257), -(49266), -(49267), -(49268), -(49269), -(49270), -(49271), -(49272), -(49273), -(49275), -(49276), -(49278), -(49279), -(49282), -(49283), -(49284), -(49288), -(49294), -(49296), -(49298), -(49305), -(49309), -(49312), -(49317), -(49323), -(49324), -(49348), -(49349), -(49353), -(49354), -(49362), -(49363), -(49364), -(49372), -(49376), -(49381), -(49383), -(49387), -(49404), -(49406), -(49418), -(49427), -(49429), -(49433), -(49439), -(49446), -(49453), -(49454), -(49459), -(49463), -(49466), -(49481), -(49482), -(49485), -(49500), -(49501), -(49511), -(49512), -(49527), -(49537), -(49544), -(49546), -(49547), -(49549), -(49560), -(49576), -(49584), -(49587), -(49592), -(49613), -(49616), -(49617), -(49624), -(49637), -(49639), -(49641), -(49644), -(49675), -(49678), -(49680), -(49681), -(49686), -(49690), -(49696), -(49704), -(49705), -(49706), -(49708), -(49710), -(49711), -(49712), -(49715), -(49718), -(49719), -(49720), -(49723), -(49729), -(49734), -(49742), -(49747), -(49749), -(49753), -(49755), -(49758), -(49759), -(49771), -(49776), -(49797), -(49799), -(49800), -(49802), -(49803), -(49804), -(49805), -(49806), -(49830), -(49836), -(49840), -(49841), -(49843), -(49846), -(49848), -(49859), -(49861), -(49863), -(49865), -(49891), -(49892), -(49893), -(49894), -(49895), -(49896), -(49897), -(49903), -(49904), -(49906), -(49909), -(49913), -(49914), -(49915), -(49916), -(49917), -(49918), -(49919), -(49920), -(49921), -(49922), -(49923), -(49924), -(49926), -(49927), -(49928), -(49929), -(49930), -(49935), -(49942), -(49945), -(49956), -(49961), -(49965), -(49966), -(49967), -(49968), -(49969), -(49970), -(49971), -(49972), -(49973), -(49974), -(49975), -(49978), -(49980), -(49981), -(49985), -(49986), -(49987), -(49989), -(49991), -(49993), -(49994), -(49995), -(49996), -(49997), -(49998), -(49999), -(50004), -(50006), -(50015), -(50021), -(50027), -(50028), -(50035), -(50038), -(50046), -(50047), -(50050), -(50052), -(50064), -(50066), -(50073), -(50075), -(50084), -(50086), -(50089), -(50090), -(50091), -(50092), -(50094), -(50100), -(50101), -(50102), -(50104), -(50135), -(50144), -(50145), -(50146), -(50156), -(50165), -(50169), -(50183), -(50184), -(50185), -(50188), -(50196), -(50198), -(50205), -(50206), -(50207), -(50217), -(50231), -(50232), -(50234), -(50245), -(50251), -(50252), -(50255), -(50256), -(50257), -(50259), -(50265), -(50271), -(50273), -(50276), -(50282), -(50287), -(50288), -(50289), -(50290), -(50291), -(50293), -(50295), -(50299), -(50301), -(50303), -(50305), -(50306), -(50307), -(50319), -(50323), -(50328), -(50335), -(50341), -(50343), -(50344), -(50347), -(50349), -(50356), -(50361), -(50370), -(50375), -(50377), -(50378), -(50379), -(50380), -(50400), -(50401), -(50402), -(50403), -(50405), -(50406), -(50410), -(50411), -(50412), -(50424), -(50431), -(50432), -(50434), -(50435), -(50436), -(50437), -(50439), -(50445), -(50454), -(50455), -(50456), -(50459), -(50462), -(50463), -(50464), -(50477), -(50478), -(50479), -(50484), -(50498), -(50499), -(50500), -(50504), -(50508), -(50509), -(50510), -(50511), -(50512), -(50517), -(50518), -(50519), -(50521), -(50523), -(50533), -(50534), -(50536), -(50537), -(50538), -(50541), -(50545), -(50550), -(50559), -(50566), -(50572), -(50573), -(50578), -(50581), -(50582), -(50588), -(50597), -(50629), -(50631), -(50633), -(50634), -(50635), -(50638), -(50655), -(50658), -(50659), -(50660), -(50661), -(50662), -(50663), -(50666), -(50668), -(50673), -(50675), -(50679), -(50688), -(50691), -(50693), -(50701), -(50704), -(50705), -(50706), -(50721), -(50725), -(50729), -(50731), -(50732), -(50733), -(50737), -(50739), -(50740), -(50744), -(50761), -(50770), -(50773), -(50782), -(50783), -(50796), -(50797), -(50799), -(50804), -(50818), -(50820), -(50821), -(50830), -(50832), -(50834), -(50842), -(50843), -(50844), -(50845), -(50846), -(50853), -(50854), -(50859), -(50861), -(50874), -(50876), -(50894), -(50895), -(50900), -(50905), -(50907), -(50914), -(50918), -(50919), -(50923), -(50924), -(50926), -(50927), -(50978), -(50979), -(50992), -(50997), -(51011), -(51015), -(51016), -(51018), -(51020), -(51026), -(51035), -(51037), -(51046), -(51054), -(51055), -(51057), -(51059), -(51062), -(51064), -(51067), -(51069), -(51072), -(51077), -(51079), -(51081), -(51083), -(51085), -(51087), -(51089), -(51091), -(51093), -(51095), -(51097), -(51100), -(51102), -(51105), -(51107), -(51111), -(51120), -(51121), -(51131), -(51134), -(51135), -(51137), -(51154), -(51156), -(51157), -(51165), -(51187), -(51196), -(51197), -(51198), -(51199), -(51200), -(51203), -(51216), -(51220), -(51221), -(51226), -(51227), -(51228), -(51229), -(51232), -(51233), -(51235), -(51236), -(51240), -(51243), -(51258), -(51259), -(51270), -(51272), -(51275), -(51279), -(51285), -(51287), -(51290), -(51292), -(51298), -(51305), -(51308), -(51310), -(51315), -(51316), -(51325), -(51326), -(51327), -(51328), -(51330), -(51334), -(51339), -(51340), -(51354), -(51356), -(51363), -(51365), -(51372), -(51382), -(51399), -(51409), -(51410), -(51411), -(51413), -(51416), -(51417), -(51418), -(51419), -(51423), -(51424), -(51425), -(51426), -(51427), -(51428), -(51429), -(51430), -(51431), -(51432), -(51440), -(51442), -(51446), -(51447), -(51454), -(51460), -(51467), -(51484), -(51489), -(51491), -(51492), -(51495), -(51496), -(51500), -(51502), -(51503), -(51504), -(51505), -(51506), -(51509), -(51514), -(51515), -(51573), -(51580), -(51584), -(51585), -(51586), -(51587), -(51588), -(51591), -(51592), -(51593), -(51596), -(51598), -(51601), -(51608), -(51609), -(51610), -(51613), -(51614), -(51618), -(51656), -(51657), -(51658), -(51659), -(51662), -(51675), -(51676), -(51677), -(51680), -(51693), -(51695), -(51699), -(51714), -(51718), -(51722), -(51724), -(51726), -(51728), -(51732), -(51734), -(51735), -(51736), -(51740), -(51751), -(51756), -(51757), -(51772), -(51775), -(51776), -(51778), -(51779), -(51786), -(51787), -(51797), -(51798), -(51799), -(51803), -(51804), -(51808), -(51809), -(51811), -(51818), -(51827), -(51830), -(51842), -(51844), -(51853), -(51854), -(51855), -(51856), -(51857), -(51863), -(51864), -(51872), -(51875), -(51876), -(51877), -(51878), -(51879), -(51886), -(51888), -(51889), -(51893), -(51894), -(51895), -(51897), -(51898), -(51899), -(51901), -(51909), -(51912), -(51917), -(51918), -(51919), -(51920), -(51926), -(51934), -(51935), -(51936), -(51937), -(51940), -(51945), -(51949), -(51951), -(51961), -(51962), -(51963), -(51968), -(51973), -(51976), -(51979), -(51981), -(51989), -(51990), -(51997), -(51998), -(51999), -(52000), -(52004), -(52005), -(52007), -(52008), -(52014), -(52025), -(52026), -(52030), -(52032), -(52042), -(52043), -(52045), -(52053), -(52069), -(52078), -(52082), -(52083), -(52086), -(52088), -(52090), -(52108), -(52125), -(52139), -(52149), -(52157), -(52160), -(52163), -(52167), -(52169), -(52171), -(52187), -(52194), -(52196), -(52198), -(52199), -(52206), -(52207), -(52209), -(52210), -(52212), -(52217), -(52219), -(52221), -(52223), -(52224), -(52228), -(52229), -(52230), -(52251), -(52252), -(52253), -(52256), -(52261), -(52263), -(52265), -(52267), -(52270), -(52280), -(52282), -(52292), -(52307), -(52312), -(52318), -(52327), -(52328), -(52334), -(52345), -(52346), -(52352), -(52353), -(52355), -(52356), -(52359), -(52360), -(52361), -(52364), -(52372), -(52373), -(52374), -(52375), -(52383), -(52389), -(52391), -(52401), -(52402), -(52415), -(52425), -(52428), -(52430), -(52431), -(52433), -(52444), -(52445), -(52447), -(52460), -(52463), -(52465), -(52466), -(52468), -(52469), -(52471), -(52472), -(52473), -(52474), -(52475), -(52476), -(52486), -(52487), -(52496), -(52498), -(52499), -(52501), -(52502), -(52504), -(52506), -(52511), -(52515), -(52519), -(52521), -(52522), -(52527), -(52532), -(52534), -(52536), -(52537), -(52538), -(52540), -(52542), -(52544), -(52545), -(52546), -(52547), -(52548), -(52549), -(52554), -(52566), -(52577), -(52581), -(52583), -(52586), -(52587), -(52591), -(52594), -(52595), -(52596), -(52600), -(52601), -(52604), -(52608), -(52609), -(52610), -(52613), -(52620), -(52631), -(52633), -(52643), -(52644), -(52655), -(52657), -(52658), -(52660), -(52672), -(52675), -(52680), -(52684), -(52695), -(52696), -(52699), -(52700), -(52702), -(52705), -(52708), -(52709), -(52711), -(52713), -(52715), -(52718), -(52719), -(52721), -(52722), -(52737), -(52740), -(52741), -(52743), -(52751), -(52752), -(52754), -(52755), -(52758), -(52761), -(52762), -(52764), -(52771), -(52772), -(52773), -(52778), -(52781), -(52782), -(52784), -(52789), -(52794), -(52806), -(52807), -(52813), -(52814), -(52818), -(52825), -(52835), -(52839), -(52851), -(52856), -(52859), -(52862), -(52863), -(52864), -(52871), -(52872), -(52873), -(52883), -(52885), -(52889), -(52890), -(52904), -(52905), -(52909), -(52921), -(52926), -(52931), -(52932), -(52939), -(52943), -(52986), -(52987), -(52988), -(52992), -(52994), -(52996), -(53001), -(53002), -(53003), -(53005), -(53006), -(53007), -(53019), -(53023), -(53027), -(53031), -(53033), -(53043), -(53044), -(53045), -(53051), -(53058), -(53059), -(53060), -(53062), -(53068), -(53069), -(53070), -(53072), -(53073), -(53085), -(53086), -(53087), -(53088), -(53089), -(53094), -(53098), -(53099), -(53100), -(53101), -(53102), -(53108), -(53109), -(53111), -(53116), -(53141), -(53145), -(53148), -(53150), -(53153), -(53158), -(53174), -(53191), -(53193), -(53194), -(53195), -(53208), -(53209), -(53214), -(53254), -(53271), -(53288), -(53289), -(53301), -(53307), -(53308), -(53310), -(53311), -(53313), -(53314), -(53317), -(53318), -(53322), -(53326), -(53327), -(53329), -(53330), -(53332), -(53333), -(53335), -(53338), -(53339), -(53340), -(53346), -(53351), -(53352), -(53353), -(53357), -(53359), -(53364), -(53366), -(53372), -(53388), -(53394), -(53395), -(53396), -(53402), -(53404), -(53407), -(53408), -(53418), -(53422), -(53424), -(53425), -(53431), -(53435), -(53437), -(53438), -(53442), -(53449), -(53460), -(53477), -(53480), -(53492), -(53493), -(53498), -(53499), -(53508), -(53509), -(53526), -(53528), -(53529), -(53532), -(53533), -(53534), -(53536), -(53537), -(53538), -(53540), -(53542), -(53543), -(53544), -(53545), -(53546), -(53547), -(53548), -(53549), -(53550), -(53558), -(53559), -(53560), -(53561), -(53562), -(53564), -(53565), -(53566), -(53567), -(53568), -(53571), -(53572), -(53573), -(53574), -(53575), -(53578), -(53579), -(53580), -(53581), -(53582), -(53584), -(53586), -(53587), -(53588), -(53589), -(53595), -(53600), -(53601), -(53617), -(53618), -(53625), -(53629), -(53631), -(53633), -(53638), -(53639), -(53652), -(53653), -(53654), -(53659), -(53669), -(53697), -(53704), -(53719), -(53726), -(53733), -(53739), -(53742), -(53769), -(53772), -(53786), -(53788), -(53799), -(53807), -(53809), -(53810), -(53815), -(53821), -(53824), -(54016), -(54028), -(54029), -(54035), -(54039), -(54042), -(54049), -(54050), -(54051), -(54052), -(54053), -(54060), -(54063), -(54068), -(54070), -(54071), -(54074), -(54075), -(54076), -(54077), -(54078), -(54079), -(54080), -(54092), -(54094), -(54095), -(54096), -(54113), -(54121), -(54126), -(54129), -(54132), -(54135), -(54158), -(54169), -(54172), -(54175), -(54183), -(54185), -(54188), -(54190), -(54191), -(54195), -(54196), -(54198), -(54203), -(54216), -(54226), -(54235), -(54237), -(54238), -(54249), -(54260), -(54261), -(54273), -(54283), -(54284), -(54290), -(54299), -(54303), -(54309), -(54311), -(54315), -(54316), -(54319), -(54321), -(54324), -(54331), -(54334), -(54335), -(54337), -(54338), -(54339), -(54340), -(54345), -(54350), -(54361), -(54376), -(54378), -(54380), -(54387), -(54393), -(54394), -(54395), -(54396), -(54399), -(54416), -(54417), -(54429), -(54431), -(54433), -(54451), -(54453), -(54458), -(54459), -(54460), -(54468), -(54470), -(54479), -(54485), -(54487), -(54491), -(54495), -(54498), -(54499), -(54502), -(54504), -(54507), -(54511), -(54514), -(54518), -(54521), -(54525), -(54526), -(54527), -(54531), -(54532), -(54540), -(54549), -(54565), -(54573), -(54576), -(54577), -(54578), -(54587), -(54588), -(54593), -(54594), -(54602), -(54604), -(54609), -(54610), -(54611), -(54612), -(54613), -(54615), -(54616), -(54617), -(54618), -(54619), -(54620), -(54622), -(54624), -(54630), -(54631), -(54632), -(54634), -(54640), -(54644), -(54646), -(54648), -(54651), -(54660), -(54662), -(54663), -(54667), -(54668), -(54673), -(54675), -(54677), -(54679), -(54680), -(54688), -(54689), -(54694), -(54702), -(54703), -(54704), -(54706), -(54708), -(54709), -(54716), -(54719), -(54723), -(54755), -(54757), -(54761), -(54770), -(54772), -(54781), -(54785), -(54788), -(54790), -(54791), -(54794), -(54799), -(54801), -(54804), -(54805), -(54820), -(54822), -(54823), -(54843), -(54846), -(54880), -(54881), -(54882), -(54883), -(54884), -(54885), -(54886), -(54887), -(54900), -(54906), -(54908), -(54919), -(54920), -(54932), -(54933), -(54951), -(54956), -(54957), -(54958), -(54965), -(54970), -(54971), -(54973), -(54974), -(54975), -(54976), -(54977), -(54982), -(54983), -(54986), -(54987), -(54992), -(54997), -(55006), -(55007), -(55008), -(55009), -(55021), -(55029), -(55039), -(55041), -(55046), -(55050), -(55051), -(55054), -(55065), -(55066), -(55069), -(55070), -(55071), -(55074), -(55075), -(55078), -(55079), -(55090), -(55093), -(55095), -(55102), -(55104), -(55144), -(55160), -(55168), -(55196), -(55209), -(55210), -(55216), -(55217), -(55218), -(55219), -(55220), -(55224), -(55225), -(55226), -(55240), -(55241), -(55253), -(55255), -(55258), -(55259), -(55260), -(55261), -(55262), -(55263), -(55264), -(55265), -(55268), -(55269), -(55270), -(55271), -(55274), -(55276), -(55277), -(55281), -(55284), -(55313), -(55314), -(55317), -(55318), -(55319), -(55320), -(55321), -(55322), -(55324), -(55331), -(55334), -(55346), -(55348), -(55359), -(55360), -(55363), -(55364), -(55411), -(55412), -(55416), -(55424), -(55425), -(55430), -(55469), -(55470), -(55482), -(55483), -(55484), -(55485), -(55487), -(55488), -(55489), -(55490), -(55491), -(55492), -(55495), -(55496), -(55497), -(55498), -(55499), -(55504), -(55505), -(55506), -(55507), -(55508), -(55509), -(55511), -(55520), -(55521), -(55530), -(55536), -(55549), -(55550), -(55555), -(55556), -(55557), -(55567), -(55568), -(55569), -(55579), -(55581), -(55582), -(55597), -(55598), -(55599), -(55602), -(55604), -(55605), -(55613), -(55622), -(55624), -(55625), -(55643), -(55645), -(55646), -(55648), -(55652), -(55659), -(55700), -(55703), -(55704), -(55716), -(55719), -(55728), -(55736), -(55748), -(55749), -(55750), -(55751), -(55752), -(55753), -(55754), -(55756), -(55770), -(55771), -(55772), -(55778), -(55779), -(55780), -(55781), -(55790), -(55797), -(55802), -(55804), -(55809), -(55813), -(55815), -(55818), -(55823), -(55824), -(55838), -(55840), -(55841), -(55864), -(55874), -(55877), -(55880), -(55890), -(55894), -(55929), -(55931), -(55932), -(55933), -(55935), -(55936), -(55937), -(55939), -(55951), -(55958), -(55959), -(55960), -(55962), -(55963), -(55968), -(55973), -(55978), -(55981), -(55982), -(55983), -(55984), -(56033), -(56036), -(56038), -(56046), -(56061), -(56071), -(56072), -(56090), -(56091), -(56092), -(56098), -(56104), -(56106), -(56107), -(56112), -(56113), -(56115), -(56122), -(56123), -(56125), -(56127), -(56130), -(56131), -(56132), -(56138), -(56139), -(56141), -(56143), -(56144), -(56147), -(56149), -(56160), -(56161), -(56185), -(56190), -(56191), -(56198), -(56200), -(56211), -(56222), -(56223), -(56230), -(56236), -(56239), -(56252), -(56254), -(56260), -(56277), -(56287), -(56305), -(56320), -(56326), -(56329), -(56331), -(56332), -(56346), -(56351), -(56352), -(56361), -(56362), -(56379), -(56404), -(56405), -(56411), -(56425), -(56426), -(56430), -(56433), -(56434), -(56440), -(56442), -(56444), -(56447), -(56448), -(56485), -(56491), -(56506), -(56513), -(56515), -(56517), -(56520), -(56521), -(56525), -(56536), -(56537), -(56539), -(56545), -(56557), -(56559), -(56562), -(56564), -(56565), -(56581), -(56582), -(56584), -(56586), -(56603), -(56605), -(56606), -(56607), -(56609), -(56624), -(56626), -(56627), -(56628), -(56629), -(56630), -(56631), -(56640), -(56641), -(56645), -(56659), -(56662), -(56664), -(56666), -(56668), -(56670), -(56671), -(56672), -(56678), -(56685), -(56687), -(56698), -(56699), -(56701), -(56707), -(56715), -(56718), -(56719), -(56720), -(56721), -(56727), -(56728), -(56729), -(56730), -(56731), -(56734), -(56753), -(56754), -(56755), -(56760), -(56761), -(56770), -(56771), -(56772), -(56773), -(56774), -(56775), -(56776), -(56777), -(56780), -(56781), -(56785), -(56790), -(56791), -(56795), -(56796), -(56797), -(56815), -(56854), -(56860), -(56861), -(56862), -(56891), -(56893), -(56896), -(56898), -(56902), -(56903), -(56905), -(56906), -(56907), -(56909), -(56917), -(56918), -(56919), -(56920), -(56921), -(56922), -(56923), -(56925), -(56933), -(56937), -(56938), -(56939), -(56940), -(56966), -(56969), -(57049), -(57050), -(57052), -(57053), -(57058), -(57062), -(57063), -(57089), -(57090), -(57094), -(57095), -(57108), -(57118), -(57143), -(57292), -(57305), -(57323), -(57337), -(57346), -(57347), -(57369), -(57374), -(57376), -(57380), -(57384), -(57386), -(57388), -(57389), -(57390), -(57391), -(57392), -(57393), -(57395), -(57397), -(57402), -(57407), -(57411), -(57413), -(57420), -(57454), -(57456), -(57461), -(57464), -(57465), -(57466), -(57473), -(57480), -(57486), -(57487), -(57488), -(57490), -(57506), -(57507), -(57528), -(57530), -(57536), -(57537), -(57547), -(57548), -(57553), -(57554), -(57556), -(57573), -(57580), -(57582), -(57587), -(57589), -(57590), -(57593), -(57594), -(57596), -(57599), -(57601), -(57602), -(57603), -(57615), -(57616), -(57617), -(57620), -(57628), -(57635), -(57640), -(57641), -(57644), -(57645), -(57647), -(57648), -(57651), -(57657), -(57661), -(57665), -(57670), -(57671), -(57677), -(57679), -(57723), -(57724), -(57725), -(57745), -(57755), -(57759), -(57765), -(57766), -(57767), -(57770), -(57774), -(57775), -(57777), -(57778), -(57779), -(57780), -(57781), -(57783), -(57785), -(57787), -(57789), -(57790), -(57795), -(57799), -(57802), -(57807), -(57808), -(57823), -(57825), -(57833), -(57834), -(57838), -(57841), -(57842), -(57845), -(57846), -(57860), -(57863), -(57864), -(57871), -(57874), -(57888), -(57896), -(57897), -(57906), -(57908), -(57914), -(57921), -(57922), -(57941), -(57949), -(57951), -(57964), -(57965), -(57969), -(57970), -(57974), -(57975), -(57981), -(57984), -(57992), -(57993), -(57994), -(58012), -(58021), -(58025), -(58044), -(58054), -(58061), -(58062), -(58071), -(58106), -(58117), -(58118), -(58119), -(58151), -(58154), -(58179), -(58180), -(58181), -(58183), -(58184), -(58187), -(58194), -(58203), -(58204), -(58205), -(58207), -(58208), -(58209), -(58210), -(58211), -(58212), -(58213), -(58214), -(58215), -(58216), -(58217), -(58218), -(58219), -(58220), -(58221), -(58222), -(58223), -(58224), -(58230), -(58270), -(58282), -(58283), -(58349), -(58351), -(58352), -(58371), -(58373), -(58412), -(58418), -(58419), -(58420), -(58421), -(58438), -(58448), -(58449), -(58450), -(58451), -(58452), -(58453), -(58456), -(58457), -(58459), -(58460), -(58461), -(58462), -(58464), -(58466), -(58471), -(58475), -(58494), -(58504), -(58505), -(58508), -(58509), -(58510), -(58511), -(58513), -(58514), -(58516), -(58517), -(58518), -(58519), -(58520), -(58526), -(58529), -(58531), -(58534), -(58535), -(58537), -(58544), -(58548), -(58561), -(58563), -(58564), -(58566), -(58567), -(58597), -(58604), -(58605), -(58607), -(58608), -(58609), -(58610), -(58611), -(58612), -(58617), -(58619), -(58621), -(58622), -(58624), -(58628), -(58632), -(58633), -(58642), -(58644), -(58660), -(58663), -(58664), -(58665), -(58666), -(58667), -(58678), -(58681), -(58683), -(58684), -(58691), -(58700), -(58701), -(58702), -(58743), -(58747), -(58758), -(58769), -(58770), -(58772), -(58781), -(58782), -(58786), -(58787), -(58788), -(58797), -(58798), -(58799), -(58810), -(58811), -(58814), -(58815), -(58816), -(58817), -(58822), -(58823), -(58827), -(58829), -(58830), -(58839), -(58840), -(58843), -(58844), -(58845), -(58847), -(58849), -(58850), -(58855), -(58859), -(58861), -(58867), -(58879), -(58890), -(58896), -(58898), -(58902), -(58905), -(58912), -(58913), -(58915), -(58919), -(58921), -(58922), -(58935), -(58940), -(58941), -(58953), -(58955), -(58959), -(58961), -(58966), -(58967), -(58969), -(58971), -(58972), -(58973), -(58976), -(58978), -(58980), -(58981), -(58987), -(58988), -(58989), -(58991), -(58996), -(59001), -(59006), -(59007), -(59011), -(59013), -(59016), -(59017), -(59019), -(59020), -(59021), -(59023), -(59024), -(59025), -(59034), -(59035), -(59039), -(59040), -(59044), -(59047), -(59050), -(59051), -(59060), -(59064), -(59065), -(59069), -(59079), -(59080), -(59081), -(59082), -(59083), -(59085), -(59100), -(59102), -(59104), -(59105), -(59106), -(59109), -(59110), -(59111), -(59114), -(59119), -(59121), -(59124), -(59130), -(59131), -(59132), -(59133), -(59134), -(59138), -(59142), -(59144), -(59146), -(59147), -(59148), -(59150), -(59151), -(59153), -(59155), -(59160), -(59161), -(59163), -(59164), -(59165), -(59166), -(59167), -(59168), -(59169), -(59170), -(59171), -(59172), -(59178), -(59179), -(59180), -(59182), -(59185), -(59186), -(59187), -(59191), -(59192), -(59199), -(59209), -(59210), -(59211), -(59215), -(59220), -(59223), -(59225), -(59226), -(59228), -(59233), -(59235), -(59237), -(59239), -(59241), -(59242), -(59243), -(59244), -(59246), -(59247), -(59248), -(59249), -(59251), -(59252), -(59254), -(59256), -(59257), -(59259), -(59260), -(59261), -(59262), -(59263), -(59264), -(59265), -(59268), -(59269), -(59270), -(59271), -(59273), -(59280), -(59288), -(59290), -(59300), -(59304), -(59318), -(59319), -(59324), -(59325), -(59329), -(59330), -(59331), -(59342), -(59343), -(59344), -(59346), -(59347), -(59348), -(59350), -(59351), -(59352), -(59355), -(59357), -(59359), -(59361), -(59362), -(59364), -(59367), -(59371), -(59373), -(59374), -(59376), -(59381), -(59389), -(59391), -(59392), -(59395), -(59397), -(59398), -(59399), -(59400), -(59401), -(59402), -(59408), -(59409), -(59412), -(59413), -(59423), -(59432), -(59434), -(59439), -(59444), -(59448), -(59455), -(59460), -(59467), -(59468), -(59471), -(59482), -(59485), -(59513), -(59515), -(59517), -(59519), -(59520), -(59525), -(59530), -(59542), -(59543), -(59544), -(59545), -(59547), -(59548), -(59557), -(59558), -(59563), -(59575), -(59577), -(59590), -(59593), -(59594), -(59599), -(59603), -(59604), -(59605), -(59606), -(59607), -(59608), -(59610), -(59611), -(59616), -(59617), -(59633), -(59634), -(59637), -(59638), -(59651), -(59653), -(59656), -(59661), -(59663), -(59679), -(59682), -(59683), -(59684), -(59685), -(59691), -(59695), -(59696), -(59700), -(59703), -(59710), -(59712), -(59713), -(59715), -(59716), -(59717), -(59718), -(59723), -(59727), -(59735), -(59736), -(59742), -(59743), -(59746), -(59750), -(59760), -(59762), -(59763), -(59765), -(59766), -(59767), -(59769), -(59779), -(59795), -(59805), -(59812), -(59813), -(59814), -(59815), -(59817), -(59823), -(59826), -(59827), -(59832), -(59839), -(59840), -(59841), -(59844), -(59846), -(59851), -(59852), -(59855), -(59856), -(59863), -(59864), -(59877), -(59879), -(59881), -(59882), -(59883), -(59884), -(59885), -(59886), -(59894), -(59901), -(59921), -(59963), -(59965), -(59972), -(59974), -(59978), -(59982), -(59984), -(59985), -(59986), -(59987), -(59988), -(59989), -(59991), -(59992), -(59993), -(59994), -(59997), -(59999), -(60003), -(60004), -(60005), -(60006), -(60008), -(60009), -(60011), -(60012), -(60013), -(60015), -(60016), -(60017), -(60018), -(60032), -(60035), -(60039), -(60041), -(60043), -(60051), -(60052), -(60053), -(60067), -(60073), -(60076), -(60078), -(60079), -(60080), -(60085), -(60089), -(60100), -(60103), -(60106), -(60107), -(60111), -(60112), -(60115), -(60117), -(60122), -(60123), -(60127), -(60129), -(60181), -(60183), -(60186), -(60194), -(60195), -(60197), -(60203), -(60204), -(60210), -(60211), -(60212), -(60229), -(60233), -(60234), -(60235), -(60236), -(60239), -(60241), -(60300), -(60307), -(60309), -(60339), -(60351), -(60352), -(60428), -(60431), -(60432), -(60433), -(60440), -(60443), -(60446), -(60447), -(60450), -(60452), -(60453), -(60472), -(60474), -(60483), -(60488), -(60500), -(60504), -(60505), -(60506), -(60518), -(60526), -(60530), -(60540), -(60541), -(60542), -(60578), -(60580), -(60585), -(60588), -(60590), -(60626), -(60642), -(60644), -(60646), -(60654), -(60672), -(60678), -(60682), -(60683), -(60699), -(60708), -(60742), -(60753), -(60781), -(60782), -(60784), -(60785), -(60786), -(60790), -(60802), -(60803), -(60805), -(60809), -(60814), -(60817), -(60842), -(60844), -(60850), -(60856), -(60857), -(60859), -(60868), -(60869), -(60870), -(60871), -(60872), -(60873), -(60876), -(60880), -(60882), -(60890), -(60896), -(60897), -(60898), -(60899), -(60900), -(60901), -(60905), -(60906), -(60917), -(60918), -(60924), -(60926), -(60927), -(60930), -(60932), -(60935), -(60940), -(60941), -(60944), -(60945), -(60946), -(60947), -(60949), -(60950), -(60951), -(60952), -(60954), -(60959), -(60961), -(60962), -(60963), -(60965), -(60968), -(60972), -(60973), -(60979), -(60980), -(60981), -(60982), -(60983), -(60988), -(60991), -(60995), -(61001), -(61005), -(61006), -(61016), -(61018), -(61024), -(61025), -(61029), -(61034), -(61036), -(61039), -(61041), -(61042), -(61046), -(61048), -(61051), -(61064), -(61070), -(61077), -(61080), -(61083), -(61087), -(61091), -(61094), -(61100), -(61101), -(61103), -(61109), -(61110), -(61111), -(61115), -(61123), -(61124), -(61127), -(61129), -(61133), -(61140), -(61143), -(61159), -(61160), -(61162), -(61164), -(61166), -(61168), -(61171), -(61172), -(61173), -(61176), -(61178), -(61182), -(61186), -(61187), -(61191), -(61193), -(61194), -(61195), -(61196), -(61197), -(61198), -(61209), -(61211), -(61213), -(61215), -(61218), -(61223), -(61226), -(61242), -(61243), -(61244), -(61253), -(61259), -(61260), -(61263), -(61269), -(61272), -(61281), -(61282), -(61286), -(61287), -(61291), -(61295), -(61296), -(61299), -(61300), -(61301), -(61302), -(61305), -(61314), -(61319), -(61320), -(61326), -(61327), -(61343), -(61344), -(61347), -(61352), -(61358), -(61372), -(61373), -(61374), -(61375), -(61380), -(61381), -(61382), -(61385), -(61395), -(61398), -(61399), -(61409), -(61411), -(61415), -(61419), -(61420), -(61421), -(61423), -(61424), -(61443), -(61445), -(61448), -(61454), -(61457), -(61461), -(61466), -(61474), -(61479), -(61480), -(61486), -(61490), -(61491), -(61493), -(61507), -(61511), -(61512), -(61515), -(61528), -(61545), -(61549), -(61550), -(61552), -(61554), -(61556), -(61558), -(61561), -(61562), -(61563), -(61565), -(61567), -(61569), -(61572), -(61579), -(61584), -(61590), -(61592), -(61593), -(61596), -(61597), -(61599), -(61600), -(61601), -(61604), -(61606), -(61607), -(61613), -(61621), -(61623), -(61624), -(61626), -(61627), -(61628), -(61634), -(61635), -(61662), -(61663), -(61666), -(61667), -(61668), -(61676), -(61685), -(61696), -(61705), -(61712), -(61716), -(61721), -(61728), -(61729), -(61730), -(61733), -(61747), -(61767), -(61780), -(61781), -(61789), -(61791), -(61793), -(61794), -(61795), -(61796), -(61797), -(61798), -(61799), -(61800), -(61801), -(61802), -(61804), -(61805), -(61806), -(61807), -(61808), -(61815), -(61817), -(61819), -(61821), -(61822), -(61823), -(61824), -(61825), -(61832), -(61833), -(61834), -(61835), -(61836), -(61837), -(61838), -(61839), -(61840), -(61841), -(61842), -(61843), -(61844), -(61845), -(61849), -(61857), -(61859), -(61862), -(61866), -(61868), -(61870), -(61873), -(61879), -(61880), -(61881), -(61888), -(61893), -(61895), -(61896), -(61897), -(61903), -(61909), -(61911), -(61912), -(61923), -(61924), -(61925), -(61926), -(61927), -(61928), -(61929), -(61965), -(61967), -(61973), -(61998), -(62014), -(62026), -(62030), -(62036), -(62053), -(62063), -(62078), -(62089), -(62103), -(62105), -(62117), -(62118), -(62119), -(62120), -(62121), -(62122), -(62124), -(62128), -(62129), -(62130), -(62131), -(62138), -(62167), -(62169), -(62195), -(62198), -(62204), -(62225), -(62226), -(62249), -(62250), -(62261), -(62264), -(62265), -(62280), -(62292), -(62298), -(62305), -(62309), -(62310), -(62312), -(62315), -(62316), -(62317), -(62318), -(62322), -(62326), -(62327), -(62328), -(62331), -(62332), -(62333), -(62334), -(62335), -(62342), -(62347), -(62354), -(62356), -(62368), -(62372), -(62373), -(62382), -(62395), -(62401), -(62402), -(62415), -(62417), -(62418), -(62420), -(62441), -(62442), -(62443), -(62444), -(62445), -(62446), -(62455), -(62456), -(62466), -(62479), -(62482), -(62503), -(62507), -(62526), -(62531), -(62536), -(62540), -(62544), -(62554), -(62563), -(62575), -(62581), -(62583), -(62589), -(62601), -(62607), -(62608), -(62611), -(62613), -(62614), -(62626), -(62638), -(62648), -(62649), -(62653), -(62658), -(62672), -(62673), -(62707), -(62708), -(62711), -(62717), -(62722), -(62726), -(62732), -(62767), -(62768), -(62769), -(62793), -(62796), -(62806), -(62832), -(62836), -(62844), -(62845), -(62846), -(62854), -(62855), -(62863), -(62867), -(62874), -(62875), -(62881), -(62900), -(62901), -(62902), -(62903), -(62904), -(62928), -(62935), -(62938), -(62939), -(62960), -(62961), -(62989), -(62997), -(62998), -(63003), -(63010), -(63012), -(63028), -(63034), -(63035), -(63036), -(63047), -(63082), -(63094), -(63103), -(63104), -(63105), -(63111), -(63112), -(63120), -(63124), -(63125), -(63126), -(63127), -(63134), -(63136), -(63138), -(63147), -(63151), -(63169), -(63171), -(63172), -(63174), -(63175), -(63177), -(63178), -(63179), -(63180), -(63183), -(63184), -(63185), -(63216), -(63221), -(63226), -(63228), -(63233), -(63240), -(63242), -(63259), -(63276), -(63278), -(63301), -(63311), -(63313), -(63314), -(63315), -(63316), -(63336), -(63337), -(63338), -(63344), -(63345), -(63356), -(63359), -(63361), -(63362), -(63363), -(63380), -(63382), -(63413), -(63416), -(63418), -(63459), -(63462), -(63463), -(63464), -(63465), -(63466), -(63468), -(63477), -(63479), -(63487), -(63493), -(63494), -(63495), -(63511), -(63518), -(63519), -(63529), -(63535), -(63536), -(63544), -(63549), -(63550), -(63551), -(63553), -(63556), -(63559), -(63562), -(63564), -(63569), -(63571), -(63573), -(63575), -(63599), -(63605), -(63612), -(63615), -(63619), -(63652), -(63653), -(63654), -(63655), -(63661), -(63668), -(63669), -(63670), -(63671), -(63672), -(63673), -(63675), -(63678), -(63685), -(63689), -(63691), -(63699), -(63700), -(63716), -(63728), -(63736), -(63738), -(63754), -(63755), -(63759), -(63760), -(63789), -(63803), -(63804), -(63809), -(63815), -(63823), -(63825), -(63827), -(63845), -(63846), -(63852), -(63861), -(63913), -(63914), -(63915), -(63916), -(63917), -(63918), -(63919), -(63920), -(63921), -(63922), -(63923), -(63931), -(63980), -(63989), -(63993), -(63995), -(63997), -(63998), -(64003), -(64005), -(64006), -(64014), -(64024), -(64025), -(64026), -(64027), -(64028), -(64029), -(64030), -(64031), -(64032), -(64034), -(64036), -(64039), -(64044), -(64058), -(64065), -(64085), -(64090), -(64097), -(64102), -(64104), -(64107), -(64113), -(64114), -(64115), -(64119), -(64123), -(64128), -(64134), -(64136), -(64138), -(64142), -(64151), -(64152), -(64153), -(64156), -(64157), -(64159), -(64160), -(64186), -(64204), -(64211), -(64212), -(64213), -(64215), -(64230), -(64269), -(64324), -(64328), -(64330), -(64331), -(64332), -(64333), -(64334), -(64335), -(64336), -(64337), -(64338), -(64339), -(64342), -(64346), -(64363), -(64365), -(64367), -(64374), -(64375), -(64376), -(64377), -(64380), -(64382), -(64387), -(64388), -(64390), -(64391), -(64395), -(64396), -(64412), -(64413), -(64429), -(64430), -(64442), -(64467), -(64478), -(64496), -(64499), -(64501), -(64507), -(64528), -(64529), -(64535), -(64542), -(64552), -(64580), -(64583), -(64588), -(64590), -(64591), -(64592), -(64595), -(64627), -(64637), -(64638), -(64640), -(64646), -(64647), -(64648), -(64649), -(64654), -(64665), -(64666), -(64667), -(64668), -(64669), -(64674), -(64682), -(64686), -(64692), -(64696), -(64698), -(64699), -(64705), -(64719), -(64740), -(64757), -(64758), -(64759), -(64766), -(64768), -(64771), -(64773), -(64776), -(64780), -(64787), -(64795), -(64798), -(64801), -(64806), -(64807), -(64821), -(64841), -(64870), -(64874), -(64876), -(64888), -(64891), -(64903), -(64909), -(64918), -(64930), -(64953), -(64967), -(64970), -(64971), -(64974), -(64978), -(64991), -(65030), -(65031), -(65033), -(65035), -(65036), -(65038), -(65039), -(65040), -(65042), -(65054), -(65055), -(65056), -(65057), -(65058), -(65059), -(65061), -(65062), -(65071), -(65080), -(65081), -(65104), -(65111), -(65113), -(65122), -(65123), -(65131), -(65133), -(65147), -(65162), -(65201), -(65210), -(65240), -(65266), -(65280), -(65343), -(65351), -(65359), -(65360), -(65374), -(65378), -(65379), -(65386), -(65391), -(65392), -(65403), -(65431), -(65488), -(65490), -(65492), -(65502), -(65503), -(65512), -(65513), -(65516), -(65531), -(65532), -(65541), -(65542), -(65545), -(65546), -(65564), -(65565), -(65575), -(65576), -(65577), -(65634), -(65635), -(65636), -(65647), -(65648), -(65693), -(65694), -(65703), -(65720), -(65722), -(65723), -(65728), -(65729), -(65744), -(65754), -(65775), -(65778), -(65782), -(65790), -(65791), -(65799), -(65801), -(65807), -(65809), -(65810), -(65812), -(65813), -(65814), -(65815), -(65819), -(65820), -(65821), -(65825), -(65826), -(65854), -(65855), -(65856), -(65857), -(65859), -(65862), -(65863), -(65866), -(65867), -(65868), -(65877), -(65878), -(65881), -(65883), -(65918), -(65924), -(65926), -(65927), -(65929), -(65930), -(65931), -(65934), -(65935), -(65936), -(65940), -(65941), -(65954), -(65957), -(65960), -(65962), -(65970), -(65971), -(65972), -(65973), -(65974), -(65978), -(65987), -(65998), -(66003), -(66005), -(66007), -(66008), -(66009), -(66012), -(66017), -(66018), -(66019), -(66020), -(66021), -(66042), -(66043), -(66045), -(66047), -(66053), -(66054), -(66055), -(66056), -(66057), -(66063), -(66065), -(66066), -(66067), -(66068), -(66069), -(66070), -(66072), -(66075), -(66079), -(66081), -(66093), -(66095), -(66097), -(66099), -(66100), -(66104), -(66109), -(66112), -(66113), -(66114), -(66115), -(66116), -(66125), -(66126), -(66134), -(66154), -(66177), -(66188), -(66196), -(66197), -(66198), -(66206), -(66207), -(66209), -(66213), -(66215), -(66216), -(66217), -(66236), -(66237), -(66240), -(66243), -(66244), -(66245), -(66250), -(66259), -(66260), -(66261), -(66262), -(66265), -(66283), -(66285), -(66290), -(66291), -(66292), -(66293), -(66294), -(66295), -(66313), -(66326), -(66331), -(66334), -(66342), -(66359), -(66377), -(66378), -(66407), -(66408), -(66409), -(66410), -(66417), -(66420), -(66423), -(66425), -(66457), -(66460), -(66461), -(66474), -(66477), -(66479), -(66480), -(66481), -(66489), -(66493), -(66516), -(66528), -(66532), -(66533), -(66536), -(66537), -(66538), -(66548), -(66549), -(66588), -(66592), -(66593), -(66594), -(66595), -(66596), -(66613), -(66619), -(66620), -(66629), -(66638), -(66666), -(66668), -(66669), -(66686), -(66687), -(66688), -(66689), -(66716), -(66717), -(66719), -(66733), -(66735), -(66736), -(66742), -(66744), -(66765), -(66770), -(66773), -(66777), -(66784), -(66796), -(66797), -(66809), -(66813), -(66823), -(66824), -(66863), -(66867), -(66869), -(66879), -(66880), -(66887), -(66888), -(66890), -(66891), -(66892), -(66899), -(66903), -(66904), -(66922), -(66940), -(66941), -(66950), -(66951), -(66952), -(66953), -(66954), -(66955), -(66957), -(66958), -(66959), -(66960), -(66961), -(66962), -(66963), -(66964), -(66965), -(66972), -(66973), -(66974), -(66975), -(66976), -(66977), -(66978), -(66979), -(66988), -(66989), -(66990), -(66991), -(66992), -(66994), -(67029), -(67030), -(67031), -(67033), -(67035), -(67049), -(67050), -(67051), -(67073), -(67074), -(67075), -(67088), -(67089), -(67090), -(67097), -(67098), -(67099), -(67114), -(67148), -(67229), -(67235), -(67237), -(67247), -(67252), -(67253), -(67280), -(67289), -(67290), -(67309), -(67310), -(67311), -(67312), -(67313), -(67314), -(67324), -(67325), -(67330), -(67331), -(67333), -(67366), -(67372), -(67373), -(67387), -(67390), -(67477), -(67478), -(67479), -(67480), -(67481), -(67485), -(67518), -(67519), -(67528), -(67529), -(67530), -(67531), -(67532), -(67533), -(67534), -(67540), -(67542), -(67550), -(67554), -(67560), -(67573), -(67574), -(67577), -(67606), -(67607), -(67608), -(67612), -(67613), -(67614), -(67618), -(67619), -(67620), -(67624), -(67625), -(67626), -(67632), -(67633), -(67634), -(67650), -(67651), -(67652), -(67654), -(67655), -(67656), -(67674), -(67675), -(67676), -(67678), -(67679), -(67680), -(67686), -(67703), -(67708), -(67709), -(67710), -(67714), -(67718), -(67719), -(67721), -(67722), -(67724), -(67725), -(67730), -(67745), -(67749), -(67760), -(67767), -(67772), -(67773), -(67774), -(67793), -(67799), -(67810), -(67811), -(67817), -(67818), -(67819), -(67821), -(67823), -(67830), -(67834), -(67835), -(67836), -(67837), -(67838), -(67846), -(67847), -(67861), -(67862), -(67863), -(67878), -(67879), -(67880), -(67881), -(67882), -(67883), -(67884), -(67885), -(67891), -(67892), -(67905), -(67906), -(67907), -(67929), -(67930), -(67931), -(67932), -(67933), -(67934), -(67935), -(67936), -(67937), -(67938), -(67939), -(67940), -(67941), -(67942), -(67943), -(67944), -(67945), -(67946), -(67947), -(67948), -(67949), -(67951), -(67952), -(67953), -(67957), -(67958), -(67959), -(67965), -(67966), -(67967), -(67968), -(67969), -(67970), -(67971), -(67972), -(67973), -(67977), -(67978), -(67979), -(67980), -(67981), -(67982), -(67983), -(67984), -(67985), -(67988), -(67989), -(67990), -(67991), -(67992), -(67993), -(67994), -(67995), -(67996), -(67997), -(67998), -(67999), -(68003), -(68004), -(68005), -(68008), -(68009), -(68010), -(68011), -(68012), -(68013), -(68014), -(68015), -(68016), -(68017), -(68018), -(68019), -(68023), -(68024), -(68025), -(68026), -(68027), -(68028), -(68032), -(68033), -(68034), -(68035), -(68036), -(68037), -(68038), -(68039), -(68040), -(68042), -(68043), -(68044), -(68055), -(68073), -(68077), -(68078), -(68081), -(68088), -(68089), -(68090), -(68091), -(68092), -(68093), -(68094), -(68095), -(68096), -(68100), -(68101), -(68102), -(68106), -(68107), -(68108), -(68109), -(68110), -(68111), -(68112), -(68113), -(68114), -(68115), -(68116), -(68117), -(68118), -(68119), -(68120), -(68123), -(68124), -(68125), -(68130), -(68133), -(68134), -(68135), -(68136), -(68137), -(68138), -(68139), -(68140), -(68141), -(68148), -(68149), -(68150), -(68151), -(68152), -(68153), -(68154), -(68155), -(68156), -(68157), -(68158), -(68159), -(68272), -(68282), -(68284), -(68301), -(68306), -(68307), -(68310), -(68311), -(68313), -(68315), -(68317), -(68318), -(68319), -(68321), -(68328), -(68333), -(68334), -(68340), -(68341), -(68350), -(68357), -(68362), -(68363), -(68364), -(68365), -(68372), -(68391), -(68415), -(68458), -(68472), -(68478), -(68479), -(68498), -(68501), -(68502), -(68503), -(68504), -(68505), -(68550), -(68551), -(68586), -(68587), -(68588), -(68607), -(68621), -(68622), -(68623), -(68624), -(68625), -(68626), -(68627), -(68628), -(68629), -(68727), -(68753), -(68754), -(68755), -(68756), -(68757), -(68758), -(68762), -(68763), -(68764), -(68778), -(68781), -(68782), -(68783), -(68784), -(68788), -(68799), -(68812), -(68834), -(68839), -(68841), -(68843), -(68868), -(68879), -(68884), -(68900), -(68915), -(68927), -(68934), -(68948), -(68966), -(68971), -(68980), -(68982), -(68984), -(68985), -(68991), -(69000), -(69003), -(69021), -(69023), -(69028), -(69034), -(69038), -(69051), -(69058), -(69063), -(69065), -(69066), -(69067), -(69068), -(69088), -(69091), -(69124), -(69128), -(69130), -(69131), -(69133), -(69137), -(69138), -(69153), -(69155), -(69156), -(69158), -(69160), -(69172), -(69180), -(69181), -(69189), -(69190), -(69198), -(69200), -(69209), -(69210), -(69211), -(69212), -(69218), -(69222), -(69232), -(69243), -(69246), -(69274), -(69275), -(69276), -(69285), -(69308), -(69342), -(69352), -(69387), -(69389), -(69391), -(69397), -(69398), -(69403), -(69404), -(69405), -(69406), -(69409), -(69410), -(69416), -(69420), -(69427), -(69438), -(69445), -(69455), -(69483), -(69489), -(69492), -(69496), -(69497), -(69498), -(69499), -(69500), -(69501), -(69503), -(69504), -(69520), -(69528), -(69542), -(69543), -(69544), -(69548), -(69563), -(69564), -(69566), -(69567), -(69569), -(69570), -(69572), -(69573), -(69574), -(69576), -(69577), -(69578), -(69579), -(69581), -(69583), -(69603), -(69617), -(69623), -(69627), -(69633), -(69644), -(69651), -(69668), -(69672), -(69673), -(69675), -(69681), -(69692), -(69693), -(69696), -(69699), -(69710), -(69722), -(69724), -(69726), -(69729), -(69730), -(69731), -(69733), -(69734), -(69771), -(69772), -(69779), -(69828), -(69837), -(69856), -(69861), -(69866), -(69869), -(69871), -(69882), -(69889), -(69891), -(69892), -(69893), -(69896), -(69898), -(69899), -(69902), -(69903), -(69906), -(69910), -(69911), -(69912), -(69916), -(69917), -(69920), -(69923), -(69926), -(69927), -(69933), -(69956), -(69958), -(69961), -(69963), -(69967), -(69968), -(69969), -(69970), -(69972), -(69973), -(69974), -(69975), -(69984), -(69989), -(70002), -(70043), -(70070), -(70074), -(70080), -(70110), -(70119), -(70122), -(70126), -(70141), -(70144), -(70153), -(70161), -(70162), -(70182), -(70183), -(70191), -(70192), -(70196), -(70205), -(70208), -(70211), -(70213), -(70227), -(70269), -(70270), -(70271), -(70273), -(70275), -(70276), -(70277), -(70278), -(70279), -(70280), -(70281), -(70282), -(70285), -(70289), -(70292), -(70296), -(70302), -(70304), -(70308), -(70309), -(70320), -(70322), -(70327), -(70333), -(70337), -(70355), -(70361), -(70381), -(70386), -(70387), -(70388), -(70391), -(70393), -(70396), -(70400), -(70408), -(70409), -(70410), -(70423), -(70428), -(70429), -(70432), -(70435), -(70437), -(70445), -(70449), -(70451), -(70453), -(70495), -(70510), -(70516), -(70525), -(70538), -(70539), -(70540), -(70542), -(70583), -(70594), -(70599), -(70616), -(70639), -(70640), -(70645), -(70646), -(70648), -(70653), -(70656), -(70659), -(70698), -(70746), -(70751), -(70754), -(70772), -(70781), -(70802), -(70809), -(70821), -(70838), -(70856), -(70857), -(70858), -(70859), -(70860), -(70861), -(70864), -(70867), -(70886), -(70890), -(70895), -(70896), -(70897), -(70906), -(70917), -(70923), -(70928), -(70929), -(70942), -(70946), -(70964), -(70965), -(70971), -(70972), -(70973), -(70974), -(70980), -(71003), -(71004), -(71005), -(71006), -(71020), -(71021), -(71023), -(71038), -(71040), -(71041), -(71087), -(71089), -(71090), -(71103), -(71107), -(71108), -(71112), -(71116), -(71117), -(71119), -(71120), -(71121), -(71124), -(71126), -(71127), -(71129), -(71130), -(71131), -(71133), -(71135), -(71136), -(71138), -(71140), -(71141), -(71142), -(71143), -(71144), -(71145), -(71146), -(71148), -(71153), -(71154), -(71155), -(71157), -(71163), -(71164), -(71169), -(71203), -(71204), -(71237), -(71248), -(71253), -(71254), -(71257), -(71264), -(71289), -(71291), -(71296), -(71297), -(71298), -(71316), -(71317), -(71318), -(71319), -(71326), -(71327), -(71328), -(71330), -(71331), -(71335), -(71339), -(71340), -(71350), -(71361), -(71362), -(71363), -(71392), -(71405), -(71410), -(71420), -(71433), -(71434), -(71443), -(71446), -(71450), -(71459), -(71462), -(71466), -(71473), -(71475), -(71476), -(71477), -(71478), -(71479), -(71480), -(71488), -(71489), -(71490), -(71500), -(71501), -(71504), -(71510), -(71512), -(71522), -(71532), -(71533), -(71539), -(71544), -(71546), -(71547), -(71548), -(71549), -(71551), -(71552), -(71553), -(71554), -(71590), -(71591), -(71594), -(71595), -(71607), -(71623), -(71624), -(71625), -(71626), -(71646), -(71647), -(71686), -(71687), -(71688), -(71713), -(71715), -(71726), -(71727), -(71728), -(71729), -(71738), -(71745), -(71748), -(71750), -(71752), -(71757), -(71758), -(71759), -(71760), -(71778), -(71779), -(71780), -(71781), -(71782), -(71783), -(71784), -(71785), -(71786), -(71788), -(71789), -(71801), -(71806), -(71807), -(71815), -(71818), -(71819), -(71820), -(71821), -(71822), -(71823), -(71824), -(71825), -(71834), -(71838), -(71839), -(71841), -(71842), -(71847), -(71864), -(71866), -(71874), -(71879), -(71909), -(71923), -(71924), -(71925), -(71926), -(71927), -(71928), -(71930), -(71931), -(71932), -(71933), -(71934), -(71936), -(71937), -(71938), -(71951), -(71954), -(71955), -(71972), -(71988), -(72004), -(72005), -(72007), -(72008), -(72010), -(72021), -(72022), -(72023), -(72024), -(72057), -(72065), -(72066), -(72098), -(72106), -(72120), -(72121), -(72123), -(72124), -(72133), -(72163), -(72164), -(72166), -(72167), -(72171), -(72194), -(72196), -(72198), -(72208), -(72211), -(72218), -(72219), -(72222), -(72231), -(72258), -(72264), -(72265), -(72266), -(72267), -(72268), -(72269), -(72293), -(72301), -(72302), -(72303), -(72304), -(72313), -(72318), -(72319), -(72321), -(72322), -(72324), -(72326), -(72327), -(72329), -(72330), -(72333), -(72334), -(72335), -(72336), -(72360), -(72366), -(72367), -(72368), -(72369), -(72373), -(72400), -(72409), -(72410), -(72421), -(72422), -(72423), -(72424), -(72426), -(72427), -(72434), -(72437), -(72447), -(72448), -(72449), -(72451), -(72453), -(72457), -(72463), -(72465), -(72484), -(72485), -(72486), -(72487), -(72488), -(72489), -(72490), -(72491), -(72492), -(72501), -(72502), -(72503), -(72504), -(72531), -(72539), -(72540), -(72541), -(72551), -(72552), -(72553), -(72556), -(72558), -(72566), -(72567), -(72568), -(72569), -(72570), -(72571), -(72586), -(72588), -(72590), -(72597), -(72613), -(72617), -(72645), -(72671), -(72672), -(72688), -(72728), -(72756), -(72796), -(72797), -(72798), -(72804), -(72805), -(72806), -(72809), -(72810), -(72811), -(72847), -(72848), -(72865), -(72875), -(72876), -(72879), -(72883), -(72898), -(72901), -(72930), -(72960), -(72961), -(72963), -(72964), -(72965), -(72966), -(72967), -(72985), -(72995), -(73003), -(73040), -(73075), -(73076), -(73079), -(73395), -(73412), -(73488), -(73489), -(73491), -(73492), -(73499), -(73536), -(73574), -(73712), -(73771), -(73772), -(73782), -(73783), -(73784), -(73788), -(73789), -(73790), -(73797), -(73798), -(73799), -(73830), -(73832), -(73833), -(73879), -(73896), -(73906), -(73912), -(73913), -(73914), -(73943), -(73952), -(73985), -(74035), -(74046), -(74062), -(74080), -(74111), -(74162), -(74163), -(74164), -(74166), -(74184), -(74185), -(74222), -(74307), -(74325), -(74326), -(74327), -(74347), -(74367), -(74394), -(74395), -(74403), -(74404), -(74413), -(74414), -(74417), -(74421), -(74422), -(74424), -(74438), -(74445), -(74451), -(74453), -(74454), -(74470), -(74485), -(74502), -(74506), -(74507), -(74524), -(74562), -(74710), -(74749), -(74762), -(74768), -(74772), -(74774), -(74792), -(74797), -(74807), -(74812), -(74904), -(74905), -(74913), -(74978), -(74982), -(75055), -(75058), -(75082), -(75086), -(75088), -(75102), -(75159), -(75160), -(75161), -(75163), -(75168), -(75182), -(75185), -(75186), -(75188), -(75209), -(75213), -(75234), -(75314), -(75327), -(75329), -(75330), -(75331), -(75332), -(75362), -(75366), -(75367), -(75382), -(75383), -(75384), -(75412), -(75419), -(75421), -(75422), -(75423), -(75434), -(75459), -(75493), -(75494), -(75648), -(75731), -(75760), -(75780), -(75888), -(75889), -(75953), -(76096), -(76221), -(79187), -(79397); -CREATE TABLE `temp_cond_vals` -( - `spellId` INT(11), - `elseGroup` INT(11) AUTO_INCREMENT, - `entry` INT(11), - `dead` INT(11), - `errorTextId` INT(11), - `comment` VARCHAR(255), - PRIMARY KEY (`spellId`, `elseGroup`) -) ENGINE=MYISAM; - -CREATE TABLE `temp_item_spell` -( - `itemId` INT(11), - `spellId` INT(11), - PRIMARY KEY (`itemId`, `spellId`) -); - -CREATE TABLE `temp_item` -( - `itemId` INT(11), - PRIMARY KEY (`itemId`) -); - -INSERT INTO `temp_item` SELECT DISTINCT `SourceEntry` FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18; -INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_1` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_1` IN (SELECT * FROM `temp_convert_spells`); -INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_2` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_2` IN (SELECT * FROM `temp_convert_spells`); -INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_3` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_3` IN (SELECT * FROM `temp_convert_spells`); -INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_4` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_4` IN (SELECT * FROM `temp_convert_spells`); -INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_5` FROM `item_template` WHERE `entry` IN (SELECT * FROM `temp_item`) AND `spellid_5` IN (SELECT * FROM `temp_convert_spells`); - -INSERT INTO `temp_cond_vals` (`spellId`, `entry`, `dead`, `errorTextId`, `comment`) SELECT DISTINCT (SELECT `spellId` FROM `temp_item_spell` WHERE `itemId` = `SourceEntry`), `ConditionValue2`, (`ConditionValue1` - 1), `ErrorTextId`, `Comment` FROM `conditions` -WHERE `SourceTypeOrReferenceId` = 18; - --- use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`) -SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 31, 1, 3, `entry`, 0, 0, `errorTextId`, `comment` FROM `temp_cond_vals`; --- for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`) -SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 36, 1, 0, 0, 0, 1, `errorTextId`, `comment` FROM `temp_cond_vals` WHERE `dead`; --- remove entries which could be converted by this sql -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18 AND `SourceEntry` IN (SELECT `itemId` FROM `temp_item_spell`); -DROP TABLE `temp_convert_spells`; -DROP TABLE `temp_cond_vals`; -DROP TABLE `temp_item_spell`; -DROP TABLE `temp_item`; - -ALTER TABLE conditions DROP PRIMARY KEY; -ALTER TABLE conditions ADD PRIMARY KEY (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`); diff --git a/sql/updates/world/2012_02_16_01_world_conditions.sql b/sql/updates/world/2012_02_16_01_world_conditions.sql deleted file mode 100644 index 4bcf997b8e4..00000000000 --- a/sql/updates/world/2012_02_16_01_world_conditions.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE `conditions` SET ConditionValue3 = 0, ConditionTarget = 1 WHERE ConditionTypeOrReference = 1 AND ConditionValue3 = 1; -UPDATE `conditions` SET ConditionTypeOrReference = 31, ConditionValue2 = ConditionValue1, ConditionValue1 = 3, ConditionTarget = 1 WHERE ConditionTypeOrReference = 19; -UPDATE `conditions` SET ConditionTypeOrReference = 38, ConditionValue2 = 4, ConditionTarget = 1 WHERE ConditionTypeOrReference = 20; diff --git a/sql/updates/world/2012_02_17_00_world_waypoints.sql b/sql/updates/world/2012_02_17_00_world_waypoints.sql deleted file mode 100644 index 1cff86f5d51..00000000000 --- a/sql/updates/world/2012_02_17_00_world_waypoints.sql +++ /dev/null @@ -1,77 +0,0 @@ --- Pathing for Eye of Thrallmar -SET @NPC :=57585; -SET @PATH :=@NPC*10; -UPDATE `creature` SET `position_x`=203.191,`position_y`=2850.286,`position_z`=160.4257,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,197.9876,2842.495,160.4257,0,0,0,100,0), -(@PATH,2,212.5493,2807.971,174.2035,0,0,0,100,0), -(@PATH,3,244.0748,2812.302,156.8424,0,0,0,100,0), -(@PATH,4,262.963,2839.935,173.5923,0,0,0,100,0), -(@PATH,5,249.0294,2865.575,155.9257,0,0,0,100,0), -(@PATH,6,223.3671,2870.441,169.5924,0,0,0,100,0), -(@PATH,7,203.191,2850.286,160.4257,0,0,0,100,0); - --- Pathing for Eye of Thrallmar -SET @NPC :=57586; -SET @PATH :=@NPC*10; -UPDATE `creature` SET `position_x`=210.6249,`position_y`=2809.285,`position_z`=208.7277,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,213.0469,2809.036,207.1722,0,0,0,100,0), -(@PATH,2,223.5349,2797.282,213.4777,0,0,0,100,0), -(@PATH,3,238.895,2805.732,213.4777,0,0,0,100,0), -(@PATH,4,252.788,2818.183,213.4777,0,0,0,100,0), -(@PATH,5,255.2734,2839.056,213.4777,0,0,0,100,0), -(@PATH,6,245.0219,2851.84,213.4777,0,0,0,100,0), -(@PATH,7,229.2117,2860.19,213.4777,0,0,0,100,0), -(@PATH,8,213.6996,2851.376,206.5887,0,0,0,100,0), -(@PATH,9,204.457,2828.248,199.6443,0,0,0,100,0), -(@PATH,10,212.4397,2807.455,199.6443,0,0,0,100,0), -(@PATH,11,241.3802,2813.464,199.6443,0,0,0,100,0), -(@PATH,12,249.7797,2829.964,199.6443,0,0,0,100,0), -(@PATH,13,244.951,2854.129,199.6443,0,0,0,100,0), -(@PATH,14,221.8344,2856.781,199.6443,0,0,0,100,0), -(@PATH,15,210.7503,2837.578,199.6443,0,0,0,100,0), -(@PATH,16,210.6249,2809.285,208.7277,0,0,0,100,0); - --- Pathing for Eye of Thrallmar -SET @NPC :=57587; -SET @PATH :=@NPC*10; -UPDATE `creature` SET `position_x`=236.1859,`position_y`=2813.747,`position_z`=200.9708,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,241.7692,2815.284,200.8042,0,0,0,100,0), -(@PATH,2,255.8273,2833.317,201.443,0,0,0,100,0), -(@PATH,3,247.4309,2853.592,205.1653,0,0,0,100,0), -(@PATH,4,223.9901,2858.107,208.5819,0,0,0,100,0), -(@PATH,5,208.0596,2843.793,192.3596,0,0,0,100,0), -(@PATH,6,213.9734,2816.793,188.4153,0,0,0,100,0), -(@PATH,7,236.1859,2813.747,200.9708,0,0,0,100,0); - --- Pathing for Eye of Thrallmar -SET @NPC :=57588; -SET @PATH :=@NPC*10; -UPDATE `creature` SET `position_x`=245.9259,`position_y`=2829.09,`position_z`=177.804,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,251.6207,2841.322,177.804,0,0,0,100,0), -(@PATH,2,241.4914,2859.113,169.6652,0,0,0,100,0), -(@PATH,3,214.9913,2858.249,176.3595,0,0,0,100,0), -(@PATH,4,210.2245,2836.028,169.7762,0,0,0,100,0), -(@PATH,5,225.7556,2822.145,169.9707,0,0,0,100,0), -(@PATH,6,237.9712,2823.874,170.1096,0,0,0,100,0), -(@PATH,7,245.9259,2829.09,177.804,0,0,0,100,0); - -DELETE FROM `creature` WHERE `guid`=57589; -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=16598; - - diff --git a/sql/updates/world/2012_02_18_00_world_spell_script_names.sql b/sql/updates/world/2012_02_18_00_world_spell_script_names.sql deleted file mode 100644 index 993fe3a2f38..00000000000 --- a/sql/updates/world/2012_02_18_00_world_spell_script_names.sql +++ /dev/null @@ -1,69 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` in (-100,-12162,13567,17251,23019,23448,23453,25860,28089,29200,29858,30458,30507,31225,35745,37674,39090,39093,39096,42784,43723,44875,47170,49357,50243,51582,51961,52759,52845,53808,54171,54577,55004,64385,-1464,-5308,12809,23881,-1454,-50286,8171,52041,52046,52047,52048,52049,52050,52059,52060,52061,52031,52033,52034,52035,52036,58778,58779,58780,60103,-49998,-66188,-47541,52375,59134,-62900,49560,62324,31890); -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(-100,'spell_warr_charge'), -(-12162,'spell_warr_deep_wounds'), -(13567,'spell_gen_dummy_trigger'), -(17251,'spell_gen_spirit_healer_res'), -(23019,'spell_item_crystal_prison_dummy_dnd'), -(23448,'spell_gen_gadgetzan_transporter_backfire'), -(23453,'spell_gen_gnomish_transporter'), -(25860,'spell_item_reindeer_transformation'), -(28089,'spell_thaddius_polarity_shift'), -(29200,'spell_item_purify_helboar_meat'), -(29858,'spell_warl_soulshatter'), -(30458,'spell_item_nigh_invulnerability'), -(30507,'spell_item_poultryizer'), -(31225,'spell_item_shimmering_vessel'), -(35745,'spell_item_socrethars_stone'), -(37674,'spell_gen_chaos_blast'), -(39090,'spell_capacitus_polarity_charge'), -(39093,'spell_capacitus_polarity_charge'), -(39096,'spell_capacitus_polarity_shift'), -(42784,'spell_astromancer_wrath_of_the_astromancer'), -(43723,'spell_item_demon_broiled_surprise'), -(44875,'spell_item_complete_raptor_capture'), -(47170,'spell_item_impale_leviroth'), -(49357,'spell_item_brewfest_mount_transformation'), -(50243,'spell_item_teach_language'), -(51582,'spell_item_rocket_boots'), -(51961,'spell_item_chicken_cover'), -(52759,'spell_sha_ancestral_awakening_proc'), -(52845,'spell_item_brewfest_mount_transformation'), -(53808,'spell_item_pygmy_oil'), -(54577,'spell_item_uded'), -(54171,'spell_pal_divine_storm_dummy'), -(55004,'spell_item_nitro_boots'), -(64385,'spell_item_unusual_compass'), -(-1464,'spell_warr_slam'), -(-5308,'spell_warr_execute'), -(12809,'spell_warr_concussion_blow'), -(23881,'spell_warr_bloodthirst'), -(-1454,'spell_warl_life_tap'), -(-50286,'spell_dru_starfall_dummy'), -(8171,'spell_sha_cleansing_totem_pulse'), -(52041,'spell_sha_healing_stream_totem'), -(52046,'spell_sha_healing_stream_totem'), -(52047,'spell_sha_healing_stream_totem'), -(52048,'spell_sha_healing_stream_totem'), -(52049,'spell_sha_healing_stream_totem'), -(52050,'spell_sha_healing_stream_totem'), -(52059,'spell_sha_healing_stream_totem'), -(52060,'spell_sha_healing_stream_totem'), -(52061,'spell_sha_healing_stream_totem'), -(52031,'spell_sha_mana_spring_totem'), -(52033,'spell_sha_mana_spring_totem'), -(52034,'spell_sha_mana_spring_totem'), -(52035,'spell_sha_mana_spring_totem'), -(52036,'spell_sha_mana_spring_totem'), -(58778,'spell_sha_mana_spring_totem'), -(58779,'spell_sha_mana_spring_totem'), -(58780,'spell_sha_mana_spring_totem'), -(60103,'spell_sha_lava_lash'), -(-49998,'spell_dk_death_strike'), -(-66188,'spell_dk_death_strike'), -(-47541,'spell_dk_death_coil'), -(52375,'spell_dk_death_coil'), -(59134,'spell_dk_death_coil'), -(-62900,'spell_dk_death_coil'), -(49560,'spell_dk_death_grip'), -(62324,'spell_vehicle_throw_passenger'); diff --git a/sql/updates/world/2012_02_18_01_world_spell_dbc.sql b/sql/updates/world/2012_02_18_01_world_spell_dbc.sql deleted file mode 100644 index b343399d7f2..00000000000 --- a/sql/updates/world/2012_02_18_01_world_spell_dbc.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_dbc` WHERE `id`=31980; -INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES -(31980,0,0,328064,1024,4,268894208,0,0,0,0,0,0,0,1,0,0,101,0,0,14,14,0,13,0,-1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,15,0,0,12,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,10,0,4,0,0,0,0,1,0,0,0,1,"Righteous Defense Trigger Spell"); diff --git a/sql/updates/world/2012_02_18_02_world_gossip.sql b/sql/updates/world/2012_02_18_02_world_gossip.sql deleted file mode 100644 index 47882d4eb36..00000000000 --- a/sql/updates/world/2012_02_18_02_world_gossip.sql +++ /dev/null @@ -1,52 +0,0 @@ --- Gossip for Lore Keeper of Norgannon "Uldaman" for quest 2278 "The Platinum Discs" -UPDATE `creature_template` SET `gossip_menu_id`=562 WHERE `entry`=7172; - --- SAI for Lore Keeper of Norgannon -SET @ENTRY := 7172; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,1,62,0,100,0,576,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Lore Keeper of Norgannon - On gossip option select - close gossip'), -(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,26,2278,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Lore Keeper of Norgannon - On gossip option select - give quest credit'); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=562 AND `SourceEntry`=0; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,562,0,0,9,2278,0,0,0,'','Show gossip option if player has quest 2278 but not complete'); - -DELETE FROM `gossip_menu` WHERE `entry` BETWEEN 561 AND 576; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(561,1080), -(562,1079), -(563,1081), -(564,1082), -(565,1083), -(566,1084), -(567,1085), -(568,1086), -(569,1087), -(570,1088), -(571,1089), -(572,1090), -(573,1091), -(574,1092), -(575,1093), -(576,1094); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 561 AND 576; -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 -(561,0,0,'What is a "subterranean being matrix"?',1,1,563,0,0,0,''), -(562,0,0,'Who are the Earthen?',1,1,561,0,0,0,''), -(563,0,0,'What are the anomalies you speak of?',1,1,564,0,0,0,''), -(564,0,0,'What is a "resilient foundation of construction"?',1,1,565,0,0,0,''), -(565,0,0,'So... the Earthen were made out of stone?',1,1,566,0,0,0,''), -(566,0,0,'Anything else I should know about the Earthen?',1,1,567,0,0,0,''), -(567,0,0,'I think I understand the Creators'' design intent for the Earthen now. What are the Earthen''s anomalies that you spoke of earlier?',1,1,568,0,0,0,''), -(568,0,0,'What high-stress environments would cause the Earthen to destabilize?',1,1,569,0,0,0,''), -(569,0,0,'What happens when the Earthen destabilize?',1,1,570,0,0,0,''), -(570,0,0,'Troggs?! Are the troggs you mention the same as the ones in the world today?',1,1,571,0,0,0,''), -(571,0,0,'You mentioned two results when the Earthen destabilize. What is the second?',1,1,572,0,0,0,''), -(572,0,0,'Dwarves!!! Now you''re telling me that dwarves originally came from the Earthen?!',1,1,573,0,0,0,''), -(573,0,0,'These dwarves are the same ones today, yes? Do dwarves maintain any other links to the Earthen?',1,1,574,0,0,0,''), -(574,0,0,'Who are the Creators?',1,1,575,0,0,0,''), -(575,0,0,'This is a lot to think about.',1,1,576,0,0,0,''), -(576,0,0,'I will access the discs now.',1,1,0,0,0,0,''); diff --git a/sql/updates/world/2012_02_18_03_world_gossip.sql b/sql/updates/world/2012_02_18_03_world_gossip.sql deleted file mode 100644 index 990006f5098..00000000000 --- a/sql/updates/world/2012_02_18_03_world_gossip.sql +++ /dev/null @@ -1,1068 +0,0 @@ --- XXXXXXXXXXXXXXXXXXXX --- X Rogue Trainers X --- XXXXXXXXXXXXXXXXXXXX - -UPDATE `creature_template` SET `gossip_menu_id`=410 WHERE `entry`=1234; -UPDATE `creature_template` SET `gossip_menu_id`=85 WHERE `entry`=2122; -UPDATE `creature_template` SET `gossip_menu_id`=3984 WHERE `entry`=6707; -UPDATE `creature_template` SET `gossip_menu_id`=4512 WHERE `entry`=3328; -UPDATE `creature_template` SET `gossip_menu_id`=4575 WHERE `entry`=4215; -UPDATE `creature_template` SET `gossip_menu_id`=4577 WHERE `entry`=4214; -UPDATE `creature_template` SET `gossip_menu_id`=4658 WHERE `entry`=1411; - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 85; -SET @TEXTYES := 581; -SET @TEXTNO := 4796; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 141; -SET @TEXTYES := 638; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 381; -SET @TEXTYES := 878; -SET @TEXTNO := 4799; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I am in need of training, Keryn.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 410; -SET @TEXTYES := 4795; -SET @TEXTNO := 4797; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 411; -SET @TEXTYES := 908; -SET @TEXTNO := 4798; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Good day, Hulfdan, I am looking for training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 436; -SET @TEXTYES := 934; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Hello! I am a Rogue in need of training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 3984; -SET @TEXTYES := 4838; -SET @TEXTNO := 4839; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Yes, I have. Teach me.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4502; -SET @TEXTYES := 4835; -SET @TEXTNO := 4837; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4512; -SET @TEXTYES := 638; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4513; -SET @TEXTYES := 638; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4540; -SET @TEXTYES := 581; -SET @TEXTNO := 4796; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4541; -SET @TEXTYES := 581; -SET @TEXTNO := 4796; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4542; -SET @TEXTYES := 581; -SET @TEXTNO := 4796; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I would like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4561; -SET @TEXTYES := 5695; -SET @TEXTNO := 4833; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I'm lookin' for rogue trainin'.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4562; -SET @TEXTYES := 4834; -SET @TEXTNO := 4833; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I'm lookin' for rogue trainin'.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4575; -SET @TEXTYES := 4795; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4576; -SET @TEXTYES := 4795; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4577; -SET @TEXTYES := 4795; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4658; -SET @TEXTYES := 6165; -SET @TEXTNO := 6164; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4659; -SET @TEXTYES := 4835; -SET @TEXTNO := 4837; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4676; -SET @TEXTYES := 4835; -SET @TEXTNO := 4833; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 4690; -SET @TEXTYES := 4795; -SET @TEXTNO := 4793; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 5061; -SET @TEXTYES := 4835; -SET @TEXTNO := 4837; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Can you train me how to use rogue skills?",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- Gossip Condition for Rogue Trainers -SET @GOSSIP := 6650; -SET @TEXTYES := 9188; -SET @TEXTNO := 9187; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,8,0,0,0,'','Show gossip text if player is a Rogue'), -(14,@GOSSIP,@TEXTNO,0,15,1527,0,0,0,'','Show gossip text if player is not a Rogue'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I require rogue training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''), -(@GOSSIP,4,0,"",1,1,0,0,0,0,''); - --- XXXXXXXXXXXXXXXXXXXXX --- X Hunter Trainers X --- XXXXXXXXXXXXXXXXXXXXX - -UPDATE `creature_template` SET `gossip_menu_id`=4657 WHERE `entry`=1404; -UPDATE `creature_template` SET `gossip_menu_id`=4695 WHERE `entry`=3596; -UPDATE `creature_template` SET `gossip_menu_id`=4009 WHERE `entry`=3601; -UPDATE `creature_template` SET `gossip_menu_id`=6652 WHERE `entry`=16672; -UPDATE `creature_template` SET `gossip_menu_id`=4101 WHERE `entry`=987; - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4008; -SET @TEXTYES := 4863; -SET @TEXTNO := 4993; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I'd like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4009; -SET @TEXTYES := 4316; -SET @TEXTNO := 4993; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I am in need of training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4010; -SET @TEXTYES := 4866; -SET @TEXTNO := 5003; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I have come for training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4011; -SET @TEXTYES := 4867; -SET @TEXTNO := 4998; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I am in need of training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4012; -SET @TEXTYES := 4868; -SET @TEXTNO := 4998; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I am a hunter and wish to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4017; -SET @TEXTYES := 4888; -SET @TEXTNO := 4888; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"Please train me.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4023; -SET @TEXTYES := 4889; -SET @TEXTNO := 4996; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I wish to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4101; -SET @TEXTYES := 5001; -SET @TEXTNO := 5002; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4472; -SET @TEXTYES := 4893; -SET @TEXTNO := 5000; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4473; -SET @TEXTYES := 4893; -SET @TEXTNO := 5000; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4474; -SET @TEXTYES := 4893; -SET @TEXTNO := 5000; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4506; -SET @TEXTYES := 4987; -SET @TEXTNO := 5004; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I wish to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4524; -SET @TEXTYES := 4997; -SET @TEXTNO := 4998; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4549; -SET @TEXTYES := 4999; -SET @TEXTNO := 5000; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4550; -SET @TEXTYES := 4890; -SET @TEXTNO := 5000; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I am here for training.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4551; -SET @TEXTYES := 4999; -SET @TEXTNO := 5000; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4647; -SET @TEXTYES := 4997; -SET @TEXTNO := 4998; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4648; -SET @TEXTYES := 4987; -SET @TEXTNO := 5004; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I wish to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4657; -SET @TEXTYES := 5001; -SET @TEXTNO := 5002; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4675; -SET @TEXTYES := 4999; -SET @TEXTNO := 5000; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4693; -SET @TEXTYES := 6160; -SET @TEXTNO := 4993; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I'd like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 4695; -SET @TEXTYES := 4863; -SET @TEXTNO := 4993; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I'd like to train.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 6652; -SET @TEXTYES := 9190; -SET @TEXTNO := 9189; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 7262; -SET @TEXTYES := 8585; -SET @TEXTNO := 8586; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I seek training in the ways of the Hunter.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Gossip Condition for Hunter Trainers -SET @GOSSIP := 7368; -SET @TEXTYES := 8804; -SET @TEXTNO := 8823; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTYES,0,15,4,0,0,0,'','Show gossip text if player is a Hunter'), -(14,@GOSSIP,@TEXTNO,0,15,1531,0,0,0,'','Show gossip text if player is not a Hunter'); --- Add Any Missing Gossip Menu item -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES); -DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP; -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 -(@GOSSIP,0,3,"I am a hunter in need of training, Acteon.",5,16,0,0,0,0,''), -(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''), -(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,''); - --- Add some missing gossip from sniff for Zabra'jin in Zangermarsh -UPDATE `creature_template` SET `gossip_menu_id`=7601 WHERE `entry`=18013; -UPDATE `creature_template` SET `gossip_menu_id`=7602 WHERE `entry`=18014; -UPDATE `creature_template` SET `gossip_menu_id`=7608 WHERE `entry`=18015; -UPDATE `creature_template` SET `gossip_menu_id`=7603 WHERE `entry`=18017; -UPDATE `creature_template` SET `gossip_menu_id`=7609 WHERE `entry`=18018; -UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=18244; -UPDATE `creature_template` SET `gossip_menu_id`=7722 WHERE `entry`=18564; - -DELETE FROM `gossip_menu` WHERE `entry` IN (7601,7602,7603,7608,7609,7722,7946,9821); -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(7601,9248),(7602,9249),(7603,9250),(7608,9259), -(7609,9260),(7722,9431),(7946,9752),(9821,13584); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7603,7608,7609) AND `id` IN (0); -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7609,7722,9821) AND `id` IN (1); -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 -(7603,0,1,'I would like to buy from you.',3,128,0,0,0,0,''), -(7608,0,1,'I wish to purchase tradeskill supplies.',3,128,0,0,0,0,''), -(7609,0,1,'I wish to purchase fishing supplies.',3,128,0,0,0,0,''), -(7609,1,3,'Give me some pointers on my fishing technique.',5,16,0,0,0,0,''), -(7722,1,1,'I have marks to redeem!',3,128,0,0,0,0,''), -(9821,1,1,'I''m looking for a lost companion.',14,4194304,0,0,0,0,''); - --- Add some missing gossip from sniff for Thunderlord Stronghold in Blade's Edge Mountains -UPDATE `creature_template` SET `gossip_menu_id`=9856 WHERE `entry`=19471; -UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=19476; -UPDATE `creature_template` SET `gossip_menu_id`=5856 WHERE `entry`=19478; -UPDATE `creature_template` SET `gossip_menu_id`=8283 WHERE `entry`=21311; -UPDATE `creature_template` SET `gossip_menu_id`=8406 WHERE `entry`=21950; -UPDATE `creature_template` SET `gossip_menu_id`=8244 WHERE `entry`=21147; -UPDATE `creature_template` SET `gossip_menu_id`=8525 WHERE `entry`=21984; -UPDATE `creature_template` SET `gossip_menu_id`=8239 WHERE `entry`=21117; - -DELETE FROM `gossip_menu` WHERE `entry` IN (8283,8406,8244,8525,8239); -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(8283,10322),(8406,10508),(8244,10259),(8525,10661),(8239,10251); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9856) AND `id` IN (0); -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 -(9856,0,1,'Show me what you have for sale.',3,128,0,0,0,0,''); - diff --git a/sql/updates/world/2012_02_18_04_world_spell_script_names.sql b/sql/updates/world/2012_02_18_04_world_spell_script_names.sql deleted file mode 100644 index 8fa5bc55197..00000000000 --- a/sql/updates/world/2012_02_18_04_world_spell_script_names.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` IN (52059,52060,52061); -DELETE FROM `spell_script_names` WHERE `spell_id` IN (58759,58760,58761); -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(58759,'spell_sha_healing_stream_totem'), -(58760,'spell_sha_healing_stream_totem'), -(58761,'spell_sha_healing_stream_totem'); diff --git a/sql/updates/world/2012_02_18_05_world_creatures.sql b/sql/updates/world/2012_02_18_05_world_creatures.sql deleted file mode 100644 index 3fdac99c854..00000000000 --- a/sql/updates/world/2012_02_18_05_world_creatures.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE `creature` SET `MovementType`=1 WHERE `spawndist`!=0 AND `MovementType`=2 AND `guid` IN (49123,49124,49125,49127,49128,49129,49143,49144,49145,49146,49150,49151,49154,49156,49157,49158,49167,49186,49187,49188,49318,49319,49664,49665,49751,49762,51398,51402,51422,51423,123148,127753,137490,137491,202314); -UPDATE `creature` SET `MovementType`=0 WHERE `spawndist`=0 AND `MovementType`=2 AND `guid` IN (49123,49124,49125,49127,49128,49129,49143,49144,49145,49146,49150,49151,49154,49156,49157,49158,49167,49186,49187,49188,49318,49319,49664,49665,49751,49762,51398,51402,51422,51423,123148,127753,137490,137491,202314); -UPDATE `creature_template` SET `MovementType`=0 WHERE `MovementType`=2 AND `entry` NOT IN (21657,30007); diff --git a/sql/updates/world/2012_02_18_06_world_gossip.sql b/sql/updates/world/2012_02_18_06_world_gossip.sql deleted file mode 100644 index e3385ceb5b0..00000000000 --- a/sql/updates/world/2012_02_18_06_world_gossip.sql +++ /dev/null @@ -1,166 +0,0 @@ --- Add some missing gossip to Nagrand From UDB -UPDATE `creature_template` SET `gossip_menu_id`=7675 WHERE `entry`=18261; -UPDATE `creature_template` SET `gossip_menu_id`=7723 WHERE `entry`=18333; -UPDATE `creature_template` SET `gossip_menu_id`=7719 WHERE `entry`=18417; -UPDATE `creature_template` SET `gossip_menu_id`=7724 WHERE `entry`=18581; -UPDATE `creature_template` SET `gossip_menu_id`=7625 WHERE `entry`=18265; -UPDATE `creature_template` SET `gossip_menu_id`=7626 WHERE `entry`=18276; -UPDATE `creature_template` SET `gossip_menu_id`=7631 WHERE `entry`=18335; -UPDATE `creature_template` SET `gossip_menu_id`=7699 WHERE `entry`=18471; -UPDATE `creature_template` SET `gossip_menu_id`=7563 WHERE `entry`=18074; -UPDATE `creature_template` SET `gossip_menu_id`=7592 WHERE `entry`=18200; -UPDATE `creature_template` SET `gossip_menu_id`=7579 WHERE `entry`=18180; -UPDATE `creature_template` SET `gossip_menu_id`=7607 WHERE `entry`=18218; -UPDATE `creature_template` SET `gossip_menu_id`=7704 WHERE `entry`=18482; -UPDATE `creature_template` SET `gossip_menu_id`=8493, `npcflag`=`npcflag`|1 WHERE `entry`=22113; - -DELETE FROM `gossip_menu` WHERE `entry`=7563 AND `text_id`=9181; -DELETE FROM `gossip_menu` WHERE `entry`=7578 AND `text_id`=9220; -DELETE FROM `gossip_menu` WHERE `entry`=7579 AND `text_id` IN (9219,9221,9256,9257); -DELETE FROM `gossip_menu` WHERE `entry`=7592 AND `text_id` IN (9240,9283,9284); -DELETE FROM `gossip_menu` WHERE `entry`=7607 AND `text_id` IN (9258,9286); -DELETE FROM `gossip_menu` WHERE `entry`=7625 AND `text_id`=9287; -DELETE FROM `gossip_menu` WHERE `entry`=7626 AND `text_id`=9288; -DELETE FROM `gossip_menu` WHERE `entry`=7631 AND `text_id`=9312; -DELETE FROM `gossip_menu` WHERE `entry`=7675 AND `text_id` IN (9361,9369); -DELETE FROM `gossip_menu` WHERE `entry`=7676 AND `text_id`=9368; -DELETE FROM `gossip_menu` WHERE `entry`=7677 AND `text_id`=9367; -DELETE FROM `gossip_menu` WHERE `entry`=7678 AND `text_id`=9366; -DELETE FROM `gossip_menu` WHERE `entry`=7679 AND `text_id`=9365; -DELETE FROM `gossip_menu` WHERE `entry`=7680 AND `text_id`=9364; -DELETE FROM `gossip_menu` WHERE `entry`=7681 AND `text_id`=9363; -DELETE FROM `gossip_menu` WHERE `entry`=7682 AND `text_id`=9362; -DELETE FROM `gossip_menu` WHERE `entry`=7699 AND `text_id`=9394; -DELETE FROM `gossip_menu` WHERE `entry`=7704 AND `text_id`=9405; -DELETE FROM `gossip_menu` WHERE `entry`=7705 AND `text_id`=9406; -DELETE FROM `gossip_menu` WHERE `entry`=7714 AND `text_id`=9424; -DELETE FROM `gossip_menu` WHERE `entry`=7715 AND `text_id`=9423; -DELETE FROM `gossip_menu` WHERE `entry`=7716 AND `text_id`=9422; -DELETE FROM `gossip_menu` WHERE `entry`=7717 AND `text_id`=9421; -DELETE FROM `gossip_menu` WHERE `entry`=7718 AND `text_id`=9420; -DELETE FROM `gossip_menu` WHERE `entry`=7719 AND `text_id` IN (9419,9427); -DELETE FROM `gossip_menu` WHERE `entry`=7723 AND `text_id`=9429; -DELETE FROM `gossip_menu` WHERE `entry`=7724 AND `text_id`=9433; -DELETE FROM `gossip_menu` WHERE `entry`=8393 AND `text_id`=10493; -DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10492; -DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10614; -- was incorrect in the db -DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10494; -DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10615; -- was incorrect in the db -DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10495; -DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10616; -- was incorrect in the db -DELETE FROM `gossip_menu` WHERE `entry`=8398 AND `text_id`=10497; -DELETE FROM `gossip_menu` WHERE `entry`=8493 AND `text_id` IN (10606,10655,10854); -DELETE FROM `gossip_menu` WHERE `entry`=8497 AND `text_id`=10616; -DELETE FROM `gossip_menu` WHERE `entry`=8498 AND `text_id`=10615; -DELETE FROM `gossip_menu` WHERE `entry`=8499 AND `text_id`=10614; -DELETE FROM `gossip_menu` WHERE `entry` BETWEEN 21296 AND 21303; -- the old menus assigned to Lantresor which were not sniffed -DELETE FROM `gossip_menu` WHERE `entry` BETWEEN 21304 AND 21309; -- the old menus assigned to Altruis which were not sniffed -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(7563,9181), -(7578,9220), -(7579,9219),(7579,9221),(7579,9256),(7579,9257), -(7592,9240),(7592,9283),(7592,9284), -(7625,9287), -(7626,9288), -(7631,9312), -(7699,9394), -(7607,9258),(7607,9286), -(7675,9361),(7675,9369), -(7676,9368), -(7677,9367), -(7678,9366), -(7679,9365), -(7680,9364), -(7681,9363), -(7682,9362), -(7704,9405), -(7705,9406), -(7714,9424), -(7715,9423), -(7716,9422), -(7717,9421), -(7718,9420), -(7719,9419),(7719,9427), -(7723,9429), -(7724,9433), -(8394,10492), -(8393,10493), -(8395,10494), -(8396,10495), -(8398,10497), -(8493,10606),(8493,10655),(8493,10854), -(8497,10616), -(8498,10615), -(8499,10614); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7579,7704,7715,7716,7717,7718,7719,8393,8394,8395,8396,8398,8497,8498,8499) AND `id`=0; -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7719,7724) AND `id`=1; -DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 7675 AND 7682 AND `id`=0; -UPDATE `gossip_menu_option` SET `action_menu_id`=8499 WHERE `menu_id`=8397; -- was incorrect -DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 21296 AND 21303; -- the old options assigned to Lantresor which were not sniffed -DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 21304 AND 21309; -- the old options assigned to Altruis which was not sniffed -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 -(7579,0,0,'Hemet Nesingwary, what are you doing here in the Outland?',1,1,7578,0,0,0,''), -(7704,0,0,'Empoor, you''re going to tell me what I want to know, or else!',1,1,0,0,0,0,''), -(7715,0,0,'Forge camps?',1,1,7714,0,0,0,''), -(7716,0,0,'How do you see them now?',1,1,7715,0,0,0,''), -(7717,0,0,'And now?',1,1,7716,0,0,0,''), -(7718,0,0,'Legion?',1,1,7717,0,0,0,''), -(7719,0,0,'I see twisted steel and smell sundered earth.',1,1,7718,0,0,0,''), -(7719,1,0,'Tell me about the demon hunter training grounds at the Ruins of Karabor.',1,1,8394,0,0,0,''), -(7724,1,1,'I have marks to redeem!',3,128,0,0,0,0,''), -(7675,0,0,'I have killed many of your ogres, Lantresor. I have no fear.',1,1,7682,0,0,0,''), -(7682,0,0,'Should I know? You look like an orc to me.',1,1,7681,0,0,0,''), -(7681,0,0,'And the other half?',1,1,7680,0,0,0,''), -(7680,0,0,'I have heard of your kind, but I never thought to see the day when I would meet a half-breed.',1,1,7679,0,0,0,''), -(7679,0,0,'My apologies. I did not mean to offend. I am here on behalf of my people.',1,1,7678,0,0,0,''), -(7678,0,0,'My people ask that you pull back your Boulderfist ogres and cease all attacks on our territories. In return, we will also pull back our forces.',1,1,7677,0,0,0,''), -(7677,0,0,'We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people.',1,1,7676,0,0,0,''), -(7676,0,0,'What do I need to do?',1,1,0,0,0,0,''), -(8394,0,0,'I''m listening.',1,1,8393,0,0,0,''), -(8393,0,0,'Go on, please.',1,1,8395,0,0,0,''), -(8395,0,0,'Interesting.',1,1,8396,0,0,0,''), -(8396,0,0,'That''s quite a story.',1,1,8398,0,0,0,''), -(8398,0,0,'There was something else I wanted to ask you, Altruis.',1,1,7719,0,0,0,''), -(8499,0,0,'But you are dragons! How could orcs do this to you?',1,1,8498,0,0,0,''), -(8498,0,0,'Your mate?',1,1,8497,0,0,0,''), -(8497,0,0,'I have battled many beasts, dragon. I will help you.',1,1,0,0,0,0,''); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7579 AND `SourceEntry` IN (9221,9256,9257); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7592 AND `SourceEntry` IN (9283,9284); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7607 AND `SourceEntry`=9286; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7675 AND `SourceEntry`=9369; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7719 AND `SourceEntry`=9427; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8493 AND `SourceEntry` IN (10655,10854); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7675 AND `SourceEntry`=0; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7704,7719) AND `SourceEntry`=0; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7719) AND `SourceEntry`=1; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=21304; -- condition for Altruis' gossip that wasn't sniffed -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=21295; -- condition for Lantresor's gossip that wasn't sniffed -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,7579,9221,0,0,8,208,0,0,0,0,'','Show different gossip if player has rewarded quest 208'), -(14,7579,9256,0,0,8,9851,0,0,0,0,'','Show different gossip if player has rewarded quest 9851'), -(14,7579,9257,0,0,8,9852,0,0,0,0,'','Show different gossip if player has rewarded quest 9852'), -(14,7592,9283,0,0,8,9854,0,0,0,0,'','Show different gossip if player has rewarded quest 9854'), -(14,7592,9284,0,0,8,9856,0,0,0,0,'','Show different gossip if player has rewarded quest 9856'), -(14,7607,9286,0,0,8,9859,0,0,0,0,'','Show different gossip if player has rewarded quest 9859'), -(14,7675,9369,0,0,8,10107,0,0,0,0,'','Show different gossip if player has rewarded quest 10107'), -(14,7675,9369,0,1,8,10108,0,0,0,0,'','Show different gossip if player has rewarded quest 10108'), -(14,7719,9427,0,0,8,9991,0,0,0,0,'','Show different gossip if player has rewarded quest 9991'), -(14,8493,10655,0,0,8,10870,0,0,0,0,'','Show different gossip if player has rewarded quest 10870'), -(14,8493,10854,0,0,8,11012,0,0,0,0,'','Show different gossip if player has rewarded quest 11012'), -(15,7675,0,0,0,9,10107,0,0,0,0,'','Show gossip option if player has quest 10107 but not complete'), -(15,7675,0,0,1,9,10108,0,0,0,0,'','Show gossip option if player has quest 10108 but not complete'), -(15,7704,0,0,0,9,9978,0,0,0,0,'','Show gossip option if player has quest 9978 but not complete'), -(15,7719,0,0,0,8,9991,0,0,1,0,'','Show gossip option if player has not rewarded quest 9991'), -(15,7719,1,0,0,9,10646,0,0,0,0,'','Show gossip option if player has quest 10646 but not complete'); - -UPDATE `smart_scripts` SET `event_param1`=7715 WHERE `entryorguid`=18417 AND `id` IN (0,1); -- correct Altruis' script -UPDATE `smart_scripts` SET `event_param1`=8396 WHERE `entryorguid`=18417 AND `id`=2; - -UPDATE `smart_scripts` SET `event_param1`=8497 WHERE `entryorguid`=21657 AND `id`=0; -- correct Neltharaku's script - -UPDATE `smart_scripts` SET `link`=3, `event_param1`=7676 WHERE `entryorguid`=18261 AND `id` IN (1,2); -- correct Lantresor's script -DELETE FROM `smart_scripts` WHERE `entryorguid`=18261 AND `id`=3; -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 -(18261,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lantresor - On gossip select - Close gossip'); diff --git a/sql/updates/world/2012_02_18_07_world_gossip.sql b/sql/updates/world/2012_02_18_07_world_gossip.sql deleted file mode 100644 index 6246f12cefc..00000000000 --- a/sql/updates/world/2012_02_18_07_world_gossip.sql +++ /dev/null @@ -1,44 +0,0 @@ --- Fallen Hero of the Horde http://old.wowhead.com/npc=7572 -DELETE FROM `gossip_menu` WHERE `entry`=840 AND `text_id`=1451; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (840,1451); -DELETE FROM `gossip_menu` WHERE `entry`=880 AND `text_id`=1452; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (880,1452); -DELETE FROM `gossip_menu` WHERE `entry`=881 AND `text_id`=1456; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (881,1456); -DELETE FROM `gossip_menu` WHERE `entry`=882 AND `text_id`=1455; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (882,1455); -DELETE FROM `gossip_menu` WHERE `entry`=883 AND `text_id`=1454; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (883,1454); -DELETE FROM `gossip_menu` WHERE `entry`=884 AND `text_id`=1453; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (884,1453); --- Text Conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=840 AND `SourceEntry` IN (1391); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,840,1391,0,8,2784,0,0,0,'','Show gossip text if player has quest 2801 or 2784 completed'), -- It's hard to imagine that so much death and despair could be confined to such a small area; yet beyond the swamp is a land plagued by chaos and destruction.$B$BWatch your step, adventurer. The Blasted Lands are the final resting place to far greater beings than you. -(14,840,1391,1,8,2801,0,0,0,'','Show gossip text if player has quest 2801 or 2784 completed'); -- It's hard to imagine that so much death and despair could be confined to such a small area; yet beyond the swamp is a land plagued by chaos and destruction.$B$BWatch your step, adventurer. The Blasted Lands are the final resting place to far greater beings than you. --- Gossip option conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=840; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,840,0,0,9,2784,0,0,0,'','Show gossip option if player has quest 2784 but not complete'), -(15,840,1,0,9,2801,0,0,0,'','Show gossip option if player has quest 2801 but not complete'), -(15,840,2,0,9,2702,0,0,0,'','Show gossip option if player has quest 2702 but not complete'); --- Add Any Missing Gossip Option -DELETE FROM `gossip_menu_option` WHERE `menu_id`=840 AND `id` IN (0,1); -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (880,881,882,883,884) AND `id` IN (0); -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 -(840,0,0,"Please continue, Hero...",1,1,880,0,0,0,''), -(840,1,0,"Please continue, Hero...",1,1,880,0,0,0,''), -(880,0,0,"What could be worse than death?",1,1,884,0,0,0,''), -(881,0,0,"I shall.",1,1,0,0,0,0,''), -(882,0,0,"You can count on me, Hero.",1,1,881,0,0,0,''), -(883,0,0,"What are the stones of binding?",1,1,882,0,0,0,''), -(884,0,0,"Subordinates?",1,1,883,0,0,0,''); --- Fallen Hero of the Horde SAI -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=7572; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=7572 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 -(7572,0,0,1,62,0,100,0,881,0,0,0,26,2784,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - complete quest 2784'), -(7572,0,1,2,61,0,100,0,0,0,0,0,26,2801,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - complete quest 2801'), -(7572,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - Close Gossip'), -(7572,0,3,4,62,0,100,0,840,2,0,0,12,7750,1,180000,0,0,0,8,0,0,0,-10630.3,-2987.05,28.96,4.54,'Fallen Hero of the Horde - On Gossip option select - Spawn Corporal Thund Splithoof'), -(7572,0,4,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fallen Hero of the Horde - On Gossip option select - Close Gossip'); diff --git a/sql/updates/world/2012_02_18_08_world_gossip.sql b/sql/updates/world/2012_02_18_08_world_gossip.sql deleted file mode 100644 index a9fef9bcd76..00000000000 --- a/sql/updates/world/2012_02_18_08_world_gossip.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Fix mistake in Fallen Hero of the Horde gossip update -UPDATE `conditions` SET `ConditionValue1`=2784,`Comment`='Show gossip text if player has quest 2801 or 2784 completed' WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=840 AND `ConditionValue1`=2704; -UPDATE `conditions` SET `Comment`='Show gossip text if player has quest 2801 or 2784 completed' WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=840 AND `ConditionValue1`=2801; -UPDATE `conditions` SET `ConditionValue1`=2784,`Comment`='Show gossip option if player has quest 2784 but not complete' WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=840 AND `ConditionValue1`=2704; -UPDATE `smart_scripts` SET `action_param1`=2784 WHERE `entryorguid`=7572 AND `id`=0; diff --git a/sql/updates/world/2012_02_19_00_world_quest_template.sql b/sql/updates/world/2012_02_19_00_world_quest_template.sql deleted file mode 100644 index 76ab51f803b..00000000000 --- a/sql/updates/world/2012_02_19_00_world_quest_template.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Shadowmourne quest chain fix by nelegalno - --- Limit quests to Warrior, Paladin and Death Knight classes -UPDATE `quest_template` SET `RequiredClasses` = 35 WHERE `Id` IN (24545, 24743, 24547, 24749, 24756, 24757, 24548, 24748); - --- Quest relations -UPDATE `quest_template` SET `NextQuestId` = 24743 WHERE `Id` = 24545; -- The Sacred and the Corrupt -UPDATE `quest_template` SET `NextQuestId` = 24547 WHERE `Id` = 24743; -- Shadow's Edge -UPDATE `quest_template` SET `NextQuestId` = 24749 WHERE `Id` = 24547; -- A Feast of Souls -UPDATE `quest_template` SET `NextQuestId` = 24756 WHERE `Id` = 24749; -- Unholy Infusion -UPDATE `quest_template` SET `NextQuestId` = 24757 WHERE `Id` = 24756; -- Blood Infusion -UPDATE `quest_template` SET `NextQuestId` = 24548 WHERE `Id` = 24757; -- Frost Infusion -UPDATE `quest_template` SET `NextQuestId` = 24549 WHERE `Id` = 24548; -- The Splintered Throne -UPDATE `quest_template` SET `NextQuestId` = 24748 WHERE `Id` = 24549; -- Shadowmourne... to The Lich King's Last Stand diff --git a/sql/updates/world/2012_02_19_01_world_quest_template.sql b/sql/updates/world/2012_02_19_01_world_quest_template.sql deleted file mode 100644 index 2f888f08cdd..00000000000 --- a/sql/updates/world/2012_02_19_01_world_quest_template.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Dire Maul Book Quests - -UPDATE `quest_template` SET `RequiredClasses` = 1 WHERE `Id` = 7499; -- Codex of Defense (18357/7499) -UPDATE `quest_template` SET `RequiredClasses` = 2 WHERE `Id` = 7501; -- The Light and How to Swing It (18359/7501) -UPDATE `quest_template` SET `RequiredClasses` = 4 WHERE `Id` = 7503; -- The Greatest Race of Hunters (18361/7503) -UPDATE `quest_template` SET `RequiredClasses` = 8 WHERE `Id` = 7498; -- Garona: A Study on Stealth and Treachery (18356/7498) -UPDATE `quest_template` SET `RequiredClasses` = 16 WHERE `Id` = 7504; -- Holy Bologna: What the Light Won't Tell You (18362/7504) -UPDATE `quest_template` SET `RequiredClasses` = 64 WHERE `Id` = 7505; -- Frost Shock and You (18363/7505) Closes #4727 -UPDATE `quest_template` SET `RequiredClasses` = 128 WHERE `Id` = 7500; -- The Arcanist's Cookbook (18358/7500) -UPDATE `quest_template` SET `RequiredClasses` = 256 WHERE `Id` = 7502; -- Harnessing Shadows (18360/7502) -UPDATE `quest_template` SET `RequiredClasses` = 1024 WHERE `Id` = 7506; -- The Emerald Dream... (18364/7506) diff --git a/sql/updates/world/2012_02_19_02_world_gameobject.sql b/sql/updates/world/2012_02_19_02_world_gameobject.sql deleted file mode 100644 index 88a1f2e3a4c..00000000000 --- a/sql/updates/world/2012_02_19_02_world_gameobject.sql +++ /dev/null @@ -1,4 +0,0 @@ --- meeting stone for UK -DELETE FROM `gameobject` WHERE `id`=188488; -INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES -(245, 188488, 571, 1, 1, 1237.301, -4948.268, 36.02063, 2.495818, 0, 0, 0.9483232, 0.3173059, 300, 0, 1); diff --git a/sql/updates/world/2012_02_19_03_world_version.sql b/sql/updates/world/2012_02_19_03_world_version.sql new file mode 100644 index 00000000000..53c6821be69 --- /dev/null +++ b/sql/updates/world/2012_02_19_03_world_version.sql @@ -0,0 +1 @@ +UPDATE `version` SET `db_version`='TDB 335.11.47' LIMIT 1; diff --git a/sql/updates/world/2012_02_19_03_world_warden_checks.sql b/sql/updates/world/2012_02_19_03_world_warden_checks.sql deleted file mode 100644 index 3698c461358..00000000000 --- a/sql/updates/world/2012_02_19_03_world_warden_checks.sql +++ /dev/null @@ -1,802 +0,0 @@ -DROP TABLE IF EXISTS `warden_checks`; - -CREATE TABLE `warden_checks` ( - `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT, - `type` tinyint(3) unsigned DEFAULT NULL, - `data` varchar(48) DEFAULT NULL, - `str` varchar(20) DEFAULT NULL, - `address` int(10) unsigned DEFAULT NULL, - `length` tinyint(3) unsigned DEFAULT NULL, - `result` varchar(24) DEFAULT NULL, - `comment` varchar(50) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - -INSERT INTO `warden_checks`(`id`,`type`,`data`,`str`,`address`,`length`,`result`,`comment`) VALUES -(1,178,'07F223143C69271AA2A851FECF6DC883A9D3A7DBA6FE26CC','',710730,23,'',NULL), -(2,191,'C7D18F99DBC446A4B36E78B9130B6FA2E365B3D2D4199DF5','',28940,17,'',NULL), -(3,191,'AA1A8559776F873F26954F15E49E6041EDC2C3766AD87A59','',21826,11,'',NULL), -(4,178,'5F342A4D0EA9DB35F93FAE6E32670D810F017309817AA7C0','',676970,23,'',NULL), -(5,178,'C57BD89DD447131EA2083784AB4DA8BD58CF3E182F1D8AF6','',690106,23,'',NULL), -(6,191,'69AA85EFE8A1A990DA5ECFED4FAFD5B14F1D52EF2548FD15','',12905,36,'',NULL), -(7,191,'083ECAD073DE2D61E3564B4BF767C9D1F8F15AA0495F5A76','',41096,24,'',NULL), -(8,178,'C774D64EF60AD5A141FC56F3D02AE78AC147770FAE25D8FE','',3037164,22,'',NULL), -(9,191,'502C59CAFEA11E9584C13BFE75F85EB79936AEEE31B44165','',12194860,37,'',NULL), -(10,178,'4FBE8978A662428C616AABD71DA5562E4AC21F54BEB8ADBF','',3037164,22,'',NULL), -(11,178,'83D3F7FD7DCA144AD8219A6A4E20F0CFC6E7EA208C4144FF','',3033068,22,'',NULL), -(12,243,'','',4623652,7,'578B7D08578BF1','Pointer to realmlist address'), -(13,178,'00523153EE2298A8D80D7B26B7067CA7B26AC06FF374FE7B','',673210,23,'',NULL), -(14,191,'91BC368FA14A3FE3E13D0B1056F485F846925E613D8E8903','',12194860,37,'',NULL), -(15,243,'','',10010636,12,'8166443FFF1FFFD9565CD95E',NULL), -(16,178,'8FEFDBC58301AB0E0D0F6EBC5FBDA5ED9A7126873A9AB337','',682394,23,'',NULL), -(17,191,'B40FF92D4F092599EA9014C88B474DE4352C3F1635109882','',448492,48,'',NULL), -(18,191,'42B596FF923054531E4918DC39E08F8564FED16D559B494A','',29852,20,'',NULL), -(19,178,'24291D6733A7CEFA3D54C3BCCAE95D56D8365BAB42AEE1CE','',3037164,22,'',NULL), -(20,178,'6C4E321E2D5A153F2BB664EB6EEDF8D67FDE7ECC8076D087','',3990720,23,'',NULL), -(21,178,'FB649706C8F1AFF5990B5F3118DFE54FF6F9609C6991C161','',3045776,31,'',NULL), -(22,191,'D1B451C906B81261B048FD4025217245950C11660815367F','',28920,23,'',NULL), -(23,191,'40079A1083A6B57E3B713992BD395FB6650B631E4C4B8D4E','',29852,20,'',NULL), -(24,178,'3F8FEFE08CB358D6613656AFDB498AB8C599BA18B5574FB6','',682378,23,'',NULL), -(25,191,'EECA71B5536EE1992FD7825A5CCC4B7F9F3B413C0DA498B6','',29884,20,'',NULL), -(26,191,'B8786BFF2421ED1F1FB30F3F0BAF671FC1DAD5B3B33124C8','',28956,17,'',NULL), -(27,191,'BF0C842D635D9D8B3F6FF84EF6DF7C963C485EBAF02D17B0','',28920,23,'',NULL), -(28,191,'9672ED2A27C4972E04DF4471C95492C721024E241995170C','',36924,24,'',NULL), -(29,191,'63532B056020A261251BD24AB026BBC5D4468AF863136044','',17906,11,'',NULL), -(30,178,'7D38C80FEAB10B857A4A7BEF15D27A58FB43FD875E29C73C','',3990720,23,'',NULL), -(31,178,'B158752316672A90BF29846E7AD64BA4FD1699C638BFD3B6','',2299116,33,'',NULL), -(32,178,'4549AE7CA28700562D996CBC78FA7341DC05F644C01474E4','',3000288,31,'',NULL), -(33,178,'EE77806A4F5723FD9C6FC6F43308C8AB448E0A139CB43700','',690106,23,'',NULL), -(34,191,'046D6EA3E99E275F51CAA591BD8C478B6F964A3072018F43','',21660,15,'',NULL), -(35,178,'B1682CE919907AD7D8990F3D8272CFF24A996162565D52B4','',676970,23,'',NULL), -(36,178,'22E057649A8BF1D9672841EF47A4DA175AAC082FFEF059DA','',710730,23,'',NULL), -(37,178,'7BA62D5F5CFEB545D1AE646962F4EB9A91B93EF8FFD5D1B0','',710554,23,'',NULL), -(38,178,'702802D919D9E5C3FD42CA9188936C73E47F87CFA419025A','',3033068,22,'',NULL), -(39,178,'FDA6D997BFB8A991B57755633D1AB3C7E567A74C1EC09937','',3070052,22,'',NULL), -(40,191,'84F6BDD28490937867774E7BF8D5B78F68BF9EB43DE90F10','',477912,60,'',NULL), -(41,191,'5A5B4BA32BD937FF253016AE836DD44B794F8D05982860A6','',447736,48,'',NULL), -(42,178,'A243986665C7FCA1E60A9F209DE9431C3098D082DF1C4528','',682378,23,'',NULL), -(43,178,'7CC89374CE3A9C07DCD685006690B828931D60085EE5FEE8','',710554,23,'',NULL), -(44,191,'01F10590E6DFED79523D26C043D5424174BEF1011F3F4974','',477928,60,'',NULL), -(45,178,'C9728BDC4B77BAA7B3515AFD3628EDB0986DFA20B46917B4','',672746,23,'',NULL), -(46,191,'179B80E5E054521E44BA8F5978D5FC489CC9E514B350A3FF','',28956,17,'',NULL), -(47,243,'','',5417948,5,'7734FF2485','FrameXML Signature Check'), -(48,191,'7769A67D6E2460450873133B0CFF99B67A58CE6C404A17F8','',17282,15,'',NULL), -(49,178,'CF3896074EEBC0F93B539FD44E4D825227D4C1556B8F2279','',3990720,23,'',NULL), -(50,178,'88F2833B5267A71A0CA72509C40819B99283A6E556FD9038','',198,10,'',NULL), -(51,243,'','',8491566,5,'8B4D10890D','Lua DoString'), -(52,178,'F7229DF2D879A9E8D5BCEDCDC7046D75BAEE1C9D4DA41E55','',3638348,23,'',NULL), -(53,191,'AE78585CD862134059B13669FC416B8124752EC6471DDCE6','',28940,17,'',NULL), -(54,191,'B408E9F9B475E4B6A81F9B7F2E060824F618FFDABBFFE805','',13634,11,'',NULL), -(55,178,'A9DA016B83961F95097E08F2DEBE69517C7573FFF06D8C4B','',668874,23,'',NULL), -(56,191,'0E74160C242EF826D09BCE4ED535E9A9D251B1CD20E31891','',24812,14,'',NULL), -(57,178,'A58E4D44D952C1F9DB7B5E423167EE4C28AD02668C5B86AF','',710730,23,'',NULL), -(58,191,'35A9FC42ACBF3A147B0C8CF67BA04EC979C6534B20249B45','',28956,12,'',NULL), -(59,243,'','',5345746,7,'746583F9177760','Lua Protection Patch'), -(60,191,'1430DC4A627EA5FA2CFF9C010CE16022F259F81DB6047879','',13634,11,'',NULL), -(61,191,'85A005398AF851382267C01BB6FB04AEF2093213C20EC200','',360508,13,'',NULL), -(62,191,'96916CD89649027A9A8BBFBD28AE190CD5D590E24BBAD451','',13033,36,'',NULL), -(63,191,'056D57A5C1A46883400E1F69405750B23DE18C3032C3D91C','',27270,13,'',NULL), -(64,191,'87C641E1EDBD96D9F170C7BE0FA13F45611DCDF41AC02526','',41127,24,'',NULL), -(65,191,'1F378DF1E7BD99164DDC7401A98CA5E9551BD50B4A35D5AA','',34176,25,'',NULL), -(66,178,'B5ED443D6CA2F6095BAC8DAFDC8F3413F7B473916357C17E','',209352,75,'',NULL), -(67,191,'A2BC3FF01787A38CB88B3EF45C1CD97DA113157FC395D38C','',30012,16,'',NULL), -(68,191,'190862E5018F1428E5B12BFDAD08283ECD057B34AD722846','',41228,24,'',NULL), -(69,191,'6E0E55BE8690F64442E275559E6C9F8A3FDCAA00937D1C13','',49347,24,'',NULL), -(70,191,'B6FC4C07BB2CBE7C5C854CD99DAFEC0D1AE4101FC51460F9','',477912,60,'',NULL), -(71,178,'3B5955C3B498489869990F08A4CAE566A7D689C23990518B','',156,8,'',NULL), -(72,243,'','',7246064,6,'8950108B450C','Movement State related'), -(73,178,'F24317DAA28AA477996EEBB9538A89569ABF9B185A3EA4E4','',718842,23,'',NULL), -(74,178,'DA25A4134671325719833878E2556455EC4321A2207B6728','',198,10,'',NULL), -(75,191,'DC9490A7BEB43C64585E013B5260BE843D126EB3BCEBAC11','',50040,26,'',NULL), -(76,178,'4BB92BBD5CA8C192C9D0E1EDB6C21FF3F4A61ED1B151365F','',673210,23,'',NULL), -(77,178,'13E8DD1C9F5501A270A59CC4B61311F6D5D18DC3F2AA351A','',3037164,22,'',NULL), -(78,191,'346CFA39FF98198BDE1C23673FBF51A50CFF5ADED784F077','',17522,15,'',NULL), -(79,113,'0590FC57AB448975FA46C314A8AB75AF96DF0FD0A3D9FB23','Afd32uu',0,0,'',NULL), -(80,178,'E37D413DC96A92D3CEAB8A482B8F5397587A0E654C9A0166','',672954,23,'',NULL), -(81,178,'E7D5551799C2C7F0072BC3149A22F37D09EA1EB83F64C655','',3045912,31,'',NULL), -(82,191,'7CC5260578671130CA5B3392BA5CFD0F3DE0BE1085E556B6','',9977,32,'',NULL), -(83,191,'F44A40945F24385D089E040A733553EEFF92EFAAB0636323','',134968,32,'',NULL), -(84,178,'D3122CF30EE55310CF4A710E61B190D2B108227B746B41AD','',679578,23,'',NULL), -(85,191,'7E3CC1BC53477D84F05F623BBC94B9DE8D01A2607CA935DB','',41188,24,'',NULL), -(86,191,'DC06565CC1512B5A91A848E08BC4FBC6DA705F6503667852','',41127,24,'',NULL), -(87,191,'03DC47CDFBB14C5CF0D0010FA5424556F951585588A2180A','',29916,16,'',NULL), -(88,191,'29EC91C4D87891FECDED381CE65A86A259F00DD788833E4D','',174688,37,'',NULL), -(89,191,'31F024003681765368F6EFB667E83CE1D12799723AA99BF9','',685304,44,'',NULL), -(90,191,'6A82AC1D0BFEF5DA7385510CBC57189FACD42E45E0D2A65E','',30012,16,'',NULL), -(91,191,'3901FBD52655E12ADA4EEDED3B365B1DDFAAA925A140097F','',448492,48,'',NULL), -(92,191,'6E9991A25EC347BEA5813EDE0A842D746779C97606565B5A','',17906,11,'',NULL), -(93,191,'0AC9F2B104AC5AA9131FB14E669B98D30D056936625B0245','',27270,13,'',NULL), -(94,178,'A338B3DA78A6683CBEE08A63C5EEFBE1AF33BF54983D583D','',684876,29,'',NULL), -(95,178,'38759C29F2ACF42DA9D16EF35837A470DC7C42C3284B2A3C','',3049492,22,'',NULL), -(96,191,'F35817564FC39F4DB7994021352FEEB86E2FEE86C11B8DBB','',360508,13,'',NULL), -(97,191,'09FAC087283873DAEE0AD074ABF7DDB1B395F5CF6BC2141E','',28956,17,'',NULL), -(98,178,'87FE57916743AF3C97CC3B583B29E89B6E503D31D1747B64','',676970,23,'',NULL), -(99,178,'97D854645011BAD1F6625679511D78D1B7367A51EB0FCC6E','',668874,23,'',NULL), -(100,178,'12369F6F1B875FB5CC5E67445ADEAE2B295D196596679317','',0,9,'',NULL), -(101,191,'5034278808E93A3DFC9BEFFD8E180FEFA24DFC5056ED3BE1','',433168,48,'',NULL), -(102,178,'55EF16220A7EF3F74A9D895821610DFBD2A757FB05C792D5','',209352,75,'',NULL), -(103,191,'67445533AA0BB737D2F74C9258148C6C667794F0E3D07498','',45324,24,'',NULL), -(104,178,'AA8649100B17A9C5BE227F47F867FADE51AD242BAAD39821','',3045632,31,'',NULL), -(105,191,'85545FE9242B2474574EEBABBF452FBD11497073CB1E46A5','',41080,24,'',NULL), -(106,191,'9DACD6981681F53650B681EAE68065D26F4803682058709D','',448456,48,'',NULL), -(107,191,'96B74F1436A05E658E3282164BC3CBDF4DBBB2CF6A5B866F','',9977,32,'',NULL), -(108,191,'033BD6861DF7878DC9470EC2F699772BB2F3D5000490866F','',90202,13,'',NULL), -(109,113,'B797D0AF3164EE83167D5C054A511A5B209A70C6655C408B','IPSect',0,0,'',NULL), -(110,178,'D91A2764435C5091D3F9471AB8B5F397E609330294694488','',710730,23,'',NULL), -(111,191,'94EED02DCDB71789E50917DA401A03F4B91BDBEA050D8BCA','',3766400,37,'',NULL), -(112,178,'2DF33CBB544E2D5238FB591F2547AC507B4D8A652D789F2B','',2303444,33,'',NULL), -(113,243,'','',7860712,5,'742DF6407C',NULL), -(114,178,'81A74F35F0F887144D59F93647C18C70C5FEEF542A7F3782','',709322,22,'',NULL), -(115,178,'2E1F8A68FDDF084A950B786A1EE7E0CE43E62449A56F92A3','',3045632,31,'',NULL), -(116,191,'B1F8988B6664A90E79503FA5D843C3CB97BFDC23EB8C7690','',433168,48,'',NULL), -(117,178,'0277E26DE31814DFD675A59E526669E39080E033BAE88859','',0,9,'',NULL), -(118,243,'','',10714892,8,'BB8D243FD4D0313E','Wall Climb'), -(119,178,'09BBFC19FCADC69D6B5BF655A5BB6350B4A8120C3EB557D2','',3990720,23,'',NULL), -(120,178,'BF4ABDEB726B0060E74701C03180C3CB02170ADCB7DCB61C','',3049872,31,'',NULL), -(121,243,'','',9990741,9,'8B878000000089463C','No Fall Damage Patch'), -(122,178,'D259A46A6D1855C436BFC96FB9376BDCDF5E9FFAE8B4147C','',3045616,31,'',NULL), -(123,178,'F425A62A44097742D72A05669B6BE93AD9CEFE9E40D71E48','',3045976,31,'',NULL), -(124,191,'B134291F515D136B6576FFBC0133C7859755974611170D07','',20512,16,'',NULL), -(125,191,'125BE691985D8DB37068DC14D74EA2DA1260E4A63D3F74BF','',45324,24,'',NULL), -(126,178,'E06E3C5B356B34BA92F6765108556AD53ABB74B986D5810E','',3070052,22,'',NULL), -(127,178,'8CC87DFF61F2EC82DE033865C9879010D94E1614369FE286','',710554,23,'',NULL), -(128,191,'E1F5233450FEFFB6F0E8F2B17683047A485828FEDD3E5B80','',448456,48,'',NULL), -(129,191,'31BA6EA4DF2362676AB71F4CB60B0D40FA51A3AABD25D5CB','',36924,24,'',NULL), -(130,191,'C14630E1D519EB85C254C536FE81DC490977E869BD5CD884','',12985,36,'',NULL), -(131,191,'B337F892EEDD52A5B978C116A19D927134273626EFC4DAA3','',17890,11,'',NULL), -(132,191,'D97560108AA21A487EC9278759F7615BFA304A933776A201','',18680,35,'',NULL), -(133,178,'DA59505BA61459508532CBEAD246DCD2C8E7BF5C6D3CE676','',3037164,22,'',NULL), -(134,191,'5803CA69E5B7F1DF08D95219894D75F52EDB1AD429E562D9','',174688,37,'',NULL), -(135,178,'8A1099E19139D91573286DBB3DED2CC093A99FD178F7FEC8','',3033068,22,'',NULL), -(136,178,'0331B438B085F55C06F7F697160845BE953D9CE789AA62A4','',3000288,31,'',NULL), -(137,191,'E844078A5671FF7DB0621E7F1C7EDDF9C92F5A9FA0477FCB','',41023,24,'',NULL), -(138,178,'AAD7F47B231861913F353341FD26E5AA89AFB586FB6A5366','',672746,23,'',NULL), -(139,178,'136DFB3FE66D2830DF46EE155FCAEADC9624FFE1410088DA','',3041472,31,'',NULL), -(140,191,'C6015A0D5C9109768BA4233639A51F163CC7ED58749E5026','',25724,20,'',NULL), -(141,178,'9C668CE4D328EEA9B6AB7AD5FF54169289B35B230275A43C','',3049872,31,'',NULL), -(142,178,'FC3C95E71F968C46BD5DB5C9EF9B0A5BDCC5619B805046F5','',2299060,33,'',NULL), -(143,178,'FBE3808C0E36BFBC1D1F5A0E508CA89E81E550CD2FDEEC48','',149,5,'',NULL), -(144,178,'35A8252DBC65514E858256C497141153812EE61C724BF5A9','',710730,23,'',NULL), -(145,178,'CC79AA9AE29A52A998181D183D38974221B8BAC0AB534E7D','',0,9,'',NULL), -(146,178,'B89F25A249D295580E649F5ABE0C65EC24401F4889A4FB16','',668874,23,'',NULL), -(147,178,'742A0A9997B9E857C355AA75797466506BAE73D44D26399D','',3037164,22,'',NULL), -(148,178,'E7975701601B2FDF8262098521B7BB4FF5CCC484F8E919E7','',3045776,31,'',NULL), -(149,178,'43E81BE830F169F4EDD23B84ABFA9D15EF12C978FE134346','',60648,56,'',NULL), -(150,178,'66CA9E464A2122E301A72FAEF13A4853D8CB1A45C177E854','',178504,96,'',NULL), -(151,113,'0A3C294B0799FD2C9EC17C1CCBCD174A51B6A2ECC62FEF17','IPSect',0,0,'',NULL), -(152,178,'6E9CE81BFCAF0C250705FCC599981D2D9E4D474A7E857B37','',2299108,33,'',NULL), -(153,178,'8734D6E081D5C993DCE8161CFDFC6197F39A487E4083A3E1','',149,5,'',NULL), -(154,178,'A33355AF7B5FF3CECB3A6059F6621F30AEE695D69421EA2B','',3049492,22,'',NULL), -(155,191,'BF8CEA63013511BDE0B551DAAC492DFBB9608645140B88F7','',29916,16,'',NULL), -(156,178,'8D5D5E99EAB2ED21A104913B05D6BD7A8E63ADA56B66CDED','',3022016,31,'',NULL), -(157,191,'778256BFEF82EA60C4E0F25083655FB2BB75B83FD60A9C06','',18680,35,'',NULL), -(158,178,'43FB8007D7DD7B01FFBEEA3EF9D0242778565544281EC761','',0,9,'',NULL), -(159,191,'94DCF5D21FE2106F5303216C14AD55EEDC1B19FDC91D5F76','',28704,16,'',NULL), -(160,191,'7EBBF90F7D8462D1453479DF9AC5943AF483FE2828C74FDD','',477928,60,'',NULL), -(161,191,'A171148491E099B12CCD1708B784D8C3B09737772C7780C0','',401992,14,'',NULL), -(162,191,'5350ACB75F9FA498FE0D2A371649C9FD9716BDDE2C32F5FB','',13634,11,'',NULL), -(163,191,'85E53280630956C58D4CA7FD8DC5FE73C9A2A03314DFF294','',45223,24,'',NULL), -(164,191,'391BC8A81D4EB6D526BAF0DC3468CAA36C9207B82E194B7A','',130380,14,'',NULL), -(165,191,'0F88FA5CD9B9950F850C18FE76C948FF43CDDE3E75638FF1','',17938,11,'',NULL), -(166,178,'EB63FC60164AFF92726DA658882BF1CE47CF0BF6C80B1B97','',690106,23,'',NULL), -(167,178,'E30B2494142B416BBE95DA3DAE4A82CBDF3A020715F10E8B','',4011280,23,'',NULL), -(168,191,'6CA1C19D0E9191CBC9CA3D5BC3CF1D19764D8F17C6B54AE4','',59620,13,'',NULL), -(169,178,'4730B7A7EC70544A688211A5C754C357A090116092D3EC4D','',682378,23,'',NULL), -(170,243,'','',10000022,6,'894644894E54',NULL), -(171,191,'713A7B79619AEF3C47E44102F86EDCE0D6AFBC5ABE87F861','',13538,11,'',NULL), -(172,191,'575F1C6AF7C71085C7D9CB2291844D9F2DA3B71391C0B941','',36907,24,'',NULL), -(173,178,'296F233E4FAC4CF419D5FBF2701AC4D5AA0866CB4D0DAEC6','',3045976,31,'',NULL), -(174,178,'933C1A228C99E35DF309838B25B7D5EA3A8E961E81D81D32','',673194,23,'',NULL), -(175,191,'9EC125252C3738478CA942DCB59030097194B284A9162B32','',59620,13,'',NULL), -(176,178,'6665F3FB8DC6BE71C152C3674B5783D6E57FE8BF796D190C','',3634252,23,'',NULL), -(177,191,'E120DD63042FEFF9E7FCEC0CA44D2544F03C5D4CDBA1C008','',12985,36,'',NULL), -(178,113,'09BDABA6CB17BE561B4104124A3D0266C858D194A8765198','drvsys_mon',0,0,'',NULL), -(179,178,'3AAE69E7088E4060EA32EF95E9B6D9532460F5B84EE4EC80','',684876,29,'',NULL), -(180,191,'990D4E1C2D63C8E447F034642686D57B727064E3EDE13B00','',448500,48,'',NULL), -(181,191,'E88F31BDC5513216CF3701CAF8BE954CCC7EAE0E7AC7D942','',594348,26,'',NULL), -(182,178,'81229C1E56FA72E01B52E8CBB8BB5F55ED48A11B72E7729B','',710554,23,'',NULL), -(183,191,'B4D0CDE7D53493A1549328F711013F07DBD3A9BE88DB2EF9','',685304,44,'',NULL), -(184,178,'D6CA6F94FF248F722F97037C1AE7C8DE0191D5F4D1E3A5B8','',156,8,'',NULL), -(185,178,'9C9DF1E868BB33D43676F21096C4F75759C0807096EEB886','',60648,56,'',NULL), -(186,178,'1C79B3B5A74A4F09A1FAE19BB15CDCF26B5F917861071F1C','',198,10,'',NULL), -(187,178,'AC1AD3E831A4C758858350A8A197A24FE82583F4B0E39A85','',3049888,31,'',NULL), -(188,178,'56E4980485E3129E94F370E7066E80B07141C4A669B9FC0F','',672746,23,'',NULL), -(189,178,'C21574305E0377A3D2B72D1E1546B9D62DCFA8B1A4405F16','',3638348,23,'',NULL), -(190,178,'AA74121AF835978BC1C1BB402A8B7388CB7C075C1227C253','',3049888,31,'',NULL), -(191,178,'D6457A86DFADF9825D6093090AED2A807FE7DA6ECF5922AF','',3065956,22,'',NULL), -(192,191,'1BAB7E6B5ACBEED8F54B667EDF13A385B9E146C0C50D9FB7','',448456,48,'',NULL), -(193,243,'','',7517484,7,'7518683B010000','Follow Unit Check'), -(194,178,'01000FEAC61ED76FE04ED1169C40289D96C71A1564E38FCB','',690106,23,'',NULL), -(195,191,'F095338ED87C658C916CC604A427F4ED95309C4A07B7898C','',34176,25,'',NULL), -(196,191,'800E120187DF74A231722FB887B3944AD16A703FB8CB9D39','',28920,23,'',NULL), -(197,191,'2CFCE981C322A54724E1418B6A6D1896B95D584630EEEA43','',38300,21,'',NULL), -(198,243,'','',5081862,8,'6840AAB600C60200',NULL), -(199,178,'481751066D6C97AD5EE90173E8ED107BB1C9FD873B0CE55A','',3037164,22,'',NULL), -(200,178,'7FC57D49535798CDA7E4DC5DCEA2E085AAB9A68BF7F9469D','',149,5,'',NULL), -(201,191,'33357C112DE0195F013FAAC4D57AB1BE77417934CE03A2B9','',3766400,37,'',NULL), -(202,191,'BF8AC678DC3CD354BADBFE46C9173D34CC84D13302190EBB','',21826,11,'',NULL), -(203,178,'4E2F9721D52A7552AE2728B9695F1523DD62DC0569237C3F','',2299108,33,'',NULL), -(204,191,'9F015E7D8A11F30AA1954D9FEA7142D0247E3C09FF2BFF72','',12194860,37,'',NULL), -(205,178,'1EB5AD39B94DB5CDC3294DF49FA589DFBE2C674D07E4B211','',710730,23,'',NULL), -(206,178,'E9D67F07E035A64B89C9E91614DC1930FEF61DC3A5C1BBA6','',690106,23,'',NULL), -(207,191,'36411C2FF2C3AC51B7F6A6B8DF61DBD4E5895C27438847BE','',59620,13,'',NULL), -(208,178,'A77F30CBB8057E0DB37782367C8462FA98D4DB21DE936ECD','',3049492,22,'',NULL), -(209,243,'','',7452688,10,'8B81CC07000025000000','WoWEmuHacker Injection'), -(210,178,'A8C806E1FB7CA3625E6BB6F5E4D9E2BF0EBDBE70BA7226F7','',3049872,31,'',NULL), -(211,191,'B3DD04807DEA2679045F4F197BDDAED5C7CCEEFE19622B43','',360508,13,'',NULL), -(212,178,'B075C8B4D8C5D83FE703677319491DC816EA5103901B44A8','',682394,23,'',NULL), -(213,191,'53DB506C0341B50BEA3897E2E3C0DD74C2CA2D8F5F34A2E4','',59620,13,'',NULL), -(214,191,'E112F38956124FE0F48BF569F5E81B40E293DC6E16B544D6','',17282,15,'',NULL), -(215,191,'0363EF2B1AAE09E6C2B1FA555E706F4EE094BE678DA27598','',3766400,37,'',NULL), -(216,191,'EA256F01B6340C99E27611B39C5ED28CF2FA202436F0972F','',49564,24,'',NULL), -(217,178,'A86C95C4E58495A10F5F1C9B5B62D3365132E8DC62863E8B','',198,12,'',NULL), -(218,191,'56DD8D99991F83AFA2E169315B395BD388B248340E9C64D3','',30044,16,'',NULL), -(219,191,'684B23E010C3D6B88CC12BD9F0B6B0CE00D692C71BFB84A8','',28940,17,'',NULL), -(220,178,'83AEEFCDF4C2E80B18DDF93D99120A89F916C19206D257AB','',668874,23,'',NULL), -(221,178,'D68651921F5CD387C7E860FB7C3B143409735748E3B2FB7F','',682394,23,'',NULL), -(222,113,'A4D501A9DB9D84BD8695A8BF61FC853BF434D2D4B352C7A0','HideEx',0,0,'',NULL), -(223,191,'5E77F12C032D4FEF559F9B837B85BDB9D95ADB10C9F56649','',448504,48,'',NULL), -(224,178,'F08406AEDFA8F19B6FB7C9ADDE0BFEE82CB0D2E275593150','',2303444,33,'',NULL), -(225,178,'AC0EC72522ADA5B2BFFAFAC92D6D0A0225E1D5C727CDFFA7','',672602,23,'',NULL), -(226,178,'4D1A7D1C88AB04438510E3255184E51EAE2036BB09DB553A','',700714,23,'',NULL), -(227,178,'68BBC36F75DC763B573DACAB1D6D8F70E667638AA894BEE9','',717898,23,'',NULL), -(228,178,'2AC3C23FBDE2C1EC46C9ECFF71BD7F603F17C9DFC1328D1C','',3638348,23,'',NULL), -(229,191,'C365E9FE00580EBB14EE863A5CE3C8139B1A59A610520AE7','',3766400,37,'',NULL), -(230,178,'DB2A0451B9753100085C9D149B61CE47A195D77C8B709143','',178504,96,'',NULL), -(231,178,'0871F69205FA62C74C2DDE200A3911FC3E41A4FB8BAB9817','',682378,23,'',NULL), -(232,191,'0017307F2FF889462B0FA06018D99EB1F847F189B6CC9B99','',21826,11,'',NULL), -(233,178,'0FEFCD6B0BF8C2816A9259AB5FD7B89231AEB8D92DE53D26','',3045356,22,'',NULL), -(234,178,'87EAD79656133B3183C2E452886D8F00C5EC6C9D741673A2','',3037164,22,'',NULL), -(235,178,'C2B6C5E19FA98D121B2CDE51789BD2883A324015E7D131E0','',710554,23,'',NULL), -(236,178,'B6F3A7D557A3E3BC4833C3D9B6B0B0609255591CC8AB3B65','',3022016,31,'',NULL), -(237,243,'','',5283280,12,'558BECB8084E0000E8731DF0','AddChatMessage'), -(238,191,'AEA87B23CD9463E9693B6C053C1D9030F8E229DA308DBF29','',90202,13,'',NULL), -(239,178,'8C16C7E8EEAD49AE67E4E91E229FFBCE2F6590A48348914E','',3049888,31,'',NULL), -(240,178,'7B2DCA97CD348E45490C288EADE9303CE270CF57F28EB1E4','',690106,23,'',NULL), -(241,191,'BC10B10BE398F2397FA6962C4E59C8CF11FDD7158EC222A5','',29916,16,'',NULL), -(242,178,'8E53EC1B8ABE90C9A5C087671DE0A3007BEA4488EE5415D0','',3037164,22,'',NULL), -(243,191,'65B5CE07A794164101F7E379D21A7A544EF1EC2A3A39A2D8','',27270,13,'',NULL), -(244,191,'C6C8597824F249180A53196699421ADF7857A5C4E4F80D6F','',13033,36,'',NULL), -(245,178,'FE677759E719178BC5CB49DA252D9B635F76030FC4C9876C','',673194,23,'',NULL), -(246,243,'','',5265823,5,'72118B5518','Language Patch'), -(247,178,'BA2D161EF412084B0229A08E64D5A445C4E9F9F2645535E5','',706314,23,'',NULL), -(248,191,'0174B647A535F206711D3EEEF08D3F421BCABD7016A2F103','',17282,15,'',NULL), -(249,178,'5F5F754FD6E7BAC9650B715387646CF992813730A2BA37DA','',2303444,33,'',NULL), -(250,178,'D2CC7F98209E9A9BBA483BD1E9A916E40EB971EE2129AFF8','',3990720,23,'',NULL), -(251,178,'E8C741CC79005898FFD0026821F61A2E4E67C695C6E1CE1C','',198,10,'',NULL), -(252,191,'23B364A9012EF40A39EC4D04A91F9B60FC7EF7D85E3F240A','',18680,35,'',NULL), -(253,191,'C9363F808D37F13FC09EBB7F700AD09EEB27DA046E41FD52','',36907,24,'',NULL), -(254,191,'2D92FC5B8603E18F50D9CAA0922F5C7BB89E42A4656ED2D5','',3766400,37,'',NULL), -(255,178,'EDEDBC5B1A3D92D2A91192118898FDBF840C967C82968D70','',3045912,31,'',NULL), -(256,113,'BFEF06E80472106B57B15D711F94A25243F6ABA7FE354C95','ndis_x86',0,0,'',NULL), -(257,178,'FB20B0EB9ACF571FE37C6B69CBE86F7906F96B996D7E5EFA','',2303444,33,'',NULL), -(258,191,'917AC1C48C1FF354FD594A3705C70A2C356FE981275E7FB5','',22792,25,'',NULL), -(259,178,'48CD29D8B39DC07B0FD071FD8C643E07A8FC2C9AFC2A3083','',3045356,22,'',NULL), -(260,243,'','',11154396,8,'D893FEC0488C11C1','Jump Momentum'), -(261,191,'FB13A8360C8E23B83ED7309625A7EFBAEE7DCF737068C5A6','',174688,37,'',NULL), -(262,191,'3C8D85F85ED5DD0354561F84EACA575123DE05EE941C28D2','',56063,25,'',NULL), -(263,191,'FBC20EEA52B5882209BC016EC14818376CA7BAF28780BCED','',22792,25,'',NULL), -(264,191,'210D85A84F7BE48F3EB427E0CBCCD9C146320ABAAB5E28D8','',41096,24,'',NULL), -(265,178,'953107F9F718795B6DF9E5E5BEE0EA949800CAD0EB71F891','',3037164,22,'',NULL), -(266,113,'FBBA36D0FC5434D12EE1509E148FF908D51F18719CCBEABC','IPSect',0,0,'',NULL), -(267,178,'82CB32BA2A05B228F2F8D0313C185EB6FDC50A94340F40C8','',209352,75,'',NULL), -(268,191,'079172B91B1768A2650A87BAB06AF700BB4C9A0B5E5B983B','',17522,15,'',NULL), -(269,191,'881751DF112F817E799953E00E94543DA4610968437DB7C6','',12194860,37,'',NULL), -(270,191,'9A47B274EAAC888FA2007B4EC0623580365458E3621CC416','',28956,17,'',NULL), -(271,191,'77344CE014111FAAA66DEF35B670B2E76AE878B054F85285','',61874,42,'',NULL), -(272,191,'0A74CBD8DFF245DA5E8691C1174F037D7ABE823E265226AB','',685656,44,'',NULL), -(273,178,'0E13ADDD413B679E2984060D929440064FAC308FC2B90742','',3049872,31,'',NULL), -(274,178,'D0D8CE5001596C6F4A766FE94726FE7E337F42469CB96CA1','',3065956,22,'',NULL), -(275,191,'313C58F8401B47F716B220B88411CAD0E85966D95B301591','',13033,36,'',NULL), -(276,178,'ACBDC68A4D748C48ED1180DD3DA52632EA6FC275BFC35D5B','',0,9,'',NULL), -(277,191,'BACA83A742B9E09CD07787BC6B50389707EA94C41886BAD0','',448504,48,'',NULL), -(278,178,'549B42D266E7F17B7F30B72E301A9CB3C5E3865DE9B7E90B','',60648,56,'',NULL), -(279,178,'86DB854557D75BEEE7DA820FCA15669B08C760E8B165B06F','',3037164,22,'',NULL), -(280,178,'02D5FBD9E30D43ACED0EFD00CF16DAA69EDD262C292136AB','',178504,96,'',NULL), -(281,191,'B9D920131EFC38767012340CF0FFBFE154DBA28E6EF3B859','',61874,42,'',NULL), -(282,191,'96E6CAE70AF690F5D552E0948C29CA9AA527DEBF9731B16B','',20512,16,'',NULL), -(283,191,'375B22B4990997348A8AEDD53319897BE196398B4F1DBAC3','',30012,16,'',NULL), -(284,178,'932F4622AE9F1B3990900F1F88375FA1DD7C238F7C6133C6','',684876,29,'',NULL), -(285,178,'43583C7BCCD9DF14C64CC84710BEE44DD30E199F579890AE','',3049872,31,'',NULL), -(286,191,'97CF98F0BCABA04BC2BAD40FBD4EBFB3C1FD8A7139D5C9B9','',433168,48,'',NULL), -(287,178,'97A0E0F8F8ACE7F1E6492DAFADE8F45B366446E79C1B0419','',3049452,22,'',NULL), -(288,243,'','',5284488,9,'7507C7451400000000','Language Patch'), -(289,191,'C3546D16052E0DC1838E7A6E18936B88CC8A40C2AEC0BE3B','',21826,11,'',NULL), -(290,178,'4179D6BD8C2F11AD5D5C103A7877504074009AB53AE4D8A6','',3045356,22,'',NULL), -(291,191,'2C360CEAB996C8D6E5DE3FFAC30E412DED48E7814D1CE110','',20512,16,'',NULL), -(292,191,'6F1486BE58078BD453F1B249947BB99CB8E17E9A355CE024','',41228,24,'',NULL), -(293,178,'924F4631DC3167BCFAB02F92DDB49A871DA0C55122EF9EB8','',0,9,'',NULL), -(294,178,'411029C5B28D942ED3C7BC1F4299162D874838A661410894','',700714,23,'',NULL), -(295,191,'B9093BAED730E86AF004119B3B7258938C56902915C2E8BA','',501956,48,'',NULL), -(296,178,'63BD2D7FF6C5442795361031E5768C396A37AE38AF98DB11','',668874,23,'',NULL), -(297,191,'754A2FE56037B971E128FFAA669032C511BDA3A62524CE03','',28956,12,'',NULL), -(298,178,'9AEFDCDB62EBC2DABD6CEBF8C411C1145274FCA7CED890CB','',3037164,22,'',NULL), -(299,178,'3AC57BAC3B782AE5ADBB899CCC060D4E8F66E5217F7DF654','',676970,23,'',NULL), -(300,191,'2F0D9702A58D6D5A8599529A0A816AA101AFE581D98416B2','',56063,25,'',NULL), -(301,178,'77804219E627B4D38C9F95194301A895180B598AEFA9963F','',3022016,31,'',NULL), -(302,178,'0D1B99EDC8E458705A88E72F7FDEEE9233DB21290A0098E6','',149,5,'',NULL), -(303,191,'BB795B4069F985BF44C7418DE264C3B0E9BA6D61A116FF81','',90202,13,'',NULL), -(304,191,'5A6EEBA1E6B9EE71BD4A5F63014E9928302C36FC806DC796','',3766400,37,'',NULL), -(305,191,'BA5777AF7FFF3895935669878D662B585912A759A2DFCE68','',24812,14,'',NULL), -(306,178,'5E690DB1AD8910886334158C6D4452FA2CE896634BCDDF40','',580768,52,'',NULL), -(307,191,'42A8F651F55F697E783ADA1959A2833276F970F1EE0410C7','',41280,16,'',NULL), -(308,243,'','',5296496,12,'558BEC81ECE80D00006A0AE8','SendChatMessage'), -(309,191,'445A6894B8C1838462D7D0D29FBE6BF815B5E6C344971349','',31924,23,'',NULL), -(310,178,'C010786A38F396503B7411FBADA0C1A68795F54A7AAE228E','',679578,23,'',NULL), -(311,113,'E3185EE4428291F9D2E4080C2EB1B19ADB005AD26EF0A993','IPSect',0,0,'',NULL), -(312,243,'','',7739760,11,'01BE80000000E805B6FFFF','Jump related?'), -(313,191,'1995FA3235ADA4B25232DC6403E7463A8D1864528BF9FDD4','',12905,36,'',NULL), -(314,243,'','',5124558,5,'8BF08D4608','GetCharacterInfo'), -(315,191,'30A26827798B7F1646003A9E846E8A9A8FF10A9DF926825A','',49564,24,'',NULL), -(316,178,'A567BBE4CA9D8E976083024E8D68903CF15CEA88C47C9961','',2299060,33,'',NULL), -(317,191,'BEA7165D7DD8E24E31B1C3D791A47A28731E1BACD1189A17','',24812,14,'',NULL), -(318,191,'0971A7CEB84D392670C7B8CBB61776762C25259D8E772CA5','',13538,11,'',NULL), -(319,178,'13200A59A28561A413FADAADFFFE4521A209CB691EA199A5','',690106,23,'',NULL), -(320,243,'','',5090917,8,'E886EE1D0083C40C',NULL), -(321,191,'56CABE081991356465BDE1DA3B8DED099DF9B6E746D1B531','',25724,20,'',NULL), -(322,191,'F98469C704F8B8ABC1A251EF8FC1E4CB5CEF1E007BAB5EA5','',57602,42,'',NULL), -(323,178,'6A64BF5AC652747B47E0B8E6593B7EEAC1EF38E0A84F4F5D','',3049452,22,'',NULL), -(324,191,'978BCD17BC9C81B05A2F0A50EC2CC206EC5F6AB1FE40D38D','',28956,12,'',NULL), -(325,178,'A28EDC898CEB14FB52591754DEF981C7168DD2421D0742FA','',3037164,22,'',NULL), -(326,191,'35E88DF07F0D48A0B7ABD53F4865DB762E6935529DC826DF','',360508,13,'',NULL), -(327,178,'BF1FB7E4C3CDD5D5A93AA1B24FC822AA5537DBB59F696818','',3037164,22,'',NULL), -(328,178,'343F1AFF6DA7A967D2DB958C608A6E2A19F83E862F8E3954','',149,5,'',NULL), -(329,243,'','',10694516,8,'2F549A416F12033B','Wall Climb'), -(330,178,'0B008034F97BD411A9F900D87578258AA1B79873850BC12B','',3049888,31,'',NULL), -(331,178,'C5A35B72E6BC604BAC9AA218908B3747D6850769CEA79C0F','',2299092,33,'',NULL), -(332,191,'FDDB2AA7F8884C8E3A7ED646B3E9E4AF5A8C0704130C39A7','',29852,20,'',NULL), -(333,178,'F57343CEA7133DE6469B1CFD1A749845D553B8D806B2BAA4','',3037164,22,'',NULL), -(334,178,'565A63583AC736E3CAFB95EE5AF9A64D3A7D3C3A8B234121','',3045912,31,'',NULL), -(335,191,'E26CF0E2ED92F608A80733CE703D7EA2C3DB83FE46182519','',3766400,37,'',NULL), -(336,191,'2F44EE3A34EFF98303B3724005EF3A8AC89CB25F9CA1B8BC','',12985,36,'',NULL), -(337,191,'C32F7CDB33BEF7B3093262F89263884DBB44E57D74D646B7','',12985,36,'',NULL), -(338,113,'2357AD2012CEBA72283F93460AC5FF55E4E5719A5AB9F5B9','drvsys_mon',0,0,'',NULL), -(339,178,'1C1595A1A64016D8725619CBC2FC7ABD41835320958A97FD','',676970,23,'',NULL), -(340,191,'DB5765A8B8D5F636D619E44669E9D3EF968BD8011C5D6999','',36907,24,'',NULL), -(341,191,'70B78734AC394D83D45427E0B7C88351E9BB108ED59C7E71','',37136,40,'',NULL), -(342,191,'85F2A5072D2D7557155CBF5157CAA460B19470DEE8AF96BB','',22792,25,'',NULL), -(343,243,'','',4609669,5,'8986100F00','Login Password Pointer'), -(344,191,'6C33FD80565B2860A76C87BB772E794E2FF444D813079A2F','',685656,44,'',NULL), -(345,178,'F09BEAD15FDEBD09240316D9E2E736028B54972B13F14E5E','',673194,23,'',NULL), -(346,191,'302E114D921D40EE54585BD9D63B9BDDFF7A2BD4D678DA97','',30044,16,'',NULL), -(347,178,'24807D7810C58A4B9A070A21B8AE50A0385DD4B4C6BD8B6F','',3049872,31,'',NULL), -(348,178,'B6BDECA858773B6F995AC6496923F5D0CBFDB1F76DB29C58','',198,12,'',NULL), -(349,243,'','',5296823,7,'75166824020000','Language patch (speak all)'), -(350,191,'C125EB3FD1B222ACE1B518959D96C5AC83EEAF109E9C6D20','',12194860,37,'',NULL), -(351,178,'8AFF28C3E6367B10340FB963B093AB52E61B267C541D5659','',2299108,33,'',NULL), -(352,191,'734D3EDDA69D9DD307032245FA0806456E2F02E90C2291E2','',36907,24,'',NULL), -(353,191,'9CB5A848D90B7FA4F58801ABD8A68EF8FDF8C602063C2CD6','',13033,36,'',NULL), -(354,178,'C8BCF785F8B7118D0270016E620E2C3DF6802E034471E5E4','',3033068,22,'',NULL), -(355,178,'8FB282098C8BB4EC10C8398E44C630677C6E2785227E31D3','',0,9,'',NULL), -(356,191,'2381BB2B613C58C364E962738335EBC2F3EFF81009DE49E4','',37180,24,'',NULL), -(357,191,'AA2A24A7C90D149C7817640B0D2D46C8A4B4D52146837605','',501956,48,'',NULL), -(358,191,'6815D749CCA8C1738A5F3236A737F0B70AE037E82D46033A','',448500,48,'',NULL), -(359,178,'F9F131F27BCC37FEF638FB8EDDAC29400652020C290D4F75','',676970,23,'',NULL), -(360,191,'319CBACC4CD2E1F54F8C8FC41EF44A3A9C492A652B00C622','',18700,32,'',NULL), -(361,178,'A4A7DB31BF51180F1ACFEA6C0E59AC84B43D022CB4BB817D','',2299116,33,'',NULL), -(362,191,'0DF639ED45B0C578DD616DD191014727A3C22C346E9FF73C','',50040,26,'',NULL), -(363,191,'72944B7FED63C1D2FC9D2CF6A07B5788731BE2B02215CEE4','',447736,48,'',NULL), -(364,191,'9148E18CF9213B25197C247F08CCA4C0DC60FEA73E3A247C','',13250,15,'',NULL), -(365,191,'ADA39A6A805BDF59271BBCE21734E8F28182164563CA15AA','',29916,16,'',NULL), -(366,191,'D5C852D85FA4393D027615506B7DEE07A1074AA4633019D8','',41023,24,'',NULL), -(367,191,'D06EE8DDC2115E5895E96D26A2A2F11FC566297D1D21BD26','',56063,25,'',NULL), -(368,191,'3AFE3B981D50B26FCAAC9DBE5A4BCB24F5BC3E9348AAA04B','',25724,20,'',NULL), -(369,191,'058E826BD75C26BACE712DF9D67B0A751896515802E9DDAE','',501956,48,'',NULL), -(370,178,'6E4C9CA0F7140E32D9284AF2E0EEB76419696771D4DDE887','',3634252,23,'',NULL), -(371,178,'29E43B1309ACB344AC777636BE838F0BFE6A04570B7FB09C','',700714,23,'',NULL), -(372,191,'5B7AC53977D57C5756A2F61582DD386EC93F5FE180FAB5DC','',27270,13,'',NULL), -(373,191,'22BF8D63A306178F368016E4657CCFCA5B2B21EBC90B8DB2','',50040,26,'',NULL), -(374,178,'1E8729EE000CD5BD8BABC49C368E0FF5AC08BC2B30921BC4','',709322,22,'',NULL), -(375,178,'8A1304B9AB2579F392F92D8A592308728EF76B26AE258A41','',4011280,23,'',NULL), -(376,178,'8A90AA547378BD5930D24FC415AEC08EF52E29B22073335F','',710730,23,'',NULL), -(377,113,'4BBF42A918109CC23F231B8E657076A213601AD681C032D1','HideEx',0,0,'',NULL), -(378,191,'06D9E92AE3953D13A0AC5FA31EC24B16C6A2260E2D32BF8E','',41096,24,'',NULL), -(379,178,'D4D3A9950FA07FAEDAD0658F9128007ADE282C043210A201','',683146,23,'',NULL), -(380,191,'94530FBCCC455105E8BB67E5B19BE0A4534A6F39A1201B52','',13291422,37,'',NULL), -(381,243,'','',4198410,6,'CCCCCCCCCCCC',NULL), -(382,178,'2313AF1E20F446936533F9440B220BEA966D9EB3A0502DCF','',178504,96,'',NULL), -(383,191,'F982BFDF01EB3BC6FFB70E897BFE21376232B2EEEFB25E58','',20512,16,'',NULL), -(384,178,'26308A71C6F483CC7795A01A2F2CF7E7EE97787C12CACC52','',2299108,33,'',NULL), -(385,113,'368334F9A3A549DFD3ABC9793E4EB83E837AA43F010354D1','ndis_x86',0,0,'',NULL), -(386,113,'5DA702DF95570780875ADB4C64259E887CE0A867D9B67711','Afd32uu',0,0,'',NULL), -(387,191,'B51E8DA25AAE556552404F5172642D0808A89E2AFE870B23','',694376,44,'',NULL), -(388,191,'4748EAC0350B1B56D8549157AAAAF4FF35438078A7E37AB5','',34176,25,'',NULL), -(389,191,'FBE20B03C75572D992273F192CE72CE78A65E6764BF8E6F6','',36907,24,'',NULL), -(390,191,'D8C1B9DEF3CA9CA59C5B827F055729B636FD55BA6242F9F0','',694376,44,'',NULL), -(391,191,'448475EBCA685E5A4ECC5F810740C9181825B49613CDDDA8','',477928,60,'',NULL), -(392,191,'2AF2DEE0CA5F307895E5773A083AEB862EA3D5210E037F06','',41080,24,'',NULL), -(393,178,'1708C050FF0C98DE59FE8F070273D80F9C1A612D336AB9FC','',3049452,22,'',NULL), -(394,178,'ED6BB184C9DD307229A023C1905E6EE73981D3E088D69FE6','',676970,23,'',NULL), -(395,191,'EB63A86D51668323A18AE2F8CE2BDD1ADAE57375B5F76C6B','',45223,24,'',NULL), -(396,178,'5837373EE8D4CCB5687045C04A4297450ACDE774FE973917','',673194,23,'',NULL), -(397,191,'65CCA5E079D38DCF32053D8DEE6C5ECF88E6AD8E1CF5379B','',31924,23,'',NULL), -(398,178,'FB895125A69DE5DB112B4731F6216668EB09C4F57943D85A','',706314,23,'',NULL), -(399,191,'A388E8CE523DB7C3C501AC5DB2C8AAE58FD1831E75665C48','',401992,14,'',NULL), -(400,178,'77C74B5E4CBCA9150FB64261E497AC4E7642A316C89B291A','',3045356,22,'',NULL), -(401,178,'8A2C4F7F3367A4648744D8964BB9A6833182ECABFE015B00','',3022016,31,'',NULL), -(402,243,'','',4609675,5,'5E5DC20800','Loggin Result'), -(403,191,'E8A24A78E6A716734CC666B48263B424804A42155C0BDB51','',18700,32,'',NULL), -(404,191,'3C881D2F0634D9223A36DF5266A7CF36B503DCF424441FA5','',28928,17,'',NULL), -(405,191,'7B3D92577810CAB5DA0134FDDA91CE6F36003C5373526774','',41023,24,'',NULL), -(406,178,'7F794E0811DA99DABA76CD9925B3E78045425E32880F05D3','',672746,23,'',NULL), -(407,178,'08235E08E4F83DDEA588D9FE32BD084FB26BDA6DEBB1E416','',668874,23,'',NULL), -(408,191,'5EF7C22867612F48FE5B41E219A1CA389AE8D32D8F0FC46B','',21660,15,'',NULL), -(409,178,'C7C78789911D6B30FA6E67198EF03B73CEE37576AEBFF5EA','',3045356,22,'',NULL), -(410,178,'62BF4E6440FE3F28138094B46FB469CDEB35008DEB652B8B','',3045776,31,'',NULL), -(411,191,'E24027620A1723C203E8084AD6269A852CD50D6F79D50530','',36544,55,'',NULL), -(412,113,'49CA50FCF2699AE5F4A867156A5D8053C4239B36DACE170C','HideEx',0,0,'',NULL), -(413,191,'073F4A76F248FE7C38F799437D475B9A2E9E81FA08B0C6BB','',17666,11,'',NULL), -(414,178,'6ECA7966F2845B9B61C6D9356E4FE4C913FE917808C8AFFE','',684876,29,'',NULL), -(415,178,'30BA488B3964465B142E75F6D1E1BA42DC9F489C3AC70BDA','',2299092,33,'',NULL), -(416,178,'55492051D368975D444428D6218A7D731555ABF7C3391E7D','',3049888,31,'',NULL), -(417,191,'94E0CEC4F7BDE7844C4D4ACF62E5C96ECF1D11FC2169CF8E','',433168,48,'',NULL), -(418,191,'5003A599A1162170A30F1906C0AD5B16DC7041E72D28A4B4','',28956,17,'',NULL), -(419,178,'686F700B2223502053CAFDF9977D8774E905E76B8C960E7C','',3049492,22,'',NULL), -(420,191,'F5A776E794B34ABBF93CA93E9230B7224CA088AB741DCB57','',13291422,37,'',NULL), -(421,191,'4A67D56DDA6B0E7D9117CFDB17EC6572E68B9300609FFE3C','',28956,17,'',NULL), -(422,178,'1B695DF78AA0708221E0EC2F5A69AB7078ED8143B2EAD174','',668874,23,'',NULL), -(423,191,'7C8CD40E29AE999923CD8EAFC233E619C73885A0258A6E3D','',21826,11,'',NULL), -(424,191,'73407824E9064DF5F1161A204A272A9CD69026EB4DF1004A','',29916,16,'',NULL), -(425,191,'B21609972E46C9BC8C6A77A18161A77D0C1D4001DC892DF1','',41080,24,'',NULL), -(426,191,'BB66A6AC45D02568067987834ECD8BF0A2BD0DAD06D12753','',17762,11,'',NULL), -(427,191,'2550EB7C358B7FB86FAF0EACDDC3111118769F448D93BF7A','',49347,24,'',NULL), -(428,178,'B6E4EF9350CA859576DB74D02C115D5A19C79AA58B0F6681','',684876,29,'',NULL), -(429,191,'451D2C8FF751743B52109FF5D95ED633DDBD8BCDB80EB7A9','',17906,11,'',NULL), -(430,191,'4A0161A4E5D50F11F58E1B23B281ABDA106625E3DC5A179C','',685304,44,'',NULL), -(431,178,'E4F21910D4B5D3E7B5461ED384889F6D0969645AE83F7601','',3037164,22,'',NULL), -(432,113,'B9756E3E1093B54511AC5A7B85711E53CEBEA373EF4866EE','Afde32uu',0,0,'',NULL), -(433,178,'A5AD6C8506004101E42165CD95051A7B5F13FBADD027461B','',710730,23,'',NULL), -(434,178,'B8AE30A02C59219D144EE95228C6CC9F99916F6FE423C940','',700714,23,'',NULL), -(435,178,'DAFD84BA8F977F5CFEEC9310C0EEF8F949F8EB6B827EBE71','',3990720,23,'',NULL), -(436,191,'B42986974893A82D73CC497B3252E9B844A11A99ACF46BEA','',41188,24,'',NULL), -(437,243,'','',11287980,8,'04000000903C9F00','Parental Controls related'), -(438,191,'0DC0953AE42E913121092DF17BC2BEE8BE133D1C53C8BFFD','',17762,11,'',NULL), -(439,178,'72C81E9BA425C54DE57BF4B7745D9C8D6B44D56E8FE933BA','',3049888,31,'',NULL), -(440,191,'100426CD22E80090502AA7A087B094B49ACFF4E7A09773ED','',30044,16,'',NULL), -(441,178,'46C797D1E60CC458E6C9D874650B996D10FC52641C2E7AA7','',676970,23,'',NULL), -(442,178,'DEA2C8A5775AA8CA86B8241BD418979D10DF4587E8E95C87','',250,11,'',NULL), -(443,113,'8807783067F9FF2697A61DEE925760682EB894C6F0A798AE','Afd32uu',0,0,'',NULL), -(444,178,'F63823A1F60619FDE6B4D6F3915EFB03EC03DEBEC82AFB9E','',673210,23,'',NULL), -(445,191,'E4DFD66163F2A65ECDD2EE9CA8062D707CC51882336F6483','',130380,14,'',NULL), -(446,178,'88182C96807A6025E628C90CE436C9EC54EC5FEC858A12B2','',690106,23,'',NULL), -(447,178,'EC322863C90B861E66A0008554BB8702EA92E1406F6F1711','',3070052,22,'',NULL), -(448,178,'9C851C7C05E54E5514E7BE038ABC5C669A3F5747EC573333','',3022016,31,'',NULL), -(449,178,'46D70E5C13F6D16BDD01A7481D9AFA51B73202070CA5D712','',673210,23,'',NULL), -(450,178,'CBEBB5F6F4EFB1324D17AB6CB48C573B639A37EAFD6299B4','',683146,23,'',NULL), -(451,191,'684575AAC0D8BC30D5325D56D3D522380E85ABFF380FA80F','',17938,11,'',NULL), -(452,178,'952BC8983C2CAEB6239BB2774F176A7F87A9F2DC10261205','',3045356,22,'',NULL), -(453,191,'4EAE0459E341062DB99658136D494BD79511B883F00BCE6A','',57602,42,'',NULL), -(454,178,'67E6E0A4006561DC5A67026886D1FF37AD14C5AA1AEA3CAD','',149,5,'',NULL), -(455,191,'222FE6B0A70CE2CEE633597E018706B3F78C338D96F6D9DC','',38300,21,'',NULL), -(456,113,'79747D68A5D6CD203671EF43029F17591E42BBCDB60B8B93','IPSect',0,0,'',NULL), -(457,178,'77ECC7613D44E56210F7CCDD6046226B41C8F087E901C94D','',682394,23,'',NULL), -(458,191,'77A59932BC8D497D992A213256ABD52C4D5F4FFB8A06002E','',49564,24,'',NULL), -(459,113,'2D14DD3BC859535580D8D9DC3BE7D59865A4E3FD112598A5','drvsys_mon',0,0,'',NULL), -(460,178,'9B487CD5032D00424A24FF3185AC4C17246729ECCE431951','',3049872,31,'',NULL), -(461,191,'978D8D1F3E1EF11CEBC4B65B13F1C5CE6E9E220E71B255B9','',13033,36,'',NULL), -(462,191,'1F5AD2397EB3CA814C5D156C6777C040F5D73085F3751C35','',433168,48,'',NULL), -(463,178,'912807952F9397C8F2B718C9164424D720E4EFC681DA3099','',3045356,22,'',NULL), -(464,191,'095F1A232F56B3DDA3338B5DE2CA310E5CF0EC0B6F72E87F','',17890,11,'',NULL), -(465,178,'2A5E27A3EE36254F61795E168A98C055772F88CEA5CCD6F1','',3033068,22,'',NULL), -(466,178,'4319BA4F2139568E87BAAC5F7C95121DD98D710B1C901E2B','',718842,23,'',NULL), -(467,191,'74E55BA8CDEFB5BD54BF1C0B0D326721D756440BA33C3ECE','',27270,13,'',NULL), -(468,191,'ED9FED6EE63B6C5E35C9E4615AC444603F6BF1FBC669D8B5','',13033,36,'',NULL), -(469,191,'DF967A96C67C8D6CB1955D1CA06556F37EEFC88D26F1D684','',90202,13,'',NULL), -(470,191,'2BDB1F4509561B2F846AAE7A5354008215C1EF4BDD0EA1D1','',49347,24,'',NULL), -(471,178,'0F3B3F0934C1B1E32DC9F83F67308BF9CFCCEB0EFE10B2FA','',672602,23,'',NULL), -(472,178,'E89980FFE6987D22DF5379283F53DA8DC3B5CD4862BA22C4','',335122,23,'',NULL), -(473,191,'156B3F2929664A16C3DA2D47CE3050B3A1BC32F9C30E4776','',27270,13,'',NULL), -(474,191,'65B03F581DEAA68B6A07C679C6B620A2623FD83EB4C4978B','',28940,17,'',NULL), -(475,178,'044C63CB9F480E28E02D68426C1F3D69BD146B39A7F081B5','',0,9,'',NULL), -(476,178,'B3BC7201BF77B362B943C8C13F9E70A751906F304F9AE133','',673210,23,'',NULL), -(477,191,'4783BF04A6BD423D63CD955407780BE0E15A70BC2643F853','',28928,17,'',NULL), -(478,178,'A71B471FFB4C58A2C99FC6818DD0269C4AE4C5686D5FDA87','',690106,23,'',NULL), -(479,191,'3EA0347F1F7D9BC9CAE387816DFBE4F492F53533400315B4','',17762,11,'',NULL), -(480,178,'AA5ADEE929B0B2FB655080B35D19607695F611672E6AD364','',3045616,31,'',NULL), -(481,191,'2DAAB5C524CA576967A7B0B713C1C34DA8EBF3990A86730C','',28704,16,'',NULL), -(482,191,'D0042CAE82A7121F7783A1382F542074B34ABFDF50A1B13A','',22792,25,'',NULL), -(483,191,'4D30286AD524AB2EB05C1A361A81036F787B1C0ACA36DD74','',30012,16,'',NULL), -(484,191,'03F9E0F9328E7C7025C0D5C59585700F19E29E8C8F9BF5B4','',49564,24,'',NULL), -(485,191,'430C4F44FD7CDF1A51F7A8FA5852ECCDA6CFA92C2A6ACB3A','',28920,23,'',NULL), -(486,178,'A2886E2080C54F25867AEDACDADD8F5175545F44512A3B58','',672746,23,'',NULL), -(487,178,'8438939BFCD0C550664ADE2DD75DD15FA23DC435EB5FC011','',3638348,23,'',NULL), -(488,191,'66480AAA84C5C00B64EEABE96DD21EB3773228B144E25D0E','',20512,16,'',NULL), -(489,191,'76C1B0FAC29E4E41FC6DAC31A0592CB0087BCE0D052904FE','',61874,42,'',NULL), -(490,191,'DA219765DA22ABBDBE5486CF7DB01C283FBF9986732C9A91','',37180,24,'',NULL), -(491,178,'F58BFE40291DD85F45C47E0E255594382DE0180AAE1F1FC9','',149,5,'',NULL), -(492,178,'8D8A305C43A3DD47DE550F256BD5F4B1753EDCC079AF279E','',3070052,22,'',NULL), -(493,191,'69CA60928A9A85D79ED39596C018DF899BD14C6219EFE088','',41080,24,'',NULL), -(494,191,'8D9AA947B904C003D06ACDF4EA0C84104612B274696999C4','',17890,11,'',NULL), -(495,178,'289CBF469FC750449980BFC2CA6AD7E42A69E14595D140A3','',209352,75,'',NULL), -(496,178,'49961CDE71B612E5432EAB389E7AD193476E05BB2778B751','',700714,23,'',NULL), -(497,178,'43818F9575A04BF426F4BE167052859015CC63622F7D4F3A','',672746,23,'',NULL), -(498,191,'7828B55FDE24719EC377E29FAE55BA6324020D00CD42A99D','',360508,13,'',NULL), -(499,178,'5432916108AFDFA313B6D88C886D87B5722E43EEBCAFC627','',0,8,'',NULL), -(500,191,'106F24060B7A4FC87A7971A4B0EFC1021F7181A09598C336','',17906,11,'',NULL), -(501,191,'13AA99805639421566A2652F0A7104939EA52EF0F77CFB03','',24812,14,'',NULL), -(502,178,'D0938B578EC70162A30A25571CD5DC7E765780F6191EAE1B','',710730,23,'',NULL), -(503,178,'70FA2C3749960F1B0D881FDB186DB9992D6EFD30C6674104','',580768,52,'',NULL), -(504,191,'BCA2CC6F5740DEF5D01D314146879036A5B6965C01424B0C','',45223,24,'',NULL), -(505,178,'47DD279576A64BCB3A4AF23D55895600C73BB5C214B70AEF','',3049452,22,'',NULL), -(506,178,'09C9B53C215456866BF764553A7B7E4F1F20F33A8D2CB613','',3638348,23,'',NULL), -(507,178,'3EC2D3876D82F424718D3B8E0B87562244C3F5A11A29F0E8','',682394,23,'',NULL), -(508,191,'7B4E9BBDC89694CCAE5BA6996D4240EB2E0C9C7F03CC5D40','',59620,13,'',NULL), -(509,178,'E2333772B05ABC620076EB66CFBB4AFE2313CCB6D719399F','',3065956,22,'',NULL), -(510,178,'2EB4C04C0946264F5BC8EFBAA832CA97381A8A6523BAB093','',178504,96,'',NULL), -(511,178,'0E3DE8374276C08D5DD241ABA2AC0AC1D2319F5CD22AAB52','',2303444,33,'',NULL), -(512,178,'FDB8DF478DADD2E36619D63D04D106EDB86EBF8FB9EC8CB4','',3000288,31,'',NULL), -(513,191,'BA76761FA5F569497047C3484FBC6FDDD8AFA71B96FE93C8','',24812,14,'',NULL), -(514,191,'2496E15413F7008A01FA53AC109C01E45B80BF2C3BC2F205','',56063,25,'',NULL), -(515,191,'CACB6383E8613E41489D93D7FE7235BE61214F9AE0825F44','',13291422,37,'',NULL), -(516,178,'931C403D2562AEE58EEB2586D73D51323A3A739860290AA6','',690106,23,'',NULL), -(517,191,'1A95AFB270B9C0D170E7280816891492C21E87D92E9EA6E5','',433168,48,'',NULL), -(518,191,'7483929857AE7A16C2D9EB0857EB1D5E9477479C2EEF0B5C','',37180,24,'',NULL), -(519,113,'379E1F6905F203E1026DB54A58AF588EF5726D9F50FCF369','Afde32uu',0,0,'',NULL), -(520,113,'08394625CCD77F36897EF283FAA0C019EE9F36775182584F','Afd32uu',0,0,'',NULL), -(521,191,'D9ADFC0283E75A86A3E1672BF50F5D1AD8E8466AE7086437','',27270,13,'',NULL), -(522,178,'D37F6219417C0E5196D3A4473D57ED767E6D9B49BB2B9555','',0,9,'',NULL), -(523,191,'93AAFBD4B8B50D6AE72F3BA7002D76791942D0EC0E61253A','',41127,24,'',NULL), -(524,191,'F9B132A5E1FFF379EC7175C12A58683C85272CC96E03E161','',41023,24,'',NULL), -(525,178,'1867D3CEC9379D1E6B8A1B9B667BDB1B6084B02ED9A60864','',3037164,22,'',NULL), -(526,178,'86548378A25632100F7E6E872ECF4D591B7542D977B623AE','',3049452,22,'',NULL), -(527,191,'9E00F6F9AF1D63FA2628E60B7BF2B1D63EFDD42D69929A73','',41080,24,'',NULL), -(528,178,'7DDD4CF1352822A1F9D19775498EE865FABB26C69F8FDEFE','',209352,75,'',NULL), -(529,191,'3D793384AD147BDDE98743EBE1E943263EFD6CAD542E2757','',17522,15,'',NULL), -(530,191,'9014AFDE93FDAC6C20971BEE76898FBB300A744CCBC24DA1','',28956,12,'',NULL), -(531,178,'D1212D7155D2C3114DA596070139C0B3610597CA0CE1CB17','',149,5,'',NULL), -(532,178,'BE18517661568A9D7F3CC9548592867F3A987A705866F60F','',3049888,31,'',NULL), -(533,191,'5D833D8DF05A7AF50DF945F5AF6880D325AC52B3ABC815AF','',41188,24,'',NULL), -(534,178,'1AA3B0D9AD368562F181E4E5D498652B3859210C126824D8','',672602,23,'',NULL), -(535,191,'331E027A700CAFDBEAC9E80B68B8304D0895D52947447448','',501956,48,'',NULL), -(536,191,'8E704337CE9F823A8A93947130ED1EE14A99F2EDB5458B94','',12194860,37,'',NULL), -(537,178,'BB1C818F79DB2F1FF71B7CB181021EB4F425311D09DAAE81','',0,9,'',NULL), -(538,178,'F1AD484D3F189A08EBF420C235D16ECAF1B485092FB063D6','',3045776,31,'',NULL), -(539,191,'1CF7028BE4D68B7AC6BB8061BECBFF402860541D04C90C0C','',17906,11,'',NULL), -(540,191,'2550D8249054E57086D4F4CF80396C686A71673C070711DA','',17890,11,'',NULL), -(541,191,'E864BD00AEB4F3D18CFFA7AADEAC7926A9A1E3EA7588F17A','',29884,20,'',NULL), -(542,191,'9E70338B4C8C845F8514925463DB624FC4423F9C467F5E62','',685304,44,'',NULL), -(543,178,'FC5EF49EDEE7A5268395298071BBA270822547A7416AEFB1','',3634252,23,'',NULL), -(544,191,'8282F57B7C3CD9B449B6363D5C9E792C2044EA2C3F381F9F','',17282,15,'',NULL), -(545,191,'B793EEE20E44B2942C6522F79343C58738A1A8489A381FB0','',24812,14,'',NULL), -(546,191,'6178EE9E575927A3505835AC88DA31BE15F0622DA55B31EB','',28956,12,'',NULL), -(547,178,'7BFD2D88793D6AB1A2351A3E8873B1E20CF44BF6563A0930','',3049888,31,'',NULL), -(548,191,'4102F13984A4E146C134D3F607AE7CA1B3263A22B52308C6','',447736,48,'',NULL), -(549,178,'EA1C4CA2A64548757BC2ED1C5BB6D2B5094AAD5B5C331F7D','',683146,23,'',NULL), -(550,178,'BEB42A9DB2B656B2DFF3DD7D1B8D87033F1D99A019CD4BB5','',3045632,31,'',NULL), -(551,191,'4E209437251EBB0CF31CF8A7CCF2C873A4D759B9563D573E','',34176,25,'',NULL), -(552,191,'85EB9C8A36B32287F096CF73F7FAE8B57405321342E9B779','',17666,11,'',NULL), -(553,191,'2EDE42629DD4A72669FFC9BBFBE15F357BF241853DBF7B2E','',27270,13,'',NULL), -(554,191,'FF47A1D9514F4DD81BDA23FC9018F03D894F9096E26EF809','',18680,35,'',NULL), -(555,191,'65185BBCA1D9995EA4B796E908B9F78923FDAE2D0C2500BC','',594348,26,'',NULL), -(556,191,'BD55E51B55A8FAB82CBF45012D761B1BEEE9BC0DAD8A83CD','',28920,17,'',NULL), -(557,178,'AACC3E694ACD478B1F99714734B5A43BD7D7A2A3565ED9B2','',3049492,22,'',NULL), -(558,191,'F3C07663325C5358F58A547725FBDF8DEF591021CD94513D','',685304,44,'',NULL), -(559,191,'503B5AB938616DE7672103919957B421FA8B6C98F72375F6','',20512,16,'',NULL), -(560,191,'3B6EFA3FF9443BEF4CBD2E7CAE08DA1753C79E5EDFA8510F','',37136,40,'',NULL), -(561,191,'3E5D1B5BBAD191442388FBD5236F5406CB2CA68EDF986328','',17666,11,'',NULL), -(562,178,'D8AB51DCC7840369846821B2A6B229CBA2E42C0CA566792D','',0,9,'',NULL), -(563,178,'F8004FA24C4925FAA3ED4993B0D457C5E4C5371915BB93D0','',3037164,22,'',NULL), -(564,178,'EAF4A696D564F6BC800BF0F6D732E4E92B50133DE02EE8C4','',0,9,'',NULL), -(565,191,'30BDC2BC3E4A2055426FA0EC67DBDEB7705C58047EFFA4D6','',61874,42,'',NULL), -(566,191,'3C8BCED97B2F9E5A52587E725004E136DED2B53AB2DB9D4F','',20512,16,'',NULL), -(567,178,'0B586F15A8CFD6B7A96632FF2B48D0F71E9D06BFAC174002','',3049888,31,'',NULL), -(568,191,'B2B3043BF9CDF3DB535D52ABC45BE586E6B8097B58D82C45','',17890,11,'',NULL), -(569,191,'9ED22064CDACF86DAC8C365C325EE428A87B628D137E038E','',28920,17,'',NULL), -(570,178,'2254B046D6D8D1A47E5F9275474B5EEE7A96CD99E8D952E9','',682378,23,'',NULL), -(571,113,'0A268B6DB28320A1956B54C36C61C625B02A48A4768A0823','Afd32uu',0,0,'',NULL), -(572,191,'41B3450DB8D10C506A561C7B95354A7792286D837C08B437','',12194860,37,'',NULL), -(573,191,'5CEDF5982800D9C6D16F9D357AEA17BBBAABADC8F3A12EC6','',45223,24,'',NULL), -(574,178,'3399D1DE6156FDE8614333B6C4AB0F5B2354381AAB7AF818','',3049872,31,'',NULL), -(575,178,'31DA5322A7B1F1715CA35F0976C201122A76D46A719F0C28','',335122,23,'',NULL), -(576,178,'36172791F3ACC5EFD406A7AD6F5D218279B94D458BDD60C3','',700714,23,'',NULL), -(577,178,'C64DDA3E5D94BD0DEFEDDB867DD304177B554C5771CF4DEF','',682378,23,'',NULL), -(578,178,'701D57AFE1315795AFE1340C35E923FE69C36EFC670C0BA5','',0,9,'',NULL), -(579,191,'D55BBE3C196C2FE07829CC54717C0A2A27C13A38ED4CF582','',30012,16,'',NULL), -(580,178,'DAD3C22D23FAB30C9AA6796E19EAB23CB7DCCD639854C14F','',3045976,31,'',NULL), -(581,178,'B3EC9710B55079104420F126BA7257F8FD7DC39D46880E5B','',2299060,33,'',NULL), -(582,191,'7762CCDD012D51167BF42F775CC307238C35EA5DA55B999E','',41096,24,'',NULL), -(583,191,'CEB7B2C893B8410CA8716C77DB679AB860F7F0E86BCF2D8E','',12194860,37,'',NULL), -(584,113,'C584FF543FABE32DBA3206AB324CAFAD92497C4926BBF8B2','HideEx',0,0,'',NULL), -(585,178,'122B96C9AD3D43FA5EE82ADFA464904F304EB7FD4CB5622D','',2299108,33,'',NULL), -(586,178,'3EFBC5B273BFF42D9F704C74DC2381B8A0D50D61C2F1512E','',717898,23,'',NULL), -(587,178,'8C5824E4A6D16714A2BFB5FC9D0CBF4706B8A2170DA87D7B','',0,9,'',NULL), -(588,191,'402282B90E06579656CF454305C0B5A925C95FBF6A7CF265','',477928,60,'',NULL), -(589,191,'71B36C6D650EF0D049328643E5B12E73DF95B58B2F30D0DC','',17938,11,'',NULL), -(590,178,'7C49C303394E1493D897E802528CA8E558B6A7BFE8320F08','',3037164,22,'',NULL), -(591,178,'2C190F9E920AF2EF67DA4D06905C2A6A0A2BC63D0192BAC5','',3045632,31,'',NULL), -(592,191,'E59168C40E1A0C9F8896EA9E2D684988D81A522FFCDC51D5','',3766400,37,'',NULL), -(593,191,'3C825803D3ABF20A11495E54718A2D83A0B35FD7D741B5E1','',12905,36,'',NULL), -(594,191,'DCF32E3E1C5DF813DFB137A2D9B21D95B0AF66CC2AD0F245','',41023,24,'',NULL), -(595,178,'7B66BDB4A0A713A7B315888708B88F90CCF7313832CCE35E','',3045356,22,'',NULL), -(596,178,'FFAF20DD14D7018A4156F000D1455DF36966513EB76F93E7','',2299116,33,'',NULL), -(597,178,'0C59AA1F05D2D9D3C0C5ECF6A38D9FF57187A7A461DEE908','',717898,23,'',NULL), -(598,191,'913AA6D16EBE73143FA4B4EF89C786668C6E7DD0B936DD18','',90202,13,'',NULL), -(599,191,'A9F5CA81A547D8F8051928A287DD280F7FE835B2858CEED5','',20512,16,'',NULL), -(600,178,'16B4D8897AEED4732A47239CDC99603D2F505D0AD602847F','',673210,23,'',NULL), -(601,191,'23F29E10D55E8701A1A699A1C05CED4553676E9FBA5B51F5','',13634,11,'',NULL), -(602,178,'9A65A024256C0D7D677C9F24A9C16A48BEA9B03CCA016098','',3000288,31,'',NULL), -(603,191,'AA0004288ED58DE4324FA521F849807DB1EF33634C7FE8C3','',61874,42,'',NULL), -(604,191,'E400A401BD0376A0475F1216731F5EE0DDF42C9A4FA805D2','',59620,13,'',NULL), -(605,178,'FD434987A57E848192562B61CA0D67BDCEA2392514CDD0AF','',3000288,31,'',NULL), -(606,191,'88C140A6580061C775D9141887FABD3F20E574DC4C0C4BBB','',9977,32,'',NULL), -(607,178,'3623B441A5D414AFD6650C8B8623ECF3C3A9129E1F5A81C1','',672954,23,'',NULL), -(608,178,'393A06D430D287FEC1C02F9945C34BA2A7954241C6357909','',335122,23,'',NULL), -(609,191,'0955A3267A3E576B9BD823BB210E8200F37CCB0421BF208C','',685656,44,'',NULL), -(610,191,'1A00ED18B456ADC1A1F39A5DEF572250FB0CCAC8BECA9DD8','',477928,60,'',NULL), -(611,178,'370B9B6E3AA987595F986C5716BF9FFCF0369438D5DC5D11','',156,8,'',NULL), -(612,191,'E8E85DFE24D8D20852A37D702CDF029C3B1FA30B99CAA4BE','',447736,48,'',NULL), -(613,178,'FA24C5FEEAF4538DD4913F10C99F3F64380B7354EB318386','',3041472,31,'',NULL), -(614,191,'C6AD92AC13B340575AB5D0769A1A7EED47BC42A5968E67D6','',37136,40,'',NULL), -(615,191,'990EFFE367D44A29E82F62C57B6041A66F66C1D100B05639','',28956,12,'',NULL), -(616,191,'631E42C3B6ED8A22F5AFA903176A7EB011754F5ABF2081EF','',3766400,37,'',NULL), -(617,191,'D8AB4091C51177D7BBA7384EE12E0384A7EDB73E38D15920','',13291422,37,'',NULL), -(618,178,'54AAA1926869D259C427870A620AE0C24AFC9B472F424633','',3049888,31,'',NULL), -(619,191,'CC0E40919988E53DA0B447F0984A30D51CC42E9DB54A8F1F','',49564,24,'',NULL), -(620,191,'396E7EC540DC2C74CD6709753CC627517E3A2DB8A1EF3633','',29916,16,'',NULL), -(621,191,'84A5A077180DFB9841E8DF4A4EC49EADE886D905768EE032','',57602,42,'',NULL), -(622,178,'072300C283F8DF72B3ED5F3CD8B7DF47574AECF7B21FBB59','',668874,23,'',NULL), -(623,191,'D4FC9A6022B7CFA81904503E43B813631D4735D80BC61868','',9977,32,'',NULL), -(624,178,'47B5A19B87234257CB6C1485AB2C0CB25513260F60094BEE','',3037164,22,'',NULL), -(625,191,'B8B6F4BA5FD45F0ABDCB060F72987987B6EF62B80C9E378F','',12194860,37,'',NULL), -(626,178,'261F2915266F20B7289A1560176F24198930C61540BEFA01','',3638348,23,'',NULL), -(627,191,'019A378006B0677C0B2F42C6CA882EC571D504E7D8F5B05B','',17282,15,'',NULL), -(628,178,'4E82DD9F04571D6DAB2FFCFCD638699D1D4C84917F720F32','',717898,23,'',NULL), -(629,178,'EAA75F6AE049552C55AFFDABB7268682428B1A9BF028C4D4','',673194,23,'',NULL), -(630,178,'F1431C669453FE0BD95430ECD8328EA0D3CD37BA658F094E','',198,12,'',NULL), -(631,178,'8AD8C581E8BAF7A2140211C4298A93E229493F272F4EFF4A','',3045912,31,'',NULL), -(632,191,'C154E3B6CE0B979BA98FEDAA1829DCCF2A7172642DEF9EFC','',37180,24,'',NULL), -(633,191,'295A29C81B1B9CC9B6758440BED913ED4D8B5E05A90D7CE7','',41023,24,'',NULL), -(634,178,'3ED9105E3D1F31AD1D4376C54B07D18348C56E7453D161B2','',690106,23,'',NULL), -(635,178,'74C75B8F0147ADA8610F6C9BB80C4BDA543C1D95943ADCEB','',0,8,'',NULL), -(636,191,'7BE7A7D3F4AD8B30A0A144D5D4AC5E569BB9A0D18AB590FC','',37180,24,'',NULL), -(637,191,'0B5C54A4850924038D95A3F1C44F300921CEA1E13644842E','',57602,42,'',NULL), -(638,191,'876743AA30D61C83444427F4F18203B2FF443C337E5DD190','',22792,25,'',NULL), -(639,191,'C83A14C21D1E66345574E3E0E3613E924F702883A30A1809','',31924,23,'',NULL), -(640,191,'2545F02B4FC2F5425960A2E5C0299936C99FF2EC68A5ECDB','',501956,48,'',NULL), -(641,191,'85EF9C6353712A8D0E2E27B1702B510A95B1305473F86345','',41023,24,'',NULL), -(642,191,'35282392AA86692A153FC159D6E13C74F9DF01661E4867D6','',13538,11,'',NULL), -(643,191,'0D6CC3008615CD5BFB96A90620805B78D5BFBC6100B1AF0D','',13538,15,'',NULL), -(644,191,'D573179188521C485CFD24A9EE9CDA77C540A31EE68E3E78','',41228,24,'',NULL), -(645,191,'8FA80694C3766FC1B041103EB35EBA3B7C77081A5DA8FFD8','',28940,17,'',NULL), -(646,113,'CD6B8F9D23612C807F7653D29F1F1C54BC8F917C5C5BD8F1','Afd32uu',0,0,'',NULL), -(647,178,'FCB5CF830DB536208D4C58E5838D1C8798F0738247EF0867','',672602,23,'',NULL), -(648,178,'4451680A3F41926C1545701887F93A0A49CC29C3E114AADB','',4011280,23,'',NULL), -(649,191,'6BE2C4F29ADF49AE5BF0485A27A854087E775FA28047168C','',27270,13,'',NULL), -(650,191,'016FF5D8685E37969B1B7C310756DCD93D4AB34256837031','',38300,21,'',NULL), -(651,191,'6726DA4A8F112CC25DD78500CA9BF792DB688F7D8D1FBC4B','',57602,42,'',NULL), -(652,191,'9F8B3A3C70027496420A619969CF1EB7AF447D245DA766A0','',29884,20,'',NULL), -(653,178,'E74FFC8ADF5FE8A0FE0F10BCABCFCEDB3B2B9C2307340D7C','',3041472,31,'',NULL), -(654,178,'B31302D6A47971059B2643B57D2D50EBEBEAA89BE483F1F4','',3037164,22,'',NULL), -(655,191,'2F761DEA3CD3394A0091D745FD2976B52F3B16BB0A48BC80','',29884,20,'',NULL), -(656,178,'8E44EC966A93870696359D3E2474D12C071A381B9403B1B9','',673210,23,'',NULL), -(657,191,'2424AFA7FEC48FF09E5E3BDAF93FAA74743A7551B6FB1495','',56063,25,'',NULL), -(658,178,'ACCF5804D419F30643F87A650C4DC6E0E10266922692AECE','',682378,23,'',NULL), -(659,191,'6EC19D6D1244E3FE787AE448EC905C509DBA3C01FBE34F24','',41280,16,'',NULL), -(660,178,'5B2D2EE40383C33D381998995210918AC6B1AD67C5880F6D','',710554,23,'',NULL), -(661,178,'83FFE0F8F224D5E56C38D731EFE8AD5AD1285B1AD4FA019B','',683146,23,'',NULL), -(662,191,'9D67A809FD8FDA1E1504F0C038E21E1D5FC4C6D11F426228','',28940,17,'',NULL), -(663,191,'2965EC092EC0A4B3D4A3C781F0A0A542824C77B7300BF50C','',45324,24,'',NULL), -(664,191,'FE31901F5558E6555DA6BC5B1BC3415E82CB97DECBB486BB','',41096,24,'',NULL), -(665,191,'B35406A77D6501A50F41981C7C137AD5272EB612F4A74109','',29884,20,'',NULL), -(666,178,'7275397E511B45264BCFA30E3A3F8101894AA3923D91BE6E','',3037164,22,'',NULL), -(667,178,'CA7D8D0E1F20385DCF6FC209799750CE9D0160B0C67196E7','',700714,23,'',NULL), -(668,191,'F5CCDA244D826B3180E7C49193B3B0B5DBF651EC67DCB47A','',594348,26,'',NULL), -(669,191,'7977F1E72B30179072EE1784396AB0406D06162051CA1EDB','',37136,40,'',NULL), -(670,178,'603F8A015D8436CCBCD68B26FF6006E7A81BA9A8D9524B1F','',3045356,22,'',NULL), -(671,178,'9631E9EBC78E0333010E522045852C7BEA44655080D418F3','',3049888,31,'',NULL), -(672,191,'43BE7C00605D9FECAEFAE38D8FFEAED78B8382563A245F10','',9977,32,'',NULL), -(673,191,'E493F1BAED1DBE7A0D429BF1A5D665636D29069060310BF0','',13291422,37,'',NULL), -(674,191,'6C53203FA95EBE4DBB0A7F3E85994058DECA069A5244C29E','',130380,14,'',NULL), -(675,178,'5A07E5A0525DBD5005CBDE16F7393EC8B795ADB2327C2F96','',3045356,22,'',NULL), -(676,178,'D7665366F333BD580C5F8E2FF8971294F69E99EC7E3623F3','',717898,23,'',NULL), -(677,191,'FB87EB8F178C69D9F7576AC7FF75D0479467057A2B6C956D','',9977,32,'',NULL), -(678,178,'292911AC98E7ED34DF021B562D5DEBE8DAA15570B552978B','',3000288,31,'',NULL), -(679,178,'6618F45C49D47C4105070C085FD5C384254A62E4AB614DB9','',3634252,23,'',NULL), -(680,191,'316E531545999AFC533814888434999501FEA8ABFBAF8655','',134968,32,'',NULL), -(681,191,'9945ED64886F68664A4BDF50731F4B4DC680273AB2E0DBCB','',20512,16,'',NULL), -(682,191,'1D4D6EC7B6B26553FC914D28BF9B62FD81D0B865DE606D97','',29884,20,'',NULL), -(683,178,'63B2D2ACF6E912CDC68282B080A2D610BE6AFE8EBB95FD31','',3070052,22,'',NULL), -(684,191,'B0955BAC042D5441496103E7C45E38609A9AE3799D534BD9','',18680,35,'',NULL), -(685,178,'6488E44D4E965581650F73F6E68DD8F863795162D99104F8','',682378,23,'',NULL), -(686,191,'CC0D3F7D8FCF928A55F92F6414F4AEF7AD75DED5819BF870','',13538,15,'',NULL), -(687,191,'CD3835965AF27EC338F828666CD06089B847B04A2DD56AE0','',17938,11,'',NULL), -(688,178,'D04E9CF6A03D4767AFF1E4EE0EFBC333AEBA5B0552F15957','',0,9,'',NULL), -(689,178,'120904F033D78A13DB0971F095C809852B7EB876D1A8AA01','',3045632,31,'',NULL), -(690,191,'7DDD19DCF77E27DF0A31BC21C7F716FF85076AF065F102DC','',36924,24,'',NULL), -(691,178,'5486E2CDD98AC3F25C223FD515CE7EF3FB09AC12ED338C86','',198,10,'',NULL), -(692,178,'F8D6423F01E5369D16F6F70180083B936F0DDE3737B23308','',2299092,33,'',NULL), -(693,191,'EC10CC349A8E654240B27B03EE1232B9CCED28F7104CCB71','',49347,24,'',NULL), -(694,178,'29E064ACC509206873A1D548F4816DB60D29D6EE9FF63A56','',682378,23,'',NULL), -(695,178,'E1A8A2A81920A7BA9F419A6D19CAC3DD9E292EF39F963234','',676970,23,'',NULL), -(696,191,'32393EB09F7C829F58612E5E47018F7203C43218C3506C79','',20512,16,'',NULL), -(697,178,'AFC4D19CACEDE8E9A2FDE3CC3D29CF8556AF4980872DFE1A','',3033068,22,'',NULL), -(698,178,'09A2B97FD351B1D339030233AC51C741E0ECDC21AA7A152B','',3049452,22,'',NULL), -(699,191,'2B2AF2171B8A9FC0D44EFE0ECDCB9DE1A55ACC8D83661E16','',41023,24,'',NULL), -(700,178,'D111B236DC42EB338870E72FF6EE3141714D0437864B02AE','',3045356,22,'',NULL), -(701,178,'E6DC6898929D1DA9F5768A9BFCBE848F8C1F31E8B6910FB8','',335122,23,'',NULL), -(702,113,'85A32F8B5F8430A086D27E62EB17D878E49CE815F6AC91CA','IPSect',0,0,'',NULL), -(703,191,'B6CB7B905A6BDD64BC032BE71927C1FE31153D14D6CF87E1','',447736,48,'',NULL), -(704,178,'40EE7F4EEE1D707ECB770CDBBB54730CB863CC8E268D4208','',3634252,23,'',NULL), -(705,178,'D74E308262D8C52ACE81B66F1D90C160AC86B2E0508176C1','',0,8,'',NULL), -(706,178,'E15287D29EE155299619F8E93E66B55B564FD921FA41CF50','',3049452,22,'',NULL), -(707,191,'58DFAEE44A52F0D5A58B0C94F0E5E63C1C7F76206D7FA7CA','',22792,25,'',NULL), -(708,191,'83705EAE8AAD9709494E52EB05AC0481C998C15730E61099','',30012,16,'',NULL), -(709,178,'0271F4D624304A48CB7CDFA016E3A735DCA3170FAD557468','',3070052,22,'',NULL), -(710,178,'217DFFE3C12F984992E1E0AE7B5864061572BA301B21D869','',178504,96,'',NULL), -(711,178,'C5C7AC33D1E4CF33E661033006BFEDE08523B643CCF51261','',3045356,22,'',NULL), -(712,243,'','',4618113,10,'FF1554F79D003B470C89','WS2_32.Send'), -(713,191,'D45144FC835266270E67CFB1F2900FD227B63204698A3EA7','',50040,26,'',NULL), -(714,191,'B5BB832AEEC591196864E08A392592C5789D76D3DDDD4DBF','',27270,13,'',NULL), -(715,191,'93582814E00150E2DD750ACAD7BD1719C4EBCD4C06F482AB','',28940,17,'',NULL), -(716,191,'FD6B6AC7FA5F2E7828CB1B429A9442383BD93E762A5D7D00','',31924,23,'',NULL), -(717,191,'51DF4EDECBBE42CC7C5D6723318F98E43E14A45F41CBD124','',41080,24,'',NULL), -(718,191,'F2B2260FDD23E5F268FAAE4D1A48E74C452F2AC5D114765D','',57602,42,'',NULL), -(719,191,'69FBDB69EC2E113EF691E47EDD46E40F03D1EBE226A1F7CE','',29884,20,'',NULL), -(720,178,'E3E431D8F8FB38F0F2586D0F50D809BCCEB13651C5EF2619','',682394,23,'',NULL), -(721,178,'2294015927F07D884FE2923FA17B3A8BCABC0A378930CF84','',679578,23,'',NULL), -(722,191,'0A022AB25C52F94404A01F96687B2D6E6BE774237254BD05','',20512,16,'',NULL), -(723,191,'65EEE243504EDC3319C3528B1A1E8061A3E75F4C25B61F95','',41228,24,'',NULL), -(724,178,'877C654036A29FC108FE8D69D416361732D7A0270E51189D','',3022016,31,'',NULL), -(725,178,'1A223564DF9E7BADD3CF858FB8250FE59F892232AC3B412D','',4011280,23,'',NULL), -(726,191,'4FEDF58FB4DE45289C97ACCF16EB2DEA6FBC85C74A52D3C9','',37180,24,'',NULL), -(727,191,'D4BE47EA1D68B92E2AD8307D139877705BE2B6A98B6A916E','',13033,36,'',NULL), -(728,191,'9658AC7EF426A52C327BBC1ED71C6FA6DC5940E35DCC18C7','',18680,35,'',NULL), -(729,113,'1B17998CD8E0CDA4D84B0A0F9DB05E536DACE0348A883D24','ndis_x86',0,0,'',NULL), -(730,178,'BB9B86ED12359A465B02387A1D727F11F78D35C8B7FCC2FC','',2299092,33,'',NULL), -(731,191,'842BC1A8C53902D26018B1C5E05ADCD70D973A968E298331','',50040,26,'',NULL), -(732,178,'3E894F9682573CC0AD54C7E9873C9026AC050929392D0B93','',3049452,22,'',NULL), -(733,191,'4A31E3D24FD6D576D84EF1BFB813D0F066870DEB38C32E47','',21826,11,'',NULL), -(734,191,'EEA122B4C066EC0B196F67511E633EBACB37C4EA6AE4BFF7','',41096,24,'',NULL), -(735,191,'66211671BEF80FB973B1C9595A70B462AD79EC83530DFE89','',12905,36,'',NULL), -(736,178,'3760BBD6FE99A0BBEE0AB61A8BD52A6ABCAC48FF3CB265B8','',3070052,22,'',NULL), -(737,191,'70F425426612D0D8495386C2375F7A4183548C0D4E7DFA46','',594348,26,'',NULL), -(738,178,'BB310E9DDE9259027123500E65F9FA1E8D9D0F5FE8381CD2','',3638348,23,'',NULL), -(739,191,'6FFB5E4982D306680E0C59087DA961CD4F6B068E323C3BB4','',401992,14,'',NULL), -(740,191,'6DDCA79B7460A1F3671532A28FDCEB331DE6CA550E3178D0','',3766400,37,'',NULL), -(741,191,'A8F7B2FB37CF3BEF43D6CE5C0BF85E85077E681490BA1C4C','',37136,40,'',NULL), -(742,191,'052F425E7528B3A7155C45EEE530F915DBB154E5C8876E25','',50040,26,'',NULL), -(743,178,'D6DE200B631AF71BFBC76202D82649942FD6ED9BC4A9EF75','',198,12,'',NULL), -(744,178,'61077261C66B2CF9B199F115A3A656EA6A00068F151E3656','',706314,23,'',NULL), -(745,191,'513FC0F0673A9DF86FA1FA05371040C14634CE08311ED619','',401992,14,'',NULL), -(746,191,'5E0970A6EB246A79DDF427CB76D0D921F971E13921DD5D2C','',134968,32,'',NULL), -(747,178,'53CAC3EF654610AC7E043C6AAD62709EF0B5400DBDE755EB','',149,5,'',NULL), -(748,178,'566637D06BAEA9190B7CE510C697F72CD20FE3D958A95A25','',3049888,31,'',NULL), -(749,113,'3C9B0CC7FE020EEBD43E6B1D88EDDF0EC46AC35974765068','drvsys_mon',0,0,'',NULL), -(750,191,'BDFEE5DCDD37FC5B2A1B3E42FBE5F7997CFED35E86062EB6','',28920,23,'',NULL), -(751,191,'7794AE60131E4D07860DB48047206784B885B30457EAB83E','',12194860,37,'',NULL), -(752,178,'653A308BB00D914AE1ECD773BA4B0BA7724874BC62647D10','',3037164,22,'',NULL), -(753,178,'06B696C35F905E75B451A02E121BDA0330CD44E0D9B872BF','',60648,56,'',NULL), -(754,191,'35E8CD9E8CBD879B1E53278926C634AA8B72B8D9A20009F9','',17522,15,'',NULL), -(755,191,'9B13F2E744904ADAAA062F9113A576D11C2C450D1CD6A4AB','',13033,36,'',NULL), -(756,191,'60851B4A6F7338632A84795FBBB20320E49AD2CC2034BA80','',28940,17,'',NULL), -(757,191,'3BC0BE02AE0B6975974D3B13B811EC6BDACBF9EE122BE633','',90202,13,'',NULL), -(758,191,'E47F7DD8D5B5C29B70AFFD4F25AA286167D411937F9BD247','',36907,24,'',NULL), -(759,178,'35D1CDEE86A410DF087DE6D5F5AC6289C4888B9753293E73','',3037164,22,'',NULL), -(760,191,'2ED2EEB29EE0D48477779E5CA875F1F5F15CCE74CA85BDAA','',28956,17,'',NULL), -(761,191,'A373FDB6A789CC46072A4CC51A429C817C40862DC6C0190F','',30012,16,'',NULL), -(762,178,'3D02551F548DFB58832626FE90A7AAA12824D93A54A0DC14','',709322,22,'',NULL), -(763,191,'09D04CF8ABC51D06D874784442987E5F2631041550607255','',36544,55,'',NULL), -(764,191,'F3CD473F8C85977895CA5BA9DC22185BCCBBF6B977205193','',448492,48,'',NULL), -(765,191,'30E2F23DB1038D16D2DEEAB1D0F1790D961E468368DC5108','',30012,16,'',NULL), -(766,191,'540D465F760320A63981289D30CD40CCC770EE126523C71D','',477912,60,'',NULL), -(767,191,'C461E1BE054FE29A1FD58B33D33890BC4A1279DE4F572B47','',37180,24,'',NULL), -(768,191,'1AC3D903CFCA11321E76A257BDA0608E5060030BE745CCF3','',130380,14,'',NULL), -(769,178,'96281A2887E61232007D7015E4A35DA118794841A8EC84BC','',3037164,22,'',NULL), -(770,178,'8A1AC926B46A9E3D60D3BD87A59FF77D7B80A1510BC327A7','',710730,23,'',NULL), -(771,191,'3620B6BDF3993B87FD35E906FE8376A04FF34684E2023D8E','',41280,16,'',NULL), -(772,191,'025C373F05EC6E809EF5A86A903570FDA14D219286BCED5E','',448492,48,'',NULL), -(773,178,'5C0E4EE98C4E34CBE44F6BD595C13DD675555164A8D491DA','',710554,23,'',NULL), -(774,191,'BECE667BF9443EF6515E8E154F74FC2C5817455C8636DB72','',501956,48,'',NULL), -(775,191,'94F1DA3E0D955761826D6BC932E26F44D321B4838C7567D8','',13538,15,'',NULL), -(776,191,'EA3A3AD71FD14B038C98F256E80C1EFA1F45562A3DF92E7D','',22792,25,'',NULL), -(777,191,'AD5A8CBF55EC436DA968EE0B9744C93F65D9E0D6E3C1B136','',174688,37,'',NULL), -(778,191,'9B6B3B311BA9007C06CF0D146BB979B11CF295C58768DD4F','',31924,23,'',NULL), -(779,217,'','RPE.DLL',0,0,'','rEdoX Packet Editor - injected dll'), -(780,243,'','',5345728,2,'558B','Lua Protection Remover'), -(781,243,'','',7726137,2,'7414','Walk on Water Patch'), -(782,243,'','',8016620,2,'7417','Collision M2 Special'), -(783,243,'','',8016079,6,'0F8462010000','Collision M2 Regular'), -(784,243,'','',8054762,2,'7506','Collision WMD'), -(785,243,'','',9995315,2,'7544','Multi-Jump Patch'), -(786,217,'','WPESPY.DLL',0,0,'','WPE PRO - injected dll'); diff --git a/sql/updates/world/2012_02_19_04_world_misc_db_updates.sql b/sql/updates/world/2012_02_19_04_world_misc_db_updates.sql deleted file mode 100644 index 32fada1e895..00000000000 --- a/sql/updates/world/2012_02_19_04_world_misc_db_updates.sql +++ /dev/null @@ -1,21 +0,0 @@ --- Horde Orphan should not have weapons -UPDATE `creature_template` SET `equipment_id`=0 WHERE `entry`=14499; --- Tog'thar Gossip -UPDATE `creature_template` SET `gossip_menu_id`=264 WHERE `entry`=2238; -DELETE FROM `gossip_menu` WHERE `entry`=264 AND `text_id`=761; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (264,761); --- Cosmetic Silkwing should have InhabitType 4 -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=21840; --- Leoroxx -UPDATE `creature_template` SET `gossip_menu_id`=8511 WHERE `entry`=22004; -DELETE FROM `gossip_menu` WHERE `entry`=8511 AND `text_id`=10645; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8511,10645); --- Spiritcaller Dohgar -UPDATE `creature_template` SET `gossip_menu_id`=8513 WHERE `entry`=22312; -DELETE FROM `gossip_menu` WHERE `entry`=8513 AND `text_id`=10647; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8513,10647); --- Ogrin -UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=22468; --- Wanted Poster "Blade's Edge Mountains" -DELETE FROM `gossip_menu` WHERE `entry`=8242 AND `text_id`=10257; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8242,10257); diff --git a/sql/updates/world/2012_02_19_05_world_creature_text.sql b/sql/updates/world/2012_02_19_05_world_creature_text.sql deleted file mode 100644 index b70385660a1..00000000000 --- a/sql/updates/world/2012_02_19_05_world_creature_text.sql +++ /dev/null @@ -1,7 +0,0 @@ --- NPC talk text from sniff -DELETE FROM `creature_text` WHERE `entry`=7604; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(7604,0,0, 'What? How dare you say that to me?!?',12,0,100,6,0,0, 'Sergeant Bly'), -(7604,1,0, 'After all we''ve been through? Well, I didn''t like you anyway!!',12,0,100,5,0,0, 'Sergeant Bly'); --- Remove old text -DELETE FROM `script_texts` WHERE `entry` IN (-1209002,-1209003); diff --git a/sql/updates/world/2012_02_19_06_world_creature_text.sql b/sql/updates/world/2012_02_19_06_world_creature_text.sql deleted file mode 100644 index f69c4cb86a9..00000000000 --- a/sql/updates/world/2012_02_19_06_world_creature_text.sql +++ /dev/null @@ -1,20 +0,0 @@ --- SAI for Erich Lohan -SET @ENTRY=3627; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,0,100,0,10000,15000,10000,15000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Erich Lohan - OOC - Say random text'); --- Talk text from sniff -DELETE FROM `creature_text` WHERE `entry`=3627; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(3627,0,0, 'Magical studies stressing your brain? Relax at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,1, 'Best drinks in Stormwind!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,2, 'Come for the beer, stay for the atmosphere!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,3, 'The only place in Stormwind where magic and spirits mix, come to the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,4, 'Free drinks at the Blue Recluse!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,5, 'Feeling blue? Come on down to the Blue Recluse for a good time!',12,7,100,0,0,0, 'Erich Lohan'), -(3627,0,6, 'Head on over to the Blue Recluse. Where everybody knows your name!',12,7,100,0,0,0, 'Erich Lohan'); --- Remove old waypoint text -UPDATE `waypoint_data` SET `action`=0 WHERE `id`=904450; -DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 432 AND 446; -DELETE FROM `db_script_string` WHERE `entry` BETWEEN 2000005185 AND 2000005199; diff --git a/sql/updates/world/2012_02_20_00_world_sai.sql b/sql/updates/world/2012_02_20_00_world_sai.sql deleted file mode 100644 index 44f8ab68d70..00000000000 --- a/sql/updates/world/2012_02_20_00_world_sai.sql +++ /dev/null @@ -1,4 +0,0 @@ -UPDATE `smart_scripts` SET `event_param3`=2*60*60*1000, `event_param4`=2*60*60*1000 WHERE `entryorguid`=18481 AND `source_type`=0 AND `id`=0; -UPDATE `smart_scripts` SET `event_flags`=`event_flags`|1 WHERE `entryorguid` IN (-85175,-85176) AND `source_type`=0 AND `id`=5 AND `link`=6; -UPDATE `smart_scripts` SET `event_flags`=`event_flags`|1 WHERE `entryorguid`=30146 AND `source_type`=0 AND `id`=0; -UPDATE `smart_scripts` SET `event_flags`=`event_flags`|0x20 WHERE `entryorguid` IN (-85175,-85176) AND `source_type`=0 AND `id`=2 AND `link`=3; diff --git a/sql/updates/world/2012_02_20_01_world_gossip.sql b/sql/updates/world/2012_02_20_01_world_gossip.sql deleted file mode 100644 index f3943ded29a..00000000000 --- a/sql/updates/world/2012_02_20_01_world_gossip.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Fix error in Scourge Deathspeaker SAI -UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=27615 AND `id`=14; --- Fix up Keeper Remulos SAI -UPDATE `smart_scripts` SET `id`=3 WHERE `entryorguid`=11832 AND `id`=4; --- Spiritcaller Dohgar -UPDATE `creature_template` SET `gossip_menu_id`=8513 WHERE `entry`=22312; -DELETE FROM `gossip_menu` WHERE `entry`=8513 AND `text_id`=10647; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8513,10647); diff --git a/sql/updates/world/2012_02_20_02_world_conditons.sql b/sql/updates/world/2012_02_20_02_world_conditons.sql deleted file mode 100644 index f87a95fb1c9..00000000000 --- a/sql/updates/world/2012_02_20_02_world_conditons.sql +++ /dev/null @@ -1,277 +0,0 @@ --- Update a typo in original data entry -UPDATE `npc_spellclick_spells` SET `quest_end`=11999 WHERE `npc_entry`=26477 AND `spell_id`=61832 AND `quest_start`=11999; - --- Delete redundant data with invalid condition type -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18; - --- Static Data -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, -`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES -(18,24752,44363,0,8,0,11460,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,24752,44363,0,9,0,11460,0,0,0,'Required quest active for spellclick'), -(18,25596,45875,0,8,0,11690,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,25596,45875,0,9,0,11690,0,0,0,'Required quest active for spellclick'), -(18,25841,46166,0,8,0,11795,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,25841,46166,0,9,0,11795,0,0,0,'Required quest active for spellclick'), -(18,26200,39996,0,8,0,11960,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26200,39996,0,9,0,11960,0,0,0,'Required quest active for spellclick'), -(18,26200,61286,0,8,0,11960,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26200,61286,0,9,0,11960,0,0,0,'Required quest active for spellclick'), -(18,26421,47575,0,8,0,12092,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26421,47575,0,8,0,12096,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26421,47575,0,9,0,12092,0,0,0,'Required quest active for spellclick'), -(18,26421,47575,0,9,0,12096,0,0,0,'Required quest active for spellclick'), -(18,26477,47096,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,47096,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,47096,0,9,0,11999,0,0,0,'Required quest active for spellclick'), -(18,26477,47096,0,9,0,12000,0,0,0,'Required quest active for spellclick'), -(18,26477,61286,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61286,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61286,0,9,0,11999,0,0,0,'Required quest active for spellclick'), -(18,26477,61286,0,9,0,12000,0,0,0,'Required quest active for spellclick'), -(18,26477,61832,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61832,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61832,0,9,0,11999,0,0,0,'Required quest active for spellclick'), -(18,26477,61832,0,9,0,12000,0,0,0,'Required quest active for spellclick'), -(18,27061,47920,0,8,0,12050,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,27061,47920,0,9,0,12050,0,0,0,'Required quest active for spellclick'), -(18,27354,60944,18,8,0,12244,0,0,0,'Required quest rewarded for spellclick'), -(18,27354,60944,18,9,0,12244,0,0,0,'Required quest active for spellclick'), -(18,28161,39996,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,39996,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,39996,0,9,0,12532,0,0,0,'Required quest active for spellclick'), -(18,28161,39996,0,9,0,12702,0,0,0,'Required quest active for spellclick'), -(18,28161,51037,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51037,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51037,0,9,0,12532,0,0,0,'Required quest active for spellclick'), -(18,28161,51037,0,9,0,12702,0,0,0,'Required quest active for spellclick'), -(18,28161,51961,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51961,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51961,0,9,0,12532,0,0,0,'Required quest active for spellclick'), -(18,28161,51961,0,9,0,12702,0,0,0,'Required quest active for spellclick'), -(18,28162,39996,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28162,39996,0,9,0,12519,0,0,0,'Required quest active for spellclick'), -(18,28162,50737,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28162,50737,0,9,0,12519,0,0,0,'Required quest active for spellclick'), -(18,28162,51026,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28162,51026,0,9,0,12519,0,0,0,'Required quest active for spellclick'), -(18,28162,61286,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28162,61286,0,9,0,12519,0,0,0,'Required quest active for spellclick'), -(18,28202,50926,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28202,50926,0,9,0,12527,0,0,0,'Required quest active for spellclick'), -(18,28202,50927,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28202,50927,0,9,0,12527,0,0,0,'Required quest active for spellclick'), -(18,28203,50918,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28203,50918,0,9,0,12527,0,0,0,'Required quest active for spellclick'), -(18,28203,50919,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28203,50919,0,9,0,12527,0,0,0,'Required quest active for spellclick'), -(18,28222,52082,0,8,0,12546,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28222,52082,0,9,0,12546,0,0,0,'Required quest active for spellclick'), -(18,28379,51658,0,8,0,12607,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28379,51658,0,9,0,12607,0,0,0,'Required quest active for spellclick'), -(18,28389,51592,0,8,0,12605,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28389,51592,0,9,0,12605,0,0,0,'Required quest active for spellclick'), -(18,28389,51593,0,8,0,12605,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28389,51593,0,9,0,12605,0,0,0,'Required quest active for spellclick'), -(18,28782,52280,0,8,0,12687,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28782,52280,0,9,0,12687,0,0,0,'Required quest active for spellclick'), -(18,29488,54568,15,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), -(18,29488,54568,15,9,0,12670,0,0,0,'Required quest active for spellclick'), -(18,29563,56795,0,8,0,1,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29598,54768,0,8,0,12856,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29708,55028,0,8,0,12856,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29708,55028,0,9,0,12856,0,0,0,'Required quest active for spellclick'), -(18,29856,55363,0,8,0,12629,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29856,55363,0,8,0,12643,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29856,55363,0,9,0,12629,0,0,0,'Required quest active for spellclick'), -(18,29856,55363,0,9,0,12643,0,0,0,'Required quest active for spellclick'), -(18,29857,55457,0,8,0,12910,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29857,55457,0,9,0,12910,0,0,0,'Required quest active for spellclick'), -(18,30066,43977,0,8,0,12953,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,30337,43671,0,8,0,13069,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,30337,43671,0,9,0,13069,0,0,0,'Required quest active for spellclick'), -(18,30500,56679,0,8,0,13045,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,30500,56679,0,9,0,13045,0,0,0,'Required quest active for spellclick'), -(18,30560,57347,0,1,0,57348,0,0,1,'Forbidden aura for spellclick'), -(18,31736,59592,0,8,0,13280,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,31736,59592,0,9,0,13280,0,0,0,'Required quest active for spellclick'), -(18,31785,59656,0,8,0,13283,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,31785,59656,0,9,0,13283,0,0,0,'Required quest active for spellclick'), -(18,31883,60123,0,1,0,48085,0,0,1,'Forbidden aura for spellclick'), -(18,31893,60123,0,1,0,48084,0,0,1,'Forbidden aura for spellclick'), -(18,31894,60123,0,1,0,28276,0,0,1,'Forbidden aura for spellclick'), -(18,31895,60123,0,1,0,27874,0,0,1,'Forbidden aura for spellclick'), -(18,31896,60123,0,1,0,27873,0,0,1,'Forbidden aura for spellclick'), -(18,31897,60123,0,1,0,7001,0,0,1,'Forbidden aura for spellclick'), -(18,32788,57539,17,8,0,13075,0,0,0,'Required quest rewarded for spellclick'), -(18,32788,57539,17,9,0,13075,0,0,0,'Required quest active for spellclick'), -(18,32790,57654,16,8,0,13073,0,0,0,'Required quest rewarded for spellclick'), -(18,32790,57654,16,9,0,13073,0,0,0,'Required quest active for spellclick'), -(18,33498,63126,0,8,0,13654,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,33498,63126,0,9,0,13654,0,0,0,'Required quest active for spellclick'), -(18,33790,62781,0,8,0,13690,0,0,0,'Required quest rewarded for spellclick'), -(18,33790,62781,0,8,0,13705,0,0,0,'Required quest rewarded for spellclick'), -(18,33791,62786,0,8,0,13696,0,0,0,'Required quest rewarded for spellclick'), -(18,33791,62786,0,8,0,13711,0,0,0,'Required quest rewarded for spellclick'), -(18,33792,62785,0,8,0,13694,0,0,0,'Required quest rewarded for spellclick'), -(18,33792,62785,0,8,0,13709,0,0,0,'Required quest rewarded for spellclick'), -(18,33793,62780,0,8,0,13688,0,0,0,'Required quest rewarded for spellclick'), -(18,33793,62780,0,8,0,13704,0,0,0,'Required quest rewarded for spellclick'), -(18,33794,62782,0,8,0,13689,0,0,0,'Required quest rewarded for spellclick'), -(18,33794,62782,0,8,0,13706,0,0,0,'Required quest rewarded for spellclick'), -(18,33795,62779,0,8,0,13685,0,0,0,'Required quest rewarded for spellclick'), -(18,33795,62779,0,8,0,13703,0,0,0,'Required quest rewarded for spellclick'), -(18,33796,62784,0,8,0,13693,0,0,0,'Required quest rewarded for spellclick'), -(18,33796,62784,0,8,0,13708,0,0,0,'Required quest rewarded for spellclick'), -(18,33798,62787,0,8,0,13695,0,0,0,'Required quest rewarded for spellclick'), -(18,33798,62787,0,8,0,13710,0,0,0,'Required quest rewarded for spellclick'), -(18,33799,62783,0,8,0,13691,0,0,0,'Required quest rewarded for spellclick'), -(18,33799,62783,0,8,0,13707,0,0,0,'Required quest rewarded for spellclick'), -(18,33800,62774,0,8,0,13593,0,0,0,'Required quest rewarded for spellclick'), -(18,33800,62774,0,8,0,13684,0,0,0,'Required quest rewarded for spellclick'), -(18,33842,63791,0,8,0,13668,0,0,0,'Required quest rewarded for spellclick'), -(18,33842,63791,0,8,0,13687,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,33843,63792,0,8,0,13667,0,0,0,'Required quest rewarded for spellclick'), -(18,33843,63792,0,8,0,13686,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,33870,63663,0,8,0,1,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13847,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13851,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13852,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13854,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13855,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13856,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13857,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13858,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13859,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13860,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13861,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13862,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13863,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,8,0,13864,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,34125,63215,0,9,0,13847,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13851,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13852,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13854,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13855,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13856,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13857,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13858,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13859,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13860,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13861,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13862,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13863,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,0,9,0,13864,0,0,0,'Required quest active for spellclick'), -(18,38248,71462,0,1,0,71443,0,0,1,'Forbidden aura for spellclick'), -(18,40176,74904,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,40176,74904,0,9,0,25444,0,0,0,'Required quest active for spellclick'), -(18,40176,74905,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,40176,74905,0,9,0,25444,0,0,0,'Required quest active for spellclick'); - --- Below is a procedure to dynamically convert custom content to conditions table. --- However this procedure only works for MySQL server versions >= 5.6 due to --- a bug / missing feature in older MySQL versions. - -/* - -DROP PROCEDURE IF EXISTS ConvertSpellClickConditions; -DELIMITER // -CREATE PROCEDURE ConvertSpellClickConditions() -BEGIN - DECLARE counter INT DEFAULT 0; - DECLARE recordCount INT DEFAULT 0; - DECLARE counterPlusOne INT DEFAULT 0; - DECLARE npcEntry INT DEFAULT 0; - DECLARE spellId INT DEFAULT 0; - DECLARE aura INT DEFAULT 0; - DECLARE quest INT DEFAULT 0; - DECLARE quest2 INT DEFAULT 0; - DECLARE questStartCanActive INT DEFAULT 0; - DECLARE maxElseGroupId INT DEFAULT 14; -- Change this for custom content - SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_required` !=0; - WHILE counter < recordCount DO - SELECT `npc_entry`, `spell_id`, `aura_required` - INTO npcEntry, spellId, aura - FROM `npc_spellclick_spells` WHERE `aura_required` !=0 - LIMIT counter,1; - INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, - `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) - VALUES (18,npcEntry,spellId,1,0,aura,0,0,'Required aura for spellclick'); - SET counter = counter+1; - END WHILE; - - SET counter = 0; - SET recordCount = 0; - SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_forbidden` !=0; - WHILE counter < recordCount DO - SELECT `npc_entry`, `spell_id`, `aura_forbidden` - INTO npcEntry, spellId, aura - FROM `npc_spellclick_spells` WHERE `aura_forbidden` !=0 - LIMIT counter,1; - INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, - `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) - VALUES (18,npcEntry,spellId,1,0,aura,0,1,'Forbidden aura for spellclick'); - SET counter = counter+1; - END WHILE; - - SET counter = 0; - SET recordCount = 0; - SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `quest_start` !=0; - WHILE counter < recordCount DO - SELECT `npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end` - INTO npcEntry, spellId, quest, questStartCanActive, quest2 - FROM `npc_spellclick_spells` WHERE `quest_start` !=0 - LIMIT counter,1; - IF questStartCanActive = 1 AND quest2 = 0 THEN - INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`, `ConditionTypeOrReference`, - `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) - VALUES (18,npcEntry,spellId,maxElseGroupId+1,9,0,quest,0,0,'Required quest active for spellclick'); - INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`, `ConditionTypeOrReference`, - `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) - VALUES (18,npcEntry,spellId,maxElseGroupId+1,8,0,quest,0,0,'Required quest rewarded for spellclick'); - SET maxElseGroupId = maxElseGroupId+1; - -- ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest) - ELSEIF questStartCanActive = 1 && quest2 = quest THEN - INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, - `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) - VALUES (18,npcEntry,spellId,9,0,quest,0,0,'Required quest active for spellclick'); - -- ^Adds the required active quest condition. Prohibit quest reward is done in next loop - ELSEIF questStartCanActive = 0 THEN - INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, - `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) - VALUES (18,npcEntry,spellId,8,0,quest,0,0,'Required quest rewarded for spellclick'); - END IF; - - SET counter = counter+1; - END WHILE; - - SET counter = 0; - SET recordCount = 0; - SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `quest_end` !=0; - WHILE counter < recordCount DO - SELECT `npc_entry`, `spell_id`, `quest_end` - INTO npcEntry, spellId, quest - FROM `npc_spellclick_spells` WHERE `quest_end` !=0 - LIMIT counter,1; - INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`, - `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) - VALUES (18,npcEntry,spellId,8,0,quest,0,1,'Forbidden rewarded quest for spellclick'); - SET counter = counter+1; - END WHILE; - -END// - -DELIMITER ; - -CALL ConvertSpellClickConditions(); -DROP PROCEDURE ConvertSpellClickConditions; - -*/ - -ALTER TABLE `npc_spellclick_spells` - DROP COLUMN `quest_start`, - DROP COLUMN `quest_start_active`, - DROP COLUMN `quest_end`, - DROP COLUMN `aura_required`, - DROP COLUMN `aura_forbidden` -; diff --git a/sql/updates/world/2012_02_21_00_world_creature_loot_template.sql b/sql/updates/world/2012_02_21_00_world_creature_loot_template.sql deleted file mode 100644 index 1d05c031868..00000000000 --- a/sql/updates/world/2012_02_21_00_world_creature_loot_template.sql +++ /dev/null @@ -1,78 +0,0 @@ --- Loot for Hellfire 5-man dungeons Trash (heroic and normal) -- --- ------------------------------------------------------------- - --- Hellfire Citadel: Ramparts -SET @Lootid := 17259; --- set all lootids to same entry (normal and heroic) -UPDATE `creature_template` SET `lootid`=@Lootid WHERE `entry` IN -(17259,17264,17269,17270,17271,17280,17281,17309,17455,17478,17517,18048,18049,18050,18051,18052,18053,18054,18055,18057,18058,18059); --- populate trashloot table -DELETE FROM `creature_loot_template` WHERE `entry` IN -(17259,17264,17269,17270,17271,17280,17281,17309,17455,17478,17517,18048,18049,18050,18051,18052,18053,18054,18055,18057,18058,18059); -DELETE FROM `creature_loot_template` WHERE `entry`=@Lootid; -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- rough indication based on wowhead data of ALL mobs in the dungeon -(@Lootid,14047,40,1,0,1,4), -- Runecloth -(@Lootid,21877,20,1,0,1,4), -- Netherweave Cloth -(@Lootid, 8952,10,1,0,1,4), -- Roasted Quail -(@Lootid, 8766, 5,1,0,1,3), -- Morning Glory Dew --- references for worldgreys -(@Lootid,1,5,1,0,-24000,1), -- Outland Grey Item Reference1 -(@Lootid,2,5,1,0,-24002,1), -- Outland Grey Item Reference2 -(@Lootid,3,5,1,0,-24003,1), -- Outland Grey Item Reference3 -(@Lootid,4,5,1,0,-24011,1), -- Outland Grey Item Reference4 -(@Lootid,5,5,1,0,-24022,1), -- Outland Grey Item Reference5 -(@Lootid,6,5,1,0,-24023,1), -- Outland Grey Item Reference6 --- specifics -(@Lootid,5759,0.25,1,0,1,1), -- Thorium Lockbox -(@Lootid,5760,0.30,1,0,1,1), -- Eternium Lockbox --- Scrolls -(@Lootid,7,5,1,0,-24724,1); -- Scroll of IV - --- ----------------------------------------- --- -- Hellfire Citadel: The Blood Furnace -- --- ----------------------------------------- -SET @Lootid := 17370; -UPDATE `creature_template` SET `lootid`=@Lootid WHERE `entry` IN (17256,17370,17371,17395,17397,17398,17399,17414,17429,17477,17491,17624,17626,17653,18894,19016,18608,18619,18617,18615,18612,18614,18618,18603,18606,18610,18611,18609,18620,21645,21646); - -DELETE FROM `creature_loot_template` WHERE `entry` IN (17370,17371,17395,17397,17398,17414,17429,17491,17624,17626,18894); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@Lootid,23894,-100,1,0,1,1), -- Fel Orc Blood (quest) --- most common items -(@Lootid,14047,40,1,0,1,4), -- Runecloth -(@Lootid,21877,20,1,0,1,4), -- Netherweave Cloth -(@Lootid, 8952,10,1,0,1,4), -- Roasted Quail -(@Lootid, 8766, 5,1,0,1,3), -- Morning Glory Dew --- references for worldgreys -(@Lootid,1,5,1,0,-24000,1), -- Outland Grey Item Reference1 -(@Lootid,2,5,1,0,-24002,1), -- Outland Grey Item Reference2 -(@Lootid,3,5,1,0,-24003,1), -- Outland Grey Item Reference3 -(@Lootid,4,5,1,0,-24011,1), -- Outland Grey Item Reference4 -(@Lootid,5,5,1,0,-24022,1), -- Outland Grey Item Reference5 -(@Lootid,6,5,1,0,-24023,1), -- Outland Grey Item Reference6 --- specifics -(@Lootid,5759,0.25,1,0,1,1), -- Thorium Lockbox -(@Lootid,5760,0.30,1,0,1,1), -- Eternium Lockbox --- Scrolls -(@Lootid,7,5,1,0,-24724,1); -- Scroll of IV - --- ------------------------------------------- --- -- Hellfire Citadel: The Shattered Halls -- --- ------------------------------------------- -SET @Lootid := 16507; -UPDATE `creature_template` SET `lootid`=@Lootid WHERE `entry` IN (17669,16507,17622,17462,17427,17420,17083,16699,16704,17695,17670,16700,16593,16594,17464,17694,17465,17461,17671,20593,20582,20576,20590,20589,20594,20567,20587,20579,20581,20595,20586,20583,20578,20574,20588,20584,20577,20580); - -DELETE FROM `creature_loot_template` WHERE `entry` IN (16507,16593,16594,16699,16700,16704,17083,17420,17427,17461,17462,17464,17465,17669,17670,17671,17694,17695,17669,16594,17694,17427,17695,17461,16593,17465,17671,17464,17420,17670,16700,16699,16507,16704,17462); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@Lootid,21877,40,1,0,2,3), -- Netherweave Cloth -(@Lootid,27854,20,1,0,1,1), -- Smoked Talbuk Venison -(@Lootid,27860,20,1,0,1,1), -- Purified Draenic Water -(@Lootid,31952,2.5,1,0,1,1), -- Khorium Lockbox --- references -(@Lootid,1,5,1,1,-24002,1), -- Outland Grey Item Reference1 -(@Lootid,2,2,1,1,-24009,1), -- Outland Green Reference1 -(@Lootid,3,5,1,1,-24011,1), -- Outland Grey Item Reference2 -(@Lootid,4,1,1,1,-24012,1), -- Outland Blue Reference1 -(@Lootid,5,5,1,1,-24093,1), -- Outland Plans & patterns --- Scrolls -(@Lootid,6,5,1,0,-24724,1); -- Scroll of IV diff --git a/sql/updates/world/2012_02_21_01_world_conditions.sql b/sql/updates/world/2012_02_21_01_world_conditions.sql deleted file mode 100644 index 95c32703ea4..00000000000 --- a/sql/updates/world/2012_02_21_01_world_conditions.sql +++ /dev/null @@ -1,3592 +0,0 @@ -CREATE TABLE `temp_convert_spells` -( - `id` INT(11), - `effMask` INT(11), - `onlyPlayers` TINYINT(3), - PRIMARY KEY (`id`) -); - -INSERT INTO `temp_convert_spells` VALUES -(46174,1,0), -(78002,1,1), -(78001,1,1), -(78000,1,1), -(77999,1,1), -(77984,1,1), -(76379,1,0), -(76098,1,0), -(76092,1,0), -(75920,1,1), -(75767,1,1), -(75765,1,1), -(75396,1,0), -(75389,1,1), -(75364,1,0), -(75319,1,0), -(75313,1,0), -(75244,1,0), -(75197,1,0), -(75195,1,0), -(75181,1,0), -(75107,1,0), -(75100,1,0), -(75078,1,0), -(75053,1,0), -(75018,1,0), -(74977,1,0), -(74903,1,0), -(74801,1,1), -(74758,1,0), -(74735,1,0), -(74549,1,0), -(74548,1,0), -(74486,1,0), -(74455,1,0), -(74444,1,0), -(74313,1,0), -(74285,1,0), -(74219,1,0), -(74182,1,0), -(74148,1,0), -(74098,1,0), -(74090,1,1), -(74086,1,1), -(74074,1,0), -(74033,1,0), -(73980,1,0), -(73955,1,0), -(73953,1,0), -(73886,1,0), -(73846,1,1), -(73845,1,1), -(73844,1,1), -(73843,1,1), -(73837,1,0), -(73836,1,0), -(73835,1,0), -(73787,1,0), -(73786,1,0), -(73785,1,0), -(73725,1,0), -(73659,1,0), -(73650,1,1), -(73582,1,0), -(73556,1,0), -(73555,1,0), -(73548,1,0), -(73331,1,1), -(73288,1,0), -(73165,1,0), -(73164,1,1), -(73159,1,1), -(73129,1,0), -(73128,1,0), -(73082,1,0), -(73071,1,0), -(73035,1,0), -(72959,1,1), -(72934,1,1), -(72928,1,1), -(72900,1,1), -(72830,1,1), -(72748,1,0), -(72747,1,0), -(72746,1,0), -(72745,1,0), -(72728,1,0), -(72706,1,1), -(72618,1,0), -(72595,1,1), -(72527,1,0), -(72479,1,1), -(72431,1,1), -(72429,1,1), -(72401,1,0), -(72347,1,0), -(72346,1,1), -(72280,1,0), -(72279,1,0), -(72278,1,0), -(72262,1,0), -(72260,1,0), -(72257,1,1), -(72209,1,0), -(72202,1,0), -(72099,1,0), -(72033,1,0), -(72032,1,0), -(72031,1,0), -(71952,1,0), -(71949,1,1), -(71948,1,0), -(71946,1,0), -(71848,1,0), -(71811,1,0), -(71809,1,0), -(71753,1,1), -(71693,1,0), -(71620,1,0), -(71617,1,0), -(71599,1,0), -(71538,1,1), -(71536,1,1), -(71520,1,0), -(71440,1,0), -(71415,1,0), -(71412,1,0), -(71365,1,0), -(71352,1,1), -(71322,1,0), -(71310,1,0), -(71308,1,0), -(71306,1,0), -(71281,1,0), -(71272,1,0), -(71189,1,0), -(71082,1,0), -(71081,1,0), -(71080,1,0), -(71079,1,0), -(71078,1,0), -(71075,1,0), -(71070,1,0), -(71032,1,0), -(71024,1,0), -(70995,1,0), -(70983,1,0), -(70966,1,1), -(70939,1,0), -(70936,1,0), -(70933,1,0), -(70931,1,0), -(70921,1,0), -(70881,1,0), -(70861,1,0), -(70860,1,0), -(70859,1,0), -(70858,1,0), -(70857,1,0), -(70856,1,0), -(70792,1,0), -(70790,1,0), -(70784,1,0), -(70781,1,0), -(70743,1,0), -(70713,1,1), -(70643,1,0), -(70639,1,0), -(70638,1,1), -(70636,1,1), -(70635,1,0), -(70623,1,1), -(70614,1,0), -(70611,1,0), -(70602,1,0), -(70595,1,0), -(70588,1,0), -(70586,1,0), -(70572,1,0), -(70569,1,0), -(70527,1,1), -(70525,1,0), -(70488,1,0), -(70485,1,0), -(70471,1,0), -(70466,1,0), -(70464,1,0), -(70444,1,0), -(70443,1,1), -(70403,1,0), -(70397,1,0), -(70383,1,0), -(70374,1,0), -(70366,1,0), -(70360,1,0), -(70338,1,0), -(70331,1,1), -(70299,1,0), -(70293,1,0), -(70290,1,0), -(70267,1,0), -(70266,1,0), -(70265,1,0), -(70246,1,0), -(70225,1,0), -(70224,1,0), -(70143,1,0), -(70130,1,0), -(70104,1,0), -(70100,1,0), -(70098,1,0), -(70079,1,0), -(70078,1,0), -(70053,1,0), -(70041,1,0), -(70040,1,0), -(70021,1,0), -(69960,1,0), -(69959,1,0), -(69922,1,0), -(69907,1,0), -(69886,1,0), -(69857,1,0), -(69843,1,0), -(69801,1,0), -(69798,1,0), -(69796,1,0), -(69784,1,0), -(69782,1,0), -(69768,1,0), -(69753,1,0), -(69705,1,0), -(69682,1,0), -(69614,1,0), -(69610,1,0), -(69601,1,0), -(69600,1,0), -(69593,1,0), -(69553,1,0), -(69538,1,0), -(69508,1,0), -(69431,1,0), -(69372,1,0), -(69347,1,0), -(69298,1,1), -(69171,1,0), -(69125,1,0), -(69101,1,0), -(69098,1,0), -(69097,1,0), -(69048,1,1), -(69039,1,0), -(69016,1,0), -(68957,1,0), -(68922,1,0), -(68919,1,0), -(68901,1,0), -(68881,1,0), -(68880,1,0), -(68861,1,0), -(68847,1,0), -(68842,1,0), -(68798,1,0), -(68663,1,0), -(68644,1,0), -(68617,1,0), -(68616,1,0), -(68614,1,0), -(68515,1,1), -(68471,1,1), -(68470,1,1), -(68401,1,0), -(68400,1,0), -(68360,1,0), -(68359,1,0), -(68358,1,0), -(68206,1,1), -(68198,1,1), -(68197,1,1), -(68193,1,1), -(68186,1,1), -(67888,1,0), -(67864,1,0), -(67857,1,0), -(67856,1,0), -(67855,1,0), -(67804,1,0), -(67757,1,0), -(67756,1,0), -(67755,1,0), -(67748,1,0), -(67732,1,0), -(67715,1,0), -(67705,1,0), -(67551,1,1), -(67547,1,0), -(67482,1,0), -(67400,1,0), -(67397,1,0), -(67369,1,0), -(67335,1,0), -(67328,1,0), -(67163,1,0), -(67162,1,0), -(67161,1,0), -(67160,1,0), -(67159,1,0), -(67158,1,0), -(66986,1,1), -(66810,1,1), -(66798,1,0), -(66785,1,0), -(66774,1,0), -(66718,1,1), -(66665,1,0), -(66637,1,0), -(66636,1,0), -(66630,1,0), -(66551,1,0), -(66550,1,0), -(66513,1,0), -(66512,1,0), -(66508,1,0), -(66401,1,0), -(66391,1,0), -(66390,1,0), -(66387,1,0), -(66386,1,0), -(66385,1,0), -(66384,1,0), -(66383,1,0), -(66382,1,0), -(66379,1,0), -(66357,1,0), -(66356,1,0), -(66355,1,0), -(66354,1,0), -(66353,1,0), -(66352,1,0), -(66350,1,0), -(66349,1,0), -(66348,1,0), -(66345,1,0), -(66339,1,0), -(66332,1,0), -(66314,1,1), -(66312,1,1), -(66287,1,0), -(66256,1,0), -(66193,1,0), -(66181,1,0), -(66153,1,0), -(66152,1,0), -(66141,1,0), -(66140,1,0), -(66135,1,1), -(66133,1,0), -(66132,1,0), -(65872,1,0), -(65861,1,0), -(65719,1,0), -(65718,1,0), -(65699,1,0), -(65685,1,0), -(65652,1,0), -(65614,1,0), -(65613,1,0), -(65611,1,0), -(65594,1,1), -(65589,1,0), -(65588,1,0), -(65587,1,0), -(65509,1,0), -(65357,1,0), -(65354,1,0), -(65350,1,0), -(65349,1,0), -(65346,1,1), -(65312,1,1), -(65311,1,1), -(65265,1,0), -(65258,1,0), -(65238,1,0), -(65224,1,0), -(65206,1,0), -(65200,1,0), -(65192,1,0), -(65184,1,1), -(65140,1,0), -(65109,1,0), -(65061,1,0), -(65042,1,0), -(65040,1,1), -(65034,1,0), -(65016,1,0), -(65015,1,0), -(64996,1,0), -(64995,1,0), -(64898,1,0), -(64887,1,0), -(64886,1,0), -(64880,1,0), -(64828,1,0), -(64799,1,0), -(64767,1,0), -(64623,1,0), -(64620,1,0), -(64619,1,0), -(64618,1,0), -(64597,1,0), -(64543,1,0), -(64539,1,0), -(64503,1,0), -(64499,1,0), -(64480,1,0), -(64475,1,0), -(64474,1,0), -(64466,1,0), -(64465,1,0), -(64463,1,0), -(64449,1,0), -(64444,1,0), -(64425,1,0), -(64414,1,0), -(64402,1,0), -(64397,1,0), -(64320,1,0), -(64229,1,0), -(64225,1,0), -(64224,1,0), -(64201,1,0), -(64185,1,0), -(64184,1,0), -(64183,1,0), -(64173,1,0), -(64172,1,0), -(64098,1,0), -(64069,1,0), -(64063,1,0), -(64061,1,0), -(64059,1,1), -(64032,1,0), -(64031,1,0), -(64030,1,0), -(64029,1,0), -(64028,1,0), -(64027,1,0), -(64026,1,0), -(64025,1,0), -(64024,1,0), -(64014,1,0), -(63984,1,0), -(63979,1,0), -(63947,1,0), -(63886,1,0), -(63882,1,0), -(63820,1,0), -(63813,1,0), -(63812,1,0), -(63764,1,0), -(63763,1,0), -(63762,1,0), -(63761,1,0), -(63749,1,0), -(63747,1,1), -(63745,1,1), -(63744,1,0), -(63702,1,0), -(63676,1,0), -(63659,1,0), -(63658,1,0), -(63657,1,0), -(63629,1,0), -(63628,1,0), -(63576,1,0), -(63524,1,0), -(63499,1,0), -(63446,1,0), -(63445,1,0), -(63444,1,0), -(63443,1,0), -(63442,1,0), -(63441,1,0), -(63440,1,0), -(63439,1,0), -(63438,1,0), -(63352,1,0), -(63348,1,0), -(63322,1,1), -(63274,1,0), -(63255,1,0), -(63238,1,0), -(63109,1,0), -(63037,1,0), -(63013,1,0), -(63001,1,0), -(62990,1,0), -(62978,1,0), -(62976,1,0), -(62943,1,0), -(62911,1,0), -(62909,1,0), -(62906,1,0), -(62888,1,0), -(62883,1,0), -(62882,1,0), -(62834,1,0), -(62809,1,0), -(62797,1,1), -(62778,1,0), -(62731,1,0), -(62727,1,0), -(62711,1,0), -(62708,1,0), -(62706,1,0), -(62701,1,0), -(62669,1,0), -(62646,1,0), -(62603,1,0), -(62584,1,0), -(62577,1,0), -(62567,1,0), -(62533,1,0), -(62525,1,0), -(62524,1,0), -(62521,1,0), -(62509,1,0), -(62505,1,0), -(62496,1,0), -(62488,1,0), -(62485,1,0), -(62484,1,0), -(62483,1,0), -(62480,1,0), -(62464,1,0), -(62378,1,0), -(124,1,0), -(2222,1,0), -(3730,1,0), -(4020,1,0), -(4338,1,0), -(5249,1,0), -(5251,1,0), -(5432,1,0), -(5555,1,0), -(6636,1,0), -(6672,1,0), -(6755,1,0), -(6955,1,0), -(6967,1,0), -(7022,1,0), -(7035,1,0), -(7036,1,0), -(7277,1,0), -(7393,1,0), -(7670,1,0), -(7769,1,0), -(8283,1,0), -(8593,1,0), -(8596,1,0), -(9002,1,0), -(9003,1,0), -(9004,1,0), -(9012,1,0), -(9082,1,0), -(9095,1,0), -(9455,1,0), -(9457,1,0), -(9712,1,0), -(9976,1,0), -(10113,1,0), -(10137,1,0), -(10252,1,0), -(10258,1,0), -(10259,1,0), -(10260,1,0), -(10345,1,0), -(10604,1,0), -(10727,1,0), -(10747,1,0), -(11195,1,0), -(11402,1,0), -(11440,1,0), -(11513,1,0), -(11637,1,0), -(11757,1,0), -(11893,1,0), -(12134,1,0), -(12158,1,0), -(12159,1,0), -(12347,1,0), -(12512,1,0), -(12564,1,0), -(12613,1,0), -(12623,1,0), -(12699,1,0), -(12709,1,0), -(12774,1,0), -(12938,1,0), -(13461,1,0), -(13727,1,0), -(13821,1,0), -(13951,1,0), -(13982,1,0), -(14250,1,0), -(14292,1,0), -(14806,1,0), -(14813,1,0), -(14928,1,0), -(15252,1,0), -(15281,1,0), -(15591,1,0), -(15658,1,0), -(15746,1,0), -(15958,1,0), -(16007,1,0), -(16032,1,0), -(16037,1,0), -(16053,1,0), -(16068,1,0), -(16069,1,0), -(16070,1,0), -(16074,1,0), -(16378,1,0), -(16381,1,0), -(16404,1,0), -(16556,1,0), -(16558,1,0), -(16637,1,0), -(16786,1,0), -(16807,1,0), -(17048,1,0), -(17166,1,0), -(17190,1,0), -(17202,1,0), -(17272,1,0), -(17278,1,0), -(17279,1,0), -(17471,1,0), -(17536,1,0), -(17616,1,0), -(17618,1,0), -(17652,1,0), -(17671,1,0), -(17675,1,0), -(17676,1,0), -(17677,1,0), -(17678,1,0), -(17698,1,0), -(17748,1,0), -(18110,1,0), -(18655,1,0), -(18666,1,0), -(18811,1,0), -(18969,1,0), -(19032,1,0), -(19096,1,0), -(19571,1,0), -(19593,1,0), -(19721,1,0), -(19749,1,0), -(19770,1,0), -(19773,1,0), -(19952,1,0), -(20358,1,0), -(20465,1,0), -(20619,1,0), -(21052,1,0), -(21075,1,0), -(21076,1,0), -(21391,1,0), -(21556,1,0), -(21566,1,0), -(21885,1,0), -(21950,1,0), -(22096,1,0), -(22203,1,0), -(22205,1,0), -(22393,1,0), -(22458,1,0), -(22860,1,0), -(22906,1,0), -(22966,1,0), -(23014,1,0), -(23016,1,0), -(23018,1,0), -(23019,1,0), -(23168,1,0), -(23328,1,0), -(23360,1,0), -(23389,1,0), -(23394,1,0), -(23415,1,0), -(23642,1,0), -(23951,1,0), -(23974,1,0), -(24062,1,0), -(24083,1,0), -(24172,1,0), -(24207,1,0), -(24217,1,0), -(24311,1,0), -(24322,1,0), -(24323,1,0), -(24391,1,0), -(24734,1,0), -(24744,1,0), -(24756,1,0), -(24758,1,0), -(24760,1,0), -(24763,1,0), -(24765,1,0), -(24768,1,0), -(24770,1,0), -(24772,1,0), -(24784,1,0), -(24786,1,0), -(24788,1,0), -(24789,1,0), -(24790,1,0), -(24804,1,0), -(24933,1,0), -(25030,1,0), -(25031,1,0), -(25032,1,0), -(25099,1,0), -(25145,1,0), -(25149,1,0), -(25150,1,0), -(25158,1,0), -(25201,1,0), -(25715,1,0), -(25727,1,0), -(25745,1,0), -(25822,1,0), -(25823,1,0), -(25896,1,0), -(26235,1,0), -(26344,1,0), -(26345,1,0), -(26346,1,0), -(26347,1,0), -(26348,1,0), -(26349,1,0), -(26351,1,0), -(26352,1,0), -(26353,1,0), -(26354,1,0), -(26355,1,0), -(26356,1,0), -(26462,1,0), -(26522,1,1), -(26608,1,0), -(26687,1,1), -(26879,1,0), -(27583,1,0), -(27651,1,0), -(27663,1,0), -(27745,1,0), -(27885,1,0), -(27886,1,0), -(27892,1,0), -(27893,1,0), -(27894,1,0), -(27928,1,0), -(27929,1,0), -(27935,1,0), -(27936,1,0), -(28018,1,0), -(28032,1,0), -(28056,1,0), -(28078,1,0), -(28087,1,0), -(28096,1,0), -(28111,1,0), -(28159,1,0), -(28278,1,0), -(28281,1,0), -(28309,1,0), -(28326,1,0), -(28338,1,0), -(28339,1,0), -(28365,1,0), -(28366,1,0), -(28367,1,0), -(28374,1,0), -(28392,1,0), -(28404,1,0), -(28441,1,0), -(28605,1,0), -(28697,1,0), -(28731,1,0), -(28732,1,0), -(28861,1,0), -(29070,1,0), -(29072,1,0), -(29120,1,0), -(29121,1,0), -(29122,1,0), -(29172,1,0), -(29173,1,0), -(29176,1,0), -(29328,1,1), -(29339,1,0), -(29340,1,0), -(29428,1,0), -(29437,1,0), -(29456,1,0), -(29457,1,0), -(29458,1,0), -(29459,1,0), -(29461,1,0), -(29531,1,0), -(29534,1,0), -(29612,1,0), -(29705,1,0), -(29726,1,0), -(29727,1,0), -(29769,1,0), -(29770,1,0), -(29846,1,1), -(29962,1,0), -(29966,1,0), -(29967,1,0), -(29969,1,0), -(29970,1,0), -(29972,1,0), -(29989,1,0), -(30012,1,0), -(30065,1,0), -(30107,1,0), -(30166,1,0), -(30207,1,0), -(30221,1,0), -(30232,1,0), -(30273,1,0), -(30410,1,0), -(30417,1,0), -(30418,1,0), -(30425,1,0), -(30427,1,0), -(30460,1,0), -(30462,1,0), -(30469,1,0), -(30477,1,0), -(30541,1,0), -(30544,1,0), -(30571,1,1), -(30572,1,0), -(30625,1,0), -(30631,1,1), -(30656,1,0), -(30662,1,0), -(30676,1,0), -(30690,1,0), -(30735,1,0), -(30738,1,0), -(30745,1,0), -(30751,1,0), -(30762,1,0), -(30763,1,0), -(30764,1,0), -(30765,1,0), -(30766,1,0), -(30834,1,0), -(30835,1,0), -(30875,1,0), -(30876,1,0), -(30951,1,0), -(30952,1,0), -(30964,1,0), -(30968,1,0), -(30970,1,0), -(30974,1,0), -(30985,1,0), -(30988,1,0), -(31115,1,0), -(31225,1,0), -(31315,1,0), -(31324,1,0), -(31326,1,0), -(31329,1,0), -(31336,1,0), -(31346,1,0), -(31411,1,0), -(31412,1,0), -(31413,1,0), -(31414,1,0), -(31474,1,0), -(31515,1,0), -(31532,1,0), -(31537,1,0), -(31550,1,0), -(31611,1,0), -(31628,1,0), -(31630,1,0), -(31631,1,0), -(31702,1,0), -(31727,1,0), -(31736,1,0), -(31749,1,0), -(31781,1,0), -(31793,1,0), -(31799,1,0), -(31806,1,0), -(31889,1,0), -(31902,1,0), -(31936,1,0), -(31979,1,0), -(31993,1,0), -(32040,1,0), -(32042,1,0), -(32045,1,0), -(32051,1,0), -(32052,1,0), -(32087,1,0), -(32111,1,0), -(32127,1,0), -(32146,1,0), -(32163,1,0), -(32164,1,0), -(32227,1,0), -(32228,1,0), -(32251,1,0), -(32260,1,0), -(32286,1,0), -(32301,1,0), -(32303,1,0), -(32312,1,0), -(32373,1,0), -(32396,1,0), -(32560,1,0), -(32573,1,0), -(32589,1,0), -(32622,1,0), -(32623,1,0), -(32638,1,0), -(32668,1,0), -(32708,1,1), -(32760,1,0), -(32838,1,0), -(32890,1,0), -(32928,1,0), -(32929,1,0), -(32930,1,0), -(32953,1,0), -(32958,1,0), -(32974,1,0), -(32976,1,0), -(32979,1,0), -(33067,1,0), -(33270,1,1), -(33329,1,0), -(33332,1,0), -(33336,1,0), -(33337,1,0), -(33423,1,0), -(33424,1,0), -(33425,1,0), -(33531,1,0), -(33532,1,0), -(33618,1,0), -(33644,1,0), -(33655,1,0), -(33669,1,0), -(33710,1,0), -(33716,1,1), -(33742,1,0), -(33744,1,0), -(33796,1,0), -(33805,1,0), -(33806,1,0), -(33809,1,0), -(33822,1,0), -(33831,1,0), -(33838,1,0), -(33861,1,0), -(33862,1,0), -(33918,1,0), -(33924,1,0), -(33937,1,0), -(33981,1,0), -(34011,1,0), -(34013,1,0), -(34016,1,0), -(34019,1,0), -(34023,1,0), -(34024,1,0), -(34062,1,0), -(34063,1,0), -(34076,1,0), -(34119,1,0), -(34154,1,0), -(34156,1,0), -(34209,1,0), -(34211,1,0), -(34212,1,0), -(34221,1,0), -(34239,1,0), -(34254,1,0), -(34330,1,0), -(34332,1,0), -(34367,1,0), -(34378,1,0), -(34393,1,0), -(34397,1,0), -(34430,1,0), -(34516,1,0), -(34526,1,0), -(34536,1,0), -(34581,1,0), -(34583,1,0), -(34613,1,0), -(34627,1,0), -(34646,1,0), -(34662,1,0), -(34742,1,0), -(34806,1,0), -(34874,1,0), -(34893,1,0), -(34946,1,0), -(35016,1,0), -(35040,1,0), -(35063,1,0), -(35097,1,0), -(35113,1,0), -(35137,1,0), -(35140,1,0), -(35141,1,0), -(35155,1,0), -(35160,1,0), -(35162,1,0), -(35170,1,0), -(35176,1,0), -(35190,1,0), -(35245,1,0), -(35262,1,0), -(35282,1,0), -(35301,1,0), -(35372,1,0), -(35413,1,0), -(35427,1,0), -(35515,1,0), -(35516,1,0), -(35598,1,0), -(35600,1,0), -(35673,1,0), -(35682,1,0), -(35724,1,0), -(35746,1,0), -(35756,1,0), -(35770,1,0), -(35771,1,0), -(35772,1,0), -(35782,1,0), -(35930,1,0), -(35941,1,1), -(35956,1,1), -(35960,1,0), -(35961,1,0), -(35962,1,0), -(36000,1,0), -(36035,1,0), -(36089,1,0), -(36090,1,0), -(36103,1,0), -(36167,1,0), -(36174,1,0), -(36196,1,0), -(36197,1,0), -(36198,1,0), -(36201,1,0), -(36220,1,0), -(36239,1,0), -(36241,1,0), -(36243,1,0), -(36290,1,0), -(36291,1,0), -(36293,1,0), -(36327,1,0), -(36330,1,0), -(36378,1,0), -(36384,1,0), -(36431,1,0), -(36452,1,0), -(36455,1,1), -(36456,1,0), -(36514,1,0), -(36544,1,0), -(36639,1,0), -(36651,1,0), -(36652,1,0), -(36692,1,0), -(36709,1,0), -(36717,1,1), -(36779,1,0), -(36795,1,0), -(36802,1,0), -(36803,1,0), -(36804,1,0), -(36823,1,0), -(36852,1,0), -(36854,1,0), -(36856,1,0), -(36857,1,0), -(36858,1,0), -(36859,1,0), -(36871,1,0), -(36878,1,0), -(36884,1,0), -(36896,1,0), -(36951,1,0), -(36953,1,0), -(36969,1,0), -(36995,1,0), -(37013,1,0), -(37017,1,0), -(37032,1,0), -(37033,1,0), -(37034,1,0), -(37035,1,0), -(37051,1,0), -(37052,1,0), -(37053,1,0), -(37055,1,0), -(37056,1,0), -(37071,1,0), -(37072,1,0), -(37103,1,0), -(37142,1,0), -(37143,1,0), -(37144,1,0), -(37146,1,0), -(37147,1,0), -(37148,1,0), -(37149,1,0), -(37150,1,0), -(37151,1,0), -(37152,1,0), -(37153,1,0), -(37199,1,0), -(37220,1,0), -(37226,1,0), -(37229,1,0), -(37235,1,0), -(37281,1,0), -(37285,1,0), -(37337,1,0), -(37339,1,0), -(37345,1,0), -(37348,1,0), -(37388,1,0), -(37406,1,0), -(37408,1,1), -(37413,1,0), -(37422,1,0), -(37427,1,0), -(37428,1,0), -(37448,1,1), -(37449,1,1), -(37453,1,0), -(37454,1,0), -(37459,1,0), -(37461,1,0), -(37465,1,0), -(37469,1,0), -(37471,1,0), -(37472,1,0), -(37474,1,0), -(37476,1,0), -(37498,1,0), -(37502,1,0), -(37573,1,0), -(37626,1,0), -(37645,1,0), -(37689,1,0), -(37697,1,0), -(37712,1,0), -(37720,1,0), -(37748,1,0), -(37755,1,0), -(37775,1,0), -(37784,1,0), -(37824,1,0), -(37842,1,0), -(37843,1,0), -(37848,1,0), -(37849,1,1), -(37853,1,0), -(37868,1,0), -(37893,1,0), -(37895,1,0), -(37918,1,0), -(37934,1,0), -(37936,1,0), -(37964,1,0), -(37984,1,0), -(38003,1,0), -(38014,1,0), -(38015,1,0), -(38017,1,0), -(38020,1,0), -(38053,1,0), -(38054,1,0), -(38072,1,0), -(38073,1,0), -(38112,1,0), -(38121,1,0), -(38123,1,0), -(38126,1,0), -(38128,1,0), -(38130,1,0), -(38202,1,0), -(38250,1,0), -(38269,1,0), -(38360,1,0), -(38444,1,0), -(38451,1,0), -(38452,1,0), -(38455,1,0), -(38469,1,0), -(38482,1,0), -(38508,1,0), -(38530,1,0), -(38629,1,0), -(38632,1,0), -(38691,1,0), -(38711,1,0), -(38722,1,0), -(38736,1,0), -(38738,1,0), -(38762,1,0), -(38802,1,0), -(38829,1,1), -(38966,1,0), -(38968,1,0), -(39010,1,0), -(39011,1,0), -(39043,1,0), -(39073,1,0), -(39094,1,0), -(39124,1,0), -(39126,1,0), -(39140,1,0), -(39141,1,0), -(39184,1,0), -(39185,1,0), -(39189,1,0), -(39190,1,0), -(39206,1,0), -(39211,1,0), -(39216,1,0), -(39219,1,0), -(39221,1,0), -(39248,1,0), -(39334,1,0), -(39335,1,0), -(39338,1,0), -(39341,1,0), -(39342,1,0), -(39344,1,0), -(39350,1,0), -(39352,1,0), -(39353,1,0), -(39354,1,0), -(39355,1,0), -(39356,1,0), -(39357,1,0), -(39358,1,0), -(39359,1,0), -(39360,1,0), -(39361,1,0), -(39362,1,0), -(39395,1,0), -(39495,1,0), -(39497,1,1), -(39552,1,0), -(39559,1,0), -(39583,1,0), -(39601,1,0), -(39635,1,0), -(39678,1,0), -(39687,1,0), -(39690,1,0), -(39691,1,0), -(39692,1,0), -(39696,1,0), -(39758,1,0), -(39834,1,1), -(39849,1,0), -(39851,1,1), -(39852,1,1), -(39853,1,1), -(39854,1,1), -(39873,1,0), -(39899,1,0), -(39914,1,0), -(39915,1,0), -(39919,1,0), -(39921,1,0), -(39923,1,1), -(39930,1,0), -(39938,1,0), -(39939,1,0), -(39940,1,0), -(39974,1,0), -(39977,1,0), -(39978,1,0), -(39985,1,0), -(39989,1,0), -(39993,1,0), -(39999,1,0), -(40085,1,0), -(40094,1,0), -(40106,1,0), -(40110,1,0), -(40112,1,1), -(40136,1,0), -(40147,1,0), -(40153,1,0), -(40156,1,0), -(40160,1,0), -(40187,1,0), -(40189,1,0), -(40190,1,0), -(40224,1,0), -(40281,1,0), -(40287,1,0), -(40288,1,0), -(40289,1,0), -(40309,1,0), -(40350,1,0), -(40359,1,0), -(40382,1,0), -(40383,1,0), -(40397,1,0), -(40437,1,0), -(40439,1,0), -(40454,1,0), -(40490,1,0), -(40494,1,0), -(40498,1,0), -(40499,1,0), -(40512,1,0), -(40520,1,0), -(40521,1,0), -(40523,1,0), -(40532,1,0), -(40547,1,0), -(40607,1,0), -(40638,1,0), -(40693,1,0), -(40704,1,0), -(40707,1,0), -(40708,1,0), -(40709,1,0), -(40710,1,0), -(40711,1,0), -(40712,1,0), -(40713,1,0), -(40715,1,0), -(40730,1,1), -(40738,1,0), -(40750,1,0), -(40761,1,0), -(40788,1,0), -(40821,1,0), -(40824,1,0), -(40825,1,0), -(40828,1,0), -(40830,1,0), -(40848,1,1), -(40874,1,0), -(40887,1,0), -(40978,1,0), -(40985,1,1), -(40989,1,0), -(40993,1,1), -(41007,1,1), -(41015,1,1), -(41022,1,1), -(41073,1,0), -(41077,1,0), -(41122,1,0), -(41124,1,0), -(41125,1,0), -(41128,1,0), -(41129,1,0), -(41154,1,0), -(41257,1,0), -(41268,1,0), -(41269,1,0), -(41271,1,0), -(41285,1,1), -(41295,1,0), -(41333,1,0), -(41342,1,0), -(41343,1,0), -(41344,1,0), -(41362,1,0), -(41455,1,0), -(41457,1,0), -(41477,1,0), -(41499,1,0), -(41522,1,0), -(41525,1,0), -(41537,1,0), -(41557,1,0), -(41560,1,0), -(41575,1,0), -(41602,1,0), -(41614,1,0), -(41624,1,1), -(41975,1,0), -(41976,1,0), -(41993,1,0), -(42008,1,0), -(42014,1,0), -(42138,1,1), -(42143,1,0), -(42151,1,0), -(42166,1,0), -(42167,1,0), -(42168,1,0), -(42178,1,0), -(42219,1,0), -(42222,1,0), -(42247,1,0), -(42269,1,0), -(42271,1,0), -(42272,1,0), -(42289,1,0), -(42317,1,0), -(42318,1,0), -(42321,1,0), -(42339,1,0), -(42341,1,0), -(42352,1,0), -(42356,1,0), -(42391,1,0), -(42393,1,0), -(42405,1,0), -(42410,1,0), -(42415,1,0), -(42428,1,0), -(42442,1,0), -(42447,1,0), -(42454,1,0), -(42471,1,0), -(42473,1,0), -(42482,1,0), -(42484,1,0), -(42515,1,0), -(42517,1,0), -(42530,1,0), -(42534,1,0), -(42536,1,0), -(42542,1,0), -(42550,1,0), -(42564,1,0), -(42567,1,0), -(42570,1,0), -(42577,1,0), -(42585,1,0), -(42604,1,0), -(42605,1,0), -(42616,1,0), -(42631,1,0), -(42638,1,1), -(42647,1,0), -(42654,1,0), -(42655,1,0), -(42659,1,0), -(42661,1,0), -(42664,1,0), -(42674,1,1), -(42685,1,0), -(42695,1,0), -(42697,1,0), -(42703,1,0), -(42707,1,0), -(42713,1,0), -(42720,1,0), -(42734,1,0), -(42757,1,1), -(42768,1,0), -(42793,1,0), -(42797,1,0), -(42808,1,0), -(42809,1,0), -(42813,1,0), -(42815,1,0), -(42816,1,0), -(42818,1,0), -(42821,1,0), -(42839,1,0), -(42857,1,0), -(42881,1,0), -(42882,1,0), -(42883,1,0), -(42884,1,0), -(42888,1,0), -(42905,1,0), -(42968,1,0), -(42982,1,0), -(43033,1,0), -(43035,1,0), -(43057,1,0), -(43066,1,0), -(43068,1,0), -(43069,1,0), -(43072,1,0), -(43076,1,0), -(43078,1,0), -(43079,1,0), -(43092,1,0), -(43101,1,0), -(43106,1,0), -(43109,1,0), -(43144,1,0), -(43171,1,0), -(43209,1,0), -(43210,1,0), -(43234,1,0), -(43239,1,0), -(43244,1,0), -(43255,1,0), -(43291,1,0), -(43306,1,0), -(43307,1,0), -(43333,1,0), -(43371,1,0), -(43385,1,0), -(43386,1,0), -(43403,1,0), -(43404,1,0), -(43407,1,0), -(43450,1,0), -(43458,1,0), -(43468,1,0), -(43486,1,0), -(43487,1,0), -(43515,1,0), -(43520,1,0), -(43525,1,0), -(43546,1,0), -(43559,1,0), -(43563,1,0), -(43568,1,0), -(43615,1,0), -(43647,1,0), -(43662,1,0), -(43685,1,0), -(43691,1,0), -(43711,1,0), -(43734,1,0), -(43754,1,0), -(43770,1,0), -(43791,1,0), -(43805,1,0), -(43863,1,0), -(43865,1,0), -(43867,1,0), -(43871,1,0), -(43872,1,0), -(43878,1,0), -(43882,1,0), -(43892,1,0), -(43942,1,0), -(43943,1,0), -(43949,1,0), -(43962,1,0), -(43990,1,0), -(43994,1,0), -(44014,1,0), -(44022,1,0), -(44023,1,0), -(44024,1,0), -(44026,1,0), -(44027,1,0), -(44028,1,0), -(44037,1,0), -(44145,1,0), -(44161,1,0), -(44193,1,0), -(44214,1,0), -(44224,1,1), -(44229,1,0), -(44232,1,1), -(44250,1,0), -(44255,1,0), -(44260,1,0), -(44266,1,0), -(44270,1,0), -(44283,1,0), -(44284,1,0), -(44309,1,0), -(44313,1,0), -(44329,1,0), -(44330,1,0), -(44355,1,0), -(44362,1,0), -(44365,1,0), -(44367,1,0), -(44374,1,0), -(44392,1,0), -(44411,1,0), -(44420,1,0), -(44422,1,0), -(44458,1,0), -(44550,1,0), -(44562,1,0), -(44574,1,0), -(44609,1,0), -(44610,1,0), -(44653,1,0), -(44681,1,0), -(44682,1,1), -(44749,1,0), -(44804,1,0), -(44807,1,0), -(44826,1,0), -(44837,1,0), -(44838,1,0), -(44839,1,0), -(44840,1,0), -(44841,1,0), -(44842,1,0), -(44845,1,0), -(44846,1,0), -(44849,1,1), -(44864,1,0), -(44865,1,0), -(44872,1,0), -(44877,1,0), -(44883,1,0), -(44886,1,0), -(44938,1,0), -(44939,1,0), -(44941,1,0), -(44946,1,0), -(44948,1,0), -(44963,1,0), -(44965,1,0), -(44981,1,0), -(45005,1,0), -(45008,1,0), -(45012,1,0), -(45013,1,0), -(45076,1,0), -(45086,1,0), -(45103,1,0), -(45109,1,0), -(45114,1,0), -(45115,1,0), -(45119,1,0), -(45172,1,0), -(45188,1,0), -(45191,1,0), -(45219,1,0), -(45223,1,0), -(45224,1,0), -(45229,1,0), -(45233,1,0), -(45259,1,0), -(45260,1,1), -(45264,1,0), -(45267,1,0), -(45277,1,0), -(45279,1,0), -(45307,1,0), -(45323,1,0), -(45339,1,0), -(45340,1,0), -(45351,1,0), -(45368,1,0), -(45371,1,0), -(45388,1,0), -(45389,1,0), -(45405,1,0), -(45407,1,0), -(45414,1,0), -(45437,1,0), -(45446,1,0), -(45448,1,0), -(45449,1,0), -(45465,1,0), -(45474,1,0), -(45536,1,0), -(45581,1,0), -(45583,1,0), -(45586,1,0), -(45594,1,0), -(45595,1,0), -(45596,1,0), -(45597,1,0), -(45602,1,0), -(45605,1,0), -(45606,1,0), -(45607,1,0), -(45608,1,0), -(45609,1,0), -(45622,1,0), -(45623,1,0), -(45630,1,0), -(45634,1,0), -(45644,1,1), -(45651,1,0), -(45655,1,0), -(45656,1,0), -(45666,1,0), -(45667,1,0), -(45671,1,1), -(45680,1,1), -(45692,1,0), -(45700,1,0), -(45714,1,0), -(45732,1,0), -(45735,1,0), -(45761,1,0), -(45774,1,0), -(45780,1,0), -(45788,1,0), -(45805,1,0), -(45808,1,0), -(45834,1,0), -(45835,1,0), -(45841,1,0), -(45853,1,0), -(45859,1,0), -(45863,1,0), -(45864,1,0), -(45867,1,0), -(45872,1,0), -(45888,1,0), -(45907,1,0), -(45911,1,0), -(45912,1,0), -(45914,1,0), -(45918,1,1), -(45923,1,0), -(45929,1,0), -(45930,1,0), -(45941,1,0), -(45949,1,0), -(45961,1,0), -(45968,1,0), -(45969,1,0), -(45970,1,0), -(45976,1,0), -(45979,1,0), -(45990,1,0), -(45993,1,0), -(46013,1,0), -(46018,1,1), -(46022,1,0), -(46034,1,0), -(46054,1,0), -(46058,1,0), -(46063,1,0), -(46066,1,0), -(46068,1,0), -(46085,1,0), -(46143,1,0), -(46171,1,0), -(46173,1,0), -(62377,1,0), -(46175,1,0), -(46176,1,0), -(46177,1,0), -(46178,1,0), -(46201,1,0), -(46208,1,0), -(46219,1,0), -(46222,1,0), -(46236,1,0), -(46237,1,0), -(46245,1,0), -(46246,1,0), -(46281,1,0), -(46307,1,1), -(46318,1,0), -(46319,1,0), -(46320,1,1), -(46330,1,0), -(46363,1,0), -(46372,1,1), -(46374,1,0), -(46376,1,0), -(46382,1,0), -(46385,1,0), -(46396,1,1), -(46398,1,0), -(46399,1,0), -(46400,1,0), -(46474,1,0), -(46475,1,0), -(46477,1,0), -(46482,1,0), -(46488,1,0), -(46521,1,0), -(46588,1,1), -(46592,1,0), -(46593,1,0), -(46603,1,0), -(46609,1,0), -(46610,1,0), -(46623,1,0), -(46631,1,0), -(46637,1,0), -(46650,1,0), -(46652,1,0), -(46656,1,0), -(46685,1,0), -(46692,1,0), -(46694,1,0), -(46704,1,0), -(46707,1,0), -(46732,1,1), -(46733,1,0), -(46735,1,0), -(46747,1,0), -(46793,1,0), -(46797,1,0), -(46809,1,0), -(46815,1,0), -(46818,1,0), -(46820,1,0), -(46843,1,0), -(46886,1,0), -(46895,1,0), -(46900,1,0), -(46902,1,0), -(46903,1,0), -(46904,1,0), -(46936,1,0), -(46937,1,0), -(46963,1,0), -(46964,1,0), -(46965,1,1), -(46974,1,0), -(47016,1,0), -(47026,1,0), -(47035,1,0), -(47060,1,0), -(47065,1,0), -(47104,1,0), -(47110,1,0), -(47137,1,0), -(47170,1,0), -(47176,1,0), -(47184,1,0), -(47214,1,0), -(47253,1,0), -(47254,1,0), -(47336,1,0), -(47344,1,0), -(47370,1,1), -(47374,1,0), -(47378,1,0), -(47421,1,0), -(47452,1,0), -(47460,1,0), -(47463,1,0), -(47469,1,0), -(47542,1,0), -(47547,1,0), -(47563,1,0), -(47574,1,0), -(47593,1,0), -(47594,1,0), -(47596,1,0), -(47597,1,0), -(47598,1,0), -(47599,1,0), -(47616,1,0), -(47617,1,0), -(47618,1,0), -(47619,1,0), -(47634,1,0), -(47669,1,0), -(47670,1,0), -(47681,1,0), -(47682,1,0), -(47683,1,0), -(47684,1,0), -(47685,1,0), -(47691,1,1), -(47711,1,0), -(47712,1,0), -(47713,1,0), -(47747,1,0), -(47771,1,0), -(47787,1,0), -(47799,1,0), -(47911,1,0), -(47913,1,0), -(47916,1,0), -(47933,1,0), -(47935,1,0), -(47939,1,0), -(47959,1,0), -(48009,1,0), -(48021,1,0), -(48028,1,1), -(48035,1,0), -(48115,1,0), -(48117,1,0), -(48183,1,0), -(48185,1,0), -(48188,1,0), -(48194,1,1), -(48199,1,0), -(48201,1,0), -(48202,1,0), -(48213,1,0), -(48218,1,0), -(48222,1,0), -(48223,1,0), -(48227,1,0), -(48246,1,1), -(48252,1,0), -(48293,1,0), -(48306,1,0), -(48315,1,0), -(48329,1,0), -(48344,1,0), -(48345,1,0), -(48362,1,0), -(48363,1,0), -(48375,1,0), -(48385,1,0), -(48398,1,0), -(48399,1,0), -(48425,1,0), -(48426,1,0), -(48455,1,0), -(48490,1,0), -(48497,1,0), -(48508,1,0), -(48530,1,0), -(48551,1,0), -(48597,1,0), -(48600,1,0), -(48605,1,0), -(48620,1,0), -(48623,1,0), -(48627,1,0), -(48641,1,0), -(48642,1,0), -(48646,1,0), -(48649,1,0), -(48685,1,0), -(48724,1,0), -(48726,1,0), -(48728,1,0), -(48730,1,0), -(48732,1,0), -(48748,1,0), -(48764,1,0), -(48771,1,0), -(48773,1,0), -(48790,1,0), -(48793,1,0), -(48799,1,0), -(48808,1,0), -(48811,1,0), -(48896,1,0), -(48901,1,0), -(48904,1,0), -(48929,1,0), -(48974,1,0), -(48975,1,0), -(49022,1,0), -(49030,1,0), -(49058,1,0), -(49062,1,0), -(49075,1,0), -(49080,1,0), -(49083,1,0), -(49118,1,0), -(49125,1,0), -(49128,1,0), -(49129,1,0), -(49131,1,0), -(49134,1,0), -(49135,1,0), -(49159,1,0), -(49166,1,0), -(49210,1,0), -(49211,1,0), -(49262,1,0), -(49291,1,0), -(49292,1,0), -(49313,1,0), -(49319,1,0), -(49325,1,0), -(49330,1,0), -(49332,1,0), -(49333,1,0), -(49334,1,0), -(49367,1,0), -(49370,1,0), -(49404,1,0), -(49405,1,0), -(49428,1,0), -(49434,1,0), -(49515,1,0), -(49517,1,0), -(49519,1,0), -(49524,1,0), -(49525,1,0), -(49552,1,0), -(49554,1,0), -(49555,1,0), -(49557,1,0), -(49590,1,0), -(49625,1,0), -(49634,1,0), -(49679,1,0), -(49682,1,0), -(49683,1,0), -(49684,1,0), -(49731,1,0), -(49751,1,0), -(49762,1,0), -(49825,1,0), -(49826,1,0), -(49829,1,0), -(49858,1,0), -(49862,1,0), -(49870,1,0), -(49899,1,0), -(49947,1,0), -(50036,1,0), -(50087,1,0), -(50133,1,0), -(50173,1,0), -(50174,1,0), -(50176,1,0), -(50177,1,0), -(50178,1,0), -(50179,1,0), -(50312,1,0), -(50315,1,1), -(50331,1,0), -(50350,1,0), -(50382,1,0), -(50383,1,0), -(50398,1,1), -(50430,1,0), -(50440,1,0), -(50492,1,0), -(50515,1,0), -(50524,1,0), -(50546,1,0), -(50547,1,0), -(50548,1,0), -(50554,1,0), -(50556,1,0), -(50562,1,0), -(50563,1,0), -(50568,1,0), -(50569,1,0), -(50592,1,0), -(50628,1,0), -(50669,1,0), -(50674,1,0), -(50682,1,1), -(50742,1,0), -(50775,1,0), -(50793,1,0), -(50794,1,0), -(50817,1,0), -(50835,1,0), -(50878,1,0), -(50883,1,1), -(50892,1,0), -(51001,1,0), -(51022,1,0), -(51023,1,0), -(51024,1,0), -(51025,1,0), -(51039,1,0), -(51049,1,0), -(51122,1,0), -(51136,1,0), -(51139,1,0), -(51152,1,0), -(51171,1,0), -(51172,1,0), -(51202,1,0), -(51213,1,0), -(51215,1,0), -(51234,1,0), -(51239,1,0), -(51247,1,0), -(51256,1,0), -(51276,1,0), -(51288,1,0), -(51318,1,0), -(51331,1,0), -(51332,1,0), -(51333,1,0), -(51343,1,0), -(51366,1,0), -(51368,1,0), -(51381,1,0), -(51384,1,0), -(51393,1,0), -(51396,1,0), -(51403,1,0), -(51420,1,0), -(51448,1,1), -(51516,1,0), -(51518,1,0), -(51577,1,0), -(51579,1,0), -(51590,1,0), -(51603,1,0), -(51606,1,0), -(51607,1,0), -(51616,1,0), -(51639,1,0), -(51641,1,0), -(51642,1,0), -(51643,1,0), -(51644,1,0), -(51645,1,0), -(51649,1,0), -(51650,1,0), -(51651,1,0), -(51652,1,0), -(51670,1,0), -(51694,1,0), -(51697,1,0), -(51727,1,0), -(51737,1,0), -(51739,1,0), -(51743,1,0), -(51754,1,0), -(51767,1,0), -(51769,1,0), -(51773,1,0), -(51774,1,0), -(51791,1,0), -(51794,1,0), -(51825,1,0), -(51840,1,0), -(51843,1,0), -(51858,1,0), -(51859,1,0), -(51861,1,0), -(51866,1,0), -(51870,1,0), -(51902,1,0), -(51904,1,0), -(51907,1,0), -(51910,1,0), -(51925,1,0), -(51927,1,0), -(51931,1,0), -(51932,1,0), -(51933,1,0), -(51942,1,0), -(51959,1,0), -(51964,1,0), -(51965,1,0), -(52011,1,0), -(52037,1,0), -(52059,1,0), -(52064,1,0), -(52089,1,0), -(52106,1,0), -(52122,1,0), -(52124,1,0), -(52140,1,0), -(52151,1,0), -(52164,1,0), -(52170,1,0), -(52173,1,0), -(52185,1,0), -(52227,1,0), -(52229,1,0), -(52238,1,0), -(52239,1,0), -(52242,1,0), -(52247,1,0), -(52254,1,0), -(52257,1,0), -(52259,1,0), -(52264,1,0), -(52294,1,0), -(52313,1,0), -(52322,1,0), -(52335,1,0), -(52336,1,0), -(52337,1,1), -(52340,1,0), -(52343,1,0), -(52349,1,0), -(52365,1,1), -(52369,1,0), -(52371,1,0), -(52381,1,0), -(52387,1,0), -(52388,1,0), -(52407,1,0), -(52412,1,0), -(52414,1,0), -(52427,1,0), -(52438,1,0), -(52446,1,0), -(52449,1,0), -(52452,1,0), -(52453,1,0), -(52454,1,0), -(52457,1,0), -(52458,1,0), -(52512,1,0), -(52514,1,0), -(52528,1,0), -(52576,1,0), -(52577,1,0), -(52585,1,0), -(52607,1,0), -(52632,1,0), -(52638,1,0), -(52654,1,0), -(52661,1,0), -(52676,1,0), -(52681,1,0), -(52686,1,0), -(52687,1,0), -(52688,1,0), -(52725,1,0), -(52726,1,0), -(52727,1,0), -(52728,1,0), -(52729,1,0), -(52730,1,0), -(52731,1,0), -(52732,1,0), -(52774,1,0), -(52791,1,0), -(52793,1,0), -(52805,1,0), -(52811,1,0), -(52816,1,0), -(52833,1,0), -(52834,1,0), -(52837,1,0), -(52838,1,0), -(52844,1,0), -(52850,1,0), -(52884,1,0), -(52908,1,0), -(52920,1,0), -(52930,1,0), -(52934,1,0), -(52935,1,0), -(52936,1,0), -(52937,1,0), -(52953,1,0), -(52955,1,0), -(52956,1,0), -(52981,1,0), -(52989,1,0), -(52990,1,0), -(53010,1,0), -(53020,1,0), -(53024,1,0), -(53029,1,0), -(53038,1,0), -(53083,1,0), -(53093,1,0), -(53096,1,0), -(53106,1,0), -(53110,1,0), -(53163,1,0), -(53170,1,0), -(53177,1,0), -(53185,1,0), -(53206,1,0), -(53210,1,0), -(53242,1,1), -(53272,1,0), -(53441,1,0), -(53464,1,0), -(53465,1,0), -(53466,1,0), -(53570,1,0), -(53609,1,0), -(53613,1,0), -(53626,1,0), -(53644,1,0), -(53680,1,0), -(53683,1,0), -(53684,1,0), -(53685,1,0), -(53701,1,0), -(53714,1,1), -(53717,1,0), -(53730,1,0), -(53745,1,0), -(53757,1,1), -(53778,1,0), -(53798,1,0), -(53826,1,0), -(53827,1,0), -(53828,1,0), -(53829,1,0), -(54040,1,0), -(54047,1,0), -(54089,1,0), -(54090,1,0), -(54097,1,0), -(54108,1,0), -(54112,1,0), -(54128,1,0), -(54142,1,0), -(54209,1,0), -(54236,1,0), -(54245,1,0), -(54250,1,0), -(54258,1,0), -(54264,1,0), -(54265,1,0), -(54266,1,0), -(54267,1,0), -(54269,1,0), -(54323,1,0), -(54325,1,0), -(54327,1,0), -(54328,1,0), -(54377,1,0), -(54423,1,0), -(54426,1,0), -(54430,1,0), -(54464,1,0), -(54510,1,0), -(54522,1,0), -(54539,1,0), -(54548,1,0), -(54643,1,0), -(54656,1,0), -(54664,1,0), -(54685,1,0), -(54699,1,1), -(54725,1,1), -(54728,1,0), -(54744,1,1), -(54746,1,1), -(54773,1,0), -(54796,1,0), -(54798,1,0), -(54806,1,0), -(54878,1,0), -(54899,1,0), -(54984,1,0), -(54985,1,0), -(54988,1,0), -(54991,1,0), -(55063,1,0), -(55089,1,0), -(55127,1,0), -(55134,1,0), -(55137,1,0), -(55138,1,0), -(55141,1,0), -(55145,1,0), -(55161,1,0), -(55223,1,0), -(55227,1,0), -(55229,1,0), -(55231,1,0), -(55244,1,0), -(55257,1,0), -(55287,1,0), -(55288,1,0), -(55290,1,0), -(55406,1,0), -(55418,1,0), -(55419,1,0), -(55423,1,1), -(55432,1,0), -(55465,1,0), -(55468,1,0), -(55510,1,0), -(55516,1,0), -(55519,1,0), -(55524,1,0), -(55526,1,0), -(55527,1,0), -(55571,1,0), -(55578,1,0), -(55616,1,1), -(55647,1,0), -(55660,1,0), -(55661,1,0), -(55662,1,0), -(55693,1,0), -(55720,1,0), -(55721,1,0), -(55722,1,0), -(55723,1,0), -(55724,1,0), -(55725,1,0), -(55726,1,0), -(55727,1,0), -(55785,1,0), -(55796,1,0), -(55801,1,0), -(55803,1,0), -(55805,1,0), -(55811,1,0), -(55844,1,0), -(55853,1,0), -(55868,1,0), -(55872,1,0), -(55875,1,0), -(55878,1,1), -(55881,1,1), -(55882,1,0), -(55885,1,1), -(55886,1,0), -(55887,1,1), -(55888,1,0), -(55954,1,0), -(56047,1,0), -(56066,1,0), -(56099,1,0), -(56103,1,0), -(56114,1,0), -(56117,1,0), -(56150,1,0), -(56152,1,0), -(56189,1,0), -(56227,1,0), -(56253,1,0), -(56263,1,0), -(56264,1,0), -(56265,1,0), -(56266,1,0), -(56275,1,0), -(56312,1,0), -(56387,1,0), -(56388,1,0), -(56393,1,0), -(56429,1,0), -(56458,1,0), -(56505,1,0), -(56523,1,0), -(56560,1,0), -(56563,1,0), -(56567,1,0), -(56575,1,0), -(56621,1,0), -(56622,1,0), -(56652,1,0), -(56661,1,0), -(56663,1,0), -(56665,1,0), -(56667,1,0), -(56669,1,0), -(56673,1,0), -(56677,1,0), -(56680,1,0), -(56683,1,0), -(56688,1,0), -(56691,1,0), -(56693,1,0), -(56695,1,0), -(56696,1,0), -(56711,1,0), -(56713,1,0), -(56722,1,0), -(56723,1,0), -(56724,1,0), -(56725,1,0), -(56738,1,0), -(56763,1,0), -(56764,1,0), -(56865,1,0), -(56905,1,0), -(56917,1,0), -(56941,1,1), -(57042,1,0), -(57068,1,0), -(57071,1,0), -(57072,1,0), -(57410,1,0), -(57417,1,0), -(57420,1,0), -(57422,1,0), -(57469,1,0), -(57471,1,0), -(57495,1,0), -(57523,1,0), -(57534,1,0), -(57632,1,0), -(57637,1,0), -(57638,1,0), -(57639,1,0), -(57642,1,0), -(57650,1,0), -(57659,1,0), -(57666,1,0), -(57667,1,0), -(57682,1,0), -(57732,1,0), -(57734,1,0), -(57735,1,0), -(57736,1,0), -(57737,1,0), -(57738,1,0), -(57797,1,0), -(57806,1,0), -(57809,1,0), -(57828,1,0), -(57852,1,0), -(57853,1,0), -(57885,1,0), -(57891,1,0), -(57912,1,0), -(57930,1,0), -(57962,1,0), -(57963,1,0), -(57980,1,0), -(57983,1,0), -(58036,1,0), -(58040,1,0), -(58064,1,0), -(58084,1,0), -(58103,1,0), -(58108,1,0), -(58109,1,0), -(58112,1,0), -(58114,1,0), -(58121,1,0), -(58123,1,0), -(58124,1,0), -(58131,1,0), -(58152,1,0), -(58178,1,0), -(58195,1,1), -(58196,1,1), -(58197,1,1), -(58198,1,1), -(58225,1,0), -(58350,1,0), -(58416,1,0), -(58493,1,1), -(58515,1,0), -(58533,1,0), -(58542,1,0), -(58552,1,0), -(58593,1,0), -(58641,1,0), -(58658,1,0), -(58672,1,0), -(58685,1,0), -(58793,1,0), -(58836,1,0), -(58838,1,0), -(58846,1,1), -(58858,1,0), -(58873,1,0), -(58916,1,0), -(58917,1,0), -(58945,1,0), -(58949,1,0), -(59078,1,0), -(59091,1,0), -(59098,1,0), -(59115,1,0), -(59125,1,0), -(59189,1,0), -(59190,1,0), -(59284,1,0), -(59335,1,0), -(59363,1,0), -(59375,1,0), -(59383,1,0), -(59386,1,0), -(59396,1,0), -(59449,1,0), -(59456,1,0), -(59461,1,1), -(59528,1,0), -(59534,1,0), -(59552,1,0), -(59554,1,0), -(59556,1,1), -(59579,1,0), -(59595,1,0), -(59643,1,0), -(59655,1,0), -(59668,1,0), -(59677,1,0), -(59678,1,0), -(59704,1,0), -(59729,1,0), -(59730,1,0), -(59764,1,0), -(59780,1,0), -(59781,1,0), -(59807,1,0), -(59847,1,0), -(59867,1,0), -(59871,1,0), -(59897,1,0), -(59925,1,0), -(59930,1,0), -(59951,1,0), -(59952,1,0), -(59977,1,0), -(60038,1,0), -(60045,1,0), -(60046,1,0), -(60088,1,0), -(60104,1,0), -(60178,1,1), -(60207,1,0), -(60208,1,0), -(60224,1,0), -(60243,1,0), -(60256,1,0), -(60285,1,0), -(60288,1,0), -(60291,1,1), -(60292,1,1), -(60293,1,1), -(60294,1,1), -(60295,1,1), -(60296,1,1), -(60297,1,1), -(60298,1,0), -(60310,1,0), -(60315,1,0), -(60316,1,0), -(60342,1,0), -(60422,1,0), -(60456,1,0), -(60476,1,1), -(60496,1,0), -(60499,1,1), -(60507,1,1), -(60508,1,1), -(60511,1,0), -(60516,1,0), -(60522,1,1), -(60528,1,0), -(60535,1,0), -(60536,1,0), -(60561,1,0), -(60612,1,0), -(60614,1,0), -(60713,1,0), -(60810,1,0), -(60829,1,0), -(60831,1,0), -(60834,1,0), -(60836,1,0), -(60863,1,0), -(60909,1,0), -(60912,1,1), -(60967,1,0), -(61007,1,0), -(61026,1,0), -(61028,1,0), -(61071,1,0), -(61072,1,0), -(61073,1,0), -(61074,1,0), -(61075,1,0), -(61114,1,0), -(61121,1,0), -(61151,1,0), -(61152,1,0), -(61180,1,0), -(61210,1,0), -(61219,1,0), -(61245,1,0), -(61254,1,0), -(61353,1,0), -(61355,1,0), -(61397,1,0), -(61408,1,0), -(61416,1,0), -(61487,1,0), -(61488,1,0), -(61492,1,0), -(61524,1,0), -(61537,1,0), -(61588,1,0), -(61602,1,0), -(61647,1,0), -(61652,1,0), -(61665,1,0), -(61710,1,0), -(61738,1,0), -(61764,1,0), -(61765,1,0), -(61766,1,0), -(61771,1,0), -(61816,1,1), -(61863,1,1), -(61901,1,0), -(61934,1,0), -(61942,1,0), -(61964,1,0), -(61975,1,0), -(62002,1,0), -(62016,1,0), -(62034,1,0), -(62037,1,1), -(62072,1,0), -(62082,1,0), -(62083,1,0), -(62084,1,0), -(62091,1,0), -(62102,1,0), -(62195,1,0), -(62223,1,0), -(62266,1,0), -(62272,1,0), -(62278,1,0), -(62284,1,0), -(62304,1,0), -(62323,1,0), -(62343,1,0), -(47129,2,0), -(34395,2,0), -(34387,2,0), -(32440,2,0), -(32439,2,0), -(32205,2,0), -(31538,2,0), -(30740,2,0), -(29831,2,0), -(28806,2,0), -(28353,2,0), -(27517,2,0), -(27203,2,0), -(27202,2,0), -(27201,2,0), -(27191,2,0), -(27190,2,0), -(27184,2,0), -(26560,2,0), -(26063,2,0), -(25005,2,0), -(24934,2,0), -(24871,2,0), -(24721,2,0), -(24390,2,0), -(23208,2,0), -(21127,2,0), -(18431,2,0), -(17731,2,0), -(17016,2,0), -(16613,2,0), -(16447,2,0), -(13489,2,0), -(12139,2,0), -(11792,2,0), -(9224,2,0), -(9223,2,0), -(9222,2,0), -(9221,2,0), -(8674,2,0), -(7729,2,0), -(7728,2,0), -(3921,2,0), -(35683,2,0), -(36066,2,0), -(36546,2,0), -(36851,2,0), -(37754,2,0), -(38439,2,0), -(38782,2,0), -(39050,2,0), -(40055,2,0), -(40165,2,0), -(40166,2,0), -(40167,2,0), -(40328,2,0), -(40447,2,0), -(40468,2,0), -(40632,2,0), -(40640,2,0), -(40642,2,0), -(40644,2,0), -(40675,2,0), -(40774,2,0), -(40785,2,0), -(40964,2,0), -(40965,2,0), -(40968,2,0), -(40970,2,0), -(41004,2,0), -(41145,2,0), -(41146,2,0), -(42020,2,0), -(42022,2,0), -(42323,2,0), -(42788,2,0), -(43418,2,0), -(43552,2,0), -(43723,2,0), -(43753,2,0), -(43768,2,0), -(43950,2,0), -(44307,2,0), -(44498,2,0), -(44499,2,0), -(44611,2,0), -(44686,2,0), -(44874,2,0), -(44885,2,0), -(45149,2,0), -(45222,2,0), -(45226,2,0), -(45795,2,0), -(45877,2,0), -(45971,2,0), -(46072,2,0), -(46350,2,0), -(46360,2,1), -(46584,2,0), -(76006,2,0), -(74179,2,0), -(72869,2,0), -(72868,2,0), -(72608,2,0), -(72456,2,0), -(72405,2,0), -(72340,2,1), -(71284,2,1), -(70598,2,1), -(70446,2,1), -(70346,2,0), -(70227,2,0), -(70199,2,0), -(70175,2,0), -(70173,2,0), -(69402,2,0), -(69400,2,0), -(69294,2,0), -(69157,2,0), -(67815,2,0), -(67814,2,0), -(67813,2,0), -(67812,2,0), -(67798,2,0), -(67459,2,0), -(67458,2,0), -(67448,2,0), -(67439,2,0), -(67436,2,0), -(66676,2,0), -(66672,2,0), -(66655,2,0), -(66531,2,0), -(66289,2,0), -(65209,2,0), -(64871,2,0), -(64570,2,0), -(64436,2,0), -(63618,2,0), -(63381,2,0), -(62776,2,0), -(62714,2,0), -(62635,2,0), -(62397,2,0), -(62363,2,0), -(62357,2,0), -(62355,2,0), -(62307,2,0), -(62086,2,0), -(61999,2,1), -(60289,2,0), -(60101,2,0), -(59790,2,0), -(59732,2,0), -(59576,2,0), -(58596,2,0), -(58231,2,0), -(57945,2,0), -(57619,2,0), -(57610,2,0), -(57607,2,0), -(57583,2,0), -(57575,2,0), -(57544,2,0), -(57517,2,0), -(57415,2,0), -(56790,2,0), -(56570,2,0), -(56385,2,0), -(56350,2,0), -(55934,2,0), -(55820,2,0), -(55367,2,0), -(55197,2,0), -(54712,2,0), -(54666,2,0), -(54530,2,0), -(52510,2,0), -(52408,2,0), -(52339,2,0), -(52277,2,0), -(52274,2,0), -(52115,2,0), -(51383,2,0), -(51328,2,0), -(51327,2,0), -(51326,2,0), -(51325,2,0), -(51241,2,0), -(50999,2,0), -(50319,2,0), -(50026,2,0), -(50003,2,0), -(49867,2,0), -(49860,2,0), -(49765,2,0), -(49728,2,0), -(49693,2,0), -(49689,2,0), -(49158,2,0), -(49123,2,0), -(49109,2,0), -(48794,2,0), -(48738,2,0), -(48347,2,0), -(47978,2,0), -(35246,2,0), -(42576,3,0), -(42492,3,0), -(42475,3,0), -(42433,3,0), -(42350,3,0), -(42348,3,0), -(42242,3,1), -(42228,3,0), -(42220,3,0), -(42114,3,0), -(41221,3,0), -(40961,3,0), -(40960,3,0), -(40959,3,0), -(40957,3,0), -(40885,3,0), -(40603,3,0), -(40495,3,0), -(40401,3,0), -(40380,3,0), -(40341,3,0), -(40307,3,0), -(40286,3,0), -(40285,3,0), -(40284,3,0), -(40283,3,0), -(40268,3,0), -(40247,3,0), -(40246,3,0), -(40245,3,0), -(40244,3,0), -(40240,3,0), -(40222,3,0), -(40179,3,0), -(40178,3,0), -(40177,3,0), -(40176,3,0), -(40105,3,0), -(40076,3,0), -(39932,3,0), -(39887,3,0), -(39844,3,0), -(39832,3,1), -(39831,3,0), -(39558,3,0), -(39401,3,0), -(39399,3,0), -(39398,3,0), -(39393,3,0), -(39384,3,0), -(39364,3,0), -(38866,3,0), -(38680,3,0), -(38173,3,0), -(38046,3,0), -(38044,3,0), -(37970,3,0), -(37954,3,0), -(37942,3,0), -(37919,3,0), -(37913,3,0), -(37793,3,1), -(37789,3,0), -(37750,3,1), -(37504,3,0), -(37489,3,0), -(37473,3,1), -(37366,3,0), -(37134,3,0), -(36821,3,0), -(36811,3,0), -(36450,3,0), -(36449,3,1), -(36325,3,0), -(35958,3,0), -(35776,3,0), -(35734,3,0), -(35599,3,0), -(35596,3,0), -(34303,3,0), -(34200,3,0), -(34186,3,0), -(42578,3,0), -(33814,3,0), -(33783,3,0), -(33670,3,0), -(33664,3,0), -(33365,3,0), -(33240,3,0), -(33111,3,0), -(32785,3,0), -(32314,3,0), -(32307,3,0), -(32241,3,0), -(32148,3,0), -(32067,3,0), -(31927,3,0), -(31543,3,0), -(31364,3,0), -(31363,3,0), -(31333,3,0), -(30758,3,0), -(30741,3,0), -(30284,3,0), -(29945,3,0), -(29866,3,0), -(29820,3,1), -(29460,3,0), -(28373,3,0), -(28250,3,0), -(28054,3,0), -(26521,3,0), -(26519,3,0), -(26518,3,0), -(26517,3,0), -(26516,3,0), -(26490,3,0), -(26488,3,0), -(26393,3,1), -(26373,3,0), -(26338,3,0), -(26337,3,0), -(26336,3,0), -(26335,3,0), -(26334,3,0), -(26333,3,0), -(26329,3,0), -(26328,3,0), -(26327,3,0), -(26326,3,0), -(26325,3,0), -(26304,3,0), -(26295,3,0), -(26294,3,0), -(26293,3,0), -(26292,3,0), -(26291,3,0), -(26286,3,0), -(25687,3,0), -(25183,3,0), -(25181,3,0), -(25180,3,0), -(25178,3,0), -(25177,3,0), -(24973,3,0), -(24731,3,0), -(23024,3,0), -(21086,3,0), -(21014,3,0), -(20038,3,0), -(20037,3,0), -(19873,3,0), -(17179,3,0), -(16629,3,0), -(16452,3,0), -(16337,3,0), -(15998,3,0), -(13488,3,0), -(12151,3,0), -(10860,3,0), -(10836,3,0), -(10835,3,0), -(10834,3,0), -(10805,3,0), -(9257,3,0), -(9232,3,0), -(42868,3,0), -(43233,3,0), -(43539,3,0), -(43664,3,0), -(43898,3,0), -(43954,3,0), -(43963,3,0), -(43986,3,0), -(44013,3,0), -(44132,3,0), -(44213,3,0), -(44249,3,0), -(44320,3,0), -(44321,3,0), -(44375,3,0), -(44465,3,0), -(44554,3,0), -(44565,3,0), -(44603,3,0), -(44678,3,0), -(44844,3,0), -(44884,3,0), -(45030,3,0), -(45050,3,1), -(45201,3,0), -(45203,3,0), -(45404,3,0), -(45502,3,0), -(45585,3,0), -(45633,3,0), -(45635,3,0), -(45653,3,0), -(45839,3,0), -(45885,3,1), -(46417,3,0), -(46574,3,0), -(46638,3,1), -(46852,3,0), -(46896,3,0), -(47030,3,1), -(47328,3,0), -(47510,3,0), -(47628,3,0), -(47745,3,0), -(47775,3,1), -(47800,3,0), -(48198,3,0), -(48212,3,0), -(48331,3,0), -(48431,3,0), -(48882,3,0), -(48972,3,0), -(49197,3,0), -(49300,3,0), -(49308,3,0), -(49453,3,0), -(49735,3,0), -(50313,3,1), -(50348,3,0), -(50443,3,0), -(50501,3,0), -(50626,3,0), -(50639,3,0), -(50640,3,0), -(50716,3,0), -(50790,3,0), -(50791,3,0), -(50802,3,0), -(50803,3,0), -(50825,3,0), -(50826,3,0), -(51212,3,0), -(51246,3,0), -(51395,3,0), -(51511,3,0), -(51742,3,0), -(51748,3,0), -(51805,3,0), -(51846,3,0), -(52067,3,1), -(52271,3,0), -(52305,3,0), -(52479,3,0), -(52480,3,0), -(52497,3,0), -(52603,3,0), -(52683,3,0), -(52685,3,0), -(52812,3,0), -(53677,3,0), -(53679,3,0), -(53694,3,0), -(53705,3,0), -(53706,3,0), -(54272,3,0), -(54517,3,0), -(54914,3,0), -(54961,3,0), -(54990,3,0), -(55037,3,0), -(55083,3,0), -(55365,3,0), -(55479,3,0), -(55715,3,0), -(55800,3,0), -(55889,3,1), -(56095,3,0), -(56140,3,0), -(56386,3,0), -(56389,3,0), -(56578,3,0), -(56747,3,0), -(56765,3,0), -(57586,3,0), -(57800,3,0), -(57824,3,0), -(57835,3,0), -(58766,3,0), -(58825,3,0), -(59008,3,0), -(59462,3,0), -(59464,3,0), -(59564,3,0), -(59629,3,0), -(59694,3,0), -(60639,3,0), -(61126,3,0), -(61224,3,0), -(61699,3,0), -(62000,3,0), -(62056,3,0), -(62385,3,0), -(62387,3,0), -(62399,3,0), -(62565,3,0), -(62709,3,0), -(62973,3,0), -(62991,3,0), -(63019,3,0), -(63122,3,1), -(63292,3,0), -(63294,3,0), -(63295,3,0), -(63317,3,0), -(63414,3,0), -(63528,3,0), -(63766,3,0), -(63983,3,0), -(63985,3,0), -(64021,3,0), -(65044,3,0), -(65045,3,0), -(65101,3,0), -(65585,3,0), -(65586,3,0), -(65690,3,0), -(66129,3,0), -(66170,3,0), -(66598,3,0), -(67398,3,0), -(68378,3,0), -(68902,3,0), -(69007,3,0), -(69095,3,0), -(69096,3,0), -(69708,3,0), -(69783,3,0), -(69797,3,0), -(69799,3,0), -(69802,3,0), -(69985,3,0), -(70028,3,0), -(70037,3,0), -(70194,3,0), -(70521,3,0), -(70564,3,0), -(70590,3,0), -(70997,3,0), -(70998,3,0), -(70999,3,0), -(71278,3,1), -(71621,3,0), -(71704,3,0), -(72155,3,1), -(72162,3,1), -(72274,3,1), -(72297,3,1), -(72460,3,1), -(72548,3,1), -(72549,3,1), -(72550,3,1), -(72619,3,1), -(72620,3,1), -(72679,3,0), -(72771,3,0), -(72850,3,0), -(72851,3,0), -(72852,3,0), -(74318,3,0), -(74319,3,0), -(74320,3,0), -(74472,3,0), -(75509,3,0), -(75553,3,1), -(75766,3,1), -(34012,3,0), -(74271,4,0), -(74270,4,0), -(72096,4,1), -(72034,4,1), -(71615,4,0), -(70827,4,0), -(69425,4,0), -(69164,4,0), -(69162,4,0), -(68981,4,0), -(68788,4,1), -(67816,4,0), -(67796,4,0), -(65370,4,0), -(65333,4,0), -(64626,4,0), -(62826,4,0), -(62489,4,0), -(62466,4,0), -(62457,4,0), -(62345,4,0), -(62308,4,0), -(60206,4,0), -(58185,4,0), -(55896,4,0), -(55349,4,0), -(54109,4,0), -(54107,4,0), -(51678,4,0), -(50652,4,0), -(49556,4,0), -(48610,4,0), -(48277,4,0), -(48224,4,0), -(47674,4,0), -(47109,4,0), -(45922,4,0), -(44969,4,0), -(44737,4,0), -(44687,4,0), -(44626,4,0), -(44233,4,0), -(40647,4,0), -(40259,4,0), -(39246,4,0), -(36904,4,0), -(36460,4,0), -(36374,4,0), -(30532,4,0), -(28995,4,0), -(10451,4,0), -(9735,4,0), -(8900,4,0), -(8899,4,0), -(8898,4,0), -(8202,4,0), -(74272,4,0), -(69767,5,0), -(65590,5,0), -(62386,5,0), -(55588,5,0), -(54713,5,0), -(49464,5,0), -(49460,5,0), -(49346,5,0), -(47310,5,1), -(45676,5,0), -(44217,5,0), -(43977,5,0), -(41962,5,0), -(40789,5,0), -(40503,5,0), -(38729,5,0), -(38312,5,0), -(38106,5,0), -(38105,5,0), -(38104,5,0), -(38103,5,0), -(38102,5,0), -(38101,5,0), -(38100,5,0), -(38099,5,0), -(37206,5,0), -(37205,5,0), -(37204,5,0), -(36817,5,0), -(34630,5,0), -(21866,5,0), -(21794,5,0), -(19832,5,0), -(19250,5,0), -(8913,5,0), -(67308,6,0), -(67307,6,0), -(67306,6,0), -(67305,6,0), -(67304,6,0), -(67303,6,0), -(65876,6,0), -(65875,6,0), -(63041,6,0), -(62560,6,0), -(59099,6,1), -(44608,6,0), -(43702,6,0), -(43080,6,0), -(43056,6,0), -(40902,6,0), -(40657,6,0), -(28803,6,1), -(16054,6,0), -(8712,6,0), -(75863,7,1), -(75448,7,1), -(74412,7,1), -(74323,7,0), -(74322,7,0), -(74321,7,0), -(73028,7,0), -(72622,7,1), -(72621,7,1), -(72459,7,1), -(72273,7,0), -(72272,7,0), -(71618,7,0), -(71614,7,0), -(71279,7,1), -(70982,7,0), -(70981,7,0), -(70952,7,0), -(69540,7,0), -(67751,7,0), -(66905,7,0), -(66667,7,0), -(65126,7,0), -(64218,7,0), -(63059,7,0), -(62942,7,0), -(62705,7,0), -(61920,7,0), -(61715,7,0), -(61714,7,0), -(61632,7,0), -(60532,7,0), -(60430,7,0), -(59474,7,0), -(59465,7,0), -(57409,7,0), -(57405,7,0), -(57056,7,1), -(56694,7,0), -(56454,7,0), -(54160,7,0), -(53605,7,0), -(52319,7,0), -(51719,7,0), -(50747,7,0), -(50646,7,0), -(50645,7,0), -(50627,7,0), -(50218,7,0), -(49889,7,0), -(48742,7,0), -(48552,7,0), -(46158,7,0), -(42287,7,0), -(42265,7,1), -(42079,7,0), -(42004,7,1), -(41284,7,0), -(41113,7,0), -(41112,7,0), -(41111,7,0), -(41110,7,0), -(41071,7,0), -(41064,7,1), -(40931,7,0), -(40929,7,0), -(40905,7,0), -(40900,7,0), -(40851,7,0), -(40370,7,0), -(40172,7,0), -(40171,7,0), -(40170,7,0), -(40169,7,0), -(40075,7,1), -(39698,7,0), -(39686,7,0), -(39218,7,0), -(38920,7,0), -(38774,7,0), -(38484,7,0), -(38449,7,0), -(38371,7,0), -(37076,7,0), -(35957,7,1), -(35754,7,0), -(35289,7,0), -(34350,7,0), -(34187,7,0), -(31625,7,0), -(31624,7,0), -(31617,7,0), -(30939,7,1), -(30659,7,0), -(30657,7,0), -(30531,7,0), -(30098,7,0), -(28681,7,1), -(25790,7,0), -(25029,7,0), -(23015,7,0), -(22710,7,0), -(20553,7,0), -(10732,7,0), -(10348,7,0), -(7082,7,0), -(5628,7,0), -(804,7,0), -(802,7,0), -(54069,1,0), -(56251,1,0), -(58630,1,0); - --- remove redundant entries -DELETE FROM `conditions` WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 1 AND `ConditionValue2` = 0 AND `SourceEntry` IN (SELECT `id` FROM `temp_convert_spells` WHERE onlyPlayers); - --- set source group if available in db -UPDATE `conditions` SET `SourceGroup` = `ConditionValue3`, `ConditionValue3` = 0 WHERE `ConditionTypeOrReference` = 18; - --- set source group in case of old default (not set) source group -UPDATE `conditions` SET `SourceGroup` = (SELECT `effMask` FROM `temp_convert_spells` WHERE `id` = `SourceEntry`) WHERE `SourceGroup` = 0 AND `ConditionTypeOrReference` = 18; - -CREATE TABLE `temp_cond_vals` -( - `sourceGroup` INT(11), - `sourceEntry` INT(11), - `conditionValue1` INT(11), - `conditionValue2` INT(11), - `elseGroup` INT(11) AUTO_INCREMENT, - PRIMARY KEY (`sourceGroup`, `sourceEntry`, `elseGroup`) -) ENGINE=MYISAM; - -INSERT INTO `temp_cond_vals` (`sourceGroup`, `sourceEntry`, `conditionValue1`, `conditionValue2`) SELECT `SourceGroup`, `SourceEntry`, `ConditionValue1`, `ConditionValue2` FROM `conditions` WHERE `ConditionTypeOrReference` = 18; - --- set correct else group -UPDATE `conditions` SET `ElseGroup` = (SELECT `elseGroup` FROM `temp_cond_vals` WHERE `sourceGroup` = `conditions`.`SourceGroup` AND `sourceEntry` = `conditions`.`SourceEntry` AND `conditionValue1` = `conditions`.`ConditionValue1` AND `conditionValue2` = `conditions`.`ConditionValue2`)-1 WHERE `ConditionTypeOrReference` = 18; - --- old condition type 3 (caster's minion) -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`) -SELECT `SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, 33, 0, 1, 3 FROM `conditions` WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 3; - -UPDATE `conditions` SET `ConditionTypeOrReference` = 31 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 3; - --- old condition type 2 (dead creature) -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `NegativeCondition`) -SELECT `SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, 36, 0, 0, 0, 1 FROM `conditions` WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 2; - -UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 3 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 2; - --- old condition type 1 (creature) -UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 3 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 1 AND `ConditionValue2`; - --- old condition type 1 (player) -UPDATE `conditions` SET `ConditionTypeOrReference` = 32, `ConditionValue1` = 0x90 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 1 AND NOT `ConditionValue2`; - --- old condition type 0 (gameobject) -UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 5 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 0; - -DROP TABLE `temp_convert_spells`; -DROP TABLE `temp_cond_vals`; diff --git a/sql/updates/world/2012_02_21_02_world_creature_loot_template.sql b/sql/updates/world/2012_02_21_02_world_creature_loot_template.sql deleted file mode 100644 index 6c6af7ed2a3..00000000000 --- a/sql/updates/world/2012_02_21_02_world_creature_loot_template.sql +++ /dev/null @@ -1,11 +0,0 @@ -UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (38032,37917,38016,38023,37214,38030,38006,37984); -DELETE FROM `creature_loot_template` WHERE `entry`IN (38032,37917,38016,38023,37214,38030,38006,37984); -INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES -(38032,1,100,1,0,-45009,1), -- Crown Sprayer -(37917,1,100,1,0,-45009,1), -- Crown Thug -(38016,1,100,1,0,-45009,1), -- Crown Agent -(38023,1,100,1,0,-45009,1), -- Crown Sprinkler -(37214,1,100,1,0,-45009,1), -- Crown Lackey -(38030,1,100,1,0,-45009,1), -- Crown Underling -(38006,1,100,1,0,-45009,1), -- Crown Hoodlum (level 1??) -(37984,1,100,1,0,-45009,1); -- Crown Duster (level 1??) diff --git a/sql/updates/world/2012_02_21_03_world_creature_loot_template.sql b/sql/updates/world/2012_02_21_03_world_creature_loot_template.sql deleted file mode 100644 index d7d043cbda9..00000000000 --- a/sql/updates/world/2012_02_21_03_world_creature_loot_template.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Razormane Hunter Warrior's Boots 32% to 3.2% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=3.2996 WHERE `entry`=3265 AND `item`=2967; --- Razormane Hunter Hunting Cloak 11% to 1.1% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=1.1855 WHERE `entry`=3265 AND `item`=4689; --- Razormane Defender Pioneer Buckler 87% to 0.8% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.8789 WHERE `entry`=3266 AND `item`=7109; --- Razormane Defender Spellbinder Belt 77% to 0.7% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7717 WHERE `entry`=3266 AND `item`=4684; --- Razormane Geomancer Simple Shoes 77% to 0.7% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7791 WHERE `entry`=3269 AND `item`=9743; --- Razormane Geomancer Veteran Bracers 73% to 0.7% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7364 WHERE `entry`=3269 AND `item`=3213; --- Venture Co. Supervisor Burnt Leather Belt 85% to 0.8% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.8511 WHERE `entry`=2979 AND `item`=4666; --- Venture Co. Supervisor Warrior's Gloves 74% to 0.7% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7433 WHERE `entry`=2979 AND `item`=2968; --- Venture Co. Supervisor Pioneer Bracers 55% to 0.5% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.5593 WHERE `entry`=2979 AND `item`=6519; --- Venture Co. Supervisor Journeyman's Gloves 43% to 0.4% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.4348 WHERE `entry`=2979 AND `item`=2960; --- Venture Co. Worker Warrior's Bracers 72% to 0.7% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.7226 WHERE `entry`=2978 AND `item`=3214; --- Venture Co. Worker Fine Scimitar 64% to 0.6% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.6492 WHERE `entry`=2978 AND `item`=4560; --- Venture Co. Worker Warrior's Girdle 24% to 0.2% -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=0.2458 WHERE `entry`=2978 AND `item`=4659; diff --git a/sql/updates/world/2012_02_21_04_world_creature_loot_template.sql b/sql/updates/world/2012_02_21_04_world_creature_loot_template.sql deleted file mode 100644 index 3deedbf0b0d..00000000000 --- a/sql/updates/world/2012_02_21_04_world_creature_loot_template.sql +++ /dev/null @@ -1,16 +0,0 @@ -SET @ENTRY := 30409; -- Apprentice Osterkilgr -DELETE FROM `creature_loot_template` WHERE entry=@ENTRY; -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Quest related Items -(@ENTRY,43089,-100,1,0,1,1), -- Vrykul Bones -(@ENTRY,42772,-100,1,0,1,1), -- Dr Terrible's "Building a Better Flesh Giant" -(@ENTRY,42422,-50,1,0,1,1), -- Jotunheim Cage Key --- Other random stuff -(@ENTRY,33470,20,1,0,1,4), -- Frostweave Cloth -(@ENTRY,43851,20,1,0,1,1), -- Fur Clothing Scraps -(@ENTRY,43852,20,1,0,1,1), -- Thick Fur Clothing Scraps --- References for world drops -(@ENTRY,1,10,1,0,-35063,1), -- Northrend Grey Items -(@ENTRY,2,5,1,0,-35066,1), -- Northrend Green Items --- hatebook -(@ENTRY,45912,0.1,1,0,1,1); -- Book Glyph of Mastery (honestly screw that thing) diff --git a/sql/updates/world/2012_02_21_05_world_gossip.sql b/sql/updates/world/2012_02_21_05_world_gossip.sql deleted file mode 100644 index 1bdccae5c39..00000000000 --- a/sql/updates/world/2012_02_21_05_world_gossip.sql +++ /dev/null @@ -1,39 +0,0 @@ --- SAI for Lothos Riftwaker -SET @ENTRY=14387; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lothos Riftwaker - On Gossip Option select - close gossip'), -(@ENTRY,0,1,0,61,0,100,0,5750,0,0,0,62,409,0,0,0,0,0,7,0,0,0,1096,-467,-104.6,3.64,'Lothos Riftwaker - On Gossip Option select - teleport player'); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (5750); -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 -(5750,0,0,'Teleport me to the Molten Core, Lothos.',1,1,0,0,0,0,''); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (5750); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,5750,0,0,0,8,7848,0,0,0,0,'','Show gossip option if player has quest 7848 completed'); - --- SAI for Zamael Lunthistle -SET @ENTRY=8436; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' 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,1,62,0,100,0,1285,0,0,0,26,3377,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - quest credit'), -(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Zamael Lunthistle - On Gossip Option select - close gossip'); - -DELETE FROM `gossip_menu` WHERE `entry`=1285 AND `text_id`=1920; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1285,1920); -DELETE FROM `gossip_menu` WHERE `entry`=1286 AND `text_id`=1922; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1286,1922); -DELETE FROM `gossip_menu` WHERE `entry`=1287 AND `text_id`=1921; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1287,1921); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1285,1286,1287); -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 -(1285,0,0,'I wish to hear your tale.',1,1,1287,0,0,0,''), -(1286,0,0,'Let me think about it, Zamael.',1,1,1285,0,0,0,''), -(1287,0,0,'Please continue, Zamael.',1,1,1286,0,0,0,''); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (1285); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,1285,0,0,0,9,3377,0,0,0,0,'','Show gossip option if player has quest 3377 but not complete'); diff --git a/sql/updates/world/2012_02_21_06_world_Gossip.sql b/sql/updates/world/2012_02_21_06_world_Gossip.sql deleted file mode 100644 index a59d330c6a3..00000000000 --- a/sql/updates/world/2012_02_21_06_world_Gossip.sql +++ /dev/null @@ -1,184 +0,0 @@ --- Gossip Update from Pitcrawler --- Creature Gossip_menu_id Update from sniff -UPDATE `creature_template` SET `gossip_menu_id`=7692 WHERE `entry`=18424; -UPDATE `creature_template` SET `gossip_menu_id`=9033 WHERE `entry`=24838; -UPDATE `creature_template` SET `gossip_menu_id`=9038 WHERE `entry`=24833; -UPDATE `creature_template` SET `gossip_menu_id`=9066 WHERE `entry`=25011; -UPDATE `creature_template` SET `gossip_menu_id`=9067 WHERE `entry`=25015; -UPDATE `creature_template` SET `gossip_menu_id`=9068 WHERE `entry`=25009; -UPDATE `creature_template` SET `gossip_menu_id`=9069 WHERE `entry`=25017; -UPDATE `creature_template` SET `gossip_menu_id`=9070 WHERE `entry`=25018; -UPDATE `creature_template` SET `gossip_menu_id`=9071 WHERE `entry`=25016; -UPDATE `creature_template` SET `gossip_menu_id`=9072 WHERE `entry` IN (25013,25014); -UPDATE `creature_template` SET `gossip_menu_id`=9091 WHERE `entry`=25076; -UPDATE `creature_template` SET `gossip_menu_id`=9107 WHERE `entry`=24929; -UPDATE `creature_template` SET `gossip_menu_id`=9109 WHERE `entry`=24927; -UPDATE `creature_template` SET `gossip_menu_id`=9110 WHERE `entry`=24924; -UPDATE `creature_template` SET `gossip_menu_id`=9116 WHERE `entry`=25105; -UPDATE `creature_template` SET `gossip_menu_id`=9117 WHERE `entry`=25100; -UPDATE `creature_template` SET `gossip_menu_id`=9118 WHERE `entry`=25104; -UPDATE `creature_template` SET `gossip_menu_id`=9120 WHERE `entry`=25107; -UPDATE `creature_template` SET `gossip_menu_id`=9121 WHERE `entry` IN (25101,25102,25103); -UPDATE `creature_template` SET `gossip_menu_id`=9122 WHERE `entry`=25106; -UPDATE `creature_template` SET `gossip_menu_id`=9349 WHERE `entry`=26539; -UPDATE `creature_template` SET `gossip_menu_id`=10120 WHERE `entry` IN (31704,31705,31706,31720,31723,31724); -UPDATE `creature_template` SET `gossip_menu_id`=10259 WHERE `entry`=31716; - --- Gossip Menu insert from sniff -DELETE FROM `gossip_menu` WHERE `entry`=7692 AND `text_id`=9383; -DELETE FROM `gossip_menu` WHERE `entry`=7696 AND `text_id`=9444; -DELETE FROM `gossip_menu` WHERE `entry`=7704 AND `text_id`=9425; -DELETE FROM `gossip_menu` WHERE `entry`=7726 AND `text_id`=9437; -DELETE FROM `gossip_menu` WHERE `entry`=7727 AND `text_id`=9438; -DELETE FROM `gossip_menu` WHERE `entry`=7728 AND `text_id`=9439; -DELETE FROM `gossip_menu` WHERE `entry`=9033 AND `text_id`=12211; -DELETE FROM `gossip_menu` WHERE `entry`=9038 AND `text_id`=12216; -DELETE FROM `gossip_menu` WHERE `entry`=9040 AND `text_id`=12217; -DELETE FROM `gossip_menu` WHERE `entry`=9041 AND `text_id`=12218; -DELETE FROM `gossip_menu` WHERE `entry`=9042 AND `text_id`=12219; -DELETE FROM `gossip_menu` WHERE `entry`=9043 AND `text_id`=12220; -DELETE FROM `gossip_menu` WHERE `entry`=9066 AND `text_id`=12262; -DELETE FROM `gossip_menu` WHERE `entry`=9067 AND `text_id`=12263; -DELETE FROM `gossip_menu` WHERE `entry`=9068 AND `text_id`=12264; -DELETE FROM `gossip_menu` WHERE `entry`=9069 AND `text_id`=12266; -DELETE FROM `gossip_menu` WHERE `entry`=9070 AND `text_id`=12267; -DELETE FROM `gossip_menu` WHERE `entry`=9091 AND `text_id`=12292; -DELETE FROM `gossip_menu` WHERE `entry`=9109 AND `text_id`=12317; -DELETE FROM `gossip_menu` WHERE `entry`=9110 AND `text_id`=12318; -DELETE FROM `gossip_menu` WHERE `entry`=9116 AND `text_id`=12327; -DELETE FROM `gossip_menu` WHERE `entry`=9117 AND `text_id`=12328; -DELETE FROM `gossip_menu` WHERE `entry`=9118 AND `text_id`=12329; -DELETE FROM `gossip_menu` WHERE `entry`=9120 AND `text_id`=12331; -DELETE FROM `gossip_menu` WHERE `entry`=9121 AND `text_id`=12332; -DELETE FROM `gossip_menu` WHERE `entry`=9122 AND `text_id`=12333; -DELETE FROM `gossip_menu` WHERE `entry`=9349 AND `text_id`=12649; -DELETE FROM `gossip_menu` WHERE `entry`=10120 AND `text_id`=14047; -DELETE FROM `gossip_menu` WHERE `entry`=10259 AND `text_id`=14248; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(7692,9383), -(7696,9444), -(7704,9425), -(7726,9437), -(7727,9438), -(7728,9439), -(9033,12211), -(9038,12216), -(9040,12217), -(9041,12218), -(9042,12219), -(9043,12220), -(9066,12262), -(9067,12263), -(9068,12264), -(9069,12266), -(9070,12267), -(9091,12292), -(9109,12317), -(9110,12318), -(9116,12327), -(9117,12328), -(9118,12329), -(9120,12331), -(9121,12332), -(9122,12333), -(9349,12649), -(10120,14047), -(10259,14248); - --- Insert npc_text from sniff -DELETE FROM `npc_text` WHERE `ID` IN (9437,9438,9439,12211,12266); -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 -(9437,'$B$BZangarmarsh... too close to truth.$B$B$B$BIs he still watching!?','',0,1,1000,1,1000,6,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), -(9438,'What''s that? Zangarmarsh? Why would I want to go there?$B$B$B$BYes, Zangarmarsh... we... the druids there are getting close to figuring out why the water level is dropping. It''s destroying everything!$B$B$B$BDestroyed us all! Bright light! BOOM!!','',0,1,0,6,1000,1,1000,5,'','',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), -(9439,'The Firewing blood elves... for some reason they want to stop us.$B$B$B$BThey... they sent one of the Broken as ... as an emissary.... But he had a bomb!$B$BThey died, they all died! They tried to run away! The lucky ones didn''t even know.$B$BI must have been at the edge of the blast. It was horr...IT''S WATCHING US AGAIN!$B$B','',0,1,0,18,1000,18,1000,5,'','',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), -(12211,'Fine day fer sailin'', innit?','',7,1,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,12340), -(12266,'','I''m almost jealous of our Mr. Wavesinger. Why, he may well be prettier than me!',7,1,0,1,3,11,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); - --- Creature Gossip_menu_option insert from sniff -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7692,7726,7727) AND `id`=0; -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9038,9040,9041,9042,9043) AND `id` IN (0,1,2); -DELETE FROM `gossip_menu_option` WHERE `menu_id`=9038 AND `id`=3; -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 -(7692,0,0,'Treelos, I know that the truth is somewhere inside you. Tell me what it is.',1,1,7726,0,0,0,''), -(7726,0,0,'Keep it together man! What about Zangarmarsh?',1,1,7727,0,0,0,''), -(7727,0,0,'I don''t have time for this! Warden, what happened?!',1,1,7728,0,0,0,''), -(9038,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), -(9038,1,0,'Food & Drink',1,1,9041,0,0,0,''), -(9038,2,0,'Goods & Gear',1,1,9042,0,0,0,''), -(9038,3,0,'"Stash?"',1,1,9043,0,0,0,''), -(9040,0,0,'Food & Drink',1,1,9041,0,0,0,''), -(9040,1,0,'Goods & Gear',1,1,9042,0,0,0,''), -(9040,2,0,'"Stash?',1,1,9043,0,0,0,''), -(9041,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), -(9041,1,0,'Goods & Gear',1,1,9042,0,0,0,''), -(9041,2,0,'"Stash?',1,1,9043,0,0,0,''), -(9042,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), -(9042,1,0,'Food & Drink',1,1,9041,0,0,0,''), -(9042,2,0,'"Stash?',1,1,9043,0,0,0,''), -(9043,0,0,'The Lady Mehley',1,1,9040,0,0,0,''), -(9043,1,0,'Food & Drink',1,1,9041,0,0,0,''), -(9043,2,0,'Goods & Gear',1,1,9042,0,0,0,''); - --- Conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7704 AND `SourceEntry`=9425; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7696 AND `SourceEntry`=9444; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7704,7692); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,7696,9444,0,0,8,10005,0,0,0,0,'','Show different gossip if player has rewarded quest 10005'), -(14,7696,9444,0,1,8,10006,0,0,0,0,'','Show different gossip if player has rewarded quest 10006'), -(14,7704,9425,0,0,8,9978,0,0,0,0,'','Show different gossip if player has rewarded quest 9978'), -(15,7704,0,0,0,9,9978,0,0,0,0,'','Show gossip option if player has quest 9978 but not complete'), -(15,7692,0,0,0,8,10006,0,0,0,0,'','Show gossip option if player has rewarded quest 10006'), -(15,7692,0,0,1,8,10005,0,0,0,0,'','Show gossip option if player has rewarded quest 10005'); - --- Gossip Update from Malcrom -DELETE FROM `gossip_menu` WHERE `entry` IN (1042,1043,1044,1045,1046,1047,1048,1049,1050,1052,1053); -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(1042,1635),(1043,1640),(1044,1644),(1045,1643),(1045,1753), -(1046,1648),(1047,1754),(1048,1650),(1049,1755), -(1050,1651),(1050,1756),(1052,1652),(1053,1653); -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1045,1047,1049,1050); -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 -(1045,0,0,'Acquire Higher Level Access Card',1,1,0,0,0,0,''), -(1047,0,0,'Acquire Higher Level Access Card',1,1,0,0,0,0,''), -(1049,0,0,'Acquire Higher Level Access Card',1,1,0,0,0,0,''), -(1050,0,0,'Acquire high level data card.',1,1,0,0,0,0,''); - -DELETE FROM `gossip_menu` WHERE `entry`=1080 AND `text_id`=1693; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1080,1693); -DELETE FROM `gossip_menu` WHERE `entry`=1100 AND `text_id`=1713; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1100,1713); -DELETE FROM `gossip_menu` WHERE `entry`=1143 AND `text_id`=1759; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1143,1759); -DELETE FROM `gossip_menu` WHERE `entry`=1161 AND `text_id`=1793; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1161,1793); -DELETE FROM `gossip_menu` WHERE `entry`=1162 AND `text_id`=1794; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1162,1794); -DELETE FROM `gossip_menu` WHERE `entry`=1201 AND `text_id`=1833; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1201,1833); -DELETE FROM `gossip_menu` WHERE `entry`=1281 AND `text_id`=1916; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1281,1916); -DELETE FROM `gossip_menu` WHERE `entry`=1282 AND `text_id`=1918; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1282,1918); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1282); -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 -(1282,0,0,'Touch the Suntara stone and call forth Lathoric the Black and his guardian, Obsidion.',1,1,0,0,0,0,''); - -DELETE FROM `gossip_menu` WHERE `entry`=1301 AND `text_id`=1933; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1301,1933); -DELETE FROM `gossip_menu` WHERE `entry`=1301 AND `text_id`=1934; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1301,1934); - -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1301); -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 -(1301,0,0,'I wish to browse your wares.',3,128,0,0,0,0,''); - -DELETE FROM `gossip_menu` WHERE `entry`=1302 AND `text_id`=1935; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1302,1935); -DELETE FROM `gossip_menu` WHERE `entry`=1321 AND `text_id`=1955; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1321,1955); -DELETE FROM `gossip_menu` WHERE `entry`=1322 AND `text_id`=1954; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1322,1954); -DELETE FROM `gossip_menu` WHERE `entry`=1362 AND `text_id`=1994; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1362,1994); diff --git a/sql/updates/world/2012_02_22_00_world_SAI.sql b/sql/updates/world/2012_02_22_00_world_SAI.sql deleted file mode 100644 index 2e392f3a45f..00000000000 --- a/sql/updates/world/2012_02_22_00_world_SAI.sql +++ /dev/null @@ -1,39 +0,0 @@ --- SAI for Kalaran Windblade -SET @ENTRY=8479; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 --- AI -(@ENTRY,0,0,1,62,0,100,0,1321,0,0,0,26,3441,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - quest credit'), -(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - close gossip'), -(@ENTRY,0,2,3,62,0,100,0,1323,2,0,0,11,19797,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - cast 19797'), -(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - close gossip'), -(@ENTRY,0,4,0,62,0,100,0,1323,3,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - On Gossip Option select - run script'), --- Script -(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - script - close gossip'), -(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - remove npc flags'), -(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,1000,1000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - say 0'), -(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,1000,1000,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - emotestate usestanding'), -(@ENTRY*100,9,4,0,0,0,100,0,60000,60000,60000,60000,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - emotestate none'), -(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,1000,1000,26,3453,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kalaran Windblade - script - give quest credit'), -(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,1000,1000,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kalaran Windblade - script - add npc flags'); --- npc text -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES -(@ENTRY,0,0,'Please be patient, $N',12,0,100,0,0,0,'Kalaran Windblade'); --- Gossip options -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1321,1322,1323); -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 -(1321,0,0,'Let me confer with my colleagues.',1,1,0,0,0,0,''), -(1322,0,0,'Continue please.',1,1,1321,0,0,0,''), -(1323,0,0,'Tell me what drives this vengeance?',1,1,1322,0,0,0,''), -(1323,2,0,'Kalaran, I have misplaced my torch. I require another.',1,1,0,0,0,0,''), -(1323,3,0,'Kalaran, please enchant the torch.',1,1,0,0,0,0,''); --- Gossip option conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (1323); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,1323,0,0,0,9,3441,0,0,0,0,'','Show gossip option if player has quest 3441 but not complete'), -(15,1323,2,0,0,8,3454,0,0,0,0,'','Show gossip option if player has quest 3441 complete'), -(15,1323,2,0,0,2,10515,0,1,0,0,'','Show gossip option if player does not have item 10515'), -(15,1323,3,0,0,9,3453,0,0,0,0,'','Show gossip option if player has quest 3453 but not complete'); diff --git a/sql/updates/world/2012_02_22_01_world_creature_text.sql b/sql/updates/world/2012_02_22_01_world_creature_text.sql deleted file mode 100644 index 8b7761e48a0..00000000000 --- a/sql/updates/world/2012_02_22_01_world_creature_text.sql +++ /dev/null @@ -1,34 +0,0 @@ --- Invisible Stalker text for Wintergrasp from sniff -DELETE FROM `creature_text` WHERE `entry`=15214; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(15214,0,0, 'Let the battle begin!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,1,0, 'The Broken Temple siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,2,0, 'The Broken Temple siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,3,0, 'The Broken Temple siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,4,0, 'The Broken Temple siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,5,0, 'The Sunken Ring siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,6,0, 'The Sunken Ring siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,7,0, 'The Sunken Ring siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,8,0, 'The Sunken Ring siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,9,0, 'The Eastspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,10,0, 'The Eastspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,11,0, 'The Eastspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,12,0, 'The Eastspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,13,0, 'The Westspark siege workshop has been attacked by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,14,0, 'The Westspark siege workshop has been captured by the Horde!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,15,0, 'The Westspark siege workshop has been attacked by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,16,0, 'The Westspark siege workshop has been captured by the Alliance!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,17,0, 'The north-western keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,18,0, 'The north-western keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,19,0, 'The south-eastern keep tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,20,0, 'The south-eastern keep tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,21,0, 'The western tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,22,0, 'The western tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,23,0, 'The southern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,24,0, 'The southern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,25,0, 'The eastern tower has been damaged!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,26,0, 'The eastern tower has been destroyed!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,27,0, 'The Horde has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,28,0, 'The Horde has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,29,0, 'The Alliance has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'), -(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'); diff --git a/sql/updates/world/2012_02_22_02_world_misc.sql b/sql/updates/world/2012_02_22_02_world_misc.sql deleted file mode 100644 index 33bec2a9b78..00000000000 --- a/sql/updates/world/2012_02_22_02_world_misc.sql +++ /dev/null @@ -1,57 +0,0 @@ --- Mounting Hodir's Helm (12987) - --- cleanup after Discovered --- clean all related to npc Hodir's Helm KC Bunny -DELETE FROM `smart_scripts` WHERE `entryorguid`=30210 AND `source_type`=0; -DELETE FROM `creature` WHERE `id`=30210; -DELETE FROM `creature_text` WHERE `entry`=30210; - -SET @HELM := 192080; -- Hodir's Helm -SET @TEMP := 300230; -- TEMP Northern Ice Spike -SET @BUNNY_TARGET := 30215; -- Ice Spike Target Bunny -SET @GUID_GO := 270; -- set by TDB -SET @GUID_NPC := 40514; -- set by TDB -SET @SPELL_READ_PRONOUNCEMENT := 56278; -SET @QUEST := 12987; -SET @AREA := 4438; -- Dun Niffelem -SET @SPELL_AREA := 56305; -- See Quest Invisibility 1 (Ice Spike Bunny) -SET @QUEST := 13006; -- Polishing the Helm - -UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33554432|256,`InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@BUNNY_TARGET; - -UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=@HELM; -UPDATE `gameobject` SET `phaseMask`=4 WHERE `id`=@TEMP; - -DELETE FROM `gameobject` WHERE `guid`=@GUID_GO; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES -(@GUID_GO,@HELM,571,1,4,7390.143,-2725.382,874.2561,-3.089183,0,0,-0.9996567,0.02620165,600,255,1); - -DELETE FROM `creature` WHERE `guid` BETWEEN @GUID_NPC+0 AND @GUID_NPC+1; -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_NPC+0,@BUNNY_TARGET,571,1,4,0,0,7386.51,-2726.489,872.5089,5.88176,300,0,0,4979,0,0,0,0,0), -(@GUID_NPC+1,@BUNNY_TARGET,571,1,4,0,0,7388.424,-2724.909,869.8643,0.5934119,300,0,0,4979,0,0,0,0,0); - -DELETE FROM `creature_template_addon` WHERE `entry`=@BUNNY_TARGET; -INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(@BUNNY_TARGET,0,0,65536,1,0, '61333 56304 61334'); -- Gigantic Helm Sparkle / Hodir's Helm Bunny: Invisibility / Extra Large Helm Sparkle - -DELETE FROM `spell_script_names` WHERE `spell_id`=@SPELL_READ_PRONOUNCEMENT; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(@SPELL_READ_PRONOUNCEMENT, 'spell_q12987_read_pronouncement'); - -DELETE FROM `spell_area` WHERE `spell`=@SPELL_AREA; -INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES -(@SPELL_AREA,@AREA,@QUEST,1,@QUEST,0,0,2,1); - --- relation for the daily quest that should be available after finishing Mounting Hodir's Helm - --- removing flag 4 or else player can't interract with Q giver -UPDATE `gameobject_template` SET `flags`=`flags`&~4 WHERE `entry`=@HELM; - -DELETE FROM `gameobject_questrelation` WHERE `id`=@HELM; -INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES -(@HELM,@QUEST); - -DELETE FROM `gameobject_involvedrelation` WHERE `id`=@HELM; -INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES -(@HELM,@QUEST); diff --git a/sql/updates/world/2012_02_22_03_world_conditions.sql b/sql/updates/world/2012_02_22_03_world_conditions.sql deleted file mode 100644 index 9c4d0cdec95..00000000000 --- a/sql/updates/world/2012_02_22_03_world_conditions.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE `conditions` SET `SourceTypeOrReferenceId`=13 WHERE `SourceTypeOrReferenceId`=17 AND `SourceGroup`=1; -UPDATE `conditions` SET `ConditionValue2`=1 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1323 AND `SourceEntry`=2 AND `ConditionTypeOrReference`=2; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup`=17465 AND `SourceEntry`=22554 AND `ConditionTypeOrReference`=7; diff --git a/sql/updates/world/2012_02_23_00_world_spell_script_names.sql b/sql/updates/world/2012_02_23_00_world_spell_script_names.sql deleted file mode 100644 index 6ea96033091..00000000000 --- a/sql/updates/world/2012_02_23_00_world_spell_script_names.sql +++ /dev/null @@ -1,7 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` in (11885,11886,11887,11888,11889); -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(11885,'spell_item_muisek_vessel'), -(11886,'spell_item_muisek_vessel'), -(11887,'spell_item_muisek_vessel'), -(11888,'spell_item_muisek_vessel'), -(11889,'spell_item_muisek_vessel'); diff --git a/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql b/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql deleted file mode 100644 index daecfc02dfc..00000000000 --- a/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql +++ /dev/null @@ -1,10 +0,0 @@ -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Deathbringer's Cache -(28058,49908,20,1,0,1,1), -- Primordial Saronite 10H -(28074,49908,20,1,0,1,1), -- Primordial Saronite 25N -(28088,49908,20,1,0,1,1), -- Primordial Saronite 25H --- Cache of the Dreamwalker -(28064,49908,20,1,0,1,1), -- Primordial Saronite 10H -(28082,49908,20,1,0,1,1), -- Primordial Saronite 25N -(28096,49908,20,1,0,1,1); -- Primordial Saronite 25H diff --git a/sql/updates/world/2012_02_24_01_world_sai.sql b/sql/updates/world/2012_02_24_01_world_sai.sql deleted file mode 100644 index 19e4e8fb772..00000000000 --- a/sql/updates/world/2012_02_24_01_world_sai.sql +++ /dev/null @@ -1,44 +0,0 @@ --- Fix for quest "You've Really Done It This Time, Kul" 14096 Alliance / 14142 Horde --- SAI for Black Cage -SET @ENTRY=195310; -UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=1); -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 -(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Black Cage - On activate - Run Script'), -(@ENTRY*100,9,0,0,0,0,100,0,6000,6000,6000,6000,32,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Black Cage - Script - set go state'); --- SAI for Captive Aspirant -SET @ENTRY=34716; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 -(@ENTRY,0,0,0,8,0,100,0,66531,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - On spellhit - Run Script'), -(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - Say random text'), -(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Captive Aspirant - Script - Kill credit'), -(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - move 10 yards'), -(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captive Aspirant - Script - despawn'); --- SAI for Kul the Reckless -SET @ENTRY=34956; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 -(@ENTRY,0,0,0,8,0,100,0,66531,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - On spellhit - Run Script'), -(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - Say random text'), -(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,2000,2000,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kul the Reckless - Script - Kill credit'), -(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - move 10 yards'), -(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kul the Reckless - Script - despawn'); --- Captive Aspirant & Kul the Reckless text from sniff -DELETE FROM `creature_text` WHERE `entry` IN (34716,34956); -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(34716,0,0, 'Thank you, $c.',12,0,100,5,0,0, 'Captive Aspirant'), -(34716,0,1, 'They''re killing the prisoners! Hurry, help the others.',12,0,100,5,0,0, 'Captive Aspirant'), -(34716,0,2, 'I knew I shouldn''t have come to the tournament!',12,0,100,5,0,0, 'Captive Aspirant'), -(34716,0,3, 'I thought I was going to die in there!',12,0,100,5,0,0, 'Captive Aspirant'), -(34956,0,0, 'They were seconds from strapping me to one of those altars and sucking my soul out. Let''s get out of here!',12,0,100,5,0,0, 'Kul the Reckless'); --- Target conditions for spell 66531 -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=66531; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,2,66531,0,0,31,3,34716,0,0,0,'','Spell 66531 targets npc 34716 or npc 34956'), -(13,2,66531,0,1,31,3,34956,0,0,0,'','Spell 66531 targets npc 34716 or npc 34956'); diff --git a/sql/updates/world/2012_02_25_00_world_spell_script_names.sql b/sql/updates/world/2012_02_25_00_world_spell_script_names.sql deleted file mode 100644 index 9619121e982..00000000000 --- a/sql/updates/world/2012_02_25_00_world_spell_script_names.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_collision_filter'; diff --git a/sql/updates/world/2012_02_25_01_world_command.sql b/sql/updates/world/2012_02_25_01_world_command.sql deleted file mode 100644 index de708b7a9cc..00000000000 --- a/sql/updates/world/2012_02_25_01_world_command.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM `command` WHERE `name` IN ('group','group leader','group disband','group remove'); -INSERT INTO `command` (`name`,`security`,`help`) VALUES -('group', 3, 'Syntax: .group $subcommand\nType .group to see the list of possible subcommands or .help group $subcommand to see info on subcommands'), -('group leader', 3, 'Syntax: .group leader [$characterName]\n\nSets the given character as his group''s leader.'), -('group disband', 3, 'Syntax: .group disband [$characterName]\n\nDisbands the given character''s group.'), -('group remove', 3, 'Syntax: .group remove [$characterName]\n\nRemoves the given character from his group.'); diff --git a/sql/updates/world/2012_02_25_01_world_misc.sql b/sql/updates/world/2012_02_25_01_world_misc.sql deleted file mode 100644 index deedd50a819..00000000000 --- a/sql/updates/world/2012_02_25_01_world_misc.sql +++ /dev/null @@ -1,11 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` IN (61698); -INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES -(61698,'spell_gen_ds_flush_knockback'); - -DELETE FROM `spell_dbc` WHERE `id`=61698; -INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES -(61698,0,0,536871296,269058048,67108868,268894272,2048,0,1024,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,-1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,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,'Flush - Knockback effect'); - -UPDATE `battleground_template` SET `HordeStartO`=3.14159 WHERE `id`=10; - -UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry`=28567; diff --git a/sql/updates/world/2012_02_25_02_world_sai.sql b/sql/updates/world/2012_02_25_02_world_sai.sql deleted file mode 100644 index e2ff99534b4..00000000000 --- a/sql/updates/world/2012_02_25_02_world_sai.sql +++ /dev/null @@ -1,28 +0,0 @@ --- Fix for Quest: 12843 "They Took Our Men!" --- SAI for Rusty Cage -SET @ENTRY=191544; -UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=1); -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 -(@ENTRY,1,0,1,70,0,100,0,2,0,0,0,45,0,1,0,0,0,0,11,29466,5,0,0,0,0,0,'Rusty Cage - On activate - set data on Goblin Prisoner'), -(@ENTRY,1,1,0,61,0,100,0,0,0,0,0,33,29466,0,0,0,0,0,7,0,0,0,0,0,0,0,'Rusty Cage - On activate - quest credit'); --- SAI for Goblin Prisoner -SET @ENTRY=29466; -UPDATE `creature` SET `modelid`=0,`spawntimesecs`=120,`curhealth`=1 WHERE `id`=29466; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 -(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,32,0,0,0,0,0,0,15,191544,5,0,0,0,0,0,'Goblin Prisoner - On respawn - reset cage'), -(@ENTRY,0,1,0,38,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - On dataset - Run Script'), -(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - set data 0'), -(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,1000,1000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - Say random text'), -(@ENTRY*100,9,2,0,0,0,100,0,2000,2000,2000,2000,46,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - move 10 yards'), -(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Goblin Prisoner - Script - despawn'); --- Goblin Prisoner -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'I can''t believe it! I''m free to go!',12,0,100,5,0,0, 'Goblin Prisoner'), -(@ENTRY,0,1, 'I''m free? I''m free!',12,0,100,5,0,0, 'Goblin Prisoner'), -(@ENTRY,0,2, 'Time to hightail it! Thanks, friend!',12,0,100,5,0,0, 'Goblin Prisoner'); diff --git a/sql/updates/world/2012_02_26_00_world_misc.sql b/sql/updates/world/2012_02_26_00_world_misc.sql deleted file mode 100644 index 3df42934aa9..00000000000 --- a/sql/updates/world/2012_02_26_00_world_misc.sql +++ /dev/null @@ -1,13 +0,0 @@ -UPDATE `spell_area` SET `quest_start`=12987,`quest_end`=12987 WHERE `spell`=56305; - -DELETE FROM `reference_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; -- bad data -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Deathbringer's Cache -(28058,49908,20,1,0,1,1), -- Primordial Saronite 10H -(28074,49908,20,1,0,1,1), -- Primordial Saronite 25N -(28088,49908,20,1,0,1,1), -- Primordial Saronite 25H --- Cache of the Dreamwalker -(28064,49908,20,1,0,1,1), -- Primordial Saronite 10H -(28082,49908,20,1,0,1,1), -- Primordial Saronite 25N -(28096,49908,20,1,0,1,1); -- Primordial Saronite 25H diff --git a/sql/updates/world/2012_02_26_01_world_spell_script_names.sql b/sql/updates/world/2012_02_26_01_world_spell_script_names.sql deleted file mode 100644 index 7bb38d5f2e0..00000000000 --- a/sql/updates/world/2012_02_26_01_world_spell_script_names.sql +++ /dev/null @@ -1,4 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` IN (48018, 48020); -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(48018,'spell_warl_demonic_circle_summon'), -(48020,'spell_warl_demonic_circle_teleport'); diff --git a/sql/updates/world/2012_02_27_00_world_creature_template.sql b/sql/updates/world/2012_02_27_00_world_creature_template.sql deleted file mode 100644 index b8936774e36..00000000000 --- a/sql/updates/world/2012_02_27_00_world_creature_template.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Update gold drops in ICC bosses based on old.wowhead.com data -UPDATE `creature_template` SET `mingold`=250000,`maxgold`=300000 WHERE `entry` IN(36612,37957,37958,37959); -- Lord Marrowgar -UPDATE `creature_template` SET `mingold`=175000,`maxgold`=225000 WHERE `entry` IN (36626,37504,37505,37506); -- Festergut -UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36627,38390,38549,38550); -- Rotface -UPDATE `creature_template` SET `mingold`=400000,`maxgold`=500000 WHERE `entry` IN (36678,38431,38585,38586); -- Professor Putricide -UPDATE `creature_template` SET `mingold`=300000,`maxgold`=350000 WHERE `entry` IN (37955,38434,38435,38436); -- Blood-Queen Lana'thel -UPDATE `creature_template` SET `mingold`=1330000,`maxgold`=1400000 WHERE `entry` IN (36853,38265,38266,38267); -- Sindragosa -UPDATE `creature_template` SET `mingold`=1300000,`maxgold`=1500000 WHERE `entry` IN (36597,39166,39167,39168); -- The Lich King diff --git a/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql b/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql deleted file mode 100644 index 9c07709246f..00000000000 --- a/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql +++ /dev/null @@ -1,366 +0,0 @@ --- Delete unused creature_data rows -DELETE FROM `creature_addon` WHERE `guid` IN (131728,131282,131283,131284,131285,131286,131287,131288,131289,131290,131291,131292,131293,131294,131295,131296,131297,131298,131299,131300,131301,131302,131303,131304,131305,131306,131307,131308,131309,131310,131311,131312,131313,131314,131315,131316,131317,131318,131319,131320,131321,131322,131326,131327,131328,131350,131351,131352,131353,131354,131376,131377,131378,131379,131380,131392,131437,131458,131631,131632,131633,131634,131635,131636,131706,131727,13128,131729,131730,131731); - --- Replace Wintergrasp spawns with properly phased spawns -SET @GUID := 88310; -DELETE FROM `creature` WHERE `id` IN (31841,31842,30400,30499,30489,30869,31036,31051,31052,31054,31108,31109,31153,39172,30870,31053,31091,31101,31102,31106,31107,31151,32294,39173,32296,30488); -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES --- Taunka Spirit Guide (Horde) -(@GUID+0,31841,571,1,0x00000010,0,0,4318.436,2408.06738,392.675751,6.23082542,120,0,0,1,0,0), -- Eastspark Workshop -(@GUID+1,31841,571,1,0x00000010,0,0,4336.25439,3235.51978,390.334,0.628318548,120,0,0,1,0,0), -- Westspark Workshop -(@GUID+2,31841,571,1,0x00000010,0,0,5104.753,2300.9458,368.568054,0.7330383,120,0,0,1,0,0), -- The Sunken Ring -(@GUID+3,31841,571,1,0x00000010,0,0,5103.133,3462.128,368.568054,5.270895,120,0,0,1,0,0), -- The Chilled Quagmire "Outside broker Temple" -(@GUID+4,31841,571,1,0x00000040,0,0,5537.482,2898.90674,517.2589,4.86946869,120,0,0,1,0,0), -- Fortress -(@GUID+5,31841,571,1,0x00000001,0,0,5031.84131,3710.74878,372.4835,0,120,5,0,1,0,0), -- Horde Landing Zone --- Dwarven Spirit Guide (Alliance) -(@GUID+6,31842,571,1,0x00000020,0,0,4318.436,2408.06738,392.675751,6.23082542,120,0,0,1,0,0), -- Eastspark Workshop -(@GUID+7,31842,571,1,0x00000020,0,0,4336.25439,3235.51978,390.334,0.628318548,120,0,0,1,0,0), -- Westspark Workshop -(@GUID+8,31842,571,1,0x00000020,0,0,5104.753,2300.9458,368.568054,0.7330383,120,0,0,1,0,0), -- The Sunken Ring -(@GUID+9,31842,571,1,0x00000020,0,0,5103.133,3462.128,368.568054,5.270895,120,0,0,1,0,0), -- The Chilled Quagmire "Outside The Broken Temple" -(@GUID+10,31842,571,1,0x00000080,0,0,5537.482,2898.90674,517.2589,4.86946869,120,0,0,1,0,0), -- Fortress -(@GUID+11,31842,571,1,0x00000001,0,0,5140.7876,2179.12451,390.9512,1.97222209,120,0,0,1,0,0), -- Aliance Landing Zone --- Goblin Mechanic (Horde) -(@GUID+12,30400,571,1,0x00000010,0,0,4964.89,3383.06,382.911,6.12611,180,0,0,1,0,0), -- The Broken Temple -(@GUID+13,30400,571,1,0x00000010,0,0,4939.76,2389.06,326.153,3.26377,180,0,0,1,0,0), -- The Sunken Ring -(@GUID+14,30400,571,1,0x00000010,0,0,4357.67,2357.99,382.007,1.67552,180,0,0,1,0,0), -- Eastspark Workshop -(@GUID+15,30400,571,1,0x00000010,0,0,4354.15,3312.82,378.046,1.67552,180,0,0,1,0,0), -- Westspark Workshop -(@GUID+16,30400,571,1,0x00000040,0,0,5391.61,2707.72,415.051,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress -(@GUID+17,30400,571,1,0x00000040,0,0,5392.91,2975.26,415.223,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress --- Gnomish Engineer (Alliance) -(@GUID+18,30499,571,1,0x00000020,0,0,4964.89,3383.06,382.911,6.12611,180,0,0,1,0,0), -- The Broken Temple -(@GUID+19,30499,571,1,0x00000020,0,0,4939.76,2389.06,326.153,3.26377,180,0,0,1,0,0), -- The Sunken Ring -(@GUID+20,30499,571,1,0x00000020,0,0,4357.67,2357.99,382.007,1.67552,180,0,0,1,0,0), -- Eastspark Workshop -(@GUID+21,30499,571,1,0x00000020,0,0,4354.15,3312.82,378.046,1.67552,180,0,0,1,0,0), -- Westspark Workshop -(@GUID+22,30499,571,1,0x00000080,0,0,5391.61,2707.72,415.051,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress -(@GUID+23,30499,571,1,0x00000080,0,0,5392.91,2975.26,415.223,4.55531,180,0,0,1,0,0), -- Wintergrasp Fortress --- Alliance NPC's -(@GUID+24,30489,571,1,0x00000080,0,0,5369.973,2874.83081,409.3225,3.12413931,120,0,0,1,0,0), -- Morgan Day -(@GUID+25,30869,571,1,0x00000001,0,0,5102.75049,2187.82837,365.707855,3.996804,120,0,0,1,0,0), -- Arzo Safeflight -(@GUID+26,31036,571,1,0x00000040,0,0,5078.281,2183.704,365.028564,1.46607661,120,0,0,1,0,0), -- Commander Zanneth -(@GUID+27,31036,571,1,0x00000080,0,0,5358.641,2841.76416,409.3225,1.13262534,120,0,0,1,0,0), -(@GUID+28,31051,571,1,0x00000040,0,0,5081.697,2173.73,365.8777,0.8552113,120,0,0,1,0,0), -- Sorceress Kaylana -(@GUID+29,31051,571,1,0x00000080,0,0,5296.869,2887.67114,409.274658,5.60250664,120,0,0,1,0,0), -(@GUID+30,31052,571,1,0x00000040,0,0,5100.06543,2168.89,365.7788,1.97222209,120,0,0,1,0,0), -- Bowyer Randolph -(@GUID+31,31052,571,1,0x00000080,0,0,5302.57373,2750.40332,409.274658,5.46288061,120,0,0,1,0,0), -(@GUID+32,31054,571,1,0x00000040,0,0,5088.611,2167.66235,365.688751,0.6806784,120,0,0,1,0,0), -- Anchorite Tessa -(@GUID+33,31054,571,1,0x00000080,0,0,5372.05859,3028.33618,409.206024,0.012565271,120,0,0,1,0,0), -(@GUID+34,31108,571,1,0x00000040,0,0,5095.673,2193.284,365.9236,4.939282,120,0,0,1,0,0), -- Siege Master Stouthandle -(@GUID+35,31108,571,1,0x00000080,0,0,5298.267,2924.97632,409.274658,0.9075712,120,0,0,1,0,0), -(@GUID+36,31109,571,1,0x00000040,0,0,5080.403,2199.00244,359.4894,2.96705961,120,0,0,1,0,0), -- Senior Demolitionist Legoso -(@GUID+37,31109,571,1,0x00000080,0,0,5228.2915,2809.888,409.274658,3.19395256,120,0,0,1,0,0), -(@GUID+38,31153,571,1,0x00000040,0,0,5088.48633,2188.17871,365.646973,5.253441,120,0,0,1,0,0), -- Tactical Officer Ahbramis -(@GUID+39,31153,571,1,0x00000080,0,0,5364.784,2835.135,409.3225,3.12413931,120,0,0,1,0,0), -(@GUID+40,32294,571,1,0x00000080,0,0,5374.568,2790.784,409.3225,2.72271371,120,0,0,1,0,0), -- Knight Dameron -(@GUID+41,39172,571,1,0x00000080,0,0,5372.672,2786.74048,409.4423,2.80998015,120,0,0,1,0,0), -- Marshal Magruder -(@GUID+42,30488,571,1,0x00000080,0,0,5370.428,2814.274,409.3225,3.054326,120,0,0,1,0,0), -- Travis Day --- Horde NPC's -(@GUID+43,30870,571,1,0x00000001,0,0,5023.4043,3686.03345,363.1192,5.131268,120,0,0,1,0,0), -- Herzo Safeflight -(@GUID+44,31053,571,1,0x00000040,0,0,5379.875,3027.43359,409.206024,0,120,0,0,1,0,0), -- Primalist Mulfort -(@GUID+45,31053,571,1,0x00000080,0,0,5034.703125,3666.703125,363.273865,4.310963,120,0,0,1,0,0), -(@GUID+46,31091,571,1,0x00000040,0,0,5347.7915,2837.38574,409.3466,2.62603331,120,0,0,1,0,0), -- Commander Dardosh -(@GUID+47,31091,571,1,0x00000080,0,0,5018.662109,3672.279541,362.862885,2.209141,120,0,0,1,0,0), -(@GUID+48,31101,571,1,0x00000040,0,0,5296.564,2789.87378,409.274658,0.7330383,120,0,0,1,0,0), -- Hoodoo Master Fu'jin -(@GUID+49,31101,571,1,0x00000080,0,0,5014.065430,3678.846436,362.995575,5.096361,120,0,0,1,0,0), -(@GUID+50,31102,571,1,0x00000040,0,0,5295.455,2732.87549,409.274658,4.7211113,120,0,0,1,0,0), -- Vieron Blazefeather -(@GUID+51,31102,571,1,0x00000080,0,0,5031.676270,3655.820801,362.234558,5.131268,120,0,0,1,0,0), -(@GUID+52,31106,571,1,0x00000040,0,0,5295.56348,2926.67188,409.274658,0.87266463,120,0,0,1,0,0), -- Siegesmith Stronghoof -(@GUID+53,31106,571,1,0x00000080,0,0,5037.602051,3675.459717,363.147888,3.176499,120,0,0,1,0,0), -(@GUID+54,31107,571,1,0x00000040,0,0,5230.09033,2876.635,409.316254,-2.19854617,120,0,0,1,0,0), -- Lieutenant Murp -(@GUID+55,31107,571,1,0x00000080,0,0,5004.455078,3661.089111,361.335785,3.979351,120,0,0,1,0,0), -(@GUID+56,31151,571,1,0x00000040,0,0,5363.2876,2834.52954,409.3606,2.76273036,120,0,0,1,0,0), -- Tactical Officer Kilrath -(@GUID+57,31151,571,1,0x00000080,0,0,5034.698242,3683.268799,363.129120,4.310963,120,0,0,1,0,0), -(@GUID+58,32296,571,1,0x00000040,0,0,5374.568,2790.784,409.3225,2.60054,120,0,0,1,0,0), -- Stone Guard Mukar --- Missing noc in fortress -(@GUID+60,39173,571,1,0x00000040,0,0,5372.672,2786.74048,409.4423,2.80998015,120,0,0,1,0,0); -- Champion Ros'slai - --- corrects previously inserted creature -UPDATE `creature` SET `spawndist`=0 WHERE `guid`=88315; - --- Pathing for Anchorite Tessa Entry: 31054 -SET @NPC := @GUID+33; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `MovementType`=2 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,5382.507,3028.468,409.206,0,0,0,100,0), -(@PATH,2,5392.744,3028.737,409.206,0,0,0,100,0), -(@PATH,3,5382.507,3028.468,409.206,0,0,0,100,0), -(@PATH,4,5371.491,3028.329,409.206,0,0,0,100,0), -(@PATH,5,5360.032,3028.516,409.3161,0,0,0,100,0), -(@PATH,6,5371.491,3028.329,409.206,0,0,0,100,0); - --- Pathing for Commander Zanneth Entry: 31036 -SET @NPC := @GUID+27; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5358.854,`position_y`=2859.232,`position_z`=409.5425 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,14337, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,5359.788,2846.359,409.3642,0,0,0,100,0), -(@PATH,2,5359.187,2839.211,409.3642,0,0,0,100,0), -(@PATH,3,5360.083,2823.116,409.5381,0,0,0,100,0), -(@PATH,4,5359.187,2839.211,409.3642,0,0,0,100,0), -(@PATH,5,5359.788,2846.359,409.3642,0,0,0,100,0), -(@PATH,6,5358.854,2859.232,409.5425,0,0,0,100,0); - --- Pathing for Commander Dardosh Entry: 31091 -SET @NPC := @GUID+46; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `MovementType`=2,`position_x`=5359.546,`position_y`=2858.049,`position_z`=409.3642 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,5359.202,2843.208,409.3642,0,0,0,100,0), -(@PATH,2,5358.997,2827.974,409.3639,0,0,0,100,0), -(@PATH,3,5359.202,2843.208,409.3642,0,0,0,100,0), -(@PATH,4,5359.546,2858.049,409.3642,0,0,0,100,0); - --- Pathing for Commander Dardosh Entry: 31091 -SET @NPC := @GUID+47; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `MovementType`=2,`position_x`=5018.411133,`position_y`=3672.615967,`position_z`=362.863525 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,5022.827637,3666.665771,362.205750,0,0,0,100,0), -(@PATH,2,5024.270508,3658.739258,361.705750,0,0,0,100,0), -(@PATH,3,5022.827637,3666.665771,362.205750,0,0,0,100,0), -(@PATH,4,5018.411133,3672.615967,362.863525,0,0,0,100,0); - --- Pathing for Primalist Mulfort Entry: 31053 -SET @NPC := @GUID+44; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,5390.624,3027.994,409.206,0,0,0,100,0), -(@PATH,2,5379.875,3027.434,409.206,0,0,0,100,0), -(@PATH,3,5371.404,3026.511,409.206,0,0,0,100,0), -(@PATH,4,5379.875,3027.434,409.206,0,0,0,100,0); - --- Pathing for Vieron Blazefeather Entry: 31102 -SET @NPC := @GUID+50; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `MovementType`=2,`position_x`=5296.644,`position_y`=2731.107,`position_z`=409.3163 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,5295.544,2722.631,409.3163,0,0,0,100,0), -(@PATH,2,5296.644,2731.107,409.3163,0,0,0,100,0), -(@PATH,3,5297.874,2738.155,409.3163,0,0,0,100,0), -(@PATH,4,5305.192,2746.161,409.3061,0,0,0,100,0), -(@PATH,5,5297.874,2738.155,409.3163,0,0,0,100,0), -(@PATH,6,5296.644,2731.107,409.3163,0,0,0,100,0); - --- Guards "Alliance" (Valiance Expedition Champion) -SET @GUID := 88371; -DELETE FROM `creature` WHERE `id`=30740; -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES --- Fortress -(@GUID+0,30740,571,1,0x00000080,0,0,5150.26855,2786.02173,409.5469,3.22885919,120,0,0,1,0,0), -(@GUID+1,30740,571,1,0x00000080,0,0,5150.657,2777.9502,409.4053,2.94960642,120,0,0,1,0,0), -(@GUID+2,30740,571,1,0x00000080,0,0,5193.632,2734.172,409.272552,4.694936,120,0,0,1,0,0), -(@GUID+3,30740,571,1,0x00000080,0,0,5200.497,2733.88843,409.272552,4.677482,120,0,0,1,0,0), -(@GUID+4,30740,571,1,0x00000080,0,0,5264.64648,2670.1936,409.1819,3.07177949,120,0,0,1,0,0), -(@GUID+5,30740,571,1,0x00000080,0,0,5265.30566,2663.15381,409.1819,3.12413931,120,0,0,1,0,0), -(@GUID+6,30740,571,1,0x00000080,0,0,5307.02051,2613.89771,409.172363,4.694936,120,0,0,1,0,0), -(@GUID+7,30740,571,1,0x00000080,0,0,5311.133,3061.04248,408.809937,1.50098312,120,0,0,1,0,0), -(@GUID+8,30740,571,1,0x00000080,0,0,5315.87354,2614.21924,408.972748,4.677482,120,0,0,1,0,0), -(@GUID+9,30740,571,1,0x00000080,0,0,5318.09,3060.634,408.882782,1.62315619,120,0,0,1,0,0), -(@GUID+10,30740,571,1,0x00000080,0,0,5149.395,2897.044,409.304443,3.03687286,120,0,0,1,0,0), -(@GUID+11,30740,571,1,0x00000080,0,0,5149.51953,2904.19336,409.276062,3.07177949,120,0,0,1,0,0), -(@GUID+12,30740,571,1,0x00000080,0,0,5192.79248,2948.454,409.2746,1.50098312,120,0,0,1,0,0), -(@GUID+13,30740,571,1,0x00000080,0,0,5201.645,2948.77612,409.2746,1.62315619,120,0,0,1,0,0), -(@GUID+14,30740,571,1,0x00000080,0,0,5265.28,3010.10083,408.895782,2.82743335,120,0,0,1,0,0), -(@GUID+15,30740,571,1,0x00000080,0,0,5265.47559,3017.39941,408.582977,3.07177949,120,0,0,1,0,0), -(@GUID+16,30740,571,1,0x00000080,0,0,5367.91455,2826.52026,409.3225,3.33357882,120,0,0,1,0,0), -(@GUID+17,30740,571,1,0x00000080,0,0,5368.71338,2856.36035,409.3225,2.94960642,120,0,0,1,0,0), -(@GUID+18,30740,571,1,0x00000080,0,0,5388.56,2834.76782,418.7585,3.07177949,120,0,0,1,0,0), -(@GUID+19,30740,571,1,0x00000080,0,0,5389.272,2847.36816,418.7585,3.106686,120,0,0,1,0,0), -(@GUID+20,30740,571,1,0x00000080,0,0,4684.475,2414.28979,369.9621,-2.85779858,120,0,0,1,0,0), -(@GUID+21,30740,571,1,0x00000080,0,0,4692.75635,2392.88574,369.0177,-2.82921553,120,0,0,1,0,0), -(@GUID+22,30740,571,1,0x00000080,0,0,5327.264648,2659.455322,409.178711,3.069901,120,0,0,1,0,0), -- F1307814000A2DAD path -(@GUID+23,30740,571,1,0x00000080,0,0,5154.225586,2833.824219,409.262451,3.124139,120,0,0,1,0,0), -(@GUID+24,30740,571,1,0x00000080,0,0,5154.119629,2847.892822,409.247559,3.071779,120,0,0,1,0,0), -(@GUID+25,30740,571,1,0x00000080,0,0,5179.111328,2837.129639,409.274658,3.211406,120,0,0,1,0,0), -(@GUID+26,30740,571,1,0x00000080,0,0,5179.666504,2846.597900,409.274658,3.089233,120,0,0,1,0,0), -(@GUID+27,30740,571,1,0x00000080,0,0,5270.163086,2833.479248,409.274658,3.124139,120,0,0,1,0,0), -(@GUID+28,30740,571,1,0x00000080,0,0,5270.057129,2847.547607,409.274658,3.071779,120,0,0,1,0,0), -(@GUID+29,30740,571,1,0x00000080,0,0,5307.750000,3008.872559,409.193024,4.781681,120,0,0,1,0,0), -- F1307814000A43AE path -(@GUID+30,30740,571,1,0x00000080,0,0,5335.117188,2916.802002,409.443756,1.500983,120,0,0,1,0,0), -(@GUID+31,30740,571,1,0x00000080,0,0,5350.681152,2917.011719,409.274658,1.466077,120,0,0,1,0,0), -(@GUID+32,30740,571,1,0x00000080,0,0,5335.306152,2764.110352,409.274567,4.834562,120,0,0,1,0,0), -(@GUID+33,30740,571,1,0x00000080,0,0,5349.811523,2763.634766,409.333374,4.660029,120,0,0,1,0,0), --- Eastspark Workshop -(@GUID+34,30740,571,1,0x00000080,0,0,4349.537,2411.25781,374.743317,2.05948853,120,0,0,1,0,0), -(@GUID+35,30740,571,1,0x00000080,0,0,4388.13135,2411.97827,374.743317,1.6406095,120,0,0,1,0,0), -(@GUID+36,30740,571,1,0x00000080,0,0,4391.6665,2300.60913,374.7433,4.92182827,120,0,0,1,0,0), -(@GUID+37,30740,571,1,0x00000080,0,0,4413.42969,2393.44946,376.3599,1.06465089,120,0,0,1,0,0), -(@GUID+38,30740,571,1,0x00000080,0,0,4417.92,2331.237,370.9189,5.846853,120,0,0,1,0,0), -(@GUID+39,30740,571,1,0x00000080,0,0,4349.11768,2299.27954,374.7433,4.904375,120,0,0,1,0,0), -(@GUID+40,30740,571,1,0x00000080,0,0,4418.608,2355.28735,372.4907,6.02138567,120,0,0,1,0,0); - --- banners -SET @OGUID := 75939; -DELETE FROM `gameobject` WHERE `id` IN (192254,192255,192269,192284,192285,192286,192287,192292,192299,192304,192305,192306,192307,192308,192309,192310,192312,192313,192314,192316,192317,192318,192319,192320,192321, - 192322,192323,192324,192325,192326,192327,192328,192329,192330,192331,192332,192333,192334,192335,192336,192338,192339,192349,192350,192351,192352,192353,192354,192355,192356, - 192357,192358,192359,192360,192361,192362,192363,192364,192366,192367,192368,192369,192370,192371,192372,192373,192374,192375,192376,192377,192378,192379,192487,192488,192501, - 192502); -DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+115; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES --- Fortress Banners "Alliance" -(@OGUID+0,192286,571,1,128,5371.44873,2820.79346,409.426575,3.124123,0,0,0,0,120,0,1), -(@OGUID+1,192287,571,1,128,5372.42432,2862.47925,409.3659,3.14159274,0,0,0,0,120,0,1), -(@OGUID+2,192292,571,1,128,5154.35059,2862.08423,445.0105,3.14159274,0,0,0,0,120,0,1), -(@OGUID+3,192299,571,1,128,5155.21631,2820.63013,444.9789,-3.115388,0,0,0,0,120,0,1), -(@OGUID+4,192304,571,1,128,5398.03564,2873.013,455.203552,3.132858,0,0,0,0,120,0,1), -(@OGUID+5,192305,571,1,128,5397.31348,2809.264,455.101624,3.132858,0,0,0,0,120,0,1), -(@OGUID+6,192306,571,1,128,5270.55469,2861.68237,444.917236,-3.124123,0,0,0,0,120,0,1), -(@OGUID+7,192307,571,1,128,5271.16064,2820.10864,445.109,-3.132858,0,0,0,0,120,0,1), -(@OGUID+8,192308,571,1,128,5235.12744,2942.12329,444.2792,1.58824873,0,0,0,0,120,0,1), -(@OGUID+9,192309,571,1,128,5272.549,2976.54175,444.493,3.132858,0,0,0,0,120,0,1), -(@OGUID+10,192310,571,1,128,5352.19775,3055.0166,444.5646,1.57952213,0,0,0,0,120,0,1), -(@OGUID+11,192312,571,1,128,5236.315,2739.21533,444.992828,-1.60570168,0,0,0,0,120,0,1), -(@OGUID+12,192313,571,1,128,5271.634,2704.829,445.182617,-3.124123,0,0,0,0,120,0,1), -(@OGUID+13,192314,571,1,128,5350.905,2622.48,444.649323,-1.56206989,0,0,0,0,120,0,1), -(@OGUID+14,192316,571,1,128,5322.013,2781.13281,435.6727,1.57952213,0,0,0,0,120,0,1), -(@OGUID+15,192317,571,1,128,5363.387,2781.27856,435.634125,1.58824873,0,0,0,0,120,0,1), -(@OGUID+16,192318,571,1,128,5322.24854,2898.94629,435.642975,-1.57952213,0,0,0,0,120,0,1), -(@OGUID+17,192319,571,1,128,5364.30371,2899.216,435.690826,-1.55334139,0,0,0,0,120,0,1), -(@OGUID+18,192320,571,1,128,5289.048,2820.22656,435.6738,0,0,0,0,0,120,0,1), -(@OGUID+19,192321,571,1,128,5288.847,2861.82128,435.590485,0.0261791088,0,0,0,0,120,0,1), -(@OGUID+20,192322,571,1,128,5322.89258,2917.14233,445.1543,1.56206989,0,0,0,0,120,0,1), -(@OGUID+21,192323,571,1,128,5364.283,2917.264,445.332184,1.58824611,0,0,0,0,120,0,1), -(@OGUID+22,192324,571,1,128,5290.514,2976.56177,435.087463,0.008724241,0,0,0,0,120,0,1), -(@OGUID+23,192325,571,1,128,5352.37744,3036.95483,435.111053,-1.56206989,0,0,0,0,120,0,1), -(@OGUID+24,192326,571,1,128,5392.64063,3036.967,433.648682,-1.51843357,0,0,0,0,120,0,1), -(@OGUID+25,192327,571,1,128,5172.336,2862.57544,435.65802,0,0,0,0,0,120,0,1), -(@OGUID+26,192328,571,1,128,5173.12842,2820.95654,435.657623,0.0261791088,0,0,0,0,120,0,1), -(@OGUID+27,192329,571,1,128,5235.32227,2924.31079,434.8981,-1.56206989,0,0,0,0,120,0,1), -(@OGUID+28,192330,571,1,128,5237.02344,2757.35669,435.625641,1.55334139,0,0,0,0,120,0,1), -(@OGUID+29,192331,571,1,128,5289.78125,2704.62158,435.714325,0.008724241,0,0,0,0,120,0,1), -(@OGUID+30,192332,571,1,128,5350.93945,2640.43066,435.2642,1.56206989,0,0,0,0,120,0,1), -(@OGUID+31,192333,571,1,128,5392.28027,2639.84033,435.207916,1.52716041,0,0,0,0,120,0,1), -(@OGUID+32,192334,571,1,128,5322.17041,2763.20142,444.9744,-1.56206715,0,0,0,0,120,0,1), -(@OGUID+33,192335,571,1,128,5363.71631,2763.24731,445.023132,-1.54461551,0,0,0,0,120,0,1), -(@OGUID+34,192487,571,1,128,5145.11133,2934.948,433.254852,-3.10665226,0,0,0,0,120,0,1), -(@OGUID+35,192487,571,1,128,5146.04443,2747.30249,433.527039,3.124123,0,0,0,0,120,0,1), -(@OGUID+36,192487,571,1,128,5158.71,2882.90161,431.27417,3.14159274,0,0,0,0,120,0,1), -(@OGUID+37,192487,571,1,128,5160.28369,2798.59766,430.6037,-3.124123,0,0,0,0,120,0,1), -(@OGUID+38,192487,571,1,128,5162.90674,2952.59766,433.368,1.57079577,0,0,0,0,120,0,1), -(@OGUID+39,192487,571,1,128,5163.85,2729.677,433.327545,-1.60570168,0,0,0,0,120,0,1), -(@OGUID+40,192487,571,1,128,5260.82471,2631.81763,433.181061,3.124123,0,0,0,0,120,0,1), -(@OGUID+41,192487,571,1,128,5262.544,3047.93018,431.96524,3.124123,0,0,0,0,120,0,1), -(@OGUID+42,192487,571,1,128,5278.43066,2613.83276,433.294434,-1.62315571,0,0,0,0,120,0,1), -(@OGUID+43,192487,571,1,128,5280.894,3064.95386,431.9758,1.55334139,0,0,0,0,120,0,1), --- Fortress Banners "Horde" -(@OGUID+44,192269,571,1,64,4526.46,2810.18,391.2,-2.99322,0,0,0,1,180,0,1), -(@OGUID+45,192284,571,1,64,5372.48,2862.5,409.049,3.14159,0,0,0,1,180,0,1), -(@OGUID+46,192285,571,1,64,5371.49,2820.8,409.177,3.14159,0,0,0,1,180,0,1), -(@OGUID+47,192338,571,1,64,5397.76,2873.08,455.461,3.10665,0,0,0,1,180,0,1), -(@OGUID+48,192339,571,1,64,5397.39,2809.33,455.344,3.10665,0,0,0,1,180,0,1), -(@OGUID+49,192349,571,1,64,5155.31,2820.74,444.979,-3.13286,0,0,0,1,180,0,1), -(@OGUID+50,192350,571,1,64,5270.69,2861.78,445.058,-3.11539,0,0,0,1,180,0,1), -(@OGUID+51,192351,571,1,64,5271.28,2820.16,445.201,-3.13286,0,0,0,1,180,0,1), -(@OGUID+52,192352,571,1,64,5173.02,2820.93,435.72,0.017452,0,0,0,1,180,0,1), -(@OGUID+53,192353,571,1,64,5172.11,2862.57,435.721,0.017452,0,0,0,1,180,0,1), -(@OGUID+54,192354,571,1,64,5288.41,2861.79,435.721,0.017452,0,0,0,1,180,0,1), -(@OGUID+55,192355,571,1,64,5288.92,2820.22,435.721,0.017452,0,0,0,1,180,0,1), -(@OGUID+56,192356,571,1,64,5237.07,2757.03,435.796,1.51844,0,0,0,1,180,0,1), -(@OGUID+57,192357,571,1,64,5235.34,2924.34,435.04,-1.5708,0,0,0,1,180,0,1), -(@OGUID+58,192358,571,1,64,5322.23,2899.43,435.808,-1.58825,0,0,0,1,180,0,1), -(@OGUID+59,192359,571,1,64,5364.35,2899.4,435.839,-1.5708,0,0,0,1,180,0,1), -(@OGUID+60,192360,571,1,64,5352.37,3037.09,435.252,-1.5708,0,0,0,1,180,0,1), -(@OGUID+61,192361,571,1,64,5392.65,3037.11,433.713,-1.52716,0,0,0,1,180,0,1), -(@OGUID+62,192362,571,1,64,5322.12,2763.61,444.974,-1.55334,0,0,0,1,180,0,1), -(@OGUID+63,192363,571,1,64,5363.61,2763.39,445.024,-1.54462,0,0,0,1,180,0,1), -(@OGUID+64,192364,571,1,64,5350.88,2622.72,444.686,-1.5708,0,0,0,1,180,0,1), -(@OGUID+65,192366,571,1,64,5236.27,2739.46,444.992,-1.59698,0,0,0,1,180,0,1), -(@OGUID+66,192367,571,1,64,5271.8,2704.87,445.183,-3.13286,0,0,0,1,180,0,1), -(@OGUID+67,192368,571,1,64,5289.46,2704.68,435.875,-0.017451,0,0,0,1,180,0,1), -(@OGUID+68,192369,571,1,64,5350.95,2640.36,435.408,1.5708,0,0,0,1,180,0,1), -(@OGUID+69,192370,571,1,64,5392.27,2639.74,435.331,1.50971,0,0,0,1,180,0,1), -(@OGUID+70,192371,571,1,64,5364.29,2916.94,445.331,1.57952,0,0,0,1,180,0,1), -(@OGUID+71,192372,571,1,64,5322.86,2916.95,445.154,1.56207,0,0,0,1,180,0,1), -(@OGUID+72,192373,571,1,64,5290.35,2976.56,435.221,0.017452,0,0,0,1,180,0,1), -(@OGUID+73,192374,571,1,64,5272.94,2976.55,444.492,3.12412,0,0,0,1,180,0,1), -(@OGUID+74,192375,571,1,64,5235.19,2941.9,444.278,1.58825,0,0,0,1,180,0,1), -(@OGUID+75,192376,571,1,64,5352.19775,3055.0166,444.5646,1.57952,0,0,0,0,120,0,1), -(@OGUID+76,192377,571,1,64,5414.19,3069.8,415.187,1.64061,0,0,0,1,180,0,1), -(@OGUID+77,192378,571,1,64,5322.02,2781.13,435.811,1.5708,0,0,0,1,180,0,1), -(@OGUID+78,192379,571,1,64,5363.42,2781.03,435.763,1.5708,0,0,0,1,180,0,1), -(@OGUID+79,192254,571,1,64,5154.46,2828.94,409.189,3.14159,0,0,0,1,180,0,1), -(@OGUID+80,192255,571,1,64,5154.52,2853.31,409.183,3.14159,0,0,0,1,180,0,1), -(@OGUID+81,192336,571,1,64,5154.49,2862.15,445.012,3.14159,0,0,0,1,180,0,1), -(@OGUID+82,192488,571,1,64,5160.34,2798.61,430.769,3.14159,0,0,0,1,180,0,1), -(@OGUID+83,192488,571,1,64,5158.81,2883.13,431.618,3.14159,0,0,0,1,180,0,1), -(@OGUID+84,192488,571,1,64,5278.38,2613.83,433.409,-1.58825,0,0,0,1,180,0,1), -(@OGUID+85,192488,571,1,64,5260.82,2631.8,433.324,3.05433,0,0,0,1,180,0,1), -(@OGUID+86,192488,571,1,64,5163.13,2952.59,433.503,1.53589,0,0,0,1,180,0,1), -(@OGUID+87,192488,571,1,64,5145.11,2935,433.386,3.14159,0,0,0,1,180,0,1), -(@OGUID+88,192488,571,1,64,5262.54,3047.95,432.055,3.10665,0,0,0,1,180,0,1), -(@OGUID+89,192488,571,1,64,5146.04,2747.21,433.584,3.07177,0,0,0,1,180,0,1), -(@OGUID+90,192488,571,1,64,5163.78,2729.68,433.394,-1.58825,0,0,0,1,180,0,1), -(@OGUID+91,192488,571,1,64,5280.894,3064.95386,431.9758,1.55334139,0,0,0,0,120,0,1), --- Tower Banners "Alliance" -(@OGUID+92,192501,571,1,64,4398.82,2804.7,429.792,-1.58825,0,0,0,1,180,0,1), -(@OGUID+93,192501,571,1,64,4416,2822.67,429.851,-0.017452,0,0,0,1,180,0,1), -(@OGUID+94,192501,571,1,64,4559.11,3606.22,419.999,-1.48353,0,0,0,1,180,0,1), -(@OGUID+95,192501,571,1,64,4539.42,3622.49,420.034,-3.07177,0,0,0,1,180,0,1), -(@OGUID+96,192501,571,1,64,4555.26,3641.65,419.974,1.67551,0,0,0,1,180,0,1), -(@OGUID+97,192501,571,1,64,4574.87,3625.91,420.079,0.087266,0,0,0,1,180,0,1), -(@OGUID+98,192501,571,1,64,4466.79,1960.42,459.144,1.15192,0,0,0,1,180,0,1), -(@OGUID+99,192501,571,1,64,4475.35,1937.03,459.07,-0.436332,0,0,0,1,180,0,1), -(@OGUID+100,192501,571,1,64,4451.76,1928.1,459.076,-2.00713,0,0,0,1,180,0,1), -(@OGUID+101,192501,571,1,64,4442.99,1951.9,459.093,2.74016,0,0,0,1,180,0,1), -(@OGUID+102,192501,571,1,64,4380.36328,2822.38013,429.8818,-3.106652,0,0,0,0,120,0,1), -(@OGUID+103,192501,571,1,64,4397.6626,2840.299,429.921661,1.58824873,0,0,0,0,120,0,1), --- Tower Banners "Horde" -(@OGUID+104,192502,571,1,128,4398.82,2804.7,429.792,-1.58825,0,0,0,1,180,0,1), -(@OGUID+105,192502,571,1,128,4416,2822.67,429.851,-0.017452,0,0,0,1,180,0,1), -(@OGUID+106,192502,571,1,128,4559.11,3606.22,419.999,-1.48353,0,0,0,1,180,0,1), -(@OGUID+107,192502,571,1,128,4539.42,3622.49,420.034,-3.07177,0,0,0,1,180,0,1), -(@OGUID+108,192502,571,1,128,4555.26,3641.65,419.974,1.67551,0,0,0,1,180,0,1), -(@OGUID+109,192502,571,1,128,4574.87,3625.91,420.079,0.087266,0,0,0,1,180,0,1), -(@OGUID+110,192502,571,1,128,4466.79,1960.42,459.144,1.15192,0,0,0,1,180,0,1), -(@OGUID+111,192502,571,1,128,4475.35,1937.03,459.07,-0.436332,0,0,0,1,180,0,1), -(@OGUID+112,192502,571,1,128,4451.76,1928.1,459.076,-2.00713,0,0,0,1,180,0,1), -(@OGUID+113,192502,571,1,128,4442.99,1951.9,459.093,2.74016,0,0,0,1,180,0,1), -(@OGUID+114,192502,571,1,128,4380.36328,2822.38013,429.8818,-3.106652,0,0,0,0,120,0,1), -(@OGUID+115,192502,571,1,128,4397.6626,2840.299,429.921661,1.58824873,0,0,0,0,120,0,1); - -SET @OGUID := 17780; -DELETE FROM `gameobject` WHERE `id` IN (192458,192459,192460,192461,192289,192290,192434,192435,192280,192283,192425,192426,192427,192428,192288,192291,192400,192401,192281,192282); -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES --- The Sunken Ring "Horde" -(@OGUID+0,192458,571,1,16,4811.4,2441.9,358.207,-2.0333,0,0,0,1,180,0,1), -(@OGUID+1,192459,571,1,16,4805.67,2407.48,358.191,1.78023,0,0,0,1,180,0,1), -(@OGUID+2,192460,571,1,16,5004.35,2486.36,358.449,2.17294,0,0,0,1,180,0,1), -(@OGUID+3,192461,571,1,16,4983.28,2503.09,358.177,-0.427603,0,0,0,1,180,0,1), -(@OGUID+4,192289,571,1,16,4778.19,2438.06,345.644,-2.94088,0,0,0,1,180,0,1), -(@OGUID+5,192290,571,1,16,5024.57,2532.75,344.023,-1.93732,0,0,0,1,180,0,1), --- The Sunken Ring "Alliance" -(@OGUID+6,192425,571,1,32,4811.435,2441.84546,357.982483,-2.02457881,0,0,0,0,120,0,1), -(@OGUID+7,192426,571,1,32,4805.514,2407.84375,357.940765,1.7715075,0,0,0,0,120,0,1), -(@OGUID+8,192427,571,1,32,5004.35,2486.36,358.449,2.17294,0,0,0,1,180,0,1), -(@OGUID+9,192428,571,1,32,4983.221,2503.27271,357.959534,-0.43633157,0,0,0,0,120,0,1), -(@OGUID+10,192288,571,1,32,4778.065,2438.02441,345.7063,-2.932139,0,0,0,0,120,0,1), -(@OGUID+11,192291,571,1,32,5024.608,2532.72583,344.4308,-1.94604158,0,0,0,0,120,0,1), --- The Broken Temple "Horde" -(@OGUID+12,192434,571,1,16,5041.61,3294.4,382.15,-1.63188,0,0,0,1,180,0,1), -(@OGUID+13,192435,571,1,16,4855.63,3297.62,376.739,-3.13286,0,0,0,1,180,0,1), -(@OGUID+14,192280,571,1,16,4857.97,3335.44,368.881,-2.94959,0,0,0,1,180,0,1), -(@OGUID+15,192283,571,1,16,5006.34,3280.4,371.163,2.22529,0,0,0,1,180,0,1), --- The Broken Temple "Alliance" -(@OGUID+16,192400,571,1,32,5041.650879,3294.318604,381.919952,-1.605702,0,0,0,1,180,0,1), -(@OGUID+17,192401,571,1,32,4855.444336,3297.600830,376.495758,-3.115388,0,0,0,1,180,0,1), -(@OGUID+18,192281,571,1,32,4857.971191,3335.415771,369.291901,-2.888511,0,0,0,1,180,0,1), -(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1); diff --git a/sql/updates/world/2012_02_29_00_world_conditions_misc.sql b/sql/updates/world/2012_02_29_00_world_conditions_misc.sql deleted file mode 100644 index 34eb1261ed1..00000000000 --- a/sql/updates/world/2012_02_29_00_world_conditions_misc.sql +++ /dev/null @@ -1,126 +0,0 @@ -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup` IN(34125,33796,33798,33799,33791,33792,33790, -33795,33793,33800,33794,33843,33842,26421,26477,28161,29856,32788,32790); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`, -`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES --- Stabled Campagin Warhorse Requires Any of the Dailies -(18,34125,63215,1,9,0,13847,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,2,9,0,13851,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,3,9,0,13852,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,4,9,0,13854,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,5,9,0,13855,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,6,9,0,13856,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,7,9,0,13857,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,8,9,0,13858,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,9,9,0,13859,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,10,9,0,13860,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,11,9,0,13861,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,12,9,0,13862,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,13,9,0,13863,0,0,0,'Required quest active for spellclick'), -(18,34125,63215,14,9,0,13864,0,0,0,'Required quest active for spellclick'), --- Raptor requires (A) Valiant of Sen'Jin -(18,33796,62784,1,8,0,13693,0,0,0,'Required quest rewarded for spellclick'), -(18,33796,62784,2,8,0,13708,0,0,0,'Required quest rewarded for spellclick'), --- Forsaken Warhorse requires (A) Valiant of Undercity -(18,33798,62787,1,8,0,13695,0,0,0,'Required quest rewarded for spellclick'), -(18,33798,62787,2,8,0,13710,0,0,0,'Required quest rewarded for spellclick'), --- Orgrimmar Wolf requires (A) Valiant of Orgrimmar -(18,33799,62783,1,8,0,13691,0,0,0,'Required quest rewarded for spellclick'), -(18,33799,62783,2,8,0,13707,0,0,0,'Required quest rewarded for spellclick'), --- Silvermoon Hawkstrider requires (A) Valiant of Silvermoon -(18,33791,62786,1,8,0,13696,0,0,0,'Required quest rewarded for spellclick'), -(18,33791,62786,2,8,0,13711,0,0,0,'Required quest rewarded for spellclick'), --- Thunder Bluff Kodo requires (A) Valiant of Thunder Bluff -(18,33792,62785,1,8,0,13694,0,0,0,'Required quest rewarded for spellclick'), -(18,33792,62785,2,8,0,13709,0,0,0,'Required quest rewarded for spellclick'), --- Exodar Elekk requires (A) Valiant of the Exodar -(18,33790,62781,1,8,0,13690,0,0,0,'Required quest rewarded for spellclick'), -(18,33790,62781,2,8,0,13705,0,0,0,'Required quest rewarded for spellclick'), --- Ironforge Ram requires (A) Valiant of Ironforge -(18,33795,62779,1,8,0,13685,0,0,0,'Required quest rewarded for spellclick'), -(18,33795,62779,2,8,0,13703,0,0,0,'Required quest rewarded for spellclick'), --- Gnomeregan Mechanostrider requires (A) Valiant of Gnomeregan -(18,33793,62780,1,8,0,13688,0,0,0,'Required quest rewarded for spellclick'), -(18,33793,62780,2,8,0,13704,0,0,0,'Required quest rewarded for spellclick'), --- Stormwind Steed requires (A) Valiant of Stormwind -(18,33800,62774,1,8,0,13593,0,0,0,'Required quest rewarded for spellclick'), -(18,33800,62774,2,8,0,13684,0,0,0,'Required quest rewarded for spellclick'), --- Darnassian Nightsaber requires (A) Valiant of Darnassus -(18,33794,62782,1,8,0,13689,0,0,0,'Required quest rewarded for spellclick'), -(18,33794,62782,2,8,0,13706,0,0,0,'Required quest rewarded for spellclick'), --- Stabled Quel'Dorei steeds requires The Argent Tournament rewarded -(18,33843,63792,0,8,0,13667,0,0,0,'Required quest rewarded for spellclick'), --- Stabled Quel'Dorei steed forbids Alliance Eligibility Marker rewarded -(18,33843,63792,0,8,0,13686,0,0,1,'Forbidden rewarded quest for spellclick'), --- Sunreaver Hawkstrider requires The Argent Tournament rewarded -(18,33842,63791,0,8,0,13668,0,0,0,'Required quest rewarded for spellclick'), --- Sunreaver Hawkstrider forbids Horde Eligibility Marker rewarded -(18,33842,63791,0,8,0,13687,0,0,1,'Forbidden rewarded quest for spellclick'), --- Misc -(18,26421,47575,0,8,0,12092,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26421,47575,0,8,0,12096,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26421,47575,1,9,0,12092,0,0,0,'Required quest active for spellclick'), -(18,26421,47575,2,9,0,12096,0,0,0,'Required quest active for spellclick'), -(18,26477,47096,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,47096,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61286,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61286,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61832,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61832,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,26477,61286,1,9,0,11999,0,0,0,'Required quest active for spellclick'), -(18,26477,61286,2,9,0,12000,0,0,0,'Required quest active for spellclick'), -(18,26477,47096,1,9,0,11999,0,0,0,'Required quest active for spellclick'), -(18,26477,47096,2,9,0,12000,0,0,0,'Required quest active for spellclick'), -(18,26477,61832,1,9,0,11999,0,0,0,'Required quest active for spellclick'), -(18,26477,61832,2,9,0,12000,0,0,0,'Required quest active for spellclick'), -(18,28161,39996,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,39996,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,39996,1,9,0,12532,0,0,0,'Required quest active for spellclick'), -(18,28161,39996,2,9,0,12702,0,0,0,'Required quest active for spellclick'), -(18,28161,51037,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51037,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51037,1,9,0,12532,0,0,0,'Required quest active for spellclick'), -(18,28161,51037,2,9,0,12702,0,0,0,'Required quest active for spellclick'), -(18,28161,51961,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51961,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,28161,51961,1,9,0,12532,0,0,0,'Required quest active for spellclick'), -(18,28161,51961,2,9,0,12702,0,0,0,'Required quest active for spellclick'), -(18,29856,55363,0,8,0,12629,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29856,55363,0,8,0,12643,0,0,1,'Forbidden rewarded quest for spellclick'), -(18,29856,55363,1,9,0,12629,0,0,0,'Required quest active for spellclick'), -(18,29856,55363,2,9,0,12643,0,0,0,'Required quest active for spellclick'), -(18,32788,57539,1,8,0,13075,0,0,0,'Required quest rewarded for spellclick'), -(18,32788,57539,2,9,0,13075,0,0,0,'Required quest active for spellclick'), -(18,32790,57654,1,8,0,13073,0,0,0,'Required quest rewarded for spellclick'), -(18,32790,57654,2,9,0,13073,0,0,0,'Required quest active for spellclick'); - --- Remove duplicate entries in npc_spellclick_spells (leave 1) -DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN(34125,26421,26477,28161, -31157,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,34944,29856,30564,29414,31269); -INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES -(26477,47096,2,0), -(26477,61286,2,0), -(26477,61832,0,0), -(29414,18277,1,0), -(29856,55363,2,0), -(31269,46598,1,0), -(33794,62782,1,0), -(28161,51037,2,0), -(28161,39996,1,0), -(30564,57401,1,0), -(34125,63215,1,0), -(34944,68458,1,0), -(33790,62781,1,0), -(33793,62780,1,0), -(33795,62779,1,0), -(33800,62774,1,0), -(33798,62787,1,0), -(31157,46598,1,0), -(26421,47575,1,0), -(28161,51961,1,0), -(33791,62786,1,0), -(33792,62785,1,0), -(33796,62784,1,0), -(33799,62783,1,0); - --- If this query fails, fix your custom content -ALTER TABLE `npc_spellclick_spells` ADD PRIMARY KEY(`npc_entry`,`spell_id`); \ No newline at end of file diff --git a/sql/updates/world/2012_02_29_01_world_conditions.sql b/sql/updates/world/2012_02_29_01_world_conditions.sql deleted file mode 100644 index bae8baf51a9..00000000000 --- a/sql/updates/world/2012_02_29_01_world_conditions.sql +++ /dev/null @@ -1,5 +0,0 @@ -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, -`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES -(18,29488,54568,15,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), -(18,29488,54568,15,9,0,12670,0,0,0,'Required quest active for spellclick'); diff --git a/sql/updates/world/2012_02_29_02_world_conditions.sql b/sql/updates/world/2012_02_29_02_world_conditions.sql deleted file mode 100644 index a28e6d6424f..00000000000 --- a/sql/updates/world/2012_02_29_02_world_conditions.sql +++ /dev/null @@ -1,5 +0,0 @@ -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, -`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES -(18,29488,54568,1,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), -(18,29488,54568,2,9,0,12670,0,0,0,'Required quest active for spellclick'); diff --git a/sql/updates/world/2012_02_29_03_world_creature_text.sql b/sql/updates/world/2012_02_29_03_world_creature_text.sql deleted file mode 100644 index 2e1d3d77dde..00000000000 --- a/sql/updates/world/2012_02_29_03_world_creature_text.sql +++ /dev/null @@ -1,18 +0,0 @@ --- NPC talk text insert from sniff -DELETE FROM `script_texts` WHERE `npc_entry`=28923; -DELETE FROM `creature_text` WHERE `entry`=28923; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(28923,0,0, 'I have witnessed the rise and fall of empires... the birth and extinction of entire species... Over countless millennia the foolishness of mortals has remained the only constant. Your presence here confirms this.',14,0,100,0,0,14160, 'Loken'), -(28923,1,0, 'My master has shown me the future, and you have no place in it. Azeroth will be reborn in darkness. Yogg-Saron shall be released! The Pantheon shall fall!',14,0,100,0,0,14161, 'Loken'), -(28923,2,0, 'What hope is there for you? None!',14,0,100,0,0,14162, 'Loken'), -(28923,3,0, 'You cannot hide from fate!',14,0,100,0,0,14163, 'Loken'), -(28923,3,1, 'Come closer. I will make it quick.',14,0,100,0,0,14164, 'Loken'), -(28923,3,2, 'Your flesh cannot hold out for long.',14,0,100,0,0,14165, 'Loken'), -(28923,4,0, 'Only mortal...',14,0,100,0,0,14166, 'Loken'), -(28923,4,1, 'I... am... FOREVER!',14,0,100,0,0,14167, 'Loken'), -(28923,4,2, 'What little time you had, you wasted!',14,0,100,0,0,14168, 'Loken'), -(28923,5,0, 'You stare blindly into the abyss!',14,0,100,0,0,14169, 'Loken'), -(28923,6,0, 'Your ignorance is profound. Can you not see where this path leads?',14,0,100,0,0,14170, 'Loken'), -(28923,7,0, 'You cross the precipice of oblivion!',14,0,100,0,0,14171, 'Loken'), -(28923,8,0, 'My death... heralds the end of this world.',14,0,100,0,0,14172, 'Loken'), -(28923,9,0, '%s begins to cast Lightning Nova!',41,0,100,0,0,0, 'Loken'); diff --git a/sql/updates/world/2012_02_29_04_world_creature_text.sql b/sql/updates/world/2012_02_29_04_world_creature_text.sql deleted file mode 100644 index d8b7c2c048a..00000000000 --- a/sql/updates/world/2012_02_29_04_world_creature_text.sql +++ /dev/null @@ -1,11 +0,0 @@ --- NPC talk text insert from sniff -DELETE FROM `script_texts` WHERE `npc_entry`=28546; -DELETE FROM `creature_text` WHERE `entry`=28546; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(28546,0,0, 'You wish to confront the master? You must first weather the storm!',14,0,100,0,0,14453, 'Ionar'), -(28546,1,0, 'The slightest spark shall be your undoing.',14,0,100,0,0,14454, 'Ionar'), -(28546,1,1, 'No one is safe!',14,0,100,0,0,14455, 'Ionar'), -(28546,2,0, 'Shocking ... I know!',14,0,100,0,0,14456, 'Ionar'), -(28546,2,1, 'You atempt the unpossible.',14,0,100,0,0,14457, 'Ionar'), -(28546,2,2, 'Your spark of light is ... extinguish.',14,0,100,0,0,14458, 'Ionar'), -(28546,3,0, 'Master... you have guests.',14,0,100,0,0,14459, 'Ionar'); diff --git a/sql/updates/world/2012_02_29_05_world_creature_text.sql b/sql/updates/world/2012_02_29_05_world_creature_text.sql deleted file mode 100644 index 332fecf6326..00000000000 --- a/sql/updates/world/2012_02_29_05_world_creature_text.sql +++ /dev/null @@ -1,15 +0,0 @@ --- NPC talk text insert from sniff -DELETE FROM `script_texts` WHERE `npc_entry`=28587; -DELETE FROM `creature_text` WHERE `entry`=28587; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(28587,0,0, 'It is you who have destroyed my children? You... shall... pay!',14,0,100,0,0,13960, 'Volkhan'), -(28587,1,0, 'Life from lifelessness... death for you.',14,0,100,0,0,13961, 'Volkhan'), -(28587,1,1, 'Nothing is wasted in the process. You will see....',14,0,100,0,0,13962, 'Volkhan'), -(28587,2,0, 'I will crush you beneath my boots!',14,0,100,0,0,13963, 'Volkhan'), -(28587,2,1, 'All my work... undone!',14,0,100,0,0,13964, 'Volkhan'), -(28587,3,0, 'The armies of iron will conquer all!',14,0,100,0,0,13965, 'Volkhan'), -(28587,3,1, 'Ha, pathetic!',14,0,100,0,0,13966, 'Volkhan'), -(28587,3,2, 'You have cost me too much work!',14,0,100,0,0,13967, 'Volkhan'), -(28587,4,0, 'The master was right... to be concerned.',14,0,100,0,0,13968, 'Volkhan'), -(28587,5,0, '%s runs to his anvil!',41,0,100,0,0,0, 'Volkhan'), -(28587,6,0, '%s prepares to shatter his Brittle Golems!',41,0,100,0,0,0, 'Volkhan'); diff --git a/sql/updates/world/2012_03_01_00_world_conditions.sql b/sql/updates/world/2012_03_01_00_world_conditions.sql deleted file mode 100644 index 794a5ce1210..00000000000 --- a/sql/updates/world/2012_03_01_00_world_conditions.sql +++ /dev/null @@ -1,5 +0,0 @@ -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29488 AND `SourceEntry`=54568; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, -`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES -(18,29488,54568,1,8,0,12670,0,0,0,'Required quest rewarded for spellclick'), -(18,29488,54568,2,28,0,12670,0,0,0,'Required quest completed for spellclick'); diff --git a/sql/updates/world/2012_03_01_01_world_creature_text.sql b/sql/updates/world/2012_03_01_01_world_creature_text.sql deleted file mode 100644 index dd4f6693654..00000000000 --- a/sql/updates/world/2012_03_01_01_world_creature_text.sql +++ /dev/null @@ -1,15 +0,0 @@ --- NPC talk text insert from sniff -DELETE FROM `script_texts` WHERE `npc_entry`=28586; -DELETE FROM `creature_text` WHERE `entry`=28586; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(28586,0,0, 'I am the greatest of my father''s sons! Your end has come!',14,0,100,0,0,14149, 'General Bjarngrim'), -(28586,1,0, 'Give me your worst!',14,0,100,0,0,14150, 'General Bjarngrim'), -(28586,2,0, 'Defend yourself, for all the good it will do!',14,0,100,0,0,14151, 'General Bjarngrim'), -(28586,3,0, 'GRAAAAAH! Behold the fury of iron and steel!',14,0,100,0,0,14152, 'General Bjarngrim'), -(28586,4,0, 'So ends your curse!',14,0,100,0,0,14153, 'General Bjarngrim'), -(28586,4,1, 'Flesh... is... weak!',14,0,100,0,0,14154, 'General Bjarngrim'), -(28586,4,2, '...',14,0,100,0,0,14155, 'General Bjarngrim'), -(28586,5,0, 'How can it be...? Flesh is not... stronger!',14,0,100,0,0,14156, 'General Bjarngrim'), -(28586,6,0, '%s switches to Defensive Stance!',41,0,100,0,0,0, 'General Bjarngrim'), -(28586,7,0, '%s switches to Battle Stance!',41,0,100,0,0,0, 'General Bjarngrim'), -(28586,8,0, '%s switches to Berserker Stance!',41,0,100,0,0,0, 'General Bjarngrim'); diff --git a/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql b/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql deleted file mode 100644 index c44ca191835..00000000000 --- a/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql +++ /dev/null @@ -1,15 +0,0 @@ -DROP TABLE IF EXISTS `locales_creature_text`; -CREATE TABLE `locales_creature_text` ( - `entry` int(10) UNSIGNED NOT NULL, - `textGroup` tinyint(3) UNSIGNED NOT NULL, - `id` int(10) UNSIGNED NOT NULL, - `text_loc1` text, - `text_loc2` text, - `text_loc3` text, - `text_loc4` text, - `text_loc5` text, - `text_loc6` text, - `text_loc7` text, - `text_loc8` text, - PRIMARY KEY (`entry`,`textGroup`,`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/sql/updates/world/2012_03_03_00_world_command.sql b/sql/updates/world/2012_03_03_00_world_command.sql deleted file mode 100644 index 52938c0b76b..00000000000 --- a/sql/updates/world/2012_03_03_00_world_command.sql +++ /dev/null @@ -1,9 +0,0 @@ -DELETE FROM `command` WHERE `name` LIKE 'debug moveflags'; -INSERT INTO `command` (`name`,`security`,`help`) VALUES -('debug moveflags',3,'Syntax: .debug moveflags [$newMoveFlags [$newMoveFlags2]]\r\nNo params given will output the current moveflags of the target'); - -DELETE FROM `trinity_string` WHERE `entry` IN(1143,1144); -INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES -(1143,'Target''s moveFlags: %u, moveFlagsExtra: %u.'), -(1144,'Target''s moveFlags set to: %u, moveFlagsExtra to: %u'); - diff --git a/sql/updates/world/2012_03_04_00_world_misc.sql b/sql/updates/world/2012_03_04_00_world_misc.sql deleted file mode 100644 index af556f648b8..00000000000 --- a/sql/updates/world/2012_03_04_00_world_misc.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Spotlight aura for spotlight NPC -DELETE FROM `creature_template_addon` WHERE `entry`=19913; -INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(19913,0,0,0,0,'39312'); - --- Scriptnames for areatriggers -SET @AT_AREA_52_SOUTH := 4472; -SET @AT_AREA_52_NORTH := 4466; -SET @AT_AREA_52_WEST := 4471; -SET @AT_AREA_52_EAST := 4422; -DELETE FROM `areatrigger_scripts` WHERE `entry` IN (@AT_AREA_52_SOUTH,@AT_AREA_52_NORTH,@AT_AREA_52_WEST,@AT_AREA_52_EAST); -INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES -(@AT_AREA_52_SOUTH,"at_area_52_entrance"),(@AT_AREA_52_NORTH,"at_area_52_entrance"),(@AT_AREA_52_WEST,"at_area_52_entrance"),(@AT_AREA_52_EAST,"at_area_52_entrance"); diff --git a/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql b/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql deleted file mode 100644 index ae4a0bc1f77..00000000000 --- a/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Add Area trigger scripts -DELETE FROM `areatrigger_scripts` WHERE `entry` IN (4422,4466,4471,4472); -INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES -(4422,'at_area_52_entrance'), -(4466,'at_area_52_entrance'), -(4471,'at_area_52_entrance'), -(4472,'at_area_52_entrance'); diff --git a/sql/updates/world/2012_03_06_00_world_commands.sql b/sql/updates/world/2012_03_06_00_world_commands.sql deleted file mode 100644 index d782a76c70d..00000000000 --- a/sql/updates/world/2012_03_06_00_world_commands.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `command` WHERE `name` = 'reload locales_creature_text'; -INSERT INTO `command` (`name`, `security`, `help`) VALUES -('reload locales_creature_text', 3, 'Syntax: .reload locales_creature_text\nReload locales_creature_text Table.'); \ No newline at end of file diff --git a/sql/updates/world/2012_03_06_01_world_misc.sql b/sql/updates/world/2012_03_06_01_world_misc.sql deleted file mode 100644 index 7eb208a9673..00000000000 --- a/sql/updates/world/2012_03_06_01_world_misc.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `warden_checks` ENGINE=MYISAM; -ALTER TABLE `achievement_dbc` ENGINE=MYISAM; -ALTER TABLE `creature_text` ENGINE=MYISAM; -ALTER TABLE `game_event_seasonal_questrelation` ENGINE=MYISAM; diff --git a/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql b/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql deleted file mode 100644 index 0efbb6609cf..00000000000 --- a/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE IF EXISTS `character_queststatus_seasonal`; diff --git a/sql/updates/world/2012_03_06_03_world_smart_scripts.sql b/sql/updates/world/2012_03_06_03_world_smart_scripts.sql deleted file mode 100644 index cb2468c4d5c..00000000000 --- a/sql/updates/world/2012_03_06_03_world_smart_scripts.sql +++ /dev/null @@ -1,17 +0,0 @@ --- SAI for Elrodan -SET @ENTRY=18743; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0); -DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY*100 AND `source_type`=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 -(@ENTRY,0,0,0,1,0,100,0,5000,8000,15000,25000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Elrodan - OOC - run script'), -(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,11,18744,20,0,0,0,0,0,'Elrodan - Script - Aurosalia say random'), -(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,3000,3000,11,32826,0,0,0,0,0,1,0,0,0,0,0,0,0,'Elrodan - Script - cast Polymorph Cast Visual'); --- Aurosalia fix model -UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid`=18145; --- Aurosalia text -DELETE FROM `creature_text` WHERE `entry`=18744; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(18744,0,0, 'Stop!',1,0,100,5,0,0, 'Aurosalia'), -(18744,0,1, 'Will you stop--',1,0,100,274,0,0, 'Aurosalia'), -(18744,0,2, '',1,0,100,6,0,0, 'Aurosalia'); diff --git a/sql/updates/world/2012_03_06_04_world_creature_text.sql b/sql/updates/world/2012_03_06_04_world_creature_text.sql deleted file mode 100644 index f49599e1ba0..00000000000 --- a/sql/updates/world/2012_03_06_04_world_creature_text.sql +++ /dev/null @@ -1,6 +0,0 @@ --- Aurosalia text -DELETE FROM `creature_text` WHERE `entry`=18744; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(18744,0,0, 'Stop!',12,1,100,5,0,0, 'Aurosalia'), -(18744,0,1, 'Will you stop--',12,1,100,6,0,0, 'Aurosalia'), -(18744,0,2, '',12,1,100,274,0,0, 'Aurosalia'); diff --git a/sql/updates/world/2012_03_07_00_world_trinity_string.sql b/sql/updates/world/2012_03_07_00_world_trinity_string.sql deleted file mode 100644 index df5afea5d4f..00000000000 --- a/sql/updates/world/2012_03_07_00_world_trinity_string.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `trinity_string` WHERE `entry`=175; -INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES -(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.'); diff --git a/sql/updates/world/2012_03_10_00_world_creature.sql b/sql/updates/world/2012_03_10_00_world_creature.sql deleted file mode 100644 index a0143af73c7..00000000000 --- a/sql/updates/world/2012_03_10_00_world_creature.sql +++ /dev/null @@ -1,21 +0,0 @@ --- Add some missing guids -SET @GUID := 42153; -DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+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`) VALUES -(@GUID,32666,530,1,1,0,0,9830.201,-7389.711,13.68803,5.532694,120,0,0,1,0,0), -(@GUID+1,32667,530,1,1,0,0,9859.044,-7406.975,13.7113,1.658063,120,0,0,1,0,0), -(@GUID+2,31144,530,1,1,0,0,9869.401,-7389.657,13.69022,3.90953755,120,0,0,1,0,0), -(@GUID+3,31144,530,1,1,0,0,9871.973,-7392.763,13.6818113,3.35103226,120,0,0,1,0,0), -(@GUID+4,31146,530,1,1,0,0,9850.529,-7395.442,13.72216,4.694936,120,0,0,1,0,0); --- Addons -DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+4; -DELETE FROM `creature_addon` WHERE `guid`=66686; -INSERT INTO `creature_addon` (`guid`,`bytes2`,`auras`) VALUES -(@GUID,1, '7056 61573'), -(@GUID+1,1, '7056 61573'), -(@GUID+2,1, '7056 61573'), -(@GUID+3,1, '7056 61573'), -(@GUID+4,1, '7056 61573'), -(66686,1, '7056'); --- convert npc to trigger -UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=18504; diff --git a/sql/updates/world/2012_03_10_00_world_smart_scripts.sql b/sql/updates/world/2012_03_10_00_world_smart_scripts.sql deleted file mode 100644 index aaa02c2e3df..00000000000 --- a/sql/updates/world/2012_03_10_00_world_smart_scripts.sql +++ /dev/null @@ -1,129 +0,0 @@ --- SAI for Champion Vranesh -SET @ENTRY=18146; -UPDATE `creature` SET `position_x`=9834.044,`position_y`=-7480.845,`position_z`=14.93467 WHERE `id`=@ENTRY; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -UPDATE `creature_template_addon` SET `mount`=0 WHERE `entry`=@ENTRY; -- 19085 -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2,@ENTRY*100+3,@ENTRY*100+4); -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 --- AI -(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On respawn - load path'), -(@ENTRY,0,1,2,40,0,100,0,7,@ENTRY,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,3,4,40,0,100,0,11,@ENTRY,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,5,6,40,0,100,0,25,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,7,8,40,0,100,0,34,@ENTRY,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,9,10,40,0,100,0,50,@ENTRY,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), -(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Run Script'), -(@ENTRY,0,11,0,40,0,100,0,57,@ENTRY,0,0,54,600000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - On waypoint reached - Pause Path'), --- Script 0 -(@ENTRY*100,9,0,0,0,0,100,0,3500,3500,3500,3500,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 0 - emote bow'), --- Script 1 -(@ENTRY*100+1,9,0,0,0,0,100,0,100,100,100,100,43,0,19085,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - mount horse'), -(@ENTRY*100+1,9,1,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 1 - say 0'), -(@ENTRY*100+1,9,2,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian emote bow'), -(@ENTRY*100+1,9,3,0,0,0,100,0,100,100,100,100,1,0,0,0,0,0,0,19,16222,10,0,0,0,0,0,'Champion Vranesh - Script 1 - Silvermoon City Guardian say 0'), --- Script 2 -(@ENTRY*100+2,9,0,0,0,0,100,0,3000,3000,3000,3000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 2 - say 1'), -(@ENTRY*100+2,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian emote bow'), -(@ENTRY*100+2,9,2,0,0,0,100,0,100,100,100,100,1,1,0,0,0,0,0,19,16222,18,0,0,0,0,0,'Champion Vranesh - Script 2 - Silvermoon City Guardian say 1'), --- Script 3 -(@ENTRY*100+3,9,0,0,0,0,100,0,3000,3000,3000,3000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 2'), -(@ENTRY*100+3,9,1,0,0,0,100,0,100,100,100,100,5,16,0,0,0,0,0,11,16222,30,0,0,0,0,0,'Champion Vranesh - Script 3 - Silvermoon City Guardian emote bow'), --- Script 4 -(@ENTRY*100+4,9,0,0,0,0,100,0,1000,1000,1000,1000,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 4 - dismount horse'), -(@ENTRY*100+4,9,1,0,0,0,100,0,1000,1000,1000,1000,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Champion Vranesh - Script 3 - say 3'); - --- NPC talk text for Champion Vranesh and Silvermoon City Guardian -DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY,16222); -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'Champion Vranesh inclines his head slightly to the pair of guardians in greeting.',16,1,100,0,0,0, 'Champion Vranesh'), -(@ENTRY,1,0, 'Champion Vranesh arches a scrulpled brow at the guards. a disapproving scowl on his face',16,1,100,0,0,0, 'Champion Vranesh'), -(@ENTRY,2,0, 'Champion Vranesh glances from guard to guard.',16,1,100,0,0,0, 'Champion Vranesh'), -(@ENTRY,3,0, 'Champion Vranesh surveys the small ranger practice ground with a condescending smirk.',16,1,100,0,0,0, 'Champion Vranesh'), -(16222,0,0, 'Glory to the Sun K-- ah... Silvermoon!',12,1,100,0,0,0, 'Silvermoon City Guardian'), -(16222,1,0, 'Our lives are yours, Blood Knight.',12,1,100,0,0,0, 'Silvermoon City Guardian'); - --- Pathing for Champion Vranesh -DELETE FROM `waypoints` WHERE `entry`=@ENTRY; -INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES -(@ENTRY,1,9834.044,-7480.845,14.93467, 'Champion Vranesh'), -(@ENTRY,2,9829.106,-7493.609,14.93653, 'Champion Vranesh'), -(@ENTRY,3,9826.172,-7516.15,19.73714, 'Champion Vranesh'), -(@ENTRY,4,9841.332,-7518.849,19.70547, 'Champion Vranesh'), -(@ENTRY,5,9845.063,-7512.885,19.68096, 'Champion Vranesh'), -(@ENTRY,6,9850.942,-7512.470,19.71548, 'Champion Vranesh'), -(@ENTRY,7,9850.934,-7513.604,19.71813, 'Champion Vranesh'), -- pause 6000 -(@ENTRY,8,9872.733,-7517.256,19.75283, 'Champion Vranesh'), -(@ENTRY,9,9872.419,-7489.979,14.91272, 'Champion Vranesh'), -(@ENTRY,10,9851.401,-7490.209,14.93464, 'Champion Vranesh'), -(@ENTRY,11,9850.948,-7470.096,14.91403, 'Champion Vranesh'), -- pause 1000 -(@ENTRY,12,9851.16,-7469.154,14.91319, 'Champion Vranesh'), -(@ENTRY,13,9849.688,-7442.579,13.50931, 'Champion Vranesh'), -(@ENTRY,14,9848.726,-7423.561,13.31949, 'Champion Vranesh'), -(@ENTRY,15,9816.583,-7423.817,13.30332, 'Champion Vranesh'), -(@ENTRY,16,9794.673,-7424.877,13.50989, 'Champion Vranesh'), -(@ENTRY,17,9794.48,-7442.293,14.40225, 'Champion Vranesh'), -(@ENTRY,18,9767.989,-7442.611,14.39258, 'Champion Vranesh'), -(@ENTRY,19,9767.406,-7422.982,13.35852, 'Champion Vranesh'), -(@ENTRY,20,9739.563,-7422.83,13.28878, 'Champion Vranesh'), -(@ENTRY,21,9736.46,-7440.873,13.53963, 'Champion Vranesh'), -(@ENTRY,22,9740.345,-7464.682,13.57483, 'Champion Vranesh'), -(@ENTRY,23,9746.739,-7482.594,13.55744, 'Champion Vranesh'), -(@ENTRY,24,9748.767,-7486.576,13.54981, 'Champion Vranesh'), -(@ENTRY,25,9753.25,-7486.52,13.5461, 'Champion Vranesh'), -- pause 8000 -(@ENTRY,26,9720.037,-7486.478,13.52865, 'Champion Vranesh'), -(@ENTRY,27,9681.502,-7475.868,13.52783, 'Champion Vranesh'), -(@ENTRY,28,9666.59,-7479.547,13.53783, 'Champion Vranesh'), -(@ENTRY,29,9638.033,-7492.629,13.50889, 'Champion Vranesh'), -(@ENTRY,30,9620.123,-7488.486,13.53853, 'Champion Vranesh'), -(@ENTRY,31,9605.795,-7475.276,13.55774, 'Champion Vranesh'), -(@ENTRY,32,9597.921,-7460.307,13.54336, 'Champion Vranesh'), -(@ENTRY,33,9594.605,-7450.369,13.5353, 'Champion Vranesh'), -(@ENTRY,34,9592.944,-7450.381,13.53116, 'Champion Vranesh'), -- pause 8000 -(@ENTRY,35,9594.605,-7450.369,13.5353, 'Champion Vranesh'), -(@ENTRY,36,9615.793,-7419.515,13.30549, 'Champion Vranesh'), -(@ENTRY,37,9654.939,-7420.383,13.29342, 'Champion Vranesh'), -(@ENTRY,38,9673.072,-7429.818,13.2933, 'Champion Vranesh'), -(@ENTRY,39,9689.373,-7431.429,13.2933, 'Champion Vranesh'), -(@ENTRY,40,9709.577,-7422.25,13.2933, 'Champion Vranesh'), -(@ENTRY,41,9722.3,-7415.217,13.39988, 'Champion Vranesh'), -(@ENTRY,42,9748.049,-7414.597,13.32135, 'Champion Vranesh'), -(@ENTRY,43,9766.792,-7413.542,13.38617, 'Champion Vranesh'), -(@ENTRY,44,9767.26,-7396.828,14.43101, 'Champion Vranesh'), -(@ENTRY,45,9793.145,-7395.393,14.3936, 'Champion Vranesh'), -(@ENTRY,46,9794.217,-7415.122,13.48684, 'Champion Vranesh'), -(@ENTRY,47,9817.575,-7415.299,13.30596, 'Champion Vranesh'), -(@ENTRY,48,9837.021,-7414.861,13.30863, 'Champion Vranesh'), -(@ENTRY,49,9848.048,-7414.794,13.31137, 'Champion Vranesh'), -(@ENTRY,50,9848.199,-7414.07,13.31068, 'Champion Vranesh'), -- pause 7000 -(@ENTRY,51,9847.695,-7415.903,13.31243, 'Champion Vranesh'), -(@ENTRY,52,9848.259,-7428.576,13.33225, 'Champion Vranesh'), -(@ENTRY,53,9846.748,-7446.964,13.56501, 'Champion Vranesh'), -(@ENTRY,54,9850.373,-7465.03,14.9097, 'Champion Vranesh'), -(@ENTRY,55,9850.84,-7480.409,14.93768, 'Champion Vranesh'), -(@ENTRY,56,9840.165,-7480.267,14.92917, 'Champion Vranesh'), -(@ENTRY,57,9843.284,-7480.133,14.92655, 'Champion Vranesh'); -- pause 60000 - --- SAI for Silvermoon Farstrider -SET @ENTRY=18507; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - Reset - Set Phase 1'), -(@ENTRY,0,1,2,1,1,100,0,3000,3000,5000,5000,11,36802,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 1)'), -(@ENTRY,0,2,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 2 (Phase 1)'), -(@ENTRY,0,3,4,1,2,100,0,3000,3000,5000,5000,11,36803,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Cast Spell (Phase 2)'), -(@ENTRY,0,4,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Farstrider - OOC - Set Phase 1 (Phase 2)'); --- SAI for Silvermoon Ranger -SET @ENTRY=18147; -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-64950,-64951,-64952,-64953); -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 -(-64950,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), -(-64951,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29121,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), -(-64952,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29120,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'), -(-64953,0,0,0,1,0,100,0,18000,22000,18000,22000,11,29122,0,0,0,0,0,1,0,0,0,0,0,0,0,'Silvermoon Ranger - OOC - Cast Spell'); diff --git a/sql/updates/world/2012_03_10_00_world_waypoint_data.sql b/sql/updates/world/2012_03_10_00_world_waypoint_data.sql deleted file mode 100644 index 01c2bc50402..00000000000 --- a/sql/updates/world/2012_03_10_00_world_waypoint_data.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Silvermoon City Guardian pathing -SET @NPC := 56902; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=9595.755,`position_y`=-7366.754,`position_z`=13.50131 WHERE `guid`=@NPC; -UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,9595.755,-7366.754,13.50131,0,0,0,100,0), -(@PATH,2,9594.553,-7336.536,14.15131,0,0,0,100,0), -(@PATH,3,9586.897,-7325.241,14.1312,0,0,0,100,0), -(@PATH,4,9561.705,-7326.179,14.05934,0,0,0,100,0), -(@PATH,5,9519.901,-7327.064,14.12175,0,0,0,100,0), -(@PATH,6,9508.228,-7352.014,14.33403,0,0,0,100,0), -(@PATH,7,9505.697,-7394.406,14.32095,0,0,0,100,0), -(@PATH,8,9535.751,-7396.176,16.8303,0,0,0,100,0), -(@PATH,9,9564.451,-7396.184,16.84703,0,0,0,100,0), -(@PATH,10,9563.777,-7415.961,19.47212,0,0,0,100,0), -(@PATH,11,9559.149,-7418.953,19.47643,0,0,0,100,0), -(@PATH,12,9563.34,-7432.895,15.4851,0,0,0,100,0), -(@PATH,13,9564.645,-7464.229,15.51088,0,0,0,100,0), -(@PATH,14,9588.409,-7464.643,13.52051,0,0,0,100,0), -(@PATH,15,9603.896,-7430.126,13.30448,0,0,0,100,0), -(@PATH,16,9595.137,-7387.862,13.52731,0,0,0,100,0), -(@PATH,17,9572.599,-7384.971,14.39343,0,0,0,100,0), -(@PATH,18,9573.106,-7369.531,14.40827,0,0,0,100,0); diff --git a/sql/updates/world/2012_03_11_00_world_sai.sql b/sql/updates/world/2012_03_11_00_world_sai.sql deleted file mode 100644 index a8cab265ac0..00000000000 --- a/sql/updates/world/2012_03_11_00_world_sai.sql +++ /dev/null @@ -1,60 +0,0 @@ --- Coilfang Guardian - -DELETE FROM `smart_scripts` WHERE `entryorguid`=21873 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 -(21873, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 15000, 11, 28168, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Arcing Smash'), -(21873, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 9080, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Cast Harmstring'), -(21873, 0, 2, 0, 0, 0, 50, 0, 3000, 4000, 10000, 20000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Guardian - IC - Say 0'); -- randomly guessed timers - -DELETE FROM `creature_text` WHERE `entry`=21873; -INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES -(21873, 0, 0, 'By Nazjatar''s Depths!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), -(21873, 0, 1, 'Die, warmblood!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), -(21873, 0, 2, 'For the Master!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), -(21873, 0, 3, 'Illidan reigns!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'), -(21873, 0, 4, 'My blood is like venom!', 12, 0, 0, 0, 0, 0, 'Coilfang Guardian'); - -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=21873; - --- Coilfang Strider - -DELETE FROM `smart_scripts` WHERE `entryorguid`=22056 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 -(22056, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 11, 38257, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - On Reset - Cast Panic Periodic'), -(22056, 0, 1, 0, 0, 0, 0, 0, 8000, 8000, 30000, 40000, 11, 38259, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Strider - IC - Cast Mind Blast'); - -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22056; - --- Coilfang Elite - -DELETE FROM `smart_scripts` WHERE `entryorguid`=22055 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 -(22055, 0, 0, 0, 0, 0, 0, 0, 5000, 5000, 15000, 20000, 11, 38260, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Cleave'), -(22055, 0, 1, 0, 0, 0, 0, 0, 2000, 2000, 10000, 10000, 11, 38262, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Elite - IC - Cast Harmstring'); - -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22055; - --- Core Hound - -DELETE FROM `smart_scripts` WHERE `entryorguid`=11673 AND `source_type`=0; -DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 11673*100+0 AND 11673*100+5 AND `source_type`=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 -(11673, 0, 0, 0, 0, 0, 0, 0, 10000, 10000, 7000, 7000, 11, 19272, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Lava Breath'), -(11673, 0, 1, 0, 0, 0, 0, 0, 4000, 4000, 6000, 6000, 11, 19319, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Cast Vicious Bite'), -(11673, 0, 2, 0, 0, 0, 0, 0, 15000, 15000, 24000, 24000, 88, 11673*100+0, 11673*100+5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - IC - Call random script'), -(11673*100+0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19364, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 0 - Cast Ground Stomp'), -(11673*100+1, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19366, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 1 - Cast Cauterizing Flames'), -(11673*100+2, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19367, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 2 - Cast Withering Heat'), -(11673*100+3, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19369, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 3 - Cast Ancient Despair'), -(11673*100+4, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19372, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 4 - Cast Ancient Hysteria'), -(11673*100+5, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19365, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Core Hound - Random 5 - Cast Ancient Dread'); - -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=11673; - --- Shadow of Aran - -DELETE FROM `smart_scripts` WHERE `entryorguid`=18254 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 -(18254, 0, 0, 0, 0, 0, 0, 0, 1000, 1000, 5000, 5000, 11, 29978, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Shadow of Aran - IC - Cast Pyro Blast'); - -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=18254; diff --git a/sql/updates/world/2012_03_12_00_world_creature_template.sql b/sql/updates/world/2012_03_12_00_world_creature_template.sql deleted file mode 100644 index cc70ff7a557..00000000000 --- a/sql/updates/world/2012_03_12_00_world_creature_template.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `creature_template` ADD COLUMN `HoverHeight` FLOAT NOT NULL DEFAULT 1 AFTER `InhabitType`; diff --git a/sql/updates/world/2012_03_12_01_world_conditions.sql b/sql/updates/world/2012_03_12_01_world_conditions.sql deleted file mode 100644 index d58d8f54ddf..00000000000 --- a/sql/updates/world/2012_03_12_01_world_conditions.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=72257; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,72257,0,0,32,0,144,0,0,0,0,'','Remove Marks of the Fallen Champion - target player'); diff --git a/sql/updates/world/2012_03_12_01_world_gameobject.sql b/sql/updates/world/2012_03_12_01_world_gameobject.sql deleted file mode 100644 index 38c615a3b0a..00000000000 --- a/sql/updates/world/2012_03_12_01_world_gameobject.sql +++ /dev/null @@ -1,4 +0,0 @@ -UPDATE `gameobject_template` SET `flags`=0x32 WHERE `entry` IN (202239,202240,202238,202241,201959,202339,202338,202340); - --- Set Deathbringer's Cache spawned by default -UPDATE `gameobject` SET `spawntimesecs`=604800 WHERE `id` IN (202239,202240,202238,202241); diff --git a/sql/updates/world/2012_03_12_01_world_spell_script_names.sql b/sql/updates/world/2012_03_12_01_world_spell_script_names.sql deleted file mode 100644 index db98aa0fbea..00000000000 --- a/sql/updates/world/2012_03_12_01_world_spell_script_names.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_deathbringer_remove_marks'; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(72257,'spell_deathbringer_remove_marks'); diff --git a/sql/updates/world/2012_03_14_00_world_creature_addon.sql b/sql/updates/world/2012_03_14_00_world_creature_addon.sql deleted file mode 100644 index c7e4edb97ed..00000000000 --- a/sql/updates/world/2012_03_14_00_world_creature_addon.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE `creature_addon` SET `bytes1`=0x3000000 WHERE `guid`=207210; -UPDATE `creature_addon` SET `bytes1`=0x3000000 WHERE `guid`=207211; diff --git a/sql/updates/world/2012_03_19_00_world_smart_scripts.sql b/sql/updates/world/2012_03_19_00_world_smart_scripts.sql deleted file mode 100644 index 20241efa9cc..00000000000 --- a/sql/updates/world/2012_03_19_00_world_smart_scripts.sql +++ /dev/null @@ -1,21 +0,0 @@ --- SAI for Unrestrained Dragonhawk -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=25236; -DELETE FROM `smart_scripts` WHERE (`entryorguid`=25236 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 -(25236,0,0,1,62,0,100,0,9143,0,0,0,11,45353,0,0,0,0,0,7,0,0,0,0,0,0,0,'Unrestrained Dragonhawk - On Gossip option select - cast "Quest - Sunwell Daily - Ship Bombing Run Return" on player'), -(25236,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Unrestrained Dragonhawk - On Gossip option select - Close Gossip'); --- Unrestrained Dragonhawk Gossip -UPDATE `creature_template` SET `gossip_menu_id`=9143 WHERE `entry`=25236; --- Gossip_menu from UDB -DELETE FROM `gossip_menu` WHERE `entry`=9143; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(9143,12371); --- Gossip_menu_option Update from UDB -DELETE FROM `gossip_menu_option` WHERE `menu_id`=9143; -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 -(9143,0,0, '',1,1,0,0,0,0, ''); --- Gossip option Conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9143; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,9143,0,0,9,11542,0,0,0,'','Show gossip option if player has quest 11542 but not complete'), -(15,9143,0,1,9,11543,0,0,0,'','Show gossip option if player has quest 11543 but not complete'); diff --git a/sql/updates/world/2012_03_20_00_world_gossip.sql b/sql/updates/world/2012_03_20_00_world_gossip.sql deleted file mode 100644 index 00214d805e7..00000000000 --- a/sql/updates/world/2012_03_20_00_world_gossip.sql +++ /dev/null @@ -1,88 +0,0 @@ --- Creature Gossip_menu_id Update from sniff -UPDATE `creature_template` SET `gossip_menu_id`=9052 WHERE `entry`=24965; -- Vindicator Xayann -UPDATE `creature_template` SET `gossip_menu_id`=9050 WHERE `entry`=24975; -- Mar'nah -UPDATE `creature_template` SET `gossip_menu_id`=9126 WHERE `entry`=25032; -- Eldara Dawnrunner -UPDATE `creature_template` SET `gossip_menu_id`=9087 WHERE `entry`=25046; -- Smith Hauthaa -UPDATE `creature_template` SET `gossip_menu_id`=9064 WHERE `entry`=25057; -- Battlemage Arynna -UPDATE `creature_template` SET `gossip_menu_id`=9062, `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=25059; -- Ayren Cloudbreaker -UPDATE `creature_template` SET `gossip_menu_id`=9063 WHERE `entry`=25061; -- Harbinger Inuuro -UPDATE `creature_template` SET `gossip_menu_id`=9127 WHERE `entry`=25069; -- Magister Ilastar -UPDATE `creature_template` SET `gossip_menu_id`=9115 WHERE `entry`=25112; -- Anchorite Ayuri -UPDATE `creature_template` SET `gossip_menu_id`=9105 WHERE `entry`=25169; -- Archmage Ne'thul -UPDATE `creature_template` SET `gossip_menu_id`=9286 WHERE `entry`=25632; -- Vindicator Moorba -UPDATE `creature_template` SET `gossip_menu_id`=9285 WHERE `entry`=25638; -- Captain Selana -UPDATE `creature_template` SET `gossip_menu_id`=9198 WHERE `entry`=25950; -- Shaani - --- Gossip Menu insert from sniff -DELETE FROM `gossip_menu` WHERE `entry`=9050 AND `text_id`=12237; -DELETE FROM `gossip_menu` WHERE `entry`=9052 AND `text_id`=12241; -DELETE FROM `gossip_menu` WHERE `entry`=9062 AND `text_id`=12252; -DELETE FROM `gossip_menu` WHERE `entry`=9063 AND `text_id`=12256; -DELETE FROM `gossip_menu` WHERE `entry`=9064 AND `text_id`=12258; -DELETE FROM `gossip_menu` WHERE `entry`=9087 AND `text_id`=12286; -DELETE FROM `gossip_menu` WHERE `entry`=9115 AND `text_id`=12323; -DELETE FROM `gossip_menu` WHERE `entry`=9126 AND `text_id`=12338; -DELETE FROM `gossip_menu` WHERE `entry`=9127 AND `text_id`=12340; -DELETE FROM `gossip_menu` WHERE `entry`=9198 AND `text_id`=12497; -DELETE FROM `gossip_menu` WHERE `entry`=9285 AND `text_id`=12596; -DELETE FROM `gossip_menu` WHERE `entry`=9286 AND `text_id`=12597; -DELETE FROM `gossip_menu` WHERE `entry`=9287 AND `text_id`=12598; -DELETE FROM `gossip_menu` WHERE `entry`=9288 AND `text_id`=12599; -DELETE FROM `gossip_menu` WHERE `entry`=9289 AND `text_id`=12600; -DELETE FROM `gossip_menu` WHERE `entry`=9290 AND `text_id`=12601; -DELETE FROM `gossip_menu` WHERE `entry`=9293 AND `text_id`=12604; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES -(9050,12237), -(9052,12241), -(9062,12252), -(9063,12256), -(9064,12258), -(9087,12286), -(9115,12323), -(9126,12338), -(9127,12340), -(9198,12497), -(9285,12596), -(9286,12597), -(9287,12598), -(9288,12599), -(9289,12600), -(9290,12601), -(9293,12604); - --- Creature Gossip_menu_option insert from sniff -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9050,9087,9126,9198,9285,9287,9288,9289) AND `id`=0; -DELETE FROM `gossip_menu_option` WHERE `menu_id`=9062 AND `id` IN (0,1); -DELETE FROM `gossip_menu_option` WHERE `menu_id`=9286 AND `id`=2; -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 -(9050,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), -(9062,0,0,'Speaking of action, I''ve been ordered to undertake an air strike.',1,1,0,0,0,0,''), -(9062,1,0,'I need to intercept the Dawnblade reinforcements.',1,1,0,0,0,0,''), -(9087,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), -(9126,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), -(9198,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), -(9285,0,0,'Give me a situation report, Captain.',1,1,9287,0,0,0,''), -(9286,2,0,'What is the current state of the Sunwell''s Gates?',1,1,9293,0,0,0,''), -(9287,0,0,'What went wrong?',1,1,9288,0,0,0,''), -(9288,0,0,'Why did they stop?',1,1,9289,0,0,0,''), -(9289,0,0,'Your insight is appreciated.',1,1,9290,0,0,0,''); - --- Conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9062 AND `SourceEntry` IN (0,1); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,9062,0,0,0,9,11532,0,0,0,0,'','Show gossip option only if player has taken quest 11532'), -(15,9062,0,0,1,9,11533,0,0,0,0,'','Show gossip option only if player has taken quest 11533'), -(15,9062,1,0,0,9,11542,0,0,0,0,'','Show gossip option only if player has taken quest 11542'), -(15,9062,1,0,1,9,11543,0,0,0,0,'','Show gossip option only if player has taken quest 11543'); - --- SmartAI -DELETE FROM `smart_scripts` WHERE `entryorguid`=25059 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 -(25059,0,0,2,62,0,100,0,9062,0,0,0,11,45071,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Cast "Quest - Sunwell Daily - Dead Scar Bombing Run" on player'), -(25059,0,1,2,62,0,100,0,9062,1,0,0,11,45113,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Cast "Quest - Sunwell Daily - Ship Bombing Run" on player'), -(25059,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ayren Cloudbreaker - On Gossip option select - Close Gossip'); - --- Spell scripts from sniff -DELETE FROM `spell_scripts` WHERE `id`=45071; -INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES -(45071,2,0,16,12318,1,0,0,0,0,0); -- Play sound diff --git a/sql/updates/world/2012_03_21_00_world_creature.sql b/sql/updates/world/2012_03_21_00_world_creature.sql deleted file mode 100644 index def72f74cd6..00000000000 --- a/sql/updates/world/2012_03_21_00_world_creature.sql +++ /dev/null @@ -1,71 +0,0 @@ --- ToC missing trigger spawns - -SET @GUID := 88412; -SET @NPC_TRIGGER1 := 34704; -- Val'kyr Twins Bullet Stalker Dark -SET @NPC_TRIGGER2 := 34720; -- Val'kyr Twins Bullet Stalker Light - -UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (@NPC_TRIGGER1,@NPC_TRIGGER2); -DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+61; -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,@NPC_TRIGGER1,649,15,1,0,0,619.771,143.71,395.244,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+1,@NPC_TRIGGER1,649,15,1,0,0,515.352,115.349,395.288,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+2,@NPC_TRIGGER1,649,15,1,0,0,605.514,103.863,395.29,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+3,@NPC_TRIGGER1,649,15,1,0,0,615.137,156.997,395.28,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+4,@NPC_TRIGGER1,649,15,1,0,0,539.179,184.132,395.282,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+5,@NPC_TRIGGER1,649,15,1,0,0,547.76,184.634,395.289,2.93215,7200,0,0,1,0,0,0,0,0), -(@GUID+6,@NPC_TRIGGER1,649,15,1,0,0,549.764,86.4444,395.266,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+7,@NPC_TRIGGER1,649,15,1,0,0,511.417,127.158,395.266,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+8,@NPC_TRIGGER1,649,15,1,0,0,597.38,183.672,395.28,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+9,@NPC_TRIGGER1,649,15,1,0,0,573.578,187.665,395.492,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+10,@NPC_TRIGGER1,649,15,1,0,0,620.465,134.66,395.233,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+11,@NPC_TRIGGER1,649,15,1,0,0,560.484,187.743,395.959,2.93215,7200,0,0,1,0,0,0,0,0), -(@GUID+12,@NPC_TRIGGER1,649,15,1,0,0,577.299,186.854,395.289,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+13,@NPC_TRIGGER1,649,15,1,0,0,563.467,81.9323,395.288,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+14,@NPC_TRIGGER1,649,15,1,0,0,534.748,92.6424,395.289,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+15,@NPC_TRIGGER1,649,15,1,0,0,518.503,170.649,395.289,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+16,@NPC_TRIGGER1,649,15,1,0,0,514.566,159.918,395.287,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+17,@NPC_TRIGGER1,649,15,1,0,0,568.049,187.67,395.563,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+18,@NPC_TRIGGER1,649,15,1,0,0,522.955,102.127,395.29,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+19,@NPC_TRIGGER1,649,15,1,0,0,611.656,114.281,395.288,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+20,@NPC_TRIGGER1,649,15,1,0,0,616.432,126.418,395.264,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+21,@NPC_TRIGGER1,649,15,1,0,0,526.833,181.783,395.285,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+22,@NPC_TRIGGER1,649,15,1,0,0,578.722,87.4444,395.272,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+23,@NPC_TRIGGER1,649,15,1,0,0,509.743,149.005,395.253,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+24,@NPC_TRIGGER1,649,15,1,0,0,592.736,93.6667,395.289,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+25,@NPC_TRIGGER1,649,15,1,0,0,506.038,139.517,395.288,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+26,@NPC_TRIGGER1,649,15,1,0,0,608.116,171.731,395.289,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+27,@NPC_TRIGGER1,649,15,1,0,0,586.344,184.078,395.283,4.60767,7200,0,0,1,0,0,0,0,0), -(@GUID+28,@NPC_TRIGGER1,649,15,1,0,0,554.818,187.568,395.288,2.93215,7200,0,0,1,0,0,0,0,0), -(@GUID+29,@NPC_TRIGGER2,649,15,1,0,0,557.743,187.729,395.915,0,7200,0,0,1,0,0,0,0,0), -(@GUID+30,@NPC_TRIGGER2,649,15,1,0,0,544.094,184.648,395.286,0,7200,0,0,1,0,0,0,0,0), -(@GUID+31,@NPC_TRIGGER2,649,15,1,0,0,551.328,187.646,395.596,0,7200,0,0,1,0,0,0,0,0), -(@GUID+32,@NPC_TRIGGER2,649,15,1,0,0,615.137,150.818,395.269,0,7200,0,0,1,0,0,0,0,0), -(@GUID+33,@NPC_TRIGGER2,649,15,1,0,0,571.158,187.691,395.629,0,7200,0,0,1,0,0,0,0,0), -(@GUID+34,@NPC_TRIGGER2,649,15,1,0,0,606.686,106.731,395.289,0,7200,0,0,1,0,0,0,0,0), -(@GUID+35,@NPC_TRIGGER2,649,15,1,0,0,612.118,118.844,395.287,0,7200,0,0,1,0,0,0,0,0), -(@GUID+36,@NPC_TRIGGER2,649,15,1,0,0,546.057,88.7691,395.284,0,7200,0,0,1,0,0,0,0,0), -(@GUID+37,@NPC_TRIGGER2,649,15,1,0,0,517.722,169.069,395.289,0,7200,0,0,1,0,0,0,0,0), -(@GUID+38,@NPC_TRIGGER2,649,15,1,0,0,507.181,142.285,395.255,0,7200,0,0,1,0,0,0,0,0), -(@GUID+39,@NPC_TRIGGER2,649,15,1,0,0,515.399,159.75,395.287,0,7200,0,0,1,0,0,0,0,0), -(@GUID+40,@NPC_TRIGGER2,649,15,1,0,0,592.151,183.8,395.279,0,7200,0,0,1,0,0,0,0,0), -(@GUID+41,@NPC_TRIGGER2,649,15,1,0,0,510.759,127.333,395.263,0,7200,0,0,1,0,0,0,0,0), -(@GUID+42,@NPC_TRIGGER2,649,15,1,0,0,524.257,178.134,395.29,0,7200,0,0,1,0,0,0,0,0), -(@GUID+43,@NPC_TRIGGER2,649,15,1,0,0,570.779,86.2986,395.253,0,7200,0,0,1,0,0,0,0,0), -(@GUID+44,@NPC_TRIGGER2,649,15,1,0,0,588.675,93.0938,395.289,0,7200,0,0,1,0,0,0,0,0), -(@GUID+45,@NPC_TRIGGER2,649,15,1,0,0,603.528,175.476,395.289,0,7200,0,0,1,0,0,0,0,0), -(@GUID+46,@NPC_TRIGGER2,649,15,1,0,0,509.639,133.26,395.247,0,7200,0,0,1,0,0,0,0,0), -(@GUID+47,@NPC_TRIGGER2,649,15,1,0,0,618.965,139.174,395.288,0,7200,0,0,1,0,0,0,0,0), -(@GUID+48,@NPC_TRIGGER2,649,15,1,0,0,514.785,118.731,395.287,0,7200,0,0,1,0,0,0,0,0), -(@GUID+49,@NPC_TRIGGER2,649,15,1,0,0,581.243,184.062,395.287,0,7200,0,0,1,0,0,0,0,0), -(@GUID+50,@NPC_TRIGGER2,649,15,1,0,0,577.757,184.436,395.289,0,7200,0,0,1,0,0,0,0,0), -(@GUID+51,@NPC_TRIGGER2,649,15,1,0,0,580.486,89.691,395.287,0,7200,0,0,1,0,0,0,0,0), -(@GUID+52,@NPC_TRIGGER2,649,15,1,0,0,511.132,151.156,395.264,0,7200,0,0,1,0,0,0,0,0), -(@GUID+53,@NPC_TRIGGER2,649,15,1,0,0,615.401,130.816,395.263,0,7200,0,0,1,0,0,0,0,0), -(@GUID+54,@NPC_TRIGGER2,649,15,1,0,0,599.307,98.8003,395.29,0,7200,0,0,1,0,0,0,0,0), -(@GUID+55,@NPC_TRIGGER2,649,15,1,0,0,520.212,108.429,395.289,0,7200,0,0,1,0,0,0,0,0), -(@GUID+56,@NPC_TRIGGER2,649,15,1,0,0,610.983,164.696,395.288,0,7200,0,0,1,0,0,0,0,0), -(@GUID+57,@NPC_TRIGGER2,649,15,1,0,0,526.337,99.5556,395.29,0,7200,0,0,1,0,0,0,0,0), -(@GUID+58,@NPC_TRIGGER2,649,15,1,0,0,563.997,187.644,395.489,0,7200,0,0,1,0,0,0,0,0), -(@GUID+59,@NPC_TRIGGER2,649,15,1,0,0,555.695,86.0208,395.253,0,7200,0,0,1,0,0,0,0,0), -(@GUID+60,@NPC_TRIGGER2,649,15,1,0,0,535.924,184.207,395.279,0,7200,0,0,1,0,0,0,0,0), -(@GUID+61,@NPC_TRIGGER2,649,15,1,0,0,538.024,92.441,395.289,0,7200,0,0,1,0,0,0,0,0); diff --git a/sql/updates/world/2012_03_22_00_world_creature_template.sql b/sql/updates/world/2012_03_22_00_world_creature_template.sql deleted file mode 100644 index e6c03ed589c..00000000000 --- a/sql/updates/world/2012_03_22_00_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Flame Sphere should not be visible to players(only their visual) -UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry` IN (30106,31686,31687); diff --git a/sql/updates/world/2012_03_22_01_world_conditions.sql b/sql/updates/world/2012_03_22_01_world_conditions.sql deleted file mode 100644 index 074328137a5..00000000000 --- a/sql/updates/world/2012_03_22_01_world_conditions.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Manual: Heavy Frostweave Bandage should be lootable if you have at least 390 skills in First Aid -UPDATE `conditions` SET `ConditionValue2`=390 WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry`=39152 AND `ConditionTypeOrReference`=7 AND `ConditionValue1`=129; diff --git a/sql/updates/world/2012_03_23_00_world_ip2nation.sql b/sql/updates/world/2012_03_23_00_world_ip2nation.sql deleted file mode 100644 index dadeaddf85a..00000000000 --- a/sql/updates/world/2012_03_23_00_world_ip2nation.sql +++ /dev/null @@ -1,21 +0,0 @@ -DROP TABLE IF EXISTS ip2nation; - -CREATE TABLE ip2nation ( - ip int(11) unsigned NOT NULL default '0', - country char(2) NOT NULL default '', - KEY ip (ip) -); - -DROP TABLE IF EXISTS ip2nationCountries; - -CREATE TABLE ip2nationCountries ( - code varchar(4) NOT NULL default '', - iso_code_2 varchar(2) NOT NULL default '', - iso_code_3 varchar(3) default '', - iso_country varchar(255) NOT NULL default '', - country varchar(255) NOT NULL default '', - lat float NOT NULL default '0', - lon float NOT NULL default '0', - PRIMARY KEY (code), - KEY code (code) -); diff --git a/sql/updates/world/2012_03_24_00_world_misc.sql b/sql/updates/world/2012_03_24_00_world_misc.sql deleted file mode 100644 index e6f6ce77307..00000000000 --- a/sql/updates/world/2012_03_24_00_world_misc.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Beam Visual -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=60342; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,60342,0,0,31,0,3,29308,0,0,0,'','Beam Visual target Prince Taldaram'); - --- script texts for Prince Taldaram -DELETE FROM `creature_text` WHERE `entry`=29308; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(29308,0,0,'The hum of magic energy in the air diminishes...',16,0,100,0,0,0,'prince taldaram SAY_1'), -(29308,1,0,'Intruders! Who trespasses in the Old Kingdom?',14,0,100,0,0,0,'prince taldaram SAY_WARNING'), -(29308,2,0,'I will feast on your remains.',14,0,100,0,0,14360,'prince taldaram SAY_AGGRO'), -(29308,3,0,'',14,10,100,0,0,14365,'prince taldaram SAY_SLAY_0'), -(29308,3,1,'I will drink no blood before it''s time.',14,0,100,0,0,14366,'prince taldaram SAY_SLAY_1'), -(29308,3,2,'One final embrace.',14,0,100,0,0,14367,'prince taldaram SAY_SLAY_2'), -(29308,4,0,'Still I hunger. Still... I... thirst.',14,0,100,0,0,14368,'prince taldaram SAY_DEATH'), -(29308,5,0,'So... appetizing.',14,0,100,0,0,14363,'prince taldaram SAY_FEED1'), -(29308,5,1,'Fresh, warm blood. It has been too long.',14,0,100,0,0,14364,'prince taldaram SAY_FEED2'), -(29308,6,0,'Your heartbeat is... music to my ears.',14,0,100,0,0,14361,'prince taldaram SAY_VANISH1'), -(29308,6,1,'I am nowhere... I am everywhere. I am the watcher, unseen.',14,0,100,0,0,14362,'prince taldaram SAY_VANISH2'); - --- cleanup -DELETE FROM `script_texts` WHERE `npc_entry`=29308; diff --git a/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql b/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql deleted file mode 100644 index 078c48a47b7..00000000000 --- a/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql +++ /dev/null @@ -1,290 +0,0 @@ --- ----------------------------------- --- -- Loot for The Siege of Ulduar -- --- ----------------------------------- - --- Old Cleanups: -DELETE FROM `reference_loot_template` WHERE `entry` IN ( 34116,34117,34118,34119,34120,34121,34157,34158,34159,34160,34161,34162); --- ------------------- --- -- Set Variables -- --- ------------------- --- 10 man mode npcids -SET @FlameLevi10 :=33113; -SET @IgnisFM10 :=33118; -SET @Razorscale10 :=33186; -SET @XT002_10 :=33293; --- 25 man mode npcids (via procedure) -call `sp_get_npc_diffentry`(@FlameLevi10,1,@FlameLevi25); -call `sp_get_npc_diffentry`(@IgnisFM10,1,@IgnisFM25); -call `sp_get_npc_diffentry`(@Razorscale10,1,@Razorscale25); -call `sp_get_npc_diffentry`(@XT002_10,1,@XT002_25); - -SET @Emblem := 47241; -SET @Orb := 45087; --- ------------------------------------- --- -- Set Reference Loot Template ids -- --- ------------------------------------- - -SET @EmblemRef := 34349; -- First Free ID -SET @OrbRef := @EmblemRef+1; -SET @Flame10Ref := @EmblemRef+2; -SET @Flame25Ref := @EmblemRef+3; -SET @Ignis10Ref := @EmblemRef+4; -SET @Ignis25Ref := @EmblemRef+5; -SET @Razor10Ref := @EmblemRef+6; -SET @Razor25Ref := @EmblemRef+7; -SET @XT002_10Ref := @EmblemRef+8; -SET @XT002_25Ref := @EmblemRef+9; --- Flame Levithian -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @EmblemRef AND @EmblemRef+9; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Emblem Ref -(@EmblemRef,47241,0,1,1,1,1), -- Emblem of Triumph 1x --- OrbRef -(@OrbRef,45087,0,1,1,1,1), -- Runed Orb 1x --- Flame Levithian 10man -(@Flame10Ref,45286,0,1,1,1,1), -- Pyrite Infuser -(@Flame10Ref,45287,0,1,1,1,1), -- Firesoul -(@Flame10Ref,45288,0,1,1,1,1), -- Firestrider Chestguard -(@Flame10Ref,45289,0,1,1,1,1), -- Lifespark Visage -(@Flame10Ref,45291,0,1,1,1,1), -- Combustion Bracers -(@Flame10Ref,45284,0,1,1,1,1), -- Kinetic Ripper -(@Flame10Ref,45282,0,1,1,1,1), -- Ironsoul -(@Flame10Ref,45285,0,1,1,1,1), -- Might of the Leviathan -(@Flame10Ref,45292,0,1,1,1,1), -- Energy Siphon -(@Flame10Ref,45283,0,1,1,1,1), -- Flamewatch Armguards --- Flame Levithian 25man -(@Flame25Ref,45117,0,1,1,1,1), -- Constructors Handwraps -(@Flame25Ref,45119,0,1,1,1,1), -- Embrace of the Leviathan -(@Flame25Ref,45113,0,1,1,1,1), -- Glowing Ring of Reclamation -(@Flame25Ref,45115,0,1,1,1,1), -- Leviathan Fueling Manual -(@Flame25Ref,45108,0,1,1,1,1), -- Mechanists Bindings -(@Flame25Ref,45106,0,1,1,1,1), -- Strenght of the Automaton -(@Flame25Ref,45109,0,1,1,1,1), -- Gloves of the Fiery Behemoth -(@Flame25Ref,45114,0,1,1,1,1), -- Steamcallers Totem -(@Flame25Ref,45118,0,1,1,1,1), -- Steamworkers Goggles -(@Flame25Ref,45116,0,1,1,1,1), -- Freya's Choker of Warding -(@Flame25Ref,45111,0,1,1,1,1), -- Mimiron's Inferno Couplings -(@Flame25Ref,45112,0,1,1,1,1), -- The Leviathan's Coil -(@Flame25Ref,45107,0,1,1,1,1), -- Iron Riveted War Helm - --- Ignis the Furnace Master 10man -(@Ignis10Ref,45309,0,1,1,1,1), -- Rifle of the Platinum Guard -(@Ignis10Ref,45310,0,1,1,1,1), -- Gauntlets of the Iron Furnace -(@Ignis10Ref,45311,0,1,1,1,1), -- Relentless Edge -(@Ignis10Ref,45312,0,1,1,1,1), -- Gloves of Smoldering Touch -(@Ignis10Ref,45313,0,1,1,1,1), -- Furnace Stone -(@Ignis10Ref,45314,0,1,1,1,1), -- Igniter Rod -(@Ignis10Ref,45316,0,1,1,1,1), -- Armbraces of the Vibrant Flame -(@Ignis10Ref,45317,0,1,1,1,1), -- Shawl of the Caretaker -(@Ignis10Ref,45318,0,1,1,1,1), -- Drape of Fuming Anger -(@Ignis10Ref,45321,0,1,1,1,1), -- Pauldrons of Tempered Will --- Ignis the Furnace Master 25man -(@Ignis25Ref,45157,0,1,1,1,1), -- Cindershard Ring -(@Ignis25Ref,45158,0,1,1,1,1), -- Heart of Iron -(@Ignis25Ref,45161,0,1,1,1,1), -- Girdle of Embers -(@Ignis25Ref,45162,0,1,1,1,1), -- Flamestalker Boots -(@Ignis25Ref,45164,0,1,1,1,1), -- Helm of the Furnace Master -(@Ignis25Ref,45165,0,1,1,1,1), -- Worldcarver -(@Ignis25Ref,45166,0,1,1,1,1), -- Charred Saronite Greaves -(@Ignis25Ref,45167,0,1,1,1,1), -- Lifeforge Breastplate -(@Ignis25Ref,45168,0,1,1,1,1), -- Pyrelight Circle -(@Ignis25Ref,45169,0,1,1,1,1), -- Totem of the Dancing Flame -(@Ignis25Ref,45170,0,1,1,1,1), -- Scepter of Creation -(@Ignis25Ref,45171,0,1,1,1,1), -- Intensity -(@Ignis25Ref,45185,0,1,1,1,1), -- Flamewrought Cinch -(@Ignis25Ref,45186,0,1,1,1,1), -- Soot-Covered Mantle -(@Ignis25Ref,45187,0,1,1,1,1), -- Wristguards of the Firetender - --- Razorscale 10man -(@Razor10Ref,45298,0,1,1,1,1), -- RazoRazorcale Talon -(@Razor10Ref,45299,0,1,1,1,1), -- Dragonsteel Faceplate -(@Razor10Ref,45301,0,1,1,1,1), -- BraceRazor of the Smothering Inferno -(@Razor10Ref,45302,0,1,1,1,1), -- Treads of the Invader -(@Razor10Ref,45303,0,1,1,1,1), -- Band of Draconic Guile -(@Razor10Ref,45304,0,1,1,1,1), -- Stormtempered Girdle -(@Razor10Ref,45305,0,1,1,1,1), -- Breastplate of the Afterlife -(@Razor10Ref,45306,0,1,1,1,1), -- Binding of the Dragon Matriarch -(@Razor10Ref,45307,0,1,1,1,1), -- Ironscale Leggings -(@Razor10Ref,45308,0,1,1,1,1), -- Eye of the Broodmother --- Razorscale 25man -(@Razor25Ref,45137,0,1,1,1,1), -- Veranus' Bane -(@Razor25Ref,45138,0,1,1,1,1), -- Drape of the Drakerider -(@Razor25Ref,45139,0,1,1,1,1), -- Dragonslayer's Brace -(@Razor25Ref,45140,0,1,1,1,1), -- RazoRazorcale Shoulderguards -(@Razor25Ref,45141,0,1,1,1,1), -- Proto-hide Leggings -(@Razor25Ref,45142,0,1,1,1,1), -- RemoRazore -(@Razor25Ref,45143,0,1,1,1,1), -- Saronite Mesh Legguards -(@Razor25Ref,45144,0,1,1,1,1), -- Sigil of Deflection -(@Razor25Ref,45146,0,1,1,1,1), -- Shackles of the Odalisque -(@Razor25Ref,45147,0,1,1,1,1), -- Guiding Star -(@Razor25Ref,45148,0,1,1,1,1), -- Living Flame -(@Razor25Ref,45149,0,1,1,1,1), -- BraceRazor of the Broodmother -(@Razor25Ref,45150,0,1,1,1,1), -- Collar of the Wyrmhunter -(@Razor25Ref,45151,0,1,1,1,1), -- Belt of the Fallen Wyrm -(@Razor25Ref,45510,0,1,1,1,1), -- Libram of Discord - --- XT-002 Deconstructor 10man -(@XT002_10Ref,45675,0,1,1,1,1), -- Power Enchancing Loop -(@XT002_10Ref,45676,0,1,1,1,1), -- Chestplate of Vicious Potency -(@XT002_10Ref,45677,0,1,1,1,1), -- Treacherous shoulderpads -(@XT002_10Ref,45679,0,1,1,1,1), -- Gloves of Taut grip -(@XT002_10Ref,45680,0,1,1,1,1), -- Armbands of the construct -(@XT002_10Ref,45682,0,1,1,1,1), -- Pulsing spellshield -(@XT002_10Ref,45685,0,1,1,1,1), -- Plasma Foil -(@XT002_10Ref,45686,0,1,1,1,1), -- Vest of the glowing Cresent -(@XT002_10Ref,45687,0,1,1,1,1), -- Helm of Veiled Energies -(@XT002_10Ref,45694,0,1,1,1,1), -- Conductive cord -(@XT002_10Ref,45867,0,2,2,1,1), -- Breasktplate of the Stoneshaper -(@XT002_10Ref,45868,0,2,2,1,1), -- Aesir's Edge -(@XT002_10Ref,45869,0,2,2,1,1), -- Fluxing Energy Coils -(@XT002_10Ref,45870,0,2,2,1,1), -- Magnetized Projectile Emitter -(@XT002_10Ref,45871,0,2,2,1,1), -- Seal of Ulduar --- XT-002 Deconstructor 25man -(@XT002_25Ref,45254,0,1,1,1,1), -- Sigil of the Vengeful Heart -(@XT002_25Ref,45251,0,1,1,1,1), -- Shoulderplates of the Deconstructor -(@XT002_25Ref,45247,0,1,1,1,1), -- Signet of the Earthshaker -(@XT002_25Ref,45256,0,1,1,1,1), -- Twisted Visage -(@XT002_25Ref,45250,0,1,1,1,1), -- Crazed Construct Ring -(@XT002_25Ref,45257,0,1,1,1,1), -- Quartz Crystal Wand -(@XT002_25Ref,45260,0,1,1,1,1), -- Boots of Hasty Revival -(@XT002_25Ref,45252,0,1,1,1,1), -- Horologist's Wristguards -(@XT002_25Ref,45253,0,1,1,1,1), -- Mantle of Wavering Calm -(@XT002_25Ref,45258,0,1,1,1,1), -- Sandals of Rash Temperament -(@XT002_25Ref,45249,0,1,1,1,1), -- Brass-lined Boots -(@XT002_25Ref,45246,0,1,1,1,1), -- Golem-Shard Sticker -(@XT002_25Ref,45248,0,1,1,1,1), -- Clockwork Legplates -(@XT002_25Ref,45259,0,1,1,1,1), -- Quartz-studded Harness -(@XT002_25Ref,45255,0,1,1,1,1); -- Thunderfall Totem --- ----------------------------------------------------------------------------------------------- --- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- --- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- --- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- -- END OF REFERENCES -- --- ----------------------------------------------------------------------------------------------- - --- Flame Levithian 10Man: --- NORMAL MODE : 2x [Normal Loot Item] + 1x [Emblem of Valor] --- ONE TOWER : 2x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Recipe] --- TWO TOWERS : 2x [Normal Loot Item] + 2x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] --- THREE TOWERS: 2x [Normal Loot Item] + 3x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] + 1x [Recipe] --- FOUR TOWERS : 2x [Normal Loot Item] + 3x [Emblem of Conquest] + 1x [Runed Orb] + CHANCE TO [Recipe] + 1x [Recipe] + 1x [Hard Loot Item] --- Flame Levithian 25 man --- NORMAL MODE : 3x [Normal Loot Item] + 1x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] --- ONE TOWER : 3x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] --- TWO TOWERS : 3x [Normal Loot Item] + 2x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] --- THREE TOWERS: 3x [Normal Loot Item] + 3x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] + [Recipe] --- FOUR TOWERS : 3x [Normal Loot Item] + 3x [Emblem of Conquest] + CHANCE TO [Runed Orb] + CHANCE TO [Recipe] + 2x [Runed Orb] + [Recipe] + 1x [Hard Loot Item] - -DELETE FROM `creature_loot_template` WHERE `entry` IN (@FlameLevi10,@FlameLevi25,@IgnisFM10,@IgnisFM25,@Razorscale10,@Razorscale25,@XT002_10,@XT002_25); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- --------------------------- --- -- Flame Levithian 10man -- --- --------------------------- -(@FlameLevi10,1,100,1,0,-@EmblemRef,1), -- 1x emblem -(@FlameLevi10,2,100,1,0,-@Flame10Ref,2), -- 2 from 10man reference --- Hardmode: 1 tower left -(@FlameLevi10,3,100,2,0,-@EmblemRef,2), -- 2x emblem -(@FlameLevi10,4,100,2,0,-@Flame10Ref,2), -- 2 from 10man reference --- Hardmode: 2 towers left -(@FlameLevi10,5,100,4,0,-@EmblemRef,2), -- 2x emblem -(@FlameLevi10,6,100,4,0,-@Flame10Ref,2), -- 2 from 10man reference --- Hardmode: 3 towers left -(@FlameLevi10,7,100,8,0,-@EmblemRef,3), -- 3x emblem -(@FlameLevi10,8,100,8,0,-@Flame10Ref,2), -- 2 from 10man reference --- Hardmode: 4 towers left -(@FlameLevi10,9,100,16,0,-@EmblemRef,3), -- 3x emblem -(@FlameLevi10,10,100,16,0,-@Flame10Ref,2), -- 2 from 10man reference --- one from hardmodeloot: -(@FlameLevi10,45296,0,16,1,1,1), -- Twirling Blades -(@FlameLevi10,45293,0,16,1,1,1), -- Handguards of Potent Cures -(@FlameLevi10,45295,0,16,1,1,1), -- Gilded Steel Legplates -(@FlameLevi10,45300,0,16,1,1,1), -- Mantle of Fiery Vengeance -(@FlameLevi10,45297,0,16,1,1,1), -- Shimmering Seal --- Shared Loot over the modes (masked) --- Non-Normal (Modes 2|4|8|16) -(@FlameLevi10,11,5,30,0,-34154,1), -- 1 from recepies (chanced) --- More then 1 tower up (Modes 4|8|16) -(@FlameLevi10,@Orb,100,28,0,1,3), -- Runed Orb (1-3) --- More then 2 towers up (Modes 8|16) -(@FlameLevi10,12,100,24,0,-34154,1), -- 1 from recepies --- --------------------------- --- -- Flame Levithian 25man -- --- --------------------------- -(@FlameLevi25,1,100,1,0,-@EmblemRef,1), -- 1x emblem -(@FlameLevi25,2,100,1,0,-@Flame25Ref,3), -- 3 from 25man reference --- Hardmode: 1 tower left -(@FlameLevi25,3,100,2,0,-@EmblemRef,2), -- 2x emblem -(@FlameLevi25,4,100,2,0,-@Flame25Ref,3), -- 3 from 25man reference --- Hardmode: 2 towers left -(@FlameLevi25,5,100,4,0,-@EmblemRef,2), -- 2x emblem -(@FlameLevi25,6,100,4,0,-@Flame25Ref,3), -- 3 from 25man reference --- Hardmode: 3 towers left -(@FlameLevi25,7,100,8,0,-@EmblemRef,3), -- 3x emblem -(@FlameLevi25,8,100,8,0,-@Flame25Ref,3), -- 3 from 25man reference --- Hardmode: 4 towers left -(@FlameLevi25,9,100,16,0,-@EmblemRef,3), -- 3x emblem -(@FlameLevi25,10,100,16,0,-@Flame25Ref,3), -- 3 from 25man reference --- one from hardmodeloot: -(@FlameLevi25,45132,0,16,1,1,1), -- Golden Saronite Dragon -(@FlameLevi25,45133,0,16,1,1,1), -- Pendant of Fiery Havoc -(@FlameLevi25,45134,0,16,1,1,1), -- Plated Leggings of Ruination -(@FlameLevi25,45135,0,16,1,1,1), -- Boots of Fiery Resolution -(@FlameLevi25,45136,0,16,1,1,1), -- Shoulderpads of Dormant Energies -(@FlameLevi25,45086,0,16,1,1,1), -- Rising Sun -(@FlameLevi25,45110,0,16,1,1,1), -- Titanguard --- Shared Loot over the modes (masked) --- All Modes (1|2|4|8|16): -(@FlameLevi25,11,5,31,0,-@OrbRef,1), -- Runed Orb (1x Chanced) -(@FlameLevi25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) -(@FlameLevi25,12,5,31,0,-34154,1), -- 1 from recepies (chanced) --- More then 1 tower up (Modes 4|8|16) -(@FlameLevi25,13,100,28,0,-@OrbRef,2), -- Runed Orb (2x garanteed) --- More then 2 towers up (Modes 8|16) -(@FlameLevi25,14,100,24,0,-34154,1), -- 1 from recepies --- ------------------------------ --- -- IGNIS THE FURNACE MASTER -- --- ------------------------------ --- Ignis the Furnace Master 10man -(@IgnisFM10,1,100,1,0,-@Ignis10Ref,2), -- 2 items from Ref loot -(@IgnisFM10,@Emblem,100,1,0,1,1), -- 1 Emblem --- Ignis the Furnace Master 25man -(@IgnisFM25,1,100,1,0,-@Ignis25Ref,3), -- 3 items from Ref loot -(@IgnisFM25,@Emblem,100,1,0,2,2), -- 2 Emblem -(@IgnisFM25,3,10,1,0,-34154,1), -- 1 from recepies -(@IgnisFM25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) -(@IgnisFM25,45087,75,1,0,1,1), -- Runed Orb --- ---------------- --- -- RAZORSCALE -- --- ---------------- --- Razorscale 10man -(@Razorscale10,1,100,1,0,-@Razor10Ref ,2), -- 2 items from ref loot -(@Razorscale10,@Emblem,100,1,0,1,1), -- Emblem of Triumph --- Razorscale 25man -(@Razorscale25,1,100,1,0,-@Razor25Ref,3), -- 3 items from Ref loot -(@Razorscale25,@Emblem,100,1,0,1,2), -- 2 Emblems -(@Razorscale25,2,10,1,0,-34154,1), -- 1 from recepies -(@Razorscale25,45038,8,1,0,1,1), -- Fragment of Val'anyr (quest only!?) -(@Razorscale25,45087,75,1,0,1,1), -- Runed Orb --- ------------------------- --- -- XT002 DECONSTRUCTOR -- --- ------------------------- --- X002 Deconstructor 10man (and hardmode) -(@XT002_10,1,100,3,0,-@XT002_10Ref,2), -- 2items from Ref loot -(@XT002_10,@Emblem,100,3,0,1,1), -- 1x Emblem --- Hard mode 10man only: -(@XT002_10,45442,0,2,1,1,1), -- Sorthalis,Hammer of the Watchers -(@XT002_10,45443,0,2,1,1,1), -- Charm of Meticulous Timing -(@XT002_10,45444,0,2,1,1,1), -- Gloves of the Steady Hand -(@XT002_10,45445,0,2,1,1,1), -- Breastplate of the Devoted -(@XT002_10,45446,0,2,1,1,1), -- Grasps of Reason --- X002 Deconstructor 25man (and hardmode) -(@XT002_25,1,100,3,0,-@XT002_25Ref,3), -- 3 items from Ref loot -(@XT002_25,2,10,3,0,-34154,1), -- 1 from recepies -(@XT002_25,45038,8,3,0,1,1), -- Fragment of Val'anyr (quest only!?) -(@XT002_25,45087,75,3,0,1,1), -- Runed Orb -(@XT002_25,47241,100,3,0,1,2), -- 2 Emblem of Triumph --- Hard Mode 25man only: -(@XT002_25,45442,0,2,1,1,1), -- Sorthalis,Hammer of the Watchers -(@XT002_25,45443,0,2,1,1,1), -- Charm of Meticulous Timing -(@XT002_25,45444,0,2,1,1,1), -- Gloves of the Steady Hand -(@XT002_25,45445,0,2,1,1,1), -- Breastplate of the Devoted -(@XT002_25,45446,0,2,1,1,1); -- Grasps of Reason diff --git a/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql b/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql deleted file mode 100644 index cdac3335aed..00000000000 --- a/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql +++ /dev/null @@ -1,136 +0,0 @@ --- (re) Add reference 26042 -SET @NEC := 26042; -- Northrend Emotion Cooking Recipe Reference -DELETE FROM `reference_loot_template` WHERE `entry`=@NEC; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@NEC,43507,0,1,1,1,1), -- Recipe: Tasty cupcake -(@NEC,43508,0,1,1,1,1), -- Recipe: Last Week's Mammoth -(@NEC,43509,0,1,1,1,1), -- Recipe: Bad Clams -(@NEC,43510,0,1,1,1,1); -- Recipe: Haunted Herring - -DELETE FROM `creature_loot_template` WHERE `entry` IN (2436,5928,5936,12239,12240,12241,12242,12243,14527,14529,14531,16506,16836,17307,21166,23809,23954,23963,23964,23983,24175,25234,28027,28113,28138,28494,29554,30177,30954,31779,40419); -UPDATE `creature_template`SET `lootid`=entry WHERE `entry` IN (2436,5928,5936,12239,12240,12241,12242,12243,14527,14529,14531,16506,16836,21166,23809,23963,23964,23983,25234,28027,28138,28494,29554,30954,31779,40419); -UPDATE `creature_template` SET `lootid`=0 WHERE `entry` IN (17307,23954,24175,28113,30177); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Farmer Kent (friendly?) -(2436,3692,-100,1,0,1,1), -- Hilsbrad Human Skull --- Sorrow Wing -(5928,5808,-50,1,0,1,1), -- Pridewing Venom Sac -(5928,5137,80,1,0,1,1), -- Bright Eyeball -(5928,5136,10,1,0,1,1), -- Torn Furry Ear -(5928,1,100,1,0,-@NEC,1), -- Random world green drop ilvl 25-30 --- Orca -(5936,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 -(5936,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(5936,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 -(5936,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 -(5936,26005,1,1,1,-26005,1), -- Northrend World Green Reference #3 -(5936,26006,1,1,1,-26006,1), -- Northrend World Green Reference #4 -(5936,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 -(5936,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 -(5936,26019,0.5,1,1,-26019,1), -- Northrend World Blue Reference #3 -(5936,26020,0.5,1,1,-26020,1), -- Northrend World Blue Reference #4 --- Add Theradric Crystal Carving (17684) to the following creatures -(12239,17684,-25,1,0,1,1), -- Spirit of Gelk -(12240,17684,-25,1,0,1,1), -- Spirit of Kolk -(12241,17684,-25,1,0,1,1), -- Spirit of Magra -(12242,17684,-25,1,0,1,1), -- Spirit of Maraudos -(12243,17684,-25,1,0,1,1), -- Spirit of Veng -(14527,18952,-100,1,0,1,1), -- Simone the Inconspicuous - Simone's Head -(14529,18953,-100,1,0,1,1), -- Franklin the Friendly - Klinfran's Head -(14531,18955,-100,1,0,1,1), -- Artorius the Amiable - Artorius's Head -(16506,22708,-100,1,0,1,1), -- Naxxramas Worshipper - Fate of Ramaladni -(16836,23460,-100,1,0,1,1), -- Escaped Dreghood - Broken Blood Sample -(21166,30451,-15,1,0,1,1), -- Illidari Dreadlord - Lohn'goron, Bow of the Torn-heart --- Vengeance Landing Cannoneer -(23809,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 -(23809,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(23809,26005,1,1,1,-26005,1), -- Northrend World Green Reference #3 --- Sergeant Lorric -(23963,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 -(23963,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(23963,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 -(23963,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 -(23963,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 -(23963,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 -(23963,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes --- Lieutenant Celeyne -(23964,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 -(23964,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(23964,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 -(23964,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 -(23964,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 -(23964,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 -(23964,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes --- North Fleet Marine -(23983,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 -(23983,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(23983,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 -(23983,26004,1,1,1,-26004,1), -- Northrend World Green Reference #2 -(23983,26017,0.5,1,1,-26017,1), -- Northrend World Blue Reference #1 -(23983,26018,0.5,1,1,-26018,1), -- Northrend World Blue Reference #2 -(23983,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes --- Stormfleet Deckhand -(25234,26000,3,1,1,-26000,1), -- Northrend World Grey Reference #1 -(25234,26003,1,1,1,-26003,1), -- Northrend World Green Reference #1 --- High-Oracle Soo-say -(28027,17058,50,1,0,1,1), -- Fish Oil -(28027,17057,30,1,0,1,1), -- Shiny Fish Scales -(28027,33470,15,1,0,2,4), -- Frostweave Cloth -(28027,35951,10,1,0,1,3), -- Poached Emperor Salmon -(28027,38642,-1,1,0,1,1), -- Golden Engagement Ring --- Elder Harkek -(28138,33470,40,1,0,2,4), -- Frostweave Cloth -(28138,33447,4,1,0,1,1), -- Runic Healing Potion -(28138,38642,-1,1,0,1,1), -- Golden Engagement Ring --- Kutube'sa -(28494,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(28494,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 -(28494,26010,1,1,1,-26010,1), -- Northrend World Green Reference #4 -(28494,26011,1,1,1,-26011,1), -- Northrend World Green Reference #5 -(28494,26012,1,1,1,-26012,1), -- Northrend World Green Reference #6 -(28494,26023,0.5,1,1,-26023,1), -- Northrend World Blue Reference #3 -(28494,26025,0.5,1,1,-26025,1), -- Northrend World Blue Reference #4 -(28494,26026,0.5,1,1,-26026,1), -- Northrend World Blue Reference #5 -(28494,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes -(28494,39152,35,1,0,1,1), -- Manual: Heavy Frostweave Bandage -(28494,43297,1,1,0,1,1), -- Damaged Necklace --- Snowblind Devotee -(29554,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(29554,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 -(29554,26009,1,1,1,-26009,1), -- Northrend World Green Reference #3 -(29554,26010,1,1,1,-26010,1), -- Northrend World Green Reference #4 -(29554,26011,1,1,1,-26011,1), -- Northrend World Green Reference #5 -(29554,26012,1,1,1,-26012,1), -- Northrend World Green Reference #6 -(29554,26013,1,1,1,-26013,1), -- Northrend World Green Reference #7 -(29554,26023,0.5,1,1,-26023,1), -- Northrend World Blue Reference #3 -(29554,26024,0.5,1,1,-26024,1), -- Northrend World Blue Reference #4 -(29554,26025,0.5,1,1,-26025,1), -- Northrend World Blue Reference #5 -(29554,26026,0.5,1,1,-26026,1), -- Northrend World Blue Reference #6 -(29554,26044,2,1,0,-@NEC,1), -- Northrend Emotion Cooking Recipes -(29554,39152,35,1,0,1,1), -- Manual: Heavy Frostweave Bandage -(29554,43297,1,1,0,1,1), -- Damaged Necklace --- Rokir -(30954,26001,6,1,1,-26001,1), -- Northrend World Grey Reference #2 -(30954,26002,6,1,1,-26002,1), -- Northrend World Grey Reference #3 -(30954,26014,2,1,1,-26014,1), -- Northrend World Green Reference #8 -(30954,26015,2,1,1,-26015,1), -- Northrend World Green Reference #9 --- Skeletal Archmage -(31779,26001,3,1,1,-26001,1), -- Northrend World Grey Reference #2 -(31779,26002,3,1,1,-26002,1), -- Northrend World Grey Reference #3 -(31779,26013,1,1,1,-26013,1), -- Northrend World Green Reference #7 -(31779,26014,1,1,1,-26014,1), -- Northrend World Green Reference #8 -(31779,26015,1,1,1,-26015,1), -- Northrend World Green Reference #9 -(31779,26028,0.5,1,1,-26028,1), -- Northrend World Blue Reference #8 -(31779,39152,50,1,0,1,1), -- Manual: Heavy Frostweave Bandage -(31779,43297,1,1,0,1,1), -- Damaged Necklace --- Charscale Assaulter -(40419,26001,6,1,1,-26001,1), -- Northrend World Grey Reference #2 -(40419,26002,6,1,1,-26002,1), -- Northrend World Grey Reference #3 -(40419,26015,2,1,1,-26015,1), -- Northrend World Green Reference #9 -(40419,26016,2,1,1,-26016,1); -- Northrend World Green Reference #10 --- conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 1 AND `SourceGroup` IN (28494,29554,31779); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES -(1,28494,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'), -(1,29554,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'), -(1,31779,39152,7,129,390,'Manual: Heavy Frostweave Bandage will drop only if the player has first aid at 390'); diff --git a/sql/updates/world/2012_03_25_00_world_game_event.sql b/sql/updates/world/2012_03_25_00_world_game_event.sql deleted file mode 100644 index 82dfaa3f494..00000000000 --- a/sql/updates/world/2012_03_25_00_world_game_event.sql +++ /dev/null @@ -1,4 +0,0 @@ --- darkmoon faerie resync, again -UPDATE `game_event` SET `start_time`='2012-04-01 00:01:00' WHERE `eventEntry`=5; -UPDATE `game_event` SET `start_time`='2012-05-06 00:01:00' WHERE `eventEntry`=3; -UPDATE `game_event` SET `start_time`='2012-06-03 00:01:00' WHERE `eventEntry`=4; diff --git a/sql/updates/world/2012_03_26_00_world_creature_template.sql b/sql/updates/world/2012_03_26_00_world_creature_template.sql deleted file mode 100644 index f60849476bd..00000000000 --- a/sql/updates/world/2012_03_26_00_world_creature_template.sql +++ /dev/null @@ -1,73 +0,0 @@ -UPDATE `creature_template` SET `HoverHeight`=10.8, `VehicleId`=232 WHERE `entry`=30393; -UPDATE `creature_template` SET `HoverHeight`=10.8, `VehicleId`=237 WHERE `entry`=30461; -UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=27530; -UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=26277; -UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=26276; -UPDATE `creature_template` SET `HoverHeight`=1.2 WHERE `entry`=31070; -UPDATE `creature_template` SET `HoverHeight`=12 WHERE `entry`=37126; -UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=27608; -UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=27608; -UPDATE `creature_template` SET `HoverHeight`=1.6 WHERE `entry`=38392; -UPDATE `creature_template` SET `HoverHeight`=2.25 WHERE `entry`=30272; -UPDATE `creature_template` SET `HoverHeight`=2.58, `Scale`=1.72 WHERE `entry`=26607; -UPDATE `creature_template` SET `HoverHeight`=25 WHERE `entry`=37755; -UPDATE `creature_template` SET `HoverHeight`=26 WHERE `entry`=29790; -UPDATE `creature_template` SET `HoverHeight`=2.7 WHERE `entry`=25451; -UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=29048; -UPDATE `creature_template` SET `HoverHeight`=2, `VehicleId`=234 WHERE `entry`=30228; -UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25445; -UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=26761; -UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=26761; -UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25721; -UPDATE `creature_template` SET `HoverHeight`=35 WHERE `entry`=27789; -UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=34567; -UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=26668; -UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=390 WHERE `entry`=34120; -UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=108 WHERE `entry`=24083; -UPDATE `creature_template` SET `HoverHeight`=3, `VehicleId`=270 WHERE `entry`=31137; -UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=24272; -UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=37098; -UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=28534; -UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=28511; -UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=26736; -UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=26736; -UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=32534; -UPDATE `creature_template` SET `HoverHeight`=5, `VehicleId`=348 WHERE `entry`=33214; -UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=27693; -UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=34203; -UPDATE `creature_template` SET `HoverHeight`=6.25 WHERE `entry`=40083; -UPDATE `creature_template` SET `HoverHeight`=6.25 WHERE `entry`=40100; -UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34496; -UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34496; -UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=34497; -UPDATE `creature_template` SET `HoverHeight`=7.5 WHERE `entry`=26933; -UPDATE `creature_template` SET `HoverHeight`=8.4, `VehicleId`=232 WHERE `entry`=30420; -UPDATE `creature_template` SET `HoverHeight`=8 WHERE `entry`=33186; -UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=26933; -UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37528; -UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37230; -UPDATE `creature_template` SET `HoverHeight`=9, `VehicleId`=375 WHERE `entry`=33687; -UPDATE `creature_template` SET `HoverHeight`=9, `VehicleId`=535 WHERE `entry`=36661; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10.8, `VehicleId`=232 WHERE `entry`=30393; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10 WHERE `entry`=27608; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=10 WHERE `entry`=27608; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=15 WHERE `entry`=32630; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=1.6 WHERE `entry`=38391; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2.25, `VehicleId`=247 WHERE `entry`=30564; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2.25 WHERE `entry`=30272; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=25721; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=29570; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=2 WHERE `entry`=26761; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3.12, `Scale`=2.08 WHERE `entry`=26607; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3 WHERE `entry`=26668; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=3, `VehicleId`=108 WHERE `entry`=24083; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=4 WHERE `entry`=37098; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=4 WHERE `entry`=30945; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5.85 WHERE `entry`=26736; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5.85 WHERE `entry`=26736; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=5, `VehicleId`=276 WHERE `entry`=31432; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=6 WHERE `entry`=30501; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=7.5 WHERE `entry`=26933; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=8.4, `VehicleId`=232 WHERE `entry`=30420; -UPDATE `creature_template` SET `InhabitType`=0x4, `HoverHeight`=9 WHERE `entry`=26933; - diff --git a/sql/updates/world/2012_03_26_01_world_spell_script_names.sql b/sql/updates/world/2012_03_26_01_world_spell_script_names.sql deleted file mode 100644 index 0a5c90f798f..00000000000 --- a/sql/updates/world/2012_03_26_01_world_spell_script_names.sql +++ /dev/null @@ -1,4 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` IN (34477, 35079); -INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES -(34477,'spell_hun_misdirection'), -(35079,'spell_hun_misdirection_proc'); diff --git a/sql/updates/world/2012_03_27_00_world_misc.sql b/sql/updates/world/2012_03_27_00_world_misc.sql deleted file mode 100644 index 132c91b81d7..00000000000 --- a/sql/updates/world/2012_03_27_00_world_misc.sql +++ /dev/null @@ -1,49 +0,0 @@ -ALTER TABLE `battleground_template` CHANGE `Weight` `Weight` tinyint(3) unsigned NOT NULL DEFAULT '1'; -ALTER TABLE `conditions` CHANGE `SourceId` `SourceId` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `creature` CHANGE `equipment_id` `equipment_id` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_addon` CHANGE `path_id` `path_id` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_ai_scripts` CHANGE `id` `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier'; -ALTER TABLE `creature_ai_scripts` CHANGE `creature_id` `creature_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Creature Template Identifier'; -ALTER TABLE `creature_ai_scripts` CHANGE `event_type` `event_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event Type'; -ALTER TABLE `creature_ai_scripts` CHANGE `event_chance` `event_chance` int(10) unsigned NOT NULL DEFAULT '100'; -ALTER TABLE `creature_ai_scripts` CHANGE `event_flags` `event_flags` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_ai_scripts` CHANGE `action1_type` `action1_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; -ALTER TABLE `creature_ai_scripts` CHANGE `action2_type` `action2_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; -ALTER TABLE `creature_ai_scripts` CHANGE `action3_type` `action3_type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Action Type'; -ALTER TABLE `creature_ai_summons` CHANGE `id` `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Location Identifier'; -ALTER TABLE `creature_ai_summons` CHANGE `spawntimesecs` `spawntimesecs` int(10) unsigned NOT NULL DEFAULT '120'; -ALTER TABLE `creature_classlevelstats` CHANGE `level` `level` tinyint(4) NOT NULL; -ALTER TABLE `creature_classlevelstats` CHANGE `class` `class` tinyint(4) NOT NULL; -ALTER TABLE `creature_classlevelstats` CHANGE `basehp0` `basehp0` smallint(6) NOT NULL; -ALTER TABLE `creature_classlevelstats` CHANGE `basehp1` `basehp1` smallint(6) NOT NULL; -ALTER TABLE `creature_classlevelstats` CHANGE `basehp2` `basehp2` smallint(6) NOT NULL; -ALTER TABLE `creature_classlevelstats` CHANGE `basemana` `basemana` smallint(6) NOT NULL; -ALTER TABLE `creature_classlevelstats` CHANGE `basearmor` `basearmor` smallint(6) NOT NULL; -ALTER TABLE `creature_formations` CHANGE `leaderGUID` `leaderGUID` int(10) unsigned NOT NULL; -ALTER TABLE `creature_formations` CHANGE `memberGUID` `memberGUID` int(10) unsigned NOT NULL; -ALTER TABLE `creature_formations` CHANGE `groupAI` `groupAI` int(10) unsigned NOT NULL; -ALTER TABLE `creature_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `creature_onkill_reputation` CHANGE `RewOnKillRepValue1` `RewOnKillRepValue1` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `KillCredit1` `KillCredit1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `KillCredit2` `KillCredit2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `exp` `exp` smallint(6) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `resistance1` `resistance1` smallint(6) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `resistance2` `resistance2` smallint(6) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `resistance3` `resistance3` smallint(6) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `resistance4` `resistance4` smallint(6) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `resistance5` `resistance5` smallint(6) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `resistance6` `resistance6` smallint(6) NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `questItem1` `questItem1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `questItem2` `questItem2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `questItem3` `questItem3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `questItem4` `questItem4` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `questItem5` `questItem5` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `questItem6` `questItem6` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; -ALTER TABLE `creature_template_addon` CHANGE `path_id` `path_id` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `creature_transport` CHANGE `guid` `guid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'GUID of NPC on transport - not the same as creature.guid'; -ALTER TABLE `creature_transport` CHANGE `transport_entry` `transport_entry` int(11) NOT NULL COMMENT 'Transport entry'; -ALTER TABLE `creature_transport` CHANGE `npc_entry` `npc_entry` int(11) NOT NULL COMMENT 'NPC entry'; -ALTER TABLE `creature_transport` CHANGE `emote` `emote` int(11) NOT NULL; -ALTER TABLE `db_script_string` CHANGE `entry` `entry` int(10) unsigned NOT NULL DEFAULT '0'; - \ No newline at end of file diff --git a/sql/updates/world/2012_03_27_01_world_misc.sql b/sql/updates/world/2012_03_27_01_world_misc.sql deleted file mode 100644 index 38c11c8ae65..00000000000 --- a/sql/updates/world/2012_03_27_01_world_misc.sql +++ /dev/null @@ -1,15 +0,0 @@ -ALTER TABLE `exploration_basexp` CHANGE `level` `level` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `exploration_basexp` CHANGE `basexp` `basexp` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `fishing_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `game_event_creature` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; -ALTER TABLE `game_event_gameobject` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; -ALTER TABLE `game_event_model_equip` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.'; -ALTER TABLE `game_event_npc_vendor` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.'; -ALTER TABLE `game_event_pool` CHANGE `eventEntry` `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.'; -ALTER TABLE `gameobject_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `gameobject_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; -ALTER TABLE `gossip_menu` CHANGE `entry` `entry` smallint(5) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `gossip_menu_option` CHANGE `menu_id` `menu_id` smallint(5) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `gossip_menu_option` CHANGE `id` `id` smallint(5) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `gossip_menu_option` CHANGE `box_money` `box_money` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `gossip_menu_option` CHANGE `action_menu_id` `action_menu_id` int(10) unsigned NOT NULL DEFAULT '0'; diff --git a/sql/updates/world/2012_03_27_02_world_misc.sql b/sql/updates/world/2012_03_27_02_world_misc.sql deleted file mode 100644 index f83a98b8100..00000000000 --- a/sql/updates/world/2012_03_27_02_world_misc.sql +++ /dev/null @@ -1,78 +0,0 @@ -ALTER TABLE `instance_template` CHANGE `allowMount` `allowMount` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `ip2nation` CHANGE `ip` `ip` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `item_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `item_set_names` CHANGE `WDBVerified` `WDBVerified` smallint(6) NOT NULL DEFAULT '1'; -ALTER TABLE `item_template` CHANGE `spellcharges_1` `spellcharges_1` smallint(6) NULL DEFAULT NULL; -ALTER TABLE `item_template` CHANGE `spellcharges_2` `spellcharges_2` smallint(6) NULL DEFAULT NULL; -ALTER TABLE `item_template` CHANGE `spellcharges_3` `spellcharges_3` smallint(6) NULL DEFAULT NULL; -ALTER TABLE `item_template` CHANGE `spellcharges_4` `spellcharges_4` smallint(6) NULL DEFAULT NULL; -ALTER TABLE `item_template` CHANGE `spellcharges_5` `spellcharges_5` smallint(6) NULL DEFAULT NULL; -ALTER TABLE `item_template` CHANGE `BagFamily` `BagFamily` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `item_template` CHANGE `TotemCategory` `TotemCategory` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `item_template` CHANGE `socketContent_1` `socketContent_1` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `item_template` CHANGE `socketContent_2` `socketContent_2` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `item_template` CHANGE `socketContent_3` `socketContent_3` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `item_template` CHANGE `socketBonus` `socketBonus` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `item_template` CHANGE `GemProperties` `GemProperties` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `item_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; -ALTER TABLE `item_template` CHANGE `ScalingStatValue` `ScalingStatValue` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `mail_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `milling_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `npc_spellclick_spells` CHANGE `user_type` `user_type` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'relation with summoner: 0-no 1-friendly 2-raid 3-party player can click'; -ALTER TABLE `outdoorpvp_template` CHANGE `TypeId` `TypeId` tinyint(3) unsigned NOT NULL; -ALTER TABLE `page_text` CHANGE `WDBVerified` `WDBVerified` smallint(6) NULL DEFAULT '1'; -ALTER TABLE `pet_name_generation` CHANGE `half` `half` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `pickpocketing_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `player_factionchange_achievement` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_achievement` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_items` CHANGE `race_A` `race_A` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_items` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_items` CHANGE `race_H` `race_H` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_items` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_reputations` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_reputations` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_spells` CHANGE `alliance_id` `alliance_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_factionchange_spells` CHANGE `horde_id` `horde_id` int(10) unsigned NOT NULL; -- also changed to unsigned -ALTER TABLE `player_xp_for_level` CHANGE `lvl` `lvl` tinyint(3) unsigned NOT NULL; -- also changed from int to tinyint -ALTER TABLE `playercreateinfo_action` CHANGE `action` `action` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `playercreateinfo_item` CHANGE `amount` `amount` tinyint(4) NOT NULL DEFAULT '1'; -ALTER TABLE `playercreateinfo_spell_custom` DROP `Active`; -- delete field, it's not used anywhere -ALTER TABLE `prospecting_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `quest_poi` CHANGE `objIndex` `objIndex` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_poi_points` CHANGE `x` `x` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_poi_points` CHANGE `y` `y` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredFactionValue1` `RequiredFactionValue1` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredFactionValue2` `RequiredFactionValue2` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredMinRepValue` `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredMinRepValue` `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredMaxRepValue` `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `PrevQuestId` `PrevQuestId` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `NextQuestId` `NextQuestId` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `ExclusiveGroup` `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardSpellCast` `RewardSpellCast` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardHonor` `RewardHonor` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardXPId` `RewardXPId` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueId1` `RewardFactionValueId1` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueId2` `RewardFactionValueId2` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueId3` `RewardFactionValueId3` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueId4` `RewardFactionValueId4` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueId5` `RewardFactionValueId5` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride1` `RewardFactionValueIdOverride1` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride2` `RewardFactionValueIdOverride2` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride3` `RewardFactionValueIdOverride3` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride4` `RewardFactionValueIdOverride4` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RewardFactionValueIdOverride5` `RewardFactionValueIdOverride5` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo1` `RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo2` `RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo3` `RequiredNpcOrGo3` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `RequiredNpcOrGo4` `RequiredNpcOrGo4` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `Unknown0` `Unknown0` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay1` `DetailsEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay2` `DetailsEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay3` `DetailsEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `DetailsEmoteDelay4` `DetailsEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay1` `OfferRewardEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay2` `OfferRewardEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay3` `OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `OfferRewardEmoteDelay4` `OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `quest_template` CHANGE `WDBVerified` `WDBVerified` smallint(6) NOT NULL DEFAULT '1'; diff --git a/sql/updates/world/2012_03_27_03_world_misc.sql b/sql/updates/world/2012_03_27_03_world_misc.sql deleted file mode 100644 index aba847dbc3f..00000000000 --- a/sql/updates/world/2012_03_27_03_world_misc.sql +++ /dev/null @@ -1,59 +0,0 @@ -ALTER TABLE `reference_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `reputation_spillover_template` CHANGE `faction` `faction` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction entry'; -ALTER TABLE `reputation_spillover_template` CHANGE `faction1` `faction1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction to give spillover for'; -ALTER TABLE `reputation_spillover_template` CHANGE `faction2` `faction2` smallint(5) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `reputation_spillover_template` CHANGE `faction3` `faction3` smallint(5) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `reputation_spillover_template` CHANGE `faction4` `faction4` smallint(5) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `skinning_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `spell_area` CHANGE `quest_start_active` `quest_start_active` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_area` CHANGE `gender` `gender` tinyint(3) unsigned NOT NULL DEFAULT '2'; -ALTER TABLE `spell_area` CHANGE `autocast` `autocast` tinyint(3) unsigned NOT NULL DEFAULT '0'; --- All the fields in spell_dbc where changed to full int32 since the DBC structure is used -ALTER TABLE `spell_dbc` CHANGE `Dispel` `Dispel` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `Mechanic` `Mechanic` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `CastingTimeIndex` `CastingTimeIndex` int(10) unsigned NOT NULL DEFAULT '1'; -ALTER TABLE `spell_dbc` CHANGE `DurationIndex` `DurationIndex` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `ProcChance` `ProcChance` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `ProcCharges` `ProcCharges` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `BaseLevel` `BaseLevel` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `MaxLevel` `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `SpellLevel` `SpellLevel` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `RangeIndex` `RangeIndex` int(10) unsigned NOT NULL DEFAULT '1'; -ALTER TABLE `spell_dbc` CHANGE `Effect1` `Effect1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `Effect2` `Effect2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `Effect3` `Effect3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectMechanic1` `EffectMechanic1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectMechanic2` `EffectMechanic2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectMechanic3` `EffectMechanic3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA1` `EffectImplicitTargetA1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA2` `EffectImplicitTargetA2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetA3` `EffectImplicitTargetA3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB1` `EffectImplicitTargetB1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB2` `EffectImplicitTargetB2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectImplicitTargetB3` `EffectImplicitTargetB3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex1` `EffectRadiusIndex1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex2` `EffectRadiusIndex2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectRadiusIndex3` `EffectRadiusIndex3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName1` `EffectApplyAuraName1` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName2` `EffectApplyAuraName2` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `EffectApplyAuraName3` `EffectApplyAuraName3` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `MaxTargetLevel` `MaxTargetLevel` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `SpellFamilyName` `SpellFamilyName` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `MaxAffectedTargets` `MaxAffectedTargets` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `DmgClass` `DmgClass` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_dbc` CHANGE `PreventionType` `PreventionType` int(10) unsigned NOT NULL DEFAULT '0'; --- -ALTER TABLE `spell_group` CHANGE `id` `id` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `spell_loot_template` CHANGE `mincountOrRef` `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1'; -ALTER TABLE `spell_proc` CHANGE `spellPhaseMask` `spellPhaseMask` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `spell_proc` CHANGE `hitMask` `hitMask` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `spell_enchant_proc_data` CHANGE `procEx` `procEx` int(10) unsigned NOT NULL DEFAULT '0'; -- changed from float to int -ALTER TABLE `spell_required` CHANGE `spell_id` `spell_id` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `spell_required` CHANGE `req_spell` `req_spell` mediumint(8) NOT NULL DEFAULT '0'; -ALTER TABLE `spell_threat` CHANGE `flatMod` `flatMod` int(11) NULL DEFAULT NULL; -ALTER TABLE `vehicle_accessory` CHANGE `seat_id` `seat_id` tinyint(4) NOT NULL DEFAULT '0'; -ALTER TABLE `vehicle_accessory` CHANGE `minion` `minion` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `vehicle_template_accessory` CHANGE `seat_id` `seat_id` tinyint(4) NOT NULL DEFAULT '0'; -ALTER TABLE `vehicle_template_accessory` CHANGE `minion` `minion` tinyint(3) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `version` CHANGE `cache_id` `cache_id` int(11) NULL DEFAULT '0'; -ALTER TABLE `waypoint_data` CHANGE `move_flag` `move_flag` tinyint(4) NOT NULL DEFAULT '0'; diff --git a/sql/updates/world/2012_03_27_04_world_misc.sql b/sql/updates/world/2012_03_27_04_world_misc.sql deleted file mode 100644 index e85350476c9..00000000000 --- a/sql/updates/world/2012_03_27_04_world_misc.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE `spell_dbc` CHANGE `StackAmount` `StackAmount` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `waypoint_data` CHANGE `action_chance` `action_chance` smallint(6) NOT NULL DEFAULT '100'; -ALTER TABLE `item_loot_template` CHANGE `maxcount` `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1'; diff --git a/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql b/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql deleted file mode 100644 index e150cad1c2e..00000000000 --- a/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Hunter Volley -UPDATE `spell_bonus_data` SET `ap_bonus`=0.0837 WHERE `entry`=42243; diff --git a/sql/updates/world/2012_03_30_00_world_smart_scripts.sql b/sql/updates/world/2012_03_30_00_world_smart_scripts.sql deleted file mode 100644 index 3ec709d76c1..00000000000 --- a/sql/updates/world/2012_03_30_00_world_smart_scripts.sql +++ /dev/null @@ -1,94 +0,0 @@ --- revised from Unholys original works --- quest 12702 chicken party! --- quest 12532 flown the coop! --- -SET @ENTRY := 28161; -- the chicken -SET @PARTY := 12702; -- chicken party quest -SET @COOP := 12532; -- flown the coop quest -SET @LIFE := 900000; -- minutes - --- set up required spells for the spells to work as they should -DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@ENTRY; -INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES -(@ENTRY,39996,1,0), -- cover spell (dummy) -(@ENTRY,51037,2,0); -- creates item in players back pack - --- set npc up to use event script -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; - --- convert over to smart script -DELETE FROM `creature_ai_scripts` WHERE `id`=@ENTRY; -- delete old eai scripts -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,1,0,100,0,1000,1000,2000,3000,89,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'create random movement every 2-3 secs'), -(@ENTRY,0,1,0,8,0,100,0,51951,0,0,0,11,50839,0,0,0,0,0,1,0,0,0,0,0,0,0, 'when hit with net cast self stun'), -(@ENTRY,0,2,0,8,0,100,0,39996,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'force despawn @1 sec when hit with dummy spell'); - --- Remove previous scripts that may interfere with this work -DELETE FROM `quest_start_scripts` WHERE `id` IN (@PARTY,@COOP); - --- start script for quest chicken party (they do not all spawn at same time) -UPDATE `quest_template` SET `StartScript`=@PARTY WHERE `id`=@PARTY; -- 12072 -INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES -(@PARTY,1,10,@ENTRY,@LIFE, 0,5251.09,4413.76,-96.086,4.8714), -(@PARTY,2,10,@ENTRY,@LIFE, 0,5251.22,4419.74,-95.8995,3.58335), -(@PARTY,23,10,@ENTRY,@LIFE, 0,5257.58,4421.77,-95.9072,2.62124), -(@PARTY,4,10,@ENTRY,@LIFE,0, 5255.97,4420.37,-95.9999,0.0451326), -(@PARTY,5,10,@ENTRY,@LIFE,0, 5256.78,4420.63,-95.9957,0.320021), -(@PARTY,6,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,0.956194), -(@PARTY,27,10,@ENTRY,@LIFE,0, 5258.54,4420.49,-96.0195,0.551714), -(@PARTY,8,10,@ENTRY,@LIFE,0, 5250.67,4417.98,-95.9787,4.39231), -(@PARTY,9,10,@ENTRY,@LIFE,0, 5273.53,4430.32,-96.0241,1.0897), -(@PARTY,40,10,@ENTRY,@LIFE,0, 5158.3,4605.25,-130.988,3.7522), -(@PARTY,21,10,@ENTRY,@LIFE,0, 5164.6,4609.43,-130.427,3.70115), -(@PARTY,22,10,@ENTRY,@LIFE,0, 5169.53,4612.44,-130.817,4.05065), -(@PARTY,23,10,@ENTRY,@LIFE,0, 5188.49,4627.85,-132.485,3.60691), -(@PARTY,44,10,@ENTRY,@LIFE,0, 5203.19,4631.63,-132.611,2.849), -(@PARTY,25,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.378917), -(@PARTY,26,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.66166), -(@PARTY,27,10,@ENTRY,@LIFE,0, 5203.5,4595.02,-111.327,5.51542), -(@PARTY,48,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,0.579192), -(@PARTY,29,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,1.09756), -(@PARTY,30,10,@ENTRY,@LIFE,0, 5172.43,4533.25,-97.3836,1.15253), -(@PARTY,41,10,@ENTRY,@LIFE,0, 5186.29,4522.69,-91.0957,3.02571), -(@PARTY,32,10,@ENTRY,@LIFE,0, 5214.67,4485.22,-91.3113,2.40524), -(@PARTY,33,10,@ENTRY,@LIFE,0, 5221.85,4475.99,-96.8801,4.89495), -(@PARTY,34,10,@ENTRY,@LIFE,0, 5222.95,4438.1,-96.8062,1.6277), -(@PARTY,35,10,@ENTRY,@LIFE,0, 5224.36,4427.83,-96.9221,2.63301), -(@PARTY,36,10,@ENTRY,@LIFE,0, 5234.72,4406.44,-95.2917,0.0647549), -(@PARTY,47,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,3.79933), -(@PARTY,38,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,4.29414), -(@PARTY,39,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,3.90536), -(@PARTY,40,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,4.36089); - --- start script for quest flown the coop (they do not all spawn at same time) -UPDATE `quest_template` SET `StartScript`=@COOP WHERE `id`=@COOP; -- 12532 -INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES -(@COOP,23,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,2.62124), -(@COOP,4,10,@ENTRY,@LIFE,0, 5255.97,4420.37,-95.9999,0.0451326), -(@COOP,5,10,@ENTRY,@LIFE,0, 5256.78,4420.63,-95.9957,0.320021), -(@COOP,6,10,@ENTRY,@LIFE,0, 5257.58,4421.77,-95.9072,0.956194), -(@COOP,27,10,@ENTRY,@LIFE,0, 5258.54,4420.49,-96.0195,0.551714), -(@COOP,8,10,@ENTRY,@LIFE,0, 5250.67,4417.98,-95.9787,4.39231), -(@COOP,9,10,@ENTRY,@LIFE,0, 5273.53,4430.32,-96.0241,1.0897), -(@COOP,40,10,@ENTRY,@LIFE,0, 5158.3,4605.25,-130.988,3.7522), -(@COOP,21,10,@ENTRY,@LIFE,0, 5164.6,4609.43,-130.427,3.70115), -(@COOP,22,10,@ENTRY,@LIFE,0, 5169.53,4612.44,-130.817,4.05065), -(@COOP,23,10,@ENTRY,@LIFE,0, 5188.49,4627.85,-132.485,3.60691), -(@COOP,44,10,@ENTRY,@LIFE,0, 5203.19,4631.63,-132.611,2.849), -(@COOP,25,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.378917), -(@COOP,26,10,@ENTRY,@LIFE,0, 5219.62,4632.46,-134.232,0.66166), -(@COOP,27,10,@ENTRY,@LIFE,0, 5203.5,4595.02,-111.327,5.51542), -(@COOP,48,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,0.579192), -(@COOP,29,10,@ENTRY,@LIFE,0, 5179.35,4558,-100.344,1.09756), -(@COOP,30,10,@ENTRY,@LIFE,0, 5172.43,4533.25,-97.3836,1.15253), -(@COOP,41,10,@ENTRY,@LIFE,0, 5186.29,4522.69,-91.0957,3.02571), -(@COOP,32,10,@ENTRY,@LIFE,0, 5214.67,4485.22,-91.3113,2.40524), -(@COOP,33,10,@ENTRY,@LIFE,0, 5221.85,4475.99,-96.8801,4.89495), -(@COOP,34,10,@ENTRY,@LIFE,0, 5222.95,4438.1,-96.8062,1.6277), -(@COOP,35,10,@ENTRY,@LIFE,0, 5224.36,4427.83,-96.9221,2.63301), -(@COOP,36,10,@ENTRY,@LIFE,0, 5234.72,4406.44,-95.2917,0.0647549), -(@COOP,47,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,3.79933), -(@COOP,38,10,@ENTRY,@LIFE,0, 5227.28,4407.01,-95.3888,4.29414), -(@COOP,39,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,3.90536), -(@COOP,40,10,@ENTRY,@LIFE,0, 5251.09,4413.76,-96.086,4.36089); diff --git a/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql b/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql deleted file mode 100644 index a817cdccf50..00000000000 --- a/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql +++ /dev/null @@ -1,191 +0,0 @@ --- ------------------------------- --- -- The Antechamber of Ulduar -- --- ------------------------------- --- Creatures -SET @Brundir10 :=32857; -call `sp_get_npc_diffentry`(@Brundir10,1,@Brundir25); -- Get 25man id using procedure -SET @Molgeim10 :=32927; -call `sp_get_npc_diffentry`(@Molgeim10,1,@Molgeim25); -- Get 25man id using procedure -SET @Steelbreaker10 :=32867; -call `sp_get_npc_diffentry`(@Steelbreaker10,1,@Steelbreaker25); -- Get 25man id using procedure -SET @Auriaya10 :=33515; -call `sp_get_npc_diffentry`(@Auriaya10,1,@Auriaya25); -- Get 25man id using procedure --- Gameobjects -SET @Kologarn10 := 195046; -- Cache of the Living Stone 10man -CALL `sp_get_go_lootid`(@Kologarn10,@CacheLivingStone10); -- Get Lootid from data1 field using procedure -SET @Kologarn25 := 195047; -- Cache of the Living Stone 25man -CALL `sp_get_go_lootid`(@Kologarn25,@CacheLivingStone25); -- Get Lootid from data1 field using procedure --- bosses -SET @Assembly10Ref := 34359; -SET @Assembly25Ref := @Assembly10Ref+1; -SET @Kologarn10Ref := @Assembly10Ref+2; -SET @Kologarn25Ref := @Assembly10Ref+3; -SET @Auriaya10Ref := @Assembly10Ref+4; -SET @Auriaya25Ref := @Assembly10Ref+5; - --- ------------------------------ --- -- Reference Loot Templates -- --- ------------------------------ --- Delete previous templates if existing -DELETE FROM `reference_loot_template` WHERE `entry` IN (12019,34122,34123,34124,34163,34216); --- Delete the current if existing & add -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Assembly10Ref AND @Assembly10Ref+5; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Assembly Of Iron 10man -(@Assembly10Ref,45322,0,1,1,1,1), -- Cloak of the Iron Council -(@Assembly10Ref,45324,0,1,1,1,1), -- Leggings of Swift Reflexes -(@Assembly10Ref,45329,0,1,1,1,1), -- Circlet of True Sight -(@Assembly10Ref,45330,0,1,1,1,1), -- Greaves of Iron Intensity -(@Assembly10Ref,45331,0,1,1,1,1), -- Rune-Etched Nightblade -(@Assembly10Ref,45332,0,1,1,1,1), -- Stormtip -(@Assembly10Ref,45333,0,1,1,1,1), -- Belt of the Iron Servant -(@Assembly10Ref,45378,0,1,1,1,1), -- Boots of the Petrified Forest -(@Assembly10Ref,45418,0,1,1,1,1), -- Lady Maye's Sapphire Ring -(@Assembly10Ref,45423,0,1,1,1,1), -- Runetouch Wristwraps --- Assembly Of Iron 25man -(@Assembly25Ref,45233,0,1,1,1,1), -- Stormrune Edge -(@Assembly25Ref,45234,0,1,1,1,1), -- Rapture -(@Assembly25Ref,45237,0,1,1,1,1), -- Phaelia's Vestments of the Sprouting Seed -(@Assembly25Ref,45193,0,1,1,1,1), -- Insurmountable Fervor -(@Assembly25Ref,45236,0,1,1,1,1), -- Unblinking Eye -(@Assembly25Ref,45225,0,1,1,1,1), -- Steelbreaker's Embrace -(@Assembly25Ref,45240,0,1,1,1,1), -- Raiments of the Iron Council -(@Assembly25Ref,45226,0,1,1,1,1), -- Ancient Iron Heaume -(@Assembly25Ref,45235,0,1,1,1,1), -- Radiant Seal -(@Assembly25Ref,45227,0,1,1,1,1), -- Iron-studded Mantle -(@Assembly25Ref,45239,0,1,1,1,1), -- Runeshaper's Gloves -(@Assembly25Ref,45224,0,1,1,1,1), -- Drape of the Lithe -(@Assembly25Ref,45232,0,1,1,1,1), -- Runed Ironhide Boots -(@Assembly25Ref,45228,0,1,1,1,1), -- Handguards of the Enclave -(@Assembly25Ref,45238,0,1,1,1,1), -- Overload Legwraps --- Cache of Living Stone 10man -(@Kologarn10Ref,45701,0,1,1,1,1), -- Greaves of the Earthbinder -(@Kologarn10Ref,45965,0,1,1,1,1), -- Spire of Withering Dreams -(@Kologarn10Ref,45702,0,1,1,1,1), -- Emerald Signet Ring -(@Kologarn10Ref,45696,0,1,1,1,1), -- Mark of the Unyielding -(@Kologarn10Ref,45698,0,1,1,1,1), -- Sabatons of the Iron Watcher -(@Kologarn10Ref,45697,0,1,1,1,1), -- Shoulderguards of the Solemn Watch -(@Kologarn10Ref,45703,0,2,2,1,1), -- Spark of Hope -(@Kologarn10Ref,45700,0,2,2,1,1), -- Stoneguard -(@Kologarn10Ref,45699,0,2,2,1,1), -- Pendant of the Piercing Glare -(@Kologarn10Ref,45704,0,2,2,1,1), -- Shawl of the Shattered Giant --- Cache of Living Stone 25man -(@Kologarn25Ref,45261,0,1,1,1,1), -- Giant's Bane -(@Kologarn25Ref,45266,0,1,1,1,1), -- Malice -(@Kologarn25Ref,45274,0,1,1,1,1), -- Leggings of the Stoneweaver -(@Kologarn25Ref,45269,0,1,1,1,1), -- Unfaltering Armguards -(@Kologarn25Ref,45268,0,1,1,1,1), -- Gloves of the Pythonic Guardian -(@Kologarn25Ref,45262,0,1,1,1,1), -- Necklace of Unerring Mettle -(@Kologarn25Ref,45275,0,1,1,1,1), -- Bracers of Unleashed Magic -(@Kologarn25Ref,45272,0,1,1,1,1), -- Robes of the Umbral Brute -(@Kologarn25Ref,45267,0,1,1,1,1), -- Saronite Plated Legguards -(@Kologarn25Ref,45263,0,1,1,1,1), -- Wrathstone -(@Kologarn25Ref,45271,0,1,1,1,1), -- Ironmender -(@Kologarn25Ref,45264,0,1,1,1,1), -- Decimator's Armguards -(@Kologarn25Ref,45265,0,1,1,1,1), -- Shoulderpads of the Monolith -(@Kologarn25Ref,45273,0,1,1,1,1), -- Handwraps of Plentiful Recovery -(@Kologarn25Ref,45270,0,1,1,1,1), -- Idol of the Crying Wind --- Auriaya 10man -(@Auriaya10Ref,45707,0,1,1,1,1), -- Shieldwall of the Breaker -(@Auriaya10Ref,45708,0,1,1,1,1), -- Archaedas' Lost Legplates -(@Auriaya10Ref,45709,0,1,1,1,1), -- Nimble Climber's Belt -(@Auriaya10Ref,45711,0,1,1,1,1), -- Ironaya's Discarded Mantle -(@Auriaya10Ref,45712,0,1,1,1,1), -- Chestplate of Titanic Fury -(@Auriaya10Ref,45713,0,1,1,1,1), -- Nurturing Touch -(@Auriaya10Ref,45832,0,1,1,1,1), -- Mantle of the Preserver -(@Auriaya10Ref,45864,0,1,1,1,1), -- Cover of the Keepers -(@Auriaya10Ref,45865,0,1,1,1,1), -- Raiments of the Corrupted -(@Auriaya10Ref,45866,0,1,1,1,1), -- Elemental Focus Stone --- Auriaya 25man -(@Auriaya25Ref,45327,0,1,1,1,1), -- Siren's Cry -(@Auriaya25Ref,45437,0,1,1,1,1), -- Runescribed Blade -(@Auriaya25Ref,45315,0,1,1,1,1), -- Stonerender -(@Auriaya25Ref,45439,0,1,1,1,1), -- Unwavering Stare -(@Auriaya25Ref,45326,0,1,1,1,1), -- Platinum Band of the Aesir -(@Auriaya25Ref,45441,0,1,1,1,1), -- Sandals of the Ancient Keeper -(@Auriaya25Ref,45435,0,1,1,1,1), -- Cowl of the Absolute -(@Auriaya25Ref,45438,0,1,1,1,1), -- Ring of the Faithful Servant -(@Auriaya25Ref,45434,0,1,1,1,1), -- Greaves of the Rockmender -(@Auriaya25Ref,45320,0,1,1,1,1), -- Shoulderplates of the Eternal -(@Auriaya25Ref,45325,0,1,1,1,1), -- Gloves of the Stonereaper -(@Auriaya25Ref,45440,0,1,1,1,1), -- Amice of the Stoic Watch -(@Auriaya25Ref,45334,0,1,1,1,1), -- Unbreakable Chestguard -(@Auriaya25Ref,45319,0,1,1,1,1), -- Cloak of the Makers -(@Auriaya25Ref,45436,0,1,1,1,1); -- Libram of the Resolute - --- --------------------------- --- -- ASSIGN CREATURE LOOTS -- --- --------------------------- -UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (@Brundir10,@Molgeim10,@Steelbreaker10,@Brundir25,@Molgeim25,@Steelbreaker25,@Auriaya10,@Auriaya25); -DELETE FROM `creature_loot_template` WHERE `entry` IN (@Brundir10,@Molgeim10,@Steelbreaker10,@Brundir25,@Molgeim25,@Steelbreaker25); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ASSEMBLY OF IRON 10-man --- Stormcaller Brundir killed last -(@Brundir10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot -(@Brundir10,47241,100,1,0,1,1), -- 1 Emblem of Triumph --- Runemaster Molgeim killed last -(@Molgeim10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot -(@Molgeim10,47241,100,1,0,2,2), -- 2 Emblem of Triumph -(@Molgeim10,45506,100,2,0,1,1), -- Archivum Data Disc -(@Molgeim10,45087,75,1,0,1,1), -- Runed Orb --- Steelbreaker killed last -(@Steelbreaker10,1,100,1,0,-@Assembly10Ref,2), -- 2 items from reference loot -(@Steelbreaker10,47241,100,1,0,2,2), -- 2 Emblem of Triumph -(@Steelbreaker10,45087,75,1,0,1,1), -- Runed Orb -(@Steelbreaker10,45506,100,1,0,1,1), -- Archivum Data Disc for Quest -(@Steelbreaker10,25455,0,1,1,1,1), -- Belt fo the Crystal Tree -(@Steelbreaker10,45447,0,1,1,1,1), -- Watchful Eye of Fate -(@Steelbreaker10,45456,0,1,1,1,1), -- Loop of the Agile -(@Steelbreaker10,45449,0,1,1,1,1), -- The Masticator -(@Steelbreaker10,45448,0,1,1,1,1), -- Perilous Bite --- ASSEMBLY OF IRON 25-man --- Stormcaller Brundir killed last -(@Brundir25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot -(@Brundir25,2,10,1,0,-34154,1), -- Chance on Recipe -(@Brundir25,45038,8,1,0,1,1), -- Fragment of Val'anyr -(@Brundir25,45087,75,1,0,1,1), -- Runed Orb -(@Brundir25,47241,100,1,0,1,2), -- 2 Emblems of Triumph --- Runemaster Molgeim killed last -(@Molgeim25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot -(@Molgeim25,2,10,1,0,-34154,1), -- Chance on Recipe -(@Molgeim25,45038,8,1,0,1,1), -- Fragment of Val'anyr -(@Molgeim25,45087,75,1,0,1,1), -- Runed Orb -(@Molgeim25,47241,100,1,0,2,2), -- 2 Emblems of Triumph -(@Molgeim25,45506,100,1,0,1,1), -- Archivum Data Disc --- Steelbreaker killed last -(@Steelbreaker25,1,100,1,0,-@Assembly25Ref,3), -- 3 items from reference loot -(@Steelbreaker25,2,10,1,0,-34154,1), -- Chance on Recipe -(@Steelbreaker25,45038,18,1,0,1,1), -- Fragment of Val'anyr -(@Steelbreaker25,45087,75,1,0,2,2), -- 2x Runed Orb -(@Steelbreaker25,47241,100,1,0,2,2), -- 2 Emblems of Triumph -(@Steelbreaker25,45506,100,1,0,1,1), -- Archivum Data Disc -(@Steelbreaker25,45241,0,1,1,1,1), -- Belt of Colossal Rage -(@Steelbreaker25,45242,0,1,1,1,1), -- Drape of Mortal Downfall -(@Steelbreaker25,45607,0,1,1,1,1), -- Fang of Oblivion -(@Steelbreaker25,45244,0,1,1,1,1), -- Greaves of Swift Vengeance -(@Steelbreaker25,45243,0,1,1,1,1), -- Sapphire Amulet of Renewal -(@Steelbreaker25,45245,0,1,1,1,1); -- Shoulderpads of the Intruder - -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@CacheLivingStone10,@CacheLivingStone25); -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- KOLOGARN 10-man -(@CacheLivingStone10,1,100,1,0,-@Kologarn10Ref,2), -- 2 items from reference loot -(@CacheLivingStone10,47241,100,1,0,1,1), -- 1 Emblem of Triumph --- KOLOGARN 25-Man -(@CacheLivingStone25,1,100,1,0,-@Kologarn25Ref,3), -- 3 items from reference loot -(@CacheLivingStone25,2,10,1,0,-34154,1), -- Chance on Recipe -(@CacheLivingStone25,45038,8,1,0,1,1), -- Fragment of Val'anyr -(@CacheLivingStone25,45087,50,1,0,1,1), -- Runed Orb -(@CacheLivingStone25,47241,100,1,0,1,2); -- 2 Emblems of Triumph - -DELETE FROM `creature_loot_template` WHERE `entry` IN (@Auriaya10,@Auriaya25); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- AURIAYA 10-man -(@Auriaya10,1,100,1,0,-@Auriaya10Ref,2), -- 2 items from reference loot -(@Auriaya10,47241,100,1,0,1,1), -- 1 Emblem of Triumph --- AURIAYA 25-man -(@Auriaya25,1,100,1,0,-@Auriaya25Ref,3), -- 3 items from reference loot -(@Auriaya25,2,10,1,0,-34154,1), -- Chance on Recipe -(@Auriaya25,45038,8,1,0,1,1), -- Fragment of Val'anyr -(@Auriaya25,45087,75,1,0,1,1), -- Runed Orb -(@Auriaya25,47241,100,1,0,1,2); -- 2 Emblems of Triumph diff --git a/sql/updates/world/2012_04_01_00_world_creature.sql b/sql/updates/world/2012_04_01_00_world_creature.sql deleted file mode 100644 index f6a42a6ef08..00000000000 --- a/sql/updates/world/2012_04_01_00_world_creature.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Add missing spawns to db -DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); -INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `curhealth`) VALUES -(4764,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,9156), -- Alchemy -(28648,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,9156), -- Blacksmithing -(40266,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,9156), -- Enchanting -(40267,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,9156), -- Engineering -(40470,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,9156), -- Leatherworking -(40471,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,9156), -- Tailoring -(40510,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,9156), -- Jewelcrafting -(40516,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,9156), -- Inscription -(40517,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,9156), -- Herbalism -(40518,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,9156), -- Mining -(40601,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,9156), -- Skinning -(40602,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,9156), -- Cooking -(40603,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,9156), -- First Aid -(41320,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,9156); -- Fishing diff --git a/sql/updates/world/2012_04_01_00_world_spell_script_names.sql b/sql/updates/world/2012_04_01_00_world_spell_script_names.sql deleted file mode 100644 index 9d37f6ad4cb..00000000000 --- a/sql/updates/world/2012_04_01_00_world_spell_script_names.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_spinning_pain_spike'; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(66316,'spell_spinning_pain_spike'), -(67100,'spell_spinning_pain_spike'), -(67101,'spell_spinning_pain_spike'), -(67102,'spell_spinning_pain_spike'); diff --git a/sql/updates/world/2012_04_01_01_world_creature.sql b/sql/updates/world/2012_04_01_01_world_creature.sql deleted file mode 100644 index f6dff34cfa9..00000000000 --- a/sql/updates/world/2012_04_01_01_world_creature.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Re-add deleted data -DELETE FROM `creature` WHERE `guid` IN (4764,28648,40266,40267,40470,40471,40510,40516,40517,40518,40601,40602,40603,41320); -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 -(4764,26796,576,2,1,0,0,424.547,185.962,-34.9367,4.72984,3600,0,0,1,0,0,0,0,0), -(28648,17148,530,1,1,0,0,-2910.22,6473.03,82.4898,2.49669,300,0,0,5914,0,0,0,0,0), -(40267,37671,1,1,1,0,0,1391.2,-4486.23,31.4544,3.3355,300,0,0,42,0,0,0,0,0), -(40470,37671,1,1,1,0,0,1392.66,-4481.87,31.3782,1.97284,300,0,0,42,0,0,0,0,0), -(40471,37671,1,1,1,0,0,1393.92,-4489.57,31.4737,4.93701,300,0,0,42,0,0,0,0,0); - --- Add missing spawns to db (trainers) -DELETE FROM `creature` WHERE `guid` IN (40266,40510,40516,40517,40518,40601,40602,40603,41320,41674,41723,41775,41779,41780); -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`curhealth`) VALUES -(40266,33608,530,1,1,-2263.63,5559.49,67.0918,5.91667,180,0,1), -- Alchemy -(40510,33609,530,1,1,-2262.64,5561.96,67.0948,5.89921,180,0,1), -- Blacksmithing -(40516,33610,530,1,1,-2261.59,5564.54,67.095,5.93412,180,0,1), -- Enchanting -(40517,33611,530,1,1,-2260.64,5567.08,67.092,5.93412,180,0,1), -- Engineering -(40518,33612,530,1,1,-2264.54,5562.77,67.0939,2.79253,180,0,1), -- Leatherworking -(40601,33613,530,1,1,-2265.57,5560.32,67.0911,2.80998,180,0,1), -- Tailoring -(40602,33614,530,1,1,-2263.47,5565.35,67.0937,2.80998,180,0,1), -- Jewelcrafting -(40603,33615,530,1,1,-2262.36,5567.8,67.0909,2.79253,180,0,1), -- Inscription -(41320,33616,530,1,1,-2268.1,5563.18,67.0919,5.89921,180,0,1), -- Herbalism -(41674,33617,530,1,1,-2266.98,5565.78,67.0927,5.89921,180,0,1), -- Mining -(41723,33618,530,1,1,-2265.86,5568.36,67.0911,5.84685,180,0,1), -- Skinning -(41775,33619,530,1,1,-2267.52,5569.19,67.0896,2.74017,180,0,1), -- Cooking -(41779,33621,530,1,1,-2269.93,5564.2,67.09,2.75762,180,0,1), -- First Aid -(41780,33623,530,1,1,-2268.81,5566.68,67.0905,2.74017,180,0,1); -- Fishing diff --git a/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql b/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql deleted file mode 100644 index d42afd1d955..00000000000 --- a/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Greater Blessing of Wisdom and Mana Spring Totem should not stack (hotfix) -SET @GROUP := 1117; -DELETE FROM `spell_group` WHERE id=@GROUP; -INSERT INTO `spell_group`(`id`,`spell_id`) VALUES -(@GROUP,25894), -- Greater Blessing of Wisdom -(@GROUP,5677); -- Mana Spring (cast by Mana Spring Totem) -DELETE FROM `spell_group_stack_rules` WHERE `group_id`=@GROUP; -INSERT INTO `spell_group_stack_rules`(`group_id`,`stack_rule`) VALUES -(@GROUP,3); -- Make them SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT diff --git a/sql/updates/world/2012_04_01_03_world_trainers.sql b/sql/updates/world/2012_04_01_03_world_trainers.sql deleted file mode 100644 index 1edc9ae09af..00000000000 --- a/sql/updates/world/2012_04_01_03_world_trainers.sql +++ /dev/null @@ -1,83 +0,0 @@ --- Template updates -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33608; -- Alchemy -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16/*80*/,`trainer_type`=2 WHERE `entry`=33609; -- Blacksmithing -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33610; -- Enchanting -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33611; -- Engineering -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33612; -- Leatherworking -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33613; -- Tailoring -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33614; -- Jewelcrafting -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33616; -- Herbalism -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33618; -- Skinning (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33617; -- Mining (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33619; -- Cooking (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16 WHERE `entry`=33621; -- First Aid (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33615; -- Inscription (guessed) -UPDATE `creature_template` SET `faction_A`=1744,`faction_H`=1744,`npcflag`=`npcflag`|16,`trainer_type`=2 WHERE `entry`=33623; -- Fishing (guessed) - --- Model data -UPDATE `creature_model_info` SET `bounding_radius`=0.11,`combat_reach`=0,`gender`=2 WHERE `modelid`=28738; -- shared by many -UPDATE `creature_model_info` SET `bounding_radius`=0.14,`combat_reach`=0,`gender`=2 WHERE `modelid`=28758; -- shared by many - --- Addon data -DELETE FROM `creature_template_addon` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); -INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(33608,0,0,1,0, NULL), -- Alchemy -(33609,0,0,1,0, NULL), -- Blacksmithing -(33610,0,0,1,0, NULL), -- Enchanting -(33611,0,0,1,0, NULL), -- Engineering -(33612,0,0,1,0, NULL), -- Leatherworking -(33613,0,0,1,0, NULL), -- Tailoring -(33614,0,0,1,0, NULL), -- Jewelcrafting -(33616,0,0,1,0, NULL), -- Herbalism -(33618,0,0,1,0, NULL), -- Skinning (guessed) -(33617,0,0,1,0, NULL), -- Mining (guessed) -(33619,0,0,1,0, NULL), -- Cooking (guessed) -(33621,0,0,1,0, NULL), -- First Aid (guessed) -(33615,0,0,1,0, NULL), -- Inscription (guessed) -(33623,0,0,1,0, NULL); -- Fishing (guessed) - --- Trainer spells -DELETE FROM `npc_trainer` WHERE `entry` IN (33608,33609,33610,33611,33612,33613,33614,33616,33618,33617,33619,33621,33615,33623); -INSERT INTO `npc_trainer` (`entry`, `spell`, `spellcost`, `reqskill`, `reqskillvalue`, `reqlevel`) VALUES -(33608, -201001, 0, 0, 0, 0), -- Alchemy -(33608, -201002, 0, 0, 0, 0), -- Alchemy -(33608, -201003, 0, 0, 0, 0), -- Alchemy -(33609, -201004, 0, 0, 0, 0), -- Blacksmithing -(33609, -201005, 0, 0, 0, 0), -- Blacksmithing -(33609, -201006, 0, 0, 0, 0), -- Blacksmithing -(33610, -201009, 0, 0, 0, 0), -- Enchanting -(33610, -201010, 0, 0, 0, 0), -- Enchanting -(33610, -201011, 0, 0, 0, 0), -- Enchanting -(33611, -201012, 0, 0, 0, 0), -- Engineering -(33611, -201013, 0, 0, 0, 0), -- Engineering -(33611, -201014, 0, 0, 0, 0), -- Engineering -(33612, -201027, 0, 0, 0, 0), -- Leatherworking -(33612, -201028, 0, 0, 0, 0), -- Leatherworking -(33612, -201029, 0, 0, 0, 0), -- Leatherworking -(33613, -201039, 0, 0, 0, 0), -- Tailoring -(33613, -201040, 0, 0, 0, 0), -- Tailoring -(33613, -201041, 0, 0, 0, 0), -- Tailoring -(33614, -201024, 0, 0, 0, 0), -- Jewelcrafting -(33614, -201025, 0, 0, 0, 0), -- Jewelcrafting -(33614, -201026, 0, 0, 0, 0), -- Jewelcrafting -(33616, -201018, 0, 0, 0, 0), -- Herbalism -(33616, -201019, 0, 0, 0, 0), -- Herbalism -(33616, -201020, 0, 0, 0, 0), -- Herbalism -(33618, -201036, 0, 0, 0, 0), -- Skinning -(33618, -201037, 0, 0, 0, 0), -- Skinning -(33618, -201038, 0, 0, 0, 0), -- Skinning -(33617, -201033, 0, 0, 0, 0), -- Mining -(33617, -201034, 0, 0, 0, 0), -- Mining -(33617, -201035, 0, 0, 0, 0), -- Mining -(33619, -202004, 0, 0, 0, 0), -- Cooking -(33619, -202005, 0, 0, 0, 0), -- Cooking -(33619, -202006, 0, 0, 0, 0), -- Cooking -(33621, -202007, 0, 0, 0, 0), -- First Aid -(33621, -202008, 0, 0, 0, 0), -- First Aid -(33621, -202009, 0, 0, 0, 0), -- First Aid -(33615, -201021, 0, 0, 0, 0), -- Inscription -(33615, -201022, 0, 0, 0, 0), -- Inscription -(33615, -201023, 0, 0, 0, 0), -- Inscription -(33623, -202001, 0, 0, 0, 0), -- Fishing -(33623, -202002, 0, 0, 0, 0), -- Fishing -(33623, -202003, 0, 0, 0, 0); -- Fishing diff --git a/sql/updates/world/2012_04_01_04_world_conditions.sql b/sql/updates/world/2012_04_01_04_world_conditions.sql deleted file mode 100644 index e84307e0b05..00000000000 --- a/sql/updates/world/2012_04_01_04_world_conditions.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Quest: Blending In (11633) --- Spell from Cape only Appliable in City Area -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=45614; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(17,0,45614,11633,23,4125,0,0,0, '', 'Shroud of the Scourge - Temple City of En''kilah'); diff --git a/sql/updates/world/2012_04_01_05_world_creature_template.sql b/sql/updates/world/2012_04_01_05_world_creature_template.sql deleted file mode 100644 index a4d13f1513a..00000000000 --- a/sql/updates/world/2012_04_01_05_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- CREATURE_FLAG_EXTRA_NO_XP_AT_KILL -UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64 WHERE `entry`=21267; -- Mana Beast diff --git a/sql/updates/world/2012_04_01_06_world_sai.sql b/sql/updates/world/2012_04_01_06_world_sai.sql deleted file mode 100644 index 9b8857da1e4..00000000000 --- a/sql/updates/world/2012_04_01_06_world_sai.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Fix quest 11468 - Falcon versus hawk -SET @entry := 24747; -- Fjord Hawk -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,1,8,0,100,0,44407,0,0,0,11,44408,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fjord Hawk - On Spellhit - Cast spell on invoker'), -(@entry,0,1,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fjord Hawk - On Spellhit - Despawn'); diff --git a/sql/updates/world/2012_04_01_07_world_misc.sql b/sql/updates/world/2012_04_01_07_world_misc.sql deleted file mode 100644 index 346627fd88b..00000000000 --- a/sql/updates/world/2012_04_01_07_world_misc.sql +++ /dev/null @@ -1,4 +0,0 @@ -UPDATE `conditions` SET `ElseGroup`=0 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=45614; -- typo fix for previous commit -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=47431; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(17,0,47431,0,23,4195,0,0,64,'','Capture Jormungar Spawn can only be used in Ice Heart Cavern'); diff --git a/sql/updates/world/2012_04_03_00_world_spell_script_names.sql b/sql/updates/world/2012_04_03_00_world_spell_script_names.sql deleted file mode 100644 index 70f675daa20..00000000000 --- a/sql/updates/world/2012_04_03_00_world_spell_script_names.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` = 36444; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(36444, 'spell_gen_wg_water'); diff --git a/sql/updates/world/2012_04_04_00_world_conditions.sql b/sql/updates/world/2012_04_04_00_world_conditions.sql deleted file mode 100644 index 55cab4ca730..00000000000 --- a/sql/updates/world/2012_04_04_00_world_conditions.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Will of Sartharion should only target the drakes and Sartharion -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=61254; -INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13, 1, 61254, 0, 0, 31, 0, 3, 30449, 0, 0, 0, '', 'Will of Sartharion'), -(13, 1, 61254, 0, 1, 31, 0, 3, 30451, 0, 0, 0, '', 'Will of Sartharion'), -(13, 1, 61254, 0, 2, 31, 0, 3, 30452, 0, 0, 0, '', 'Will of Sartharion'), -(13, 1, 61254, 0, 3, 31, 0, 3, 28860, 0, 0, 0, '', 'Will of Sartharion'); diff --git a/sql/updates/world/2012_04_04_01_world_spell_dbc.sql b/sql/updates/world/2012_04_04_01_world_spell_dbc.sql deleted file mode 100644 index 7eccdf811e4..00000000000 --- a/sql/updates/world/2012_04_04_01_world_spell_dbc.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `spell_dbc` SET `EffectApplyAuraName1`=4 WHERE `Id`=56817; diff --git a/sql/updates/world/2012_04_05_00_world_gameobject_template.sql b/sql/updates/world/2012_04_05_00_world_gameobject_template.sql deleted file mode 100644 index d50c4ad8d1c..00000000000 --- a/sql/updates/world/2012_04_05_00_world_gameobject_template.sql +++ /dev/null @@ -1,32 +0,0 @@ -DELETE FROM `gameobject_template` WHERE `entry`=202931; -INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `data0`, `data1`, `data2`, `data3`, `data4`, `data5`, `data6`, `data7`, `data8`, `data9`, `data10`, `data11`, `data12`, `data13`, `data14`, `data15`, `data16`, `data17`, `data18`, `data19`, `data20`, `data21`, `data22`, `data23`, `size`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `WDBVerified`) VALUES -(202931, 5, 9463, 'Serpent Offering', '', '', '', 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.17, 0, 0, 0, 0, 0, 0, 12340); -- -Unknown- - -UPDATE `gameobject_template` SET `questItem1`=30527, `questItem2`=30524, `questItem3`=30525, `questItem4`=30526 WHERE `entry`=184815; -- Sealed Coffin --- UPDATE `gameobject_template` SET `data0`=2061, `WDBVerified`=12340 WHERE `entry`=151951; -- Idol Oven Fire --- UPDATE `gameobject_template` SET `type`=5, `data3`=0, `data5`=0 WHERE `entry`=188187; -- Snow Pile -UPDATE `gameobject_template` SET `size`=0.45 WHERE `entry`=190169; -- Tiger Lily -UPDATE `gameobject_template` SET `unk1`='' WHERE `entry`=190549; -- The Zephyr --- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=191300; -- Fire -UPDATE `gameobject_template` SET `displayId`=7836 WHERE `entry`=196485; -- Saronite Rock --- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126337; -- 126337 --- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126338; -- 126338 --- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126339; -- 126339 --- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126340; -- 126340 --- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126341; -- 126341 --- UPDATE `gameobject_template` SET `data0`=2061 WHERE `entry`=126345; -- 126345 -UPDATE `gameobject_template` SET `data2`=23787, `data7`=3605, `data19`=0 WHERE `entry`=202443; -- Dedication of Honor -UPDATE `gameobject_template` SET `type`=10 WHERE `entry`=166872; -- Supply Crate -UPDATE `gameobject_template` SET `data6`=-1000 WHERE `entry`=178559; -- Larva Spewer - -/* -GameObject (Entry: 126337 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -GameObject (Entry: 126338 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -GameObject (Entry: 126339 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -GameObject (Entry: 126340 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -GameObject (Entry: 126341 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -GameObject (Entry: 126345 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -GameObject (Entry: 151951 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -GameObject (Entry: 191300 GoType: 8) have data0=2061 but SpellFocus (Id: 2061) not exist. -Gameobject (Entry: 188192 GoType: 3) have data7=188187 but GO (Entry 188187) have not GAMEOBJECT_TYPE_TRAP (6) type. -*/ diff --git a/sql/updates/world/2012_04_05_00_world_spell_script_names.sql b/sql/updates/world/2012_04_05_00_world_spell_script_names.sql deleted file mode 100644 index 43f6760e8d6..00000000000 --- a/sql/updates/world/2012_04_05_00_world_spell_script_names.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` in (7384,7887,11584,11585); -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(7384, 'spell_warr_overpower'), -(7887, 'spell_warr_overpower'), -(11584, 'spell_warr_overpower'), -(11585, 'spell_warr_overpower'); diff --git a/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql b/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql deleted file mode 100644 index 076f97b8736..00000000000 --- a/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE `spell_proc_event` SET `SpellFamilyMask0`=0x80000000, `SpellFamilyMask1`=0 WHERE `entry`=67363; -- Fixes Libram of Veracity proc - diff --git a/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql b/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql deleted file mode 100644 index 0fba3bb46d6..00000000000 --- a/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `spell_proc_event` SET `SpellFamilyMask0`=0x10 WHERE `entry`=60132; -- Oblit/Scourge Strike Runic Power Up (T7 4s) diff --git a/sql/updates/world/2012_04_06_01_world_spell_dbc.sql b/sql/updates/world/2012_04_06_01_world_spell_dbc.sql deleted file mode 100644 index c0dc38ebf83..00000000000 --- a/sql/updates/world/2012_04_06_01_world_spell_dbc.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_dbc` WHERE `Id`=64748; -- Item - Death Knight T8 Tank 4P Bonus -INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES -(64748,1,0,384,0,0,0,0,131080,0,0,0,0,0,1,0,0,101,0,0,80,80,28,1,0,-1,0,0,6,0,0,1,0,1,'0','0','0',-11,0,-11,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16777829,0,0,0,15,0,0,0,0,0,0,'1','1','1',0,32,'Item - Death Knight T8 Tank 4P Bonus'); diff --git a/sql/updates/world/2012_04_06_02_world_gameobject_template.sql b/sql/updates/world/2012_04_06_02_world_gameobject_template.sql deleted file mode 100644 index 5089579998d..00000000000 --- a/sql/updates/world/2012_04_06_02_world_gameobject_template.sql +++ /dev/null @@ -1,4 +0,0 @@ --- GO required by spell 70477 - Cleanse Quel'Delar -DELETE FROM `gameobject_template` WHERE `entry`=300246; -INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `faction`, `flags`, `size`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `data0`, `data1`, `data2`, `data3`, `data4`, `data5`, `data6`, `data7`, `data8`, `data9`, `data10`, `data11`, `data12`, `data13`, `data14`, `data15`, `data16`, `data17`, `data18`, `data19`, `data20`, `data21`, `data22`, `data23`, `AIName`, `ScriptName`, `WDBVerified`) VALUES -(300246, 8, 0, 'TEMP Sunwell', '', '', '', 0, 0, 1, 0, 0, 0, 0, 0, 0, 1641, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', 1); diff --git a/sql/updates/world/2012_04_06_03_world_spell_dbc.sql b/sql/updates/world/2012_04_06_03_world_spell_dbc.sql deleted file mode 100644 index 90ac4ac0f51..00000000000 --- a/sql/updates/world/2012_04_06_03_world_spell_dbc.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_dbc` WHERE `Id`=64934; -- Item - Warrior T8 Protection 4P Bonus -INSERT INTO `spell_dbc`(`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES -(64934,1,0,384,0,0,0,0,131080,0,0,0,0,0,1,0,0,101,0,0,80,80,28,1,0,-1,0,0,6,0,0,1,0,1,'0','0','0',-21,0,-11,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16777829,0,0,0,4,0,0,0,0,0,0,'1','1','1',0,32, 'Item - Warrior T8 Protection 4P Bonus'); diff --git a/sql/updates/world/2012_04_06_04_world_page_text.sql b/sql/updates/world/2012_04_06_04_world_page_text.sql deleted file mode 100644 index 97c0d9afe2d..00000000000 --- a/sql/updates/world/2012_04_06_04_world_page_text.sql +++ /dev/null @@ -1,25 +0,0 @@ -DELETE FROM `page_text` WHERE entry IN (2177,2295,2296,2297,2301,2302,2303,2308,2309,3036,3045,3046,3047,3049,3050,3051,3052,3053,3378,3544,3563,3564,3565); -INSERT INTO `page_text` (`entry`, `text`, `next_page`) VALUES -(2177, 'Valea Twinblades \nWarrior of the Scarlet Crusade\nCitizen of Alterac \nLast seen deep in the Eastern Plaguelands', 0), -(2295, 'Before the Age of Memory, the gentle Earthmother breathed upon the golden mists of dawn. Where the amber clouds came to rest, there were endless fields of flowing wheat and barley. This was the basin of her works - the great basket of life and hope.', 2296), -(2296, 'The Earthmother\'s eyes shone down upon the lands she had breathed into creation. Her right eye, An\'she (the sun), gave warmth and light to the land. Her left eye, Mu\'sha (the moon), gave peace and sleep to the stirring creatures of the dawning. Such was the power of her gaze that the Earthmother closed one dreaming eye for every turning of the sky. Thus, her loving gaze turned day into night for the first dawning of the world. $B', 2297), -(2297, 'While the right eye shone down upon the golden dawn, the Earthmother\'s gentle hands spread out across the golden plains. Wherever the shadow of her arms passed, a noble people arose from the rich soil. The Shu\'halo (the tauren) arose to give thanks and prayer to their loving mother. There, in the endless fields of dawn, the children of the earth swore themselves to her grace and vowed to bless her name until the final darkening of the world.', 0), -(2301, 'Into the brave hearts of her pure children, the Earthmother placed the love of the hunt. For the creatures of the first dawn were savage and fierce. They hid from the Earthmother, finding solace in the shadows and the wild places of the land. The Shu\'halo hunted these beasts wherever they could be found and tamed them with the Earthmother\'s blessing. ', 2302), -(2302, 'One great spirit eluded them, however. Apa\'ro (known as Malorne to the night elves), was a proud stag of snow white fur. His antlers scraped the roof of the heavens and his mighty hooves stamped out the deep places of the world. The Shu\'halo hunted Apa\'ro to the corners of the dawning world - and closed in to snare the proud stag.', 2303), -(2303, 'Seeking to escape, the great stag leapt into the sky. Yet, as his escape seemed assured, his mighty antlers tangled in the stars which held him fast. Though he kicked and struggled, Apa\'ro could not loose himself from the heavens. It was then that Mu\'sha found him as she chased her brother, An\'she, towards the dawn. Mu\'sha saw the mighty stag as he struggled and fell in love with him immediately. ', 2304), -(2308, 'As the mists of dawn faded and the Age of Memory advanced, the demigod, Cenarius, went his own way through the fields of the world. The Shu\'halo (tauren) were sorrowful at his passing and forgot much of the druidism he had taught them. As the generations passed, they forgot how to speak with the trees and the wild things of the land. The dark whispers from the deeps of the world drifted up to their ears once again.', 2309), -(2309, 'Though the children of the earth closed out the evil whisperings, a terrible curse befell their roaming tribes. Out of the black lands of the west came a horde of murderous creatures - the centaur. Cannibals and ravagers, the centaur fell upon the Shu\'halo like a plague. Though the braves and hunters fought with the Earthmother\'s blessing in their hearts, the centaur could not be defeated.', 2310), -(3544, 'You have found the wreckage of a mysterious object. Beyond the flames, you are able to make out an insignia marked "M:1815212085". You wonder what world this object must be from...', 0), -(3378, 'INVINCIBLE$B$BBeloved steed of Prince Arthas Menethil$B$BLoyal and great of heart in life, may you find peace in death.$B$BPure streams and green pastures, devoted friend.', 0), -(3565, 'Gritting his teeth, Marcus gestured as light flashed over him, restoring his strength.$B$BTavi stared anxiously as he rose to his full height, engulfing her in his shadow. He thrust his hand forward, sending a wave of righteous force through her. Eyes rolled back as she wavered for several seconds before regaining consciousness.$B$B"I\'ve recently taken the path of... retribution."$B$BThe mischievous smirk returned to her face, "Well then, this is going to be fun."$B$B', 0), -(3564, 'Marcus took both her hands in one of his as he reassured her, "It\'s fine. What is your specialization?"$B$BHer head snapped up, eyes burning with renewed life as shadowy energy channeled through her hands into Marcus, dropping him to his knees in agony.$B$B"Affliction, actually."$B', 3565), -(3563, '"Interested in some more company?" she purred as her hands weaved through a complex summoning ritual, stopping only when she felt the warmth of a new presence behind her.$B$BAll color drained from Marcus\'s face as he struggled to protest. "I... I don\'t think that\'s appropriate."$B$BConfused, Tavi turned to see what was wrong. A hideous fel hound stood ready, drooling onto the floor as it stared intently at the half-armored paladin.$B$B"No! No that\'s not what I meant." she stammered as she dispelled the hungry demon. "I\'m sorry, that\'s not really my specialization...."', 3564), -(3045, 'First Watch, Eight Bells$BWatches changed. All is well.', 3046), -(3046, 'Middle Watch, One Bell$BCedric found attempting to break into Captain\'s wine cabinet. Disciplined.', 3047), -(3047, 'Middle Watch, Two Bells$BCedric climbed rigging, became tangled and fell. Attended by ship\'s surgeon. Sent below to sober up.', 3049), -(3049, 'Middle Watch, Four Bells$BBottle of rum found in Cedric\'s pants. Disciplined.', 3050), -(3050, 'Middle Watch, Five Bells$BCedric\'s clothes found. Cedric found separately. Cedric disciplined.', 3051), -(3051, 'Middle Watch, Six Bells$BCedric singing loudly. Woke Captain. Cedric disciplined by Captain.', 3052), -(3052, 'Middle Watch, Eight Bells$BWatches changed. All quiet. Two men sent to locate Cedric.$B', 3053), -(3053, 'Morning Watch, One Bell$BFire in Captain\'s quarters. All hands roused. Throwing powder overboard. ', 0), -(3036, 'The mighty creature\'s maw opened wide, tossing bolts of icy water toward our vessel. Those terrible jaws clamped down upon the bow of our ship, tearing it from the hull. Sailors and cargo were thrown violently into the sea as the remnants of the ship disappeared beneath the waves.$B$BThe last thing I remember was flying from the broken hull, hitting the inky waters, and plunging beneath the waves. The world went dark and I thought for certain I\'d drawn my last breath. When I awoke in Theramore\'s infirmary, I knew someone had to tell our story.', 0); diff --git a/sql/updates/world/2012_04_07_00_world_gameobject.sql b/sql/updates/world/2012_04_07_00_world_gameobject.sql deleted file mode 100644 index c63fc753d32..00000000000 --- a/sql/updates/world/2012_04_07_00_world_gameobject.sql +++ /dev/null @@ -1,5 +0,0 @@ -UPDATE `gameobject_template` SET `faction`=54 WHERE `entry`=178164; -SET @GUID := 247; -DELETE FROM `gameobject` WHERE `guid`=@GUID; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES -(@GUID,178164,409,1,1,736.6528,-1176.32,-118.0967,-0.6806787,0,0,0,1,120,255,1); -- Hot Coal, damage diff --git a/sql/updates/world/2012_04_07_01_world_game_event.sql b/sql/updates/world/2012_04_07_01_world_game_event.sql deleted file mode 100644 index 7b74a90b49d..00000000000 --- a/sql/updates/world/2012_04_07_01_world_game_event.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE `game_event` SET `start_time` = '2012-04-08 00:01:00' WHERE `eventEntry` =9; -- Noblegarden -UPDATE `game_event` SET `start_time` = '2012-04-29 00:01:00' WHERE `eventEntry` =10; -- Children's Week diff --git a/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql b/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql deleted file mode 100644 index 62ef49bc657..00000000000 --- a/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `spell_proc_event` SET `procFlags`=0 WHERE `entry`=70805; diff --git a/sql/updates/world/2012_04_08_00_world_spell_script_names.sql b/sql/updates/world/2012_04_08_00_world_spell_script_names.sql deleted file mode 100644 index ca97f419e11..00000000000 --- a/sql/updates/world/2012_04_08_00_world_spell_script_names.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb_dummy'; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(69712,'spell_sindragosa_ice_tomb_dummy'); diff --git a/sql/updates/world/2012_04_08_01_world_creature_template.sql b/sql/updates/world/2012_04_08_01_world_creature_template.sql deleted file mode 100644 index c6665729b75..00000000000 --- a/sql/updates/world/2012_04_08_01_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Gymer -UPDATE `creature_template` SET `unit_class`=4,`spell1`=55426,`spell2`=55429,`spell3`=55516,`spell4`=55421,`VehicleId`=205 WHERE `entry`=29884; diff --git a/sql/updates/world/2012_04_08_02_world_spell_dbc.sql b/sql/updates/world/2012_04_08_02_world_spell_dbc.sql deleted file mode 100644 index 5775428668d..00000000000 --- a/sql/updates/world/2012_04_08_02_world_spell_dbc.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_dbc` WHERE `Id`=31934; -- Blessed Life -INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES -(31934,0,0,384,0,0,0,0,0,0,0,131072,0,0,1,0,1048576,100,1,0,0,0,21,1,0,-1,0,0,6,0,0,1,0,0,'0','0','0',-51,0,0,0,0,0,1,0,0,0,0,0,0,0,0,87,0,0,0,0,0,'0','0','0',127,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,'1','0','0',0,0,'Blessed Life'); diff --git a/sql/updates/world/2012_04_08_02_world_spell_script_names.sql b/sql/updates/world/2012_04_08_02_world_spell_script_names.sql deleted file mode 100644 index dd23c9ef560..00000000000 --- a/sql/updates/world/2012_04_08_02_world_spell_script_names.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_mystic_buffet'; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(70127,'spell_sindragosa_mystic_buffet'), -(72528,'spell_sindragosa_mystic_buffet'), -(72529,'spell_sindragosa_mystic_buffet'), -(72530,'spell_sindragosa_mystic_buffet'); diff --git a/sql/updates/world/2012_04_08_03_world_spell_script_names.sql b/sql/updates/world/2012_04_08_03_world_spell_script_names.sql deleted file mode 100644 index 744a8bad10d..00000000000 --- a/sql/updates/world/2012_04_08_03_world_spell_script_names.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id`=-1064; -INSERT INTO `spell_script_names` VALUES -(-1064, 'spell_sha_chain_heal'); diff --git a/sql/updates/world/2012_04_12_00_world_creature_template.sql b/sql/updates/world/2012_04_12_00_world_creature_template.sql deleted file mode 100644 index ef4596939f5..00000000000 --- a/sql/updates/world/2012_04_12_00_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Update proper modelid for Celestial Steed (31957 is wrong) -UPDATE `creature_template` SET `modelid1`=31958,`modelid2`=0 WHERE `entry`=40625; diff --git a/sql/updates/world/2012_04_12_01_world_creature_template.sql b/sql/updates/world/2012_04_12_01_world_creature_template.sql deleted file mode 100644 index bfe7b698ae9..00000000000 --- a/sql/updates/world/2012_04_12_01_world_creature_template.sql +++ /dev/null @@ -1,6 +0,0 @@ -UPDATE `creature_template` SET `WDBVerified`=12340 WHERE `entry`=40624; -- Verified - --- Remove temp entry 68686 and replace with wdb verified 38686 -UPDATE `creature_template` SET `difficulty_entry_3`=38686 WHERE `entry`=36950; -UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`exp`=2,`faction_A`=84,`faction_H`=84,`mindmg`=488,`maxdmg`=642,`attackpower`=782,`unit_flags`=32832,`dynamicflags`=8,`minrangedmg`=363,`maxrangedmg`=521,`rangedattackpower`=121 WHERE `entry`=38686; -DELETE FROM `creature_template` WHERE `entry`=68686; diff --git a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql b/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql deleted file mode 100644 index db35f5d97ee..00000000000 --- a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Druid -UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (779,1822,60089); -DELETE FROM `spell_bonus_data` WHERE `entry` IN (1079,9007,22568); -INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES -(1079,0,0,-1,-1, 'Druid - Rip'), -(9007,0,0,-1,-1, 'Druid - Pounce Bleed'), -(22568,0,0,-1,-1, 'Druid - Ferocious Bite'); - --- Hunter -UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (3044,3674,53352,13812,13797,1978,42243); -UPDATE `spell_bonus_data` SET `ap_dot_bonus`=0.1 WHERE `entry`=13812; -DELETE FROM `spell_bonus_data` WHERE `entry` IN (24131,53353); -INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES -(24131,0,0,-1,-1, 'Hunter - Wyvern Sting (triggered)'), -(53353,0,0,-1,-1, 'Hunter - Chimera Shot (Serpent)'); -DELETE FROM `spell_ranks` WHERE `first_spell_id`=24131; -INSERT INTO `spell_ranks` VALUES -(24131,24131,1), -(24131,24134,2), -(24131,24135,3), -(24131,27069,4), -(24131,49009,5), -(24131,49010,6); - --- Rogue -UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (2818,2819,11353,11354,25349,26968,27187,57969,57970); - --- Howling blast -UPDATE `spell_bonus_data` SET `ap_bonus`=0.2 WHERE `entry`=49184; diff --git a/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql b/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql deleted file mode 100644 index d2262e52e98..00000000000 --- a/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Fixes some spell power stacking exploits -DELETE FROM `spell_bonus_data` WHERE `entry` IN (44525,18798,16614,7712,13897); -INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES -(44525,0,0,-1,-1, 'Enchant Weapon - Icebreaker'), -(18798,0,0,-1,-1, 'Item - Freezing Band'), -(16614,0,0,-1,-1, 'Item - Storm Gauntlets'), -(7712,0,0,-1,-1, 'Item - Fiery Retributer | Blazefury Medallion'), -(13897,0,0,-1,-1, 'Enchant Weapon - Fiery Weapon'); diff --git a/sql/updates/world/2012_04_12_04_world_creature_template.sql b/sql/updates/world/2012_04_12_04_world_creature_template.sql deleted file mode 100644 index 35664ec5198..00000000000 --- a/sql/updates/world/2012_04_12_04_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Update modelid for Invincible (with not bugged animation) -UPDATE `creature_template` SET `modelid1`=31007,`modelid2`=0,`WDBVerified`=-12340 WHERE `entry`=38545; diff --git a/sql/updates/world/2012_04_12_05_world_command.sql b/sql/updates/world/2012_04_12_05_world_command.sql deleted file mode 100644 index 8eb87155cb2..00000000000 --- a/sql/updates/world/2012_04_12_05_world_command.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM `trinity_string` WHERE `entry` IN(555,556); -DELETE FROM `command` WHERE `name`='hover'; diff --git a/sql/updates/world/2012_04_13_00_world_sai.sql b/sql/updates/world/2012_04_13_00_world_sai.sql deleted file mode 100644 index 0fd4bdddd9b..00000000000 --- a/sql/updates/world/2012_04_13_00_world_sai.sql +++ /dev/null @@ -1,25 +0,0 @@ -UPDATE `smart_scripts` SET `target_type`=`action_param6` WHERE -(`entryorguid`=369200 AND `source_type`=9 AND `id`=3) OR -(`entryorguid`=369201 AND `source_type`=9 AND `id`=3) OR -(`entryorguid`=3692 AND `source_type`=0 AND `id`=2) OR -(`entryorguid`=3692 AND `source_type`=0 AND `id`=3) OR -(`entryorguid`=3584 AND `source_type`=0 AND `id`=3) OR -(`entryorguid`=3584 AND `source_type`=0 AND `id`=4) OR -(`entryorguid`=954600 AND `source_type`=9 AND `id`=2) OR -(`entryorguid`=954600 AND `source_type`=9 AND `id`=3) OR -(`entryorguid`=7207 AND `source_type`=0 AND `id`=1) OR -(`entryorguid`=7207 AND `source_type`=0 AND `id`=2) OR -(`entryorguid`=911700 AND `source_type`=9 AND `id`=3); - -UPDATE `smart_scripts` SET `action_param6`=0 WHERE -(`entryorguid`=369200 AND `source_type`=9 AND `id`=3) OR -(`entryorguid`=369201 AND `source_type`=9 AND `id`=3) OR -(`entryorguid`=3692 AND `source_type`=0 AND `id`=2) OR -(`entryorguid`=3692 AND `source_type`=0 AND `id`=3) OR -(`entryorguid`=3584 AND `source_type`=0 AND `id`=3) OR -(`entryorguid`=3584 AND `source_type`=0 AND `id`=4) OR -(`entryorguid`=954600 AND `source_type`=9 AND `id`=2) OR -(`entryorguid`=954600 AND `source_type`=9 AND `id`=3) OR -(`entryorguid`=7207 AND `source_type`=0 AND `id`=1) OR -(`entryorguid`=7207 AND `source_type`=0 AND `id`=2) OR -(`entryorguid`=911700 AND `source_type`=9 AND `id`=3); diff --git a/sql/updates/world/2012_04_13_01_world_misc.sql b/sql/updates/world/2012_04_13_01_world_misc.sql deleted file mode 100644 index e4d04449a3f..00000000000 --- a/sql/updates/world/2012_04_13_01_world_misc.sql +++ /dev/null @@ -1,219 +0,0 @@ --- Gnomish Playback Device (item 52709) Targeting condition -- by norfik closes #2169 -DELETE FROM `conditions` WHERE `SourceEntry`=74222 AND `ConditionValue2` IN (1268, 7955, 6119); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES -(17, 0, 74222, 1, 31, 3, 1268, 0, 63, '', 'Gnomish Playback Device on Ozzie Togglevolt'), -(17, 0, 74222, 2, 31, 3, 7955, 0, 63, '', 'Gnomish Playback Device on Milli Featherwhistle'), -(17, 0, 74222, 3, 31, 3, 6119, 0, 63, '', 'Gnomish Playback Device on Tog Rustsprocket'); - --- fix revenge ap coeff -- by ric101 closes #3344 -UPDATE `spell_bonus_data` SET `ap_bonus` = 0.310 WHERE `entry` = 6572; - --- fix life seed sp coeff -- by warpten closes #4162 -DELETE FROM `spell_bonus_data` WHERE `entry`=48503; -INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES -(48503,0,0,0,0, 'Druid - Living Seed Heal'); - --- fix glyph of shadowflame proc only allow on damage. by kandera closes #3530 -UPDATE `spell_proc_event` SET `procEx` = procEx|262144 WHERE`entry` = 63310; -- Glyph of shadowflame fix - --- Disable deprecated quests /in 2.4/ from Midsummer Festival - The Festival of Fire {A/H} by trista closes #5982 -DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (9367,9368); -INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES -(1,9367,0,0,0,'Disable quest The Festival of Fire {A}/Deprecated after 2.4 Midsummer Festival revamp/'), -(1,9368,0,0,0,'Disable quest The Festival of Fire {H}/Deprecated after 2.4 Midsummer Festival revamp/'); - --- fix gameobject spawn for just maces sign -- by mrsmite closes #5849 -DELETE FROM `gameobject` WHERE `guid` = 10714; -UPDATE `gameobject` SET `guid` = 10714 WHERE `guid` = 61895 AND `id` = 2157; - --- update npc texts. by helias closes #6098 -DELETE FROM `npc_text` WHERE `ID` IN (10719,10782,10783,10787,10788,2838,9072,9110,10310,13293,13641,14089,15077,15155,15240,15412,15866,15873,15877,8663,8244,8254,8255,8282,8291,8296,8298,11093,3464,4776,4713,12130,13002,9984,12977,12978,10918,10999,10986,10991); -INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `lang0`, `prob0`, `em0_0`, `em0_1`, `em0_2`, `em0_3`, `em0_4`, `em0_5`) VALUES -(10719, '$B$BWorry not, child. Look in your pack and you will find it once more.', NULL, 0, 1, 0, 0, 0, 0, 0, 0), -(10782, 'Sayoc, da ugly orc here, teach you daggers. You want teaching in other places, you talk to Ileda in da Farstrider Square of Silvermoon or Archibald in the War Quarter of Undercity, hokay?', 'Sayoc, da ugly orc here, teach you daggers. You want teaching in other places, you talk to Ileda in da Farstrider Square of Silvermoon or Archibald in the War Quarter of Undercity, hokay?', 1, 1, 0, 0, 0, 0, 0, 0), -(10783, 'You want to punch things, yah? Talk to Sayoc right here. He teach you.', 'You want to punch things, yah? Talk to Sayoc right here. He teach you.', 1, 1, 0, 0, 0, 0, 0, 0), -(10787, 'Ileda of da blood elves, in Farstrider Square of Silvermoon, train her students in both one and two-handed swords. Archibald, da Undercity"s weapon master, also train you, mon. He in da War Quarter.', 'Ileda of da blood elves, in Farstrider Square of Silvermoon, train her students in both one and two-handed swords. Archibald, da Undercity"s weapon master, also train you, mon. He in da War Quarter.', 1, 1, 0, 0, 0, 0, 0, 0), -(10788, 'Hanashi here knows staves. If you want a sturdier instructor, go to Thunder Bluff. Ansekhwa will teach you on the lower central rise there.', '', 1, 1, 0, 0, 0, 0, 0, 0), -(2838, '', 'Sure thing, $N. Here"s another for you.', 0, 1, 0, 0, 0, 0, 0, 0), -(9072, 'A search of the corpse"s clothing and equipment reveals the insignia you need, undamaged by the battle and foul environment.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(9110, 'Say, you happen to see that arch in the lake to the west? I wonder where that goes? I should go divin" over there.', '', 0, 1, 0, 1, 0, 0, 0, 0), -(10310, 'You must be exalted with the blood elves before I will teach you a riding skill, $c.', '', 1, 1, 0, 1, 0, 0, 0, 0), -(13293, 'Please hurry, $N. I am in a great deal of pain and time is running out.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(13641, '', '', 0, 1, 0, 0, 0, 0, 0, 0), -(14089, 'I"ve got a lead on Norgannon"s keystone, which guards access to Ulduar"s archives, but the Titans divided it into two pieces and secreted them away.$B$BOne of the pieces, the keystone"s shell, is held within the Inventor"s Library on the northern coast, south of Ulduar itself. The first thing you"ll need to do is retrieve the fragments of an access disk from the library"s guardians.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(15077, 'There you are! I was beginning to think that the Sunreavers had intercepted you. Are you ready to deliver the tome to our representatives in Icecrown?', '', 0, 1, 0, 0, 0, 0, 0, 0), -(15155, 'These appear to be the remains of Thalorien Dawnseeker, the last wielder of Quel"Delar.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(15240, 'I will escort you into the Sunwell when you"re ready.', 'I will escort you into the Sunwell when you"re ready.', 0, 1, 0, 0, 0, 0, 0, 0), -(15412, 'We got the final barrier blockin" entry to Frostwing Halls down, $g lad:lass;. Only Sindragosa stands between the Lich King and divine retribution! What are ye waitin" for?!', '', 0, 1, 0, 5, 0, 0, 0, 0), -(15866, 'De Darkspears have a home again! An" we couldn"t have done it wit"out ya helpin", $N. Now, we celebrate!', '', 0, 1, 0, 1, 0, 1, 0, 0), -(15873, 'Vol"jin told me ta keep hittin" da drum till he gets back. If ya be waitin" for him, he"d be back soon to take back da Isles.$B$BJust wait here and enjoy da music!', '', 0, 1, 0, 0, 0, 0, 0, 0), -(15877, 'We require da help of allies on da islands.$B$BZen"tabra has been watching over da animals of de Islands for some time now. We"d need her help and da help of da animal creatures.$B$BBwonsamdi is a powerful loa dat controls de spirits of de dead on da islands. His blessing is crucial for our attack.$B$BOnce our allies have joined us, Zalazane and his army of mind-controlled trolls will have no chance! Then, da Echo Isles will be de Darkspears!', '', 0, 1, 0, 0, 0, 0, 0, 0), -(8663, 'Thank you for delivering that list! My leg is almost recovered enough that I"ll be able to walk back to the crash site.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(8244, 'We"ve been so wrapped up in this war, some of us forgot to make time for love.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(8254, 'You work with machines for so long, sometimes you forget about real hearts.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(8255, '', 'When you have lived as long as I, it becomes easy to forget about love for years. It is always good to be reminded.', 0, 1, 0, 0, 0, 0, 0, 0), -(8282, '', 'You look like you"ve had your heart broken. Come back when you"re not so sad.', 0, 1, 0, 25, 0, 153, 0, 0), -(8291, 'What, you don"t have a token to give me? Don"t you love me?', '', 0, 1, 0, 18, 0, 0, 0, 0), -(8296, 'It looks like you"ve already found love. You can give me a love token, but I"m not giving you anything nice. I"m waiting for someone special.', 'It looks like you"ve already found love. You can give me a love token, but I"m not giving you anything nice. I"m waiting for someone special.', 0, 1, 0, 1, 0, 0, 0, 0), -(8298, 'I"d like you better if you would apply some perfume.', 'I"d like you better if you would apply some perfume.', 0, 1, 0, 24, 0, 0, 0, 0), -(11093, 'Let"s get out of here!', '', 0, 1, 0, 5, 0, 0, 0, 0), -(3464, '', 'You do fine work, but it"s a bit rough around the edges. Don"t worry about it, it will come with practice. Speaking of which, how about we see what you"ve been working on?', 7, 1, 0, 0, 0, 0, 0, 0), -(4776, 'The battle is over, and the people of Darrowshire are saved.', '', 0, 1, 0, 0, 0, 0, 0, 0), -(4713, 'The Nightmare is finally over! Darrowshire, forgive me!', '', 0, 1, 0, 15, 0, 0, 0, 0), -(12130, '', '', 0, 1, 0, 0, 0, 0, 0, 0), -(13002, 'There ya go, mon. Try ta be more careful with this one, won"t ya?$b$bNow head down ta Drak"Zin Ruins and drink it near the pedestal!', NULL, 0, 1, 0, 0, 0, 0, 0, 0), -(9984, 'What are ye doin" here?! Get yer chatty self ta Alterac Vallery, where ye"re needed!', '', 7, 1, 1, 5, 0, 0, 0, 0), -(12977, 'Blight, Blight, Blight... that"s all I hear about around here. I miss the diversity!$b$bHere, here. You have pets, yes? Of course you do. Of course. Little pets. I have a mixture for them. It will make them ca-- ah, clever and strong creatures, yes. Yes. ', '', 1, 1, 396, 5, 0, 0, 0, 0), -(12978, 'Careful with it. It"s unstable and loses its potency quickly. Use it soon! And... preferably within eyesight, yes...', '', 1, 1, 5, 0, 0, 0, 0, 0), -(10918, 'The boy"s too stupid still to say it -- not enough crystal exposure yet -- but, he"s thankful for what you did in getting him those flasks.$B$BNow, only nine more sons to go. Gah!$B$B$B$BWant to take one of them off of our hands? We"ll sell him to you cheap.', '', 0, 1, 0, 1, 0, 5, 0, 6), -(10999, 'Friend! It"s been too long. What can we get for you?', '', 0, 1, 1, 1, 0, 0, 0, 0), -(10986, 'Our drinks should quench even the mightiest of thirsts.', '', 0, 1, 1, 396, 0, 0, 0, 0), -(10991, 'What can I say, $N? Yer the finest o" the Sha"tari Skyguard!$B$BJust don"t be lettin" that go ta yer head. I can still teach ya a thing or two, $G lad : lass;!$B$B', '', 0, 0, 0, 0, 0, 0, 0, 0); - --- Fix Kor'kron War Rider flying by trista closes #5569 -UPDATE `creature_template` SET `inhabittype`=5,`speed_walk`=1, `speed_run`=1 WHERE `entry`=26813; - --- Gretta the Arbiter (Storm Peaks, Brunhilldar) by mweinelt closes #5493 --- Daily Quest Pooling --- Source: http://www.wowwiki.com/Gretta_the_Arbiter -SET @pool_id := 354; - -DELETE FROM `pool_template` WHERE `entry` = @pool_id; -INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES -(@pool_id, 1, 'Gretta the Arbiter - Daily Quests'); - -DELETE FROM `pool_quest` WHERE `entry` IN (13424, 13423, 13422, 13425); -INSERT INTO `pool_quest` (`entry`, `pool_entry`, `description`) VALUES -(13424, @pool_id, 'Back to the Pit'), -(13423, @pool_id, 'Defending Your Title'), -(13422, @pool_id, 'Maintaining Discipline'), -(13425, @pool_id, 'The Aberrations Must Die'); - --- Pathing for Arzeth the Merciless Entry: 19354 by kiperr closes #5510 -SET @NPC := 69051; -SET @PATH := @NPC * 10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-617.6182,`position_y`=4800.323,`position_z`=38.53064 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,-546.5514,4799.893,33.83914,0,0,0,100,0), -(@PATH,2,-512.5808,4799.929,32.09928,0,0,0,100,0), -(@PATH,3,-480.9247,4799.97,28.25657,0,0,0,100,0), -(@PATH,4,-512.6269,4799.873,32.09928,0,0,0,100,0), -(@PATH,5,-542.1885,4799.724,33.71414,0,0,0,100,0), -(@PATH,6,-570.3811,4800.449,34.60215,0,0,0,100,0), -(@PATH,7,-592.3809,4800.299,35.85215,0,0,0,100,0), -(@PATH,8,-617.6182,4800.323,38.53064,0,0,0,100,0), -(@PATH,9,-659.4124,4799.819,49.09505,0,0,0,100,0), -(@PATH,10,-582.4199,4800.242,34.97715,0,0,0,100,0), -(@PATH,11,-546.5514,4799.893,33.83914,0,0,0,100,0), -(@PATH,12,-542.1885,4799.724,33.71414,0,0,0,100,0), -(@PATH,13,-570.3811,4800.449,34.60215,0,0,0,100,0), -(@PATH,14,-592.3809,4800.299,35.85215,0,0,0,100,0), -(@PATH,15,-617.6182,4800.323,38.53064,0,0,0,100,0), -(@PATH,16,-659.4124,4799.819,49.09505,0,0,0,100,0), -(@PATH,17,-512.5808,4799.929,32.09928,0,0,0,100,0), -(@PATH,18,-480.9247,4799.97,28.25657,0,0,0,100,0), -(@PATH,19,-512.6269,4799.873,32.09928,0,0,0,100,0), -(@PATH,20,-542.1885,4799.724,33.71414,0,0,0,100,0), -(@PATH,21,-570.3811,4800.449,34.60215,0,0,0,100,0), -(@PATH,22,-592.3809,4800.299,35.85215,0,0,0,100,0), -(@PATH,23,-617.6182,4800.323,38.53064,0,0,0,100,0), -(@PATH,24,-659.4124,4799.819,49.09505,0,0,0,100,0), -(@PATH,25,-582.4199,4800.242,34.97715,0,0,0,100,0), -(@PATH,26,-512.6269,4799.873,32.09928,0,0,0,100,0), -(@PATH,27,-542.1885,4799.724,33.71414,0,0,0,100,0), -(@PATH,28,-570.3811,4800.449,34.60215,0,0,0,100,0), -(@PATH,29,-592.3809,4800.299,35.85215,0,0,0,100,0), -(@PATH,30,-617.6182,4800.323,38.53064,0,0,0,100,0); - --- Dark Portal - corrects the entry position and orientation by cdawg closes #5470 -UPDATE `areatrigger_teleport` SET `target_position_x`=-248.149292, `target_position_y`=921.874953, `target_position_z`=84.388448, `target_orientation`=1.584155 WHERE `id`=4354; - --- Add pamphlets to mail loot by gecko32 closes #5408 -DELETE FROM `mail_loot_template` WHERE `entry` BETWEEN 224 AND 233; -INSERT INTO `mail_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES -(224, 46875, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Elwynn Forest -(225, 46876, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Darnassus -(226, 46877, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Dun Morogh drawf -(227, 46879, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Azuremyst Isle -(228, 46878, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Dun Morogh gnome -(229, 46884, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Mulgore -(230, 46883, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Durator -(231, 46880, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Orgrimmar -(232, 46882, 100, 1, 0, 1, 1), -- Riding Training Pamphlet Eversong Woods -(233, 46881, 100, 1, 0, 1, 1); -- Riding Training Pamphlet Tirisfal Glades - --- fix coordinates for cannoneer whessan by mosoo closes #5406 -UPDATE `creature` SET `position_x`=-2093.53, `position_y`=-3496.47, `position_z`=130.084, `orientation`=3.008 WHERE `id`=3455 LIMIT 1; - --- fix quest requirement for the last of her kind by shlomi 1515 closes #4875 -UPDATE `quest_template` SET `PrevQuestID` = 12900 WHERE `id` = 12983; - --- Add rep reward to ICC25 Trash by gecko32 closes #5457 -DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (37655,38031,38057,38058,38059,38061,38062,38063,38064,38072,38073,38074,38075,38076,38098,38099,38100,38101,38102,38103,38105,38108,38110,38126,38130,38131,38132,38133,38139,38151,38219,38220,38418,38445,38446,38479,38480,38481); -INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES -(37655, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Decaying colossus -(38031, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Deathbound Ward -(38057, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Servant of the throne -(38058, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Nerub'ar Broodkeeper -(38059, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ancient Skeletal Soldier -(38061, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- The Damned -(38062, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Plague Scientist -(38063, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Vengeful Fleshreaper -(38064, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Stinky -(38072, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Attedent -(38073, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Disciple -(38074, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Deathspeacker High Preist -(38075, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Servant -(38076, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Deathspeacker Zealot -(38098, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Advisor -(38099, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Archmage -(38100, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Blood Knight -(38101, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Lieutenant -(38102, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Commander -(38103, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Precious -(38105, 1156, 0, 7, 0, 2, 0, 0, 0, 0), -- Plagued Zombie -(38108, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Blighted Abomination -(38110, 1156, 0, 7, 0, 30, 0, 0, 0, 0), -- Pustulating Horror -(38126, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Frostbinder -(38130, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Deathbringer -(38131, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Huntress -(38132, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Battle-Maiden -(38133, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Ymirjar Warlord -(38139, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frostwarden Handler -(38151, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frostwing Whelp -(38219, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Spinestalker -(38220, 1156, 0, 7, 0, 150, 0, 0, 0, 0), -- Rimefang -(38418, 1156, 0, 7, 0, 45, 0, 0, 0, 0), -- Val'kyr Herald -(38445, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Spire Minion -(38446, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Frenzied Abomination -(38479, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Tactician -(38480, 1156, 0, 7, 0, 15, 0, 0, 0, 0), -- Darkfallen Noble -(38481, 1156, 0, 7, 0, 15, 0, 0, 0, 0); -- Spire Gargoyle - --- fix procs by warpten closes #4467 for --- Needle-Encrusted Scorpion -DELETE FROM `spell_proc_event` WHERE `entry`=71404; -INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES -(71404,0,0,0,0,0,0,2,0,0,50); - --- Black Magic -DELETE FROM `spell_proc_event` WHERE `entry`=59630; -INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES -(59630,0,0,0,0,0,0,0,0,0,35); - --- Environment Creature Hight Update by shlomi1515 closes #4043 -UPDATE `creature` SET `position_z`=558.210022 WHERE `guid` IN (85141,85143,85154,85153,85142,85151,85152,85150); -UPDATE `creature` SET `position_z`=586.302 WHERE `guid` IN (85145,85144,85146); -UPDATE `creature` SET `position_z`=586.263 WHERE `guid` IN (85147,85148,85149); - --- fix winterskorn raider not landing by nayd closes #3899 -UPDATE `creature_template` SET `InhabitType`=`InhabitType`|1 WHERE `entry`=23665; - --- fix head of onyxia's loot closes by kandera #3851 -UPDATE `item_template` SET `flags` = flags|4096 WHERE `entry` IN (18422,18423,49644,49643); - --- fix visual for plagued dragonsflayer tribesman by shlomi1515 closes #3518 -DELETE FROM `creature_addon` WHERE `guid` = 97540; diff --git a/sql/updates/world/2012_04_13_02_world_misc.sql b/sql/updates/world/2012_04_13_02_world_misc.sql deleted file mode 100644 index 7c71af78cd7..00000000000 --- a/sql/updates/world/2012_04_13_02_world_misc.sql +++ /dev/null @@ -1,18 +0,0 @@ -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (38308,38309,37824); -- Professor Putricide triggers -UPDATE `creature_template` SET `ScriptName`='npc_gas_cloud' WHERE `entry`=37562; -- Gas Cloud -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_putricide_ooze_summon'; -DELETE FROM `spell_target_position` WHERE `id` IN (71413,71414); -INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES -(71414,631,4335.00,3206.75,389.399,0), -(71413,631,4380.43,3206.55,389.398,0); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (71615,71618,71412,71415); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES -(13,4,71615,31,3,37690,'Putricide - Tear Gas on Slime Puddle'), -(13,1,71618,31,3,37562,'Putricide - Tear Gas on Gas Cloud'), -(13,2,71618,31,3,37697,'Putricide - Tear Gas on Volatile Ooze'), -(13,4,71618,31,3,38159,'Putricide - Tear Gas on Choking Gas Bomb'); - -UPDATE `spell_script_names` SET `ScriptName`='spell_putricide_clear_aura_effect_value' WHERE `ScriptName`='spell_putricide_clear_mutated_plague'; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(71620,'spell_putricide_clear_aura_effect_value'); diff --git a/sql/updates/world/2012_04_13_03_world_bg_template.sql b/sql/updates/world/2012_04_13_03_world_bg_template.sql deleted file mode 100644 index a426d7c6831..00000000000 --- a/sql/updates/world/2012_04_13_03_world_bg_template.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE `battleground_template` ADD `StartMaxDist` float NOT NULL DEFAULT 0 AFTER `HordeStartO`; - -UPDATE `battleground_template` SET `StartMaxDist`=200 WHERE `id`=30; -- IC -UPDATE `battleground_template` SET `StartMaxDist`=100 WHERE `id`=1; -- AV -UPDATE `battleground_template` SET `StartMaxDist`=75 WHERE `id` IN (2,3,7); -- WSG, AB, EotS - -UPDATE `battleground_template` SET `MinLvl`=1 WHERE `id`=32; diff --git a/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql b/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql deleted file mode 100644 index 3ea68187687..00000000000 --- a/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Blackened Naaru Silver proc cooldown -DELETE FROM `spell_proc_event` WHERE `entry`=45355; -INSERT INTO `spell_proc_event`(`entry`,`schoolmask`,`spellfamilyname`,`spellfamilymask0`,`spellfamilymask1`,`spellfamilymask2`,`procflags`,`procex`,`ppmrate`,`customchance`,`cooldown`) VALUES -(45355,0,0,0,0,0,0,0,0,0,45); \ No newline at end of file diff --git a/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql b/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql deleted file mode 100644 index dea4b771068..00000000000 --- a/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Add Bogblossom to this Bogblossom object for the druid quest (other one already contains it) -DELETE FROM `gameobject_loot_template` WHERE (`entry`=10961) AND (`item`=31950); -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES (10961,31950,-100,0,0,1,1); diff --git a/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql b/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql deleted file mode 100644 index a3dd0c39865..00000000000 --- a/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Add missing gameobject_loot_templates to prevent startup errors -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (3458,3459,3460,3461,15920,16841,26878,27725); -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(3458,4594,100,0,0,1,1), -- Rockscale Cod on Feast Fish -(3459,3771,100,0,0,1,1), -- Wild Hog Shank On Feast Boar -(3460,4538,100,0,0,1,1), -- Snapvine Watermelon on Feast Fruit -(3461,1708,100,0,0,1,1), -- Sweet Nectar on Feast Goblet -(15920,17822,-100,0,0,1,1), -- Weird Map on weird object -(16841,18950,-100,0,0,1,1), -- Chambermaid Pillaclenchers Pillow on Pillaclencher's Ornate Pillow -(26878,45062,100,0,0,1,1), -- Dusty Journal on Dusty Journal (different ID) -(27725,49648,100,0,0,1,1); -- Borrowed Tabard on Clean Laundry (might need condition!) diff --git a/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql b/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql deleted file mode 100644 index 6aaa7da383e..00000000000 --- a/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE `creature_template_addon` SET `auras`='50453' WHERE `entry`=28017; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=28017; -UPDATE `creature_template` SET `ainame` = '' WHERE `entry`=28017; \ No newline at end of file diff --git a/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql b/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql deleted file mode 100644 index ee081c17078..00000000000 --- a/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `spell_bonus_data` SET `direct_bonus`=0.8930 WHERE `entry`=51505; diff --git a/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql b/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql deleted file mode 100644 index 78a869e655a..00000000000 --- a/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_proc_event` WHERE `entry`=53601; -INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES -(53601, 0, 0, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0, 0, 6); diff --git a/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql b/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql deleted file mode 100644 index 8cb2b1d3d2b..00000000000 --- a/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM `spell_proc_event` WHERE `entry` IN (51486,51485,51483); diff --git a/sql/updates/world/2012_04_16_00_world_game_event.sql b/sql/updates/world/2012_04_16_00_world_game_event.sql deleted file mode 100644 index 1dc3fe3ad91..00000000000 --- a/sql/updates/world/2012_04_16_00_world_game_event.sql +++ /dev/null @@ -1,4 +0,0 @@ -SET @Event = 26; -- Pilgrim's Bounty -DELETE FROM `game_event` WHERE `eventEntry`=@Event; -INSERT INTO `game_event` (`eventEntry`,`start_time`,`end_time`,`occurence`,`length`,`holiday`,`description`,`world_event`) VALUES -(@Event,'2012-11-18 01:00:00','2020-12-31 05:00:00',525600,10020,404,'Pilgrim\'s Bounty',0); diff --git a/sql/updates/world/2012_04_17_00_world_creature.sql b/sql/updates/world/2012_04_17_00_world_creature.sql deleted file mode 100644 index ebf0fb42a59..00000000000 --- a/sql/updates/world/2012_04_17_00_world_creature.sql +++ /dev/null @@ -1,28 +0,0 @@ -SET @GUID1 := 41781; -SET @GUID2 := 41783; - -DELETE FROM creature WHERE guid IN (@GUID1,@GUID2); -INSERT INTO `creature` -(`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`) -VALUES -(@GUID1 ,38453,571,1,1,3561.821,-2736.367,136.0317,0), -- Arcturis in Grizzly Hills -(@GUID2,35189,571,1,1,7101.845,-1443.734,924.2609,0.178631); -- Skoll in The Storm Peaks - -UPDATE `creature_template` SET `faction_A` = 190, `faction_H`=190 WHERE `entry` IN (38453,35189); - -SET @NPC= @GUID1*10; --- Add pathing for Arcturis -DELETE FROM `creature_addon` WHERE `guid` = @GUID1; -INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(@GUID1,@NPC,0,0,0,0,''); -- Add path for Acturis --- Add waypoint data for the path: -DELETE FROM `waypoint_data` WHERE `id`=@NPC; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES -(@NPC,1,3563.499,-2737.698,137.1898), -(@NPC,2,3565.249,-2738.698,138.4398), -(@NPC,3,3566.749,-2739.948,139.9398), -(@NPC,4,3568.249,-2740.698,140.6898), -(@NPC,5,3567.839,-2741.380,141.9256), -(@NPC,6,3569.999,-2741.948,142.1898), -(@NPC,7,3570.749,-2742.448,143.1898), -(@NPC,8,3572.676,-2743.528,144.8479); diff --git a/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql b/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql deleted file mode 100644 index 3bad860290b..00000000000 --- a/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE `npc_spellclick_spells` SET `spell_id`=57053 WHERE `npc_entry`=30066 AND `spell_id`=56678; -UPDATE `creature_template` SET `spell1`=55812 WHERE `entry`=30066; diff --git a/sql/updates/world/2012_04_18_01_world_creature.sql b/sql/updates/world/2012_04_18_01_world_creature.sql deleted file mode 100644 index e2d6bdac95b..00000000000 --- a/sql/updates/world/2012_04_18_01_world_creature.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `creature` SET `spawntimesecs`=39600 WHERE `guid` IN (41781,41783); -- Set the spawntime to 11 hours for Arcturis & Skoll diff --git a/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql b/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql deleted file mode 100644 index 4ed922060d9..00000000000 --- a/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql +++ /dev/null @@ -1,377 +0,0 @@ --- ---------------------- --- -- Various Cleanups -- --- ---------------------- -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=10 AND `SourceGroup`=34105; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceGroup` IN (27081,27085,27073,26963,26955); -DELETE FROM `reference_loot_template` WHERE `entry` IN (12020,12021,12022,34105,34125,34126,34127,34128,34129,34130); -DELETE FROM `gameobject_loot_template` WHERE `entry`=10961; -- Bad Bogblossom fix was bad -UPDATE `gameobject_template` SET `data1`=26956 WHERE `entry`=194315; --- ------------------------------- --- -- Variables and definitions -- --- ------------------------------- --- Freya 10 man -SET @Freya10k0ID := 194324; -- Freyas Gift 10man ALL elders alive -SET @Freya10k1ID := 194326; -- Freyas Gift 10man killed 1 elder -SET @Freya10k2ID := 194328; -- Freyas Gift 10man killed 2 elder -SET @Freya10k3ID := 194330; -- Freyas Gift 10man killed 3 elder --- Freya 25 man -SET @Freya25k0ID := 194325; -- Freyas Gift 25man ALL elders alive -SET @Freya25k1ID := 194327; -- Freyas Gift 25man killed 1 elder -SET @Freya25k2ID := 194329; -- Freyas Gift 25man killed 2 elder -SET @Freya25k3ID := 194331; -- Freyas Gift 25man killed 3 elder --- Hodir -SET @Hodir10nID := 194307; -- Cache of Winter 10man -SET @Hodir10hID := 194200; -- Rare Cache of Winter 10man -SET @Hodir25nID := 194308; -- Cache of Winter 25man -SET @Hodir25hID := 194201; -- Rare Cache of Winter 25man --- Mimiron -SET @Mimiron10nID := 194789; -- Cache of Innovations 10man -SET @Mimiron25nID := 194956; -- Cache of Innovations 25man -SET @Mimiron10hID := 194957; -- Cache of Innovation 10 man Hardmode -SET @Mimiron25hID := 194958; -- Cache of Innovation 25 man Hardmode --- Thorim -SET @Thorim10nID := 194312; -- Cache of Storms 10man -SET @Thorim10hID := 194313; -- Cache of Storms 10 man Hardmode -SET @Thorim25nID := 194314; -- Cache of Storms 25man -SET @Thorim25hID := 194315; -- Cache of Storms 25 man Hardmode - --- Use procedure to get Lootid from data1 field and assign it to a variable --- Freya 10 -CALL `sp_get_go_lootid`(@Freya10k0ID,@Freya10k0); -CALL `sp_get_go_lootid`(@Freya10k1ID,@Freya10k1); -CALL `sp_get_go_lootid`(@Freya10k2ID,@Freya10k2); -CALL `sp_get_go_lootid`(@Freya10k3ID,@Freya10k3); --- Freya 25 -CALL `sp_get_go_lootid`(@Freya25k0ID,@Freya25k0); -CALL `sp_get_go_lootid`(@Freya25k1ID,@Freya25k1); -CALL `sp_get_go_lootid`(@Freya25k2ID,@Freya25k2); -CALL `sp_get_go_lootid`(@Freya25k3ID,@Freya25k3); --- Hodir 10 -CALL `sp_get_go_lootid`(@Hodir10nID,@Hodir10n); -CALL `sp_get_go_lootid`(@Hodir10hID,@Hodir10h); --- Hodir 25 -CALL `sp_get_go_lootid`(@Hodir25nID,@Hodir25n); -CALL `sp_get_go_lootid`(@Hodir25hID,@Hodir25h); --- Mimiron -CALL `sp_get_go_lootid`(@Mimiron10nID,@Mimiron10n); -CALL `sp_get_go_lootid`(@Mimiron10hID,@Mimiron10h); -CALL `sp_get_go_lootid`(@Mimiron25nID,@Mimiron25n); -CALL `sp_get_go_lootid`(@Mimiron25hID,@Mimiron25h); --- Thorim -CALL `sp_get_go_lootid`(@Thorim10nID,@Thorim10n); -CALL `sp_get_go_lootid`(@Thorim10hID,@Thorim10h); -CALL `sp_get_go_lootid`(@Thorim25nID,@Thorim25n); -CALL `sp_get_go_lootid`(@Thorim25hID,@Thorim25h); --- Set References -SET @Freya10Ref := 34365; -SET @Freya25Ref := @Freya10Ref+1; -SET @Hodir10Ref := @Freya10Ref+2; -SET @Hodir25Ref := @Freya10Ref+3; -SET @Mimiron10Ref := @Freya10Ref+4; -SET @Mimiron25Ref := @Freya10Ref+5; -SET @Thorim10Ref := @Freya10Ref+6; -SET @Thorim25Ref := @Freya10Ref+7; -SET @HandToken := 12026; -SET @LegToken := @HandToken+1; -SET @LegsToken := @HandToken+2; -SET @ChestToken := @HandToken+3; -SET @HeadToken := @HandToken+4; -SET @GloveToken := @HandToken+5; -SET @ShoulderToken := @HandToken+6; -SET @HelmToken := @HandToken+7; -SET @Recipe := 34154; --- ------------------------- --- -- Reference Templates -- --- ------------------------- --- Delete previous templates if existing -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Freya10Ref AND @Freya10Ref+7; -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @HandToken AND @HandToken+7; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Freya 10 man -(@Freya10Ref,45934,0,1,1,1,1), -- Unraveling Reach -(@Freya10Ref,45935,0,1,1,1,1), -- Ironbark Faceguard -(@Freya10Ref,45941,0,1,1,1,1), -- Chestguard of the Lasher -(@Freya10Ref,45936,0,1,1,1,1), -- Legplates of Flourishing Resolve -(@Freya10Ref,45940,0,1,1,1,1), -- Tunic of the Limber Stalker --- Freya 25 man -(@Freya25Ref,45483,0,1,1,1,1), -- Boots of the Servant -(@Freya25Ref,45482,0,1,1,1,1), -- Leggings of the Lifetender -(@Freya25Ref,45481,0,1,1,1,1), -- Gauntlets of Ruthless Reprisal -(@Freya25Ref,45480,0,1,1,1,1), -- Nymph Heart Charm -(@Freya25Ref,45479,0,1,1,1,1), -- The Lifebinder --- Freya Tokens -(@HandToken,45644,0,1,1,1,1), -- Gloves of the Wayward Conqueror -(@HandToken,45645,0,1,1,1,1), -- Gloves of the Wayward Protector -(@HandToken,45646,0,1,1,1,1), -- Gloves of the Wayward Vanquisher -(@LegToken,45653,0,1,1,1,1), -- Legplates of the Wayward Conqueror -(@LegToken,45654,0,1,1,1,1), -- Legplates of the Wayward Protector -(@LegToken,45655,0,1,1,1,1), -- Legplates of the Wayward Vanquisher --- Hodir 10 man -(@Hodir10Ref,45874,0,1,1,1,1), -- Signet of Winter -(@Hodir10Ref,45458,0,1,1,1,1), -- Stormedge -(@Hodir10Ref,45873,0,1,1,1,1), -- Winter's Frigid Embrace -(@Hodir10Ref,45872,0,1,1,1,1), -- Avalanche -(@Hodir10Ref,45454,0,1,1,1,1), -- Cowl of Icy Breaths --- Hodir 25 man -(@Hodir25Ref,45452,0,1,1,1,1), -- Frostplate Greaves -(@Hodir25Ref,45454,0,1,1,1,1), -- Frost-Bound Chain Bracers -(@Hodir25Ref,45453,0,1,1,1,1), -- Winter's Icy Embrace -(@Hodir25Ref,45450,0,1,1,1,1), -- Northern Barrier -(@Hodir25Ref,45451,0,1,1,1,1), -- Frozen Loop --- Hodir Tokens -(@LegsToken,45650,0,1,1,1,1), -- Leggings of the Wayward Conqueror -(@LegsToken,45651,0,1,1,1,1), -- Leggings of the Wayward Protector -(@LegsToken,45652,0,1,1,1,1), -- Leggings of the Wayward Vanquisher -(@ChestToken,45632,0,1,1,1,1), -- Breastplate of the Wayward Conqueror -(@ChestToken,45633,0,1,1,1,1), -- Breastplate of the Wayward Protector -(@ChestToken,45634,0,1,1,1,1), -- Breastplate of the Wayward Vanquisher --- Mimiron 10 man -(@Mimiron10Ref,45974,0,1,1,1,1), -- Shoulderguards of Assimilation -(@Mimiron10Ref,45976,0,1,1,1,1), -- Static Charge Handwraps -(@Mimiron10Ref,45972,0,1,1,1,1), -- Pulse Baton -(@Mimiron10Ref,45973,0,1,1,1,1), -- Stylish Power Cape -(@Mimiron10Ref,45975,0,1,1,1,1), -- Cable of the Metrognome --- Mimiron 25 man -(@Mimiron25Ref,45492,0,1,1,1,1), -- Malleable Steelweave Mantle -(@Mimiron25Ref,45493,0,1,1,1,1), -- Asimov's Drape -(@Mimiron25Ref,45490,0,1,1,1,1), -- Pandora's Plea -(@Mimiron25Ref,45491,0,1,1,1,1), -- Waistguard of the Creator -(@Mimiron25Ref,45489,0,1,1,1,1), -- Insanity's Grip --- Mimiron Tokens -(@HeadToken,45647,0,1,1,1,1), -- Helm of the Wayward Conqueror -(@HeadToken,45648,0,1,1,1,1), -- Helm of the Wayward Protector -(@HeadToken,45649,0,1,1,1,1), -- Helm of the Wayward Vanquisher -(@GloveToken,45641,0,1,1,1,1), -- Gauntlets of the Wayward Conqueror -(@GloveToken,45642,0,1,1,1,1), -- Gauntlets of the Wayward Protector -(@GloveToken,45643,0,1,1,1,1), -- Gauntlets of the Wayward Vanquisher --- Thorim 10 man -(@Thorim10Ref,45927,0,1,1,1,1), -- Handwraps of Resonance -(@Thorim10Ref,45894,0,1,1,1,1), -- Leggings of Unstable Discharge -(@Thorim10Ref,45895,0,1,1,1,1), -- Belt of the Blood Pit -(@Thorim10Ref,45893,0,1,1,1,1), -- Guise of the Midgard Serpent -(@Thorim10Ref,45892,0,1,1,1,1), -- Legacy of Thunder --- Throim 25 man -(@Thorim25Ref,45468,0,1,1,1,1), -- Leggings of Lost Love -(@Thorim25Ref,45466,0,1,1,1,1), -- Scale of Fates -(@Thorim25Ref,45467,0,1,1,1,1), -- Belt of the Betrayed -(@Thorim25Ref,45469,0,1,1,1,1), -- Sif's Promise -(@Thorim25Ref,45463,0,1,1,1,1), -- Vulmir, the Northern Tempest --- Thorim Tokens -(@ShoulderToken,45659,0,1,1,1,1), -- Spaulders of the Wayward Conqueror -(@ShoulderToken,45660,0,1,1,1,1), -- Spaulders of the Wayward Protector -(@ShoulderToken,45661,0,1,1,1,1), -- Spaulders of the Wayward Vanquisher -(@HelmToken,45638,0,1,1,1,1), -- Crown of the Wayward Conqueror -(@HelmToken,45639,0,1,1,1,1), -- Crown of the Wayward Protector -(@HelmToken,45640,0,1,1,1,1); -- Crown of the Wayward Vanquisher --- ------------------------------- --- -- Gameobject Loot Templates -- --- ------------------------------- --- Delete previous templates if existing -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Freya10k3,@Freya10k2,@Freya10k1,@Freya10k0,@Freya25k3,@Freya25k2,@Freya25k1,@Freya25k0,@Hodir10n,@Hodir10h,@Hodir25n,@Hodir25h,@Mimiron10n,@Mimiron10h,@Mimiron25n,@Mimiron25h,@Thorim10n,@Thorim10h,@Thorim25n,@Thorim25h); -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ------------------ --- -- Freya 10 man -- --- ------------------ --- Normal Mode: -(@Freya10k3,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot -(@Freya10k3,2,100,1,0,-@HandToken,1), -- 1 from tokens -(@Freya10k3,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya10k3,47241,100,1,0,1,1), -- 1x Emblem of Triumph --- Hard Mode: 1 elder alive -(@Freya10k2,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot -(@Freya10k2,2,100,1,0,-@HandToken,1), -- 1 from tokens -(@Freya10k2,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya10k2,47241,100,1,0,2,2), -- 2x Emblem of Triumph -(@Freya10k2,45087,100,1,0,1,1), -- Runed Orb -(@Freya10k2,3,100,1,0,-34349,1), -- 1x Emblem of Triumph for Alive Elders --- Hard Mode: 2 elders alive -(@Freya10k1,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot -(@Freya10k1,2,100,1,0,-@HandToken,1), -- 1 from tokens -(@Freya10k1,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya10k1,47241,100,1,0,3,3), -- 3x Emblem of Triumph -(@Freya10k1,45087,100,1,0,1,1), -- Runed Orb -(@Freya10k1,3,100,1,0,-@Recipe,1), -- 1 from Recipe -(@Freya10k1,4,100,1,0,-34349,2), -- 2x Emblem of Triumph for Alive Elders --- Hard Mode: 3 elders alive -(@Freya10k0,1,100,1,0,-@Freya10Ref,1), -- 1 from normal loot -(@Freya10k0,2,100,1,0,-@HandToken,1), -- 1 from tokens -(@Freya10k0,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya10k0,47241,100,1,0,3,3), -- 3x Emblem of Triumph (self) -(@Freya10k0,45087,100,1,0,1,1), -- Runed Orb -(@Freya10k0,3,100,1,0,-@Recipe,1), -- 1 from Recipe -(@Freya10k0,45788,-100,1,0,1,1), -- Freya's Sigil 10 man QUEST ONLY -(@Freya10k0,4,100,1,0,-34349,1), -- 3x Emblem of Triumph for Alive Elders --- 1 from Hardmode items: -(@Freya10k0,45943,0,1,1,1,1), -- Gloves of Whispering Winds -(@Freya10k0,45946,0,1,1,1,1), -- Fire Orchid Signet -(@Freya10k0,45945,0,1,1,1,1), -- Seed of Budding Carnage -(@Freya10k0,45947,0,1,1,1,1), -- Serilas, Blood Blade of Invar One-Arm -(@Freya10k0,45294,0,1,1,1,1), -- Petrified Ivy Sprig --- ------------------ --- -- Freya 25 man -- --- ------------------ --- Normal Mode: -(@Freya25k3,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot -(@Freya25k3,2,100,1,0,-@LegToken,2), -- 2 from tokens -(@Freya25k3,47241,100,1,0,1,1), -- 1x Emblem of Triumph -(@Freya25k3,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya25k3,3,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Freya25k3,45087,10,1,0,1,1), -- Chance on Runed Orb -(@Freya25k3,45083,5,1,0,1,1), -- Fragment of Val'anyr --- Hard Mode: 1 elder alive -(@Freya25k2,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot -(@Freya25k2,2,100,1,0,-@LegToken,2), -- 2 from tokens -(@Freya25k2,47241,100,1,0,2,2), -- 2x Emblem of Triumph -(@Freya25k2,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya25k2,3,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Freya25k2,4,10,1,0,-34350,1), -- Chance on Runed Orb -(@Freya25k2,45087,100,1,0,2,2), -- 2x Runed Orb -(@Freya25k2,45083,7,1,0,1,1), -- Fragment of Val'anyr -(@Freya25k2,5,100,1,0,-34349,1), -- 1x Emblem of Triumph for Alive Elder --- Hard Mode: 2 elders alive -(@Freya25k1,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot -(@Freya25k1,2,100,1,0,-@LegToken,2), -- 2 from tokens -(@Freya25k1,47241,100,1,0,3,3), -- 3x Emblem of Triumph -(@Freya25k1,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya25k1,3,10,1,0,-34350,1), -- Chance on Runed Orb -(@Freya25k1,45087,100,1,0,2,2), -- 2x Runed Orb -(@Freya25k1,4,100,1,0,-@Recipe,1), -- Recipe -(@Freya25k1,5,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Freya25k1,45083,9,1,0,1,1), -- Fragment of Val'anyr -(@Freya25k1,6,100,1,0,-34349,2), -- 2x Emblem of Triumph for Alive Elder --- Hard Mode: 3 elders alive -(@Freya25k0,1,100,1,0,-@Freya25Ref,1), -- 1 from normal loot -(@Freya25k0,2,100,1,0,-@LegToken,2), -- 2 from tokens -(@Freya25k0,47241,100,1,0,3,3), -- 3x Emblem of Triumph -(@Freya25k0,46110,100,1,0,1,1), -- Alchemist's Cache -(@Freya25k0,3,10,1,0,-34350,1), -- Chance on Runed Orb -(@Freya25k0,45087,100,1,0,2,2), -- 2x Runed Orb -(@Freya25k0,4,100,1,0,-@Recipe,1), -- Recipe -(@Freya25k0,5,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Freya25k0,45814,-100,1,0,1,1), -- Freya's Sigil 25 man QUEST ONLY -(@Freya25k0,45083,20,1,0,1,1), -- Fragment of Val'anyr -(@Freya25k2,6,100,1,0,-34349,3), -- 3x Emblem of Triumph for Alive Elder --- 1 from Hardmode items -(@Freya25k0,45484,0,1,1,1,1), -- Bladetwister -(@Freya25k0,45486,0,1,1,1,1), -- Drape of the Sullen Goddess -(@Freya25k0,45487,0,1,1,1,1), -- Handguards of Revitalization -(@Freya25k0,45488,0,1,1,1,1), -- Leggings of the Enslaved Idol -(@Freya25k0,45613,0,1,1,1,1), -- Dreambinder -(@Freya25k0,45485,0,1,1,1,1), -- Bronze Pendant of the Vanir --- ------------------ --- -- Hodir 10 man -- --- ------------------ -(@Hodir10n,1,100,1,0,-@Hodir10Ref,1), -- 1x Normal Loot Item -(@Hodir10n,2,100,1,0,-@LegsToken,1), -- 1x Token -(@Hodir10n,47241,100,1,0,1,1), -- Emblem of Triumph --- Hard mode: -(@Hodir10h,1,100,1,0,-@Hodir10Ref,1), -- 1x Normal Loot Item -(@Hodir10h,2,100,1,0,-@LegsToken,1), -- 1x Token -(@Hodir10h,47241,100,1,0,1,1), -- Emblem of Triumph -(@Hodir10h,45786,-100,1,0,1,1), -- Hodir's Sigil --- 1 from Hardmode items -(@Hodir10h,45887,0,1,1,1,1), -- Ice Layered Barrier -(@Hodir10h,45888,0,1,1,1,1), -- Bitter Cold Armguards -(@Hodir10h,45886,0,1,1,1,1), -- Icecore Staff -(@Hodir10h,45876,0,1,1,1,1), -- Shiver -(@Hodir10h,45877,0,1,1,1,1), -- The Boreal Guard --- ------------------ --- -- Hodir 25 man -- --- ------------------ -(@Hodir25n,1,100,1,0,-@Hodir25Ref,1), -- 1x Normal Loot Item -(@Hodir25n,2,100,1,0,-@ChestToken,1), -- 1x Token -(@Hodir25n,47241,100,1,0,1,1), -- Emblem of Triumph -(@Hodir25n,3,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Hodir25n,45087,10,1,0,1,1), -- Chance on Runed Orb -(@Hodir25n,45083,10,1,0,1,1), -- Fragment of Val'anyr --- Hard mode: -(@Hodir25h,1,100,1,0,-@Hodir25Ref,1), -- 1x Normal Loot Item -(@Hodir25h,2,100,1,0,-@ChestToken,2), -- 2x Token -(@Hodir25h,47241,100,1,0,1,1), -- Emblem of Triumph -(@Hodir25h,45815,-100,1,0,1,1), -- Hodir's Sigil -(@Hodir25h,3,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Hodir25h,45087,10,1,0,1,1), -- Chance on Runed Orb -(@Hodir25h,45083,20,1,0,1,1), -- Fragment of Val'anyr --- -------------------- --- -- Mimiron 10 man -- --- -------------------- -(@Mimiron10n,1,100,1,0,-@Mimiron10Ref,1), -- 1x Normal Loot Item -(@Mimiron10n,2,100,1,0,-@HeadToken,1), -- 1x Token -(@Mimiron10n,47241,100,1,0,1,1), -- 1x Emblem of Triumph --- Hardmode 10 man -(@Mimiron10h,1,100,1,0,-@Mimiron10Ref,1), -- 1x Normal Loot Item -(@Mimiron10h,2,100,1,0,-@HeadToken,1), -- 1x Token -(@Mimiron10h,47241,100,1,0,1,1), -- 1x Emblem of Triumph -(@Mimiron10h,45787,-100,1,0,1,1), -- Mimiron's Sigel (QUEST ONLY, HARDMODE ONLY) --- 1 from Hardmode items -(@Mimiron10h,45989,0,1,1,1,1), -- Tempered Mercury Greaves -(@Mimiron10h,45982,0,1,1,1,1), -- Fused Alloy Legplates -(@Mimiron10h,45993,0,1,1,1,1), -- Mimiron's Flight Goggles -(@Mimiron10h,45988,0,1,1,1,1), -- Greaves of the Iron Army -(@Mimiron10h,45990,0,1,1,1,1), -- Fusion Blade --- -------------------- --- -- Mimiron 25 man -- --- -------------------- -(@Mimiron25n,1,100,1,0,-@Mimiron25Ref,1), -- 1x Normal Loot Item -(@Mimiron25n,2,100,1,0,-@GloveToken,2), -- 2x Token -(@Mimiron25n,47241,100,1,0,1,1), -- 1x Emblem of Triumph -(@Mimiron25n,3,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Mimiron25n,45087,10,1,0,1,1), -- Chance on Runed Orb -(@Mimiron25n,45083,8,1,0,1,1), -- Fragment of Val'anyr Normal --- Hard Mode 25 man -(@Mimiron25h,1,100,1,0,-@Mimiron25Ref,1), -- 1x Normal Loot Item -(@Mimiron25h,2,100,1,0,-@GloveToken,2), -- 2x Token -(@Mimiron25h,47241,100,1,0,1,1), -- 1x Emblem of Triumph -(@Mimiron25h,3,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Mimiron25h,45087,10,1,0,1,1), -- Chance on Runed Orb -(@Mimiron25h,45816,-100,1,0,1,1), -- Mimiron's Sigel (QUEST ONLY, HARDMODE ONLY) -(@Mimiron25h,45083,18,1,0,1,1), -- Fragment of Val'anyr Hardmode --- 1 from Hardmode items -(@Mimiron25h,45496,0,1,1,1,1), -- Titanskin Cloak -(@Mimiron25h,45494,0,1,1,1,1), -- Delirium's Touch -(@Mimiron25h,45663,0,1,1,1,1), -- Armbands of Bedlam -(@Mimiron25h,45620,0,1,1,1,1), -- Starshard Edge -(@Mimiron25h,45495,0,1,1,1,1), -- Conductive Seal -(@Mimiron25h,45497,0,1,1,1,1), -- Crown of Luminescence --- ------------------- --- -- Thorim 10 man -- --- ------------------- -(@Thorim10n,1,100,1,0,-@Thorim10Ref,1), -- 1x Normal Loot Item -(@Thorim10n,2,100,1,0,-@ShoulderToken,1), -- 1x Token -(@Thorim10n,47241,100,1,0,1,1), -- 1x Emblem of Triumph --- Hardmode 10 man -(@Thorim10h,1,100,1,0,-@Thorim10Ref,1), -- 1x Normal Loot Item -(@Thorim10h,2,100,1,0,-@ShoulderToken,1), -- 1x Token -(@Thorim10h,47241,100,1,0,1,1), -- 1x Emblem of Triumph -(@Thorim10h,45784,-100,2,0,1,1), -- Thorim's Sigil (QUEST ONLY, HARDMODE ONLY) --- 1 from Hardmode items -(@Thorim10h,45933,0,2,1,1,1), -- Pendant of the Shallow Grave -(@Thorim10h,45929,0,2,1,1,1), -- Sif's Remembrance -(@Thorim10h,45928,0,2,1,1,1), -- Gauntlets of the Thunder God -(@Thorim10h,45931,0,2,1,1,1), -- Mjolnir Runestone -(@Thorim10h,45930,0,2,1,1,1), -- Combatant's Bootblade --- ------------------- --- -- Thorim 25 man -- --- ------------------- -(@Thorim25n,1,100,3,0,-@Thorim25Ref,1), -- 1x Normal Loot Item -(@Thorim25n,2,100,3,0,-@HelmToken,2), -- 2x Token -(@Thorim25n,47241,100,3,0,1,1), -- 1x Emblem of Triumph -(@Thorim25n,3,10,3,0,-@Recipe,1), -- Chance on Recipe -(@Thorim25n,45087,10,3,0,1,1), -- Chance on Runed Orb -(@Thorim25n,45083,8,1,0,1,1), -- Fragment of Val'anyr Normal --- Hardmode 25 man -(@Thorim25h,1,100,3,0,-@Thorim25Ref,1), -- 1x Normal Loot Item -(@Thorim25h,2,100,3,0,-@HelmToken,2), -- 2x Token -(@Thorim25h,47241,100,3,0,1,1), -- 1x Emblem of Triumph -(@Thorim25h,3,10,3,0,-@Recipe,1), -- Chance on Recipe -(@Thorim25h,45087,10,3,0,1,1), -- Chance on Runed Orb -(@Thorim25h,45817,-100,1,0,1,1), -- Thorim's Sigil (QUEST ONLY, HARDMODE ONLY) -(@Thorim25h,45083,18,1,0,1,1), -- Fragment of Val'anyr Hardmode --- 1 from Hardmode items -(@Thorim25h,45471,0,1,1,1,1), -- Fate's Clutch -(@Thorim25h,45570,0,1,1,1,1), -- Skyforge Crossbow -(@Thorim25h,45472,0,1,1,1,1), -- Warhelm of the Champion -(@Thorim25h,45474,0,1,1,1,1), -- Pauldrons of the Combatant -(@Thorim25h,45470,0,1,1,1,1), -- Wisdom's Hold -(@Thorim25h,45473,0,1,1,1,1); -- Embrace of the Gladiator - diff --git a/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql b/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql deleted file mode 100644 index 5ad26809cdf..00000000000 --- a/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Increase dropchance for Venture Co. Explosives -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-10 WHERE `entry` IN(28123,28124) AND `item`=39651; diff --git a/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql b/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql deleted file mode 100644 index ab1c562f7dd..00000000000 --- a/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql +++ /dev/null @@ -1,501 +0,0 @@ --- implement missing Northrend pickpocket loot --- reference IDs -SET @NEWREF0 := 10026; -SET @NEWREF1 := @NEWREF0+1; -SET @NEWREF2 := @NEWREF0+2; -SET @NEWREF3 := @NEWREF0+3; -SET @NEWREF4 := @NEWREF0+4; -SET @NEWREF5 := @NEWREF0+5; -SET @NEWREF6 := @NEWREF0+6; -SET @NEWREF7 := @NEWREF0+7; -SET @NEWREF8 := @NEWREF0+8; -SET @NEWREF9 := @NEWREF0+9; --- new references -DELETE FROM `reference_loot_template` WHERE entry IN (@NEWREF0, @NEWREF1, @NEWREF2, @NEWREF3, @NEWREF4, @NEWREF5, @NEWREF6, @NEWREF7, @NEWREF8, @NEWREF9); -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`mincountOrRef`,`maxcount`) VALUES -(@NEWREF0,33447,25,1,1),-- Runic Healing Potion -(@NEWREF0,35953,30,1,1),-- Mead Basted Caribou -(@NEWREF0,38260,50,1,1),-- Empty Tobacco Pouch -(@NEWREF0,43575,80,1,1),-- Reinforced Junkbox -(@NEWREF1,36862,4,1,1),-- Wrogn Troll Dice -(@NEWREF1,40202,20,1,1),-- Sizzling Grizzly Flank -(@NEWREF2,33452,30,1,1),-- Honey-Spiced Lichen -(@NEWREF2,38269,35,1,1),-- Soggy Handkerchief -(@NEWREF3,33454,15,1,1),-- Salted Venison -(@NEWREF3,38261,13,1,1),-- Ben House Key -(@NEWREF4,38263,19,1,1),-- Too-Small Amband -(@NEWREF4,38264,18,1,1),-- A Very Pretty Rock -(@NEWREF5,29448,9,1,1),-- Mag'har Mild Cheese -(@NEWREF5,29450,13,1,1),-- Telaari Grapes -(@NEWREF5,37467,40,1,1),-- A Steamy Romance Novel: Forbidden Love -(@NEWREF6,35947,25,1,1),-- Sparkling Frostcap -(@NEWREF6,38269,40,1,1),-- Soggy Handkerchief -(@NEWREF7,33447,25,1,1),-- Runic Healing Potion -(@NEWREF7,35947,25,1,1),-- Sparkling Frostcap -(@NEWREF7,38269,40,1,1),-- Soggy Handkerchief -(@NEWREF7,43575,80,1,1),-- Reinforced Junkbox -(@NEWREF8,35948,11,1,1),-- Savory Snowplum -(@NEWREF8,35950,9,1,1),-- Sweet Potato Bread -(@NEWREF8,35952,8,1,1),-- Briny Hardcheese -(@NEWREF9,33447,25,1,1),-- Runic Healing Potion -(@NEWREF9,38260,50,1,1),-- Empty Tobacco Pouch -(@NEWREF9,43575,80,1,1); -- Reinforced Junkbox --- implement pickpokect loot -UPDATE `creature_template` SET `pickpocketloot`=entry WHERE `entry` IN (25800,23667,23674,23760,23796,23865,23875,23963,24069,24262,24400,24460,25351,25427,25428,25429,25430,25601,25801,26073,26202,26334,26413,26447,26480,26481,26620,26621,26624,26626,26635,26636,26637,26639,26658,26681,26696,26727,26729,26800,26802,26836,26948,27105,27210,27211,/**/27234,27235,27247,27278,27289,27334,27342,27431,27533,27580,27639,27640,27699,27800,27859,27860,27961,27964,27965,28494,28496,28565,28803,28837,28838,28848,28961,28965,29369,29407,29553,29554,29656,29793,29820,29822,29836,29874,29875,29885,29920,30283,30319,30856,30868,31396,31554,32263); -UPDATE `creature_template` SET `pickpocketloot`=25430 WHERE `entry` IN (23654,23656,23663,23665,25434,26728,26827,26926,27554,32572); -UPDATE `creature_template` SET `pickpocketloot`=26481 WHERE `entry` IN (23662,23940,24016,24161,26493,26655,27007,27009); -UPDATE `creature_template` SET `pickpocketloot`=25351 WHERE `entry` IN (23993,24540,25224,25383,26343,26492,26891,26946,27224,27226,27283,27360,27552,27799,27823,27826,28564,28750); -UPDATE `creature_template` SET `pickpocketloot`=27533 WHERE `entry` IN (26555,26669,26670,26694,26830,27871,28022,28108,28242,28268,28419,29123,29133,29722,29738,30701,30894,30922,30949,31139,31150,31779,31847,32278,32505); -UPDATE `creature_template` SET `pickpocketloot`=30319 WHERE `entry` IN (30111,30179); -DELETE FROM `pickpocketing_loot_template` WHERE entry IN (25800,23656,23662,23663,23665,23667,23674,23760,23796,23865,23875,23940,23963,23993,24016,24069,24161,24262,24400,24460,24540,25224,25351,25383,25427,25428,25429,25430,25434,25601,25801,26073,26202,26334,26343,26413,26447,26480,26481,26492,26493,26555,26620,26621,26624,26626,26635,26636,26637,26639,26655,26658,26669,26670,26681,26694,26696,26727,26728,26729,26800,26802,26827,26830,26836,26891,26926,26946,26948,27007,27009,27105,27210,27211,27224,27226,27234,27235,27247,27278,27283,27289,27334,27342,27360,27431,27533,27552,27554,27580,27639,27640,27699,27799,27800,27823,27826,27859,27860,27871,27961,27964,27965,28022,28108,28242,28268,28419,28494,28496,28564,28565,28750,28803,28837,28838,28848,28961,28965,29123,29133,29369,29407,29553,29554,29656,29722,29738,29793,29820,29822,29836,29874,29875,29885,29920,30111,30179,30283,30319,30701,30856,30868,30894,30922,30949,31139,31150,31396,31554,31779,31847,32263,32278,32505,32572); -INSERT INTO `pickpocketing_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Plague Walker -(30283,43575,100,0,1,1),-- Reinforced Junkbox -(30283,0,100,0,-@NEWREF6,1), --- Twilight Darkcaster -(30319,0,100,0,-@NEWREF0,1), -(30319,33449,11,0,1,1),-- Crusty Flatbread -(30319,1,100,0,-@NEWREF1,1), -(30319,2,100,0,-@NEWREF3,1), --- High Priest Talet-Kha -(26073,43575,58,0,1,1),-- Reinforced Junkbox -(26073,0,100,0,-@NEWREF5,1), -(26073,33449,8,0,1,1),-- Crusty Flatbread -(26073,33447,8,0,1,1),-- Runic Healing Potion --- Nedar, Lord of Rhinos -(25801,0,100,0,-@NEWREF5,1), -(25801,33447,6,0,1,1),-- Runic Healing Potion -(25801,38261,6,0,1,1),-- Bent House Key --- Clam Master K -(25800,43575,47,0,1,1),-- Reinforced Junkbox -(25800,0,100,0,-@NEWREF5,1), -(25800,38261,15,0,1,1),-- Bent House Key -(25800,33449,5,0,1,1),-- Crusty Flatbread -(25800,33447,5,0,1,1),-- Runic Healing Potion --- Magmothregar -(25430,0,100,0,-@NEWREF3,1), -(25430,1,100,0,-@NEWREF9,1), -(25430,33449,7,0,1,1),-- Crusty Flatbread -(25430,36862,4,0,1,1),-- Wrogn Troll Dice --- Kaganishu -(25427,43575,43,0,1,1),-- Reinforced Junkbox -(25427,33454,35,0,1,1),-- Salted Venison -(25427,0,100,0,-@NEWREF4,1), -(25427,33447,8,0,1,1),-- Runic Healing Potion --- Prince Valanar -(25601,43575,43,0,1,1),-- Reinforced Junkbox -(25601,37467,39,0,1,1),-- A Steamy Romance Novel: Forbidden Love -(25601,33447,9,0,1,1),-- Runic Healing Potion -(25601,38261,9,0,1,1),-- Bent House Key -(25601,33449,4,0,1,1),-- Crusty Flatbread -(25601,29450,4,0,1,1),-- Telaari Grapes --- Ghostly Sage -(25351,43575,42,0,1,1),-- Reinforced Junkbox -(25351,0,100,0,-@NEWREF2,1), -(25351,33447,10,0,1,1),-- Runic Healing Potion --- Luthion the Vile -(27860,43575,42,0,1,1),-- Reinforced Junkbox -(27860,0,100,0,-@NEWREF5,1), -(27860,38261,13,0,1,1),-- Bent House Key -(27860,33449,6,0,1,1),-- Crusty Flatbread -(27860,33447,6,0,1,1),-- Runic Healing Potion --- Reckless Scavenger -(26658,0,100,0,-@NEWREF2,1), -(26658,43575,40,0,1,1),-- Reinforced Junkbox --- Ziggurat Defender -(26202,43575,40,0,1,1),-- Reinforced Junkbox -(26202,0,100,0,-@NEWREF2,1), -(26202,33447,7,0,1,1),-- Runic Healing Potion -(26202,29569,3,0,1,1),-- Strong Junkbox --- Magmoth Forager -(25429,43575,39,0,1,1),-- Reinforced Junkbox -(25429,33454,27,0,1,1),-- Salted Venison -(25429,0,100,0,-@NEWREF4,1), -(25429,33447,10,0,1,1),-- Runic Healing Potion -(25429,38266,0.5,0,1,1),-- Rotund Relic --- Magmoth Shaman -(25428,43575,39,0,1,1),-- Reinforced Junkbox -(25428,33454,28,0,1,1),-- Salted Venison -(25428,0,100,0,-@NEWREF4,1), -(25428,33447,9,0,1,1),-- Runic Healing Potion -(25428,38266,0.5,0,1,1),-- Rotund Relic --- Vanthryn the Merciless -(27859,43575,39,0,1,1),-- Reinforced Junkbox -(27859,0,100,0,-@NEWREF5,1), -(27859,33449,12,0,1,1),-- Crusty Flatbread -(27859,38261,12,0,1,1),-- Bent House Key -(27859,33447,3,0,1,1),-- Runic Healing Potion --- Unbound Corrupter -(30868,43575,47,0,1,1),-- Reinforced Junkbox -(30868,40202,18,0,1,1),-- Sizzling Grizzly Flank -(30868,33447,16,0,1,1),-- Runic Healing Potion -(30868,0,100,0,-@NEWREF4,1), --- Unbound Trickster -(30856,43575,38,0,1,1),-- Reinforced Junkbox -(30856,0,100,0,-@NEWREF4,1), -(30856,33447,19,0,1,1),-- Runic Healing Potion -(30856,40202,14,0,1,1),-- Sizzling Grizzly Flank --- Kreug Oathbreaker -(27105,43575,63,0,1,1),-- Reinforced Junkbox -(27105,33447,25,0,1,1),-- Runic Healing Potion -(27105,38269,13,0,1,1),-- Soggy Handkerchief --- Lead Cannoneer Zierhut -(27235,43575,53,0,1,1),-- Reinforced Junkbox -(27235,0,100,0,-@NEWREF5,1), -(27235,33447,8,0,1,1),-- Runic Healing Potion -(27235,38261,8,0,1,1),-- Bent House Key --- Devout Bodyguard -(27247,43575,50,0,1,1),-- Reinforced Junkbox -(27247,37467,42,0,1,1),-- A Steamy Romance Novel: Forbidden Love -(27247,33447,8,0,1,1),-- Runic Healing Potion -(27247,29450,8,0,1,1),-- Telaari Grapes -(27247,38261,8,0,1,1),-- Bent House Key --- Magnataur Alpha -(26481,0,100,0,-@NEWREF9,1), -(26481,1,100,0,-@NEWREF3,1), -(26481,33449,5,0,1,1),-- Crusty Flatbread --- High General Abbendis -(27210,43575,48,0,1,1),-- Reinforced Junkbox -(27210,0,100,0,-@NEWREF5,1), -(27210,33449,10,0,1,1),-- Crusty Flatbread -(27210,33447,10,0,1,1),-- Runic Healing Potion -(27210,38261,8,0,1,1),-- Bent House Key --- Anub'ar Dreadweaver -(26413,43575,44,0,1,1),-- Reinforced Junkbox -(26413,43576,22,0,1,1),-- Chitin Polish -(26413,33452,11,0,1,1),-- Honey-Spiced Lichen -(26413,33447,11,0,1,1),-- Runic Healing Potion -(26413,43577,11,0,1,1),-- Carapace Cleanser --- Naxxramas Necrolord -(27289,33452,44,0,1,1),-- Honey-Spiced Lichen -(27289,43575,44,0,1,1),-- Reinforced Junkbox -(27289,33447,11,0,1,1),-- Runic Healing Potion --- Onslaught Commander Iustus -(27334,37467,50,0,1,1),-- A Steamy Romance Novel: Forbidden Love -(27334,43575,44,0,1,1),-- Reinforced Junkbox -(27334,29448,13,0,1,1),-- Mag'har Mild Cheese -(27334,38261,6,0,1,1),-- Bent House Key --- Blacksmith Goodman -(27234,43575,41,0,1,1),-- Reinforced Junkbox -(27234,0,100,0,-@NEWREF5,1), -(27234,38261,13,0,1,1),-- Bent House Key -(27234,33447,9,0,1,1),-- Runic Healing Potion -(27234,33449,7,0,1,1),-- Crusty Flatbread --- Magnataur Youngling -(26480,33449,19,0,1,1),-- Crusty Flatbread -(26480,0,100,0,-@NEWREF3,1), -(26480,1,100,0,-@NEWREF9,1), --- Bloodpaw Warrior -(27342,43575,40,0,1,1),-- Reinforced Junkbox -(27342,33454,26,0,1,1),-- Salted Venison -(27342,0,100,0,-@NEWREF4,1), -(27342,33447,11,0,1,1),-- Runic Healing Potion -(27342,38266,0.6,0,1,1),-- Rotund Relic --- Frigid Geist -(27533,0,100,0,-@NEWREF7,1), --- Snowplain Zealot -(27278,43575,40,0,1,1),-- Reinforced Junkbox -(27278,33454,22,0,1,1),-- Salted Venison -(27278,0,100,0,-@NEWREF4,1), -(27278,33447,12,0,1,1),-- Runic Healing Potion -(27278,38266,0.3,0,1,1),-- Rotund Relic --- Hulking Atrocity -(26948,43575,39,0,1,1),-- Reinforced Junkbox -(26948,0,100,0,-@NEWREF2,1), -(26948,33447,9,0,1,1),-- Runic Healing Potion -(26948,29569,0.3,0,1,1),-- Strong Junkbox -(26948,38268,0.3,0,1,1),-- Spare Hand --- Onslaught Executioner -(27211,43575,39,0,1,1),-- Reinforced Junkbox -(27211,0,100,0,-@NEWREF5,1), -(27211,33449,12,0,1,1),-- Crusty Flatbread -(27211,38261,11,0,1,1),-- Bent House Key -(27211,33447,5,0,1,1),-- Runic Healing Potion --- Gigantaur -(26836,0,100,0,-@NEWREF9,1), -(26836,1,100,0,-@NEWREF3,1), -(26836,33449,12,0,1,1),-- Crusty Flatbread --- Leprous Servant -(27800,43575,38,0,1,1),-- Reinforced Junkbox -(27800,0,100,0,-@NEWREF2,1), -(27800,33447,7,0,1,1),-- Runic Healing Potion -(27800,38268,2,0,1,1),-- Spare Hand --- Wretched Belcher -(26624,43575,100,0,1,1),-- Reinforced Junkbox -(26624,0,100,0,-@NEWREF2,1), -(26624,33447,25,0,1,1),-- Runic Healing Potion -(26624,35947,25,0,1,1),-- Sparkling Frostcap --- Drakkari Commander -(27431,43575,90,0,1,1),-- Reinforced Junkbox -(27431,0,100,0,-@NEWREF2,1), -(27431,33447,26,0,1,1),-- Runic Healing Potion -(27431,35947,10,0,1,1),-- Sparkling Frostcap --- Drakkari Guardian -(26620,0,100,0,-@NEWREF0,1), -(26620,33454,17,0,1,1),-- Salted Venison -(26620,33449,9,0,1,1),-- Crusty Flatbread -(26620,38261,9,0,1,1),-- Bent House Key -(26620,1,100,0,-@NEWREF1,1), --- Risen Drakkari Soulmage -(26636,43575,85,0,1,1),-- Reinforced Junkbox -(26636,0,100,0,-@NEWREF2,1), -(26636,35947,21,0,1,1),-- Sparkling Frostcap -(26636,33447,16,0,1,1),-- Runic Healing Potion --- Ghoul Tormentor -(26621,43575,81,0,1,1),-- Reinforced Junkbox -(26621,0,100,0,-@NEWREF2,1), -(26621,35947,24,0,1,1),-- Sparkling Frostcap -(26621,33447,14,0,1,1),-- Runic Healing Potion --- Risen Drakkari Warrior -(26635,43575,71,0,1,1),-- Reinforced Junkbox -(26635,0,100,0,-@NEWREF2,1), -(26635,33447,29,0,1,1),-- Runic Healing Potion -(26635,35947,18,0,1,1),-- Sparkling Frostcap -(26635,38268,0.8,0,1,1),-- Spare Hand --- Risen Drakkari Handler -(26637,0,100,0,-@NEWREF2,1), -(26637,43575,67,0,1,1),-- Reinforced Junkbox -(26637,33447,30,0,1,1),-- Runic Healing Potion -(26637,35947,18,0,1,1),-- Sparkling Frostcap --- Scourge Reanimator -(26626,0,100,0,-@NEWREF2,1), -(26626,43575,67,0,1,1),-- Reinforced Junkbox -(26626,33447,21,0,1,1),-- Runic Healing Potion -(26626,35947,21,0,1,1),-- Sparkling Frostcap --- Drakkari Shaman -(26639,0,100,0,-@NEWREF0,1), -(26639,33449,18,0,1,1),-- Crusty Flatbread -(26639,1,100,0,-@NEWREF3,1), -(26639,40202,11,0,1,1),-- Sizzling Grizzly Flank --- Selas -(27580,43575,50,0,1,1),-- Reinforced Junkbox -(27580,0,100,0,-@NEWREF3,1), -(27580,38260,20,0,1,1),-- Empty Tobacco Pouch --- Forgemaster Damrath -(26334,43575,48,0,1,1),-- Reinforced Junkbox -(26334,0,100,0,-@NEWREF5,1), -(26334,33447,9,0,1,1),-- Runic Healing Potion -(26334,38261,9,0,1,1),-- Bent House Key --- Grumbald One-Eye -(26681,43575,39,0,1,1),-- Reinforced Junkbox -(26681,33454,28,0,1,1),-- Salted Venison -(26681,0,100,0,-@NEWREF4,1), -(26681,33447,9,0,1,1),-- Runic Healing Potion --- Drakkari Shaman -(26447,0,100,0,-@NEWREF9,1), -(26447,1,100,0,-@NEWREF3,1), -(26447,33449,10,0,1,1),-- Crusty Flatbread -(26447,35799,0.2,0,1,1),-- Frozen Mojo -(26447,36862,0.2,0,1,1),-- Wrogn Troll Dice --- Drakkari God Hunter -(29820,0,100,0,-@NEWREF0,1), -(29820,1,100,0,-@NEWREF1,1), --- Drakkari Battle Rider -(29836,0,100,0,-@NEWREF0,1), -(29836,40202,18,0,1,1),-- Sizzling Grizzly Flank --- Ruins Dweller -(29920,43575,71,0,1,1),-- Reinforced Junkbox -(29920,37452,69,0,1,1),-- Fatty Bluefin -(29920,38274,58,0,1,1),-- Large Snail Shell -(29920,38273,35,0,1,1),-- Brain Coral -(29920,33447,16,0,1,1),-- Runic Healing Potion --- Drakkari Fire Weaver -(29822,0,100,0,-@NEWREF0,1), -(29822,40202,24,0,1,1),-- Sizzling Grizzly Flank --- Drakkari Inciter -(29874,0,100,0,-@NEWREF0,1), -(29874,36862,16,0,1,1),-- Wrogn Troll Dice -(29874,40202,12,0,1,1),-- Sizzling Grizzly Flank --- Titanium Siegebreaker -(28961,0,100,0,-@NEWREF0,1), -(28961,40202,35,0,1,1),-- Sizzling Grizzly Flank --- Stormforged Sentinel -(28837,0,100,0,-@NEWREF0,1), -(28837,40202,16,0,1,1),-- Sizzling Grizzly Flank --- Titanium Thunderer -(28965,0,100,0,-@NEWREF0,1), -(28965,40202,44,0,1,1),-- Sizzling Grizzly Flank --- Titanium Vanguard -(28838,0,100,0,-@NEWREF0,1), -(28838,40202,27,0,1,1),-- Sizzling Grizzly Flank --- Dark Rune Scholar -(27964,0,100,0,-@NEWREF9,1), -(27964,1,100,0,-@NEWREF1,1), --- Dark Rune Worker -(27961,0,100,0,-@NEWREF0,1), -(27961,40202,29,0,1,1),-- Sizzling Grizzly Flank -(27961,36862,4,0,1,1),-- Wrogn Troll Dice --- Dark Rune Shaper -(27965,0,100,0,-@NEWREF0,1), -(27965,40202,28,0,1,1),-- Sizzling Grizzly Flank --- Steel Gate Archaeologist -(24400,0,100,0,-@NEWREF0,1), -(24400,1,100,0,-@NEWREF5,1), -(24400,33449,7,0,1,1),-- Crusty Flatbread -(24400,38261,9,0,1,1),-- Bent House Key --- Blacksouled Keeper -(23875,0,100,0,-@NEWREF0,1), -(23875,1,100,0,-@NEWREF3,1), -(23875,33449,14,0,1,1),-- Crusty Flatbread --- Winterskorn Rune-Seer -(23667,0,100,0,-@NEWREF0,1), -(23667,33449,7,0,1,1),-- Crusty Flatbread -(23667,33454,7,0,1,1),-- Salted Venison --- Sergeant Lorric -(23963,43575,45,0,1,1),-- Reinforced Junkbox -(23963,0,100,0,-@NEWREF5,1), -(23963,33447,13,0,1,1),-- Runic Healing Potion -(23963,38261,11,0,1,1),-- Bent House Key -(23963,33449,7,0,1,1),-- Crusty Flatbread --- Gjalerhorn Scavenger -(27699,0,100,0,-@NEWREF4,1), -(27699,43575,43,0,1,1),-- Reinforced Junkbox -(27699,33454,22,0,1,1),-- Salted Venison -(27699,33447,7,0,1,1),-- Runic Healing Potion -(27699,29569,0.8,0,1,1),-- Strong Junkbox --- Iron Rune Binder -(23796,0,100,0,-@NEWREF5,1), -(23796,43575,42,0,1,1),-- Reinforced Junkbox -(23796,38261,12,0,1,1),-- Bent House Key -(23796,33449,11,0,1,1),-- Crusty Flatbread -(23796,33447,9,0,1,1),-- Runic Healing Potion -(23796,29569,0.5,0,1,1),-- Strong Junkbox --- Forsaken Plaguebringer -(23760,0,100,0,-@NEWREF2,1), -(23760,43575,41,0,1,1),-- Reinforced Junkbox -(23760,33447,10,0,1,1),-- Runic Healing Potion -(23760,38268,0.3,0,1,1),-- Spare Hand --- Chillmere Tidehunter -(24460,43575,40,0,1,1),-- Reinforced Junkbox -(24460,38274,33,0,1,1),-- Large Snail Shell -(24460,37452,18,0,1,1),-- Fatty Bluefin -(24460,38273,15,0,1,1),-- Brain Coral -(24460,33447,7,0,1,1),-- Runic Healing Potion --- Vrykul Soul -(24262,0,100,0,-@NEWREF2,1), -(24262,43575,40,0,1,1),-- Reinforced Junkbox -(24262,33447,3,0,1,1),-- Runic Healing Potion --- Iron Rune Sage -(23674,0,100,0,-@NEWREF5,1), -(23674,43575,39,0,1,1),-- Reinforced Junkbox -(23674,38261,13,0,1,1),-- Bent House Key -(23674,33449,9,0,1,1),-- Crusty Flatbread -(23674,33447,6,0,1,1),-- Runic Healing Potion --- Vengeance Bringer -(23865,43575,39,0,1,1),-- Reinforced Junkbox -(23865,0,100,0,-@NEWREF2,1), --- Restless Lookout -(31554,43575,80,0,1,1),-- Reinforced Junkbox -(31554,35947,40,0,1,1),-- Sparkling Frostcap --- Val'kyr Taskmistress -(31396,43575,56,0,1,1),-- Reinforced Junkbox -(31396,35947,38,0,1,1),-- Sparkling Frostcap -(31396,33447,15,0,1,1),-- Runic Healing Potion --- Overseer Veraj -(32263,43575,42,0,1,1),-- Reinforced Junkbox -(32263,37467,28,0,1,1),-- A Steamy Romance Novel: Forbidden Love -(32263,38261,15,0,1,1),-- Bent House Key -(32263,33447,13,0,1,1),-- Runic Healing Potion -(32263,0,100,0,-@NEWREF8,1), --- Steward -(26729,0,100,0,-@NEWREF0,1), -(26729,1,100,0,-@NEWREF3,1), -(26729,33449,31,0,1,1),-- Crusty Flatbread -(26729,29569,0.5,0,1,1),-- Strong Junkbox --- Alliance Berserker -(26800,43575,62,0,1,1),-- Reinforced Junkbox -(26800,33449,19,0,1,1),-- Crusty Flatbread -(26800,38261,16,0,1,1),-- Bent House Key -(26800,33447,10,0,1,1),-- Runic Healing Potion -(26800,0,100,0,-@NEWREF5,1), --- Alliance Ranger -(26802,0,100,0,-@NEWREF5,1), -(26802,43575,60,0,1,1),-- Reinforced Junkbox -(26802,38261,34,0,1,1),-- Bent House Key -(26802,33449,24,0,1,1),-- Crusty Flatbread -(26802,33447,12,0,1,1),-- Runic Healing Potion --- Mage Hunter Ascendant -(26727,0,100,0,-@NEWREF0,1), -(26727,1,100,0,-@NEWREF3,1), -(26727,33449,29,0,1,1),-- Crusty Flatbread --- Ring-Lord Sorceress -(27639,43575,87,0,1,1),-- Reinforced Junkbox -(27639,37467,46,0,1,1),-- A Steamy Romance Novel: Forbidden Love -(27639,38261,28,0,1,1),-- Bent House Key -(27639,33447,19,0,1,1),-- Runic Healing Potion -(27639,0,100,0,-@NEWREF8,1), -(27639,36863,1.6,0,1,1),-- Decahedral Dwarven Dice --- Ring-Lord Conjurer -(27640,37467,67,0,1,1),-- A Steamy Romance Novel: Forbidden Love -(27640,43575,64,0,1,1),-- Reinforced Junkbox -(27640,33447,30,0,1,1),-- Runic Healing Potion -(27640,38261,26,0,1,1),-- Bent House Key -(27640,0,100,0,-@NEWREF8,1), --- Mildred the Cruel -(29885,0,100,0,-@NEWREF0,1), -(29885,40202,13,0,1,1),-- Sizzling Grizzly Flank --- Snowblind Devotee -(29407,43575,42,0,1,1),-- Reinforced Junkbox -(29407,40202,29,0,1,1),-- Sizzling Grizzly Flank -(29407,0,100,0,-@NEWREF4,1), -(29407,33447,12,0,1,1),-- Runic Healing Potion --- Snowblind Devotee -(29554,43575,43,0,1,1),-- Reinforced Junkbox -(29554,40202,27,0,1,1),-- Sizzling Grizzly Flank -(29554,0,100,0,-@NEWREF4,1), -(29554,33447,12,0,1,1),-- Runic Healing Potion -(29554,38266,0.2,0,1,1),-- Rotund Relic --- Frostfeather Witch -(29793,43575,40,0,1,1),-- Reinforced Junkbox -(29793,40202,21,0,1,1),-- Sizzling Grizzly Flank -(29793,0,100,0,-@NEWREF4,1), -(29793,33447,16,0,1,1),-- Runic Healing Potion --- Icemane Yeti -(29875,43575,39,0,1,1),-- Reinforced Junkbox -(29875,40202,23,0,1,1),-- Sizzling Grizzly Flank -(29875,0,100,0,-@NEWREF4,1), -(29875,33447,15,0,1,1),-- Runic Healing Potion -(29875,38266,0.3,0,1,1),-- Rotund Relic --- Garm Watcher -(29553,0,100,0,-@NEWREF0,1), -(29553,1,100,0,-@NEWREF1,1), -(29553,24231,0.3,0,2,2),-- Coarse Snuff --- Stormforged Taskmaster -(29369,43575,38,0,1,1),-- Reinforced Junkbox -(29369,37467,34,0,1,1),-- A Steamy Romance Novel: Forbidden Love -(29369,33447,13,0,1,1),-- Runic Healing Potion -(29369,38261,6,0,1,1),-- Bent House Key -(29369,0,100,0,-@NEWREF8,1), --- Dragonflayer Bonecrusher -(24069,0,100,0,-@NEWREF0,1), -(24069,1,100,0,-@NEWREF1,1), -(24069,29569,47,0,1,1),-- Strong Junkbox -(24069,29570,34,0,1,1),-- A Gnome Effigy -(24069,27855,22,0,1,1),-- Mag'har Grainbread -(24069,27854,19,0,1,1),-- Smoked Talbuk Venison -(24069,22829,10,0,1,1),-- Super Healing Potion -(24069,23438,1.2,0,1,1),-- Star of Elune --- Ymirjar Berserker -(26696,0,100,0,-@NEWREF7,1), -(26696,29569,1.1,0,1,1),-- Strong Junkbox --- Kutube'sa -(28494,0,100,0,-@NEWREF0,1), -(28494,1,100,0,-@NEWREF1,1), --- Chulo the Mad -(28496,0,100,0,-@NEWREF0,1), -(28496,40202,6,0,1,1),-- Sizzling Grizzly Flank --- Drakuru's Guard -(28803,43575,50,0,1,1),-- Reinforced Junkbox -(28803,33447,33,0,1,1),-- Runic Healing Potion -(28803,38269,17,0,1,1),-- Soggy Handkerchief --- Prophet of Har'koa -(28848,0,100,0,-@NEWREF0,1), -(28848,40202,3,0,1,1),-- Sizzling Grizzly Flank --- Decaying Ghoul -(28565,0,100,0,-@NEWREF7,1), -(28565,22829,0.9,0,1,1),-- Super Healing Potion --- Drakuru Berserker -(29656,0,100,0,-@NEWREF0,1), -(29656,1,100,0,-@NEWREF3,1), -(29656,33449,11,0,1,1),-- Crusty Flatbread -(29656,29569,0.9,0,1,1); -- Strong Junkbox diff --git a/sql/updates/world/2012_04_18_05_world_conditions.sql b/sql/updates/world/2012_04_18_05_world_conditions.sql deleted file mode 100644 index ecf80f270a3..00000000000 --- a/sql/updates/world/2012_04_18_05_world_conditions.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Add condition to the Lovely Charm aura -DELETE FROM conditions WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`= 69511; -INSERT INTO conditions (SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, COMMENT) VALUES -(17,0,69511,0,12,8,0,0,0, '', 'Lovely Charm - Only during event'); diff --git a/sql/updates/world/2012_04_18_06_world_creature_template.sql b/sql/updates/world/2012_04_18_06_world_creature_template.sql deleted file mode 100644 index 8c167c2ffa1..00000000000 --- a/sql/updates/world/2012_04_18_06_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Remove Skinning loot from Blackwing Spellbinder -UPDATE `creature_template` SET `skinloot`=0 WHERE `entry`=12457; diff --git a/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql b/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql deleted file mode 100644 index 6c39cc95b48..00000000000 --- a/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- update wrong area. -UPDATE `fishing_loot_template` SET `entry`=4560 WHERE `entry`=4395 AND `item`=11026; diff --git a/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql b/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql deleted file mode 100644 index 4b00685ed55..00000000000 --- a/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Add loot for Hrothgar's Landing -DELETE FROM `creature_loot_template` WHERE `entry` IN (34980,34838,34839,34965); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- AURIAYA 10-man --- Drottinn Hrothgar - http://old.wowhead.com/npc=34980 -(34980,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg --- Kvaldir Reaver -(34838,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg -(34838,49676,5,1,0,1,1), -- Kvaldir Attack Plans -(34838,33470,35,1,0,1,4), -- 1-4x Frostweave Cloth -(34838,1,10,1,0,-24727,1), -- 1 of Northrend scrolls -(34838,2,10,1,0,-26002,1), -- Northrend Grey Item Reference1 -(34838,3,2,1,0,-35080,1), -- Northrend Green Item Reference --- Kvaldir Mist Binder -(34839,46859,-100,1,0,1,1), -- Stolen Tallstrider Leg -(34839,49676,5,1,0,1,1), -- Kvaldir Attack Plans -(34839,33470,35,1,0,1,4), -- 1-4x Frostweave Cloth -(34839,1,10,1,0,-24727,1), -- 1 of Northrend scrolls -(34839,2,10,1,0,-26002,1), -- Northrend Grey Item Reference1 -(34839,3, 2,1,0,-35080,1), -- Northrend Green Item Reference --- Mistcaller Yngvar -(34965,46859,-100,1,0,1,1); -- Stolen Tallstrider Leg diff --git a/sql/updates/world/2012_04_19_00_world_creature_template.sql b/sql/updates/world/2012_04_19_00_world_creature_template.sql deleted file mode 100644 index e9abd40095e..00000000000 --- a/sql/updates/world/2012_04_19_00_world_creature_template.sql +++ /dev/null @@ -1,7 +0,0 @@ --- update Plague Slime & Marauding Geist to naxx25 trash lootid -UPDATE `creature_template` SET `lootid`=100005 WHERE `entry` IN(29575,30424); --- update Plague Slime & Marauding Geist to naxx10 trash lootid -UPDATE `creature_template` SET `lootid`=100003 WHERE `entry` IN(16243,30083); -DELETE FROM `creature_loot_template` WHERE `entry` IN(30424,29575,16243,30083); --- Remove scraps for naxx10 from creature creature_loot_template -DELETE FROM `creature_loot_template` WHERE `item` IN (22373,22374,22375,22376); diff --git a/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql b/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql deleted file mode 100644 index 997b16ff65d..00000000000 --- a/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql +++ /dev/null @@ -1,202 +0,0 @@ --- Fix to add pickpocketing loot for humoniods in borean tundra -SET @GORLOCREF := 25100; -SET @BERYLREF := @GORLOCREF+1; -SET @BLOODREF := @GORLOCREF+2; -SET @CHIEFREF := @GORLOCREF+3; -SET @CULTREF := @GORLOCREF+4; -SET @KVALDIRREF := @GORLOCREF+5; -SET @CLAXREF := @GORLOCREF+6; -SET @MAGMOTHREF := @GORLOCREF+7; --- Create reference templates -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GORLOCREF AND @GORLOCREF+7; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@GORLOCREF,29576,57,1,0,1,1), -- Shark Bait -(@GORLOCREF,29569,30,1,0,1,1), -- Strong Junkbox -(@GORLOCREF,27858,8,1,0,1,1), -- Sunspring Carp -(@GORLOCREF,22829,3,1,0,1,1), -- Super Healing Potion -(@GORLOCREF,23436,0.5,1,0,1,1), -- Living Ruby -(@GORLOCREF,23437,0.5,1,0,1,1), -- Talasite -(@GORLOCREF,23440,0.5,1,0,1,1), -- Dawnstone -(@GORLOCREF,23438,0.5,1,0,1,1), -- Star of Elune -(@GORLOCREF,23439,0.5,1,0,1,1), -- Noble Topaz --- -------------------------------------------------- -(@BERYLREF,37467,32.5,1,0,1,1), -- A Steamy Romance Novel: Forbidden Love -(@BERYLREF,43575,31,1,0,1,1), -- Reinforced Junkbox -(@BERYLREF,38261,10,1,0,1,1), -- Bent House Key -(@BERYLREF,29448,7,1,0,1,1), -- Mag'har Mild Cheese -(@BERYLREF,29450,7,1,0,1,1), -- Telaari Grapes -(@BERYLREF,33447,6,1,0,1,1), -- Runic Healing Potion -(@BERYLREF,33449,6,1,0,1,1), -- Crusty Flatbread -(@BERYLREF,36863,0.5,1,0,1,1), -- Decahedral Dwarven Dice --- -------------------------------------------------- -(@BLOODREF,29572,37,1,0,1,1), -- Aboriginal Carvings -(@BLOODREF,29569,33,1,0,1,1), -- Strong Junkbox -(@BLOODREF,8952,20,1,0,1,1), -- Roasted Quail -(@BLOODREF,22829,8,1,0,1,1), -- Super Healing Potion -(@BLOODREF,23438,0.5,1,0,1,1), -- Star of Elune -(@BLOODREF,23436,0.5,1,0,1,1), -- Living Ruby -(@BLOODREF,23441,0.5,1,0,1,1), -- Nightseye -(@BLOODREF,23437,0.5,1,0,1,1), -- Talasite -(@BLOODREF,23440,0.5,1,0,1,1), -- Dawnstone --- -------------------------------------------------- -(@CHIEFREF,29569,50,1,0,1,1), -- Strong Junkbox -(@CHIEFREF,27858,20,1,0,1,1), -- Sunspring Carp -(@CHIEFREF,29576,20,1,0,1,1), -- Shark Bait -(@CHIEFREF,22829,10,1,0,1,1), -- Super Healing Potion --- -------------------------------------------------- -(@CULTREF,29569,40,1,0,1,1), -- Strong Junkbox -(@CULTREF,29571,37,1,0,1,1), -- A Steamy Romance Novel -(@CULTREF,30458,8,1,0,1,1), -- Stromgarde Muenster -(@CULTREF,27855,7,1,0,1,1), -- Mag'har Grainbread -(@CULTREF,27856,6,1,0,1,1), -- Skethyl Berries -(@CULTREF,22829,2,1,0,1,1), -- Super Healing Potion -(@CULTREF,36863,0.5,1,0,1,1), -- Decahedral Dwarven Dice --- -------------------------------------------------- -(@KVALDIRREF,29569,39,1,0,1,1), -- Strong Junkbox -(@KVALDIRREF,29570,28,1,0,1,1), -- A Gnome Effigy -(@KVALDIRREF,27855,12,1,0,1,1), -- Mag'har Grainbread -(@KVALDIRREF,27854,12,1,0,1,1), -- Smoked Talbuk Venison -(@KVALDIRREF,22829,7,1,0,1,1), -- Super Healing Potion -(@KVALDIRREF,23436,0.5,1,0,1,1), -- Living Ruby -(@KVALDIRREF,23441,0.5,1,0,1,1), -- Nightseye -(@KVALDIRREF,23440,0.5,1,0,1,1), -- Dawnstone -(@KVALDIRREF,23439,0.5,1,0,1,1), -- Noble Topaz -(@KVALDIRREF,23437,0.5,1,0,1,1), -- Talasite --- -------------------------------------------------- -(@CLAXREF,43575,28,1,0,1,1), -- Reinforced Junkbox -(@CLAXREF,38273,26,1,0,1,1), -- Brain Coral -(@CLAXREF,38274,23,1,0,1,1), -- Large Snail Shell -(@CLAXREF,37452,17,1,0,1,1), -- Fatty Bluefin -(@CLAXREF,33447,6,1,0,1,1), -- Runic Healing Potion --- -------------------------------------------------- -(@MAGMOTHREF,38260,33,1,0,1,1), -- Empty Tobacco Pouch -(@MAGMOTHREF,38261,21,1,0,1,1), -- Bent House Key -(@MAGMOTHREF,33449,16,1,0,1,1), -- Crusty Flatbread -(@MAGMOTHREF,43575,16,1,0,1,1), -- Reinforced Junkbox -(@MAGMOTHREF,33454,9,1,0,1,1), -- Salted Venison -(@MAGMOTHREF,33447,5,1,0,1,1), -- Runic Healing Potion -(@MAGMOTHREF,36862,1,1,0,1,1); -- Worn Troll Dice --- ------------------- --- -- NPC Variables -- --- ------------------- -SET @NPC := 25686; -SET @NPC1 := 25700; -SET @NPC2 := 25687; -SET @NPC3 := 25685; -SET @NPC4 := 25449; -SET @NPC5 := 25316; -SET @NPC6 := 25353; -SET @NPC7 := 25719; -SET @NPC8 := 25804; -SET @NPC9 := 25392; -SET @NPC10 := 25651; -SET @NPC11 := 25836; -SET @NPC12 := 25979; -SET @NPC13 := 25806; -SET @NPC14 := 25720; -SET @NPC15 := 25803; -SET @NPC16 := 25880; -SET @NPC17 := 25618; -SET @NPC18 := 25839; -SET @NPC19 := 25470; -SET @NPC20 := 24567; -SET @NPC21 := 25467; -SET @NPC22 := 25468; -SET @NPC23 := 25501; -SET @NPC24 := 25726; -SET @NPC25 := 25701; -SET @NPC26 := 25725; -SET @NPC27 := 25699; -SET @NPC28 := 24576; -SET @NPC29 := 25605; -SET @NPC30 := 25609; -SET @NPC31 := 25378; -SET @NPC32 := 25843; -SET @NPC33 := 25496; -SET @NPC34 := 25479; -SET @NPC35 := 25760; -SET @NPC36 := 26266; -SET @NPC37 := 26451; -SET @NPC38 := 25521; -SET @NPC39 := 25613; -SET @NPC40 := 25522; -SET @NPC41 := 25520; -SET @NPC42 := 25209; -SET @NPC43 := 25210; -SET @NPC44 := 25216; -SET @NPC45 := 25215; -SET @NPC46 := 25217; -SET @NPC47 := 25789; -SET @NPC48 := 24469; -SET @NPC49 := 25432; -SET @NPC50 := 25433; -SET @NPC51 := 25615; -SET @NPC52 := 25523; --- ---------------------- --- -- Assign the loots -- --- ---------------------- -UPDATE `creature_template` SET `pickpocketloot`=`entry` WHERE `entry` IN (@NPC,@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6,@NPC7,@NPC8,@NPC9,@NPC10,@NPC11,@NPC12,@NPC13,@NPC14,@NPC15,@NPC16,@NPC17,@NPC18,@NPC19,@NPC20,@NPC21,@NPC22,@NPC23,@NPC24,@NPC25,@NPC26,@NPC27,@NPC28,@NPC29,@NPC30,@NPC31,@NPC32,@NPC33,@NPC34,@NPC35,@NPC36,@NPC37,@NPC38,@NPC39,@NPC40,@NPC41,@NPC42,@NPC43,@NPC44,@NPC45,@NPC46,@NPC47,@NPC48,@NPC49,@NPC50,@NPC51,@NPC52); -DELETE FROM `pickpocketing_loot_template` WHERE `entry` IN (@NPC,@NPC1,@NPC2,@NPC3,@NPC4,@NPC5,@NPC6,@NPC7,@NPC8,@NPC9,@NPC10,@NPC11,@NPC12,@NPC13,@NPC14,@NPC15,@NPC16,@NPC17,@NPC18,@NPC19,@NPC20,@NPC21,@NPC22,@NPC23,@NPC24,@NPC25,@NPC26,@NPC27,@NPC28,@NPC29,@NPC30,@NPC31,@NPC32,@NPC33,@NPC34,@NPC35,@NPC36,@NPC37,@NPC38,@NPC39,@NPC40,@NPC41,@NPC42,@NPC43,@NPC44,@NPC45,@NPC46,@NPC47,@NPC48,@NPC49,@NPC50,@NPC51,@NPC52); -INSERT INTO `pickpocketing_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ----------------------------------------------------------------------------------------------- -(@NPC,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Gibberer -(@NPC1,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Hunter -(@NPC2,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Steam Belcher -(@NPC3,1,100,1,0,-@GORLOCREF,1), -- Gorloc ref loot template on Gorloc Waddler --- ----------------------------------------------------------------------------------------------- -(@NPC4,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Reclaimer -(@NPC5,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Sorcerer -(@NPC6,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Beryl Treasure Hunter -(@NPC7,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Coldarra Spellbinder -(@NPC8,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Harold Lane -(@NPC9,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on High Priest Andorath -(@NPC10,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Cultist Necrolyte -(@NPC11,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Diver -(@NPC12,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Hunter -(@NPC13,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Loot Crazed Poacher -(@NPC14,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Inquisitor Caleras -(@NPC15,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Karen "I Don't Caribou" the Culler -(@NPC16,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Minion of Kaw -(@NPC17,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Varidus the Flenser -(@NPC18,1,100,1,0,-@BERYLREF,1), -- Beryl ref loot template on Northsea Mercenary --- ----------------------------------------------------------------------------------------------- -(@NPC19,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Firestarter -(@NPC20,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Den Vermin -(@NPC21,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Harvester -(@NPC22,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Bloodspore Roaster -(@NPC23,1,100,1,0,-@BLOODREF,1), -- Bloodspore ref loot template on Gammoth Tender --- ----------------------------------------------------------------------------------------------- -(@NPC24,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Chieftain Burblegobble -(@NPC25,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Gorloc Dredger -(@NPC26,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Chieftain GurgleBoggle -(@NPC27,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Gorloc Mud Splasher -(@NPC28,1,100,1,0,-@CHIEFREF,1), -- Chieftian ref loot template on Riplash Myrmidon --- ----------------------------------------------------------------------------------------------- -(@NPC29,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on Clandestine Cultist -(@NPC30,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on En'kilah Necrolord -(@NPC31,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on En'kilah Necromancer -(@NPC32,1,100,1,0,-@CULTREF,1), -- Cultist ref loot template on Northsea Thug --- ----------------------------------------------------------------------------------------------- -(@NPC33,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Mist Lord -(@NPC34,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Mistweaver -(@NPC35,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Kvaldir Raider -(@NPC36,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Heigarr the Horrible -(@NPC37,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Ragnar Drakkarlund -(@NPC37,35774,-100,1,0,1,1), -- Trident of Naz'jan on Ragnar Drakkarlund -(@NPC38,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Longboatsman -(@NPC39,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Mistweaver -(@NPC40,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Raider -(@NPC41,1,100,1,0,-@KVALDIRREF,1), -- Kvaldir ref loot template on Skadir Runecaster --- ----------------------------------------------------------------------------------------------- -(@NPC42,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Claximus -(@NPC43,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Keymaster Urmgrgl -(@NPC44,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Oracle -(@NPC45,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Shorestriker -(@NPC46,1,100,1,0,-@CLAXREF,1), -- Clax ref loot template on Winterfin Warrior --- ----------------------------------------------------------------------------------------------- -(@NPC47,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth2 ref loot template on Gammothra the Tormentor -(@NPC48,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Magnataur Huntress -(@NPC49,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Mate of Magmothregar -(@NPC50,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Offspring of Magmothregar -(@NPC51,1,100,1,0,-@MAGMOTHREF,1), -- Magmoth ref loot template on Plagued Magnataur -(@NPC52,1,100,1,0,-@MAGMOTHREF,1); -- Magmoth ref loot template on Skadir Mariner diff --git a/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql b/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql deleted file mode 100644 index 336cd61c0eb..00000000000 --- a/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- fix DB-error on startup -DELETE FROM `creature_loot_template` WHERE `entry` IN (34965,34980); diff --git a/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql b/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql deleted file mode 100644 index a39ed9c01d5..00000000000 --- a/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql +++ /dev/null @@ -1,174 +0,0 @@ -DELETE FROM `script_texts` WHERE `entry` BETWEEN -1603019 AND -1603000; -UPDATE `creature_template` SET `ScriptName`='' WHERE `ScriptName` IN ('boss_algalon','mob_collapsing_star'); - --- Difficulty linking -UPDATE `creature_template` SET `difficulty_entry_1`=34296 WHERE `entry`=32953; -- Black Hole - -UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`faction_A`=35,`faction_H`=35,`unit_flags`=0x8300,`equipment_id`=2478 WHERE `entry`=34064; -- Brann Bronzebeard -UPDATE `creature_template` SET `speed_walk`=4,`speed_run`=2.14286,`exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=190,`faction_H`=190,`unit_flags`=0x8100,`BaseAttackTime`=1000,`equipment_id`=2479 WHERE `entry` IN (32871,33070); -- Algalon the Observer -UPDATE `creature_template` SET `faction_A`=190,`faction_H`=190,`exp`=2,`minlevel`=83,`maxlevel`=83,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry`=34246; -- Azeroth -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33086; -- Algalon Stalker -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2008000,`speed_run`=1,`equipment_id`=2480,`InhabitType`=4 WHERE `entry` IN (33052,33116); -- Living Constellation -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`speed_run`=1,`RegenHealth`=0 WHERE `entry` IN (32955,34215); -- Collapsing Star -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=80,`maxlevel`=80,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry` IN (32953,34296); -- Black Hole -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`minlevel`=81,`maxlevel`=81,`unit_flags`=0x8000,`speed_walk`=4,`speed_run`=1.42857,`InhabitType`=4 WHERE `entry` IN(33089,34097,34221,34222); -- Dark Matter -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`flags_extra`=0x80 WHERE `entry`=34100; -- Algalon Void Zone Visual Stalker -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`speed_run`=1,`InhabitType`=4 WHERE `entry`=34099; -- Worm Hole -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33104; -- Algalon Stalker Asteroid Target 01 -UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`exp`=2,`minlevel`=74,`maxlevel`=74,`unit_flags`=0x2000000,`flags_extra`=0x80,`InhabitType`=4 WHERE `entry`=33105; -- Algalon Stalker Asteroid Target 02 - -UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=9,`gender`=0 WHERE `modelid`=28641; -- Algalon the Observer -UPDATE `creature_model_info` SET `bounding_radius`=0.02,`combat_reach`=0.2,`gender`=2 WHERE `modelid`=29133; -- Azeroth -UPDATE `creature_model_info` SET `bounding_radius`=0.62,`combat_reach`=0,`gender`=2 WHERE `modelid`=28741; -- Living Constellation -UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28988; -- Collapsing Star -UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28460; -- Black Hole - -UPDATE `gameobject_template` SET `faction`=114,`flags`=32 WHERE `entry`=194910; -- Doodad_UL_SigilDoor_03 -UPDATE `gameobject_template` SET `data0`=579 WHERE `entry`=194628; -- Celestial Planetarium Access - -UPDATE `creature_template` SET `ScriptName`='boss_algalon_the_observer' WHERE `entry`=32871; -- Algalon the Observer -UPDATE `creature_template` SET `ScriptName`='npc_living_constellation' WHERE `entry`=33052; -- Living Constellation -UPDATE `creature_template` SET `ScriptName`='npc_collapsing_star' WHERE `entry`=32955; -- Collapsing Star -UPDATE `creature_template` SET `ScriptName`='npc_brann_bronzebeard_algalon' WHERE `entry`=34064; -- Brann Bronzebeard -UPDATE `gameobject_template` SET `ScriptName`='go_celestial_planetarium_access' WHERE `entry` IN (194628,194752); -- Celestial Planetarium Access -UPDATE `creature_template` SET `AIName`='NullCreatureAI' WHERE `entry` IN (32953,34099); -- Black Hole - -DELETE FROM `creature` WHERE `guid` IN (41781,41783,41790,41811,41812,41814,41819,41820,41821,41822,41823,41875); -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES -(41781,33086,603,3,1,1627.400,-339.4133,417.4044,1.378810,7200,0,0), -- Algalon Stalker -(41783,33086,603,3,1,1622.681,-344.2576,417.3955,1.378810,7200,0,0), -- Algalon Stalker -(41790,33086,603,3,1,1629.984,-271.4798,417.4045,4.782202,7200,0,0), -- Algalon Stalker -(41811,33086,603,3,1,1630.005,-345.5189,417.3955,1.378810,7200,0,0), -- Algalon Stalker -(41812,33089,603,3,16,1622.451,-321.1563,417.6188,4.677482,7200,20,1), -- Dark Matter -(41814,33089,603,3,16,1649.438,-319.8127,418.3941,1.082104,7200,20,1), -- Dark Matter -(41819,33089,603,3,16,1615.060,-291.6816,417.7796,3.490659,7200,20,1), -- Dark Matter -(41820,33089,603,3,16,1647.005,-288.6790,417.3955,3.490659,7200,20,1), -- Dark Matter -(41821,33089,603,3,16,1622.451,-321.1563,417.6188,4.677482,7200,20,1), -- Dark Matter -(41822,33089,603,3,16,1649.438,-319.8127,418.3941,1.082104,7200,20,1), -- Dark Matter -(41823,33089,603,3,16,1615.060,-291.6816,417.7796,3.490659,7200,20,1), -- Dark Matter -(41875,33089,603,3,16,1647.005,-288.6790,417.3955,3.490659,7200,20,1); -- Dark Matter - -SET @OGUID := 252; -DELETE FROM `gameobject` WHERE `id` IN (194767,194910,194911,194715,194716,194148,194253,194628,194752,194821,194822); -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES -(@OGUID+00,194767,603,3,17,1632.024,-182.9211,427.6681,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_SigilDoor_01 -(@OGUID+04,194911,603,3,17,1632.024,-182.9211,408.4224,3.141593,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_SigilDoor_02 -(@OGUID+10,194910,603,3,17,1632.053,-266.1495,438.5608,0.000000,0,0,8.742278E-08,1, 604800,255,0), -- Doodad_UL_SigilDoor_03 -(@OGUID+12,194715,603,3,17,1632.053,-307.6541,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,0), -- Doodad_UL_UniverseFloor_01 -(@OGUID+19,194716,603,3,17,1632.251,-307.5483,416.2641,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_UniverseFloor_02 -(@OGUID+22,194148,603,3,17,1632.053,-307.6541,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_UniverseGlobe01 -(@OGUID+24,194253,603,3,17,1631.908,-246.4970,417.3211,0.000000,0,0,8.742278E-08,1, 604800,255,1), -- Doodad_UL_Ulduar_Trapdoor_03 -(@OGUID+29,194628,603,1, 1,1646.182,-174.6881,427.2536,1.553341,0,0,0.000000E-00,1, 604800,255,1), -- Celestial Planetarium Access -(@OGUID+33,194752,603,2, 1,1646.182,-174.6881,427.2536,1.553341,0,0,0.000000E-00,1, 604800,255,1), -- Celestial Planetarium Access -(@OGUID+37,194821,603,1, 1,1632.099,-306.5609,417.3210,4.694937,0,0,0.000000E-00,1,-604800,255,1), -- Gift of the Observer (10 man) -(@OGUID+46,194822,603,2, 1,1632.099,-306.5609,417.3210,4.694937,0,0,0.000000E-00,1,-604800,255,1); -- Gift of the Observer (25 man) - -DELETE FROM `creature_equip_template` WHERE `entry` IN (2478,2479,2480); -INSERT INTO `creature_equip_template` (`entry`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES -(2478,1903,25972,0), -(2479,45985,45985,0), -(2480,44952,0,0); - -DELETE FROM `creature_template_addon` WHERE `entry` IN (32871,33070,33052,33116,33089,34221,34097,34222,33105); -INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES -(32871,0,0x0000000,0x0,NULL), -- Algalon the Observer -(33070,0,0x0000000,0x0,NULL), -- Algalon the Observer -(33052,0,0x3000000,0x1,NULL), -- Living Constellation -(33116,0,0x3000000,0x1,NULL), -- Living Constellation -(33089,0,0x3000000,0x1,NULL), -- Dark Matter -(34221,0,0x3000000,0x1,NULL), -- Dark Matter -(34097,0,0x3000000,0x1,NULL), -- Unleashed Dark Matter -(34222,0,0x3000000,0x1,NULL), -- Unleashed Dark Matter -(33105,0,0x3000000,0x1,NULL); -- Algalon Stalker Asteroid Target 02 - -DELETE FROM `creature_text` WHERE `entry` IN (32871,34064); -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`sound`,`emote`,`comment`) VALUES -(34064,0,0,'We did it, lads! We got here before Algalon''s arrival. Maybe we can rig the systems to interfere with his analysis--',14,15824,0,'Brann Bronzebeard - SAY_BRANN_ALGALON_INTRO_1'), -(34064,1,0,'I''ll head back to the Archivum and see if I can jam his signal. I might be able to buy us some time while you take care of him.',12,15825,0,'Brann Bronzebeard - SAY_BRANN_ALGALON_INTRO_2'), -(34064,2,0,'I know just the place. Will you be all right?',14,15823,6,'Brann Bronzebeard - SAY_BRANN_ALGALON_OUTRO'), -(32871,0,0,'Translocation complete. Commencing planetary analysis of Azeroth.',12,15405,0,'Algalon the Observer - SAY_ALGALON_INTRO_1'), -(32871,1,0,'Stand back, mortals. I''m not here to fight you.',12,15406,0,'Algalon the Observer - SAY_ALGALON_INTRO_2'), -(32871,2,0,'It is in the universe''s best interest to re-originate this planet should my analysis find systemic corruption. Do not interfere.',12,15407,0,'Algalon the Observer - SAY_ALGALON_INTRO_3'), -(32871,3,0,'Your actions are illogical. All possible results for this encounter have been calculated. The Pantheon will receive the Observer''s message regardless of outcome.',14,15386,0,'Algalon the Observer - SAY_ALGALON_START_TIMER'), -(32871,4,0,'See your world through my eyes: A universe so vast as to be immeasurable - incomprehensible even to your greatest minds.',14,15390,1,'Algalon the Observer - SAY_ALGALON_AGGRO'), -(32871,5,0,'The stars come to my aid!',14,15392,0,'Algalon the Observer - SAY_ALGALON_COLLAPSING_STAR'), -(32871,6,0,'%s begins to Summon Collapsing Stars!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_COLLAPSING_STAR'), -(32871,7,0,'Witness the fury of the cosmos!',14,15396,0,'Algalon the Observer - SAY_ALGALONG_BIG_BANG'), -(32871,8,0,'%s begins to cast Big Bang!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_BIG_BANG'), -(32871,9,0,'You are out of time.',14,15394,0,'Algalon the Observer - SAY_ALGALON_ASCEND'), -(32871,10,0,'%s begins to cast Cosmic Smash!',41,0,0,'Algalon the Observer - EMOTE_ALGALON_COSMIC_SMASH'), -(32871,11,0,'Behold the tools of creation!',14,15397,0,'Algalon the Observer - SAY_ALGALON_PHASE_TWO'), -(32871,12,0,'I have seen worlds bathed in the Makers'' flames, their denizens fading without as much as a whimper. Entire planetary systems born and razed in the time that it takes your mortal hearts to beat once. Yet all throughout, my own heart devoid of emotion... of empathy. I. Have. Felt. Nothing. A million-million lives wasted. Had they all held within them your tenacity? Had they all loved life as you do?',14,15393,1,'Algalon the Observer - SAY_ALGALON_OUTRO_1'), -(32871,13,0,'Perhaps it is your imperfections... that which grants you free will... that allows you to persevere against all cosmically calculated odds. You prevail where the Titan''s own perfect creations have failed.',14,15401,1,'Algalon the Observer - SAY_ALGALON_OUTRO_2'), -(32871,14,0,'I''ve rearranged the reply code - your planet will be spared. I cannot be certain of my own calculations anymore.',14,15402,1,'Algalon the Observer - SAY_ALGALON_OUTRO_3'), -(32871,15,0,'I lack the strength to transmit the signal. You must... hurry... find a place of power... close to the skies.',14,15403,1,'Algalon the Observer - SAY_ALGALON_OUTRO_4'), -(32871,16,0,'Do not worry about my fate, Bronzen. If the signal is not transmitted in time, re-origination will proceed regardless. Save... your world...',14,15404,1,'Algalon the Observer - SAY_ALGALON_OUTRO_5'), -(32871,17,0,'Analysis complete. There is partial corruption in the planet''s life-support systems as well as complete corruption in most of the planet''s defense mechanisms.',12,15398,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_1'), -(32871,18,0,'Begin uplink: Reply Code: ''Omega''. Planetary re-origination requested.',12,15399,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_2'), -(32871,19,0,'Farewell, mortals. Your bravery is admirable, for such flawed creatures.',12,15400,0,'Algalon the Observer - SAY_ALGALON_DESPAWN_3'), -(32871,20,0,'Loss of life unavoidable.',14,15387,0,'Algalon the Observer - SAY_ALGALON_KILL'), -(32871,20,1,'I do what I must.',14,15388,0,'Algalon the Observer - SAY_ALGALON_KILL'); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (64996,62266,65509,62304,64597); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES -(13,1,64996,31,3,34246,'Algalon the Observer - Reorigination on Azeroth'), -(13,1,62266,31,3,33052,'Algalon Stalker - target Living Constellation'), -(13,1,65509,31,3,33052,'Black Hole - target Living Constellation'), -(13,1,62304,31,3,33104,'Cosmic Smash - target trigger'), -(13,1,64597,31,3,33104,'Cosmic Smash - target trigger'); - -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_phase_punch'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_arcane_barrage'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_trigger_3_adds'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_collapse'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_big_bang'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_remove_phase'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_cosmic_smash'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_cosmic_smash_damage'; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_algalon_supermassive_fail'; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(64412,'spell_algalon_phase_punch'), -(64599,'spell_algalon_arcane_barrage'), -(64607,'spell_algalon_arcane_barrage'), -(62266,'spell_algalon_trigger_3_adds'), -(62018,'spell_algalon_collapse'), -(64443,'spell_algalon_big_bang'), -(64584,'spell_algalon_big_bang'), -(64445,'spell_algalon_remove_phase'), -(62295,'spell_algalon_cosmic_smash'), -(62311,'spell_algalon_cosmic_smash_damage'), -(64596,'spell_algalon_cosmic_smash_damage'), -(65311,'spell_algalon_supermassive_fail'); - -SET @DIFF_ID := 3262; -DELETE FROM `spelldifficulty_dbc` WHERE `id` BETWEEN @DIFF_ID AND @DIFF_ID+5; -INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`) VALUES -(@DIFF_ID+0,64395,64592), -(@DIFF_ID+1,64599,64607), -(@DIFF_ID+2,64443,64584), -(@DIFF_ID+3,64122,65108), -(@DIFF_ID+4,62301,64598), -(@DIFF_ID+5,62304,64597); - -UPDATE `instance_encounters` SET `creditType`=1,`creditEntry`=65184 WHERE `entry` IN (757,771); -- Algalon the Observer - -DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (10565,10566,10678,9990,9991,10567,10569,10698,10780,10781,10782,10783,10568,10570); -DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10565,10566,10678,9990,9991,10567,10569,10698,10780,10781,10782,10783,10568,10570); -INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES -(10565,12,0,0,''), -- Algalon the Observer kills (Ulduar 10 player) -(10566,12,1,0,''), -- Algalon the Observer kills (Ulduar 25 player) -(10678,12,0,0,''), -- Herald of the Titans -(10678,18,0,0,''), -- Herald of the Titans -(9990,12,0,0,''), -- Lich King 10-player bosses killed -(9991,12,1,0,''), -- Lich King 25-player bosses killed -(10567,12,0,0,''), -- Observed (10 player) -(10569,12,1,0,''), -- Observed (25 player) -(10698,12,1,0,''), -- Realm First! Celestial Defender -(10780,12,0,0,''), -- Supermassive (10 player) -(10781,12,0,0,''), -- Supermassive (10 player) -(10782,12,1,0,''), -- Supermassive (25 player) -(10783,12,1,0,''), -- Supermassive (25 player) -(10568,11,0,0,'achievement_he_feeds_on_your_tears'), -- He Feeds On Your Tears (10 player) -(10568,12,0,0,''), -- He Feeds On Your Tears (10 player) -(10570,11,0,0,'achievement_he_feeds_on_your_tears'), -- He Feeds On Your Tears (25 player) -(10570,12,1,0,''); -- He Feeds On Your Tears (25 player) diff --git a/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql b/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql deleted file mode 100644 index 47a22d519d0..00000000000 --- a/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql +++ /dev/null @@ -1,15 +0,0 @@ -SET @Ref := 12002; -DELETE FROM `reference_loot_template` WHERE `entry`=@Ref; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@Ref,47242,100,1,0,1,1); -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (195668,195667,195666,195665,195672,195671,195670,195669) AND `item`=47242; -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (195668,195667,195666,195665,195672,195671,195670,195669) AND `mincountOrRef` = -@Ref; -INSERT INTO gameobject_loot_template (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(195665,5,100,1,0,-@Ref,4), -- 10 man,50 attempts -(195666,3,100,1,0,-@Ref,4), -- 10 man,45+ attempts -(195667,3,100,1,0,-@Ref,2), -- 10 man,25+ attempts -(195668,1,100,1,0,-@Ref,2), -- 10 man,0+ attempts -(195669,6,100,1,0,-@Ref,4), -- 25 man,50 attempts -(195670,4,100,1,0,-@Ref,4), -- 25 man,45+ attempts -(195671,4,100,1,0,-@Ref,2), -- 25 man,25+ attempts -(195672,2,100,1,0,-@Ref,2); -- 25 man,0+ attempts diff --git a/sql/updates/world/2012_04_20_01_world_item_loot_template.sql b/sql/updates/world/2012_04_20_01_world_item_loot_template.sql deleted file mode 100644 index af52ade0b25..00000000000 --- a/sql/updates/world/2012_04_20_01_world_item_loot_template.sql +++ /dev/null @@ -1,10 +0,0 @@ -SET @Bag := 52676; -DELETE FROM `item_loot_template` WHERE `entry`=@Bag; -INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@Bag,36933,0,1,1,1,3),-- Forest Emerald -(@Bag,36918,0,1,1,1,3),-- Scarlet Ruby -(@Bag,36921,0,1,1,1,3),-- Autumn's Glow -(@Bag,36930,0,1,1,1,3),-- Monarch Topaz -(@Bag,36924,0,1,1,1,3),-- Sky Sapphire -(@Bag,36927,0,1,1,1,3),-- Twilight Opal -(@Bag,43953,5,1,0,1,1); -- Reins of the Blue Drake diff --git a/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql b/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql deleted file mode 100644 index 09b5beee75c..00000000000 --- a/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql +++ /dev/null @@ -1,4 +0,0 @@ -DELETE FROM `creature_loot_template` WHERE `entry` IN (31702,32297) AND `item`=44564; -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(31702,44564,0.5,1,0,1,1), -- Recipe: Mighty Arcane Protection Potion on Frostbrood Spawn -(32297,44564,0.5,1,0,1,1); -- Recipe: Mighty Arcane Protection Potion on Cult Researcher diff --git a/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql b/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql deleted file mode 100644 index a0b586ee0d9..00000000000 --- a/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql +++ /dev/null @@ -1,7 +0,0 @@ -SET @ITEM := 50406; -- Formula: Enchant Gloves - Angler -UPDATE `creature_template` SET `lootid` = `entry` WHERE `entry` IN(26343,26344,26336); -DELETE FROM `creature_loot_template` WHERE `item`=@ITEM; -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(26343, @ITEM, 1.1, 1, 0, 1, 1), -- Indu'Le Fisherman -(26336, @ITEM, 0.9, 1, 0, 1, 1), -- Indu'Le Mystic -(26344, @ITEM, 1, 1, 0, 1, 1); -- Indu'Le Warrior diff --git a/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql b/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql deleted file mode 100644 index 73e01efa23e..00000000000 --- a/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Make Grimscale Murlocs drop their heads faster... -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-66 WHERE `item`=21757; - diff --git a/sql/updates/world/2012_04_20_05_gameobject_template.sql b/sql/updates/world/2012_04_20_05_gameobject_template.sql deleted file mode 100644 index 24400b16a5c..00000000000 --- a/sql/updates/world/2012_04_20_05_gameobject_template.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Restore horrible mistake in UP34 from myself -UPDATE `gameobject_template` SET `data1`=27512 WHERE `entry`=195669; -UPDATE `gameobject_template` SET `data1`=27517 WHERE `entry`=195670; -UPDATE `gameobject_template` SET `data1`=27518 WHERE `entry`=195671; --- Fix loottemplates along with it -UPDATE `gameobject_loot_template` SET `entry`=27512 WHERE `entry`=195669; -UPDATE `gameobject_loot_template` SET `entry`=27517 WHERE `entry`=195670; -UPDATE `gameobject_loot_template` SET `entry`=27518 WHERE `entry`=195671; diff --git a/sql/updates/world/2012_04_21_00_world_spell_script_names.sql b/sql/updates/world/2012_04_21_00_world_spell_script_names.sql deleted file mode 100644 index e61ef4aec74..00000000000 --- a/sql/updates/world/2012_04_21_00_world_spell_script_names.sql +++ /dev/null @@ -1,14 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` IN (20625,29142,35139,42393,49882,55269,56578,38441,66316,67100,67101,67102); -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(20625,'spell_gen_default_count_pct_from_max_hp'), -- Ritual of Doom Sacrifice -(29142,'spell_gen_default_count_pct_from_max_hp'), -- Eyesore Blaster -(35139,'spell_gen_default_count_pct_from_max_hp'), -- Throw Boom's Doom -(42393,'spell_gen_default_count_pct_from_max_hp'), -- Brewfest - Attack Keg -(49882,'spell_gen_default_count_pct_from_max_hp'), -- Leviroth Self-Impale -(55269,'spell_gen_default_count_pct_from_max_hp'), -- Deathly Stare -(56578,'spell_gen_default_count_pct_from_max_hp'), -- Rapid-Fire Harpoon -(38441,'spell_gen_50pct_count_pct_from_max_hp'), -- Cataclysmic Bolt -(66316,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 10m -(67100,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 25m -(67101,'spell_gen_50pct_count_pct_from_max_hp'), -- Spinning Pain Spike 10m heroic -(67102,'spell_gen_50pct_count_pct_from_max_hp'); -- Spinning Pain Spike 25m heroic diff --git a/sql/updates/world/2012_04_22_00_world_sai.sql b/sql/updates/world/2012_04_22_00_world_sai.sql deleted file mode 100644 index f223883c8a7..00000000000 --- a/sql/updates/world/2012_04_22_00_world_sai.sql +++ /dev/null @@ -1,63 +0,0 @@ --- SAI for Tabard Vendor Elizabeth Ross -SET @ROSS := 28776; -SET @GOSSIP := 9832; - -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ROSS; - -DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id`>0 AND `id`<11; -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 -(@GOSSIP, 1, 0, 'I''ve lost my Blood Knight Tabard.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 2, 0, 'I''ve lost my Tabard of the Hand.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 3, 0, 'I''ve lost my Tabard of the Protector.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 4, 0, 'I''ve lost my Green Trophy Tabard of the Illidari.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 5, 0, 'I''ve lost my Purple Trophy Tabard of the Illidari.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 6, 0, 'I''ve lost my Tabard of Summer Skies.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 7, 0, 'I''ve lost my Tabard of Summer Flames.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 8, 0, 'I''ve lost my Loremaster''s Colors.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 9, 0, 'I''ve lost my Tabard of the Explorer.', 1, 1, 0, 0, 0, 0, ''), -(@GOSSIP, 10, 0, 'I''ve lost my Tabard of the Achiever.', 1, 1, 0, 0, 0, 0, ''); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=@ROSS 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 -(@ROSS, 0, 0, 10, 62, 0, 100, 0, @GOSSIP, 1, 0, 0, 11, 54974, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Blood Knight Tabard'), -(@ROSS, 0, 1, 10, 62, 0, 100, 0, @GOSSIP, 2, 0, 0, 11, 54976, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Hand'), -(@ROSS, 0, 2, 10, 62, 0, 100, 0, @GOSSIP, 3, 0, 0, 11, 55008, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Protector'), -(@ROSS, 0, 3, 10, 62, 0, 100, 0, @GOSSIP, 4, 0, 0, 11, 54977, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Green Trophy Tabard of the Illidari'), -(@ROSS, 0, 4, 10, 62, 0, 100, 0, @GOSSIP, 5, 0, 0, 11, 54982, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Purple Trophy Tabard of the Illidari'), -(@ROSS, 0, 5, 10, 62, 0, 100, 0, @GOSSIP, 6, 0, 0, 11, 62768, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Skies'), -(@ROSS, 0, 6, 10, 62, 0, 100, 0, @GOSSIP, 7, 0, 0, 11, 62769, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of Summer Flames'), -(@ROSS, 0, 7, 10, 62, 0, 100, 0, @GOSSIP, 8, 0, 0, 11, 58194, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Loremaster''s Colors'), -(@ROSS, 0, 8, 10, 62, 0, 100, 0, @GOSSIP, 9, 0, 0, 11, 58224, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Explorer'), -(@ROSS, 0, 9, 10, 62, 0, 100, 0, @GOSSIP, 10, 0, 0, 11, 55006, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Cast Spell Create Tabard of the Achiever'), -(@ROSS, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Elizabeth Ross - On Gossip Select - Close Gossip'); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,@GOSSIP,1,0,2,25549,1,1,1,0,'','Only show gossip if player doesn''t have Blood Knight Tabard'), -(15,@GOSSIP,1,0,8,9737,0,0,0,0,'','Only show gossip if player already finished quest True Masters of Light'), -(15,@GOSSIP,2,0,2,24344,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Hand'), -(15,@GOSSIP,2,0,8,9762,0,0,0,0,'','Only show gossip if player already finished quest The Unwritten Prophecy'), -(15,@GOSSIP,3,0,2,28788,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the protector'), -(15,@GOSSIP,3,0,8,10259,0,0,0,0,'','Only show gossip if player already finished quest Into the Breach'), -(15,@GOSSIP,4,0,2,31404,1,1,1,0,'','Only show gossip if player doesn''t have Green Trophy Tabard of Illidari'), -(15,@GOSSIP,4,0,2,31405,1,1,1,0,'','Only show gossip if player doesn''t have Purple Trophy Tabard of Illidari'), -(15,@GOSSIP,4,0,2,31408,1,1,1,0,'','Only show gossip if player doesn''t have Offering of the Sha''tar'), -(15,@GOSSIP,4,0,8,10781,0,0,0,0,'','Only show gossip if player already finished quest Battle of the Crimson Watch'), -(15,@GOSSIP,5,0,2,31404,1,1,1,0,'','Only show gossip if player doesn''t have Green Trophy Tabard of Illidari'), -(15,@GOSSIP,5,0,2,31405,1,1,1,0,'','Only show gossip if player doesn''t have Purple Trophy Tabard of Illidari'), -(15,@GOSSIP,5,0,2,31408,1,1,1,0,'','Only show gossip if player doesn''t have Offering of the Sha''tar'), -(15,@GOSSIP,5,0,8,10781,0,0,0,0,'','Only show gossip if player already finished quest Battle of the Crimson Watch'), -(15,@GOSSIP,6,0,2,35279,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Skies'), -(15,@GOSSIP,6,0,2,35280,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Flames'), -(15,@GOSSIP,6,0,8,11972,0,0,0,0,'','Only show gossip if player already finished quest Shards of Ahune'), -(15,@GOSSIP,7,0,2,35279,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Skies'), -(15,@GOSSIP,7,0,2,35280,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of Summer Flames'), -(15,@GOSSIP,7,0,8,11972,0,0,0,0,'','Only show gossip if player already finished quest Shards of Ahune'), -(15,@GOSSIP,8,0,2,43300,1,1,1,0,'','Only show gossip if player doesn''t have Loremaster''s Colors'), -(15,@GOSSIP,8,0,17,1681,0,0,0,0,'','Only show gossip if player have achievement Loremaster (A)'), -(15,@GOSSIP,8,1,2,43300,1,1,1,0,'','Only show gossip if player doesn''t have Loremaster''s Colors'), -(15,@GOSSIP,8,1,17,1682,0,0,0,0,'','Only show gossip if player have achievement Loremaster (H)'), -(15,@GOSSIP,9,0,2,43348,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Explorer'), -(15,@GOSSIP,9,0,17,45,0,0,0,0,'','Only show gossip if player have achievement Explore Northrend'), -(15,@GOSSIP,10,0,2,40643,1,1,1,0,'','Only show gossip if player doesn''t have Tabard of the Explorer'), -(15,@GOSSIP,10,0,17,1021,0,0,0,0,'','Only show gossip if player have achievement Twenty-Five Tabards'); diff --git a/sql/updates/world/2012_04_23_00_world_creatures.sql b/sql/updates/world/2012_04_23_00_world_creatures.sql deleted file mode 100644 index 3730fabf552..00000000000 --- a/sql/updates/world/2012_04_23_00_world_creatures.sql +++ /dev/null @@ -1,12 +0,0 @@ -UPDATE `creature_template` SET `flags_extra`=0x82,`ModelId1`=1126,`ModelId2`=16925 WHERE `entry` IN (38008,38641,38773,38774); -- Blood Orb Controller -UPDATE `creature_template` SET `flags_extra`=0x80,`ModelId1`=19725,`ModelId2`=31095,`baseattacktime`=2000,`speed_walk`=0.8,`speed_run`=0.28571 WHERE `entry` IN (38454,38775,38776,38777); -- Kinetic Bomb -UPDATE `creature_template` SET `exp`=2,`baseattacktime`=2000,`ModelId1`=19725,`ModelId2`=21342 WHERE `entry`=38458; -- Kinetic Bomb Target -UPDATE `creature_template` SET `baseattacktime`=2000,`speed_walk`=4.4,`ModelId1`=19725,`ModelId2`=26767 WHERE `entry` IN (38332,38451); -- Ball of Flame -UPDATE `creature_template` SET `flags_extra`=0x80 WHERE `entry`=37950; -- Valithria Dreamwalker -UPDATE `creature_template` SET `InhabitType`=4 WHERE `InhabitType`&4 AND `flags_extra`&0x80; -- make flying triggers fly -UPDATE `creature_template` SET `InhabitType`=4,`HoverHeight`=12 WHERE `entry`=37126; -- Sister Svalna -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=37950; -- Valithria Dreamwalker -UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=0,`gender`=0 WHERE `modelid`=31095; -- Kinetic Bomb -UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=0 WHERE `modelid`=21342; -- Kinetic Bomb Target -UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=0 WHERE `modelid`=26767; -- Ball of Flame -UPDATE `creature_template_addon` SET `bytes1`=50331648,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=38454; -- Kinetic Bomb diff --git a/sql/updates/world/2012_04_23_01_world_conditions.sql b/sql/updates/world/2012_04_23_01_world_conditions.sql deleted file mode 100644 index c731426aa3f..00000000000 --- a/sql/updates/world/2012_04_23_01_world_conditions.sql +++ /dev/null @@ -1,5 +0,0 @@ --- setup alternate conditions for spell 46488 -DELETE FROM `conditions` WHERE `SourceEntry` = 46488 AND `ElseGroup` = 1; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,46488,0,1,31,1,3,26817,0,0,0,'',''), -(13,1,46488,0,1,36,1,0,0,0,1,0,'',''); diff --git a/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql b/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql deleted file mode 100644 index 6ea44d92722..00000000000 --- a/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql +++ /dev/null @@ -1,112 +0,0 @@ -SET @TinRef := 13000; -SET @TBC1 := @TinRef+1; -SET @TBC2 := @TinRef+2; -SET @WOTLK1 := @TinRef+3; -SET @WOTLK2 := @TinRef+4; -SET @WOTLK3 := @TinRef+5; - -SET @Copper := 2770; -SET @Tin := 2771; -SET @Iron := 2772; -SET @Mithril := 3858; -SET @Thorium := 10620; -SET @FelIron := 23424; -SET @Adamantite := 23425; -SET @Cobalt := 36909; -SET @Saronite := 36912; -SET @Titanium := 36910; - --- Reference Loot Templates -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @TinRef AND @TinRef+5; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Stupid Tin -(@TinRef,1529,0,1,1,1,1), -- Jade -(@TinRef,3864,0,1,1,1,1), -- Citrine -(@TinRef,7909,0,1,1,1,1), -- Aquamarine --- TBC Greens -(@TBC1,21929,0,1,1,1,2), -- Flame Spessarite -(@TBC1,23077,0,1,1,1,2), -- Blood Garnet -(@TBC1,23079,0,1,1,1,2), -- Deep Peridot -(@TBC1,23107,0,1,1,1,2), -- Shadow Draenite -(@TBC1,23112,0,1,1,1,2), -- Golden Draenite -(@TBC1,23117,0,1,1,1,2), -- Azure Moonstone --- TBC Blues -(@TBC2,23436,0,1,1,1,1), -- Living Ruby -(@TBC2,23437,0,1,1,1,1), -- Talasite -(@TBC2,23438,0,1,1,1,1), -- Star of Elune -(@TBC2,23439,0,1,1,1,1), -- Noble Topaz -(@TBC2,23440,0,1,1,1,1), -- Dawnstone -(@TBC2,23441,0,1,1,1,1), -- Nightseye --- WOTLK Greens -(@WOTLK1,36917,0,1,1,1,2), -- Bloodstone -(@WOTLK1,36920,0,1,1,1,2), -- Sun Crystal -(@WOTLK1,36923,0,1,1,1,2), -- Chalcedony -(@WOTLK1,36926,0,1,1,1,2), -- Shadow Crystal -(@WOTLK1,36929,0,1,1,1,2), -- Huge Citrine -(@WOTLK1,36932,0,1,1,1,2), -- Dark Jade --- WOTLK Blues -(@WOTLK2,36918,0,1,1,1,2), -- Scarlet Ruby -(@WOTLK2,36921,0,1,1,1,2), -- Autumn's Glow -(@WOTLK2,36924,0,1,1,1,2), -- Sky Sapphire -(@WOTLK2,36927,0,1,1,1,2), -- Twilight Opal -(@WOTLK2,36930,0,1,1,1,2), -- Monarch Topaz -(@WOTLK2,36933,0,1,1,1,2), -- Forest Emerald --- WOTLK Epics -(@WOTLK3,36919,0,1,1,1,1), -- Cardinal Ruby -(@WOTLK3,36922,0,1,1,1,1), -- King's Amber -(@WOTLK3,36925,0,1,1,1,1), -- Majestic Zircon -(@WOTLK3,36928,0,1,1,1,1), -- Dreadstone -(@WOTLK3,36931,0,1,1,1,1), -- Ametrine -(@WOTLK3,36934,0,1,1,1,1); -- Eye of Zul --- -------------------------------------------------------- --- Prospecting Loot Templates -DELETE FROM `prospecting_loot_template` WHERE `entry` IN (@Copper,@Tin,@Iron,@Mithril,@Thorium,@FelIron,@Adamantite,@Cobalt,@Saronite,@Titanium); -INSERT INTO `prospecting_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Copper Ore -(@Copper,774,0,1,1,1,1), -- Malachite -(@Copper,818,0,1,1,1,1), -- Tigerseye -(@Copper,1210,10,1,0,1,1), -- Shadowgem --- Tin Ore -(@Tin,1210,0,1,1,1,2), -- Shadowgem -(@Tin,1705,0,1,1,1,2), -- Lesser Moonstone -(@Tin,1206,0,1,1,1,2), -- Moss Agate -(@Tin,1,10,1,0,-@TinRef,1), -- One Rare gem chance --- Iron Ore -(@Iron,1529,30,1,1,1,2), -- Jade -(@Iron,1705,30,1,1,1,2), -- Lesser Moonstone -(@Iron,3864,30,1,1,1,2), -- Citrine -(@Iron,7909,5,1,1,1,1), -- Aquamarine -(@Iron,7910,5,1,1,1,1), -- Star Ruby --- Mithril Ore -(@Mithril,3864,30,1,1,1,2), -- Citrine -(@Mithril,7909,30,1,1,1,2), -- Aquamarine -(@Mithril,7910,30,1,1,1,2), -- Star Ruby -(@Mithril,12361,2.5,1,1,1,1), -- Blue Sapphire -(@Mithril,12364,2.5,1,1,1,1), -- Huge Emerald -(@Mithril,12799,2.5,1,1,1,1), -- Large Opal -(@Mithril,12800,2.5,1,1,1,1), -- Azerothian Diamond --- Thorium Ore -(@Thorium,7910,30,1,1,1,2), -- Star Ruby -(@Thorium,12361,15,1,1,1,2), -- Blue Sapphire -(@Thorium,12364,15,1,1,1,2), -- Huge Emerald -(@Thorium,12799,15,1,1,1,2), -- Large Opal -(@Thorium,12800,15,1,1,1,2), -- Azerothian Diamond -(@Thorium,1,10,1,1,-@TBC1,1), -- one from TBC Greens --- Fel Iron Ore -(@FelIron,1,95,1,1,-@TBC1,1), -- One from TBC Greens -(@FelIron,2,05,1,1,-@TBC2,1), -- One from TBC Blues --- Adamantite Ore -(@Adamantite,24243,100,1,0,1,1), -- Adamantite Powder -(@Adamantite,1,100,1,1,-@TBC1,1), -- One from TBC Greens -(@Adamantite,2, 10,1,1,-@TBC2,1), -- One from TBC Blues --- Cobalt Ore -(@Cobalt,1,95,1,1,-@WOTLK1,1), -- One from WOTLK Greens -(@Cobalt,2,05,1,1,-@WOTLK2,1), -- One from WOTLK Blues --- Saronite Ore -(@Saronite,1,85,1,1,-@WOTLK1,2), -- One from WOTLK Greens -(@Saronite,2,15,1,1,-@WOTLK2,1), -- One from WOTLK Blues --- Titanium Ore -(@Titanium,46849,75,1,0,1,1), -- Titanium Powder -(@Titanium,1,75,1,1,-@WOTLK1,2), -- Two from WOTLK Greens -(@Titanium,2,25,1,1,-@WOTLK2,1), -- One from WOTLK Blues -(@Titanium,3,20,1,0,-@WOTLK3,1); -- One from WOTLK Epics diff --git a/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql b/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql deleted file mode 100644 index a1aa9e070f2..00000000000 --- a/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql +++ /dev/null @@ -1,44 +0,0 @@ -UPDATE `creature_template` SET `skinloot`=entry WHERE `entry` IN (30260, 32517, 27641, 28860); -UPDATE `creature_template` SET `skinloot`=70202 WHERE `entry` IN (25774,29693); -UPDATE `creature_template` SET `skinloot`=70203 WHERE `entry`=28257; -UPDATE `creature_template` SET `skinloot`=70207 WHERE `entry`=34137; -UPDATE `creature_template` SET `skinloot`=70208 WHERE `entry` IN (32572,25448,25716,25713); -UPDATE `creature_template` SET `skinloot`=70210 WHERE `entry` IN (33528,40419,26723,31134,36891); -UPDATE `creature_template` SET `skinloot`=70211 WHERE `entry` IN (28847,30206,29875,29931,28203,30432); -UPDATE `creature_template` SET `skinloot`=70212 WHERE `entry` IN (27645,32377,29838,26628,26622,32490,38453,32485,26633,32400,32361,29768,29735,26641,27644,27642,26735,26730,26722,33776,35189,26716,26672,29664,29774); -UPDATE `creature_template` SET `skinloot`=70213 WHERE `entry` IN (27483,29312); -UPDATE `creature_template` SET `skinloot`=70214 WHERE `entry` IN (37217,34564); -UPDATE `creature_template` SET `skinloot`=27641 WHERE `entry` IN (31385,34269,34270,27641,30905,30353); - -DELETE FROM `skinning_loot_template` WHERE entry IN (30260,32517,70212,70213,70214,28860,27641); -INSERT INTO `skinning_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `groupid`, `mincountOrRef`, `maxcount`) VALUES --- Stoic Mammoth -(30260,33568,100,0,1,3), -- Borean Leather -(30260,42542,-50,0,1,1), -- Stoic Mammoth Hide --- Loque'nahak -(32517,33568,0,1,1,3), -- Borean Leather -(32517,44128,2,1,1,1), -- Arctic Fur -(32517,44687,100,0,1,1), -- Loque'Nahak's Pelt --- skinloot 70212 -(70212,33568,0,1,1,3), -- Borean Leather -(70212,44128,1,1,1,1), -- Arctic Fur --- skinloot 70213 -(70213,33568,0,1,5,12), -- Borean Leather -(70213,44128,1,1,1,1), -- Arctic Fur --- skinloot 70214 -(70214,33568,0,1,12,16), -- Borean Leather -(70214,44128,25,1,1,1), -- Arctic Fur --- Sartharion -(28860,33568,0,1,8,12), -- Borean Leather -(28860,38557,0,1,8,12),-- Icy Dragonscale -(28860,44128,1,1,1,1), -- Arctic Fur --- Centrifuge Construct -(27641,41337,85,0,1,3), -- Whizzed-Out Gizmo -(27641,41338,80,0,1,3), -- Sprung Whirlygig -(27641,39690,15,0,1,3), -- Volatile Blasting Trigger -(27641,39684,8,0,1,1), -- Hair Trigger -(27641,36813,8,0,1,3), -- Sprung Sprocket -(27641,39681,8,0,2,4), -- Handful of Cobalt Bolts -(27641,49050,2,0,1,1), -- Schematic: Jeeves -(27641,39682,1,0,1,1), -- Overcharged Capacitor -(27641,39685,1,0,1,1); -- Indestructible Frame diff --git a/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql b/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql deleted file mode 100644 index 94d2b092d12..00000000000 --- a/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Correct dropchance for Mote of Life, wowhead was wrong (as usual) -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=18.5307 WHERE `entry`=22307 AND `item`=22575; diff --git a/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql b/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql deleted file mode 100644 index ddf0780d362..00000000000 --- a/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Update the dropchance to 100% if on quest -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=21477 AND `item`=31372; -- Rocknail Flayer Carcass -UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=21478 AND `item`=31373; -- Rocknail Flayer Giblets diff --git a/sql/updates/world/2012_04_24_00_world_command.sql b/sql/updates/world/2012_04_24_00_world_command.sql deleted file mode 100644 index 25912392347..00000000000 --- a/sql/updates/world/2012_04_24_00_world_command.sql +++ /dev/null @@ -1,10 +0,0 @@ -DELETE FROM `command` WHERE `name` IN ('modify tp','modify bwalk','modify swim','modify fly','modify arena','modify aspeed','modify morph'); -INSERT INTO `command` (`name`, `security`, `help`) VALUES ('modify speed all', 1, 'Syntax: .modify aspeed #rate\r\n\r\nModify all speeds -run,swim,run back,swim back- of the selected player to "normalbase speed for this move type"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify speed backwalk', 1, 'Syntax: .modify speed backwalk #rate\r\n\r\nModify the speed of the selected player while running backwards to "normal walk back speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify speed fly', 1, '.modify speed fly #rate\nModify the flying speed of the selected player to "normal flying speed"*rate. If no player is selected, modify your speed.\n #rate may range from 0.1 to 50.'), -('modify speed swim', 1, 'Syntax: .modify speed swim #rate\r\n\r\nModify the swim speed of the selected player to "normal swim speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify speed walk', 1, 'Syntax: .modify speed bwalk #rate\r\n\r\nModify the speed of the selected player while running to "normal walk speed"*rate. If no player is selected, modify your speed.\r\n\r\n #rate may range from 0.1 to 50.'), -('modify talentpoints', 1, 'Syntax: .modify talentpoints #amount\r\n\r\nSet free talent points for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.'), -('morph', 2, 'Syntax: .morph #displayid\r\n\r\nChange your current model id to #displayid.'), -('modify arenapoints', 1, 'Syntax: .modify arenapoints #value\r\nAdd $amount arena points to the selected player.'); -UPDATE `command` SET `help`='Syntax: .modify speed $speedtype #rate\r\n\r\nModify the running speed of the selected player to "normal base run speed"= 1. If no player is selected, modify your speed.\r\n\r\n$speedtypes may be fly, all, walk, backwalk, or swim.\r\n\r\n #rate may range from 0.1 to 50.' WHERE `name`='modify speed' LIMIT 1; diff --git a/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql b/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql deleted file mode 100644 index 6e997931bb5..00000000000 --- a/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Honor Among Thieves proc chance -UPDATE `spell_proc_event` SET `CustomChance`=33 WHERE `entry`=51698; -- Rank 1 -UPDATE `spell_proc_event` SET `CustomChance`=66 WHERE `entry`=51700; -- Rank 2 -UPDATE `spell_proc_event` SET `CustomChance`=100 WHERE `entry`=51701; -- Rank 3 diff --git a/sql/updates/world/2012_04_24_02_world_warden_checks.sql b/sql/updates/world/2012_04_24_02_world_warden_checks.sql deleted file mode 100644 index 74539f99fb3..00000000000 --- a/sql/updates/world/2012_04_24_02_world_warden_checks.sql +++ /dev/null @@ -1,8 +0,0 @@ -UPDATE `warden_checks` SET `comment`='Swimming_FallCalc - movement state' WHERE `id`=15; -UPDATE `warden_checks` SET `comment`='CreateMovementStatus' WHERE `id`=72; -UPDATE `warden_checks` SET `comment`='OnStartSwim OnSplineStartSwim - movement state' WHERE `id`=170; -UPDATE `warden_checks` SET `comment`='DefaultServerLogin - account name' WHERE `id`=198; -UPDATE `warden_checks` SET `comment`='Login Checksum - authentication process' WHERE `id`=320; -UPDATE `warden_checks` SET `comment`='CalcFallStartElevation - (some kind of wall climb)' WHERE `id`=329; -UPDATE `warden_checks` SET `comment`='Code injection at 0x40100A' WHERE `id`=381; -UPDATE `warden_checks` SET `comment`='Login State - (May be false positive)' WHERE `id`=437; diff --git a/sql/updates/world/2012_04_24_03_world_spell_script_names.sql b/sql/updates/world/2012_04_24_03_world_spell_script_names.sql deleted file mode 100644 index a53d8bd585c..00000000000 --- a/sql/updates/world/2012_04_24_03_world_spell_script_names.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Earthen Power -DELETE FROM `spell_script_names` WHERE `spell_id`=59566; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(59566,'spell_sha_earthen_power'); diff --git a/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql b/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql deleted file mode 100644 index 5ba6f24ccf8..00000000000 --- a/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql +++ /dev/null @@ -1,4 +0,0 @@ - -- Rogue T9 2P - Should proc only from Rupture ticks. -DELETE FROM `spell_proc_event` WHERE `entry` IN(67209); -INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `procFlags`) VALUES -(67209, 0x01, 8, 0x100000, 0x50000); diff --git a/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql b/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql deleted file mode 100644 index c524999b492..00000000000 --- a/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Apply same loot template to below mentioned Bloodsail NPCs as that of Bloodsail Raider 1561 --- (Mage 1562, Swashbuckler 1563, Warlock 1564, Sea Dog 1565) -UPDATE `creature_template` SET `lootid`=1561 WHERE `entry` IN (1562,1563,1564,1565); --- Remove Loot from `creature_loot_template` for above mentioned NPCs because it contains only 2 items. --- Those 2 items, along with complete loot template for these mobs is applied in query above. -DELETE FROM `creature_loot_template` WHERE `entry` IN (1562,1563,1564,1565); --- Remove loot and gold drop from Bloodsail Warlock's Minions -UPDATE `creature_template` SET `lootid`=0, `mingold`=0 AND `maxgold`=0 WHERE `entry` IN (10928,12922); -DELETE FROM `creature_loot_template` WHERE `entry` IN (10928,12922); diff --git a/sql/updates/world/2012_04_24_06_world_misc.sql b/sql/updates/world/2012_04_24_06_world_misc.sql deleted file mode 100644 index 2e095a76cd9..00000000000 --- a/sql/updates/world/2012_04_24_06_world_misc.sql +++ /dev/null @@ -1,31 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` = 46485; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(46485,'spell_item_greatmothers_soulcatcher'); - -DELETE FROM `conditions` WHERE `SourceEntry` IN (46485,46488); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,46485,0,1,31,1,3,26817,0,0,0,'',''), -(13,1,46485,0,1,36,1,0,0,0,1,0,'',''), -(13,1,46488,0,1,31,1,3,26817,0,0,0,'',''), -(13,1,46488,0,1,36,1,0,0,0,1,0,'',''); - --- Gnome Soul SAI -SET @ENTRY := 26096; -SET @SPELL_ARCANE_EXPLOSION := 35426; -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,1,54,0,100,0,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gnome Soul - On Just Summoned - Quest Credit"), -(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,25814,10,1,0,0,0,0,"Gnome Soul - On Just Summoned - Set Data Fizzcrank Mechagnome"), -(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,69,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gnome Soul - On Just Summoned - Move to Summoner"), - -(@ENTRY,0,3,4,34,0,100,0,1,0,0,0,11,@SPELL_ARCANE_EXPLOSION,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gnome Soul - Reached Summoner - Cast Arcane Explosion Visual"), -(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gnome Soul - Reached Summoner - Forced Despawn"); - --- Fizzcrank Mechagnome SAI -SET @ENTRY := 25814; -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,4,0,100,0,0,0,0,0,1,1,10000,0,0,0,0,0,0,0,0,0,0,0,0,"Fizzcrank Mechagnome - Chance Say on Aggro"), -(@ENTRY,1,0,0,38,0,100,0,1,1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Fizzcrank Mechagnome - On Data Set - Forced Despawn"); diff --git a/sql/updates/world/2012_04_25_00_world_misc.sql b/sql/updates/world/2012_04_25_00_world_misc.sql deleted file mode 100644 index 3d2f20fdc8c..00000000000 --- a/sql/updates/world/2012_04_25_00_world_misc.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE `smart_scripts` SET `source_type`=0,`id`=1 WHERE `entryorguid`=24814 AND `source_type`=1 AND `event_type`=38; -UPDATE `conditions` SET `SourceTypeOrReferenceId`=17 WHERE `SourceEntry` IN (46485,46488); -UPDATE `conditions` SET `ElseGroup`=0 WHERE `SourceEntry` IN (46485,46488) AND `ConditionValue1`=26817; diff --git a/sql/updates/world/2012_04_25_01_world_spell_script_names.sql b/sql/updates/world/2012_04_25_01_world_spell_script_names.sql deleted file mode 100644 index 7b7135860ab..00000000000 --- a/sql/updates/world/2012_04_25_01_world_spell_script_names.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` = 33110; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(33110,'spell_pri_prayer_of_mending_heal'); diff --git a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql b/sql/updates/world/2012_04_25_02_world_spell_script_names.sql deleted file mode 100644 index ad63bc87837..00000000000 --- a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql +++ /dev/null @@ -1,11 +0,0 @@ -DELETE FROM `spell_scripts` WHERE `id` IN (15998,25952,29435,45980,51592,51910,52267,54420); -DELETE FROM `spell_script_names` WHERE `spell_id` IN (15998,25952,29435,45980,51592,51910,52267,54420); -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(15998, 'spell_gen_despawn_self'), -(25952, 'spell_gen_despawn_self'), -(29435, 'spell_gen_despawn_self'), -(45980, 'spell_gen_despawn_self'), -(51592, 'spell_gen_despawn_self'), -(51910, 'spell_gen_despawn_self'), -(52267, 'spell_gen_despawn_self'), -(54420, 'spell_gen_despawn_self'); diff --git a/sql/updates/world/2012_04_25_03_world_spell_group.sql b/sql/updates/world/2012_04_25_03_world_spell_group.sql deleted file mode 100644 index a6fa90ad41d..00000000000 --- a/sql/updates/world/2012_04_25_03_world_spell_group.sql +++ /dev/null @@ -1,11 +0,0 @@ -DELETE FROM `spell_group` WHERE `id` IN (1117,1118); -INSERT INTO `spell_group` (`id`,`spell_id`) VALUES -(1117,25898), -(1117,25899), -(1118,20911), -(1118,20217); - -DELETE FROM `spell_group_stack_rules` WHERE `group_id` in (1117,1118); -INSERT INTO `spell_group_stack_rules` (`group_id`,`stack_rule`) VALUES -(1117,3), -(1118,3); diff --git a/sql/updates/world/2012_04_26_00_world_conditions.sql b/sql/updates/world/2012_04_26_00_world_conditions.sql deleted file mode 100644 index 8d525cad057..00000000000 --- a/sql/updates/world/2012_04_26_00_world_conditions.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `conditions` SET `ElseGroup` = 0, `SourceGroup` = 0 WHERE `SourceEntry` IN (46485,46488); diff --git a/sql/updates/world/2012_04_26_01_world_smart_scripts.sql b/sql/updates/world/2012_04_26_01_world_smart_scripts.sql deleted file mode 100644 index e90e7b58433..00000000000 --- a/sql/updates/world/2012_04_26_01_world_smart_scripts.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `smart_scripts` SET `source_type` = 0, `id` = 1 WHERE `entryorguid` = 25814 AND `source_type` = 1 AND `id` = 0; diff --git a/sql/updates/world/2012_04_27_00_world_instance_icc.sql b/sql/updates/world/2012_04_27_00_world_instance_icc.sql deleted file mode 100644 index 6738e4904ab..00000000000 --- a/sql/updates/world/2012_04_27_00_world_instance_icc.sql +++ /dev/null @@ -1,5 +0,0 @@ -DELETE FROM `creature_text` WHERE `entry`=37813 AND `groupid`=14; -INSERT INTO `creature_text` (`entry`,`groupid`,`text`,`type`,`comment`) VALUES (37813,14,'%s''s Blood Beasts gain the scent of blood!',41,'Deathbringer Saurfang - EMOTE_SCENT_OF_BLOOD'); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=72771; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES -(13,3,72771,31,3,38508,'Deathbringer Saurfang - Scent of Blood on Blood Beast'); diff --git a/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql b/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql deleted file mode 100644 index 07c53a8f7c9..00000000000 --- a/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql +++ /dev/null @@ -1,158 +0,0 @@ --- The Descent into Madness --- References --- ------------------------------- --- -- Variables and definitions -- --- ------------------------------- --- Set References -SET @Vezax10Ref := 34373; -SET @Vezax25Ref := @Vezax10Ref+1; -SET @Yogg10Ref := @Vezax10Ref+2; -SET @Yogg25Ref := @Vezax10Ref+3; -SET @Chest := 12034; -SET @Shoulder := 12035; -SET @EmblemRef := 34349; -SET @Recipe := 34154; -SET @Vezax10 := 33271; -SET @Vezax25 := 33449; -SET @Yogg10 := 33288; -SET @Yogg25 := 33955; - --- ------------------------- --- -- Reference Templates -- --- ------------------------- --- Delete previous templates if existing -DELETE FROM `reference_loot_template` WHERE `entry` IN (34131,34132,34133,34164,34165); -DELETE FROM `reference_loot_template` WHERE `entry` IN (@Vezax10Ref,@Vezax25Ref,@Yogg10Ref,@Yogg25Ref,@Chest,@Shoulder); -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Vezax 10 man -(@Vezax10Ref,46014,0,1,1,1,1), -- Saronite Animus Cloak -(@Vezax10Ref,46008,0,1,1,1,1), -- Choker of the Abyss -(@Vezax10Ref,46010,0,1,1,1,1), -- Darkstone Ring -(@Vezax10Ref,45996,0,1,1,1,1), -- Hoperender -(@Vezax10Ref,46015,0,1,1,1,1), -- Pendant of Endless Despair -(@Vezax10Ref,46013,0,1,1,1,1), -- Underworld Mantle -(@Vezax10Ref,46012,0,1,1,1,1), -- Vestments of the Piercing Light -(@Vezax10Ref,46009,0,1,1,1,1), -- Bindings of the Depths -(@Vezax10Ref,45997,0,1,1,1,1), -- Gauntlets of the Wretched -(@Vezax10Ref,46011,0,1,1,1,1), -- Shadowbite --- Vezax 25 man -(@Vezax25Ref,45513,0,1,1,1,1), -- Boots of the Forgotten Dephts -(@Vezax25Ref,45509,0,1,1,1,1), -- Idol of the Corruptor -(@Vezax25Ref,45501,0,1,1,1,1), -- Boots of the Underdweller -(@Vezax25Ref,45512,0,1,1,1,1), -- Grips of the Unbroken -(@Vezax25Ref,45503,0,1,1,1,1), -- Metallic Loop of the Sufferer -(@Vezax25Ref,45505,0,1,1,1,1), -- Belt of Clinging Hope -(@Vezax25Ref,45502,0,1,1,1,1), -- Helm of the Faceless -(@Vezax25Ref,45145,0,1,1,1,1), -- Libram of the Sacred Shield -(@Vezax25Ref,45508,0,1,1,1,1), -- Belt of the Darkspeaker -(@Vezax25Ref,45504,0,1,1,1,1), -- Darkcore Leggings -(@Vezax25Ref,45514,0,1,1,1,1), -- Mantle of the Unknowing -(@Vezax25Ref,45515,0,1,1,1,1), -- Ring of the Vacant Eye -(@Vezax25Ref,45507,0,1,1,1,1), -- The General's Heart --- Yogg 10 man -(@Yogg10Ref,46016,0,1,1,1,1), -- Abaddon -(@Yogg10Ref,46018,0,1,1,1,1), -- Deliverance -(@Yogg10Ref,46019,0,1,1,1,1), -- Leggings of the Insatiable -(@Yogg10Ref,46021,0,1,1,1,1), -- Royal Seal of King Llane -(@Yogg10Ref,46022,0,1,1,1,1), -- Pendant of a Thousand Maws -(@Yogg10Ref,46024,0,1,1,1,1), -- Kingsbane -(@Yogg10Ref,46025,0,1,1,1,1), -- Devotion -(@Yogg10Ref,46028,0,1,1,1,1), -- Faceguard of the Eyeless Horror -(@Yogg10Ref,46030,0,1,1,1,1), -- Threads of the Dragon Council -(@Yogg10Ref,46031,0,1,1,1,1), -- Touch of Madness --- Yogg 25 man -(@Yogg25Ref,45521,0,1,1,1,1), -- Earthshaper -(@Yogg25Ref,45522,0,1,1,1,1), -- Blood of the Old God -(@Yogg25Ref,45523,0,1,1,1,1), -- Garona's Guise -(@Yogg25Ref,45524,0,1,1,1,1), -- Chestguard of Insidious Intent -(@Yogg25Ref,45525,0,1,1,1,1), -- Godbane Signet -(@Yogg25Ref,45527,0,1,1,1,1), -- Soulscribe -(@Yogg25Ref,45529,0,1,1,1,1), -- Shawl of Haunted Memories -(@Yogg25Ref,45530,0,1,1,1,1), -- Sanity's Bond -(@Yogg25Ref,45531,0,1,1,1,1), -- Chestguard of the Fallen God -(@Yogg25Ref,45532,0,1,1,1,1), -- Cowl of Dark Whispers --- Chest for Yogg -(@Chest,45635,0,1,1,1,1), -- Chestguard of the Wayward Conqueror -(@Chest,45636,0,1,1,1,1), -- Chestguard of the Wayward Protector -(@Chest,45637,0,1,1,1,1), -- Chestguard of the Wayward Vanquisher -(@Shoulder,45656,0,1,1,1,1), -- Mantle of the Wayward Conqueror -(@Shoulder,45657,0,1,1,1,1), -- Mantle of the Wayward Protector -(@Shoulder,45658,0,1,1,1,1); -- Mantle of the Wayward Vanquisher - -DELETE FROM `creature_loot_template` WHERE `entry` IN(@Vezax10,@Vezax25,@Yogg10,@Yogg25); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ---------------------------------------------------------- --- General Vezax --- ---------------------------------------------------------- --- 10 man mode -(@Vezax10,1,100,3,0,-@Vezax10Ref,2), -- 2x Normal Loot Item -(@Vezax10,47241,100,3,0,1,1), -- 1x Emblem of Triumph --- hardmode loot 10 -(@Vezax10,46032,0,2,1,1,1), -- Drape of the Faceless General -(@Vezax10,46034,0,2,1,1,1), -- Leggings of Profound Darkness -(@Vezax10,46033,0,2,1,1,1), -- Tortured Earth -(@Vezax10,46035,0,2,1,1,1), -- Aesuga, Hand of the Ardent Champion -(@Vezax10,46036,0,2,1,1,1), -- Void Sabre --- 25 man mode -(@Vezax25,1,100,3,0,-@Vezax25Ref,3), -- 3x Normal Loot Item -(@Vezax25,47241,100,3,0,1,1), -- 1x Emblem of Triumph -(@Vezax25,2,10,1,0,-@Recipe,1), -- Chance on Recipe -(@Vezax25,3,10,1,0,-34350,1), -- Chance on Runed Orb --- hardmode loot 25 -(@Vezax25,45498,0,2,1,1,1), -- Lotrafen, Spear of the Damned -(@Vezax25,45511,0,2,1,1,1), -- Scepter of Lost Souls -(@Vezax25,45516,0,2,1,1,1), -- Voldrethar, Dark Blade of Oblivion -(@Vezax25,45517,0,2,1,1,1), -- Pendulum of Infinity -(@Vezax25,45519,0,2,1,1,1), -- Vestments of the Blind Denizen -(@Vezax25,45518,0,2,1,1,1), -- Flare of the Heavens -(@Vezax25,45520,0,2,1,1,1), -- Handwraps of the Vigilant --- ---------------------------------------------------------- --- Yogg Saron --- ---------------------------------------------------------- --- 10 man --- All modes -(@Yogg10,1,100,31,0,-@Yogg10Ref,1), -- 1x Normal Loot item for modes 0&1&2&3&4 -(@Yogg10,2,100,31,0,-@Chest,1), -- 1x Tier token for modes 0&1&2&3&4 -(@Yogg10,47241,100,31,0,1,1), -- 1x Emblem of Triumph for modes 0&1&2&3&4 --- Extra for <3 watchers -(@Yogg10,3,100,30,0,-@EmblemRef,1), -- additional Emblem for modes2&3 --- Extra for <2 watchers -(@Yogg10,4,100,28,0,-34350,1), -- Runed Orb for 0&1&2 -(@Yogg10,5,10,28,0,-@Recipe,1), -- Chance on Recipe for 0&1&2 --- Extra for <1 watchers -(@Yogg10,6,100,24,0,-@EmblemRef,1), -- additional Emblem for 0&1 -(@Yogg10,7,100,24,0,-@Recipe,1), -- Garanteed Recipe for 0&1 --- Hardmode 10 loot -(@Yogg10,46067,0,24,1,1,1), -- Hammer of Crushing Whispers -(@Yogg10,46068,0,24,1,1,1), -- Amice of Inconceivable Horror -(@Yogg10,46095,0,24,1,1,1), -- Soul-Devouring Cinch -(@Yogg10,46096,0,24,1,1,1), -- Signet of Soft Lament -(@Yogg10,46097,0,24,1,1,1), -- Caress of Insanity --- Extra for 0 watchers -(@Yogg10,46312,100,16,0,1,1), -- Vanquished Clutches of Yogg-Saron --- 25 man mode --- All modes -(@Yogg25,1,100,31,0,-@Yogg25Ref,2), -- 2x Normal Loot item for modes 0&1&2&3&4 -(@Yogg25,2,100,31,0,-@Shoulder,2), -- 2x Tier token for modes 0&1&2&3&4 -(@Yogg25,47241,100,31,0,1,1), -- 1x Emblem of Triumph for modes 0&1&2&3&4 -(@Yogg25,3,10,31,0,-34350,1), -- Chance on Runed Orb for modes 0&1&2&3&4 -(@Yogg25,4,10,31,0,-@Recipe,1), -- Chance on Recipe for 0&1&2&3&4 -(@Yogg25,45897,100,31,0,1,1), -- Fragment of Val'anyr --- Extra for <3 watchers -(@Yogg25,5,100,30,0,-@EmblemRef,1), -- additional Emblem for modes2&3 --- Extra for <2 watchers -(@Yogg25,6,100,28,0,-34350,1), -- Runed Orb for 0&1&2 --- Extra for <1 watchers -(@Yogg25,7,100,24,0,-@EmblemRef,1), -- additional Emblem for 0&1 -(@Yogg25,8,100,24,0,-@Recipe,1), -- Garanteed Recipe for 0&1 --- Hardmode 25 loot -(@Yogg25,45533,0,24,1,1,1), -- Dark Edge of Depravity -(@Yogg25,45534,0,24,1,1,1), -- Seal of the Betrayed King -(@Yogg25,45535,0,24,1,1,1), -- Show of Faith -(@Yogg25,45536,0,24,1,1,1), -- Legguards of Cunning Deception -(@Yogg25,45537,0,24,1,1,1), -- Threads of the False Oracle --- Extra for 0 watchers -(@Yogg25,45693,100,16,0,1,1); -- Mimiron's Head - --- Cleanups -DELETE FROM `conditions` WHERE `SourceEntry`=45897 AND `SourceGroup`=33955; diff --git a/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql b/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql deleted file mode 100644 index e46c45e497a..00000000000 --- a/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql +++ /dev/null @@ -1,22 +0,0 @@ -SET @Triumph :=47241; --- Cleanup some unneeded references -DELETE FROM `reference_loot_template` WHERE `entry` IN (34167,34168,34169); -UPDATE `creature_loot_template` SET `mincountOrRef`=-34349 WHERE `mincountOrRef` IN (-34167,-34168,-34169); --- Fix this weird defined reference for ulduar -UPDATE `reference_loot_template` SET `ChanceOrQuestChance`=100,`groupid`=0 WHERE `entry`=34349; --- Remove Emblem of Triumph from reference_loot -DELETE FROM `reference_loot_template` WHERE `item`=@Triumph AND `entry`IN (12025,35034,35040,35049); --- Actual Emblem on creature as it should be -DELETE FROM `creature_loot_template` WHERE `entry` IN (30397,30398,31365,31367,31656,31679) AND `item`=@Triumph; -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(30397,@Triumph,100,1,0,1,1), -- Commander Kolurg (1) -(30398,@Triumph,100,1,0,1,1), -- Commander Stoutbeard (1) -(31365,@Triumph,100,1,0,1,1), -- Drakkari Colossus (1) -(31367,@Triumph,100,1,0,1,1), -- Drakkari Elemental (1) -(31656,@Triumph,100,1,0,1,1), -- Dalronn the Controller (1) -(31679,@Triumph,100,1,0,1,1); -- Skarvald the Constructor (1) --- Similar action for gameobjects -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (27416,27417) AND `item`=@Triumph; -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(27417,@Triumph,100,1,0,1,1), -- Confessor's Cache -(27416,@Triumph,100,1,0,1,1); -- Eadric's Cache diff --git a/sql/updates/world/2012_05_01_00_world_creature.sql b/sql/updates/world/2012_05_01_00_world_creature.sql deleted file mode 100644 index c0509d0d132..00000000000 --- a/sql/updates/world/2012_05_01_00_world_creature.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Add missing Challe & Orphan Matron Aria Spawns -SET @GUID := 41876; -DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES -(@GUID,23101,530,1,1,0,0,-480.4989,7499.029,181.2889,3.560472,120,0,0,1,0,0), -(@GUID+1,34365,571,1,1,0,0,5716.604,642.8611,646.2927,5.88176,120,0,0,1,0,0); --- Add to game event creature -DELETE FROM `game_event_creature` WHERE `guid`=@GUID+1; -INSERT INTO `game_event_creature` (`eventEntry`,`guid`) VALUES (10,@GUID+1); diff --git a/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql b/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql deleted file mode 100644 index f0721e63635..00000000000 --- a/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql +++ /dev/null @@ -1,8 +0,0 @@ -DELETE FROM `creature_loot_template` WHERE `entry` IN(38064,38103); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Precious 25 man -(38103,1,100,1,0,-35069,2), -- Two From ICC Trashgenerated on Precious -(38103,52019,30,1,0,1,1), -- Precious Ribbon on Precious -(38064,1,100,1,0,-35069,2); -- Two From ICC Trashgenerated on Stinky --- add skinning loot for Stinky & Precious -UPDATE `creature_template` SET `skinloot`=70214 WHERE `entry` IN (37025,38064,37217,38103); diff --git a/sql/updates/world/2012_05_03_00_world_creature.sql b/sql/updates/world/2012_05_03_00_world_creature.sql deleted file mode 100644 index d906dba78bc..00000000000 --- a/sql/updates/world/2012_05_03_00_world_creature.sql +++ /dev/null @@ -1,29 +0,0 @@ -SET @GUID1 := 42158; -SET @GUID2 := 42159; --- add creature -DELETE FROM creature WHERE guid IN (@GUID1,@GUID2); -INSERT INTO `creature` -(`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`) -VALUES -(@GUID1 ,38453,571,1,1,3561.821,-2736.367,136.0317,0), -- Arcturis in Grizzly Hills -(@GUID2,35189,571,1,1,7101.845,-1443.734,924.2609,0.178631); -- Skoll in The Storm Peaks --- Update template -UPDATE `creature_template` SET `faction_A` = 190, `faction_H`=190 WHERE `entry` IN (38453,35189); -SET @NPC= @GUID1*10; --- Add pathing for Arcturis -DELETE FROM `creature_addon` WHERE `guid` = @GUID1; -INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(@GUID1,@NPC,0,0,0,0,''); -- Add path for Acturis --- Add waypoint data for the path: -DELETE FROM `waypoint_data` WHERE `id`=@NPC; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES -(@NPC,1,3563.499,-2737.698,137.1898), -(@NPC,2,3565.249,-2738.698,138.4398), -(@NPC,3,3566.749,-2739.948,139.9398), -(@NPC,4,3568.249,-2740.698,140.6898), -(@NPC,5,3567.839,-2741.380,141.9256), -(@NPC,6,3569.999,-2741.948,142.1898), -(@NPC,7,3570.749,-2742.448,143.1898), -(@NPC,8,3572.676,-2743.528,144.8479); --- Spawntimefix -UPDATE `creature` SET `spawntimesecs`=39600 WHERE `guid` IN (@GUID1,@GUID2); -- Set the spawntime to 11 hours for Arcturis & Skoll diff --git a/sql/updates/world/2012_05_03_01_world_cos_misc.sql b/sql/updates/world/2012_05_03_01_world_cos_misc.sql deleted file mode 100644 index 6c2ea6d3a95..00000000000 --- a/sql/updates/world/2012_05_03_01_world_cos_misc.sql +++ /dev/null @@ -1,153 +0,0 @@ -UPDATE `script_texts` SET `emote` = 432 WHERE `entry` IN (-1595111); -UPDATE `script_texts` SET `emote` = 396 WHERE `entry` IN (-1595070,-1595075,-1595078,-1595079,-1595088,-1595103,-1595106,-1595107,-1595108,-1595109,-1595113,-1595114,-1595115,-1595116); -UPDATE `script_texts` SET `emote` = 397 WHERE `entry` IN (-1595071,-1595084,-1595093); -UPDATE `script_texts` SET `emote` = 274 WHERE `entry` IN (-1595091); -UPDATE `script_texts` SET `emote` = 5 WHERE `entry` IN (-1595073,-1595118); -UPDATE `script_texts` SET `emote` = 6 WHERE `entry` IN (-1595076); -UPDATE `script_texts` SET `emote` = 1 WHERE `entry` IN (-1595083,-1595100,-1595104,-1595120); -UPDATE `script_texts` SET `emote` = 0 WHERE `entry` IN (-1595009,-1595010,-1595081,-1595082,-1595085,-1595119); - -UPDATE `script_texts` SET `type` = 1 WHERE `entry` IN (-1595009,-1595010,-1595087,-1595094,-1595095,-1595093); -UPDATE `script_texts` SET `type` = 0 WHERE `entry` IN (-1595077,-1595078,-1595119); - -UPDATE `script_texts` SET `content_default` = "Champions, meet me at the Town Hall at once. We must take the fight to Mal'Ganis." WHERE `entry` = -1595095; -UPDATE `script_texts` SET `content_default` = "Follow me, I know the way through." WHERE `entry` = -1595096; -UPDATE `script_texts` SET `content_default` = "Take position here, and I will lead a small force inside Stratholme to begin the culling. We must contain and purge the infected for the sake of all of Lordaeron!" WHERE entry = -1595087; -UPDATE `script_texts` SET `content_default` = "Ah, you've finally arrived Prince Arthas. You're here just in the nick of time." WHERE `entry` = -1595097; -UPDATE `script_texts` SET `content_default` = "Yes, I'm glad I could get to you before the plague." WHERE `entry` = -1595098; -UPDATE `script_texts` SET `content_default` = "As if I could forget. Listen, Uther, there's something about the plague you should know..." WHERE `entry` = -1595072; -UPDATE `script_texts` SET `content_default` = "There's no need for you to understand, Arthas. All you need to do is die." WHERE `entry` = -1595100; -UPDATE `script_texts` SET `content_default` = "More vile sorcery! Be ready for anything!" WHERE `entry` = -1595102; -UPDATE `script_texts` SET `content_default` = "Watch your backs: they have us surrounded in this hall." WHERE `entry` = -1595104; -UPDATE `script_texts` SET `content_default` = "Mal'Ganis is not making this easy." WHERE `entry` = -1595106; -UPDATE `script_texts` SET `content_default` = "What else can he put in my way?" WHERE `entry` = -1595108; -UPDATE `script_texts` SET `content_default` = "I do what I must for Lordaeron, and neither your words nor your actions will stop me." WHERE `entry` = -1595109; -UPDATE `script_texts` SET `content_default` = "The quickest path to Mal'Ganis lies behind that bookshelf ahead." WHERE `entry` = -1595110; -UPDATE `script_texts` SET `content_default` = "I'm relieved this secret passage still works." WHERE `entry` = -1595112; -UPDATE `script_texts` SET `content_default` = "Let's move through here as quickly as possible. If the undead don't kill us, the fires might." WHERE `entry` = -1595113; -UPDATE `script_texts` SET `content_default` = "Rest a moment and clear your lungs, but we must move again soon." WHERE `entry` = -1595114; -UPDATE `script_texts` SET `content_default` = "That's enough; we must move again. Mal'Ganis awaits." WHERE `entry` = -1595115; -UPDATE `script_texts` SET `content_default` = "At last some good luck. Market Row has not caught fire yet. Mal'Ganis is supposed to be in Crusaders' Square, which is just ahead. Tell me when you're ready to move forward." WHERE `entry` = -1595116; -UPDATE `script_texts` SET `content_default` = "Justice will be done." WHERE `entry` = -1595117; -UPDATE `script_texts` SET `content_default` = "We're going to finish this right now, Mal'Ganis. Just you... and me." WHERE `entry` = -1595118; - -UPDATE `script_texts` SET `comment` = concat(`comment`,". NEEDS VERIFICATION") WHERE `entry` IN (-1595101,-1595105); - -SET @GUID := 88474; -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+00,27737,595,3,1,25543,0,2319.89,1285.78,131.407,1.72169,60,10,0,630,0,1,0,0,0), -(@GUID+01,27737,595,3,1,10979,0,2308.12,1304.21,127.601,4.39662,60,10,0,630,0,1,0,0,0), -(@GUID+02,27737,595,3,1,25542,0,2335.47,1262.04,132.921,1.42079,60,10,0,630,0,1,0,0,0), -(@GUID+03,27737,595,3,1,25543,0,2297.73,1338.75,124.622,2.5574,60,10,0,630,0,1,0,0,0), -(@GUID+04,27737,595,3,1,10979,0,2322.65,1265.39,133.033,5.6524,60,10,0,630,0,1,0,0,0), -(@GUID+05,27737,595,3,1,10973,0,2277.83,1331.92,124.19,3.48045,60,10,0,630,0,1,0,0,0), -(@GUID+06,27737,595,3,1,25543,0,2294.18,1316.93,125.672,6.05649,60,10,0,630,0,1,0,0,0), -(@GUID+07,27737,595,3,1,10973,0,2310.56,1369,128.372,5.03364,60,10,0,630,0,1,0,0,0), -(@GUID+08,27737,595,3,1,10979,0,2306.15,1322.85,125.708,4.99133,60,10,0,630,0,1,0,0,0), -(@GUID+09,27737,595,3,1,10973,0,2320.14,1297.48,129.694,1.35248,60,10,0,630,0,1,0,0,0), -(@GUID+10,27737,595,3,1,25542,0,2291.57,1327.27,124.545,5.32358,60,10,0,630,0,1,0,0,0), -(@GUID+11,27737,595,3,1,25542,0,2308.04,1352.65,126.907,5.83741,60,10,0,630,0,1,0,0,0), -(@GUID+12,27737,595,3,1,10979,0,2329.44,1281.11,132.636,2.25207,60,10,0,630,0,1,0,0,0), -(@GUID+13,27737,595,3,1,0,0,2407.32,1423.8,131.522,6.24743,60,10,0,706,0,1,0,0,0), -(@GUID+14,27737,595,3,1,0,0,2417.26,1428.41,131.652,6.20423,60,10,0,730,0,1,0,0,0), -(@GUID+15,27737,595,3,1,0,0,2420.48,1419.99,130.716,0.0977616,60,10,0,706,0,1,0,0,0), -(@GUID+16,27737,595,3,1,0,0,2426.63,1413.41,130.464,0.404064,60,10,0,730,0,1,0,0,0), -(@GUID+17,27737,595,3,1,0,0,2430.46,1417.6,130.557,0.125247,60,10,0,730,0,1,0,0,0), -(@GUID+18,27737,595,3,1,0,0,2433.94,1427.03,131.18,0.0584885,60,10,0,706,0,1,0,0,0), -(@GUID+19,27737,595,3,1,0,0,2446.5,1428.37,131.013,6.10606,60,10,0,756,0,1,0,0,0), -(@GUID+20,27737,595,3,1,0,0,2449.49,1423.35,130.588,5.77619,60,10,0,706,0,1,0,0,0), -(@GUID+21,27737,595,3,1,0,0,2441.92,1424.41,130.606,6.07857,60,10,0,706,0,1,0,0,0), -(@GUID+22,27737,595,3,1,0,0,2450.6,1438.61,132.213,4.74889,60,10,0,730,0,1,0,0,0), -(@GUID+23,27737,595,3,1,0,0,2460.17,1436.46,131.501,4.73711,60,10,0,756,0,1,0,0,0), -(@GUID+24,27737,595,3,1,0,0,2444.68,1421.68,130.324,6.01338,60,10,0,756,0,1,0,0,0), -(@GUID+25,27737,595,3,1,0,0,2456.87,1419.07,130.488,5.39763,60,10,0,706,0,1,0,0,0), -(@GUID+26,27737,595,3,1,0,0,2464.27,1422.15,130.976,5.22092,60,10,0,756,0,1,0,0,0), -(@GUID+27,27737,595,3,1,0,0,2468.21,1403.06,130.39,5.6364,60,10,0,756,0,1,0,0,0), -(@GUID+28,27737,595,3,1,0,0,2460.88,1406.8,130.508,5.96234,60,10,0,756,0,1,0,0,0), -(@GUID+29,27737,595,3,1,0,0,2485.77,1398.35,130.795,4.71591,60,10,0,756,0,1,0,0,0), -(@GUID+30,27737,595,3,1,0,0,2485.79,1380.46,130.15,5.02928,60,10,0,730,0,1,0,0,0), -(@GUID+31,27737,595,3,1,0,0,2475.77,1396.31,130.124,4.84079,60,10,0,730,0,1,0,0,0), -(@GUID+32,27737,595,3,1,0,0,2476.92,1387.21,129.401,5.05128,60,10,0,730,0,1,0,0,0), -(@GUID+33,27737,595,3,1,0,0,2483.24,1389.37,130.123,4.74104,60,10,0,730,0,1,0,0,0), -(@GUID+34,27737,595,3,1,0,0,2480.2,1370.15,129.533,5.79583,60,10,0,706,0,1,0,0,0), -(@GUID+35,27737,595,3,1,0,0,2481.54,1375.11,129.642,5.4644,60,10,0,730,0,1,0,0,0), -(@GUID+36,27737,595,3,1,0,0,2489.44,1359.42,131.233,5.378,60,10,0,730,0,1,0,0,0), -(@GUID+37,27737,595,3,1,0,0,2486.59,1356.19,131.876,5.7275,60,10,0,756,0,1,0,0,0), -(@GUID+38,27737,595,3,1,0,0,2495.53,1348.61,133.072,5.52722,60,10,0,730,0,1,0,0,0), -(@GUID+39,27737,595,3,1,0,0,2504.48,1349.65,132.856,5.11881,60,10,0,730,0,1,0,0,0), -(@GUID+40,27737,595,3,1,0,0,2493.11,1380.29,130.24,4.93189,60,10,0,706,0,1,0,0,0), -(@GUID+41,27737,595,3,1,0,0,2487.18,1392.64,130.512,4.93818,60,10,0,706,0,1,0,0,0), -(@GUID+42,27737,595,3,1,0,0,2506.49,1336.89,132.794,5.19343,60,10,0,756,0,1,0,0,0), -(@GUID+43,27737,595,3,1,0,0,2518.2,1306.39,130.623,4.81723,60,10,0,756,0,1,0,0,0), -(@GUID+44,27737,595,3,1,0,0,2513.4,1299.67,130.868,4.4206,60,10,0,756,0,1,0,0,0), -(@GUID+45,27737,595,3,1,0,0,2511.45,1291.47,130.808,5.00729,60,10,0,756,0,1,0,0,0), -(@GUID+46,27737,595,3,1,0,0,2518.56,1292.32,130.528,5.16438,60,10,0,756,0,1,0,0,0), -(@GUID+47,27737,595,3,1,0,0,2515.49,1279.85,129.214,5.28847,60,10,0,730,0,1,0,0,0), -(@GUID+48,27737,595,3,1,0,0,2514.37,1285.92,129.934,5.70473,60,10,0,706,0,1,0,0,0), -(@GUID+49,27737,595,3,1,0,0,2522.65,1274.29,128.576,5.44634,60,10,0,706,0,1,0,0,0), -(@GUID+50,27737,595,3,1,0,0,2535.38,1275.77,127.42,5.49817,60,10,0,756,0,1,0,0,0), -(@GUID+51,27737,595,3,1,0,0,2537.59,1273.1,127.05,5.02693,60,10,0,730,0,1,0,0,0), -(@GUID+52,27737,595,3,1,0,0,2547.49,1261.7,126.44,4.78425,60,10,0,730,0,1,0,0,0), -(@GUID+53,27737,595,3,1,0,0,2534.36,1261.06,127.125,4.3994,60,10,0,756,0,1,0,0,0), -(@GUID+54,27737,595,3,1,0,0,2532.69,1251.44,127.452,5.4479,60,10,0,730,0,1,0,0,0), -(@GUID+55,27737,595,3,1,0,0,2551.84,1252.35,125.455,5.04342,60,10,0,706,0,1,0,0,0), -(@GUID+56,27737,595,3,1,0,0,2536.1,1244,126.928,5.16515,60,10,0,756,0,1,0,0,0), -(@GUID+57,27737,595,3,1,0,0,2543.63,1247.23,126.131,5.19735,60,10,0,706,0,1,0,0,0), -(@GUID+58,27737,595,3,1,0,0,2554.21,1238.95,125.475,4.64836,60,10,0,730,0,1,0,0,0), -(@GUID+59,27737,595,3,1,0,0,2548.89,1227.37,126.375,5.31517,60,10,0,756,0,1,0,0,0), -(@GUID+60,27737,595,3,1,0,0,2560.46,1225.4,125.496,4.85335,60,10,0,706,0,1,0,0,0), -(@GUID+61,27737,595,3,1,0,0,2555.11,1218.55,125.944,5.11646,60,10,0,730,0,1,0,0,0), -(@GUID+62,27737,595,3,1,0,0,2561.91,1211.56,125.38,5.5877,60,10,0,730,0,1,0,0,0), -(@GUID+63,27737,595,3,1,0,0,2568.67,1202.96,125.509,4.96095,60,10,0,756,0,1,0,0,0), -(@GUID+64,27737,595,3,1,0,0,2571.93,1193.48,125.619,5.07641,60,10,0,756,0,1,0,0,0), -(@GUID+65,27737,595,3,1,0,0,2577.77,1180.88,125.562,4.64522,60,10,0,756,0,1,0,0,0), -(@GUID+66,27737,595,3,1,0,0,2574.2,1166.63,126.089,4.44966,60,10,0,706,0,1,0,0,0), -(@GUID+67,27737,595,3,1,0,0,2564.78,1166.82,127.092,4.2266,60,10,0,756,0,1,0,0,0), -(@GUID+68,27737,595,3,1,0,0,2577.56,1158.41,126.385,4.07738,60,10,0,756,0,1,0,0,0), -(@GUID+69,27737,595,3,1,0,0,2567.93,1176.56,126.2,4.7489,60,10,0,706,0,1,0,0,0), -(@GUID+70,27737,595,3,1,0,0,2559.28,1189.46,126.642,4.73319,60,10,0,756,0,1,0,0,0), -(@GUID+71,27737,595,3,1,0,0,2554.14,1213.37,126.599,5.13845,60,10,0,706,0,1,0,0,0), -(@GUID+72,27737,595,3,1,0,0,2560.58,1218.48,125.281,4.97351,60,10,0,730,0,1,0,0,0), -(@GUID+73,27737,595,3,1,0,0,2570.2,1170.58,126.311,4.64365,60,10,0,756,0,1,0,0,0), -(@GUID+74,27729,595,3,1,0,0,2496.57,1354.66,132.217,5.13691,120,5,0,63000,0,1,0,0,0), -(@GUID+75,27729,595,3,1,0,0,2494.22,1365.17,130.812,5.15654,120,5,0,63000,0,1,0,0,0), -(@GUID+76,27729,595,3,1,0,0,2440.41,1434.46,131.456,5.69372,120,5,0,63000,0,1,0,0,0), -(@GUID+77,27729,595,3,1,0,0,2433.18,1421.13,130.644,0.046706,120,5,0,63000,0,1,0,0,0), -(@GUID+78,27734,595,3,1,0,0,2546.07,1239.17,125.945,5.07801,120,5,0,63000,0,1,0,0,0), -(@GUID+79,27734,595,3,1,0,0,2458.58,1426.22,131.056,5.42984,120,5,0,63000,0,1,0,0,0), -(@GUID+80,27736,595,3,1,0,0,2488.11,1364.91,130.402,5.35524,120,5,0,130330,0,1,0,0,0), -(@GUID+81,28199,595,3,1,0,0,2527.63,1267.59,128.168,5.12906,120,5,0,63000,0,1,0,0,0), -(@GUID+82,28199,595,3,1,0,0,2528.06,1284.34,128.877,5.14869,120,5,0,63000,0,1,0,0,0), -(@GUID+83,28199,595,3,1,0,0,2466.27,1414.57,130.977,5.18637,120,5,0,63000,0,1,0,0,0), -(@GUID+84,28200,595,3,1,0,0,2570.51,1181.4,125.809,4.61855,120,5,0,50400,44070,1,0,0,0), -(@GUID+85,28200,595,3,1,0,0,2560.45,1202.05,126.031,4.85417,120,5,0,50400,44070,1,0,0,0), -(@GUID+86,28200,595,3,1,0,0,2487.85,1373.29,130.236,5.078,120,5,0,50400,44070,1,0,0,0), -(@GUID+87,28200,595,3,1,0,0,2416.7,1416.52,130.379,0.191224,120,5,0,50400,44070,1,0,0,0), -(@GUID+88,28200,595,3,1,0,0,2424.42,1422.68,130.868,0.25327,120,5,0,50400,44070,1,0,0,0), -(@GUID+89,28201,595,3,1,0,0,2540.67,1254.82,126.274,4.97198,120,5,0,130330,0,1,0,0,0), -(@GUID+90,28201,595,3,1,0,0,2410.03,1417.19,130.577,0.191229,120,5,0,130330,0,1,0,0,0), -(@GUID+91,28249,595,3,1,0,0,2562.66,1177.9,126.716,4.77171,120,5,0,63000,0,1,0,0,0), -(@GUID+92,28249,595,3,1,0,0,2566.72,1190.41,125.837,4.7992,120,5,0,63000,0,1,0,0,0), -(@GUID+93,28249,595,3,1,0,0,2472.34,1404.76,130.752,5.20601,120,5,0,63000,0,1,0,0,0), -(@GUID+94,28249,595,3,1,0,0,2460.59,1413.26,130.46,5.4377,120,5,0,63000,0,1,0,0,0), -(@GUID+95,28249,595,3,1,0,0,2415.04,1423.52,131.111,0.214785,120,5,0,63000,0,1,0,0,0); - -DELETE FROM `script_texts` WHERE entry BETWEEN -1595052 AND -1595048; -INSERT INTO `script_texts` (npc_entry,entry, content_default, comment) VALUES -(27913,-1595048, "Scourge forces have been spotted near the Elder's Square Gate!","Spawns near elder's square gate."), -(27913,-1595059, "Scourge forces have been spotted near the Town Hall!","Spawns near town hall."), -(27913,-1595050, "Scourge forces have been spotted near the King's Square fountain!","Spawns near king's square."), -(27913,-1595051, "Scourge forces have been spotted near the Market Row Gate!", "Spawns near market row gate."), -(27913,-1595052, "Scourge forces have been spotted near the Festival Lane Gate!", "Spawns near festval lane gate."); - -UPDATE `creature_template` SET `dynamicflags` = 0 WHERE `entry` IN (32273,32313); -UPDATE `areatrigger_teleport` SET id = 5181 WHERE id = 5148; -UPDATE `creature_template` SET `flags_extra` = 128 WHERE `entry` = 20562; -UPDATE `script_waypoint` SET location_x = 2449.32, location_y = 1191.09 WHERE entry = 26499 AND pointid = 26; - -UPDATE `creature_template` SET `lootid` = 32273 WHERE `entry` IN (32273, 32313); - --- thx warpten (fix for credit spell) -UPDATE `spell_dbc` SET `Attributes` = '8388992', `AttributesEx2` = '5', `AttributesEx3` = '269484288' WHERE `Id` = 58630; diff --git a/sql/updates/world/2012_05_03_02_world_quest_template.sql b/sql/updates/world/2012_05_03_02_world_quest_template.sql deleted file mode 100644 index 49953bd2166..00000000000 --- a/sql/updates/world/2012_05_03_02_world_quest_template.sql +++ /dev/null @@ -1,28 +0,0 @@ --- Wolvar Orphan quest order -UPDATE `quest_template` SET `prevquestid`=13927,`exclusivegroup`=-13930 WHERE `id` IN (13930,13934,13951); -UPDATE `quest_template` SET `prevquestid`=13930,`exclusivegroup`=-13955 WHERE `id` IN (13955,13957); -UPDATE `quest_template` SET `prevquestid`=13955,`exclusivegroup`=0 WHERE `id`=13938; -UPDATE `quest_template` SET `prevquestid`=13938,`exclusivegroup`=0 WHERE `id`=13960; --- Oracle Orphan quest order -UPDATE `quest_template` SET `prevquestid`=13926,`exclusivegroup`=-13929 WHERE `id` IN (13929,13933,13950); -UPDATE `quest_template` SET `prevquestid`=13929,`exclusivegroup`=-13954 WHERE `id` IN (13954,13956); -UPDATE `quest_template` SET `prevquestid`=13954,`exclusivegroup`=0 WHERE `id`=13937; -UPDATE `quest_template` SET `prevquestid`=13937,`exclusivegroup`=0 WHERE `id`=13959; --- Human Orphan quest order -UPDATE `quest_template` SET `prevquestid`=1468,`exclusivegroup`=-1479 WHERE `id` IN (1479,1558,1687); -UPDATE `quest_template` SET `prevquestid`=1479,`exclusivegroup`=-558 WHERE `id` IN (558,4822); -UPDATE `quest_template` SET `prevquestid`=558,`exclusivegroup`=0 WHERE `id`=171; --- Orcish Orphan quest order -UPDATE `quest_template` SET `prevquestid`=172,`exclusivegroup`=-910 WHERE `id` IN (910,911,1800); -UPDATE `quest_template` SET `prevquestid`=910,`exclusivegroup`=-915 WHERE `id` IN (915,925); -UPDATE `quest_template` SET `prevquestid`=915,`exclusivegroup`=0 WHERE `id`=5502; --- Draenei Orphan quest order -UPDATE `quest_template` SET `prevquestid`=10943,`exclusivegroup`=-10950 WHERE `id` IN (10950,10952,10954); -UPDATE `quest_template` SET `prevquestid`=10950,`exclusivegroup`=-10956 WHERE `id` IN (10956,10962); -UPDATE `quest_template` SET `NextQuestIdChain`=10968 WHERE `id`=10956; -UPDATE `quest_template` SET `prevquestid`=10968,`exclusivegroup`=0 WHERE `id`=10966; --- Blood Elf Orphan quest order -UPDATE `quest_template` SET `prevquestid`=10942,`exclusivegroup`=-10945 WHERE `id` IN (10945,10951,10953); -UPDATE `quest_template` SET `prevquestid`=10945,`exclusivegroup`=-10960 WHERE `id` IN (10960,10963); -UPDATE `quest_template` SET `prevquestid`=10960,`exclusivegroup`=0 WHERE `id`=11975; -UPDATE `quest_template` SET `prevquestid`=11975,`exclusivegroup`=0 WHERE `id`=10967; diff --git a/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql b/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql deleted file mode 100644 index 1da4f6d29ad..00000000000 --- a/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Set correct NPC for A Warden of the Alliance -UPDATE `creature_questrelation` SET `id`=14305 WHERE `quest`=171; diff --git a/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql b/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql deleted file mode 100644 index 62fd4415549..00000000000 --- a/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql +++ /dev/null @@ -1,57 +0,0 @@ -DELETE FROM `creature_questrelation` WHERE `id` IN (14305,14444,22817,22818,33532,33533,34365); -DELETE FROM `game_event_creature_quest` WHERE `eventEntry`=10; -INSERT INTO `game_event_creature_quest` (`eventEntry`,`id`,`quest`) VALUES --- Alliance -(10,14450,1468), -- Orphan Matron Nightingale - Children's Week -(10,14305,1479), -- Human Orphan - The Bough of the Eternals -(10,14305,1558), -- Human Orphan - The Stonewrought Dam -(10,14305,1687), -- Human Orphan - Spooky Lighthouse -(10,14305,558), -- Human Orphan - Jaina's Autograph -(10,14305,4822), -- Human Orphan - You Scream, I Scream... --- Horde -(10,14451,172), -- Orphan Matron Battlewail - Children's Week -(10,14444,910), -- Orcish Orphan - Down at the Docks -(10,14444,911), -- Orcish Orphan - Gateway to the Frontier -(10,14444,1800), -- Orcish Orphan - Lordaeron Throne Room -(10,14444,915), -- Orcish Orphan - You Scream, I Scream... -(10,14444,925), -- Orcish Orphan - Cairne's Hoofprint -(10,14444,5502), -- Orcish Orphan - A Warden of the Horde --- Outlands: Blood Elfs -(10,22819,10942), -- Orphan Matron Mercy - Children's Week -(10,22817,10945), -- Blood Elf Orphan - Hch'uu and the Mushroom People -(10,22817,10951), -- Blood Elf Orphan - A Trip to the Dark Portal -(10,22817,10953), -- Blood Elf Orphan - Visit the Throne of the Elements -(10,22817,11975), -- Blood Elf Orphan - Now, When I Grow Up... -(10,22817,10963), -- Blood Elf Orphan - Time to Visit the Caverns -(10,22817,10967), -- Blood Elf Orphan - Back to the Orphanage --- Outlands: Draenei -(10,22819,10943), -- Orphan Matron Mercy - Children's Week -(10,22818,10950), -- Draenei Orphan - Auchindoun and the Ring of Observance -(10,22818,10952), -- Draenei Orphan - A Trip to the Dark Portal -(10,22818,10954), -- Draenei Orphan - Jheel is at Aeris Landing! -(10,22818,10956), -- Draenei Orphan - The Seat of the Naaru -(10,22818,10962), -- Draenei Orphan - Time to Visit the Caverns -(10,22818,10966), -- Draenei Orphan - Back to the Orphanage --- Northrend: Wolvar -(10,34365,13927), -- Orphan Matron Aria - Little Orphan Kekek Of The Wolvar -(10,33532,13930), -- Wolvar Orphan - Home Of The Bear-Men -(10,33532,13934), -- Wolvar Orphan - The Bronze Dragonshrine -(10,33532,13951), -- Wolvar Orphan - Playmates! -(10,33532,13955), -- Wolvar Orphan - The Dragon Queen -(10,33532,13957), -- Wolvar Orphan - The Mighty Hemet Nesingwary -(10,33532,13960), -- Wolvar Orphan - Back To The Orphanage --- Northrend: Oracles -(10,34365,13926), -- Orphan Matron Aria - Little Orphan Roo Of The Oracles -(10,33533,13929), -- Oracle Orphan - The Biggest Tree Ever! -(10,33533,13933), -- Oracle Orphan - The Bronze Dragonshrine -(10,33533,13937), -- Oracle Orphan - A Trip To The Wonderworks -(10,33533,13950), -- Oracle Orphan - Playmates! -(10,33533,13954), -- Oracle Orphan - The Dragon Queen -(10,33533,13956), -- Oracle Orphan - Meeting a Great One -(10,33533,13959); -- Oracle Orphan - Back To The Orphanage - --- Removed "When I Grow Up..." and replace it with "Now, When I Grow Up..." -UPDATE `quest_template` SET `prevquestid`=10945,`exclusivegroup`=-11975 WHERE `id` IN (11975,10963); -DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=10960; -INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES -(1,10960,0,'','','Deprecated quest: When I grow up...'); diff --git a/sql/updates/world/2012_05_04_00_world_waypoints.sql b/sql/updates/world/2012_05_04_00_world_waypoints.sql deleted file mode 100644 index a07bde59d49..00000000000 --- a/sql/updates/world/2012_05_04_00_world_waypoints.sql +++ /dev/null @@ -1,137 +0,0 @@ --- Thrallmar Grunt pathing -SET @NPC := 57505; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=168.3949,`position_y`=2641.357,`position_z`=86.32077 WHERE `guid`=@NPC; -UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,168.3949,2641.357,86.32077,0,0,0,100,0), -(@PATH,2,186.5067,2615.882,87.28357,0,0,0,100,0), -(@PATH,3,188.9113,2601.655,87.28357,0,0,0,100,0), -(@PATH,4,198.3909,2602.661,87.28357,0,0,0,100,0), -(@PATH,5,201.5686,2609.845,87.28357,0,0,0,100,0), -(@PATH,6,187.2484,2616.44,87.28357,0,0,0,100,0), -(@PATH,7,168.7871,2641.268,86.32077,0,0,0,100,0), -(@PATH,8,155.2003,2681.998,84.82113,0,0,0,100,0), -(@PATH,9,194.6133,2692.07,90.61374,0,0,0,100,0), -(@PATH,10,215.4427,2693.589,90.69872,0,0,0,100,0), -(@PATH,11,219.0203,2692.25,90.69665,0,0,0,100,0), -(@PATH,12,225.5117,2680.063,90.68996,0,0,0,100,0), -(@PATH,13,235.309,2679.308,90.69373,0,0,0,100,0), -(@PATH,14,246.9184,2682.646,90.70419,0,0,0,100,0), -(@PATH,15,252.4411,2688.479,90.70386,0,0,0,100,0), -(@PATH,16,255.0155,2699.197,90.70283,0,0,0,100,0), -(@PATH,17,251.5234,2707.998,90.70486,0,0,0,100,0), -(@PATH,18,243.2346,2712.791,90.70392,0,0,0,100,0), -(@PATH,19,231.9871,2713.626,90.70399,0,0,0,100,0), -(@PATH,20,221.1457,2709.591,90.69753,0,0,0,100,0), -(@PATH,21,218.8803,2695.845,90.69318,0,0,0,100,0), -(@PATH,22,215.4517,2693.612,90.69869,0,0,0,100,0), -(@PATH,23,194.7944,2692.039,90.65273,0,0,0,100,0), -(@PATH,24,175.8115,2687.591,86.68189,0,0,0,100,0), -(@PATH,25,155.2143,2682.375,84.82113,0,0,0,100,0), -(@PATH,26,131.8727,2679.832,84.56969,0,0,0,100,0), -(@PATH,27,130.0859,2666.262,84.1262,0,0,0,100,0), -(@PATH,28,153.1291,2650.22,86.15128,0,0,0,100,0); - --- Remove dup Thrallmar Grunt spawn -DELETE FROM `creature` WHERE `guid`=57532; -DELETE FROM `creature_addon` WHERE `guid`=57532; - --- Bat Rider Guard pathing -SET @NPC := 54840; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=156.9029,`position_y`=2554.784,`position_z`=170.8949 WHERE `guid`=@NPC; -UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,156.9029,2554.784,170.8949,0,0,0,100,0), -(@PATH,2,52.51677,2602.816,139.7838,0,0,0,100,0), -(@PATH,3,42.10146,2627.056,139.7838,0,0,0,100,0), -(@PATH,4,37.17329,2663.729,139.7838,0,0,0,100,0), -(@PATH,5,62.91933,2687.96,139.7838,0,0,0,100,0), -(@PATH,6,96.1871,2688.141,148.4226,0,0,0,100,0), -(@PATH,7,129.818,2690.786,151.256,0,0,0,100,0), -(@PATH,8,165.6888,2715.398,170.8949,0,0,0,100,0), -(@PATH,9,199.7751,2744.93,170.8949,0,0,0,100,0), -(@PATH,10,246.0857,2761.154,170.8949,0,0,0,100,0), -(@PATH,11,295.0904,2757.991,170.8949,0,0,0,100,0), -(@PATH,12,309.3468,2726.089,170.8949,0,0,0,100,0), -(@PATH,13,303.8448,2682.588,170.8949,0,0,0,100,0), -(@PATH,14,289.3104,2650.866,170.8949,0,0,0,100,0), -(@PATH,15,261.2743,2618.831,170.8949,0,0,0,100,0), -(@PATH,16,233.6436,2578.997,170.8949,0,0,0,100,0), -(@PATH,17,199.3375,2546.226,170.8949,0,0,0,100,0); - --- Bat Rider Guard pathing -SET @NPC := 54841; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=65.97776,`position_y`=2661.205,`position_z`=163.6752 WHERE `guid`=@NPC; -UPDATE `creature_addon` SET `path_id`=@PATH WHERE `guid`=@NPC; -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,65.97776,2661.205,163.6752,0,0,0,100,0), -(@PATH,2,85.52612,2668.312,163.6752,0,0,0,100,0), -(@PATH,3,119.9537,2689.26,163.6752,0,0,0,100,0), -(@PATH,4,121.8238,2721.88,163.6752,0,0,0,100,0), -(@PATH,5,142.6907,2750.891,163.6752,0,0,0,100,0), -(@PATH,6,149.9812,2788.504,163.6752,0,0,0,100,0), -(@PATH,7,142.9353,2830.464,163.6752,0,0,0,100,0), -(@PATH,8,115.1711,2822.444,163.6752,0,0,0,100,0), -(@PATH,9,57.16672,2791.644,163.6752,0,0,0,100,0), -(@PATH,10,38.80463,2758.823,163.6752,0,0,0,100,0), -(@PATH,11,19.69282,2714.784,163.6752,0,0,0,100,0), -(@PATH,12,23.22027,2677.714,163.6752,0,0,0,100,0); - --- Bat Rider Guard pathing -SET @NPC := 54842; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=263.5968,`position_y`=2694.818,`position_z`=169.7312 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,4097); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,263.5968,2694.818,169.7312,0,0,0,100,0), -(@PATH,2,184.0861,2784.899,154.4534,0,0,0,100,0), -(@PATH,3,154.2815,2754.787,154.3701,0,0,0,100,0), -(@PATH,4,127.0308,2740.488,154.3701,0,0,0,100,0), -(@PATH,5,118.0444,2706.509,154.3701,0,0,0,100,0), -(@PATH,6,115.7577,2669.386,158.6756,0,0,0,100,0), -(@PATH,7,131.4314,2622.531,162.1478,0,0,0,100,0), -(@PATH,8,154.8241,2607.207,164.4812,0,0,0,100,0), -(@PATH,9,176.3283,2571.343,168.5645,0,0,0,100,0), -(@PATH,10,221.6267,2559.683,172.1201,0,0,0,100,0), -(@PATH,11,245.392,2593.423,169.8978,0,0,0,100,0), -(@PATH,12,251.0069,2617.749,169.7312,0,0,0,100,0), -(@PATH,13,263.0581,2644.614,169.7312,0,0,0,100,0); - --- Bat Rider Guard pathing -SET @NPC := 54843; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=62.42025,`position_y`=2785.719,`position_z`=192.1124 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,4097); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,62.42025,2785.719,192.1124,0,0,0,100,0), -(@PATH,2,159.9371,2842.977,208.279,0,0,0,100,0), -(@PATH,3,183.0578,2845.035,208.279,0,0,0,100,0), -(@PATH,4,211.2432,2864.757,214.2235,0,0,0,100,0), -(@PATH,5,238.1182,2871.979,220.9457,0,0,0,100,0), -(@PATH,6,252.9173,2853.913,220.9457,0,0,0,100,0), -(@PATH,7,255.0203,2812.634,220.9457,0,0,0,100,0), -(@PATH,8,240.4993,2780.929,220.9457,0,0,0,100,0), -(@PATH,9,195.4901,2773.965,209.3901,0,0,0,100,0), -(@PATH,10,162.1341,2742.294,212.9179,0,0,0,100,0), -(@PATH,11,125.4935,2720.611,197.9457,0,0,0,100,0), -(@PATH,12,93.49241,2699.757,192.1124,0,0,0,100,0), -(@PATH,13,58.35324,2681.49,192.1124,0,0,0,100,0), -(@PATH,14,22.8833,2715.123,192.1124,0,0,0,100,0), -(@PATH,15,30.10514,2764.5,192.1124,0,0,0,100,0); - --- Fix Bat Rider Guard InhabitType -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=15242; - --- Remove dup Bat Rider Guard spawns -DELETE FROM `creature` WHERE `guid` IN (54839,54844,54845); -DELETE FROM `creature_addon` WHERE `guid` IN (54839,54844,54845); diff --git a/sql/updates/world/2012_05_04_01_world_sai.sql b/sql/updates/world/2012_05_04_01_world_sai.sql deleted file mode 100644 index 7021fc92548..00000000000 --- a/sql/updates/world/2012_05_04_01_world_sai.sql +++ /dev/null @@ -1,32 +0,0 @@ --- Speech by Martik Tor'seldoi, Thrallmar -SET @ENTRY := 16577; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; -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,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldoi - OOC - Load script every 6 min ooc'), -(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,18100,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Martik Tor''seldoi - Reset - Cast Frost Armor'), -(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 0'), -(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), -(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), -(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 0'), -(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,5,6,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim emote'), -(@ENTRY*100,9,5,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Martik Tor''seldoi turn to'), -(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 1'), -(@ENTRY*100,9,7,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 1'), -(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi Say text 2'), -(@ENTRY*100,9,9,0,0,0,100,0,3000,3000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), -(@ENTRY*100,9,10,0,0,0,100,0,3000,3000,0,0,5,273,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi emote'), -(@ENTRY*100,9,11,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,10,57487,16578,0,0,0,0,0,'Blood Elf Pilgrim Say text 2'), -(@ENTRY*100,9,12,0,0,0,100,0,1000,1000,0,0,5,15,0,0,0,0,0,9,16578,0,20,0,0,0,0,'Blood Elf Pilgrim emote'), -(@ENTRY*100,9,13,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Martik Tor''seldoi turn to'); --- NPC talk text insert from sniff -DELETE FROM `creature_text` WHERE `entry` IN (16577,16578); -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(16577,0,0, 'Brothers and sisters, I have been to the promised land. I have tasted in the sublim energy. I have felt bliss - bliss so engrossing and all encompassing that I was left wondering if I had stumbled upon the dreams of gods.!',12,0,100,5,0,0, 'Martik Tor''seldoi'), -(16577,1,0, 'In paradise, you merely reach out and take from the Nether.',12,0,100,1,0,0, 'Martik Tor''seldoi'), -(16577,2,0, 'From the very air! Tendrils of arcane energy light up the obsidian sky as plumes of raw magic rise up from fissures in the land. Kneel and drink from the fissure as you do from a stream or well. Pluck a tendril from the heavens as if it were an apple hanging from a branch.',12,0,100,5,0,0, 'Martik Tor''seldoi'), -(16578,0,0, 'Tell us more, Martik. What is it? What does it feel like?',12,0,100,1,0,0, 'Blood Elf Pilgrim'), -(16578,1,0, 'But how?',12,0,100,6,0,0, 'Blood Elf Pilgrim'), -(16578,2,0, '%s smiles/gasps.',16,0,100,0,0,0, 'Blood Elf Pilgrim'); diff --git a/sql/updates/world/2012_05_05_00_world_sai.sql b/sql/updates/world/2012_05_05_00_world_sai.sql deleted file mode 100644 index e03c36337af..00000000000 --- a/sql/updates/world/2012_05_05_00_world_sai.sql +++ /dev/null @@ -1,205 +0,0 @@ --- Forge of Souls Trash update - --- Npc Updates - --- Spiteful Apparition -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36551; -UPDATE `creature` SET `spawndist`=20,`MovementType`=1,`curhealth`=1,`curmana`=0 WHERE `id`=36551; -DELETE FROM `creature_template_addon` WHERE `entry`=36551; -INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (36551,1, '69105 69136'); --- Spiteful Apparition (Ambient) -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36967; -UPDATE `creature` SET `spawndist`=20,`MovementType`=1,`curhealth`=1,`curmana`=0 WHERE `id`=36967; -DELETE FROM `creature_template_addon` WHERE `entry`=36967; -INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (36967,1, '69663 69658'); --- Spectral Warden -UPDATE `creature_addon` SET `auras`='69144' WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=36666); - --- SAI Updates - --- Spiteful Apparition SAI -SET @ENTRY := 36551; -- NPC entry -SET @SPELL1 := 41253; -- Greater Invisibility -SET @SPELL2 := 68895; -- Spite (Normal) -SET @SPELL3 := 70212; -- Spite (Heroic) -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,25,0,100,6,0,0,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Spiteful Apparition - On Reset - Cast Greater Invisibility'), -(@ENTRY,0,1,0,10,0,100,6,0,10,3000,4000,28,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Spiteful Apparition - OOC range - Remove Greater Invisibility'), -(@ENTRY,0,2,0,0,0,100,2,7000,9000,7000,9000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spiteful Apparition - Combat - Cast Spite "Normal"'), -(@ENTRY,0,3,0,0,0,100,4,7000,9000,7000,9000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spiteful Apparition - Combat - Cast Spite "Heroic"'); - --- Soulguard Reaper SAI -SET @ENTRY := 36499; -- NPC entry -SET @SPELL1 := 68797; -- Soulguard Channel -SET @SPELL2 := 69058; -- Shadow Lance -SET @SPELL3 := 69060; -- Frost Nova (Normal) -SET @SPELL4 := 70209; -- Frost Nova (Heroic) -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,1,0,100,7,0,0,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Reaper - OOC - Cast Soulguard Channel'), -(@ENTRY,0,1,0,0,0,100,6,5000,6000,7000,9000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Shadow Lance'), -(@ENTRY,0,2,0,0,0,100,2,7000,9000,8000,10000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Frost Nova "Normal"'), -(@ENTRY,0,3,0,0,0,100,4,7000,9000,8000,10000,11,@SPELL4,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Reaper - Combat - Cast Frost Nova "Heroic"'), -(@ENTRY,0,4,0,4,0,100,6,0,0,0,0,39,30,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Reaper - Aggro - Call for help'); - --- Soulguard Beam Focus Target -SET @ENTRY := 36508; -- NPC entry -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-201770,-201785,-201741); -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 -(-201770,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), -(-201785,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), -(-201741,0,0,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36620,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Adept'), -(-201741,0,1,0,1,0,100,6,1000,1000,5000,5000,45,0,1,0,0,0,0,19,36564,60,0,0,0,0,0, 'Soulguard Beam Focus Target - OOC - Set data on Soulguard Bonecaster'); - --- Spectral Warden SAI -SET @ENTRY := 36666; -- NPC entry -SET @SPELL1 := 69633; -- Veil of Shadow -SET @SPELL2 := 69148; -- Wail of Souls (Normal) -SET @SPELL3 := 70210; -- Wail of Souls (Heroic) -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,6,5000,6000,9000,10000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Veil of Shadow'), -(@ENTRY,0,1,0,0,0,100,2,9000,11000,5000,6000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Wail of Souls'), -(@ENTRY,0,2,0,0,0,100,4,9000,11000,5000,6000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Spectral Warden - Combat - Cast Wail of Souls'); - --- Soulguard Watchman SAI -SET @ENTRY := 36478; -- NPC entry -SET @SPELL1 := 69056; -- Shroud of Runes -SET @SPELL2 := 69053; -- Unholy Rage -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,50,6,0,10000,16000,20000,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Combat - Cast Shroud of Runes'), -(@ENTRY,0,1,2,0,0,100,6,8000,16000,32000,40000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Combat - Cast Unholy Rage'), -(@ENTRY,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, 'Soulguard Watchman - Combat - Say 0'), -(@ENTRY,0,3,0,4,0,100,6,0,0,0,0,39,20,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Watchman - Aggro - Call for help'); --- NPC talk text insert -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, '%s goes into a frenzy!',16,0,100,0,0,0, 'Soulguard Watchman'); - --- Soul Horror SAI -SET @ENTRY := 36522; -- NPC entry -SET @SPELL1 := 69088; -- Soul Strike (Normal) -SET @SPELL2 := 70211; -- Soul Strike (Heroic) -SET @SPELL3 := 69107; -- Killing Spree Invis Aura -SET @SPELL4 := 69106; -- Killing Spree Aura -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,2,5000,6000,5000,6000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soul Horror - Combat - Cast Soul Strike'), -(@ENTRY,0,1,0,0,0,100,4,5000,6000,5000,6000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soul Horror - Combat - Cast Soul Strike'), -(@ENTRY,0,4,0,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soul Horror - Aggro - Call for help'); - --- Soulguard Animator SAI -SET @ENTRY := 36516; -- NPC entry -SET @SPELL1 := 68834; -- Soulguard Channel Beam02 -SET @SPELL2 := 69562; -- Raise Dead -SET @SPELL3 := 69131; -- Soul Sickness -SET @SPELL4 := 69128; -- Soul Siphon -SET @SPELL5 := 69068; -- Shadow Bolt (Normal) -SET @SPELL6 := 70208; -- Shadow Bolt (Heroic) -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Animator - OOC - Cast Soulguard Channel Beam02'), -(@ENTRY,0,1,0,0,1,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Raise Dead'), -(@ENTRY,0,2,0,0,0,100,6,7000,9000,9000,11000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Soul Sickness'), -(@ENTRY,0,3,0,0,0,100,6,9000,11000,7000,9000,11,@SPELL4,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Soul Siphon'), -(@ENTRY,0,4,0,0,0,100,2,4000,5000,3500,4500,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Shadow Bolt "Normal"'), -(@ENTRY,0,5,0,0,0,100,4,4000,5000,3500,4500,11,@SPELL6,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Animator - Combat - Cast Shadow Bolt "Heroic"'), -(@ENTRY,0,6,7,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Aggro - Call for help'), -(@ENTRY,0,7,0,61,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Aggro - Set phase 1'), -(@ENTRY,0,8,9,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 2 - Set data'), -(@ENTRY,0,9,0,61,0,100,6,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 2 - Set phase 2'), -(@ENTRY,0,10,11,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 3 - Set data'), -(@ENTRY,0,11,0,61,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Animator - Data set 3 - Set phase 1'); - --- Soulguard Adept SAI -SET @ENTRY := 36620; -- NPC entry -SET @SPELL1 := 68834; -- Soulguard Channel Beam02 -SET @SPELL2 := 69562; -- Raise Dead -SET @SPELL3 := 69068; -- Shadow Bolt (Normal) -SET @SPELL4 := 70208; -- Shadow Bolt (Heroic) -SET @SPELL5 := 69066; -- Drain Life (Normal) -SET @SPELL6 := 70213; -- Drain Life (Heroic) -SET @SPELL7 := 69564; -- Shadow Mend (Normal) -SET @SPELL8 := 70205; -- Shadow Mend (Heroic) -SET @SPELL9 := 68797; -- Soulguard Channel -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Adept - OOC - Cast Soulguard Channel Beam02'), -(@ENTRY,0,1,0,0,4,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Raise Dead'), -(@ENTRY,0,2,0,0,0,100,2,7000,8000,3500,4500,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Bolt "Normal"'), -(@ENTRY,0,3,0,0,0,100,4,7000,8000,3500,4500,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Bolt "Heroic"'), -(@ENTRY,0,4,0,0,0,100,2,6000,7000,8000,10000,11,@SPELL5,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Drain Life "Normal"'), -(@ENTRY,0,5,0,0,0,100,4,6000,7000,8000,10000,11,@SPELL6,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Drain Life "Heroic"'), -(@ENTRY,0,6,0,0,0,100,2,30000,35000,18000,22000,11,@SPELL7,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Mend "Normal"'), -(@ENTRY,0,7,0,0,0,100,4,30000,35000,18000,22000,11,@SPELL8,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Adept - Combat - Cast Shadow Mend "Heroic"'), -(@ENTRY,0,8,0,25,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - On Reset - Set phase 1'), -(@ENTRY,0,9,0,38,1,100,6,0,1,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - On dataset 0 1 - Set phase 2'), -(@ENTRY,0,10,0,1,2,100,7,0,0,0,0,11,@SPELL9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - OOC - Cast Soulguard Channel'), -(@ENTRY,0,11,12,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Aggro - Call for help'), -(@ENTRY,0,12,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Aggro - Set phase 3'), -(@ENTRY,0,13,14,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 2 - Set data'), -(@ENTRY,0,14,0,61,0,100,6,0,0,0,0,22,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 2 - Set phase 4'), -(@ENTRY,0,15,16,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 3 - Set data'), -(@ENTRY,0,16,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Adept - Data set 3 - Set phase 3'); - --- Soulguard Bonecaster SAI -SET @ENTRY := 36564; -- NPC entry -SET @SPELL1 := 68834; -- Soulguard Channel Beam02 -SET @SPELL2 := 69562; -- Raise Dead -SET @SPELL3 := 69080; -- Bone Volley (Normal) -SET @SPELL4 := 70206; -- Bone Volley (Heroic) -SET @SPELL5 := 69069; -- Shield of Bones (Normal) -SET @SPELL6 := 70207; -- Shield of Bones (Heroic) -SET @SPELL7 := 68797; -- Soulguard Channel -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,1,0,100,7,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,9,36522,1,15,0,0,0,0, 'Soulguard Bonecaster - OOC - Cast Soulguard Channel Beam02'), -(@ENTRY,0,1,0,0,4,100,6,20000,25000,20000,25000,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Raise Dead'), -(@ENTRY,0,2,0,0,0,100,2,5000,7000,6000,8000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Bone Volley "Normal"'), -(@ENTRY,0,3,0,0,0,100,4,5000,7000,6000,8000,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Bone Volley "Heroic"'), -(@ENTRY,0,4,0,0,0,100,2,5000,7000,7000,9000,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Shield of Bones "Normal"'), -(@ENTRY,0,5,0,0,0,100,4,5000,7000,7000,9000,11,@SPELL6,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Combat - Cast Shield of Bones "Heroic"'), -(@ENTRY,0,6,0,25,0,100,6,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - On Reset - Set phase 1'), -(@ENTRY,0,7,0,38,1,100,6,0,1,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - On dataset 0 1 - Set phase 2'), -(@ENTRY,0,8,0,1,2,100,7,0,0,0,0,11,@SPELL7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - OOC - Cast Soulguard Channel'), -(@ENTRY,0,9,10,4,0,100,6,0,0,0,0,39,35,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Aggro - Call for help'), -(@ENTRY,0,10,0,61,0,100,6,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Aggro - Set phase 3'), -(@ENTRY,0,11,12,38,0,100,7,0,2,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 2 - Set data'), -(@ENTRY,0,12,0,61,0,100,6,0,0,0,0,22,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 2 - Set phase 4'), -(@ENTRY,0,13,14,38,0,100,7,0,3,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 3 - Set data'), -(@ENTRY,0,14,0,61,0,100,6,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Soulguard Bonecaster - Data set 3 - Set phase 3'); - --- Ghoul Minion SAI -SET @ENTRY := 36916; -- NPC entry -SET @SPELL1 := 69088; -- Soul Strike (Normal) -SET @SPELL2 := 70211; -- Soul Strike (Heroic) -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,1,54,0,100,6,0,0,0,0,45,0,2,0,0,0,0,23,0,0,0,0,0,0,0, 'Ghoul Minion - Just Summoned - Set Data Summoner'), -(@ENTRY,0,1,0,61,0,100,6,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - Just Summoned - Set Random Movement'), -(@ENTRY,0,2,0,0,0,100,6,115000,115000,115000,115000,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - combat - die after 2 min'), -(@ENTRY,0,3,0,1,0,100,6,15000,15000,15000,15000,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - OOC - die after 15 sec'), -(@ENTRY,0,4,5,6,0,100,6,15000,15000,15000,15000,45,0,3,0,0,0,0,23,0,0,0,0,0,0,0, 'Ghoul Minion - on Death - Set data summoner'), -(@ENTRY,0,5,0,61,0,100,6,15000,15000,15000,15000,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ghoul Minion - on Death - despawn after 3 sec'); diff --git a/sql/updates/world/2012_05_05_01_world_creature_template.sql b/sql/updates/world/2012_05_05_01_world_creature_template.sql deleted file mode 100644 index 2eeaf2f40d2..00000000000 --- a/sql/updates/world/2012_05_05_01_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Set proper faction for Ymirjar Skycaller (Heroic) -UPDATE `creature_template` SET `faction_A`=1885,`faction_H`=1885 WHERE `entry`=37643; diff --git a/sql/updates/world/2012_05_05_02_world_gameobject.sql b/sql/updates/world/2012_05_05_02_world_gameobject.sql deleted file mode 100644 index c0b2c6b147b..00000000000 --- a/sql/updates/world/2012_05_05_02_world_gameobject.sql +++ /dev/null @@ -1,10 +0,0 @@ --- Add some missing Blood of Heroes spawns -SET @GUID := 5276; -DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+5; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES -(@GUID,176213,0,1,1,1529.10242,-1427.06946,65.49049,-3.001947,0,0,-0.9975634,0.06976615,7200,100,1), -(@GUID+1,176213,0,1,1,1705.87439,-4690.138,48.9742165,-3.08918333,0,0,-0.9996567,0.02620165,7200,100,1), -(@GUID+2,176213,0,1,1,1846.79382,-3825.265,135.5159,1.83259487,0,0,0.7933531,0.6087617,7200,100,1), -(@GUID+3,176213,0,1,1,1748.16333,-4453.13525,74.26272,-2.0594883,0,0,0,0,7200,100,1), -(@GUID+4,176213,0,1,1,2159.835,-2442.754,62.0804,-0.4886912,0,0,-0.2419214,0.9702958,7200,100,1), -(@GUID+5,176213,0,1,1,1342.557,-1382.568,46.89193,2.775069,0,0,0.9832544,0.182238,7200,100,1); diff --git a/sql/updates/world/2012_05_05_03_world_sai.sql b/sql/updates/world/2012_05_05_03_world_sai.sql deleted file mode 100644 index fce3b5bc957..00000000000 --- a/sql/updates/world/2012_05_05_03_world_sai.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Wrathbone Laborer SAI -SET @ENTRY := 36830; -- NPC entry -SET @SPELL1 := 70302; -- Blinding Dirt -SET @SPELL2 := 70278; -- Puncture Wound (Normal) -SET @SPELL3 := 70279; -- Puncture Wound (Heroic) -SET @SPELL4 := 69572; -- Shovelled! (Normal) -SET @SPELL5 := 70280; -- Shovelled! (Heroic) -UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), -(@ENTRY,0,1,0,0,0,100,2,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), -(@ENTRY,0,2,0,0,0,100,4,8000,9000,9000,10000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Heroic)'), -(@ENTRY,0,3,0,0,0,100,2,5000,6000,7000,8000,11,@SPELL4,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'), -(@ENTRY,0,4,0,0,0,100,4,5000,6000,7000,8000,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Heroic)'), -(@ENTRY,0,5,0,1,0,100,6,1000,3000,3000,3000,5,38,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Wrathbone Laborer - OOC - emote'); diff --git a/sql/updates/world/2012_05_05_04_world_creature_template.sql b/sql/updates/world/2012_05_05_04_world_creature_template.sql deleted file mode 100644 index 7c4f13dd667..00000000000 --- a/sql/updates/world/2012_05_05_04_world_creature_template.sql +++ /dev/null @@ -1,27 +0,0 @@ --- Fix InhabitType for Eye of the Lich King -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36913; --- Updates From CDawg --- Wrathbone Laborer (heroic) - fix hostility and adds equipment -UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`equipment_id`=104 WHERE `entry`=37638; --- Wrathbone Siegesmith (Heroic) add equipment -UPDATE `creature_template` SET `equipment_id`=122 WHERE `entry`=37639; --- Fallen Warrior add equipment -UPDATE `creature_template` SET `equipment_id`=2328 WHERE `entry`=37612; --- Forgemaster Garfrost add equipment -UPDATE `creature_template` SET `equipment_id`=2325 WHERE `entry`=37613; --- Deathwhisper Necrolyte add equipment -UPDATE `creature_template` SET `equipment_id`=2365 WHERE `entry`=37609; --- Deathwhisper Shadowcaster - add equipment -UPDATE `creature_template` SET `equipment_id`=2365 WHERE `entry`=38025; --- Alliance slaves add equipments -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37645; -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37646; -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37647; -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37648; --- horde slaves add equipments -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37649; -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37650; -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37651; -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=37652; --- Ymirjar Skycaller (heroic) - Fix unit flags and add equipment -UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32832,`equipment_id`=2438 WHERE `entry`=37643; diff --git a/sql/updates/world/2012_05_05_05_world_creature_template.sql b/sql/updates/world/2012_05_05_05_world_creature_template.sql deleted file mode 100644 index a2f2a217252..00000000000 --- a/sql/updates/world/2012_05_05_05_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Fix skillup on some target dummys -UPDATE `creature_template` SET `flags_extra`=`flags_extra`|262144 WHERE `entry` IN (31144,2674,2673); diff --git a/sql/updates/world/2012_05_05_06_world_sai.sql b/sql/updates/world/2012_05_05_06_world_sai.sql deleted file mode 100644 index 7b064af4a4e..00000000000 --- a/sql/updates/world/2012_05_05_06_world_sai.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Wrathbone Laborer SAI -SET @ENTRY := 36830; -- NPC entry -SET @SPELL1 := 70302; -- Blinding Dirt -SET @SPELL2 := 70278; -- Puncture Wound -SET @SPELL3 := 69572; -- Shovelled! -UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256,`AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), -(@ENTRY,0,1,0,0,0,100,6,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), -(@ENTRY,0,2,0,0,0,100,6,5000,6000,7000,8000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'), -(@ENTRY,0,3,0,1,0,100,6,1000,3000,3000,3000,5,38,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Wrathbone Laborer - OOC - emote'); diff --git a/sql/updates/world/2012_05_06_00_world_creature_template.sql b/sql/updates/world/2012_05_06_00_world_creature_template.sql deleted file mode 100644 index 30dbf85c28d..00000000000 --- a/sql/updates/world/2012_05_06_00_world_creature_template.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Gold for Toc based on old.wowhead -UPDATE `creature_template` SET `mingold`=850000,`maxgold`=950000 WHERE `entry` IN(34797,35447,35448,35449); -- Icehowl -UPDATE `creature_template` SET `mingold`=550000,`maxgold`=650000 WHERE `entry` IN(34780,35216,35268,35269); -- Lord Jaraxxus -UPDATE `creature_template` SET `mingold`=650000,`maxgold`=700000 WHERE `entry` IN(34497,35350,35351,35352,34496,35347,35348,35359); -- Fjola Lightbane & Eydis Darkbane -UPDATE `creature_template` SET `mingold`=500000,`maxgold`=600000 WHERE `entry` IN(34564,34566,35615,35616); -- Anub'arak diff --git a/sql/updates/world/2012_05_06_01_world_creature_template.sql b/sql/updates/world/2012_05_06_01_world_creature_template.sql deleted file mode 100644 index fa0c9af5805..00000000000 --- a/sql/updates/world/2012_05_06_01_world_creature_template.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Based on old.wowhead.com -UPDATE `creature_template` SET `mingold`=1600000,`maxgold`=1800000 WHERE `entry` IN (33113,34003); -- Flame Levithian -UPDATE `creature_template` SET `mingold`=1100000,`maxgold`=1300000 WHERE `entry` IN (33118,33190); -- Ignis the Furnace Master -UPDATE `creature_template` SET `mingold`=280000,`maxgold`=360000 WHERE `entry` IN (33186,33724); -- Razorscale -UPDATE `creature_template` SET `mingold`=670000,`maxgold`=750000 WHERE `entry` IN (33293,33885); -- XT-002 Deconstructor -UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32857,33694); -- Stormcaller Brundir -UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32927,33692); -- Runemaster Molgeim -UPDATE `creature_template` SET `mingold`=1680000,`maxgold`=1900000 WHERE `entry` IN (32867,33693); -- Steelbreaker -UPDATE `creature_template` SET `mingold`=1220000,`maxgold`=1500000 WHERE `entry` IN (33515,34175); -- Auriaya -UPDATE `creature_template` SET `mingold`=1650000,`maxgold`=1950000 WHERE `entry` IN (33271,33449); -- General Vezax -UPDATE `creature_template` SET `mingold`=2020000,`maxgold`=2220000 WHERE `entry` IN (33288,33955); -- Yogg-Saron diff --git a/sql/updates/world/2012_05_07_00_world_waypoints.sql b/sql/updates/world/2012_05_07_00_world_waypoints.sql deleted file mode 100644 index f24b7c9c254..00000000000 --- a/sql/updates/world/2012_05_07_00_world_waypoints.sql +++ /dev/null @@ -1,73 +0,0 @@ --- Wrathbone Siegesmith pathing -SET @NPC := 202159; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=646.5851,`position_y`=-191.1892,`position_z`=526.8476 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,646.5851,-191.1892,526.8476,0,0,0,100,0), -(@PATH,2,648.8837,-181.967,526.7226,0,0,0,100,0), -(@PATH,3,649.4167,-179.4531,526.7226,14000,0,0,100,0), -(@PATH,4,652.1736,-183.3594,526.7226,0,0,0,100,0), -(@PATH,5,648.5643,-188.309,526.8476,0,0,0,100,0), -(@PATH,6,642.5313,-193.4826,527.3874,0,0,0,100,0), -(@PATH,7,633.688,-200.741,528.941,12000,0,0,100,0), -(@PATH,8,641.9254,-196.5747,528.9726,0,0,0,100,0); - --- Wrathbone Siegesmith pathing -SET @NPC := 201855; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=723.5469,`position_y`=-170.9497,`position_z`=527.5121 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,723.5469,-170.9497,527.5121,13000,0,0,100,0), -(@PATH,2,726.6484,-173.3438,527.1627,0,0,0,100,0), -(@PATH,3,726.6484,-174.3438,527.1627,0,0,0,100,0), -(@PATH,4,725.25,-175.2379,526.8134,0,0,0,100,0), -(@PATH,5,722.0521,-181.5122,526.8134,0,0,0,100,0), -(@PATH,6,721.2031,-187.8142,526.8134,0,0,0,100,0), -(@PATH,7,717.7917,-194.4358,526.8134,0,0,0,100,0), -(@PATH,8,719.3073,-202.2691,527.1509,0,0,0,100,0), -(@PATH,9,720.3403,-206.1198,527.7932,12000,0,0,100,0), -(@PATH,10,717.6111,-199.5035,526.9384,0,0,0,100,0), -(@PATH,11,717.566,-189.0642,526.8134,0,0,0,100,0), -(@PATH,12,718.5764,-182.3958,526.8134,0,0,0,100,0), -(@PATH,13,719.9531,-176.0729,526.8134,0,0,0,100,0); - --- Forgemaster Garfrost pathing -SET @NPC := 201992; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=712.1371,`position_y`=-215.7014,`position_z`=527.066 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`auras`) VALUES (@NPC,@PATH,1,'68792'); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,712.1371,-215.7014,527.066,0,0,0,100,0), -(@PATH,2,719.507,-227.8559,527.066,3000,0,0,100,0), -(@PATH,3,712.1371,-215.7014,527.066,0,0,0,100,0), -(@PATH,4,685.1805,-207.349,526.8424,0,0,0,100,0), -(@PATH,5,664.5191,-203.3472,526.816,0,0,0,100,0), -(@PATH,6,645.033,-208.5295,528.941,0,0,0,100,0), -(@PATH,7,653.0729,-194.3681,526.7226,0,0,0,100,0), -(@PATH,8,664.8646,-195.2135,526.7226,0,0,0,100,0), -(@PATH,9,686.0816,-213.8264,526.8424,0,0,0,100,0), -(@PATH,10,697.9757,-221.6215,526.8424,0,0,0,100,0), -(@PATH,11,708.0903,-211.908,527.066,0,0,0,100,0), -(@PATH,12,717.8924,-204.6979,527.191,0,0,0,100,0), -(@PATH,13,699.0504,-201.3438,526.8424,0,0,0,100,0), -(@PATH,14,672.066,-201.1493,526.8424,0,0,0,100,0), -(@PATH,15,655.9496,-203.4931,526.816,0,0,0,100,0), -(@PATH,16,672.066,-201.1493,526.8424,0,0,0,100,0), -(@PATH,17,699.0504,-201.3438,526.8424,0,0,0,100,0), -(@PATH,18,717.8924,-204.6979,527.191,0,0,0,100,0), -(@PATH,19,708.0903,-211.908,527.066,0,0,0,100,0), -(@PATH,20,697.9757,-221.6215,526.8424,0,0,0,100,0), -(@PATH,21,686.0816,-213.8264,526.8424,0,0,0,100,0), -(@PATH,22,664.8646,-195.2135,526.7226,0,0,0,100,0), -(@PATH,23,653.0729,-194.3681,526.7226,0,0,0,100,0), -(@PATH,24,645.033,-208.5295,528.941,0,0,0,100,0), -(@PATH,25,664.5191,-203.3472,526.816,0,0,0,100,0), -(@PATH,26,685.1805,-207.349,526.8424,0,0,0,100,0); diff --git a/sql/updates/world/2012_05_07_01_world_sai.sql b/sql/updates/world/2012_05_07_01_world_sai.sql deleted file mode 100644 index 83676d31df9..00000000000 --- a/sql/updates/world/2012_05_07_01_world_sai.sql +++ /dev/null @@ -1,51 +0,0 @@ --- Ymirjar Skycaller SAI addition -SET @ENTRY := 31260; -- NPC entry -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY AND `id`=2; -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,2,0,25,0,100,6,0,0,0,0,11,46598,0,0,0,0,0,19,36891,20,0,0,0,0,0, 'Ymirjar Skycaller - Reset - Cast Ride Vehicle Hardcoded'); - --- Wrathbone Laborer SAI -SET @ENTRY := -201800; -- NPC entry -SET @SPELL1 := 70302; -- Blinding Dirt -SET @SPELL2 := 70278; -- Puncture Wound -SET @SPELL3 := 69572; -- Shovelled! -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,6,7000,8000,10000,11000,11,@SPELL1,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Blinding Dirt'), -(@ENTRY,0,1,0,0,0,100,6,8000,9000,9000,10000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Puncture Wound (Normal)'), -(@ENTRY,0,2,0,0,0,100,6,5000,6000,7000,8000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Wrathbone Laborer - Combat - Cast Shovelled! (Normal)'); - --- Wrathbone Laborer pathing -SET @NPC := 201800; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=584.4202,`position_y`=188.9149,`position_z`=509.6726 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,584.4202,188.9149,509.6726,0,0,0,100,0), -(@PATH,2,583.6736,193.9653,509.7404,3000,0,48,100,0), -(@PATH,3,583.6736,193.9653,509.7404,3000,0,48,100,0), -(@PATH,4,583.6736,193.9653,509.7404,3000,0,48,100,0), -(@PATH,5,583.6736,193.9653,509.7404,3000,0,48,100,0), -(@PATH,6,594.0781,190.2622,508.8613,0,0,0,100,0), -(@PATH,7,604.9809,191.5451,507.6583,0,0,0,100,0), -(@PATH,8,617.8438,191.3455,507.5206,0,0,0,100,0), -(@PATH,9,633.1597,186.8281,508.6275,3000,0,48,100,0), -(@PATH,10,633.1597,186.8281,508.6275,3000,0,48,100,0), -(@PATH,11,624.3472,190.9705,507.7706,0,0,0,100,0), -(@PATH,12,613.3229,189.9236,507.3956,0,0,0,100,0), -(@PATH,13,604.5156,189.651,507.3956,0,0,0,100,0), -(@PATH,14,593.9844,187.4479,508.9778,0,0,0,100,0), -(@PATH,15,584.4202,188.9149,509.6726,0,0,0,100,0); -DELETE FROM `waypoint_scripts` WHERE `id`=48; -INSERT INTO `waypoint_scripts` (`id`,`delay`,`command`,`datalong`,`guid`) VALUES -(48,0,1,38,67); - --- Add Overlord Drakuru riders to Stonespine Gargoyle -UPDATE creature_template SET InhabitType=4,`flags_extra`=`flags_extra`|128 WHERE entry=28717; -DELETE FROM `creature` WHERE `id`=28717 AND `map`=658; -DELETE FROM `vehicle_template_accessory` WHERE `entry`=36896; -INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`) VALUES -(36896,28717,1,0, 'Overlord Drakuru on Stonespine Gargoyle',6,30000); diff --git a/sql/updates/world/2012_05_08_00_world_sai.sql b/sql/updates/world/2012_05_08_00_world_sai.sql deleted file mode 100644 index 8a776b5f2d2..00000000000 --- a/sql/updates/world/2012_05_08_00_world_sai.sql +++ /dev/null @@ -1,89 +0,0 @@ --- [Q] Arelion's Mistress --- Viera Sunwhisper SAI --- Twinkle SAI -SET @ENTRY_VIERA := 17226; -SET @ENTRY_TWINKLE := 17230; -SET @QUEST_PLEASURES := 9483; -SET @SPELL_RETRIBUTION := 30077; -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_TWINKLE); -DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_VIERA,@ENTRY_TWINKLE,@ENTRY_VIERA*100,@ENTRY_VIERA*100+1); -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_VIERA,0,0,0,20,0,100,0,@QUEST_PLEASURES,0,0,0,80,@ENTRY_VIERA*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Quest Finish - Run Script'), -(@ENTRY_VIERA*100,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Viera Sunwhisper - On Script - Remove Quest Flag"), -(@ENTRY_VIERA*100,9,1,0,0,0,100,0,2000,2000,0,0,53,0,@ENTRY_VIERA,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Start WP 1'), -(@ENTRY_VIERA*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 0'), -(@ENTRY_VIERA*100,9,3,0,0,0,100,0,0,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Stand Up'), -(@ENTRY_VIERA*100,9,4,0,0,0,100,0,6500,6500,0,0,45,0,1,0,0,0,0,10,61963,@ENTRY_TWINKLE,0,0,0,0,0,'Viera Sunwhisper - On Script - Set Data 0 1 Twinkle'), -(@ENTRY_VIERA,0,1,2,40,0,100,0,10,@ENTRY_VIERA,0,0,66,0,0,0,0,0,0,11,@ENTRY_TWINKLE,15,0,0,0,0,0,'Viera Sunwhisper - On WP 10 - Face Twinkle'), -(@ENTRY_VIERA,0,2,0,61,0,100,0,0,0,0,0,54,1000000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 10 - Pause WP'), - -(@ENTRY_TWINKLE,0,0,0,38,0,100,0,0,1,0,0,53,1,@ENTRY_TWINKLE,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On Data 0 1 Set - Start WP 1 (run)'), -(@ENTRY_TWINKLE,0,1,0,40,0,100,0,13,@ENTRY_TWINKLE,0,0,54,1000000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On WP 13 - Pause WP'), -(@ENTRY_TWINKLE,0,2,0,38,0,100,0,1,2,0,0,53,1,@ENTRY_TWINKLE*10,0,0,0,0,1,0,0,0,0,0,0,0,'Twinkle - On Data Set 1 2 - Start WP 2 (run)'), -(@ENTRY_TWINKLE,0,3,0,40,0,100,0,4,@ENTRY_TWINKLE*10,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 4 (2) - Force Despawn'), - -(@ENTRY_VIERA,0,3,0,8,0,100,0,@SPELL_RETRIBUTION,0,0,0,80,@ENTRY_VIERA*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Spellhit - Run Second Script'), -(@ENTRY_VIERA*100+1,9,0,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 1'), -(@ENTRY_VIERA*100+1,9,1,0,0,0,100,0,0,0,0,0,33,@ENTRY_VIERA,0,0,0,0,0,7,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Quest Credit'), -(@ENTRY_VIERA*100+1,9,2,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 2'), -(@ENTRY_VIERA*100+1,9,3,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,9,@ENTRY_TWINKLE,0,25,0,0,0,0,'Twinkle - On Script - Say Line 0'), -(@ENTRY_VIERA*100+1,9,4,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Say Line 3'), -(@ENTRY_VIERA*100+1,9,5,0,0,0,100,0,0,0,0,0,45,1,2,0,0,0,0,10,61963,@ENTRY_TWINKLE,0,0,0,0,0,'Viera Sunwhisper - On Script - Set Data 1 2 Twinkle'), -(@ENTRY_VIERA*100+1,9,6,0,0,0,100,0,0,0,0,0,53,1,@ENTRY_VIERA*10,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On Script - Start WP 2 (run)'), -(@ENTRY_VIERA,0,4,0,40,0,100,0,4,@ENTRY_VIERA*10,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Viera Sunwhisper - On WP 4 (2) - Force Despawn'); - --- Waypoints for Viera Sunwhisper -DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_VIERA*10); -INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES -(@ENTRY_VIERA,1,-653.739197,4145.138184,64.200729,'Viera Sunwhisper'), -(@ENTRY_VIERA,2,-658.875732,4147.715332,64.168304,'Viera Sunwhisper'), -(@ENTRY_VIERA,3,-681.465088,4147.636230,64.118073,'Viera Sunwhisper'), -(@ENTRY_VIERA,4,-686.400696,4161.865234,59.707859,'Viera Sunwhisper'), -(@ENTRY_VIERA,5,-695.956909,4179.237305,57.618931,'Viera Sunwhisper'), -(@ENTRY_VIERA,6,-699.832153,4189.959473,57.503750,'Viera Sunwhisper'), -(@ENTRY_VIERA,7,-708.518616,4184.436035,55.275894,'Viera Sunwhisper'), -(@ENTRY_VIERA,8,-716.137268,4178.130371,52.637508,'Viera Sunwhisper'), -(@ENTRY_VIERA,9,-719.865295,4174.992676,51.554867,'Viera Sunwhisper'), -(@ENTRY_VIERA,10,-720.839417,4162.232422,50.805923,'Viera Sunwhisper'), - -(@ENTRY_VIERA*10,1,-722.323486,4147.936523,50.337898,'Viera Sunwhisper'), -(@ENTRY_VIERA*10,2,-726.639343,4125.156250,48.479683,'Viera Sunwhisper'), -(@ENTRY_VIERA*10,3,-727.648315,4109.684082,47.528461,'Viera Sunwhisper'), -(@ENTRY_VIERA*10,4,-727.874329,4093.438721,46.446579,'Viera Sunwhisper'); - --- Waypoints for Twinkle -DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY_TWINKLE,@ENTRY_TWINKLE*10); -INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES -(@ENTRY_TWINKLE,1,-605.445190,4165.205078,64.081802,'Twinkle'), -(@ENTRY_TWINKLE,2,-619.293335,4161.776855,63.217815,'Twinkle'), -(@ENTRY_TWINKLE,3,-629.536560,4153.708984,64.067123,'Twinkle'), -(@ENTRY_TWINKLE,4,-644.773438,4151.062988,64.174675,'Twinkle'), -(@ENTRY_TWINKLE,5,-658.875732,4147.715332,64.168304,'Twinkle'), -(@ENTRY_TWINKLE,6,-681.465088,4147.636230,64.118073,'Twinkle'), -(@ENTRY_TWINKLE,7,-686.400696,4161.865234,59.707859,'Twinkle'), -(@ENTRY_TWINKLE,8,-695.956909,4179.237305,57.618931,'Twinkle'), -(@ENTRY_TWINKLE,9,-699.832153,4189.959473,57.503750,'Twinkle'), -(@ENTRY_TWINKLE,10,-708.518616,4184.436035,55.275894,'Twinkle'), -(@ENTRY_TWINKLE,11,-716.137268,4178.130371,52.637508,'Twinkle'), -(@ENTRY_TWINKLE,12,-719.865295,4174.992676,51.554867,'Twinkle'), -(@ENTRY_TWINKLE,13,-720.636292,4166.637695,50.815567,'Twinkle'), - -(@ENTRY_TWINKLE*10,1,-722.323486,4147.936523,50.337898,'Twinkle'), -(@ENTRY_TWINKLE*10,2,-726.639343,4125.156250,48.479683,'Twinkle'), -(@ENTRY_TWINKLE*10,3,-727.648315,4109.684082,47.528461,'Twinkle'), -(@ENTRY_TWINKLE*10,4,-727.874329,4093.438721,46.446579,'Twinkle'); - --- Spawn spell focus object on correct position -DELETE FROM `gameobject` WHERE `id`=300071 AND `guid`=303; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES -(303,300071,530,1,1,-720.803,4162.77,50.7916,4.61029,0,0,0.742267,-0.670104,300,0,1); - --- Texts -DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY_VIERA,@ENTRY_TWINKLE); -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY_VIERA,0,0,"Ok, let's go. I know just the perfect spot!",12,0,100,0,0,0,'Viera Sunwhisper'), -(@ENTRY_VIERA,1,0,"I can't wait to try this wine!",12,0,100,0,0,0,'Viera Sunwhisper'), -(@ENTRY_VIERA,2,0,"What... is happening... to me? Get this cat away from me!",12,0,100,0,0,0,'Viera Sunwhisper'), -(@ENTRY_VIERA,3,0,"%s scurries away, attempting to flee from Twinkle",16,0,100,0,0,0,'Viera Sunwhisper'), - -(@ENTRY_TWINKLE,0,0,"%s looks at Viera Sunwhisper with very hungry eyes",16,0,100,0,0,0,'Twinkle'); diff --git a/sql/updates/world/2012_05_08_01_world_gameobject.sql b/sql/updates/world/2012_05_08_01_world_gameobject.sql deleted file mode 100644 index b83d02b4762..00000000000 --- a/sql/updates/world/2012_05_08_01_world_gameobject.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Add Missing Ice Wall, Pit of Saron -SET @GUID := 305; -DELETE FROM `gameobject` WHERE `guid`=@GUID; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES -(@GUID,201885,658,3,1,932.2674,-80.6684,591.6761,2.286379,0,0,0,0,300,100,1); diff --git a/sql/updates/world/2012_05_08_01_world_misc.sql b/sql/updates/world/2012_05_08_01_world_misc.sql deleted file mode 100644 index 8f19132fa27..00000000000 --- a/sql/updates/world/2012_05_08_01_world_misc.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Spell area spells for entering POS -DELETE FROM `spell_area` WHERE `spell` IN (70056,70057); -INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES -(70056,4904,0,0,0,0,690,2,1), -- Send Script Event (22717) -(70057,4904,0,0,0,0,1101,2,1); -- Send Script Event (22718) - --- Fix flags and equipment for Ymirjar Deathbringer -UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~256 WHERE `entry` IN (36892,37641); -UPDATE `creature_template` SET `equipment_id`=2444 WHERE `entry`=37641; diff --git a/sql/updates/world/2012_05_09_00_world_spell_target_position.sql b/sql/updates/world/2012_05_09_00_world_spell_target_position.sql deleted file mode 100644 index a6e9d7289b7..00000000000 --- a/sql/updates/world/2012_05_09_00_world_spell_target_position.sql +++ /dev/null @@ -1,7 +0,0 @@ -DELETE FROM `spell_target_position` WHERE `id` IN (67834, 68081); -INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES -(67834, 571, 3167.01, 5586.04, 880.067, 0), -(68081, 571, 5857.252, 516.8015, 599.82, 2.987); - -UPDATE `spell_target_position` SET `target_position_x`=6136.89,`target_position_y`=4785.55,`target_position_z`=100.673 WHERE `id`=67835; -UPDATE `spell_target_position` SET `target_position_x`=8301.39,`target_position_y`=1501.34,`target_position_z`=870.555 WHERE `id`=67836; diff --git a/sql/updates/world/2012_05_09_01_world_commands.sql b/sql/updates/world/2012_05_09_01_world_commands.sql deleted file mode 100644 index dcd4c9130eb..00000000000 --- a/sql/updates/world/2012_05_09_01_world_commands.sql +++ /dev/null @@ -1,8 +0,0 @@ -DELETE FROM `trinity_string` WHERE `entry` = 555; -INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES -(555,"SetData performed on [GUID: %u, entry: %u, name: %s] Field: %u, Data: %u, with %s"); - -DELETE FROM `command` WHERE `name` = "npc set data"; -INSERT INTO `command` (`name`,`security`,`help`) VALUES -("npc set data", 3, "Syntax: .npc set data $field $data -Sets data for the selected creature. Used for testing Scripting"); diff --git a/sql/updates/world/2012_05_09_02_world_sai.sql b/sql/updates/world/2012_05_09_02_world_sai.sql deleted file mode 100644 index 01004b23505..00000000000 --- a/sql/updates/world/2012_05_09_02_world_sai.sql +++ /dev/null @@ -1,116 +0,0 @@ --- Fixup for Quest Quest:The Path to the Citadel "Alliance and Horde" - --- Alliance slave add missing equipments -UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=36767; - --- Horde Slave SAI -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36770,36771,36772,36773); -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36770,36771,36772,36773); -DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3677000); -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 -(36770,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), -(36771,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), -(36772,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), -(36773,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'), -(36770,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), -(36771,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), -(36772,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), -(36773,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'), --- Script -(3677000,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - Turnto envoker'), -(3677000,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - say text'), -(3677000,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set unitflag'), -(3677000,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set faction'), -(3677000,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set Emotestate'), -(3677000,9,5,0,0,0,100,0,100,100,100,100,33,36770,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - give quest credit'), -(3677000,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set run on'), -(3677000,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Horde Slave - Script - move to closest trigger'), -(3677000,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - despawn'); - --- Alliance Slave SAI -UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36764,36765,36766,36767); -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36764,36765,36766,36767); -DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3676400); -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 -(36764,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), -(36765,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), -(36766,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), -(36767,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'), -(36764,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), -(36765,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), -(36766,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), -(36767,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'), --- Script -(3676400,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - Turnto envoker'), -(3676400,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - say text'), -(3676400,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set unitflag'), -(3676400,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set faction'), -(3676400,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set Emotestate'), -(3676400,9,5,0,0,0,100,0,100,100,100,100,33,36764,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - give quest credit'), -(3676400,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set run on'), -(3676400,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Alliance Slave - Script - move to closest trigger'), -(3676400,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - despawn'); - --- Ball and chain SAI -UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (201969); -DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid` IN (201969); -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 -(201969,1,0,0,64,0,100,6,0,0,0,0,85,71281,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Ball and chain - On Gossip Hello - Envoker cast on self'); - --- Spell Conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=71281; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,71281,0,31,3,36770,0,0,'','Spell 71281 targets entry 36770'), -(13,1,71281,1,31,3,36771,0,0,'','Spell 71281 targets entry 36771'), -(13,1,71281,2,31,3,36772,0,0,'','Spell 71281 targets entry 36772'), -(13,1,71281,3,31,3,36773,0,0,'','Spell 71281 targets entry 36773'), -(13,1,71281,4,31,3,36764,0,0,'','Spell 71281 targets entry 36764'), -(13,1,71281,5,31,3,36765,0,0,'','Spell 71281 targets entry 36765'), -(13,1,71281,6,31,3,36766,0,0,'','Spell 71281 targets entry 36766'), -(13,1,71281,7,31,3,36767,0,0,'','Spell 71281 targets entry 36767'); - --- Creature text from sniff -DELETE FROM `creature_text` WHERE `entry` IN (36770,36771,36772,36773,36764,36765,36766,36767); -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES --- Alliance Slaves -(36764,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), -(36764,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), -(36764,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), -(36764,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), -(36764,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), -(36765,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), -(36765,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), -(36765,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), -(36765,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), -(36765,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), -(36766,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), -(36766,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), -(36766,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), -(36766,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), -(36766,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), -(36767,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'), -(36767,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'), -(36767,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'), -(36767,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'), -(36767,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'), --- Horde Slaves -(36770,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), -(36770,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), -(36770,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), -(36770,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), -(36770,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), -(36771,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), -(36771,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), -(36771,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), -(36771,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), -(36771,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), -(36772,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), -(36772,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), -(36772,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), -(36772,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), -(36772,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'), -(36773,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'), -(36773,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'), -(36773,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'), -(36773,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'), -(36773,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'); diff --git a/sql/updates/world/2012_05_09_03_world_misc.sql b/sql/updates/world/2012_05_09_03_world_misc.sql deleted file mode 100644 index 63e162fcfce..00000000000 --- a/sql/updates/world/2012_05_09_03_world_misc.sql +++ /dev/null @@ -1,56 +0,0 @@ --- Update Scourgelord Tyrannus "Make him fly" -UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36794; - --- Put Rimefang in the air and make him fly -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36661; -UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36661; - --- Deathwhisper Necrolyte SAI -SET @ENTRY := 36788; -- NPC entry -SET @SPELL1 := 69577; -- Shadow Bolt -SET @SPELL2 := 69578; -- Conversion Beam -SET @SPELL3 := 45104; -- Shadow Channelling -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,6,100,100,3000,3000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Shadow Bolt'), -(@ENTRY,0,1,0,0,0,100,6,9000,9000,24000,24000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Conversion Beam'); - --- Deathwhisper Necrolyte pathing -SET @NPC := 202231; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=592.975,`position_y`=176.104,`position_z`=508.746 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,596.0208,175.5243,508.3654,0,0,0,100,0), -(@PATH,2,605.2656,157.7101,507.2126,0,0,0,100,0), -(@PATH,3,604.4063,146.283,507.3376,0,0,0,100,0), -(@PATH,4,592.2899,131.4271,507.8163,0,0,0,100,0), -(@PATH,5,577.4531,118.224,508.3163,0,0,0,100,0), -(@PATH,6,563.0695,103.7309,514.1504,0,0,0,100,0), -(@PATH,7,557.7743,89.41319,523.1727,0,0,0,100,0), -(@PATH,8,560.9583,77.65278,525.4227,0,0,0,100,0), -(@PATH,9,560.9583,77.65278,525.4227,0,0,0,100,0), -(@PATH,10,571.0139,69.43403,525.2753,0,0,0,100,0), -(@PATH,11,560.9583,77.65278,525.4227,0,0,0,100,0), -(@PATH,12,557.7743,89.41319,523.1727,0,0,0,100,0), -(@PATH,13,563.0695,103.7309,514.1504,0,0,0,100,0), -(@PATH,14,577.4531,118.224,508.3163,0,0,0,100,0), -(@PATH,15,592.2899,131.4271,507.8163,0,0,0,100,0), -(@PATH,16,604.4063,146.283,507.3376,0,0,0,100,0), -(@PATH,17,605.2656,157.7101,507.2126,0,0,0,100,0), -(@PATH,18,596.0208,175.5243,508.3654,0,0,0,100,0); - -DELETE FROM `creature_formations` WHERE `leaderGUID`=202231; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(202231,202231,0,0,2), -(202231,202099,7,288,2), -(202231,202282,7,324,2), -(202231,202125,7,360,2), -(202231,202203,7,36,2), -(202231,201960,7,72,2); - --- Remove a dupe spawn -DELETE FROM `creature` WHERE `guid`=201998; -DELETE FROM `creature_addon` WHERE `guid`=201998; diff --git a/sql/updates/world/2012_05_10_00_world_sai.sql b/sql/updates/world/2012_05_10_00_world_sai.sql deleted file mode 100644 index c6d6e914345..00000000000 --- a/sql/updates/world/2012_05_10_00_world_sai.sql +++ /dev/null @@ -1,42 +0,0 @@ --- [Q] See You on the Other Side - --- Gan'jo SAI -SET @ENTRY := 26924; -SET @QUEST := 12121; -SET @GOSSIP := 10220; -SET @SPELL_RESURRECT := 61613; -UPDATE `creature_template` SET `npcflag`=3,`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,1,62,0,100,0,@GOSSIP,0,0,0,11,@SPELL_RESURRECT,1,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Cast Ganjo Resurrection"), -(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Close Gossip"); - --- Essence of Warlord Jin'arrak SAI -SET @ENTRY := 26902; -SET @SPELL_DIE_EFFECT := 61611; -SET @SPELL_CAMERA_SHAKE := 47533; -UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=128 WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100) 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 -(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Just Summoned - Run Script"), -(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"), -(@ENTRY*100,9,1,0,0,0,100,0,4000,4000,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Killed Monster Credit"), -(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Monster Whisper Line 0"), -(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"), -(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,85,@SPELL_DIE_EFFECT,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast On The Other Side"); - --- Essence of Warlord Jin'arrak text -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0,"How dare you summon me without an offering!",42,0,0,0,0,0,"Essence of Warlord Jin'arrak"); - --- Ganjo's Resurrection removes On The Other Side -DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=@SPELL_RESURRECT; -INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES -(@SPELL_RESURRECT,-@SPELL_DIE_EFFECT,1,"Ganjo's Resurrection removes On The Other Side"); - --- Conditions for Gan'jo's gossip option -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTarget`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`comment`) VALUES -(15,@GOSSIP,0,0,0,1,@SPELL_DIE_EFFECT,0,"Ganjo's Gossip - requires aura See You On The Other Side"), -(15,@GOSSIP,0,0,1,9,@QUEST,0,"Ganjo's Gossip - requires quest See You On The Other Side to be rewarded"); diff --git a/sql/updates/world/2012_05_10_01_world_misc.sql b/sql/updates/world/2012_05_10_01_world_misc.sql deleted file mode 100644 index a7a30d518a2..00000000000 --- a/sql/updates/world/2012_05_10_01_world_misc.sql +++ /dev/null @@ -1,37 +0,0 @@ --- [Q] Leave Nothing to Chance - --- Lower Wintergarde Mine Shaft and Upper Wintergarde Mine Shaft -UPDATE `creature_template` SET `MovementType`=0,`flags_extra`=`flags_extra`|128 WHERE `entry`IN (27437,27436); -UPDATE `creature` SET `MovementType`=0,`spawndist`=0 WHERE `id` IN (27437,27436); - --- Wintergarde Mine Bomb SAI -SET @ENTRY := 27435; -SET @SPELL_EXPLOSION := 48742; -UPDATE `creature_template` SET `AIName`='SmartAI' 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,1,1,0,100,1,14000,14000,0,0,11,@SPELL_EXPLOSION,2,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - Out of Combat - Cast Wintergarde Mine Explosion"), -(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - On Wintergarde Mine Explosion Cast - Forced Despawn"); - --- Spawn missing spell focus object for upper mine -DELETE FROM `gameobject` WHERE `id`=188711 AND `guid`=370; -INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES -(370,188711,571,1,1,3898.18,-881.748,119.533,0.421023,0,0,0.20896,0.977924,300,0,1); - --- Spawn missing Upper Wintergarde Mine Shaft -DELETE FROM `creature` WHERE `id`=27436 AND `guid`=42576; -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 -(42576,27436,571,1,1,0,0,3899.86,-883.613,119.536,0.0636665,300,0,0,42,0,0,0,0,0); - --- Spellscriptname -DELETE FROM `spell_script_names` WHERE `spell_id`=@SPELL_EXPLOSION; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(@SPELL_EXPLOSION,'spell_q12277_wintergarde_mine_explosion'); - --- The conditions will make it works exactly like it should. Thanks a lot Josh. -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_EXPLOSION; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,@SPELL_EXPLOSION,0,31,3,27437,0,0,'',"Wintergarde Mine Explosion - Lower Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY -(13,1,@SPELL_EXPLOSION,1,31,3,27436,0,0,'',"Wintergarde Mine Explosion - Upper Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY -(13,2,@SPELL_EXPLOSION,0,31,4,0,0,0,'',"Wintergarde Mine Explosion - Targets Players"), -- Effect 1 - SPELL_EFFECT_KNOCK_BACK -(13,4,@SPELL_EXPLOSION,0,31,5,188712,0,0,'',"Wintergarde Mine Explosion - Wintergarde Mine Cave In (2)"); -- Effect 2 - SPELL_EFFECT_ACTIVATE_OBJECT diff --git a/sql/updates/world/2012_05_10_02_world_creature_template.sql b/sql/updates/world/2012_05_10_02_world_creature_template.sql deleted file mode 100644 index 28893f24fdf..00000000000 --- a/sql/updates/world/2012_05_10_02_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- fix creauture_template loot id for infinite corruptor. could have sworn this was already in the db. -UPDATE `creature_template` SET `lootid` = 0 WHERE `entry` IN (32313,32273); diff --git a/sql/updates/world/2012_05_10_03_world_misc.sql b/sql/updates/world/2012_05_10_03_world_misc.sql deleted file mode 100644 index 339f52ac0bb..00000000000 --- a/sql/updates/world/2012_05_10_03_world_misc.sql +++ /dev/null @@ -1,129 +0,0 @@ - -- Remove obsolete requirement 'cooking profession' from quest 'Beer Basted Boar Ribs' (thx tifkat) closes #5198 -UPDATE `quest_template` SET `RequiredSkillId`=0, `RequiredSkillPoints`=0 WHERE `Id`=384; - --- Fix proc for Death's Verdict/Choice (author: kandera) closes #6041 -UPDATE `spell_proc_event` SET `procFlags` = 0, `procEx` = `procEx`|262144 WHERE `entry` in (67702, 67771); - --- Disables quest "Desperate Research" for all factions author trista closes #5285 -DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12782,12783,12811,12784,12752,12775,12777,12753,12808,12772); -INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES -(1,12782,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'), -(1,12783,0,0,0,'Disable quest from Scourge Invasion for Orcs'), -(1,12811,0,0,0,'Disable quest from Scourge Invasion for Trolls'), -(1,12784,0,0,0,'Disable quest from Scourge Invasion for Tauren'), -(1,12752,0,0,0,'Disable quest from Scourge Invasion for undead'), -(1,12775,0,0,0,'Disable quest from Scourge Invasion for Human'), -(1,12777,0,0,0,'Disable quest from Scourge Invasion for Draenei'), -(1,12753,0,0,0,'Disable quest from Scourge Invasion for Dwarves'), -(1,12808,0,0,0,'Disable quest from Scourge Invasion for Gnomes'), -(1,12772,0,0,0,'Disable quest from Scourge Invasion for Night Elves'); --- Disables scourge invasion connected quests listed below -DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12788,12812,12785,12786,12787,12774,12776,12771,12809,12773); -INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES -(1,12788,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'), -(1,12812,0,0,0,'Disable quest from Scourge Invasion for Orcs'), -(1,12785,0,0,0,'Disable quest from Scourge Invasion for Trolls'), -(1,12786,0,0,0,'Disable quest from Scourge Invasion for Tauren'), -(1,12787,0,0,0,'Disable quest from Scourge Invasion for undead'), -(1,12774,0,0,0,'Disable quest from Scourge Invasion for Human'), -(1,12776,0,0,0,'Disable quest from Scourge Invasion for Draenei'), -(1,12771,0,0,0,'Disable quest from Scourge Invasion for Dwarves'), -(1,12809,0,0,0,'Disable quest from Scourge Invasion for Gnomes'), -(1,12773,0,0,0,'Disable quest from Scourge Invasion for Night Elves'); - --- Limit Bloodgem Shard use to Netherstorm Cristal Target author: nelegalno closes #4165 -DELETE FROM `conditions` WHERE (`SourceEntry`=34367 AND `SourceTypeOrReferenceId`=17 AND `ConditionTypeOrReference`=29); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(17,0,34367,0,29,19421,15,0,64,'','Limit Bloodgem Shard use to Netherstorm Cristal Target'); - --- Path of xx and A Change of Heart (Ashen Band rings) author: studioworks closes #2544 -UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `id` IN -(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831,24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN --- Paths -(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831, --- A Change of Heart -24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES --- Path of Courage -(19,0,24827,0,2,50375,1,0,'Path of Courage 1'), -(19,0,24834,0,2,50388,1,0,'Path of Courage 2'), -(19,0,24835,0,2,50403,1,0,'Path of Courage 3'), --- Path of Destruction -(19,0,24823,0,2,50384,1,0,'Path of Destruction 1'), -(19,0,24828,0,2,50377,1,0,'Path of Destruction 2'), -(19,0,24829,0,2,50397,1,0,'Path of Destruction 3'), --- Path of Might -(19,0,25239,0,2,52569,1,0,'Path of Might 1'), -(19,0,25240,0,2,52570,1,0,'Path of Might 2'), -(19,0,25242,0,2,52571,1,0,'Path of Might 3'), --- Path of Vengeance -(19,0,24826,0,2,50376,1,0,'Path of Vengeance 1'), -(19,0,24832,0,2,50387,1,0,'Path of Vengeance 2'), -(19,0,24833,0,2,50401,1,0,'Path of Vengeance 3'), --- Path of Wisdom -(19,0,24825,0,2,50378,1,0,'Path of Wisdom 1'), -(19,0,24830,0,2,50386,1,0,'Path of Wisdom 2'), -(19,0,24831,0,2,50399,1,0,'Path of Wisdom 3'), --- A Change of Heart -(19,0,24819,0,2,50377,1,0,'A Change of Heart'), -(19,0,24820,0,2,50376,1,0,'A Change of Heart'), -(19,0,24821,0,2,50375,1,0,'A Change of Heart'), -(19,0,24822,0,2,50378,1,0,'A Change of Heart'), -(19,0,24836,0,2,50384,1,0,'A Change of Heart'), -(19,0,24837,0,2,50386,1,0,'A Change of Heart'), -(19,0,24838,0,2,50387,1,0,'A Change of Heart'), -(19,0,24839,0,2,50388,1,0,'A Change of Heart'), -(19,0,24840,0,2,50397,1,0,'A Change of Heart'), -(19,0,24841,0,2,50399,1,0,'A Change of Heart'), -(19,0,24842,0,2,50401,1,0,'A Change of Heart'), -(19,0,24843,0,2,50403,1,0,'A Change of Heart'), -(19,0,24844,0,2,50398,1,0,'A Change of Heart'), -(19,0,24845,0,2,50400,1,0,'A Change of Heart'), -(19,0,24846,0,2,50402,1,0,'A Change of Heart'), -(19,0,24847,0,2,50404,1,0,'A Change of Heart'), -(19,0,25246,0,2,52572,1,0,'A Change of Heart'), -(19,0,25247,0,2,52569,1,0,'A Change of Heart'), -(19,0,25248,0,2,52570,1,0,'A Change of Heart'), -(19,0,25249,0,2,52571,1,0,'A Change of Heart'); - --- spawn farmer torp author: zxbiohazardzx closes #6256 -SET @guid := 42652; -DELETE FROM `creature` WHERE `guid`=@guid; -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`) -VALUES -(@guid,25607,571,1,1,2886.325,6385.55,92.96985,1.4512,120); -- Farmer Torp - --- Disgusting Oozeling aura author: gecko32 closes #6197 -UPDATE `creature_template_addon` SET `auras`='25163' WHERE `entry`=15429; --- Mr. Chilly --- Add aura chilly for Periodic slide -DELETE FROM `creature_template_addon` WHERE `entry`=29726; -INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES -(29726, 0, 0, 0, 0, 0, '61811'); - --- Update to Change to $n in page text author: gecko32 closes #5930 -UPDATE `page_text` SET `text`='This proof of deed is to verify that $n slew Margol the Rager, scourge of the searing gorge.$B$BThe Ironforge museum recognizes this achievement and thanks the bearer for their generous contribution.$B$B-Head Curator Thorius Stonetender' WHERE `entry`=1231; - --- Update frost shock and you to only be for shamans. author: whit33r closes #4727 -UPDATE `quest_template` SET `RequiredClasses`=64 WHERE `id` = 7505; - --- fixes ashen band of destruction proc author: kandera -DELETE FROM `spell_proc_event` WHERE `entry` = 72417; -INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES -(72417,0,0,0,0,0,327680,0,0,0,60); - --- fixes quest credit from Fel reaver no thanks! author: tREAk & shlomi1515 closes #3715 -UPDATE `spell_dbc` SET `Effect1`=16,`EffectMiscValue1`=10855 WHERE `id`=38758; -DELETE FROM `creature_ai_scripts` WHERE creature_id=22293; - --- fix areatrigger for wickerman camp author: boomper closes #3549 -DELETE FROM `areatrigger_involvedrelation` WHERE `id` =3991; -INSERT INTO `areatrigger_involvedrelation` (`id`, `quest`) -VALUES (3991,1658); - --- yous have da darkrune should be daily author: kaelima closes #3457 -UPDATE `quest_template` SET `SpecialFlags` = `SpecialFlags` | 1 WHERE `id` = 11027; - --- fix infinite corruptor loot id author: vincent-michael -UPDATE `creature_template` SET `lootid` = 32313 WHERE `entry` =32313; diff --git a/sql/updates/world/2012_05_10_04_world_ceature_sai.sql b/sql/updates/world/2012_05_10_04_world_ceature_sai.sql deleted file mode 100644 index 5f01e951c4b..00000000000 --- a/sql/updates/world/2012_05_10_04_world_ceature_sai.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Spawn Disturbed Glacial Revenant -DELETE FROM `creature` WHERE `guid`=201998; -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 -(201998,36874,658,2,1,0,0,1053.894,-93.05556,632.8575,4.223697,86400,0,0,1,0,0,0,0,0); -DELETE FROM `creature_addon` WHERE `guid`=201998; -INSERT INTO `creature_addon` (`guid`,`bytes2`) VALUES -(201998,1); - --- Disturbed Glacial Revenant SAI -SET @ENTRY := 36874; -- NPC entry -UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,4,0,0,12000,15000,11,55216,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Disturbed Glacial Revenant - Combat - Cast Avalanche'); diff --git a/sql/updates/world/2012_05_10_05_world_waypoints.sql b/sql/updates/world/2012_05_10_05_world_waypoints.sql deleted file mode 100644 index 1677d74c4a7..00000000000 --- a/sql/updates/world/2012_05_10_05_world_waypoints.sql +++ /dev/null @@ -1,88 +0,0 @@ --- Deathwhisper Necrolyte pathing -SET @NPC := 202103; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,555.3976,303.5347,507.6232,0,0,0,100,0), -(@PATH,2,568.4896,297.9913,506.9572,0,0,0,100,0), -(@PATH,3,586.1476,292.5486,506.3322,0,0,0,100,0), -(@PATH,4,598.5833,292.6007,506.3322,0,0,0,100,0), -(@PATH,5,602.3438,300.2135,506.9457,0,0,0,100,0), -(@PATH,6,603.0573,307.5399,507.6957,0,0,0,100,0), -(@PATH,7,611.7239,316.1129,508.4457,0,0,0,100,0), -(@PATH,8,620.0677,312.684,508.1957,0,0,0,100,0), -(@PATH,9,622.184,305.0868,508.3207,0,0,0,100,0), -(@PATH,10,616.684,295.2083,507.8819,0,0,0,100,0), -(@PATH,11,613.9236,287.4288,507.0737,0,0,0,100,0), -(@PATH,12,618.5174,272.882,507.6097,0,0,0,100,0), -(@PATH,13,621.4445,263.4861,507.9438,0,0,0,100,0), -(@PATH,14,618.5174,272.882,507.6097,0,0,0,100,0), -(@PATH,15,613.9236,287.4288,507.0737,0,0,0,100,0), -(@PATH,16,616.684,295.2083,507.8819,0,0,0,100,0), -(@PATH,17,622.184,305.0868,508.3207,0,0,0,100,0), -(@PATH,18,620.0677,312.684,508.1,0,0,0,100,0), -(@PATH,19,611.7239,316.1129,508.4457,0,0,0,100,0), -(@PATH,20,603.0573,307.5399,507.6629,0,0,0,100,0), -(@PATH,21,602.3438,300.2135,506.8405,0,0,0,100,0), -(@PATH,22,598.5833,292.6007,506.3498,0,0,0,100,0), -(@PATH,23,586.1476,292.5486,506.3322,0,0,0,100,0), -(@PATH,24,568.4896,297.9913,506.9572,0,0,0,100,0); -DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(@NPC,@NPC,0,0,2), -(@NPC,201819,7,270,2), -(@NPC,201934,7,306,2), -(@NPC,202121,7,342,2), -(@NPC,202196,7,18,2), -(@NPC,202098,7,54,2), -(@NPC,201954,7,90,2); - --- Deathwhisper Necrolyte pathing -SET @NPC := 202273; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988); -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,611.9375,117.441,508.0308,0,0,0,100,0), -(@PATH,2,620.9531,139.3004,506.531,0,0,0,100,0), -(@PATH,3,624.3854,153.9531,507.3376,0,0,0,100,0), -(@PATH,4,625.8316,167.6233,507.4478,0,0,0,100,0), -(@PATH,5,622.8368,183.6788,507.7706,0,0,0,100,0), -(@PATH,6,625.8316,167.6233,507.4478,0,0,0,100,0), -(@PATH,7,624.3854,153.9531,507.3376,0,0,0,100,0), -(@PATH,8,620.9531,139.3004,506.531,0,0,0,100,0), -(@PATH,9,611.9375,117.441,508.0308,0,0,0,100,0), -(@PATH,10,610.8828,99.47656,510.0737,0,0,0,100,0); -DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(@NPC,@NPC,0,0,2), -(@NPC,202054,7,270,2), -(@NPC,201845,7,306,2), -(@NPC,201914,7,342,2), -(@NPC,202145,7,18,2), -(@NPC,202227,7,54,2), -(@NPC,201988,7,90,2); - --- Fix previous creature removal -DELETE FROM `creature` WHERE `id`=42160; -INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`, `position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES -(42160,36881,658,3,1,0,0,592.975,176.104,510.1582,508.746,86400,0,0,1,0,0); -UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988); -DELETE FROM `creature_formations` WHERE `leaderGUID`=202231; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(202231,202231,0,0,2), -(202231,202099,7,270,2), -(202231,202282,7,306,2), -(202231,202125,7,342,2), -(202231,202203,7,18,2), -(202231,201960,7,54,2), -(202231,42160,7,90,2); - --- Update Scourgelord Tyrannus "Make him fly" -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36794; diff --git a/sql/updates/world/2012_05_10_06_world_waypoints.sql b/sql/updates/world/2012_05_10_06_world_waypoints.sql deleted file mode 100644 index 6fd04d0e4da..00000000000 --- a/sql/updates/world/2012_05_10_06_world_waypoints.sql +++ /dev/null @@ -1,40 +0,0 @@ --- Deathwhisper Necrolyte pathing -SET @NPC := 202063; -SET @PATH := @NPC*10; -UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -UPDATE `creature` SET `position_x`=631.8229,`position_y`=229.7292,`position_z`=508.0604 WHERE `guid` IN (202028,202000,201957,201820,202122,202199); -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES -(@PATH,1,631.8229,229.7292,508.0604,0,0,0,100,0), -(@PATH,2,643.8733,215.2674,508.2268,0,0,0,100,0), -(@PATH,3,659.0139,215.9635,507.8518,0,0,0,100,0), -(@PATH,4,674.184,213.5833,508.8467,0,0,0,100,0), -(@PATH,5,678.8004,201.066,508.4717,0,0,0,100,0), -(@PATH,6,662.4636,183.0694,507.9585,0,0,0,100,0), -(@PATH,7,650.8941,171.5642,507.7085,0,0,0,100,0), -(@PATH,8,637.7292,155.2569,507.9196,0,0,0,100,0), -(@PATH,9,644.6389,130.2639,510.4212,0,0,0,100,0), -(@PATH,10,654.9896,121.3038,511.9212,0,0,0,100,0), -(@PATH,11,677.7448,136.6528,512.7715,0,0,0,100,0), -(@PATH,12,678.2847,149.1233,507.8965,0,0,0,100,0), -(@PATH,13,677.7448,136.6528,512.7715,0,0,0,100,0), -(@PATH,14,654.9896,121.3038,511.9212,0,0,0,100,0), -(@PATH,15,644.6389,130.2639,510.4212,0,0,0,100,0), -(@PATH,16,637.7292,155.2569,507.9196,0,0,0,100,0), -(@PATH,17,650.8941,171.5642,507.7085,0,0,0,100,0), -(@PATH,18,662.4636,183.0694,507.9585,0,0,0,100,0), -(@PATH,19,678.8004,201.066,508.4717,0,0,0,100,0), -(@PATH,20,674.184,213.5833,508.8467,0,0,0,100,0), -(@PATH,21,659.0139,215.9635,507.8518,0,0,0,100,0), -(@PATH,22,643.8733,215.2674,508.2268,0,0,0,100,0); -DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC; -INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES -(@NPC,@NPC,0,0,2), -(@NPC,202028,7,270,2), -(@NPC,202000,7,306,2), -(@NPC,201957,7,342,2), -(@NPC,201820,7,18,2), -(@NPC,202122,7,54,2), -(@NPC,202199,7,90,2); diff --git a/sql/updates/world/2012_05_11_00_world_waypoints.sql b/sql/updates/world/2012_05_11_00_world_waypoints.sql deleted file mode 100644 index fa4e18f6468..00000000000 --- a/sql/updates/world/2012_05_11_00_world_waypoints.sql +++ /dev/null @@ -1,31 +0,0 @@ --- Scourgelord Tyrannus pathing -SET @NPC := 201951; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=873.783,`position_y`=136.9774,`position_z`=623.6115,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,873.783,136.9774,623.6115,0,0,0,100,0), -(@PATH,2,872.9045,139.2743,622.4446,0,0,0,100,0), -(@PATH,3,888.7917,171.3403,591.3615,0,0,0,100,0), -(@PATH,4,861.3073,209.8455,591.3615,0,0,0,100,0), -(@PATH,5,830.4913,254.5556,591.3615,0,0,0,100,0), -(@PATH,6,780.4844,277.6406,591.3615,0,0,0,100,0), -(@PATH,7,732.6771,272.4635,591.3615,0,0,0,100,0), -(@PATH,8,683.9028,265.276,591.3615,0,0,0,100,0), -(@PATH,9,612.3368,284.7934,553.4998,0,0,0,100,0), -(@PATH,10,554.816,303.1858,553.4998,0,0,0,100,0), -(@PATH,11,498.1024,309.0625,553.4998,0,0,0,100,0), -(@PATH,12,470.4167,230.0174,553.4998,0,0,0,100,0), -(@PATH,13,454.0087,175.2135,553.4998,0,0,0,100,0), -(@PATH,14,492.4288,127.1806,583.1108,0,0,0,100,0), -(@PATH,15,551.2604,121.6354,583.1108,0,0,0,100,0), -(@PATH,16,647.5573,126.3542,583.1108,0,0,0,100,0), -(@PATH,17,766.2222,130.9254,583.1108,0,0,0,100,0), -(@PATH,18,829.408,42.33854,583.1108,0,0,0,100,0), -(@PATH,19,746.7101,-53.03299,583.1108,0,0,0,100,0), -(@PATH,20,663.2379,-77.32291,583.1108,0,0,0,100,0), -(@PATH,21,618.6389,3.369792,583.1108,0,0,0,100,0), -(@PATH,22,641.8559,89.27604,583.1108,0,0,0,100,0), -(@PATH,23,794.1667,115.6858,583.1108,0,0,0,100,0); diff --git a/sql/updates/world/2012_05_11_01_world_gameobject_template.sql b/sql/updates/world/2012_05_11_01_world_gameobject_template.sql deleted file mode 100644 index 630a166276b..00000000000 --- a/sql/updates/world/2012_05_11_01_world_gameobject_template.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Lock Ice Wall and make untargetable -UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201885; --- Saronite Rock Should be untargetable -UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=196485; diff --git a/sql/updates/world/2012_05_11_02_world_conditions.sql b/sql/updates/world/2012_05_11_02_world_conditions.sql deleted file mode 100644 index a10c27a0ef5..00000000000 --- a/sql/updates/world/2012_05_11_02_world_conditions.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Spell Conditions for spell Necromantic Power 69347 -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=69347; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,69347,0,31,3,37496,0,0,'','Spell 69347 targets entry 37496'), -(13,1,69347,1,31,3,37497,0,0,'','Spell 69347 targets entry 37497'), -(13,1,69347,2,31,3,37498,0,0,'','Spell 69347 targets entry 37498'), -(13,1,69347,3,31,3,37584,0,0,'','Spell 69347 targets entry 37584'), -(13,1,69347,4,31,3,37587,0,0,'','Spell 69347 targets entry 37587'), -(13,1,69347,5,31,3,37588,0,0,'','Spell 69347 targets entry 37588'); - --- Spell Conditions for spell Shriek of the Highborne 70512 -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70512; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,70512,3,31,3,37584,0,0,'','Spell 70512 targets entry 37584'), -(13,1,70512,4,31,3,37587,0,0,'','Spell 70512 targets entry 37587'), -(13,1,70512,5,31,3,37588,0,0,'','Spell 70512 targets entry 37588'); - --- Spell Conditions for spell Empowered Blizzard 70130 -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70130; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,1,70130,0,31,3,37496,0,0,'','Spell 70130 targets entry 37496'), -(13,1,70130,1,31,3,37497,0,0,'','Spell 70130 targets entry 37497'), -(13,1,70130,2,31,3,37498,0,0,'','Spell 70130 targets entry 37498'); diff --git a/sql/updates/world/2012_05_12_00_world_gameobject_template.sql b/sql/updates/world/2012_05_12_00_world_gameobject_template.sql deleted file mode 100644 index ffa932c8640..00000000000 --- a/sql/updates/world/2012_05_12_00_world_gameobject_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Lock Halls of Reflection Portcullis -UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201848; diff --git a/sql/updates/world/2012_05_12_01_world_item_loot_template.sql b/sql/updates/world/2012_05_12_01_world_item_loot_template.sql deleted file mode 100644 index 052b749c48c..00000000000 --- a/sql/updates/world/2012_05_12_01_world_item_loot_template.sql +++ /dev/null @@ -1,92 +0,0 @@ -DELETE FROM `item_loot_template` WHERE `entry` BETWEEN 51999 AND 52005; -INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Satchel of Helpfull Goods (level 0-25) -(51999,51964,0,1,1,1,1), -- Vigorous Belt -(51999,51968,0,1,1,1,1), -- Enumerated Wrap -(51999,51978,0,1,1,1,1), -- Earthbound Girdle -(51999,51994,25,1,1,1,1), -- Tumultuous Cloak --- Satchel of Helpfull Goods (level 26-35) -(52000,51965,0,1,1,1,1), -- Vigorous Handguards -(52000,51973,0,1,1,1,1), -- Enumerated Handwraps -(52000,51980,0,1,1,1,1), -- Earthbound Handgrips -(52000,51996,25,1,1,1,1), -- Tumultuous Necklace --- Satchel of Helpfull Goods (level 36-45) -(52001,51966,0,1,1,1,1), -- Vigorous Spaulders -(52001,51974,0,1,1,1,1), -- Enumerated Shoulderpads -(52001,51976,0,1,1,1,1), -- Earthbound Shoulderguards -(52001,51984,0,1,1,1,1), -- Stalwart Shoulderpads -(52001,51992,25,1,1,1,1), -- Tumultuous Ring --- Satchel of Helpfull Goods (level 46-55) -(52002,51962,0,1,1,1,1), -- Vigorous Bracers -(52002,51963,0,1,1,1,1), -- Vigorous Stompers -(52002,51967,0,1,1,1,1), -- Enumerated Sandals -(52002,51972,0,1,1,1,1), -- Enumerated Bracers -(52002,51981,0,1,1,1,1), -- Earthbound Wristguards -(52002,51982,0,1,1,1,1), -- Earthbound Boots -(52002,51989,0,1,1,1,1), -- Stalwart Bands -(52002,51990,0,1,1,1,1), -- Stalwart Treads --- Satchel of Helpfull Goods (level 56-60) -(52003,51959,0,1,1,1,1), -- Vigorous Belt -(52003,51971,0,1,1,1,1), -- Enumerated Belt -(52003,51977,0,1,1,1,1), -- Earthbound Girdle -(52003,51985,0,1,1,1,1), -- Stalwart Belt -(52003,51993,25,1,1,1,1), -- Turbulent Cloak --- Satchel of Helpfull Goods (level 61-64) -(52004,51960,0,1,1,1,1), -- Vigorous Gloves -(52004,51970,0,1,1,1,1), -- Enumerated Gloves -(52004,51979,0,1,1,1,1), -- Earthbound Grips -(52004,51987,0,1,1,1,1), -- Stalwart Grips -(52004,51995,25,1,1,1,1), -- Turbulent Necklace --- Satchel of Helpfull Goods (level 65-70) -(52005,51961,0,1,1,1,1), -- Vigorous Shoulderguards -(52005,51969,0,1,1,1,1), -- Enumerated Shoulders -(52005,51975,0,1,1,1,1), -- Earthbound Shoulders -(52005,51983,0,1,1,1,1), -- Stalwart Shoulderguards -(52005,51991,25,1,0,1,1); -- Turbulent Signet --- ------------------------------------------------------------------- --- Set some Parameters --- ------------------------------------------------------------------- -SET @Cloth := 400; -- Class Bitmask: 16 (Priest) +128 (Mage) +256 (Warlock) -SET @Leather1 := 1100; -- Class Bitmask: 4 (Hunter) +8 (Rogue) +64 (Shaman) +1024 (Druid) -SET @Leather2 := 1032; -- Class Bitmask: 8 (Rogue) +1024 (Druid) -SET @Mail1 := 3; -- Class Bitmask: 1 (Warrior) +2 (Paladin) -SET @Mail2 := 68; -- Class Bitmask: 4 (Hunter) +8 (Shaman) -SET @Plate := 35; -- Class Bitmask: 1 (Warrior) +2 (Paladin) +32 (DeathKnight) --- Add conditions to make sure everyone gets beneficial loot for their class --- ------------------------------------------------------------------- -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=5 AND `SourceGroup` BETWEEN 51999 AND 52005 ; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES --- Cloth Items -(5,51999,51968,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Wrap only for clothusers'), -(5,52000,51973,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Handwraps only for clothusers'), -(5,52001,51974,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulderpads only for clothusers'), -(5,52002,51967,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Sandals only for clothusers'), -(5,52002,51972,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Bracers only for clothusers'), -(5,52003,51971,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Belt only for clothusers'), -(5,52004,51970,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Gloves only for clothusers'), -(5,52005,51969,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulders only for clothusers'), --- Leather Items -(5,51999,51964,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'), -(5,52000,51965,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Handguards only for leatherusers'), -(5,52001,51966,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Spaulders only for leatherusers'), -(5,52002,51962,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Bracers only for leatherusers'), -(5,52002,51963,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Stompers only for leatherusers'), -(5,52003,51959,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'), -(5,52004,51960,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Gloves only for leatherusers'), -(5,52005,51961,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Shoulderguards only for leatherusers'), --- Mail Items -(5,51999,51978,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'), -(5,52000,51980,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Handgrips only for mail users'), -(5,52001,51976,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulderguards only for mail users'), -(5,52002,51982,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Boots only for mail users'), -(5,52002,51981,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Wristguards only for mail users'), -(5,52003,51977,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'), -(5,52004,51979,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Grips only for mail users'), -(5,52005,51975,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulders only for mail users'), --- Plate Items -(5,52001,51984,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderpads only for plate users'), -(5,52002,51989,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Bands only for plate users'), -(5,52002,51990,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Treads only for plate users'), -(5,52003,51985,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Belt only for plate users'), -(5,52004,51987,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Grips only for plate users'), -(5,52005,51983,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderguards only for plate users'); diff --git a/sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql b/sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql deleted file mode 100644 index b1f445faa59..00000000000 --- a/sql/updates/world/2012_05_12_02_world_gameobject_loot_template.sql +++ /dev/null @@ -1,37 +0,0 @@ --- Add Reference Loots -SET @RefNormal := 35091; -SET @RefHeroic := 35092; -DELETE FROM `reference_loot_template` WHERE `entry` IN (@RefNormal,@RefHeroic); -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Normal Loot -(@RefNormal,49839,0,1,1,1,1), -- Mourning Malice -(@RefNormal,49840,0,1,1,1,1), -- Hate-Forged Cleaver -(@RefNormal,49841,0,1,1,1,1), -- Blackened Geist Ribs -(@RefNormal,49842,0,1,1,1,1), -- Tapestry of the Frozen Throne -(@RefNormal,49843,0,1,1,1,1), -- Crystalline Citadel Gauntlets -(@RefNormal,49844,0,1,1,1,1), -- Crypt Fiend Slayer -(@RefNormal,49845,0,1,1,1,1), -- Bone Golem Scapula -(@RefNormal,49846,0,1,1,1,1), -- Chilled Heart of the Glacier -(@RefNormal,49847,0,1,1,1,1), -- Legguards of Untimely Demise -(@RefNormal,49848,0,1,1,1,1), -- Grim Lasher Shoulderguards -(@RefNormal,49849,0,1,1,1,1), -- Tattered Glacial-Woven Hood -(@RefNormal,49851,0,1,1,1,1), -- Greathelm of the Silver Hand --- Heroic Loot -(@RefHeroic,50303,0,1,1,1,1), -- Black Icicle -(@RefHeroic,50302,0,1,1,1,1), -- Liar's Tongue -(@RefHeroic,50311,0,1,1,1,1), -- Second Helm of the Executioner -(@RefHeroic,50312,0,1,1,1,1), -- Chestguard of Broken Branches -(@RefHeroic,50310,0,1,1,1,1), -- Fossilized Ammonite Choker -(@RefHeroic,50313,0,1,1,1,1), -- Oath of Empress Zoe -(@RefHeroic,50309,0,1,1,1,1), -- Shriveled Heart -(@RefHeroic,50314,0,1,1,1,1), -- Strip of Remorse -(@RefHeroic,50308,0,1,1,1,1), -- Blighted Leather Footpads -(@RefHeroic,50305,0,1,1,1,1), -- Grinning Skull Boots -(@RefHeroic,50306,0,1,1,1,1), -- The Lady's Promise -(@RefHeroic,50304,0,1,1,1,1); -- Hoarfrost Gauntlets --- Assign to the chest -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (27985,27993); -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(27985,1,100,1,0,-@RefNormal,2), -- Two from Normal Reference Loot -(27993,1,100,1,0,-@RefHeroic,2), -- Two from Heroic Reference Loot -(27993,43102,85,1,0,1,1); -- Frozen Orb diff --git a/sql/updates/world/2012_05_13_00_world_creature_text.sql b/sql/updates/world/2012_05_13_00_world_creature_text.sql deleted file mode 100644 index 8d083156fb0..00000000000 --- a/sql/updates/world/2012_05_13_00_world_creature_text.sql +++ /dev/null @@ -1,13 +0,0 @@ --- NPC talk text insert from sniff -DELETE FROM `creature_text` WHERE `entry`=36494; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(36494,0,0, 'Tiny creatures under feet, you bring Garfrost something good to eat!',14,0,100,0,0,0, 'Forgemaster Garfrost'), -(36494,1,0, 'Axe too weak. Garfrost make better and CRUSH YOU.',14,0,100,0,0,0, 'Forgemaster Garfrost'), -(36494,2,0, 'Garfrost tired of puny mortals. Now your bones will freeze!',14,0,100,0,0,0, 'Forgemaster Garfrost'), -(36494,3,0, 'Garfrost hope giant underpants clean. Save boss great shame. For later.',14,0,100,0,0,0, 'Forgemaster Garfrost'), -(36494,4,0, 'Will save for snack. For later.',12,0,100,0,0,0, 'Forgemaster Garfrost'), -(36494,4,1, 'That one maybe not so good to eat now. Stupid Garfrost! BAD! BAD!',12,0,100,0,0,0, 'Forgemaster Garfrost'), -(36494,5,0, '%s hurls a massive saronite boulder at you!',16,0,100,0,0,0, 'Forgemaster Garfrost'), -(36494,6,0, '%s casts |cFF00AACCDeep Freeze|r at $n.',41,0,100,0,0,0, 'Forgemaster Garfrost'); --- Remove old script text -DELETE FROM `script_texts` WHERE `entry` BETWEEN -1658006 AND -1658001; diff --git a/sql/updates/world/2012_05_13_01_world_creature_text.sql b/sql/updates/world/2012_05_13_01_world_creature_text.sql deleted file mode 100644 index 8e983fd9a73..00000000000 --- a/sql/updates/world/2012_05_13_01_world_creature_text.sql +++ /dev/null @@ -1,14 +0,0 @@ --- NPC talk text insert for Sara -DELETE FROM `creature_text` WHERE `entry`=33134; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(33134,0,0, 'Help me! Please get them off me!',14,0,100,0,0,15771, 'Sara YELL_PREFIGHT'), -(33134,0,1, 'What do you want from me? Leave me alone!',14,0,100,0,0,15772, 'Sara YELL_PREFIGHT'), -(33134,1,0, 'Yes! YES! Show them no mercy! Give no pause to your attacks!',14,0,100,0,0,15773, 'Sara YELL_COMBAT_PHASE_1'), -(33134,1,1, 'Let hatred and rage guide your blows!',14,0,100,0,0,15774, 'Sara YELL_COMBAT_PHASE_1'), -(33134,1,2, 'The time to strike at the head of the beast will soon be upon us! Focus your anger and hatred on his minions!',14,0,100,457,0,15775, 'Sara YELL_COMBAT_PHASE_1'), -(33134,2,0, 'Suffocate upon your own hate!',14,0,100,0,0,15776, 'Sara YELL_COMBAT_PHASE_2'), -(33134,2,1, 'Tremble, mortals, before the coming of the end!',14,0,100,0,0,15777, 'Sara YELL_COMBAT_PHASE_2'), -(33134,3,0, 'Powerless to act...',14,0,100,0,0,15778, 'Sara YELL_SLAY'), -(33134,3,1, 'Could they have been saved?',14,0,100,0,0,15779, 'YELL SAY_SLAY'); --- remove script text -DELETE FROM script_texts WHERE entry BETWEEN -1603319 AND -1603310; diff --git a/sql/updates/world/2012_05_16_00_world_scripts.sql b/sql/updates/world/2012_05_16_00_world_scripts.sql deleted file mode 100644 index 9997c09bd8d..00000000000 --- a/sql/updates/world/2012_05_16_00_world_scripts.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Add script to Dragonspire Hall Runes "UBRS" -UPDATE `gameobject_template` SET `ScriptName`= 'go_dragonspire_hall_rune' WHERE `entry` BETWEEN 175194 AND 175200; diff --git a/sql/updates/world/2012_05_17_00_world_creature_text.sql b/sql/updates/world/2012_05_17_00_world_creature_text.sql deleted file mode 100644 index d7df0f94c0b..00000000000 --- a/sql/updates/world/2012_05_17_00_world_creature_text.sql +++ /dev/null @@ -1,7 +0,0 @@ --- NPC talk text insert from sniff -DELETE FROM `creature_text` WHERE `entry`=9816; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(9816,0,0, '%s begins to regain its strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'), -(9816,1,0, '%s is nearly at full strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'), -(9816,2,0, '%s regains its power and breaks free of its bonds!',16,0,100,0,0,0, 'Pyroguard Emberseer'), -(9816,3,0, 'Ha! Ha! Ha! Thank you for freeing me, fools. Now let me repay you by charring the flesh from your bones.',14,0,100,0,0,0, 'Pyroguard Emberseer'); diff --git a/sql/updates/world/2012_05_18_00_world_conditions.sql b/sql/updates/world/2012_05_18_00_world_conditions.sql deleted file mode 100644 index ad18a6c65ef..00000000000 --- a/sql/updates/world/2012_05_18_00_world_conditions.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM `conditions` WHERE `SourceEntry` = 52264; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(13,0,52264,0,0,29,0,28653,5,0,0,97,"","Creature conditions for spell 52264 (Deliver stolen horse)"); diff --git a/sql/updates/world/2012_05_18_01_world_misc.sql b/sql/updates/world/2012_05_18_01_world_misc.sql deleted file mode 100644 index bded6fae447..00000000000 --- a/sql/updates/world/2012_05_18_01_world_misc.sql +++ /dev/null @@ -1,7 +0,0 @@ -DELETE FROM `spell_proc_event` WHERE `entry` = 70656; - -UPDATE `quest_template` SET `NextQuestId` = 3761 WHERE `id` IN (936,3784,3762); - -DELETE FROM `spell_proc_event` WHERE `entry` = 63611; -INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES -(63611,0,0,0,0,0,51154,0,0,0,0); diff --git a/sql/updates/world/2012_05_18_01_world_spell_target_position.sql b/sql/updates/world/2012_05_18_01_world_spell_target_position.sql deleted file mode 100644 index 72ebc409d9d..00000000000 --- a/sql/updates/world/2012_05_18_01_world_spell_target_position.sql +++ /dev/null @@ -1,9 +0,0 @@ -DELETE FROM `spell_target_position` WHERE `id` IN (30719,53140,53141,53360,54406,68328,71512); -INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES -(30719,571,5807.75,588.347,661.505,1.663), -(53140,571,5807.75,588.347,661.505,1.663), -(53141,571,5807.75,588.347,661.505,1.663), -(53360,571,5807.75,588.347,661.505,1.663), -(54406,571,5807.75,588.347,661.505,1.663), -(68328,571,5807.75,588.347,661.505,1.663), -(71512,571,5807.75,588.347,661.505,1.663); diff --git a/sql/updates/world/2012_05_19_00_world_quest_template.sql b/sql/updates/world/2012_05_19_00_world_quest_template.sql deleted file mode 100644 index f18172ed836..00000000000 --- a/sql/updates/world/2012_05_19_00_world_quest_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Change Flags for the Body and Heart Quest -UPDATE `quest_template` SET `Flags`=`Flags`&~2, `SpecialFlags`=`SpecialFlags`|2 WHERE `id` IN (6001,6002); diff --git a/sql/updates/world/2012_05_19_01_world_smart_scripts.sql b/sql/updates/world/2012_05_19_01_world_smart_scripts.sql deleted file mode 100644 index 06169d8610a..00000000000 --- a/sql/updates/world/2012_05_19_01_world_smart_scripts.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Fix Quest 9962,9967,9970,9972,9973 -UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18398 AND `id`=1; -- Brokentoe -UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18399 AND `id`=4; -- Murkblood Twin -UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18400 AND `id`=5; -- Rokdar the Sundered Lord -UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18401 AND `id`=3; -- Skra'gath -UPDATE `smart_scripts` SET `id`=5,`link`=6,`target_type`=16 WHERE `entryorguid`=18402 AND `action_type`=15; -- Warmaul Champion -UPDATE `smart_scripts` SET `id`=6 WHERE `entryorguid`=18402 AND `action_type`=45; -- Warmaul Champion diff --git a/sql/updates/world/2012_05_19_02_world_misc.sql b/sql/updates/world/2012_05_19_02_world_misc.sql deleted file mode 100644 index 1dd946b5a18..00000000000 --- a/sql/updates/world/2012_05_19_02_world_misc.sql +++ /dev/null @@ -1,6 +0,0 @@ --- 2012-05-19 12:48:24 SourceEntry 52264 in `condition` table, has incorrect SourceGroup 0 (spell effectMask) set , ignoring. -UPDATE `conditions` SET `SourceId`=1 WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=0 AND `SourceEntry`=52264 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=29 AND `ConditionTarget`=0 AND `ConditionValue1`=28653 AND `ConditionValue2`=5 AND `ConditionValue3`=0; - --- 2012-05-19 12:48:18 Quest 384 has `ZoneOrSort` = -304 but `RequiredSkillId` does not have a corresponding value (185). --- It is not clear if cooking was required on 3.3.5, so reverting it to its original state (however we are sure it is not required in Cata) -UPDATE `quest_template` SET `RequiredSkillId`=185, `RequiredSkillPoints`=1 WHERE `Id`=384; -- cgit v1.2.3 From da2c39d113176ef3bf835dbc151d1043c7ddee8e Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 19 May 2012 15:56:57 +0100 Subject: DB/Loot: No npc should drop Saronite Ore Thanks Amit --- sql/updates/world/2012_02_19_04_creature_loot_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_02_19_04_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_19_04_creature_loot_template.sql b/sql/updates/world/2012_02_19_04_creature_loot_template.sql new file mode 100644 index 00000000000..ae996e01956 --- /dev/null +++ b/sql/updates/world/2012_02_19_04_creature_loot_template.sql @@ -0,0 +1 @@ +DELETE FROM `creature_loot_template` WHERE `entry`=31813 AND `item`=36912; -- Saronite Ore -- cgit v1.2.3 From 015162ce5f1ab17e8fa5afc61d965987808a1426 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 19 May 2012 19:38:42 +0200 Subject: DB/Loot: Add Gunship Loot to the respective chests, kills some startup errors Fixes #6248 --- .../2012_02_19_05_gameobject_loot_template.sql | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 sql/updates/world/2012_02_19_05_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_19_05_gameobject_loot_template.sql b/sql/updates/world/2012_02_19_05_gameobject_loot_template.sql new file mode 100644 index 00000000000..f95cb45efe4 --- /dev/null +++ b/sql/updates/world/2012_02_19_05_gameobject_loot_template.sql @@ -0,0 +1,93 @@ +-- Set Variables +SET @Gunship10N := 28057; -- Data1 for 201872 & 202177 +SET @Gunship10H := 28045; -- Data1 for 201873 & 202178 +SET @Gunship25N := 28072; -- Data1 for 201874 & 202179 +SET @Gunship25H := 28090; -- Data1 for 201875 & 202180 +SET @emblem := 49426; -- Emblem of Frost +SET @SfShard := 50274; -- Shadowfrost Shard +SET @PriSar := 49908; -- Primordial Saronite +-- Dug up the old references i created for UP34: +SET @Ref10J := 34329; +SET @Ref25J := 34251; +SET @RefJ10H := 34263; +SET @RefJ25H := 34275; +-- Gunship_Armory10N_reference +DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref10J,@Ref25J,@RefJ10H,@RefJ25H); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak +(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering +(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter +(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver +(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun +(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots +(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope +(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass +(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm +(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring +(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers +(@Ref10J,50796,0,1,1,1,1), -- Bracers of Pale Illumination +-- Gunship_Armory25N_reference +(@Ref25J,50011,0,1,1,1,1), -- Gunship Captain's Mittens +(@Ref25J,50002,0,1,1,1,1), -- Polar Bear Claw Bracers +(@Ref25J,50006,0,1,1,1,1), -- Corp'rethar Ceremonial Crown +(@Ref25J,50010,0,1,1,1,1), -- Waistband of Righteous Fury +(@Ref25J,50003,0,1,1,1,1), -- Boneguard Commander's Pauldrons +(@Ref25J,50000,0,1,1,1,1), -- Scourge Hunter's Vambraces +(@Ref25J,50359,0,1,1,1,1), -- Althor's Abacus +(@Ref25J,50352,0,1,1,1,1), -- Corpse Tongue Coin +(@Ref25J,49999,0,1,1,1,1), -- Skeleton Lord's Circle +(@Ref25J,50009,0,1,1,1,1), -- Boots of Unnatural Growth +(@Ref25J,50008,0,1,1,1,1), -- Ring of Rapid Ascent +(@Ref25J,49998,0,1,1,1,1), -- Shadowvault Slayer's Cloak +(@Ref25J,50005,0,1,1,1,1), -- Amulet of the Silent Eulogy +(@Ref25J,50411,0,1,1,1,1), -- Scourgeborne Waraxe +(@Ref25J,50001,0,1,1,1,1), -- Ikfirus's Sack of Wonder +-- Gunship_Armory10H_reference +(@RefJ10H,51912,0,1,1,1,1), -- Saronite Gargoyle Cloak (heroic) +(@RefJ10H,51908,0,1,1,1,1), -- Cord of Dark Suffering (heroic) +(@RefJ10H,51909,0,1,1,1,1), -- Neverending Winter (heroic) +(@RefJ10H,51916,0,1,1,1,1), -- Frost Giant's Cleaver (heroic) +(@RefJ10H,51910,0,1,1,1,1), -- Midnight Sun (heroic) +(@RefJ10H,51915,0,1,1,1,1), -- Bone Drake's Enameled Boots (heroic) +(@RefJ10H,51911,0,1,1,1,1), -- Pauldrons of Lost Hope (heroic) +(@RefJ10H,50345,0,1,1,1,1), -- Muradin's Spyglass (heroic) +(@RefJ10H,51906,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm (heroic) +(@RefJ10H,51913,0,1,1,1,1), -- Abomination's Bloody Ring (heroic) +(@RefJ10H,51914,0,1,1,1,1), -- Icecrown Rampart Bracers (heroic) +(@RefJ10H,51907,0,1,1,1,1), -- Bracers of Pale Illumination (heroic) +-- Gunship_Armory25H_reference +(@RefJ25H,50663,0,1,1,1,1), -- Gunship Captain's Mittens (heroic) +(@RefJ25H,50659,0,1,1,1,1), -- Polar Bear Claw Bracers (heroic) +(@RefJ25H,50661,0,1,1,1,1), -- Corp'rethar Ceremonial Crown (heroic) +(@RefJ25H,50667,0,1,1,1,1), -- Waistband of Righteous Fury (heroic) +(@RefJ25H,50660,0,1,1,1,1), -- Boneguard Commander's Pauldrons (heroic) +(@RefJ25H,50655,0,1,1,1,1), -- Scourge Hunter's Vambraces (heroic) +(@RefJ25H,50366,0,1,1,1,1), -- Althor's Abacus (heroic) +(@RefJ25H,50349,0,1,1,1,1), -- Corpse Tongue Coin (heroic) +(@RefJ25H,50657,0,1,1,1,1), -- Skeleton Lord's Circle (heroic) +(@RefJ25H,50665,0,1,1,1,1), -- Boots of Unnatural Growth (heroic) +(@RefJ25H,50664,0,1,1,1,1), -- Ring of Rapid Ascent (heroic) +(@RefJ25H,50653,0,1,1,1,1), -- Shadowvault Slayer's Cloak (heroic) +(@RefJ25H,50658,0,1,1,1,1), -- Amulet of the Silent Eulogy (heroic) +(@RefJ25H,50654,0,1,1,1,1), -- Scourgeborne Waraxe (heroic) +(@RefJ25H,50656,0,1,1,1,1); -- Ikfirus's Sack of Wonder (heroic) +-- Bind the refs to the objects +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Gunship10N,@Gunship10H,@Gunship25N,@Gunship25H); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Gunship10N +(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N +(@Gunship10N,1,100,1,0,-@Ref10J,2), -- 2 from reference 10Normal +-- Gunship25N +(@Gunship25N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25N +(@Gunship25N,1,100,1,0,-@Ref25J,2), -- 3 from reference 25Normal +(@Gunship25N,@SfShard,-35,1,0,1,1), -- Shadowfrost Shard @ 38% chance +(@Gunship25N,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 10% chance +-- Gunship10H +(@Gunship10H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10H +(@Gunship10H,1,100,1,0,-@RefJ10H,2), -- 2 from reference 10Heroic +(@Gunship10H,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 38% chance +-- Gunship25H +(@Gunship25H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25H +(@Gunship25H,1,100,1,0,-@RefJ25H,2), -- 3 from reference 25Heroic +(@Gunship25H,@SfShard,-75,1,0,1,1), -- Shadowfrost Shard @ 75% chance +(@Gunship25H,@PriSar,50,1,0,1,1); -- Primordial Saronite @ 50% chance -- cgit v1.2.3 From c4a98cb04129f70e1aaf5c80a7eeb0f16569e5b9 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 19 May 2012 22:01:49 +0100 Subject: SQLS: Correct recent sqls file names --- sql/updates/world/2012_02_19_03_world_version.sql | 1 - .../world/2012_02_19_04_creature_loot_template.sql | 1 - .../2012_02_19_05_gameobject_loot_template.sql | 93 ---------------------- sql/updates/world/2012_05_19_03_world_version.sql | 1 + .../world/2012_05_19_04_creature_loot_template.sql | 1 + .../2012_05_19_05_gameobject_loot_template.sql | 93 ++++++++++++++++++++++ 6 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 sql/updates/world/2012_02_19_03_world_version.sql delete mode 100644 sql/updates/world/2012_02_19_04_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_02_19_05_gameobject_loot_template.sql create mode 100644 sql/updates/world/2012_05_19_03_world_version.sql create mode 100644 sql/updates/world/2012_05_19_04_creature_loot_template.sql create mode 100644 sql/updates/world/2012_05_19_05_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_02_19_03_world_version.sql b/sql/updates/world/2012_02_19_03_world_version.sql deleted file mode 100644 index 53c6821be69..00000000000 --- a/sql/updates/world/2012_02_19_03_world_version.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `version` SET `db_version`='TDB 335.11.47' LIMIT 1; diff --git a/sql/updates/world/2012_02_19_04_creature_loot_template.sql b/sql/updates/world/2012_02_19_04_creature_loot_template.sql deleted file mode 100644 index ae996e01956..00000000000 --- a/sql/updates/world/2012_02_19_04_creature_loot_template.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM `creature_loot_template` WHERE `entry`=31813 AND `item`=36912; -- Saronite Ore diff --git a/sql/updates/world/2012_02_19_05_gameobject_loot_template.sql b/sql/updates/world/2012_02_19_05_gameobject_loot_template.sql deleted file mode 100644 index f95cb45efe4..00000000000 --- a/sql/updates/world/2012_02_19_05_gameobject_loot_template.sql +++ /dev/null @@ -1,93 +0,0 @@ --- Set Variables -SET @Gunship10N := 28057; -- Data1 for 201872 & 202177 -SET @Gunship10H := 28045; -- Data1 for 201873 & 202178 -SET @Gunship25N := 28072; -- Data1 for 201874 & 202179 -SET @Gunship25H := 28090; -- Data1 for 201875 & 202180 -SET @emblem := 49426; -- Emblem of Frost -SET @SfShard := 50274; -- Shadowfrost Shard -SET @PriSar := 49908; -- Primordial Saronite --- Dug up the old references i created for UP34: -SET @Ref10J := 34329; -SET @Ref25J := 34251; -SET @RefJ10H := 34263; -SET @RefJ25H := 34275; --- Gunship_Armory10N_reference -DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref10J,@Ref25J,@RefJ10H,@RefJ25H); -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak -(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering -(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter -(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver -(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun -(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots -(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope -(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass -(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm -(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring -(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers -(@Ref10J,50796,0,1,1,1,1), -- Bracers of Pale Illumination --- Gunship_Armory25N_reference -(@Ref25J,50011,0,1,1,1,1), -- Gunship Captain's Mittens -(@Ref25J,50002,0,1,1,1,1), -- Polar Bear Claw Bracers -(@Ref25J,50006,0,1,1,1,1), -- Corp'rethar Ceremonial Crown -(@Ref25J,50010,0,1,1,1,1), -- Waistband of Righteous Fury -(@Ref25J,50003,0,1,1,1,1), -- Boneguard Commander's Pauldrons -(@Ref25J,50000,0,1,1,1,1), -- Scourge Hunter's Vambraces -(@Ref25J,50359,0,1,1,1,1), -- Althor's Abacus -(@Ref25J,50352,0,1,1,1,1), -- Corpse Tongue Coin -(@Ref25J,49999,0,1,1,1,1), -- Skeleton Lord's Circle -(@Ref25J,50009,0,1,1,1,1), -- Boots of Unnatural Growth -(@Ref25J,50008,0,1,1,1,1), -- Ring of Rapid Ascent -(@Ref25J,49998,0,1,1,1,1), -- Shadowvault Slayer's Cloak -(@Ref25J,50005,0,1,1,1,1), -- Amulet of the Silent Eulogy -(@Ref25J,50411,0,1,1,1,1), -- Scourgeborne Waraxe -(@Ref25J,50001,0,1,1,1,1), -- Ikfirus's Sack of Wonder --- Gunship_Armory10H_reference -(@RefJ10H,51912,0,1,1,1,1), -- Saronite Gargoyle Cloak (heroic) -(@RefJ10H,51908,0,1,1,1,1), -- Cord of Dark Suffering (heroic) -(@RefJ10H,51909,0,1,1,1,1), -- Neverending Winter (heroic) -(@RefJ10H,51916,0,1,1,1,1), -- Frost Giant's Cleaver (heroic) -(@RefJ10H,51910,0,1,1,1,1), -- Midnight Sun (heroic) -(@RefJ10H,51915,0,1,1,1,1), -- Bone Drake's Enameled Boots (heroic) -(@RefJ10H,51911,0,1,1,1,1), -- Pauldrons of Lost Hope (heroic) -(@RefJ10H,50345,0,1,1,1,1), -- Muradin's Spyglass (heroic) -(@RefJ10H,51906,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm (heroic) -(@RefJ10H,51913,0,1,1,1,1), -- Abomination's Bloody Ring (heroic) -(@RefJ10H,51914,0,1,1,1,1), -- Icecrown Rampart Bracers (heroic) -(@RefJ10H,51907,0,1,1,1,1), -- Bracers of Pale Illumination (heroic) --- Gunship_Armory25H_reference -(@RefJ25H,50663,0,1,1,1,1), -- Gunship Captain's Mittens (heroic) -(@RefJ25H,50659,0,1,1,1,1), -- Polar Bear Claw Bracers (heroic) -(@RefJ25H,50661,0,1,1,1,1), -- Corp'rethar Ceremonial Crown (heroic) -(@RefJ25H,50667,0,1,1,1,1), -- Waistband of Righteous Fury (heroic) -(@RefJ25H,50660,0,1,1,1,1), -- Boneguard Commander's Pauldrons (heroic) -(@RefJ25H,50655,0,1,1,1,1), -- Scourge Hunter's Vambraces (heroic) -(@RefJ25H,50366,0,1,1,1,1), -- Althor's Abacus (heroic) -(@RefJ25H,50349,0,1,1,1,1), -- Corpse Tongue Coin (heroic) -(@RefJ25H,50657,0,1,1,1,1), -- Skeleton Lord's Circle (heroic) -(@RefJ25H,50665,0,1,1,1,1), -- Boots of Unnatural Growth (heroic) -(@RefJ25H,50664,0,1,1,1,1), -- Ring of Rapid Ascent (heroic) -(@RefJ25H,50653,0,1,1,1,1), -- Shadowvault Slayer's Cloak (heroic) -(@RefJ25H,50658,0,1,1,1,1), -- Amulet of the Silent Eulogy (heroic) -(@RefJ25H,50654,0,1,1,1,1), -- Scourgeborne Waraxe (heroic) -(@RefJ25H,50656,0,1,1,1,1); -- Ikfirus's Sack of Wonder (heroic) --- Bind the refs to the objects -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Gunship10N,@Gunship10H,@Gunship25N,@Gunship25H); -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Gunship10N -(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N -(@Gunship10N,1,100,1,0,-@Ref10J,2), -- 2 from reference 10Normal --- Gunship25N -(@Gunship25N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25N -(@Gunship25N,1,100,1,0,-@Ref25J,2), -- 3 from reference 25Normal -(@Gunship25N,@SfShard,-35,1,0,1,1), -- Shadowfrost Shard @ 38% chance -(@Gunship25N,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 10% chance --- Gunship10H -(@Gunship10H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10H -(@Gunship10H,1,100,1,0,-@RefJ10H,2), -- 2 from reference 10Heroic -(@Gunship10H,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 38% chance --- Gunship25H -(@Gunship25H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25H -(@Gunship25H,1,100,1,0,-@RefJ25H,2), -- 3 from reference 25Heroic -(@Gunship25H,@SfShard,-75,1,0,1,1), -- Shadowfrost Shard @ 75% chance -(@Gunship25H,@PriSar,50,1,0,1,1); -- Primordial Saronite @ 50% chance diff --git a/sql/updates/world/2012_05_19_03_world_version.sql b/sql/updates/world/2012_05_19_03_world_version.sql new file mode 100644 index 00000000000..53c6821be69 --- /dev/null +++ b/sql/updates/world/2012_05_19_03_world_version.sql @@ -0,0 +1 @@ +UPDATE `version` SET `db_version`='TDB 335.11.47' LIMIT 1; diff --git a/sql/updates/world/2012_05_19_04_creature_loot_template.sql b/sql/updates/world/2012_05_19_04_creature_loot_template.sql new file mode 100644 index 00000000000..ae996e01956 --- /dev/null +++ b/sql/updates/world/2012_05_19_04_creature_loot_template.sql @@ -0,0 +1 @@ +DELETE FROM `creature_loot_template` WHERE `entry`=31813 AND `item`=36912; -- Saronite Ore diff --git a/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql new file mode 100644 index 00000000000..f95cb45efe4 --- /dev/null +++ b/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql @@ -0,0 +1,93 @@ +-- Set Variables +SET @Gunship10N := 28057; -- Data1 for 201872 & 202177 +SET @Gunship10H := 28045; -- Data1 for 201873 & 202178 +SET @Gunship25N := 28072; -- Data1 for 201874 & 202179 +SET @Gunship25H := 28090; -- Data1 for 201875 & 202180 +SET @emblem := 49426; -- Emblem of Frost +SET @SfShard := 50274; -- Shadowfrost Shard +SET @PriSar := 49908; -- Primordial Saronite +-- Dug up the old references i created for UP34: +SET @Ref10J := 34329; +SET @Ref25J := 34251; +SET @RefJ10H := 34263; +SET @RefJ25H := 34275; +-- Gunship_Armory10N_reference +DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref10J,@Ref25J,@RefJ10H,@RefJ25H); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak +(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering +(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter +(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver +(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun +(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots +(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope +(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass +(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm +(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring +(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers +(@Ref10J,50796,0,1,1,1,1), -- Bracers of Pale Illumination +-- Gunship_Armory25N_reference +(@Ref25J,50011,0,1,1,1,1), -- Gunship Captain's Mittens +(@Ref25J,50002,0,1,1,1,1), -- Polar Bear Claw Bracers +(@Ref25J,50006,0,1,1,1,1), -- Corp'rethar Ceremonial Crown +(@Ref25J,50010,0,1,1,1,1), -- Waistband of Righteous Fury +(@Ref25J,50003,0,1,1,1,1), -- Boneguard Commander's Pauldrons +(@Ref25J,50000,0,1,1,1,1), -- Scourge Hunter's Vambraces +(@Ref25J,50359,0,1,1,1,1), -- Althor's Abacus +(@Ref25J,50352,0,1,1,1,1), -- Corpse Tongue Coin +(@Ref25J,49999,0,1,1,1,1), -- Skeleton Lord's Circle +(@Ref25J,50009,0,1,1,1,1), -- Boots of Unnatural Growth +(@Ref25J,50008,0,1,1,1,1), -- Ring of Rapid Ascent +(@Ref25J,49998,0,1,1,1,1), -- Shadowvault Slayer's Cloak +(@Ref25J,50005,0,1,1,1,1), -- Amulet of the Silent Eulogy +(@Ref25J,50411,0,1,1,1,1), -- Scourgeborne Waraxe +(@Ref25J,50001,0,1,1,1,1), -- Ikfirus's Sack of Wonder +-- Gunship_Armory10H_reference +(@RefJ10H,51912,0,1,1,1,1), -- Saronite Gargoyle Cloak (heroic) +(@RefJ10H,51908,0,1,1,1,1), -- Cord of Dark Suffering (heroic) +(@RefJ10H,51909,0,1,1,1,1), -- Neverending Winter (heroic) +(@RefJ10H,51916,0,1,1,1,1), -- Frost Giant's Cleaver (heroic) +(@RefJ10H,51910,0,1,1,1,1), -- Midnight Sun (heroic) +(@RefJ10H,51915,0,1,1,1,1), -- Bone Drake's Enameled Boots (heroic) +(@RefJ10H,51911,0,1,1,1,1), -- Pauldrons of Lost Hope (heroic) +(@RefJ10H,50345,0,1,1,1,1), -- Muradin's Spyglass (heroic) +(@RefJ10H,51906,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm (heroic) +(@RefJ10H,51913,0,1,1,1,1), -- Abomination's Bloody Ring (heroic) +(@RefJ10H,51914,0,1,1,1,1), -- Icecrown Rampart Bracers (heroic) +(@RefJ10H,51907,0,1,1,1,1), -- Bracers of Pale Illumination (heroic) +-- Gunship_Armory25H_reference +(@RefJ25H,50663,0,1,1,1,1), -- Gunship Captain's Mittens (heroic) +(@RefJ25H,50659,0,1,1,1,1), -- Polar Bear Claw Bracers (heroic) +(@RefJ25H,50661,0,1,1,1,1), -- Corp'rethar Ceremonial Crown (heroic) +(@RefJ25H,50667,0,1,1,1,1), -- Waistband of Righteous Fury (heroic) +(@RefJ25H,50660,0,1,1,1,1), -- Boneguard Commander's Pauldrons (heroic) +(@RefJ25H,50655,0,1,1,1,1), -- Scourge Hunter's Vambraces (heroic) +(@RefJ25H,50366,0,1,1,1,1), -- Althor's Abacus (heroic) +(@RefJ25H,50349,0,1,1,1,1), -- Corpse Tongue Coin (heroic) +(@RefJ25H,50657,0,1,1,1,1), -- Skeleton Lord's Circle (heroic) +(@RefJ25H,50665,0,1,1,1,1), -- Boots of Unnatural Growth (heroic) +(@RefJ25H,50664,0,1,1,1,1), -- Ring of Rapid Ascent (heroic) +(@RefJ25H,50653,0,1,1,1,1), -- Shadowvault Slayer's Cloak (heroic) +(@RefJ25H,50658,0,1,1,1,1), -- Amulet of the Silent Eulogy (heroic) +(@RefJ25H,50654,0,1,1,1,1), -- Scourgeborne Waraxe (heroic) +(@RefJ25H,50656,0,1,1,1,1); -- Ikfirus's Sack of Wonder (heroic) +-- Bind the refs to the objects +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Gunship10N,@Gunship10H,@Gunship25N,@Gunship25H); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Gunship10N +(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N +(@Gunship10N,1,100,1,0,-@Ref10J,2), -- 2 from reference 10Normal +-- Gunship25N +(@Gunship25N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25N +(@Gunship25N,1,100,1,0,-@Ref25J,2), -- 3 from reference 25Normal +(@Gunship25N,@SfShard,-35,1,0,1,1), -- Shadowfrost Shard @ 38% chance +(@Gunship25N,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 10% chance +-- Gunship10H +(@Gunship10H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10H +(@Gunship10H,1,100,1,0,-@RefJ10H,2), -- 2 from reference 10Heroic +(@Gunship10H,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 38% chance +-- Gunship25H +(@Gunship25H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25H +(@Gunship25H,1,100,1,0,-@RefJ25H,2), -- 3 from reference 25Heroic +(@Gunship25H,@SfShard,-75,1,0,1,1), -- Shadowfrost Shard @ 75% chance +(@Gunship25H,@PriSar,50,1,0,1,1); -- Primordial Saronite @ 50% chance -- cgit v1.2.3 From 0dd97dfcb62d91ed132789532623f5c2f164a608 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 19 May 2012 23:23:16 +0200 Subject: DB/Loot: fix the last startups related to loot. this should be all... --- .../world/2012_05_19_06_gameobject_loot_template.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sql/updates/world/2012_05_19_06_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql new file mode 100644 index 00000000000..f5d496b465b --- /dev/null +++ b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql @@ -0,0 +1,13 @@ +DELETE FROM `reference_loot_template` WHERE `entry`=34172; +DELETE FROM `creature_loot_template` WHERE `entry`=38013; +DELETE FROM `gameobject_loot_template` WHERE `entry=28683 +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(28683,35498,3,1,0,1,1), -- Formula: Enchant Weapon - Deathfrost +(28683,35557,28,1,0,1,2), -- Huge Snowball +(28683,35720,3,1,0,5,6), -- Lord of Frost's Private Label +(28683,35723,12,1,0,1,1), -- Shards of Ahune +(28683,54801,0,1,1,1,1), -- Icebound Cloak +(28683,54802,0,1,1,1,1), -- The Frost Lord's War Cloak +(28683,54803,0,1,1,1,1), -- The Frost Lord's Battle Shroud +(28683,54804,0,1,1,1,1), -- Shroud of Winter's Chill +(28683,54805,0,1,1,1,1); -- Cloak of the Frigid Winds -- cgit v1.2.3 From 2f1f2044afd9b81e7258248c86075b8d355563bc Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 19 May 2012 23:29:08 +0200 Subject: DB/Commit: bio is an idiot that forgot a ; and a ` dont tell click! --- sql/updates/world/2012_05_19_06_gameobject_loot_template.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql index f5d496b465b..9b2dcbb9363 100644 --- a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql +++ b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql @@ -1,6 +1,6 @@ DELETE FROM `reference_loot_template` WHERE `entry`=34172; DELETE FROM `creature_loot_template` WHERE `entry`=38013; -DELETE FROM `gameobject_loot_template` WHERE `entry=28683 +DELETE FROM `gameobject_loot_template` WHERE `entry`=28683; INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES (28683,35498,3,1,0,1,1), -- Formula: Enchant Weapon - Deathfrost (28683,35557,28,1,0,1,2), -- Huge Snowball -- cgit v1.2.3 From 85561f6a3f4b427f5ddcb4d0f2f4f68dbd3928f3 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 20 May 2012 14:26:17 +0100 Subject: DB: Rename .modify rep to .modify reputation (commands table) and fix a possible database startup error with conditions --- sql/updates/world/2012_05_20_00_world_misc.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sql/updates/world/2012_05_20_00_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_20_00_world_misc.sql b/sql/updates/world/2012_05_20_00_world_misc.sql new file mode 100644 index 00000000000..5b96f9881d6 --- /dev/null +++ b/sql/updates/world/2012_05_20_00_world_misc.sql @@ -0,0 +1,16 @@ +-- Update mod rep command name +UPDATE `command` SET + `name` = 'modify reputation', + `help` = 'Syntax: .modify reputation #repId (#repvalue | $rankname [#delta])\nSets the selected players reputation with faction #repId to #repvalue or to $reprank.\nIf the reputation rank name is provided, the resulting reputation will be the lowest reputation for that rank plus the delta amount, if specified.\nYou can use \'.pinfo rep\' to list all known reputation ids, or use \'.lookup faction $name\' to locate a specific faction id.' +WHERE `name` = 'modify rep'; + +-- Fix "2012-05-20 06:46:00 ERROR: SourceEntry 52264 in `condition` table, has incorrect SourceGroup 0 (spell effectMask) set , ignoring." +UPDATE `conditions` SET + `SourceGroup` = 1, + `SourceId` = 0 +WHERE + `SourceTypeOrReferenceId` = 13 AND + `SourceEntry` = 52264 AND + `ConditionTypeOrReference` = 29 AND + `ConditionValue1` = 28653 AND + `ConditionValue2` = 5; -- cgit v1.2.3 From a2d2732c03df73bcd8c8a6c935c099afaae7212c Mon Sep 17 00:00:00 2001 From: faq_ Date: Sun, 20 May 2012 17:16:03 +0100 Subject: DB/Spells: Lay on Hands shouldn't scale with spell power --- sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql b/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql new file mode 100644 index 00000000000..7603f7dd938 --- /dev/null +++ b/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql @@ -0,0 +1,2 @@ +DELETE FROM `spell_bonus_data` WHERE `entry`=633; +INSERT INTO `spell_bonus_data` (`entry`,`comments`) VALUES (633,'Paladin - Lay on Hands'); -- cgit v1.2.3 From 4943eb4391a8314efd58e2966f48f476a1e0ac12 Mon Sep 17 00:00:00 2001 From: Kandera Date: Tue, 22 May 2012 09:18:35 -0400 Subject: DB/Spells: fixes proc flags for blood presence. sorry :[ Closes #6564 --- sql/updates/world/2012_05_22_00_world_spell_proc_event.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_05_22_00_world_spell_proc_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql b/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql new file mode 100644 index 00000000000..ba2ea83f643 --- /dev/null +++ b/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql @@ -0,0 +1 @@ +UPDATE `spell_proc_event` SET `procFlags` = 332116 WHERE `entry` = 63611; -- cgit v1.2.3 From 83c8c974de0807c732a92f6bc33bcdeae610b5a6 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Tue, 22 May 2012 19:13:38 +0200 Subject: DB/Loot: make Formula: Enchant Boots - Surefooted a garanteed drop Closes #6579 --- sql/updates/world/2012_05_22_01_world_creature_loot_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_22_01_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql b/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql new file mode 100644 index 00000000000..bcae5be9ae1 --- /dev/null +++ b/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql @@ -0,0 +1,2 @@ +-- As of patch 3.1.0, the drop rate of Formula: Enchant Boots - Surefooted has been increased to Guaranteed (100%). +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=100 WHERE `entry`=16472 and `item`=22545; -- cgit v1.2.3 From c8e00ddfc5cdce68a1d12b227a39da9ea6900810 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 23 May 2012 09:12:31 +0200 Subject: DB/Creature: Add spawns for Chicken Escapee & set their aura accordingly (sniffs) --- sql/updates/world/2012_05_23_00_world_creature.sql | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 sql/updates/world/2012_05_23_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_23_00_world_creature.sql b/sql/updates/world/2012_05_23_00_world_creature.sql new file mode 100644 index 00000000000..8a965b7fdfe --- /dev/null +++ b/sql/updates/world/2012_05_23_00_world_creature.sql @@ -0,0 +1,55 @@ +-- Chicken Spawns from sniff: +SET @Chicken := 28161; +SET @CGUID := 88570; +DELETE FROM `creature` WHERE `id`=@Chicken; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES +(@CGUID,@Chicken,571,1,1,5199.809,4704.83,-128.2989,1.70125,120,0,0), -- Chicken Escapee +(@CGUID+1,@Chicken,571,1,1,5201.715,4702.484,-127.8371,1.53589,120,0,0), -- Chicken Escapee +(@CGUID+2,@Chicken,571,1,1,5198.132,4702.78,-127.5534,1.797689,120,0,0), -- Chicken Escapee +(@CGUID+3,@Chicken,571,1,1,5198.32,4704.375,-127.9992,1.064651,120,0,0), -- Chicken Escapee +(@CGUID+4,@Chicken,571,1,1,5201.744,4704.674,-128.4752,4.555309,120,0,0), -- Chicken Escapee +(@CGUID+5,@Chicken,571,1,1,5251.442,4508.976,-85.30431,4.304774,120,0,0), -- Chicken Escapee +(@CGUID+6,@Chicken,571,1,1,5251.708,4511.778,-85.32935,1.64061,120,0,0), -- Chicken Escapee +(@CGUID+7,@Chicken,571,1,1,5251.118,4509.744,-85.32935,4.886922,120,0,0), -- Chicken Escapee +(@CGUID+8,@Chicken,571,1,1,5252.795,4509.772,-85.32524,0.7853982,120,0,0), -- Chicken Escapee +(@CGUID+9,@Chicken,571,1,1,5253.682,4511.424,-85.32755,2.356194,120,0,0), -- Chicken Escapee +(@CGUID+10,@Chicken,571,1,1,5254.174,4514.632,-84.96572,0.4096795,120,0,0), -- Chicken Escapee +(@CGUID+11,@Chicken,571,1,1,5252.096,4514.868,-85.32635,4.363323,120,0,0), -- Chicken Escapee +(@CGUID+12,@Chicken,571,1,1,5251.637,4513.41,-85.32935,3.490659,120,0,0), -- Chicken Escapee +(@CGUID+13,@Chicken,571,1,1,5253.287,4513.109,-85.32935,3.036873,120,0,0), -- Chicken Escapee +(@CGUID+14,@Chicken,571,1,1,5253.494,4514.764,-85.31329,3.717551,120,0,0), -- Chicken Escapee +(@CGUID+15,@Chicken,571,1,1,5251.158,4518.321,-85.3019,1.592369,120,0,0), -- Chicken Escapee +(@CGUID+16,@Chicken,571,1,1,5250.385,4516.643,-85.3257,5.044002,120,0,0), -- Chicken Escapee +(@CGUID+17,@Chicken,571,1,1,5251.159,4515.294,-85.32935,4.694936,120,0,0), -- Chicken Escapee +(@CGUID+18,@Chicken,571,1,1,5252.267,4516.414,-85.30904,0.5235988,120,0,0), -- Chicken Escapee +(@CGUID+19,@Chicken,571,1,1,5251.693,4517.859,-85.3243,4.590216,120,0,0), -- Chicken Escapee +(@CGUID+20,@Chicken,571,1,1,5262.68,4528.738,-84.4747,4.718389,120,0,0), -- Chicken Escapee +(@CGUID+21,@Chicken,571,1,1,5256.907,4480.617,-84.26879,4.927223,120,0,0), -- Chicken Escapee +(@CGUID+22,@Chicken,571,1,1,5298.603,4489.708,-93.65161,6.16371,120,0,0), -- Chicken Escapee +(@CGUID+23,@Chicken,571,1,1,5192.673,4513.661,-89.12463,1.299241,120,0,0), -- Chicken Escapee +(@CGUID+24,@Chicken,571,1,1,5228.781,4579.799,-96.98647,0.05766594,120,0,0), -- Chicken Escapee +(@CGUID+25,@Chicken,571,1,1,5230.247,4433.143,-96.82567,5.135688,120,0,0), -- Chicken Escapee +(@CGUID+26,@Chicken,571,1,1,5180.035,4541.38,-97.84879,0.2208638,120,0,0), -- Chicken Escapee +(@CGUID+27,@Chicken,571,1,1,5178.563,4538.964,-97.54511,0.9771074,120,0,0), -- Chicken Escapee +(@CGUID+28,@Chicken,571,1,1,5272.981,4417.033,-96.50356,0.9044432,120,0,0), -- Chicken Escapee +(@CGUID+29,@Chicken,571,1,1,5214.513,4416.202,-96.53072,2.862281,120,0,0), -- Chicken Escapee +(@CGUID+30,@Chicken,571,1,1,5160.117,4474.996,-96.96887,4.499754,120,0,0), -- Chicken Escapee +(@CGUID+31,@Chicken,571,1,1,5263.541,4409.121,-95.87889,1.570796,120,0,0), -- Chicken Escapee +(@CGUID+32,@Chicken,571,1,1,5234.166,4404.604,-95.12725,1.031549,120,0,0), -- Chicken Escapee +(@CGUID+33,@Chicken,571,1,1,5297.803,4493.681,-93.65161,5.525303,120,0,0), -- Chicken Escapee +(@CGUID+34,@Chicken,571,1,1,5260.112,4340.577,-97.61092,1.942801,120,0,0), -- Chicken Escapee +(@CGUID+35,@Chicken,571,1,1,5208.492,4379.111,-95.49483,0.6675518,120,0,0), -- Chicken Escapee +(@CGUID+36,@Chicken,571,1,1,5172.742,4368.674,-96.27965,0.8766832,120,0,0), -- Chicken Escapee +(@CGUID+37,@Chicken,571,1,1,5223.491,4467.19,-96.75621,4.723376,120,0,0), -- Chicken Escapee +(@CGUID+38,@Chicken,571,1,1,5220.966,4469.76,-96.75582,5.183968,120,0,0), -- Chicken Escapee +(@CGUID+39,@Chicken,571,1,1,5221.419,4473.14,-96.75536,4.98181,120,0,0), -- Chicken Escapee +(@CGUID+40,@Chicken,571,1,1,5221.419,4473.14,-96.75536,5.49084,120,0,0), -- Chicken Escapee +(@CGUID+41,@Chicken,571,1,1,5221.828,4470.711,-96.57594,5.315169,120,0,0), -- Chicken Escapee +(@CGUID+42,@Chicken,571,1,1,5151.083,4416.434,-96.38642,2.066685,120,0,0), -- Chicken Escapee +(@CGUID+43,@Chicken,571,1,1,5281.582,4425.185,-96.79945,4.45059,120,0,0), -- Chicken Escapee +(@CGUID+44,@Chicken,571,1,1,5257.173,4424.231,-95.62836,3.996804,120,0,0); -- Chicken Escapee + +-- Aura for Chicken Escapee (thx Discovered) +DELETE FROM `creature_template_addon` WHERE `entry`=28161; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(28161,0,0,0,0,'50734'); -- Chicken Escapee - Frenzyheart Chicken: Invisibility -- cgit v1.2.3 From e974cff1e6d755d82f14040b69d717005bbf9740 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 23 May 2012 09:25:02 +0200 Subject: DB/SAI: add SAI for Elder Harkek & remove the ugly spawning via quest_start_scripts major kudos for Discovered on the SAI part of the fix --- sql/updates/world/2012_05_23_01_world_sai.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 sql/updates/world/2012_05_23_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_23_01_world_sai.sql b/sql/updates/world/2012_05_23_01_world_sai.sql new file mode 100644 index 00000000000..af2fd5409d1 --- /dev/null +++ b/sql/updates/world/2012_05_23_01_world_sai.sql @@ -0,0 +1,14 @@ +-- Delete all spawnings of Chicken Escapee via quest_start_scripts +DELETE FROM `quest_start_scripts` WHERE `command`=10 AND `datalong`=28161; + +-- Elder Harkek SAI +SET @ENTRY := 28138; +SET @SPELL_SEE_INVIS_CHICKEN := 50735; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@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,19,0,100,0,12532,0,0,0,85,@SPELL_SEE_INVIS_CHICKEN,2,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Accept - Invoker Cast Frenzyheart Chicken: See Invisibility"), +(@ENTRY,0,1,0,19,0,100,0,12702,0,0,0,85,@SPELL_SEE_INVIS_CHICKEN,2,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Accept - Invoker Cast Frenzyheart Chicken: See Invisibility"), +(@ENTRY,0,2,0,20,0,100,0,12532,0,0,0,28,@SPELL_SEE_INVIS_CHICKEN,0,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Complete - Remove Aura Frenzyheart Chicken: See Invisibility"), +(@ENTRY,0,3,0,20,0,100,0,12702,0,0,0,28,@SPELL_SEE_INVIS_CHICKEN,0,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Complete - Remove Aura Frenzyheart Chicken: See Invisibility"); -- cgit v1.2.3 From f4c8f6ed7321aadb3ce3372064f63f6f4e51adfa Mon Sep 17 00:00:00 2001 From: Discovered Date: Wed, 23 May 2012 11:28:50 +0200 Subject: DB/SAI: Add SAI for the Chicken Escapee --- sql/updates/world/2012_05_23_02_world_sai.sql | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 sql/updates/world/2012_05_23_02_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_23_02_world_sai.sql b/sql/updates/world/2012_05_23_02_world_sai.sql new file mode 100644 index 00000000000..588f25f1568 --- /dev/null +++ b/sql/updates/world/2012_05_23_02_world_sai.sql @@ -0,0 +1,21 @@ +-- Chicken Escapee SAI +SET @ENTRY := 28161; +SET @SPELL_NET_CHICKEN := 51959; +SET @SPELL_INVIS_CHICKEN := 50734; +SET @SPELL_SCARED_CHICKEN := 51846; +SET @SPELL_CREATE_QUESTITEM := 51037; +UPDATE `creature` SET `MovementType`=0,`spawndist`=0,`spawntimesecs`=5 WHERE `id`=@ENTRY; +UPDATE `creature_template` SET `AIName`='SmartAI',`npcflag`=1 WHERE `entry`=@ENTRY; +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@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,1,8,0,100,0,@SPELL_NET_CHICKEN,0,0,0,28,@SPELL_SCARED_CHICKEN,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Spellhit - Remove Aura Scared Chicken"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,41,4000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Spellhit - Forced Despawn"), +(@ENTRY,0,2,3,64,0,100,0,0,0,0,0,85,@SPELL_CREATE_QUESTITEM,2,0,0,0,0,7,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Invoker Cast Capture Chicken Escapee"), -- Triggered because of cast-time +(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Close Gossip"), +(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Set Npcflag None"), +(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,28,@SPELL_SCARED_CHICKEN,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Remove Aura Scared Chicken"), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,41,500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Forced Despawn"), +(@ENTRY,0,7,8,25,0,100,0,0,0,0,0,11,@SPELL_INVIS_CHICKEN,1,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Reset - Cast Frenzyheart Chicken: Invisibility"), -- Just in case +(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,11,@SPELL_SCARED_CHICKEN,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Reset - Cast Scared Chicken"); -- cgit v1.2.3 From 23641d8c7a9d5065d3a3c5ee0e6e4624bc8905fd Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 23 May 2012 14:38:28 +0200 Subject: DB/Loot: Add loot for Reinforced Fel Iron Chest (heroic) (thx xanvial for initial work) Closes #5675 --- ...012_05_23_03_world_gameobject_loot_template.sql | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql b/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..22ecebcae31 --- /dev/null +++ b/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql @@ -0,0 +1,32 @@ +SET @entry := 35093; +SET @epic := 25009; +SET @gem := @entry+1; +-- Create references +DELETE FROM `reference_loot_template` WHERE `entry` IN(@entry,@epic,@gem); +INSERT INTO `reference_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(@entry,27452,0,1,1,1,1), -- Light Scribe Bands +(@entry,27453,0,1,1,1,1), -- Averinn's RIng of Slaying +(@entry,27454,0,1,1,1,1), -- Volcanic Pauldrons +(@entry,27455,0,1,1,1,1), -- Irondrake faceguard +(@entry,27456,0,1,1,1,1), -- Raiments of Nature's Breath +(@entry,27457,0,1,1,1,1), -- Life Bearer's Gauntlets +(@entry,27458,0,1,1,1,1), -- Oceansong Kilt +(@entry,27459,0,1,1,1,1), -- Vambraces of Daring +(@entry,27460,0,1,1,1,1), -- Reavers' Ring +(@entry,27461,0,1,1,1,1), -- Chestguard of the Prowler +-- Epics +(@epic,29238,0,1,1,1,1), -- Lion's Heart Girdle +(@epic,29264,0,1,1,1,1), -- Tree-Mender's Belt +(@epic,29346,0,1,1,1,1), -- Feltooth Eviscerator +(@epic,32077,0,1,1,1,1), -- Wrath Infused Gauntlets +-- Gems +(@gem,30592,0,1,1,1,1), -- Steady Chrysoprase +(@gem,30593,0,1,1,1,1), -- Potent Fire Opal +(@gem,30594,0,1,1,1,1); -- Regal Chrysoprase +-- Assign loot to the chest +SET @GOloot := 21764; -- lootid of Reinforced Fel Iron Chest Heroic +DELETE FROM `gameobject_loot_template` WHERE `entry`=@GOloot; +INSERT INTO `gameobject_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(@GOloot,1,100,1,0,-@entry, 2), -- one from gear +(@GOloot,2,30,1,0,-@gem,1), -- one gem (30%) +(@GOloot,3,100,1,0,-@epic,1); -- one from epics -- cgit v1.2.3 From 05ddeb5c387eca3bf71eb1d650a16b0c6d6eda2e Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 23 May 2012 22:01:45 +0200 Subject: DB/Gameobject: Add spawn for Scarlet Onslaught Daily Orders: Beach Closes #1958 --- sql/updates/world/2012_05_23_04_world_gameobject.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_05_23_04_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_23_04_world_gameobject.sql b/sql/updates/world/2012_05_23_04_world_gameobject.sql new file mode 100644 index 00000000000..afcb1e89317 --- /dev/null +++ b/sql/updates/world/2012_05_23_04_world_gameobject.sql @@ -0,0 +1,3 @@ +DELETE FROM `gameobject` WHERE `id`=188677; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(318,188677,571,1,1,2567.449,-388.7118,3.573463,-2.879789,0,0,0.639778,0.76856,1200,100,1); -- cgit v1.2.3 From 741f3ac0e0742715a3abe96b5f18d8e2865a77a7 Mon Sep 17 00:00:00 2001 From: Svannon Date: Wed, 23 May 2012 22:06:53 +0200 Subject: DB/Creature: add spawn for Aponi Brightmane Closes #2383 --- sql/updates/world/2012_05_23_05_world_creature.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sql/updates/world/2012_05_23_05_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_23_05_world_creature.sql b/sql/updates/world/2012_05_23_05_world_creature.sql new file mode 100644 index 00000000000..bb162f927bd --- /dev/null +++ b/sql/updates/world/2012_05_23_05_world_creature.sql @@ -0,0 +1,12 @@ +-- Spawn from Sniff +DELETE FROM `creature` WHERE `id`=34526; +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 +(42161,34526,1,1,1,0,0,-1050.052,-286.7274,159.1137,5.951573,120,0,0,1,0,0,0,0,0); +-- Template updates +UPDATE `creature_template` SET `faction_A`=104,`faction_H`=104,`baseattacktime`=2000,`npcflag`=`npcflag`|3,`unit_flags`=`unit_flags`|512 WHERE `entry`=34526; -- Aponi Brightmane +-- Model data +UPDATE `creature_model_info` SET `bounding_radius`=1.003375,`combat_reach`=4.3125,`gender`=1 WHERE `modelid`=29249; -- Aponi Brightmane +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry`=34526; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(34526,0,1,256,0,NULL); -- Aponi Brightmane -- cgit v1.2.3 From b114f3be1b7ca71e8b81ba48fde48823fc5f5259 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 24 May 2012 10:33:30 -0400 Subject: DB/Misc: fix update sql file name. --- sql/updates/world/2012_04_05_00_world_creature_misc.sql | 5 ----- sql/updates/world/2012_05_24_00_world_creature_misc.sql | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 sql/updates/world/2012_04_05_00_world_creature_misc.sql create mode 100644 sql/updates/world/2012_05_24_00_world_creature_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_04_05_00_world_creature_misc.sql b/sql/updates/world/2012_04_05_00_world_creature_misc.sql deleted file mode 100644 index ae35b3fba5d..00000000000 --- a/sql/updates/world/2012_04_05_00_world_creature_misc.sql +++ /dev/null @@ -1,5 +0,0 @@ -UPDATE `creature_template` SET `faction_A`=1914,`faction_H`=1914,`unit_flags`=33024 WHERE `entry`=26452; - -DELETE FROM `creature_template_addon` WHERE `entry`=26452; -INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(26452,0,0,0,1,383,''); diff --git a/sql/updates/world/2012_05_24_00_world_creature_misc.sql b/sql/updates/world/2012_05_24_00_world_creature_misc.sql new file mode 100644 index 00000000000..ae35b3fba5d --- /dev/null +++ b/sql/updates/world/2012_05_24_00_world_creature_misc.sql @@ -0,0 +1,5 @@ +UPDATE `creature_template` SET `faction_A`=1914,`faction_H`=1914,`unit_flags`=33024 WHERE `entry`=26452; + +DELETE FROM `creature_template_addon` WHERE `entry`=26452; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(26452,0,0,0,1,383,''); -- cgit v1.2.3 From 8e4b6934c3d7736be4ea6517ed7830cdde163545 Mon Sep 17 00:00:00 2001 From: Svannon Date: Thu, 24 May 2012 17:33:47 +0200 Subject: DB/Gameobject: Spawn Book The Betrayer Ascendant Closes #2517 --- sql/updates/world/2012_05_24_01_world_gameobject.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_05_24_01_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_24_01_world_gameobject.sql b/sql/updates/world/2012_05_24_01_world_gameobject.sql new file mode 100644 index 00000000000..32bbc15494f --- /dev/null +++ b/sql/updates/world/2012_05_24_01_world_gameobject.sql @@ -0,0 +1,3 @@ +DELETE FROM `gameobject` WHERE `id`=175759 AND `guid`=219; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(219,175759,530,1,1,9636.439,-7231.265,16.73347,-2.82743,0,0,-0.9876881,0.1564362,900,100,1); -- cgit v1.2.3 From eb08c4d4b4a35a178f6368ed4a4388f74d3cc04e Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 25 May 2012 23:25:47 -0230 Subject: DB/SAI: Visual addition to Pit of Saron --- sql/updates/world/2012_05_25_00_world_sai.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_05_25_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_25_00_world_sai.sql b/sql/updates/world/2012_05_25_00_world_sai.sql new file mode 100644 index 00000000000..fa5682db02f --- /dev/null +++ b/sql/updates/world/2012_05_25_00_world_sai.sql @@ -0,0 +1,6 @@ +-- Eye of the Lich King SAI +SET @ENTRY := 36913; -- NPC entry +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,6,0,0,1000,1000,66,0,0,0,0,0,0,21,150,0,0,0,0,0,0, 'Eye of the Lich King - OOC - face closest player'); -- cgit v1.2.3 From 60a164578b2f75a54d68759d1859fb1f9eedfd11 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 25 May 2012 23:34:58 -0230 Subject: DB/Waypoints: Some waypoint additions for Outlands/Blades edge --- .../world/2012_05_25_01_world_waypoints.sql | 149 +++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 sql/updates/world/2012_05_25_01_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_25_01_world_waypoints.sql b/sql/updates/world/2012_05_25_01_world_waypoints.sql new file mode 100644 index 00000000000..0d2c04bc6bc --- /dev/null +++ b/sql/updates/world/2012_05_25_01_world_waypoints.sql @@ -0,0 +1,149 @@ +-- Bladewing Bloodletter InhabitType fix +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=21033; + +-- Bladewing Bloodletter +SET @NPC := 73849; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=1987.838,`position_y`=6153.995,`position_z`=146.4068,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,1987.838,6153.995,146.4068,0,0,0,100,0), +(@PATH,2,1981.592,6150.557,146.4068,0,0,0,100,0), +(@PATH,3,1966.573,6153.941,146.4068,0,0,0,100,0), +(@PATH,4,1953.747,6155.154,146.4068,0,0,0,100,0), +(@PATH,5,1941.287,6159.015,146.4068,0,0,0,100,0), +(@PATH,6,1937.986,6166.096,146.4068,0,0,0,100,0), +(@PATH,7,1948.558,6175.274,145.1566,0,0,0,100,0), +(@PATH,8,1959.44,6173.246,145.6567,0,0,0,100,0), +(@PATH,9,1971.408,6169.729,145.7679,0,0,0,100,0), +(@PATH,10,1986.747,6168.348,144.8511,0,0,0,100,0), +(@PATH,11,1998.881,6168.547,144.4066,0,0,0,100,0), +(@PATH,12,2008.877,6170.33,143.7955,0,0,0,100,0), +(@PATH,13,2021.965,6166.769,143.657,0,0,0,100,0), +(@PATH,14,2027.152,6158.083,145.4344,0,0,0,100,0), +(@PATH,15,2025.352,6149.427,146.4068,0,0,0,100,0), +(@PATH,16,2011.869,6150.37,146.4068,0,0,0,100,0), +(@PATH,17,1999.44,6155.886,146.4068,0,0,0,100,0); + +-- Bladewing Bloodletter +SET @NPC := 73850; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=2099.588,`position_y`=6126.344,`position_z`=148.8029,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,2099.588,6126.344,148.8029,0,0,0,100,0), +(@PATH,2,2094.131,6133.031,148.303,0,0,0,100,0), +(@PATH,3,2085.703,6143.32,148.303,0,0,0,100,0), +(@PATH,4,2077.25,6154.094,148.5252,0,0,0,100,0), +(@PATH,5,2062.893,6175.25,146.414,0,0,0,100,0), +(@PATH,6,2056.135,6184.647,144.8307,0,0,0,100,0), +(@PATH,7,2050.784,6189.019,141.9417,0,0,0,100,0), +(@PATH,8,2044,6181.015,142.6362,0,0,0,100,0), +(@PATH,9,2044.303,6175.524,143.3028,0,0,0,100,0), +(@PATH,10,2053.432,6161.702,145.8306,0,0,0,100,0), +(@PATH,11,2064.378,6145.299,146.7471,0,0,0,100,0), +(@PATH,12,2064.748,6135.614,147.7195,0,0,0,100,0), +(@PATH,13,2067.337,6117.838,149.0529,0,0,0,100,0), +(@PATH,14,2073.338,6100.975,149.664,0,0,0,100,0), +(@PATH,15,2089.383,6099.217,149.3585,0,0,0,100,0), +(@PATH,16,2099.147,6111.964,149.1641,0,0,0,100,0); + +-- Bladewing Bloodletter +SET @NPC := 73852; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=2180.795,`position_y`=6149.398,`position_z`=145.9554,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,2180.795,6149.398,145.9554,0,0,0,100,0), +(@PATH,2,2185.298,6157.3,146.8721,0,0,0,100,0), +(@PATH,3,2191.635,6164.935,146.6221,0,0,0,100,0), +(@PATH,4,2203.45,6168.873,146.2055,0,0,0,100,0), +(@PATH,5,2217.238,6165.062,145.6221,0,0,0,100,0), +(@PATH,6,2225.425,6159.092,145.1501,0,0,0,100,0), +(@PATH,7,2228.766,6146.569,145.3166,0,0,0,100,0), +(@PATH,8,2225.81,6129.76,143.9,0,0,0,100,0), +(@PATH,9,2203.906,6114.964,145.0111,0,0,0,100,0), +(@PATH,10,2184.713,6115.808,145.7333,0,0,0,100,0), +(@PATH,11,2173.165,6123,146.8721,0,0,0,100,0), +(@PATH,12,2175.542,6139.301,146.8721,0,0,0,100,0); + +-- Bladewing Bloodletter +SET @NPC := 73853; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=2153.506,`position_y`=6119.981,`position_z`=148.0267,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,2153.506,6119.981,148.0267,0,0,0,100,0), +(@PATH,2,2144.238,6124.169,148.0267,0,0,0,100,0), +(@PATH,3,2133.341,6127.807,148.0267,0,0,0,100,0), +(@PATH,4,2120.865,6126.57,148.0267,0,0,0,100,0), +(@PATH,5,2110.276,6122.198,148.0267,0,0,0,100,0), +(@PATH,6,2108.702,6111.856,148.0267,0,0,0,100,0), +(@PATH,7,2113.887,6104.159,148.0267,0,0,0,100,0), +(@PATH,8,2123.298,6095.088,148.0267,0,0,0,100,0), +(@PATH,9,2136.37,6099.125,148.0267,0,0,0,100,0), +(@PATH,10,2146.343,6107.208,148.0267,0,0,0,100,0), +(@PATH,11,2150.752,6118.491,148.0267,0,0,0,100,0), +(@PATH,12,2158.115,6126.979,148.0267,0,0,0,100,0), +(@PATH,13,2168.949,6133.578,148.0267,0,0,0,100,0), +(@PATH,14,2180.009,6134.229,148.0267,0,0,0,100,0), +(@PATH,15,2189.201,6129.583,148.0267,0,0,0,100,0), +(@PATH,16,2192.429,6119.862,148.0267,0,0,0,100,0), +(@PATH,17,2187.044,6112.755,148.0267,0,0,0,100,0), +(@PATH,18,2176.445,6111.443,148.0267,0,0,0,100,0), +(@PATH,19,2166.243,6114.129,148.0267,0,0,0,100,0); + +-- Bladewing Bloodletter +SET @NPC := 73858; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=2128.704,`position_y`=6018.743,`position_z`=141.9579,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,2128.704,6018.743,141.9579,0,0,0,100,0), +(@PATH,2,2118.804,6016.506,141.9433,0,0,0,100,0), +(@PATH,3,2100.692,6019.814,141.9433,0,0,0,100,0), +(@PATH,4,2080.599,6017.728,144.3877,0,0,0,100,0), +(@PATH,5,2070.564,6003.17,144.1802,0,0,0,100,0), +(@PATH,6,2079.148,5988.599,143.5968,0,0,0,100,0), +(@PATH,7,2088.214,5974.081,142.9579,0,0,0,100,0), +(@PATH,8,2102.427,5966.812,142.208,0,0,0,100,0), +(@PATH,9,2117.762,5969.647,141.9579,0,0,0,100,0), +(@PATH,10,2130.632,5977.25,141.9579,0,0,0,100,0), +(@PATH,11,2135.56,5993.264,141.9579,0,0,0,100,0), +(@PATH,12,2148.631,6003.11,141.1247,0,0,0,100,0), +(@PATH,13,2144.206,6017.48,141.9579,0,0,0,100,0); + +-- Bladewing Bloodletter +SET @NPC := 73860; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=1951.455,`position_y`=5919.516,`position_z`=140.4673,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,1951.455,5919.516,140.4673,0,0,0,100,0), +(@PATH,2,1953.539,5912.287,140.4179,0,0,0,100,0), +(@PATH,3,1955.967,5902.248,140.4179,0,0,0,100,0), +(@PATH,4,1947.568,5889.415,140.4179,0,0,0,100,0), +(@PATH,5,1938.332,5877.63,140.4179,0,0,0,100,0), +(@PATH,6,1946.422,5859.488,140.4179,0,0,0,100,0), +(@PATH,7,1958.004,5850.275,140.4179,0,0,0,100,0), +(@PATH,8,1967.889,5861.601,140.4673,0,0,0,100,0), +(@PATH,9,1967.766,5874.843,140.4673,0,0,0,100,0), +(@PATH,10,1962.739,5881.181,140.4673,0,0,0,100,0), +(@PATH,11,1965.367,5889.64,140.4673,0,0,0,100,0), +(@PATH,12,1977.617,5904.389,140.4673,0,0,0,100,0), +(@PATH,13,1979.003,5918.971,140.4673,0,0,0,100,0), +(@PATH,14,1969.612,5933.128,140.4673,0,0,0,100,0), +(@PATH,15,1958.879,5940.208,140.4673,0,0,0,100,0), +(@PATH,16,1952.594,5927.489,140.4673,0,0,0,100,0); -- cgit v1.2.3 From e56ce7394fbc953b5ad1036fc41594a46ff91548 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 25 May 2012 23:39:55 -0230 Subject: db/creature_template: fix inhabittype for Floating Flavor Eye --- sql/updates/world/2012_05_25_02_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_25_02_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_25_02_world_creature_template.sql b/sql/updates/world/2012_05_25_02_world_creature_template.sql new file mode 100644 index 00000000000..fd4c1743f07 --- /dev/null +++ b/sql/updates/world/2012_05_25_02_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Floating Flavor Eye InhabitType fix +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=21659; -- cgit v1.2.3 From 39a609ce5c3c926384273c7c1676d3f72a672d09 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 25 May 2012 23:53:33 -0230 Subject: Core/DB: Some updates for UBRS from sniff --- sql/updates/world/2012_05_25_03_world_template.sql | 8 ++ .../BlackrockSpire/blackrock_spire.h | 9 +- .../BlackrockSpire/boss_pyroguard_emberseer.cpp | 40 ++++++++- .../BlackrockSpire/instance_blackrock_spire.cpp | 100 ++++++++++++++++----- 4 files changed, 129 insertions(+), 28 deletions(-) create mode 100644 sql/updates/world/2012_05_25_03_world_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_25_03_world_template.sql b/sql/updates/world/2012_05_25_03_world_template.sql new file mode 100644 index 00000000000..6ef112f342f --- /dev/null +++ b/sql/updates/world/2012_05_25_03_world_template.sql @@ -0,0 +1,8 @@ +-- Fix unit flags for Blackhand Incarcerator +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=10316; +-- Fix unit flags for Pyroguard Emberseer +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33554688 WHERE `entry`=9816; +-- Remove hack event script +DELETE FROM `event_scripts` WHERE `id`=4884; +-- Remove script to Dragonspire Hall Runes "UBRS" +UPDATE `gameobject_template` SET `ScriptName`= '' WHERE `entry` BETWEEN 175194 AND 175200; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h index beef71ea857..0af2af948d3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h @@ -33,7 +33,8 @@ enum Data DATA_WARCHIEF_REND_BLACKHAND, DATA_GYTH, DATA_THE_BEAST, - DATA_GENERAL_DRAKKISATH + DATA_GENERAL_DRAKKISATH, + DATA_DRAGONSPIRE_ROOM, }; enum Npc { @@ -51,6 +52,9 @@ enum Npc NPC_GYTH = 10339, NPC_THE_BEAST = 10430, NPC_GENERAL_DRAKKISATH = 10363, + NPC_BLACKHAND_DREADWEAVER = 9817, + NPC_BLACKHAND_SUMMONER = 9818, + NPC_BLACKHAND_VETERAN = 9819, }; enum AdditionalData @@ -58,6 +62,9 @@ enum AdditionalData SPELL_SUMMON_ROOKERY_WHELP = 15745, MAX_ENCOUNTER = 14, MAX_DRAGONSPIRE_HALL_RUNES = 7, + EVENT_PYROGUARD_EMBERSEER = 4884, + AREATRIGGER_ENTER_UBRS = 2046, + AREATRIGGER_STADIUM = 2026, }; enum GameObjects diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp index 411b800cd03..f84fcefd40b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -20,11 +20,24 @@ #include "ScriptedCreature.h" #include "blackrock_spire.h" +enum Text +{ + EMOTE_ONE_STACK = 0, + EMOTE_TEN_STACK = 1, + EMOTE_FREE_OF_BONDS = 2, + YELL_FREE_OF_BONDS = 3, +}; + enum Spells { - SPELL_FIRENOVA = 23462, - SPELL_FLAMEBUFFET = 23341, - SPELL_PYROBLAST = 17274, + SPELL_ENCAGED_EMBERSEER = 15282, // Self on spawn + SPELL_FIRE_SHIELD_TRIGGER = 13377, // Self on spawn missing from 335 dbc + SPELL_FREEZE_ANIM = 16245, // Self on event start + SPELL_EMBERSEER_GROWING = 16048, // Self on event start + SPELL_EMBERSEER_FULL_STRENGTH = 16047, // Emberseer Full Strength + SPELL_FIRENOVA = 23462, // Combat + SPELL_FLAMEBUFFET = 23341, // Combat + SPELL_PYROBLAST = 17274, // Combat }; enum Events @@ -51,12 +64,19 @@ public: void Reset() { + if(instance->GetBossState(DATA_PYROGAURD_EMBERSEER) == IN_PROGRESS) + OpenDoors(FALSE); + instance->SetBossState(DATA_PYROGAURD_EMBERSEER,NOT_STARTED); + // respawn any dead Blackhand Incarcerators + DoCast(me, SPELL_ENCAGED_EMBERSEER); + //DoCast(me, SPELL_FIRE_SHIELD_TRIGGER); _Reset(); } void EnterCombat(Unit* /*who*/) { _EnterCombat(); + // activate all runes in room events.ScheduleEvent(EVENT_FIRENOVA, 6 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_FLAMEBUFFET, 3 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_PYROBLAST, 14 * IN_MILLISECONDS); @@ -64,12 +84,26 @@ public: void JustDied(Unit* /*killer*/) { + instance->SetBossState(DATA_PYROGAURD_EMBERSEER,DONE); + OpenDoors(TRUE); _JustDied(); } + void OpenDoors(bool Boss_Killed) + { + if (GameObject* door1 = me->GetMap()->GetGameObject(instance->GetData64(GO_EMBERSEER_IN))) + door1->SetGoState(GO_STATE_ACTIVE); + if (GameObject* door2 = me->GetMap()->GetGameObject(instance->GetData64(GO_DOORS))) + door2->SetGoState(GO_STATE_ACTIVE); + if (Boss_Killed) + if (GameObject* door3 = me->GetMap()->GetGameObject(instance->GetData64(GO_EMBERSEER_OUT))) + door3->SetGoState(GO_STATE_ACTIVE); + } + void UpdateAI(uint32 const diff) { if (!UpdateVictim()) + return; events.Update(diff); diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index b5b1b34a593..fdb73fe1196 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -49,6 +49,12 @@ public: uint64 Gyth; uint64 TheBeast; uint64 GeneralDrakkisath; + uint64 go_emberseerin; + uint64 go_doors; + uint64 go_emberseerout; + uint64 go_roomrunes[MAX_DRAGONSPIRE_HALL_RUNES]; + uint8 Runemaxprotectors[MAX_DRAGONSPIRE_HALL_RUNES]; + uint8 Runeprotectorsdead[MAX_DRAGONSPIRE_HALL_RUNES]; void Initialize() { @@ -67,6 +73,9 @@ public: Gyth = 0; TheBeast = 0; GeneralDrakkisath = 0; + go_emberseerin = 0; + go_doors = 0; + go_emberseerout = 0; } bool IsEncounterInProgress() const @@ -125,7 +134,11 @@ public: case NPC_GENERAL_DRAKKISATH: GeneralDrakkisath = creature->GetGUID(); break; - } + case NPC_BLACKHAND_DREADWEAVER: + case NPC_BLACKHAND_SUMMONER: + case NPC_BLACKHAND_VETERAN: + break; + } } void OnGameObjectCreate(GameObject* go) @@ -135,6 +148,36 @@ public: case GO_WHELP_SPAWNER: go->CastSpell(NULL, SPELL_SUMMON_ROOKERY_WHELP); break; + case GO_EMBERSEER_IN: + go_emberseerin = go->GetGUID(); + break; + case GO_DOORS: + go_doors = go->GetGUID(); + break; + case GO_EMBERSEER_OUT: + go_emberseerout = go->GetGUID(); + break; + case GO_ROOM_1_RUNE: + go_roomrunes[0] = go->GetGUID(); + break; + case GO_ROOM_2_RUNE: + go_roomrunes[1] = go->GetGUID(); + break; + case GO_ROOM_3_RUNE: + go_roomrunes[2] = go->GetGUID(); + break; + case GO_ROOM_4_RUNE: + go_roomrunes[3] = go->GetGUID(); + break; + case GO_ROOM_5_RUNE: + go_roomrunes[4] = go->GetGUID(); + break; + case GO_ROOM_6_RUNE: + go_roomrunes[5] = go->GetGUID(); + break; + case GO_ROOM_7_RUNE: + go_roomrunes[6] = go->GetGUID(); + break; } } @@ -167,6 +210,18 @@ public: return true; } + void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) + { + switch (eventId) + { + case EVENT_PYROGUARD_EMBERSEER: + SetBossState(DATA_PYROGAURD_EMBERSEER,IN_PROGRESS); + break; + default: + break; + } + } + uint64 GetData64(uint32 type) { switch (type) @@ -199,6 +254,26 @@ public: return TheBeast; case DATA_GENERAL_DRAKKISATH: return GeneralDrakkisath; + case GO_EMBERSEER_IN: + return go_emberseerin; + case GO_DOORS: + return go_doors; + case GO_EMBERSEER_OUT: + return go_emberseerout; + case GO_ROOM_1_RUNE: + return go_roomrunes[0]; + case GO_ROOM_2_RUNE: + return go_roomrunes[1]; + case GO_ROOM_3_RUNE: + return go_roomrunes[2]; + case GO_ROOM_4_RUNE: + return go_roomrunes[3]; + case GO_ROOM_5_RUNE: + return go_roomrunes[4]; + case GO_ROOM_6_RUNE: + return go_roomrunes[5]; + case GO_ROOM_7_RUNE: + return go_roomrunes[6]; } return 0; @@ -247,30 +322,7 @@ public: }; -uint8 ActivatedRunes = 0; - -class go_dragonspire_hall_rune : public GameObjectScript -{ -public: - go_dragonspire_hall_rune() : GameObjectScript("go_dragonspire_hall_rune") { } - - void OnGameObjectStateChanged(GameObject* go, uint32 state) - { - if (state == GO_STATE_READY) - { - if (++ActivatedRunes == MAX_DRAGONSPIRE_HALL_RUNES) - { - if (GameObject* door1 = GetClosestGameObjectWithEntry(go, GO_EMBERSEER_IN, 150.0f)) - door1->SetGoState(GO_STATE_ACTIVE); - if (GameObject* door2 = GetClosestGameObjectWithEntry(go, GO_DOORS, 150.0f)) - door2->SetGoState(GO_STATE_ACTIVE); - } - } - } -}; - void AddSC_instance_blackrock_spire() { new instance_blackrock_spire(); - new go_dragonspire_hall_rune; } -- cgit v1.2.3 From a0028fca55cce5cebeb2d6ab5449ce2eeeabdf51 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 26 May 2012 15:03:30 +0100 Subject: DB/Misc: EAI: Fix unkillable Obsidian Nullifier in AQ Closes #2977 SAI: Use correct action_type for two SAI scripts (was 0) Closes #6569 and fixes DB startup errors --- sql/updates/world/2012_05_26_00_world_scripts.sql | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sql/updates/world/2012_05_26_00_world_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_26_00_world_scripts.sql b/sql/updates/world/2012_05_26_00_world_scripts.sql new file mode 100644 index 00000000000..18b0fa2f6b2 --- /dev/null +++ b/sql/updates/world/2012_05_26_00_world_scripts.sql @@ -0,0 +1,20 @@ +-- Correction for Obsidian Nullifier EAI +UPDATE `creature_ai_scripts` SET + `action1_param1` = 23 +WHERE `id` = 1531201; + +-- Correction for Wildspawn Felsworn and Wildspawn Hellcaller SAI +UPDATE `smart_scripts` SET + `event_phase_mask` = 2, + `action_type` = 22, + `action_param1` = 1, + `target_type` = 1 +WHERE + (`entryorguid` = 11457 AND + `source_type` = 0 AND + `id` = 10 AND + `link` = 0) OR + (`entryorguid` = 11455 AND + `source_type` = 0 AND + `id` = 11 AND + `link` = 0); -- cgit v1.2.3 From 61e006e4e99968db609675676d63f2c25b7cd834 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 26 May 2012 15:40:52 +0100 Subject: DB/Spells: Add Fire shield (spell id 13377) to spell_dbc Will be used in an upcoming script by Malcrom --- sql/updates/world/2012_05_26_01_world_spell_dbc.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_26_01_world_spell_dbc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_26_01_world_spell_dbc.sql b/sql/updates/world/2012_05_26_01_world_spell_dbc.sql new file mode 100644 index 00000000000..7efebc37489 --- /dev/null +++ b/sql/updates/world/2012_05_26_01_world_spell_dbc.sql @@ -0,0 +1,4 @@ +-- Fire Shield from 2.0.12 dbc +DELETE FROM `spell_dbc` WHERE `Id`=13377; +INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES +(13377, 1, 0, 2512, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 40, 40, 21, 1, 0, -1, -1, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 3000, 0, 0, '0', '0', '0', 0, 0, 0, 0, 0, 0, 13376, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 2, 'Fire Shield'); -- cgit v1.2.3 From e7845f780e2a9cb588c1848c4feda3ce0a535346 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 26 May 2012 16:39:37 +0100 Subject: DB/NPC: Use the same flags_extra (no skill gain) and immunities (grip and bleed) to all the training dummies. Closes #1853 --- sql/updates/world/2012_05_26_02_world_creature_template.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_05_26_02_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_26_02_world_creature_template.sql b/sql/updates/world/2012_05_26_02_world_creature_template.sql new file mode 100644 index 00000000000..e51567390b7 --- /dev/null +++ b/sql/updates/world/2012_05_26_02_world_creature_template.sql @@ -0,0 +1,5 @@ +-- Training dummies +UPDATE `creature_template` SET + `flags_extra`=0x40000, /* NO_SKILLGAIN */ + `mechanic_immune_mask`=0x20|0x4000 /* GRIP|BLEED */ /* two of the templates already had bleed immunity, is that correct? */ +WHERE `ScriptName`='npc_training_dummy'; -- cgit v1.2.3 From 5956eb9ae2e8466629a4b4d024b13be49dcba3ca Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 26 May 2012 17:10:27 +0100 Subject: DB/PageText: Add a missing page text Closes #6592 Unknown author --- sql/updates/world/2012_05_26_03_world_page_text.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_26_03_world_page_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_26_03_world_page_text.sql b/sql/updates/world/2012_05_26_03_world_page_text.sql new file mode 100644 index 00000000000..9dc285cd99d --- /dev/null +++ b/sql/updates/world/2012_05_26_03_world_page_text.sql @@ -0,0 +1,4 @@ +-- First page of A Steamy Romance Novel: Northern Exposure +DELETE FROM `page_text` WHERE `entry`=3562; +INSERT INTO `page_text` (`entry`, `text`, `next_page`) VALUES +(3562, 'The tiny gnome peered over the railing into the secluded Dalaran courtyard.$B$B"The view from the balcony is amazing. You have to come see!"$B$BArmor legplates creaked as Marcus walked over, taking in a deep breath as he absently scratched his scruffy chin.$B$B"The Hero''s Welcome is no slouch. And there''s something in the room that might interest you."$B$BTavi bounded into the room, pausing only a moment before jumping onto the massive bed. She turned to gaze at Marcus with her huge saucer-like eyes, narrowing them playfully and replacing her glowing smile with a diabolical grin.', 3563); -- cgit v1.2.3 From a6adce0e3f86896324b6cdc6e31ef4227621b189 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 26 May 2012 19:35:36 +0100 Subject: DB/NPCs: Remove bleed immunity from all training dummies Ref e7845f780e2a9cb --- sql/updates/world/2012_05_26_04_world_creature_template.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_26_04_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_26_04_world_creature_template.sql b/sql/updates/world/2012_05_26_04_world_creature_template.sql new file mode 100644 index 00000000000..911cd45ef8c --- /dev/null +++ b/sql/updates/world/2012_05_26_04_world_creature_template.sql @@ -0,0 +1,4 @@ +-- Training dummies +UPDATE `creature_template` SET + `mechanic_immune_mask` = `mechanic_immune_mask` &~ 0x4000 /* BLEED */ +WHERE `ScriptName`='npc_training_dummy'; -- cgit v1.2.3 From 593774f9c5adcf0bc6f6eb5a4e580dd8d630d34c Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 26 May 2012 16:23:34 -0230 Subject: DB/Creature_template: Some trigger flag fixes --- sql/updates/world/2012_05_26_05_world_creature_template.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2012_05_26_05_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_26_05_world_creature_template.sql b/sql/updates/world/2012_05_26_05_world_creature_template.sql new file mode 100644 index 00000000000..59d69b3fbe1 --- /dev/null +++ b/sql/updates/world/2012_05_26_05_world_creature_template.sql @@ -0,0 +1,8 @@ +-- Blade's Edge - Legion - Invis Bunny +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=20736; +-- Death's Door Warp-Gate Explosion Bunny +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=22502; +-- Death's Door North Warp-Gate +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=22471; +-- Death's Door South Warp-Gate +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=22472; -- cgit v1.2.3 From 1593a53086538cce6ae6252a9bc9779b02a5b1b8 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 26 May 2012 18:30:44 -0230 Subject: DB/Smart Scripts: Some EAI to SAI conversions for UBRS --- .../world/2012_05_26_06_world_smart_scripts.sql | 143 +++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 sql/updates/world/2012_05_26_06_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_26_06_world_smart_scripts.sql b/sql/updates/world/2012_05_26_06_world_smart_scripts.sql new file mode 100644 index 00000000000..397a5ad517a --- /dev/null +++ b/sql/updates/world/2012_05_26_06_world_smart_scripts.sql @@ -0,0 +1,143 @@ +-- Blackhand Dreadweaver SAI +SET @ENTRY := 9817; -- NPC entry +SET @SPELL1 := 12739; -- Shadow Bolt +SET @SPELL2 := 7068; -- Veil of Shadow +SET @SPELL3 := 12380; -- Shadow Channeling +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,11,0,100,2,0,0,0,0,58,1,@SPELL1,3600,6300,25,30,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Reset - Load caster template Cast Shadow Bolt'), +(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,@SPELL3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Reset - Aura Shadow Channeling'), +(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Aggro - Cast Shadow Bolt'), +(@ENTRY,0,3,0,61,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Aggro - Call for help'), +(@ENTRY,0,4,0,0,0,100,2,9400,21400,22000,28800,11,@SPELL2,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - Combat - Cast Veil of Shadow'), +(@ENTRY,0,5,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - HP@15% - Flee for help'), +(@ENTRY,0,6,7,1,0,100,2,0,8000,12000,14000,92,0,0,1,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - interupt channeling'), +(@ENTRY,0,7,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - set phase 1'), +(@ENTRY,0,8,0,1,1,100,2,0,0,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - emote (phase 1)'), +(@ENTRY,0,9,10,1,1,100,2,4000,4000,4000,4000,11,@SPELL3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - Aura Shadow Channeling (phase 1)'), +(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - set phase 0 (phase 1)'); + +-- Blackhand Summoner SAI +SET @ENTRY := 9818; -- NPC entry +SET @SPELL1 := 12466; -- Fireball +SET @SPELL2 := 15532; -- Frost Nova +SET @SPELL3 := 15792; -- Summon Blackhand Veteran +SET @SPELL4 := 15794; -- Summon Blackhand Dreadweaver +SET @SPELL5 := 12380; -- Shadow Channeling +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,11,0,100,2,0,0,0,0,58,1,@SPELL1,3600,6300,25,30,1,0,0,0,0,0,0,0, 'Blackhand Summoner - On Reset - Load caster template Cast Fireball'), +(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,@SPELL5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - On Reset - Aura Shadow Channeling'), +(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Summoner - On Aggro - Cast Shadow Bolt'), +(@ENTRY,0,3,0,61,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - On Aggro - Call for help'), +(@ENTRY,0,4,0,0,0,100,2,11400,11400,12700,16700,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Frost Nova'), +(@ENTRY,0,5,6,0,0,100,3,30000,35000,0,0,11,@SPELL3,1,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Summon Blackhand Veteran'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - say 0'), +(@ENTRY,0,7,8,0,0,100,3,40000,45000,0,0,11,@SPELL4,1,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Summon Blackhand Dreadweaver'), +(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - say 1'), +(@ENTRY,0,9,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - HP@15% - Flee for help'), +(@ENTRY,0,10,0,1,0,100,2,0,8000,12000,14000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - OOC - emote'); +-- NPC talk text insert +DELETE FROM `creature_text` WHERE `entry`=9818; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(9818,0,0,'%s begins to summon in a Blackhand Veteran!',16,0,100,0,0,0,'Blackhand Summoner'), +(9818,1,0,'%s begins to summon in a Blackhand Dreadweaver!',16,0,100,0,0,0,'Blackhand Summoner'); + +-- Blackhand Veteran SAI +SET @ENTRY := 9819; -- NPC entry +SET @SPELL1 := 15749; -- Shield Charge +SET @SPELL2 := 14516; -- Strike +SET @SPELL3 := 11972; -- Shield Bash +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,4,0,100,2,0,0,0,0,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Veteran - On Aggro - Cast Shield Charge'), +(@ENTRY,0,1,0,61,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Veteran - On Aggro - Call for help'), +(@ENTRY,0,2,0,0,0,100,2,7800,15800,13800,22900,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Blackhand Veteran - Combat - Cast Veil of Shadow'), +(@ENTRY,0,3,0,0,0,100,2,10000,20000,6000,12000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Blackhand Veteran - Combat - Cast Veil of Shadow'), +(@ENTRY,0,4,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Veteran - HP@15% - Flee for help'), +(@ENTRY,0,5,0,1,0,100,2,0,8000,12000,14000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Veteran - OOC - emote'); + +-- Rage Talon Dragonspawn SAI +SET @ENTRY := 9096; -- NPC entry +SET @SPELL1 := 15580; -- Strike +SET @SPELL2 := 12021; -- Fixate +SET @SPELL3 := 15572; -- Sunder Armor +SET @SPELL4 := 3391; -- Thrash +SET @SPELL5 := 8269; -- Frenzy +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,2,4000,13200,6600,14400,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Strike'), +(@ENTRY,0,1,0,0,0,100,2,7700,17100,20300,34200,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Fixate'), +(@ENTRY,0,2,0,0,0,100,2,1400,12300,7100,11700,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Sunder Armor'), +(@ENTRY,0,3,0,0,0,100,2,8200,17100,5600,18100,11,@SPELL4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Thrash'), +(@ENTRY,0,4,5,2,0,100,2,0,30,120000,120000,11,@SPELL5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - HP@30% - Cast Frenzy'), +(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - HP@30% - say 0'); +-- NPC talk text insert +DELETE FROM `creature_text` WHERE `entry`=9096; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(9096,0,0,'%s goes into a frenzy!',16,0,100,0,0,0,'Rage Talon Dragonspawn'); + + -- Scarshield Legionnaire SAI +SET @ENTRY := 9097; -- NPC entry +SET @SPELL1 := 15496; -- Cleave +SET @SPELL2 := 11972; -- Shield Bash +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Legionnaire - On Aggro - Call for help'), +(@ENTRY,0,1,0,0,0,100,2,7800,11500,8000,22100,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Scarshield Legionnaire - Combat - Cast Cleave'), +(@ENTRY,0,2,0,0,0,100,2,4000,10000,14000,20000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Scarshield Legionnaire - Combat - Cast Shield Bash'); + +-- Scarshield Acolyte SAI +SET @ENTRY := 9045; -- NPC entry +SET @SPELL1 := 14032; -- Shadow Word: Pain +SET @SPELL2 := 12039; -- Heal +SET @SPELL3 := 8362; -- Renew +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Acolyte - On Aggro - Call for help'), +(@ENTRY,0,1,0,0,0,100,2,7700,15700,21900,33500,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Scarshield Acolyte - Combat - Cast Shadow Word: Pain'), +(@ENTRY,0,2,0,2,0,100,3,0,75,0,0,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Acolyte - HP@75% - Cast Heal'), +(@ENTRY,0,3,0,14,0,100,2,35,8,5000,6000,11,@SPELL3,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Scarshield Acolyte - Friendly hp@35 - Cast Renew on friendly unit'); + +-- Scarshield Spellbinder SAI +SET @ENTRY := 9098; -- NPC entry +SET @SPELL1 := 13748; -- Arcane Bolt +SET @SPELL2 := 15123; -- Resist Fire +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,11,0,100,2,0,0,0,0,58,1,@SPELL1,1100,3000,30,30,1,0,0,0,0,0,0,0, 'Scarshield Spellbinder - On Reset - Load caster template Cast Arcane Bolt'), +(@ENTRY,0,1,0,4,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Spellbinder - On Aggro - Call for help'), +(@ENTRY,0,2,0,16,0,100,2,@SPELL2,30,3000,6000,11,@SPELL2,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Resist Fire'); + +-- Blackhand Incarcerator SAI +SET @ENTRY := 10316; -- NPC entry +SET @SPELL1 := 15281; -- Encage Emberseer +SET @SPELL2 := 12039; -- Heal +SET @SPELL3 := 8362; -- Renew +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,3,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - OOC - Cast Encage Emberseer'), +(@ENTRY,0,1,2,38,0,100,2,0,1,0,0,92,0,@SPELL1,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - On data set - Stop Casting Encage Emberseer'), +(@ENTRY,0,2,4,61,0,100,0,0,0,0,0,19,768,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - On data set - Remove unit flags'), +(@ENTRY,0,3,4,4,0,100,2,0,0,0,0,9,0,0,0,0,0,0,15,175244,100,0,0,0,0,0, 'Blackhand Incarcerator - On aggro - close emberseer in door'), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,9,0,0,0,0,0,0,15,175705,100,0,0,0,0,0, 'Blackhand Incarcerator - On aggro - close doors'), +(@ENTRY,0,5,0,0,0,100,2,7800,15800,13800,22900,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Incarcerator - Combat - Cast Strike'), +(@ENTRY,0,6,0,0,0,100,2,10000,20000,6000,12000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Blackhand Incarcerator - Combat - Cast Encage'), +(@ENTRY,0,7,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - HP@15% - Flee for help'), +(@ENTRY,0,8,0,6,0,100,0,0,0,0,0,41,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - On death - Despawn after 10 sec'); -- cgit v1.2.3 From b78d6c2c2b426a13e36d24eec7776afe5fdcfaf5 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 27 May 2012 13:17:00 +0200 Subject: DB/Gameobject: Quenched Illidari-Bane Blade added to the object Closes #6446,#6604 --- sql/updates/world/2012_05_27_00_world_gameobject_template.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_05_27_00_world_gameobject_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_00_world_gameobject_template.sql b/sql/updates/world/2012_05_27_00_world_gameobject_template.sql new file mode 100644 index 00000000000..5fa3c15a505 --- /dev/null +++ b/sql/updates/world/2012_05_27_00_world_gameobject_template.sql @@ -0,0 +1,7 @@ +-- Gameobject updates based on sniffs +UPDATE `gameobject_template` SET `size` =2.5,`questItem1`=30876,`data0`=57,`data1`=21583 WHERE `entry`=185032; +UPDATE `gameobject` SET `position_x`=-3420.991,`position_y`=1373.175,`position_z`=257.5233,`orientation`=3.141593 WHERE `id`=185032; +-- Gameobject loot template +DELETE FROM `gameobject_loot_template` WHERE `entry`=21583; +INSERT INTO `gameobject_loot_template` VALUES +(21583,30876,100,1,0,1,1); -- Quenched Illidari-Bane Blade -- cgit v1.2.3 From dff7c70a38756d9d964f0beb79bb71278351772e Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 27 May 2012 11:12:46 -0230 Subject: DB/waypoints: Fix some waypoint errors. --- sql/updates/world/2012_05_27_01_world_waypoints.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_05_27_01_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_01_world_waypoints.sql b/sql/updates/world/2012_05_27_01_world_waypoints.sql new file mode 100644 index 00000000000..3685b58a629 --- /dev/null +++ b/sql/updates/world/2012_05_27_01_world_waypoints.sql @@ -0,0 +1,7 @@ +-- RE FIX Reanimated Frost Wyrm +DELETE FROM `creature` WHERE `guid` IN (116670,116671,116672,116681,116683,116684,116685,116686,116687,116696,116697,116699,116700,116701); +UPDATE `creature` SET `MovementType`=2 WHERE `guid` BETWEEN 40497 AND 40505; +UPDATE `creature_addon` SET `bytes1`=50331648,`bytes2`=1 WHERE `guid` BETWEEN 40497 AND 40505; +-- Fix Wildhammer Scout +UPDATE `creature` SET `MovementType`=0 WHERE guid IN (69122,69123,69124,69125,69126,69127); +UPDATE `creature_addon` SET `path_id`=0 WHERE guid IN (69122,69123,69124,69125,69126,69127); -- cgit v1.2.3 From ae98cd9d8adfeab99c2cfb190469caf7ba47a23a Mon Sep 17 00:00:00 2001 From: zxbiohazardzx Date: Sun, 27 May 2012 16:57:47 +0200 Subject: DB/Creature: Add Missing spawn for Queen Angerboda Closes #4842 --- sql/updates/world/2012_05_27_02_world_creature.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_27_02_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_02_world_creature.sql b/sql/updates/world/2012_05_27_02_world_creature.sql new file mode 100644 index 00000000000..8ca3ee75c94 --- /dev/null +++ b/sql/updates/world/2012_05_27_02_world_creature.sql @@ -0,0 +1,4 @@ +-- Add Missing spawn for Queen Angerboda +DELETE FROM `creature` WHERE `id`=24023; +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 +(42162,24023,571,1,1,0,0,2855.372,-3869.662,248.6132,2.181662,150,0,0,9291,3231,0,0,0,0); -- cgit v1.2.3 From abbdeb199e8df880f4a5c8b36c405bdf32a12222 Mon Sep 17 00:00:00 2001 From: gecko32 Date: Sun, 27 May 2012 17:01:34 +0200 Subject: DB/Creature: Remove Compact Harvest Reaver Spawn Closes #5207 --- sql/updates/world/2012_05_27_03_world_creature.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_27_03_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_03_world_creature.sql b/sql/updates/world/2012_05_27_03_world_creature.sql new file mode 100644 index 00000000000..097f40581a7 --- /dev/null +++ b/sql/updates/world/2012_05_27_03_world_creature.sql @@ -0,0 +1,2 @@ +-- Remove Spawns for Compact Harvest Reaper, it should be spawned via script +DELETE FROM `creature` WHERE `id`=2676; -- cgit v1.2.3 From 310249423356c500878224bb325c0c28a4e1efeb Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 27 May 2012 12:47:45 -0230 Subject: DB/SAI: Fixed spawning, added SAI & pathing, for Reconstructed Wyrm --- .../world/2012_05_27_04_world_smart_scripts.sql | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 sql/updates/world/2012_05_27_04_world_smart_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_04_world_smart_scripts.sql b/sql/updates/world/2012_05_27_04_world_smart_scripts.sql new file mode 100644 index 00000000000..1f7cfa3d19c --- /dev/null +++ b/sql/updates/world/2012_05_27_04_world_smart_scripts.sql @@ -0,0 +1,24 @@ +-- Reconstructed Wyrm SAI +SET @ENTRY := 27693; +SET @SPELL1 := 49386; -- Not in dbc +SET @SPELL2 := 49343; -- Frost Breath Strafe +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Reconstructed Wyrm - On spawn - cast aura'), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,53,0,@ENTRY,0,0,0,0,1,0,0,0,0,0,0,0,'Reconstructed Wyrm - On spawn - Load Path'); +-- waypoints for Reconstructed Wyrm +DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY,1,4685.845,1130.759,150.1177, 'Reconstructed Wyrm'), +(@ENTRY,2,4686.284,1131.658,150.1177, 'Reconstructed Wyrm'), +(@ENTRY,3,4688.699,1166.089,161.2737, 'Reconstructed Wyrm'), +(@ENTRY,4,4702.308,1212.668,161.2737, 'Reconstructed Wyrm'), +(@ENTRY,5,4733.535,1260.209,169.6348, 'Reconstructed Wyrm'), +(@ENTRY,6,4751.818,1293.699,175.9404, 'Reconstructed Wyrm'), +(@ENTRY,7,4794.479,1345.154,199.5372, 'Reconstructed Wyrm'), +(@ENTRY,8,4812.264,1373.523,219.8613, 'Reconstructed Wyrm'); +-- Fix spawns +UPDATE `creature` SET `position_x`=4685.845,`position_y`=1130.759,`position_z`=150.1177,`spawntimesecs`=120,`spawndist`=0,`MovementType`=0 WHERE `guid`=100211; +DELETE FROM `creature` WHERE `guid` IN (100256,133240,133241); +DELETE FROM `creature_addon` WHERE `guid` IN (100256,133240,133241); -- cgit v1.2.3 From 0f81aad346dfbfaf02cbe23ab7c436abfcd50022 Mon Sep 17 00:00:00 2001 From: Valcorb Date: Sun, 27 May 2012 19:25:14 +0200 Subject: DB/Quest: solve issues with Attunement to Dalaran killcredit Closes #4747 --- sql/updates/world/2012_05_27_05_world_gameobject.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sql/updates/world/2012_05_27_05_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_05_world_gameobject.sql b/sql/updates/world/2012_05_27_05_world_gameobject.sql new file mode 100644 index 00000000000..66fbfd0afca --- /dev/null +++ b/sql/updates/world/2012_05_27_05_world_gameobject.sql @@ -0,0 +1,13 @@ +-- [QUEST] Attunement to Dalaran +SET @GUID := 320; +-- Adds the gameobject to recognize the zone +DELETE FROM `gameobject` WHERE `id`=300193; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) +VALUES +(@GUID,300193,571,1,1,3343.8,2502.85,-15.1381,5.74342,0,0,0.266617,-0.963802,300,0,1); +-- [SAI] NPC Attunement To Dalaran Kill Credit Bunny 27135 +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=27135; +DELETE FROM `smart_scripts` WHERE `entryorguid`=27135 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 +(27135,0,0,0,8,0,100,1,48021,1,0,0,33,27135,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On spellhit - give kill credit - Attunement to Dalaran Kill Credit Bunny'); -- cgit v1.2.3 From 2724a4ece8ec2e9f3593c96cefbb2e03fff722aa Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sun, 27 May 2012 19:47:21 +0200 Subject: DB/Creature: Add SAI to some rares and set (temp) factions, Special thanks to : Shlomi1515 for the work and Gecko32 for the SAI Closes #3849 --- sql/updates/world/2012_05_27_06_world_creature.sql | 113 +++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 sql/updates/world/2012_05_27_06_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_06_world_creature.sql b/sql/updates/world/2012_05_27_06_world_creature.sql new file mode 100644 index 00000000000..1074465a0be --- /dev/null +++ b/sql/updates/world/2012_05_27_06_world_creature.sql @@ -0,0 +1,113 @@ +-- Tukemuth +DELETE FROM `smart_scripts` WHERE `entryorguid`=32400; +INSERT INTO `smart_scripts` VALUES +(32400,0,0,0,9,0,100,0,0,5,9000,13000,11,50410,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Tukemuth - Cast Tusk Strike'), +(32400,0,1,0,0,0,100,0,9000,17000,15000,22000,11,57066,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Tukemuth - Cast Trample'); +UPDATE `creature_template` SET faction_A=7,faction_H=7,mindmg=2926.0,maxdmg=3542.0,skinloot=70209,spell1=50410,spell2=57066,attackpower=3384,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32400; + +-- Fumblub Gearwind +DELETE FROM `smart_scripts` WHERE `entryorguid`=32358; +INSERT INTO `smart_scripts` VALUES +(32358,0,0,0,0,0,100,0,4000,6000,12000,15000,11,60906,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Fumblub Gearwind - Cast Machine Gun'); +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=60906,attackpower=3384,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647,type_flags=2048,InhabitType=4 where entry=32358; +UPDATE `creature_addon` SET mount=22719,bytes1=33554432 where guid=151938; + +-- Old Crystalbark +DELETE FROM `smart_scripts` WHERE `entryorguid`=32357; +INSERT INTO `smart_scripts` VALUES +(32357,0,0,0,0,0,100,0,3700,16200,19200,28000,11,50506,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Old Crystalbark - Cast Mark of Detonation'), +(32357,0,1,0,0,0,100,0,1625,8100,9600,14000,11,60903,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Old Crystalbark - Cast Arcane Breath'); +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=3231.0,maxdmg=3309.0,spell1=60903,spell2=50506,attackpower=3214,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32357; + +-- Terror Spinner - Tameable +DELETE FROM `smart_scripts` WHERE `entryorguid`=32475; +INSERT INTO `smart_scripts` VALUES +(32475,0,0,0,0,0,100,0,4000,6000,12000,15000,11,36839,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Terror Spinner - Cast Impairing Poison'), +(32475,0,1,0,0,0,100,0,1625,8100,9600,14000,11,28428,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Terror Spinner - Cast Instant Poison'); +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=3625.0,maxdmg=4301.0,spell1=32475,spell2=28428,attackpower=3963,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=66624,name= 'Terror Spinner' where entry=32475; + +-- Hildana Deathstealer +DELETE FROM `smart_scripts` WHERE `entryorguid`=32495; +INSERT INTO `smart_scripts` VALUES +(32495,0,0,0,0,0,100,1,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Hildana Deathstealer - Enter phase 1'), +(32495,0,1,2,0,1,100,0,3000,6000,4000,6000,11,60991,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Hildana Deathstealer - Cast Lash'), +(32495,0,2,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Hildana Deathstealer - Enter phase 2'), +(32495,0,3,0,0,2,100,0,3000,5000,9000,11000,11,57547,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Hildana Deathstealer - Cast Touch of the Valkyr'), +(32495,0,4,0,0,2,100,0,12000,13000,13000,15000,22,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Hildana Deathstealer - timer back to phase 1'); +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=4715,maxdmg=5474,attackpower=5094,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32495; + +-- Syreian the Bonecarver +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2926,maxdmg=3542,spell1=38952,spell2=47168,spell3=50092,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=2147483647 where entry=32438; + +-- Icehorn - Tameable +DELETE FROM `smart_scripts` WHERE `entryorguid`=32361; +INSERT INTO `smart_scripts` VALUES +(32361,0,0,0,0,0,100,0,4500,6750,6750,9750,11,57468,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Icehorn - Cast Romp'); +UPDATE `creature_template` SET type_flags= '1',faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=57468,attackpower=3084,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=66624,skinloot=70211 where entry=32361; + +-- King Ping +DELETE FROM `smart_scripts` WHERE `entryorguid`=32398; +INSERT INTO `smart_scripts` VALUES +(32398,0,0,0,0,0,100,0,1600,8000,12400,13000,11,61115,0,0,0,0,0,2,0,0,0,0,0,0,0, 'King Ping - Cast Belly Flop'), +(32398,0,1,0,0,0,100,0,800,2600,4200,6800,11,50169,0,0,0,0,0,2,0,0,0,0,0,0,0, 'King Ping - Cast Flipper Thwack'); +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=61115,spell2=50169,attackpower=3234,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 WHERE entry=32398; + +-- High Thane Jorfus +DELETE FROM `smart_scripts` WHERE `entryorguid`=32501; +INSERT INTO `smart_scripts` VALUES +(32501,0,0,0,0,0,100,0,1600,3200,6400,12800,11,60950,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Blood Plague'), +(32501,0,1,0,0,0,100,2,10000,20000,10000,20000,11,60945,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Blood Strike'), +(32501,0,2,0,0,0,100,0,8000,13000,16000,21000,11,60953,1,0,0,0,0,5,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Death and Decaye'), +(32501,0,3,0,0,0,100,4,1000,1400,8500,20500,11,60949,0,0,0,0,0,5,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Death Coil'), +(32501,0,4,0,0,0,100,2,5000,9000,15000,22000,11,60951,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Frost Strike'); +UPDATE `creature_template` set faction_A=14,faction_H=14,mindmg=4894,maxdmg=5649,spell1=60950,spell2=60945,spell3=60953,spell4=60949,spell5=60951,attackpower=5271,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 WHERE entry=32501; + +-- Perobas the Bloodthirster +DELETE FROM `smart_scripts` WHERE `entryorguid`=32377; +INSERT INTO `smart_scripts` VALUES +(32377,0,0,0,0,0,100,0,5000,8000,12000,15000,11,50046,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Perobas the Bloodthirster - Cast Gnaw Bone'), +(32377,0,1,0,2,0,100,0,0,50,10000,13000,11,50271,1,0,0,0,0,1,0,0,0,0,0,0,0, 'Perobas the Bloodthirster - Cast Killing Rage'); +UPDATE `creature_template` set faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=50046,spell2=52071,attackpower=3084,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=66624,skinloot=70209 where entry=32377; + +-- Aotona - Tameable +UPDATE `creature` SET curhealth=15952 where id=32481; +UPDATE `creature_template` SET exp=2,armor_mod=1.0,minlevel=75,maxlevel=75,faction_A=14,faction_H=14,mindmg=3376,maxdmg=4034,spell1=49865,spell2=51144,attackpower=3705,dmg_multiplier=1.0,mechanic_immune_mask=66624 where entry=32481; + +-- Griegen +DELETE FROM `smart_scripts` WHERE `entryorguid`=32471; +INSERT INTO `smart_scripts` VALUES +(32471,0,0,0,0,0,100,0,5000,8000,9000,12000,11,51334,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Griegen - Cast Smash'); +UPDATE `creature` set curhealth=15952 where id=32471; +UPDATE `creature_template` set exp=2,armor_mod=1.0,minlevel=75,maxlevel=75,faction_A=14,faction_H=14,mindmg=3376,maxdmg=4034,spell1=51334,attackpower=3705,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32471; + +-- Seething Hate +UPDATE `creature_template` SET mindmg=2926,maxdmg=3542,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32429; + +-- Vigdis the War Maiden +DELETE FROM `creature_template_addon` WHERE entry=32386; +INSERT INTO `creature_template_addon` VALUES +(32386,0,28040,0,0,0,NULL); +UPDATE `creature` SET spawndist=20.0,MovementType=1 WHERE id=32386; +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,attackpower=3084,dmg_multiplier=1.0,mechanic_immune_mask=2147483647,InhabitType=1 where entry=32386; + +-- King Krush - Tameable +UPDATE `creature_template` SET faction_A=14,faction_H=14,mechanic_immune_mask=66624 WHERE entry=32485; + +-- Scarlet Highlord Daion +UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2926,maxdmg=3542,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32417; + +-- Crazed Indu'le Survivor +UPDATE `creature_template` SET mindmg=2926,maxdmg=3542,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32409; + +-- Grocklar +UPDATE `creature_template` SET mindmg=3137,maxdmg=3777,attackpower=3457,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32422; + +-- Loque'nahak - Tameable +UPDATE `creature_template` SET type_flags= '1',mechanic_immune_mask=66624 WHERE entry=32422; + +-- Zuldrak Sentinel +DELETE FROM `smart_scripts` WHERE `entryorguid`=32447; +INSERT INTO `smart_scripts` VALUES +(32447,0,0,0,0,0,100,0,0,5,9000,13000,11,55196,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Zuldrak Sentinel - Cast Stomp'), +(32447,0,1,0,0,0,100,0,15000,20000,21000,35000,11,54565,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Zuldrak Sentinel - Cast Whammy'); +UPDATE `creature_template` SET mindmg= '3905',maxdmg= '4600',attackpower= '4252',dmg_multiplier= '1.0',mechanic_immune_mask= '66624',spell1= '54565',spell2= '55196',AIName= 'SmartAI' WHERE entry= '32447'; -- cgit v1.2.3 From 25717c3faf89a2de5f3cc016a745109fb51094c2 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 27 May 2012 17:08:21 -0230 Subject: DB/Waypoints: Trying to fix errors in db. --- sql/updates/world/2012_05_27_07_world_waypoints.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2012_05_27_07_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_07_world_waypoints.sql b/sql/updates/world/2012_05_27_07_world_waypoints.sql new file mode 100644 index 00000000000..bd6aa2d0fc1 --- /dev/null +++ b/sql/updates/world/2012_05_27_07_world_waypoints.sql @@ -0,0 +1,8 @@ +-- Fix pathing for Thiassi the Lightning Bringer +DELETE FROM `creature_addon` WHERE `guid`=106554; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (106554,1065540,1); + +-- bio's screwed up movement for rares. Fix for some +UPDATE `creature` SET `spawndist`=10,`MovementType`=1 WHERE `id` IN (32400,32417,32422,32429); +UPDATE `creature_addon` SET `path_id`=2026020 WHERE `guid`=202602; +UPDATE `waypoint_data` SET `id`=2026020 WHERE `id`=2500060; -- cgit v1.2.3 From 52719aa8159d41cef6be0290933216335ebe68f1 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 27 May 2012 22:03:39 +0200 Subject: DB/GameEvents: update starting dates for events Closes #6611 --- sql/updates/world/2012_05_27_07_world_game_event.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2012_05_27_07_world_game_event.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_27_07_world_game_event.sql b/sql/updates/world/2012_05_27_07_world_game_event.sql new file mode 100644 index 00000000000..eff4a9e7652 --- /dev/null +++ b/sql/updates/world/2012_05_27_07_world_game_event.sql @@ -0,0 +1,8 @@ +UPDATE `game_event` SET `start_time` ='2012-06-21 00:01:00' WHERE `eventEntry`=1; -- Midsummer Fire Festival +UPDATE `game_event` SET `start_time` ='2012-09-19 00:01:00' WHERE `eventEntry`=50; -- Pirates' Day +UPDATE `game_event` SET `start_time` ='2012-09-20 00:01:00' WHERE `eventEntry`=24; -- Brewfest +UPDATE `game_event` SET `start_time` ='2012-09-24 00:01:00' WHERE `eventEntry`=11; -- Harvest Festival +UPDATE `game_event` SET `start_time` ='2012-09-18 01:00:00' WHERE `eventEntry`=11; -- Hallow's End +UPDATE `game_event` SET `start_time` ='2012-11-01 01:00:00' WHERE `eventEntry`=51; -- Day of the Dead +UPDATE `game_event` SET `start_time` ='2012-11-18 01:00:00' WHERE `eventEntry`=26; -- Pilgrim's Bounty +UPDATE `game_event` SET `start_time` ='2012-12-15 06:00:00' WHERE `eventEntry`=2; -- Winter Veil -- cgit v1.2.3 From 2dbbd535ef7292ab5dd2e2dca64dcdbaf4534184 Mon Sep 17 00:00:00 2001 From: Valcorb Date: Mon, 28 May 2012 02:43:41 +0200 Subject: DB\Errors: Fix DB errors from previous commit(s) --- sql/updates/world/2012_05_28_world_creature_ai_scripts.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_05_28_world_creature_ai_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql b/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql new file mode 100644 index 00000000000..94035eb9e08 --- /dev/null +++ b/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql @@ -0,0 +1,3 @@ +-- Fix recent DB errors +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27135; -- Attunement To Dalaran Kill Credit +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=32400; -- Tukemuth -- cgit v1.2.3 From 50d2f9f939c856864c3122e383a4bc503d4027cc Mon Sep 17 00:00:00 2001 From: Valcorb Date: Mon, 28 May 2012 02:48:30 +0200 Subject: DB\Errors: Fix recent DB errors (credits to Vincent-Michael) --- sql/updates/world/2012_05_28_world_creature_ai_scripts.sql | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql b/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql index 94035eb9e08..aef4e4c6f67 100644 --- a/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql +++ b/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql @@ -1,3 +1,9 @@ -- Fix recent DB errors DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27135; -- Attunement To Dalaran Kill Credit DELETE FROM `creature_ai_scripts` WHERE `creature_id`=32400; -- Tukemuth + +-- Fix recent DB errors (credits to Vincent-Michael) +DELETE FROM `creature_addon` WHERE `guid` = 2593; +DELETE FROM `creature_template_addon` WHERE `entry` = 2676; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(2676,0,0,0,4097,0,NULL); -- cgit v1.2.3 From ca07f30d0359bf5a6eecba8b9cc68702eca4071b Mon Sep 17 00:00:00 2001 From: joschiwald Date: Mon, 28 May 2012 04:07:51 +0200 Subject: Core/Spells: convert some spell effects to SpellScripts --- .../world/2012_05_28_00_world_spell_ranks.sql | 5 + .../2012_05_28_01_world_spell_script_names.sql | 38 ++++++ .../2012_05_28_02_world_spelldifficulty_dbc.sql | 5 + .../world/2012_05_28_03_world_conditions.sql | 7 ++ src/server/game/Entities/Unit/Unit.cpp | 81 ------------ src/server/game/Spells/Auras/SpellAuraEffects.cpp | 135 +------------------- src/server/game/Spells/Spell.cpp | 104 ++++----------- src/server/game/Spells/SpellEffects.cpp | 31 ----- src/server/game/Spells/SpellMgr.cpp | 19 ++- .../ShadowfangKeep/shadowfang_keep.cpp | 46 ++++++- .../EasternKingdoms/ZulAman/boss_hexlord.cpp | 140 +++++++++++++-------- .../TrialOfTheCrusader/boss_faction_champions.cpp | 62 +++++++-- .../Northrend/Naxxramas/boss_four_horsemen.cpp | 66 +++++++++- .../scripts/Northrend/Naxxramas/boss_gothik.cpp | 37 +++++- .../scripts/Northrend/Naxxramas/boss_kelthuzad.cpp | 42 +++++++ .../Ulduar/HallsOfLightning/boss_loken.cpp | 80 ++++++------ .../Northrend/Ulduar/Ulduar/boss_general_vezax.cpp | 42 +++++++ src/server/scripts/Spells/spell_dk.cpp | 16 ++- src/server/scripts/Spells/spell_druid.cpp | 125 +++++++++++++++++- src/server/scripts/Spells/spell_generic.cpp | 120 ++++++++++++++++++ src/server/scripts/Spells/spell_hunter.cpp | 29 +++++ src/server/scripts/Spells/spell_mage.cpp | 47 ++++++- src/server/scripts/Spells/spell_paladin.cpp | 92 ++++++++++++-- src/server/scripts/Spells/spell_priest.cpp | 46 +++++++ src/server/scripts/Spells/spell_shaman.cpp | 51 ++++++++ src/server/scripts/Spells/spell_warlock.cpp | 104 +++++++++++++++ 26 files changed, 1107 insertions(+), 463 deletions(-) create mode 100644 sql/updates/world/2012_05_28_00_world_spell_ranks.sql create mode 100644 sql/updates/world/2012_05_28_01_world_spell_script_names.sql create mode 100644 sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql create mode 100644 sql/updates/world/2012_05_28_03_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_00_world_spell_ranks.sql b/sql/updates/world/2012_05_28_00_world_spell_ranks.sql new file mode 100644 index 00000000000..f6641f2f095 --- /dev/null +++ b/sql/updates/world/2012_05_28_00_world_spell_ranks.sql @@ -0,0 +1,5 @@ +DELETE FROM `spell_ranks` WHERE `first_spell_id`=64694; +INSERT INTO `spell_ranks` (`first_spell_id`,`spell_id`,`rank`) VALUES +(64694,64694,1), +(64694,65263,2), +(64694,65264,3); diff --git a/sql/updates/world/2012_05_28_01_world_spell_script_names.sql b/sql/updates/world/2012_05_28_01_world_spell_script_names.sql new file mode 100644 index 00000000000..78054aa1555 --- /dev/null +++ b/sql/updates/world/2012_05_28_01_world_spell_script_names.sql @@ -0,0 +1,38 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (-633,781,-746,-8050,-34914,-44457,-48181,-30108,34438,34439,35183,43522,65812,68154,68155,68156,-33763,43421,52551,53608,57762,59990,66093,67957,67958,67959,7057,28832,28833,28834,28835,27831,55638,52942,59837,63322); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(-633, 'spell_pal_lay_on_hands'), +(781, 'spell_hun_disengage'), +(-746, 'spell_gen_bandage'), +(-8050, 'spell_sha_flame_shock'), +(-34914,'spell_pri_vampiric_touch'), +(-44457,'spell_mage_living_bomb'), +(-48181,'spell_warl_haunt'), +(-30108,'spell_warl_unstable_affliction'), +(34438, 'spell_warl_unstable_affliction'), -- using class spell script for generic spell because it uses class spell effect +(34439, 'spell_warl_unstable_affliction'), +(35183, 'spell_warl_unstable_affliction'), +(43522, 'spell_hexlord_unstable_affliction'), +(65812, 'spell_faction_champion_warl_unstable_affliction'), +(68154, 'spell_faction_champion_warl_unstable_affliction'), +(68155, 'spell_faction_champion_warl_unstable_affliction'), +(68156, 'spell_faction_champion_warl_unstable_affliction'), +(-33763,'spell_dru_lifebloom'), +(43421, 'spell_hexlord_lifebloom'), +(52551, 'spell_tur_ragepaw_lifebloom'), +(53608, 'spell_cenarion_scout_lifebloom'), +(57762, 'spell_twisted_visage_lifebloom'), +(59990, 'spell_twisted_visage_lifebloom'), +(66093, 'spell_faction_champion_dru_lifebloom'), +(67957, 'spell_faction_champion_dru_lifebloom'), +(67958, 'spell_faction_champion_dru_lifebloom'), +(67959, 'spell_faction_champion_dru_lifebloom'), +(7057, 'spell_shadowfang_keep_haunting_spirits'), +(28832, 'spell_four_horsemen_mark'), +(28833, 'spell_four_horsemen_mark'), +(28834, 'spell_four_horsemen_mark'), +(28835, 'spell_four_horsemen_mark'), +(27831, 'spell_gothic_shadow_bolt_volley'), +(55638, 'spell_gothic_shadow_bolt_volley'), +(52942, 'spell_loken_pulsing_shockwave'), +(59837, 'spell_loken_pulsing_shockwave'), +(63322, 'spell_general_vezax_saronite_vapors'); diff --git a/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql b/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql new file mode 100644 index 00000000000..93749c9c5cd --- /dev/null +++ b/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql @@ -0,0 +1,5 @@ +SET @DIFF := xxxx; -- set by TDB team +DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (@DIFF+0,@DIFF+1); +INSERT INTO `spelldifficulty_dbc` (`id`,`spelld0`,`spellid1`,`spelld2`,`spellid3`) VALUES +(@DIFF+0,57762,57763,0,0), +(@DIFF+1,59990,61489,0,0); diff --git a/sql/updates/world/2012_05_28_03_world_conditions.sql b/sql/updates/world/2012_05_28_03_world_conditions.sql new file mode 100644 index 00000000000..8369352481b --- /dev/null +++ b/sql/updates/world/2012_05_28_03_world_conditions.sql @@ -0,0 +1,7 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (19938,30877); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,19938,0,0,1,1,17743,0,0,0,0,'','Awaken Peon'), +(17,0,30877,0,0,31,1,3,17326,0,0,0,'','Tag Murloc'); + +-- Lifebinder's Gift +UPDATE `conditions` SET `SourceGroup`=7 WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (62584,64185); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index a04e2ac0e48..8e2738783dc 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3629,87 +3629,6 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint32 dispellerSpellId // Call AfterDispel hook on AuraScript aura->CallScriptAfterDispel(&dispelInfo); - switch (aura->GetSpellInfo()->SpellFamilyName) - { - case SPELLFAMILY_WARLOCK: - { - // Unstable Affliction (crash if before removeaura?) - if (aura->GetSpellInfo()->SpellFamilyFlags[1] & 0x0100) - { - Unit* caster = aura->GetCaster(); - if (!caster) - break; - if (AuraEffect const* aurEff = aura->GetEffect(EFFECT_0)) - { - int32 damage = aurEff->GetAmount() * 9; - // backfire damage and silence - caster->CastCustomSpell(dispeller, 31117, &damage, NULL, NULL, true, NULL, aurEff); - } - } - break; - } - case SPELLFAMILY_DRUID: - { - // Lifebloom - if (aura->GetSpellInfo()->SpellFamilyFlags[1] & 0x10) - { - if (AuraEffect const* aurEff = aura->GetEffect(EFFECT_1)) - { - // final heal - int32 healAmount = aurEff->GetAmount(); - if (Unit* caster = aura->GetCaster()) - { - healAmount = caster->SpellHealingBonusDone(this, aura->GetSpellInfo(), healAmount, HEAL, dispelInfo.GetRemovedCharges()); - healAmount = this->SpellHealingBonusTaken(aura->GetSpellInfo(), healAmount, HEAL, dispelInfo.GetRemovedCharges()); - } - CastCustomSpell(this, 33778, &healAmount, NULL, NULL, true, NULL, NULL, aura->GetCasterGUID()); - - // mana - if (Unit* caster = aura->GetCaster()) - { - int32 mana = CalculatePctU(caster->GetCreateMana(), aura->GetSpellInfo()->ManaCostPercentage) * chargesRemoved / 2; - caster->CastCustomSpell(caster, 64372, &mana, NULL, NULL, true, NULL, NULL, aura->GetCasterGUID()); - } - } - } - break; - } - case SPELLFAMILY_SHAMAN: - { - // Flame Shock - if (aura->GetSpellInfo()->SpellFamilyFlags[0] & 0x10000000) - { - if (Unit* caster = aura->GetCaster()) - { - uint32 triggeredSpellId = 0; - // Lava Flows - if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 3087, 0)) - { - switch (aurEff->GetId()) - { - case 51482: // Rank 3 - triggeredSpellId = 65264; - break; - case 51481: // Rank 2 - triggeredSpellId = 65263; - break; - case 51480: // Rank 1 - triggeredSpellId = 64694; - break; - default: - sLog->outError("Unit::RemoveAurasDueToSpellByDispel: Unknown rank of Lava Flows (%d) found", aurEff->GetId()); - } - } - - if (triggeredSpellId) - caster->CastSpell(caster, triggeredSpellId, true); - } - } - break; - } - default: - break; - } return; } else diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index e3d220d744f..c7eb4e83be8 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -777,33 +777,18 @@ void AuraEffect::CalculatePeriodic(Unit* caster, bool create, bool load) m_amplitude = 1 * IN_MILLISECONDS; case SPELL_AURA_PERIODIC_DAMAGE: case SPELL_AURA_PERIODIC_HEAL: - case SPELL_AURA_PERIODIC_ENERGIZE: case SPELL_AURA_OBS_MOD_HEALTH: + case SPELL_AURA_PERIODIC_TRIGGER_SPELL: + case SPELL_AURA_PERIODIC_ENERGIZE: case SPELL_AURA_PERIODIC_LEECH: case SPELL_AURA_PERIODIC_HEALTH_FUNNEL: case SPELL_AURA_PERIODIC_MANA_LEECH: case SPELL_AURA_PERIODIC_DAMAGE_PERCENT: case SPELL_AURA_POWER_BURN: - m_isPeriodic = true; - break; - case SPELL_AURA_PERIODIC_TRIGGER_SPELL: - if (GetId() == 51912) - m_amplitude = 3000; - m_isPeriodic = true; - break; - case SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE: case SPELL_AURA_PERIODIC_DUMMY: + case SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE: m_isPeriodic = true; break; - case SPELL_AURA_DUMMY: - // Haunting Spirits - perdiodic trigger demon - if (GetId() == 7057) - { - m_isPeriodic = true; - m_amplitude = irand (0, 60) + 30; - m_amplitude *= IN_MILLISECONDS; - } - break; default: break; } @@ -1099,14 +1084,6 @@ void AuraEffect::UpdatePeriodic(Unit* caster) { switch (GetAuraType()) { - case SPELL_AURA_DUMMY: - // Haunting Spirits - if (GetId() == 7057) - { - m_amplitude = irand (0, 60) + 30; - m_amplitude *= IN_MILLISECONDS; - } - break; case SPELL_AURA_PERIODIC_DUMMY: switch (GetSpellInfo()->SpellFamilyName) { @@ -1308,11 +1285,6 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) case SPELL_AURA_POWER_BURN: HandlePeriodicPowerBurnAuraTick(target, caster); break; - case SPELL_AURA_DUMMY: - // Haunting Spirits - if (GetId() == 7057) - target->CastSpell((Unit*)NULL, GetAmount(), true); - break; default: break; } @@ -4804,38 +4776,6 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (Unit* spellTarget = ObjectAccessor::GetUnit(*target, target->ToPlayer()->GetComboTarget())) target->CastSpell(spellTarget, 51699, true); break; - case 28832: // Mark of Korth'azz - case 28833: // Mark of Blaumeux - case 28834: // Mark of Rivendare - case 28835: // Mark of Zeliek - if (caster) // actually we can also use cast(this, originalcasterguid) - { - int32 damage; - switch (GetBase()->GetStackAmount()) - { - case 1: damage = 0; break; - case 2: damage = 500; break; - case 3: damage = 1000; break; - case 4: damage = 1500; break; - case 5: damage = 4000; break; - case 6: damage = 12000; break; - default:damage = 20000 + 1000 * (GetBase()->GetStackAmount() - 7); break; - } - if (damage) - caster->CastCustomSpell(28836, SPELLVALUE_BASE_POINT0, damage, target); - } - break; - case 63322: // Saronite Vapors - { - if (caster) - { - int32 mana = int32(GetAmount() * pow(2.0f, GetBase()->GetStackAmount())); // mana restore - bp * 2^stackamount - int32 damage = mana * 2; // damage - caster->CastCustomSpell(target, 63337, &mana, NULL, NULL, true); - caster->CastCustomSpell(target, 63338, &damage, NULL, NULL, true); - } - break; - } case 71563: if (Aura* newAura = target->AddAura(71564, target)) newAura->SetStackAmount(newAura->GetSpellInfo()->StackAmount); @@ -4929,57 +4869,6 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool break; } break; - case SPELLFAMILY_MAGE: - // Living Bomb - if (m_spellInfo->SpellFamilyFlags[1] & 0x20000) - { - AuraRemoveMode removeMode = aurApp->GetRemoveMode(); - if (caster && (removeMode == AURA_REMOVE_BY_ENEMY_SPELL || removeMode == AURA_REMOVE_BY_EXPIRE)) - caster->CastSpell(target, GetAmount(), true); - } - break; - case SPELLFAMILY_PRIEST: - // Vampiric Touch - if (m_spellInfo->SpellFamilyFlags[1] & 0x0400 && aurApp->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL && GetEffIndex() == 0) - if (AuraEffect const* aurEff = GetBase()->GetEffect(1)) - { - int32 damage = aurEff->GetAmount() * 8; - // backfire damage - target->CastCustomSpell(target, 64085, &damage, NULL, NULL, true, NULL, NULL, GetCasterGUID()); - } - break; - case SPELLFAMILY_WARLOCK: - // Haunt - if (m_spellInfo->SpellFamilyFlags[1] & 0x40000) - if (caster) - target->CastCustomSpell(caster, 48210, &m_amount, 0, 0, true, NULL, this, GetCasterGUID()); - break; - case SPELLFAMILY_DRUID: - // Lifebloom - if (GetSpellInfo()->SpellFamilyFlags[1] & 0x10) - { - // Final heal only on duration end - if (aurApp->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE) - return; - - // final heal - int32 stack = GetBase()->GetStackAmount(); - int32 heal = m_amount; - if (caster) - { - heal = caster->SpellHealingBonusDone(target, GetSpellInfo(), heal, HEAL, stack); - heal = target->SpellHealingBonusTaken(GetSpellInfo(), heal, HEAL, stack); - } - target->CastCustomSpell(target, 33778, &heal, &stack, NULL, true, NULL, this, GetCasterGUID()); - - // restore mana - if (caster) - { - int32 returnmana = CalculatePctU(caster->GetCreateMana(), GetSpellInfo()->ManaCostPercentage) * stack / 2; - caster->CastCustomSpell(caster, 64372, &returnmana, NULL, NULL, true, NULL, this, GetCasterGUID()); - } - } - break; case SPELLFAMILY_DEATHKNIGHT: // Summon Gargoyle (Dismiss Gargoyle at remove) if (GetId() == 61777) @@ -5087,16 +4976,6 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool } break; } - case 57723: // Exhaustion - case 57724: // Sated - { - switch (GetId()) - { - case 57723: target->ApplySpellImmune(GetId(), IMMUNITY_ID, 32182, apply); break; // Heroism - case 57724: target->ApplySpellImmune(GetId(), IMMUNITY_ID, 2825, apply); break; // Bloodlust - } - break; - } case 57819: // Argent Champion case 57820: // Ebon Champion case 57821: // Champion of the Kirin Tor @@ -5884,14 +5763,6 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) if (caster) caster->CastCustomSpell(29879, SPELLVALUE_BASE_POINT0, int32(target->CountPctFromMaxHealth(21)), target, true, NULL, this); return; - // Detonate Mana - case 27819: - if (int32 mana = (int32)(target->GetMaxPower(POWER_MANA) / 10)) - { - mana = target->ModifyPower(POWER_MANA, -mana); - target->CastCustomSpell(27820, SPELLVALUE_BASE_POINT0, -mana*10, target, true, NULL, this); - } - return; // Inoculate Nestlewood Owlkin case 29528: if (target->GetTypeId() != TYPEID_UNIT) // prevent error reports in case ignored player target diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 28b089f91cd..7c4cc47b886 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1288,18 +1288,6 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge maxSize = m_caster->HasAura(62970) ? 6 : 5; // Glyph of Wild Growth power = POWER_HEALTH; } - else if (m_spellInfo->SpellFamilyFlags[2] == 0x0100) // Starfall - { - // Remove targets not in LoS or in stealth - for (std::list::iterator itr = unitTargets.begin(); itr != unitTargets.end();) - { - if ((*itr)->HasStealthAura() || (*itr)->HasInvisibilityAura() || !(*itr)->IsWithinLOSInMap(m_caster)) - itr = unitTargets.erase(itr); - else - ++itr; - } - break; - } else break; @@ -1340,6 +1328,11 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge } } + // todo: move to scripts, but we must call it before resize list by MaxAffectedTargets + // Intimidating Shout + if (m_spellInfo->Id == 5246 && effIndex != EFFECT_0) + unitTargets.remove(m_targets.GetUnitTarget()); + // Other special target selection goes here if (uint32 maxTargets = m_spellValue->MaxAffectedTargets) { @@ -1348,8 +1341,6 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge if ((*j)->IsAffectedOnSpell(m_spellInfo)) maxTargets += (*j)->GetAmount(); - if (m_spellInfo->Id == 5246) //Intimidating Shout - unitTargets.remove(m_targets.GetUnitTarget()); Trinity::Containers::RandomResizeList(unitTargets, maxTargets); } @@ -2477,12 +2468,6 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) caster->DealSpellDamage(&damageInfo, true); - // Haunt - if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->SpellFamilyFlags[1] & 0x40000 && m_spellAura && m_spellAura->GetEffect(1)) - { - AuraEffect* aurEff = m_spellAura->GetEffect(1); - aurEff->SetAmount(CalculatePctU(aurEff->GetAmount(), damageInfo.damage)); - } m_damage = damageInfo.damage; } // Passive spell hits/misses or active spells only misses (only triggers) @@ -4825,19 +4810,9 @@ SpellCastResult Spell::CheckCast(bool strict) if (!(m_spellInfo->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS) && VMAP::VMapFactory::checkSpellForLoS(m_spellInfo->Id) && !m_caster->IsWithinLOSInMap(target)) return SPELL_FAILED_LINE_OF_SIGHT; } - else - { - if (m_caster->GetTypeId() == TYPEID_PLAYER) // Target - is player caster - { - // Lay on Hands - cannot be self-cast on paladin with Forbearance or after using Avenging Wrath - if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN && m_spellInfo->SpellFamilyFlags[0] & 0x0008000) - if (target->HasAura(61988)) // Immunity shield marker - return SPELL_FAILED_TARGET_AURASTATE; - } - } } - //Check for line of sight for spells with dest + // Check for line of sight for spells with dest if (m_targets.HasDst()) { float x, y, z; @@ -4936,7 +4911,8 @@ SpellCastResult Spell::CheckCast(bool strict) bool hasDispellableAura = false; bool hasNonDispelEffect = false; - for (int i = 0; i < MAX_SPELL_EFFECTS; i++) + uint32 dispelMask = 0; + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (m_spellInfo->Effects[i].Effect == SPELL_EFFECT_DISPEL) { if (m_spellInfo->Effects[i].IsTargetingArea() || m_spellInfo->AttributesEx & SPELL_ATTR1_MELEE_COMBAT_START) @@ -4944,17 +4920,8 @@ SpellCastResult Spell::CheckCast(bool strict) hasDispellableAura = true; break; } - if (Unit* target = m_targets.GetUnitTarget()) - { - DispelChargesList dispelList; - uint32 dispelMask = SpellInfo::GetDispelMask(DispelType(m_spellInfo->Effects[i].MiscValue)); - target->GetDispellableAuraList(m_caster, dispelMask, dispelList); - if (!dispelList.empty()) - { - hasDispellableAura = true; - break; - } - } + + dispelMask |= SpellInfo::GetDispelMask(DispelType(m_spellInfo->Effects[i].MiscValue)); } else if (m_spellInfo->Effects[i].IsEffect()) { @@ -4962,10 +4929,18 @@ SpellCastResult Spell::CheckCast(bool strict) break; } - if (!hasNonDispelEffect && !hasDispellableAura && m_spellInfo->HasEffect(SPELL_EFFECT_DISPEL) && !IsTriggered()) - return SPELL_FAILED_NOTHING_TO_DISPEL; + if (!hasNonDispelEffect && !hasDispellableAura && dispelMask && !IsTriggered()) + { + if (Unit* target = m_targets.GetUnitTarget()) + { + DispelChargesList dispelList; + target->GetDispellableAuraList(m_caster, dispelMask, dispelList); + if (dispelList.empty()) + return SPELL_FAILED_NOTHING_TO_DISPEL; + } + } - for (int i = 0; i < MAX_SPELL_EFFECTS; i++) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { // for effects of spells that have only one target switch (m_spellInfo->Effects[i].Effect) @@ -4977,25 +4952,6 @@ SpellCastResult Spell::CheckCast(bool strict) if (m_caster->IsInWater()) return SPELL_FAILED_ONLY_ABOVEWATER; } - else if (m_spellInfo->SpellIconID == 156) // Holy Shock - { - // spell different for friends and enemies - // hurt version required facing - if (m_targets.GetUnitTarget() && !m_caster->IsFriendlyTo(m_targets.GetUnitTarget()) && !m_caster->HasInArc(static_cast(M_PI), m_targets.GetUnitTarget())) - return SPELL_FAILED_UNIT_NOT_INFRONT; - } - else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] == 0x2000) // Death Coil (DeathKnight) - { - Unit* target = m_targets.GetUnitTarget(); - if (!target || (target->IsFriendlyTo(m_caster) && target->GetCreatureType() != CREATURE_TYPE_UNDEAD)) - return SPELL_FAILED_BAD_TARGETS; - } - else if (m_spellInfo->Id == 19938) // Awaken Peon - { - Unit* unit = m_targets.GetUnitTarget(); - if (!unit || !unit->HasAura(17743)) - return SPELL_FAILED_BAD_TARGETS; - } else if (m_spellInfo->Id == 52264) // Deliver Stolen Horse { if (!m_caster->FindNearestCreature(28653, 5)) @@ -5329,10 +5285,6 @@ SpellCastResult Spell::CheckCast(bool strict) } case SPELL_EFFECT_LEAP_BACK: { - // Spell 781 (Disengage) requires player to be in combat - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->Id == 781 && !m_caster->isInCombat()) - return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; - if (m_caster->HasUnitState(UNIT_STATE_ROOT)) { if (m_caster->GetTypeId() == TYPEID_PLAYER) @@ -5363,14 +5315,6 @@ SpellCastResult Spell::CheckCast(bool strict) //custom check switch (m_spellInfo->Id) { - // Tag Murloc - case 30877: - { - Unit* target = m_targets.GetUnitTarget(); - if (!target || target->GetEntry() != 17326) - return SPELL_FAILED_BAD_TARGETS; - break; - } case 61336: if (m_caster->GetTypeId() != TYPEID_PLAYER || !m_caster->ToPlayer()->IsInFeralForm()) return SPELL_FAILED_ONLY_SHAPESHIFT; @@ -7173,12 +7117,6 @@ void Spell::PrepareTriggersExecutedOnHit() // todo: move this to scripts switch (m_spellInfo->SpellFamilyName) { - case SPELLFAMILY_GENERIC: - { - if (m_spellInfo->Mechanic == MECHANIC_BANDAGE) // Bandages - m_preCastSpell = 11196; // Recently Bandaged - break; - } case SPELLFAMILY_MAGE: { // Permafrost diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 06493dd070a..4df34e1a62d 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -368,28 +368,6 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) damage = (distance > radius) ? 0 : int32(m_spellInfo->Effects[EFFECT_0].CalcValue(m_caster) * ((radius - distance)/radius)); break; } - // Loken Pulsing Shockwave - case 59837: - case 52942: - { - // don't damage self and only players - if (unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - float radius = m_spellInfo->Effects[EFFECT_0].CalcRadius(m_caster); - if (!radius) - return; - float distance = m_caster->GetDistance2d(unitTarget); - damage = (distance > radius) ? 0 : int32(m_spellInfo->Effects[EFFECT_0].CalcValue(m_caster) * distance); - break; - } - // TODO: add spell specific target requirement hook for spells - // Shadowbolts only affects targets with Shadow Mark (Gothik) - case 27831: - case 55638: - if (!unitTarget->HasAura(27825)) - return; - break; // Gargoyle Strike case 51963: { @@ -3569,15 +3547,6 @@ void Spell::EffectHealMaxHealth(SpellEffIndex /*effIndex*/) return; int32 addhealth; - if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN) // Lay on Hands - { - if (m_caster->GetGUID() == unitTarget->GetGUID()) - { - m_caster->CastSpell(m_caster, 25771, true); // Forbearance - m_caster->CastSpell(m_caster, 61988, true); // Immune shield marker (serverside) - m_caster->CastSpell(m_caster, 61987, true); // Avenging Wrath marker - } - } // damage == 0 - heal for caster max health if (damage == 0) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 06e4978eb58..87373321a36 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2960,8 +2960,10 @@ void SpellMgr::LoadDbcDataCorrections() switch (spellInfo->Id) { - case 40244: case 40245: // Simon Game Visual - case 40246: case 40247: // Simon Game Visual + case 40244: // Simon Game Visual + case 40245: // Simon Game Visual + case 40246: // Simon Game Visual + case 40247: // Simon Game Visual case 42835: // Spout, remove damage effect, only anim is needed spellInfo->Effect[0] = 0; break; @@ -3125,6 +3127,9 @@ void SpellMgr::LoadDbcDataCorrections() case 51852: // The Eye of Acherus (no spawn in phase 2 in db) spellInfo->EffectMiscValue[0] |= 1; break; + case 51912: // Crafty's Ultra-Advanced Proto-Typical Shortening Blaster + spellInfo->EffectAmplitude[0] = 3000; + break; case 29809: // Desecration Arm - 36 instead of 37 - typo? :/ spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_7_YARDS; break; @@ -3293,11 +3298,6 @@ void SpellMgr::LoadDbcDataCorrections() // that will be clear if we get more spells with problem like this spellInfo->AttributesEx |= SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY; break; - case 62584: // Lifebinder's Gift - case 64185: // Lifebinder's Gift - spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_NEARBY_ENTRY; - spellInfo->EffectImplicitTargetB[2] = TARGET_UNIT_NEARBY_ENTRY; - break; case 62301: // Cosmic Smash (Algalon the Observer) spellInfo->MaxAffectedTargets = 1; break; @@ -3539,11 +3539,6 @@ void SpellMgr::LoadDbcDataCorrections() switch (spellInfo->SpellFamilyName) { - case SPELLFAMILY_DRUID: - // Starfall Target Selection - if (spellInfo->SpellFamilyFlags[2] & 0x100) - spellInfo->MaxAffectedTargets = 2; - break; case SPELLFAMILY_PALADIN: // Seals of the Pure should affect Seal of Righteousness if (spellInfo->SpellIconID == 25 && spellInfo->Attributes & SPELL_ATTR0_PASSIVE) diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 63e753a18ba..676cd7be4f0 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -27,7 +27,11 @@ EndScriptData */ npc_shadowfang_prisoner EndContentData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "ScriptedEscortAI.h" #include "shadowfang_keep.h" @@ -193,8 +197,48 @@ public: }; +class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader +{ + public: + spell_shadowfang_keep_haunting_spirits() : SpellScriptLoader("spell_shadowfang_keep_haunting_spirits") { } + + class spell_shadowfang_keep_haunting_spirits_AuraScript : public AuraScript + { + PrepareAuraScript(spell_shadowfang_keep_haunting_spirits_AuraScript); + + void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) + { + isPeriodic = true; + amplitude = (irand(0, 60) + 30) * IN_MILLISECONDS; + } + + void HandleDummyTick(AuraEffect const* aurEff) + { + GetTarget()->CastSpell((Unit*)NULL, aurEff->GetAmount(), true); + } + + void HandleUpdatePeriodic(AuraEffect* aurEff) + { + aurEff->CalculatePeriodic(GetCaster()); + } + + void Register() + { + DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_shadowfang_keep_haunting_spirits_AuraScript::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_shadowfang_keep_haunting_spirits_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_shadowfang_keep_haunting_spirits_AuraScript::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_DUMMY); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_shadowfang_keep_haunting_spirits_AuraScript(); + } +}; + void AddSC_shadowfang_keep() { new npc_shadowfang_prisoner(); new npc_arugal_voidwalker(); + new spell_shadowfang_keep_haunting_spirits(); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index b5698d851f8..4fcfa8a046e 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -23,7 +23,10 @@ SDComment: SDCategory: Zul'Aman EndScriptData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "zulaman.h" #define YELL_AGGRO "Da shadow gonna fall on you... " @@ -47,54 +50,58 @@ EndScriptData */ //Defines for various powers he uses after using soul drain -//Druid -#define SPELL_DR_LIFEBLOOM 43421 -#define SPELL_DR_THORNS 43420 -#define SPELL_DR_MOONFIRE 43545 - -//Hunter -#define SPELL_HU_EXPLOSIVE_TRAP 43444 -#define SPELL_HU_FREEZING_TRAP 43447 -#define SPELL_HU_SNAKE_TRAP 43449 - -//Mage -#define SPELL_MG_FIREBALL 41383 -#define SPELL_MG_FROSTBOLT 43428 -#define SPELL_MG_FROST_NOVA 43426 -#define SPELL_MG_ICE_LANCE 43427 - -//Paladin -#define SPELL_PA_CONSECRATION 43429 -#define SPELL_PA_HOLY_LIGHT 43451 -#define SPELL_PA_AVENGING_WRATH 43430 - -//Priest -#define SPELL_PR_HEAL 41372 -#define SPELL_PR_MIND_CONTROL 43550 -#define SPELL_PR_MIND_BLAST 41374 -#define SPELL_PR_SW_DEATH 41375 -#define SPELL_PR_PSYCHIC_SCREAM 43432 -#define SPELL_PR_PAIN_SUPP 44416 - -//Rogue -#define SPELL_RO_BLIND 43433 -#define SPELL_RO_SLICE_DICE 43457 -#define SPELL_RO_WOUND_POISON 39665 - -//Shaman -#define SPELL_SH_FIRE_NOVA 43436 -#define SPELL_SH_HEALING_WAVE 43548 -#define SPELL_SH_CHAIN_LIGHT 43435 - -//Warlock -#define SPELL_WL_CURSE_OF_DOOM 43439 -#define SPELL_WL_RAIN_OF_FIRE 43440 -#define SPELL_WL_UNSTABLE_AFFL 35183 - -//Warrior -#define SPELL_WR_SPELL_REFLECT 43443 -#define SPELL_WR_WHIRLWIND 43442 -#define SPELL_WR_MORTAL_STRIKE 43441 +enum Spells +{ + // Druid + SPELL_DR_THORNS = 43420, + SPELL_DR_LIFEBLOOM = 43421, + SPELL_DR_MOONFIRE = 43545, + + // Hunter + SPELL_HU_EXPLOSIVE_TRAP = 43444, + SPELL_HU_FREEZING_TRAP = 43447, + SPELL_HU_SNAKE_TRAP = 43449, + + // Mage + SPELL_MG_FIREBALL = 41383, + SPELL_MG_FROST_NOVA = 43426, + SPELL_MG_ICE_LANCE = 43427, + SPELL_MG_FROSTBOLT = 43428, + + // Paladin + SPELL_PA_CONSECRATION = 43429, + SPELL_PA_AVENGING_WRATH = 43430, + SPELL_PA_HOLY_LIGHT = 43451, + + // Priest + SPELL_PR_HEAL = 41372, + SPELL_PR_MIND_BLAST = 41374, + SPELL_PR_SW_DEATH = 41375, + SPELL_PR_PSYCHIC_SCREAM = 43432, + SPELL_PR_MIND_CONTROL = 43550, + SPELL_PR_PAIN_SUPP = 44416, + + // Rogue + SPELL_RO_BLIND = 43433, + SPELL_RO_SLICE_DICE = 43457, + SPELL_RO_WOUND_POISON = 43461, + + // Shaman + SPELL_SH_CHAIN_LIGHT = 43435, + SPELL_SH_FIRE_NOVA = 43436, + SPELL_SH_HEALING_WAVE = 43548, + + // Warlock + SPELL_WL_CURSE_OF_DOOM = 43439, + SPELL_WL_RAIN_OF_FIRE = 43440, + SPELL_WL_UNSTABLE_AFFL = 43522, + SPELL_WL_UNSTABLE_AFFL_DISPEL = 43523, + + // Warrior + SPELL_WR_MORTAL_STRIKE = 43441, + SPELL_WR_WHIRLWIND = 43442, + SPELL_WR_SPELL_REFLECT = 43443 +}; #define ORIENT 1.5696f #define POS_Y 921.2795f @@ -936,6 +943,40 @@ class boss_koragg : public CreatureScript } }; +class spell_hexlord_unstable_affliction : public SpellScriptLoader +{ + public: + spell_hexlord_unstable_affliction() : SpellScriptLoader("spell_hexlord_unstable_affliction") { } + + class spell_hexlord_unstable_affliction_AuraScript : public AuraScript + { + PrepareAuraScript(spell_hexlord_unstable_affliction_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_WL_UNSTABLE_AFFL_DISPEL)) + return false; + return true; + } + + void HandleDispel(DispelInfo* dispelInfo) + { + if (Unit* caster = GetCaster()) + caster->CastSpell(dispelInfo->GetDispeller(), SPELL_WL_UNSTABLE_AFFL_DISPEL, true, NULL, GetEffect(EFFECT_0)); + } + + void Register() + { + AfterDispel += AuraDispelFn(spell_hexlord_unstable_affliction_AuraScript::HandleDispel); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_hexlord_unstable_affliction_AuraScript(); + } +}; + void AddSC_boss_hex_lord_malacrass() { new boss_hexlord_malacrass(); @@ -947,5 +988,6 @@ void AddSC_boss_hex_lord_malacrass() new boss_fenstalker(); new boss_koragg(); new boss_alyson_antille(); + new spell_hexlord_unstable_affliction(); } 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 79bbb470edf..3b0aeb958cb 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -27,7 +27,10 @@ EndScriptData */ // All - untested // Pets aren't being summoned by their masters -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "trial_of_the_crusader.h" enum eYell @@ -945,18 +948,18 @@ public: }; -enum eWarlockSpells +enum WarlockSpells { - SPELL_HELLFIRE = 65816, - SPELL_CORRUPTION = 65810, - SPELL_CURSE_OF_AGONY = 65814, - SPELL_CURSE_OF_EXHAUSTION = 65815, - SPELL_FEAR = 65809, //8s - SPELL_SEARING_PAIN = 65819, - SPELL_SHADOW_BOLT = 65821, - SPELL_UNSTABLE_AFFLICTION = 65812, - SPELL_SUMMON_FELHUNTER = 67514, - H_SPELL_UNSTABLE_AFFLICTION = 68155, //15s + SPELL_HELLFIRE = 65816, + SPELL_CORRUPTION = 65810, + SPELL_CURSE_OF_AGONY = 65814, + SPELL_CURSE_OF_EXHAUSTION = 65815, + SPELL_FEAR = 65809, // 8s + SPELL_SEARING_PAIN = 65819, + SPELL_SHADOW_BOLT = 65821, + SPELL_UNSTABLE_AFFLICTION = 65812, // 15s + SPELL_UNSTABLE_AFFLICTION_DISPEL = 65813, + SPELL_SUMMON_FELHUNTER = 67514, }; class mob_toc_warlock : public CreatureScript @@ -2030,6 +2033,40 @@ public: }; }; +class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader +{ + public: + spell_faction_champion_warl_unstable_affliction() : SpellScriptLoader("spell_faction_champion_warl_unstable_affliction") { } + + class spell_faction_champion_warl_unstable_affliction_AuraScript : public AuraScript + { + PrepareAuraScript(spell_faction_champion_warl_unstable_affliction_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_UNSTABLE_AFFLICTION_DISPEL)) + return false; + return true; + } + + void HandleDispel(DispelInfo* dispelInfo) + { + if (Unit* caster = GetCaster()) + caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, NULL, GetEffect(EFFECT_0)); + } + + void Register() + { + AfterDispel += AuraDispelFn(spell_faction_champion_warl_unstable_affliction_AuraScript::HandleDispel); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_faction_champion_warl_unstable_affliction_AuraScript(); + } +}; + void AddSC_boss_faction_champions() { new boss_toc_champion_controller(); @@ -2049,4 +2086,5 @@ void AddSC_boss_faction_champions() new mob_toc_retro_paladin(); new mob_toc_pet_warlock(); new mob_toc_pet_hunter(); + new spell_faction_champion_warl_unstable_affliction(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 17ed6a79c76..f81ddbf6bf8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -15,7 +15,10 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "naxxramas.h" enum Horsemen @@ -26,6 +29,11 @@ enum Horsemen HORSEMEN_SIR, }; +enum Spells +{ + SPELL_MARK_DAMAGE = 28836 +}; + enum Events { EVENT_NONE, @@ -395,7 +403,63 @@ public: }; +class spell_four_horsemen_mark : public SpellScriptLoader +{ + public: + spell_four_horsemen_mark() : SpellScriptLoader("spell_four_horsemen_mark") { } + + class spell_four_horsemen_mark_AuraScript : public AuraScript + { + PrepareAuraScript(spell_four_horsemen_mark_AuraScript); + + void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + { + int32 damage; + switch (GetStackAmount()) + { + case 1: + damage = 0; + break; + case 2: + damage = 500; + break; + case 3: + damage = 1000; + break; + case 4: + damage = 1500; + break; + case 5: + damage = 4000; + break; + case 6: + damage = 12000; + break; + default: + damage = 20000 + 1000 * (GetStackAmount() - 7); + break; + } + if (damage) + caster->CastCustomSpell(SPELL_MARK_DAMAGE, SPELLVALUE_BASE_POINT0, damage, GetTarget()); + } + } + + void Register() + { + AfterEffectApply += AuraEffectApplyFn(spell_four_horsemen_mark_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_four_horsemen_mark_AuraScript(); + } +}; + void AddSC_boss_four_horsemen() { new boss_four_horsemen(); + new spell_four_horsemen_mark(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 8d23de5427c..227dfaada9c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -15,7 +15,9 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" #include "naxxramas.h" enum Yells @@ -25,6 +27,7 @@ enum Yells SAY_DEATH = -1533042, SAY_TELEPORT = -1533043 }; + //Gothik enum Spells { @@ -36,8 +39,11 @@ enum Spells SPELL_INFORM_LIVE_RIDER = 27935, SPELL_INFORM_DEAD_TRAINEE = 27915, SPELL_INFORM_DEAD_KNIGHT = 27931, - SPELL_INFORM_DEAD_RIDER = 27937 + SPELL_INFORM_DEAD_RIDER = 27937, + + SPELL_SHADOW_MARK = 27825 }; + enum Creatures { MOB_LIVE_TRAINEE = 16124, @@ -585,8 +591,35 @@ class mob_gothik_minion : public CreatureScript } }; +class spell_gothic_shadow_bolt_volley : public SpellScriptLoader +{ + public: + spell_gothic_shadow_bolt_volley() : SpellScriptLoader("spell_gothic_shadow_bolt_volley") { } + + class spell_gothic_shadow_bolt_volley_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gothic_shadow_bolt_volley_SpellScript); + + void FilterTargets(std::list& unitList) + { + unitList.remove_if(Trinity::UnitAuraCheck(false, SPELL_SHADOW_MARK)); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_gothic_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gothic_shadow_bolt_volley_SpellScript(); + } +}; + void AddSC_boss_gothik() { new boss_gothik(); new mob_gothik_minion(); + new spell_gothic_shadow_bolt_volley(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 4d6bfc578ff..f6c65f9c67d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -86,6 +86,7 @@ enum Spells SPELL_SHADOW_FISURE = 27810, SPELL_VOID_BLAST = 27812, SPELL_MANA_DETONATION = 27819, + SPELL_MANA_DETONATION_DAMAGE = 27820, SPELL_FROST_BLAST = 27808, SPELL_CHAINS_OF_KELTHUZAD = 28410, //28408 script effect SPELL_KELTHUZAD_CHANNEL = 29423, @@ -773,6 +774,46 @@ class npc_kelthuzad_abomination : public CreatureScript } }; +class spell_kelthuzad_detonate_mana : public SpellScriptLoader +{ + public: + spell_kelthuzad_detonate_mana() : SpellScriptLoader("spell_kelthuzad_detonate_mana") { } + + class spell_kelthuzad_detonate_mana_AuraScript : public AuraScript + { + PrepareAuraScript(spell_kelthuzad_detonate_mana_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_MANA_DETONATION_DAMAGE)) + return false; + return true; + } + + void HandleScript(AuraEffect const* aurEff) + { + PreventDefaultAction(); + + Unit* target = GetTarget(); + if (int32 mana = int32(target->GetMaxPower(POWER_MANA) / 10)) + { + mana = target->ModifyPower(POWER_MANA, -mana); + target->CastCustomSpell(SPELL_MANA_DETONATION_DAMAGE, SPELLVALUE_BASE_POINT0, -mana * 10, target, true, NULL, aurEff); + } + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_kelthuzad_detonate_mana_AuraScript::HandleScript, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_kelthuzad_detonate_mana_AuraScript(); + } +}; + class achievement_just_cant_get_enough : public AchievementCriteriaScript { public: @@ -796,5 +837,6 @@ void AddSC_boss_kelthuzad() new boss_kelthuzad(); new at_kelthuzad_center(); new npc_kelthuzad_abomination(); + new spell_kelthuzad_detonate_mana(); new achievement_just_cant_get_enough(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 2e2744baa3c..0034747c6c2 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -19,11 +19,13 @@ /* ScriptData SDName: Boss Loken SD%Complete: 60% -SDComment: Missing intro. Remove hack of Pulsing Shockwave when core supports. Aura is not working (59414) +SDComment: Missing intro. Aura is not working (59414) SDCategory: Halls of Lightning EndScriptData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" #include "halls_of_lightning.h" enum eEnums @@ -73,22 +75,16 @@ public: InstanceScript* instance; - bool m_bIsAura; - uint32 m_uiArcLightning_Timer; uint32 m_uiLightningNova_Timer; - uint32 m_uiPulsingShockwave_Timer; uint32 m_uiResumePulsingShockwave_Timer; uint32 m_uiHealthAmountModifier; void Reset() { - m_bIsAura = false; - m_uiArcLightning_Timer = 15000; m_uiLightningNova_Timer = 20000; - m_uiPulsingShockwave_Timer = 2000; m_uiResumePulsingShockwave_Timer = 15000; m_uiHealthAmountModifier = 1; @@ -130,44 +126,14 @@ public: if (!UpdateVictim()) return; - if (m_bIsAura) - { - // workaround for PULSING_SHOCKWAVE - if (m_uiPulsingShockwave_Timer <= uiDiff) - { - Map* map = me->GetMap(); - if (map->IsDungeon()) - { - Map::PlayerList const &PlayerList = map->GetPlayers(); - - if (PlayerList.isEmpty()) - return; - - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource() && i->getSource()->isAlive() && i->getSource()->isTargetableForAttack()) - { - int32 dmg; - float m_fDist = me->GetExactDist(i->getSource()->GetPositionX(), i->getSource()->GetPositionY(), i->getSource()->GetPositionZ()); - - dmg = DUNGEON_MODE(100, 150); // need to correct damage - if (m_fDist > 1.0f) // Further from 1 yard - dmg = int32(dmg*m_fDist); - - me->CastCustomSpell(i->getSource(), DUNGEON_MODE(52942, 59837), &dmg, 0, 0, false); - } - } - m_uiPulsingShockwave_Timer = 2000; - } else m_uiPulsingShockwave_Timer -= uiDiff; - } - else + if (m_uiResumePulsingShockwave_Timer) { if (m_uiResumePulsingShockwave_Timer <= uiDiff) { //breaks at movement, can we assume when it's time, this spell is casted and also must stop movement? DoCast(me, SPELL_PULSING_SHOCKWAVE_AURA, true); - DoCast(me, SPELL_PULSING_SHOCKWAVE_N); // need core support - m_bIsAura = true; + DoCast(me, SPELL_PULSING_SHOCKWAVE_N, true); m_uiResumePulsingShockwave_Timer = 0; } else @@ -190,7 +156,7 @@ public: Talk(EMOTE_NOVA); DoCast(me, SPELL_LIGHTNING_NOVA_N); - m_bIsAura = false; + me->RemoveAurasDueToSpell(DUNGEON_MODE(SPELL_PULSING_SHOCKWAVE_N, SPELL_PULSING_SHOCKWAVE_H)); m_uiResumePulsingShockwave_Timer = DUNGEON_MODE(5000, 4000); // Pause Pulsing Shockwave aura m_uiLightningNova_Timer = urand(20000, 21000); } @@ -216,7 +182,39 @@ public: }; +class spell_loken_pulsing_shockwave : public SpellScriptLoader +{ + public: + spell_loken_pulsing_shockwave() : SpellScriptLoader("spell_loken_pulsing_shockwave") { } + + class spell_loken_pulsing_shockwave_SpellScript : public SpellScript + { + PrepareSpellScript(spell_loken_pulsing_shockwave_SpellScript); + + void CalculateDamage() + { + if (!GetHitUnit()) + return; + + float distance = GetCaster()->GetDistance2d(GetHitUnit()); + if (distance > 1.0f) + SetHitDamage(int32(GetHitDamage() * distance)); + } + + void Register() + { + OnHit += SpellHitFn(spell_loken_pulsing_shockwave_SpellScript::CalculateDamage); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_loken_pulsing_shockwave_SpellScript(); + } +}; + void AddSC_boss_loken() { new boss_loken(); + new spell_loken_pulsing_shockwave(); } 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 3556bf188de..8090b9e8a3e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -51,6 +51,8 @@ enum VezaxSpells SPELL_SHADOW_CRASH_HIT = 62659, SPELL_SURGE_OF_DARKNESS = 62662, SPELL_SARONITE_VAPORS = 63323, + SPELL_SARONITE_VAPORS_ENERGIZE = 63337, + SPELL_SARONITE_VAPORS_DAMAGE = 63338, SPELL_SUMMON_SARONITE_VAPORS = 63081, SPELL_BERSERK = 26662, @@ -463,6 +465,45 @@ class spell_mark_of_the_faceless : public SpellScriptLoader } }; +class spell_general_vezax_saronite_vapors : public SpellScriptLoader +{ + public: + spell_general_vezax_saronite_vapors() : SpellScriptLoader("spell_general_vezax_saronite_vapors") { } + + class spell_general_vezax_saronite_vapors_AuraScript : public AuraScript + { + PrepareAuraScript(spell_general_vezax_saronite_vapors_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_SARONITE_VAPORS_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_SARONITE_VAPORS_DAMAGE)) + return false; + return true; + } + + void HandleEffectApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + { + int32 mana = int32(aurEff->GetAmount() * pow(2.0f, GetStackAmount())); // mana restore - bp * 2^stackamount + int32 damage = mana * 2; + caster->CastCustomSpell(GetTarget(), SPELL_SARONITE_VAPORS_ENERGIZE, &mana, NULL, NULL, true); + caster->CastCustomSpell(GetTarget(), SPELL_SARONITE_VAPORS_DAMAGE, &damage, NULL, NULL, true); + } + } + + void Register() + { + AfterEffectApply += AuraEffectApplyFn(spell_general_vezax_saronite_vapors_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_general_vezax_saronite_vapors_AuraScript(); + } +}; + class achievement_shadowdodger : public AchievementCriteriaScript { public: @@ -509,6 +550,7 @@ void AddSC_boss_general_vezax() new boss_saronite_animus(); new npc_saronite_vapors(); new spell_mark_of_the_faceless(); + new spell_general_vezax_saronite_vapors(); new achievement_shadowdodger(); new achievement_smell_saronite(); } diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 13190ed013f..2f778336433 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -723,14 +723,25 @@ class spell_dk_death_coil : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_coil_SpellScript); - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*spell*/) { if (!sSpellMgr->GetSpellInfo(SPELL_DEATH_COIL_DAMAGE) || !sSpellMgr->GetSpellInfo(SPELL_DEATH_COIL_HEAL)) return false; return true; } - void HandleDummy(SpellEffIndex /* effIndex */) + SpellCastResult CheckCast() + { + Unit* caster = GetCaster(); + if (Unit* target = GetExplTargetUnit()) + { + if (target->IsFriendlyTo(caster) && target->GetCreatureType() != CREATURE_TYPE_UNDEAD) + return SPELL_FAILED_BAD_TARGETS; + } + return SPELL_CAST_OK; + } + + void HandleDummy(SpellEffIndex /*effIndex*/) { int32 damage = GetEffectValue(); Unit* caster = GetCaster(); @@ -752,6 +763,7 @@ class spell_dk_death_coil : public SpellScriptLoader void Register() { + OnCheckCast += SpellCheckCastFn(spell_dk_death_coil_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 898350dbd71..7fe7c769a33 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -28,7 +28,9 @@ enum DruidSpells { DRUID_INCREASED_MOONFIRE_DURATION = 38414, - DRUID_NATURES_SPLENDOR = 57865 + DRUID_NATURES_SPLENDOR = 57865, + DRUID_LIFEBLOOM_FINAL_HEAL = 33778, + DRUID_LIFEBLOOM_ENERGIZE = 64372 }; // 54846 Glyph of Starfire @@ -154,7 +156,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while Stunned in Cat Form - if (GetTarget()->GetShapeshiftForm() == FORM_CAT && GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<GetShapeshiftForm() == FORM_CAT && GetTarget()->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<HasStealthAura() || target->HasInvisibilityAura()) + return true; + + if (!target->IsWithinLOSInMap(_caster)) + return true; + + return false; + } + + private: + Unit* _caster; +}; + class spell_dru_starfall_dummy : public SpellScriptLoader { public: @@ -337,7 +359,14 @@ class spell_dru_starfall_dummy : public SpellScriptLoader { PrepareSpellScript(spell_dru_starfall_dummy_SpellScript); - void HandleDummy(SpellEffIndex /* effIndex */) + void FilterTargets(std::list& unitList) + { + // Remove targets not in LoS or in stealth + unitList.remove_if(StarfallDummyTargetFilter(GetCaster())); + Trinity::Containers::RandomResizeList(unitList, 2); + } + + void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); // Shapeshifting into an animal form or mounting cancels the effect @@ -348,15 +377,16 @@ class spell_dru_starfall_dummy : public SpellScriptLoader return; } - //Any effect which causes you to lose control of your character will supress the starfall effect. + // Any effect which causes you to lose control of your character will supress the starfall effect. if (caster->HasUnitState(UNIT_STATE_CONTROLLED)) return; - caster->CastSpell(GetHitUnit(), GetEffectValue(), true); + caster->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } void Register() { + OnUnitTargetSelect += SpellUnitTargetFn(spell_dru_starfall_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_dru_starfall_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -367,6 +397,90 @@ class spell_dru_starfall_dummy : public SpellScriptLoader } }; +class spell_dru_lifebloom : public SpellScriptLoader +{ + public: + spell_dru_lifebloom() : SpellScriptLoader("spell_dru_lifebloom") { } + + class spell_dru_lifebloom_AuraScript : public AuraScript + { + PrepareAuraScript(spell_dru_lifebloom_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(DRUID_LIFEBLOOM_FINAL_HEAL)) + return false; + if (!sSpellMgr->GetSpellInfo(DRUID_LIFEBLOOM_ENERGIZE)) + return false; + return true; + } + + void AfterRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + // Final heal only on duration end + if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE) + return; + + // final heal + int32 stack = GetStackAmount(); + int32 healAmount = aurEff->GetAmount(); + Unit* caster = GetCaster(); + if (caster) + { + healAmount = caster->SpellHealingBonusDone(GetTarget(), GetSpellInfo(), healAmount, HEAL, stack); + healAmount = GetTarget()->SpellHealingBonusTaken(GetSpellInfo(), healAmount, HEAL, stack); + } + + GetTarget()->CastCustomSpell(GetTarget(), DRUID_LIFEBLOOM_FINAL_HEAL, &healAmount, NULL, NULL, true, NULL, aurEff, GetCasterGUID()); + + // restore mana + if (caster) + { + int32 returnMana = CalculatePctU(caster->GetCreateMana(), GetSpellInfo()->ManaCostPercentage) * stack / 2; + caster->CastCustomSpell(caster, DRUID_LIFEBLOOM_ENERGIZE, &returnMana, NULL, NULL, true, NULL, aurEff, GetCasterGUID()); + } + } + + void HandleDispel(DispelInfo* dispelInfo) + { + if (Unit* target = GetUnitOwner()) + { + if (AuraEffect const* aurEff = GetEffect(EFFECT_1)) + { + // final heal + int32 healAmount = aurEff->GetAmount(); + Unit* caster = GetCaster(); + if (caster) + { + healAmount = caster->SpellHealingBonusDone(target, GetSpellInfo(), healAmount, HEAL, dispelInfo->GetRemovedCharges()); + healAmount = target->SpellHealingBonusTaken(GetSpellInfo(), healAmount, HEAL, dispelInfo->GetRemovedCharges()); + } + + target->CastCustomSpell(target, DRUID_LIFEBLOOM_FINAL_HEAL, &healAmount, NULL, NULL, true, NULL, NULL, GetCasterGUID()); + + // restore mana + if (caster) + { + int32 returnMana = CalculatePctU(caster->GetCreateMana(), GetSpellInfo()->ManaCostPercentage) * dispelInfo->GetRemovedCharges() / 2; + caster->CastCustomSpell(caster, DRUID_LIFEBLOOM_ENERGIZE, &returnMana, NULL, NULL, true, NULL, NULL, GetCasterGUID()); + } + } + } + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_dru_lifebloom_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterDispel += AuraDispelFn(spell_dru_lifebloom_AuraScript::HandleDispel); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_dru_lifebloom_AuraScript(); + } +}; + void AddSC_druid_spell_scripts() { new spell_dru_glyph_of_starfire(); @@ -377,4 +491,5 @@ void AddSC_druid_spell_scripts() new spell_dru_starfall_aoe(); new spell_dru_swift_flight_passive(); new spell_dru_starfall_dummy(); + new spell_dru_lifebloom(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 501c7c47676..bd8f6e3b387 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2688,6 +2688,120 @@ public: } }; +enum GenericBandage +{ + SPELL_RECENTLY_BANDAGED = 11196, +}; + +class spell_gen_bandage : public SpellScriptLoader +{ + public: + spell_gen_bandage() : SpellScriptLoader("spell_gen_bandage") { } + + class spell_gen_bandage_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_bandage_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_RECENTLY_BANDAGED)) + return false; + return true; + } + + SpellCastResult CheckCast() + { + if (Unit* target = GetExplTargetUnit()) + { + if (target->HasAura(SPELL_RECENTLY_BANDAGED)) + return SPELL_FAILED_TARGET_AURASTATE; + } + return SPELL_CAST_OK; + } + + void HandleScript() + { + if (Unit* target = GetHitUnit()) + GetCaster()->CastSpell(target, SPELL_RECENTLY_BANDAGED, true); + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_gen_bandage_SpellScript::CheckCast); + AfterHit += SpellHitFn(spell_gen_bandage_SpellScript::HandleScript); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gen_bandage_SpellScript(); + } +}; + +enum GenericLifebloom +{ + SPELL_HEXLORD_MALACRASS_LIFEBLOOM_FINAL_HEAL = 43422, + SPELL_TUR_RAGEPAW_LIFEBLOOM_FINAL_HEAL = 52552, + SPELL_CENARION_SCOUT_LIFEBLOOM_FINAL_HEAL = 53692, + SPELL_TWISTED_VISAGE_LIFEBLOOM_FINAL_HEAL = 57763, + SPELL_FACTION_CHAMPIONS_DRU_LIFEBLOOM_FINAL_HEAL = 66094, +}; + +class spell_gen_lifebloom : public SpellScriptLoader +{ + public: + spell_gen_lifebloom(const char* name, uint32 spellId) : SpellScriptLoader(name), _spellId(spellId) { } + + class spell_gen_lifebloom_AuraScript : public AuraScript + { + PrepareAuraScript(spell_gen_lifebloom_AuraScript); + + public: + spell_gen_lifebloom_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(_spellId)) + return false; + return true; + } + + void AfterRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + // Final heal only on duration end + if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE) + return; + + // final heal + GetTarget()->CastSpell(GetTarget(), _spellId, true, NULL, aurEff, GetCasterGUID()); + } + + void HandleDispel(DispelInfo* /*dispelInfo*/) + { + // final heal + if (Unit* target = GetUnitOwner()) + target->CastSpell(target, _spellId, true, NULL, GetEffect(EFFECT_0), GetCasterGUID()); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_gen_lifebloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); + AfterDispel += AuraDispelFn(spell_gen_lifebloom_AuraScript::HandleDispel); + } + + private: + uint32 _spellId; + }; + + AuraScript* GetAuraScript() const + { + return new spell_gen_lifebloom_AuraScript(_spellId); + } + + private: + uint32 _spellId; +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -2742,4 +2856,10 @@ void AddSC_generic_spell_scripts() new spell_gen_count_pct_from_max_hp("spell_gen_default_count_pct_from_max_hp"); new spell_gen_count_pct_from_max_hp("spell_gen_50pct_count_pct_from_max_hp", 50); new spell_gen_despawn_self(); + new spell_gen_bandage(); + new spell_gen_lifebloom("spell_hexlord_lifebloom", SPELL_HEXLORD_MALACRASS_LIFEBLOOM_FINAL_HEAL); + new spell_gen_lifebloom("spell_tur_ragepaw_lifebloom", SPELL_TUR_RAGEPAW_LIFEBLOOM_FINAL_HEAL); + new spell_gen_lifebloom("spell_cenarion_scout_lifebloom", SPELL_CENARION_SCOUT_LIFEBLOOM_FINAL_HEAL); + new spell_gen_lifebloom("spell_twisted_visage_lifebloom", SPELL_TWISTED_VISAGE_LIFEBLOOM_FINAL_HEAL); + new spell_gen_lifebloom("spell_faction_champion_dru_lifebloom", SPELL_FACTION_CHAMPIONS_DRU_LIFEBLOOM_FINAL_HEAL); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 53a78e42c3c..e2272e0cdb4 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -618,6 +618,34 @@ class spell_hun_misdirection_proc : public SpellScriptLoader } }; +class spell_hun_disengage : public SpellScriptLoader +{ + public: + spell_hun_disengage() : SpellScriptLoader("spell_hun_disengage") { } + + class spell_hun_disengage_SpellScript : public SpellScript + { + PrepareSpellScript(spell_hun_disengage_SpellScript); + + SpellCastResult CheckCast() + { + if (GetCaster()->GetTypeId() == TYPEID_PLAYER && !GetCaster()->isInCombat()) + return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; + + return SPELL_CAST_OK; + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_hun_disengage_SpellScript::CheckCast); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_hun_disengage_SpellScript(); + } +}; void AddSC_hunter_spell_scripts() { @@ -633,4 +661,5 @@ void AddSC_hunter_spell_scripts() new spell_hun_pet_carrion_feeder(); new spell_hun_misdirection(); new spell_hun_misdirection_proc(); + new spell_hun_disengage(); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 050741ffaba..0edfbaee437 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -342,13 +342,52 @@ public: } }; +class spell_mage_living_bomb : public SpellScriptLoader +{ + public: + spell_mage_living_bomb() : SpellScriptLoader("spell_mage_living_bomb") { } + + class spell_mage_living_bomb_AuraScript : public AuraScript + { + PrepareAuraScript(spell_mage_living_bomb_AuraScript); + + bool Validate(SpellInfo const* spell) + { + if (!sSpellMgr->GetSpellInfo(uint32(spell->Effects[EFFECT_1].CalcValue()))) + return false; + return true; + } + + void AfterRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + AuraRemoveMode removeMode = GetTargetApplication()->GetRemoveMode(); + if (removeMode != AURA_REMOVE_BY_ENEMY_SPELL && removeMode != AURA_REMOVE_BY_EXPIRE) + return; + + if (Unit* caster = GetCaster()) + caster->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true, NULL, aurEff); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_mage_living_bomb_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_mage_living_bomb_AuraScript(); + } +}; + void AddSC_mage_spell_scripts() { - new spell_mage_blast_wave; - new spell_mage_cold_snap; + new spell_mage_blast_wave(); + new spell_mage_cold_snap(); new spell_mage_frost_warding_trigger(); new spell_mage_incanters_absorbtion_absorb(); new spell_mage_incanters_absorbtion_manashield(); - new spell_mage_polymorph_cast_visual; - new spell_mage_summon_water_elemental; + new spell_mage_polymorph_cast_visual(); + new spell_mage_summon_water_elemental(); + new spell_mage_living_bomb(); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index cf8cae68c58..95bb1429dc3 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -43,6 +43,10 @@ enum PaladinSpells SPELL_DIVINE_STORM = 53385, SPELL_DIVINE_STORM_DUMMY = 54171, SPELL_DIVINE_STORM_HEAL = 54172, + + SPELL_FORBEARANCE = 25771, + SPELL_AVENGING_WRATH_MARKER = 61987, + SPELL_IMMUNE_SHIELD_MARKER = 61988, }; // 31850 - Ardent Defender @@ -255,17 +259,18 @@ class spell_pal_holy_shock : public SpellScriptLoader class spell_pal_holy_shock_SpellScript : public SpellScript { - PrepareSpellScript(spell_pal_holy_shock_SpellScript) - bool Validate(SpellInfo const* spellEntry) + PrepareSpellScript(spell_pal_holy_shock_SpellScript); + + bool Validate(SpellInfo const* spell) { if (!sSpellMgr->GetSpellInfo(PALADIN_SPELL_HOLY_SHOCK_R1)) return false; // can't use other spell than holy shock due to spell_ranks dependency - if (sSpellMgr->GetFirstSpellInChain(PALADIN_SPELL_HOLY_SHOCK_R1) != sSpellMgr->GetFirstSpellInChain(spellEntry->Id)) + if (sSpellMgr->GetFirstSpellInChain(PALADIN_SPELL_HOLY_SHOCK_R1) != sSpellMgr->GetFirstSpellInChain(spell->Id)) return false; - uint8 rank = sSpellMgr->GetSpellRank(spellEntry->Id); + uint8 rank = sSpellMgr->GetSpellRank(spell->Id); if (!sSpellMgr->GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_DAMAGE, rank, true) || !sSpellMgr->GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_HEALING, rank, true)) return false; @@ -287,10 +292,18 @@ class spell_pal_holy_shock : public SpellScriptLoader SpellCastResult CheckCast() { - Player* caster = GetCaster()->ToPlayer(); + Unit* caster = GetCaster(); if (Unit* target = GetExplTargetUnit()) - if (!caster->IsFriendlyTo(target) && !caster->IsValidAttackTarget(target)) - return SPELL_FAILED_BAD_TARGETS; + { + if (!caster->IsFriendlyTo(target)) + { + if (!caster->HasInArc(static_cast(M_PI), target)) + return SPELL_FAILED_UNIT_NOT_INFRONT; + + if (!caster->IsValidAttackTarget(target)) + return SPELL_FAILED_BAD_TARGETS; + } + } return SPELL_CAST_OK; } @@ -423,6 +436,70 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader } }; +class spell_pal_lay_on_hands : public SpellScriptLoader +{ + public: + spell_pal_lay_on_hands() : SpellScriptLoader("spell_pal_lay_on_hands") { } + + class spell_pal_lay_on_hands_SpellScript : public SpellScript + { + PrepareSpellScript(spell_pal_lay_on_hands_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_FORBEARANCE)) + return false; + if (!sSpellMgr->GetSpellInfo(SPELL_AVENGING_WRATH_MARKER)) + return false; + if (!sSpellMgr->GetSpellInfo(SPELL_IMMUNE_SHIELD_MARKER)) + return false; + return true; + } + + SpellCastResult CheckCast() + { + Unit* caster = GetCaster(); + if (Unit* target = GetExplTargetUnit()) + { + if (caster == target) + { + if (target->HasAura(SPELL_FORBEARANCE)) + return SPELL_FAILED_TARGET_AURASTATE; + + if (target->HasAura(SPELL_AVENGING_WRATH_MARKER)) + return SPELL_FAILED_TARGET_AURASTATE; + + if (target->HasAura(SPELL_IMMUNE_SHIELD_MARKER)) + return SPELL_FAILED_TARGET_AURASTATE; + } + } + return SPELL_CAST_OK; + } + + void HandleScript() + { + Unit* caster = GetCaster(); + if (caster == GetHitUnit()) + { + caster->CastSpell(caster, SPELL_FORBEARANCE, true); + caster->CastSpell(caster, SPELL_AVENGING_WRATH_MARKER, true); + caster->CastSpell(caster, SPELL_IMMUNE_SHIELD_MARKER, true); + } + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_pal_lay_on_hands_SpellScript::CheckCast); + AfterHit += SpellHitFn(spell_pal_lay_on_hands_SpellScript::HandleScript); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_pal_lay_on_hands_SpellScript(); + } +}; + void AddSC_paladin_spell_scripts() { new spell_pal_ardent_defender(); @@ -433,4 +510,5 @@ void AddSC_paladin_spell_scripts() new spell_pal_judgement_of_command(); new spell_pal_divine_storm(); new spell_pal_divine_storm_dummy(); + new spell_pal_lay_on_hands(); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 8088004c9d1..a20534effaf 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -34,6 +34,7 @@ enum PriestSpells PRIEST_SPELL_PENANCE_R1_HEAL = 47757, PRIEST_SPELL_REFLECTIVE_SHIELD_TRIGGERED = 33619, PRIEST_SPELL_REFLECTIVE_SHIELD_R1 = 33201, + PRIEST_SPELL_VAMPIRIC_TOUCH_DISPEL = 64085, }; // Guardian Spirit @@ -330,6 +331,50 @@ public: } }; +class spell_pri_vampiric_touch : public SpellScriptLoader +{ + public: + spell_pri_vampiric_touch() : SpellScriptLoader("spell_pri_vampiric_touch") { } + + class spell_pri_vampiric_touch_AuraScript : public AuraScript + { + PrepareAuraScript(spell_pri_vampiric_touch_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(PRIEST_SPELL_VAMPIRIC_TOUCH_DISPEL)) + return false; + return true; + } + + void HandleDispel(DispelInfo* /*dispelInfo*/) + { + if (Unit* caster = GetCaster()) + { + if (Unit* target = GetUnitOwner()) + { + if (AuraEffect const* aurEff = GetEffect(EFFECT_1)) + { + int32 damage = aurEff->GetAmount() * 8; + // backfire damage + caster->CastCustomSpell(target, PRIEST_SPELL_VAMPIRIC_TOUCH_DISPEL, &damage, NULL, NULL, true, NULL, aurEff); + } + } + } + } + + void Register() + { + AfterDispel += AuraDispelFn(spell_pri_vampiric_touch_AuraScript::HandleDispel); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_pri_vampiric_touch_AuraScript(); + } +}; + void AddSC_priest_spell_scripts() { new spell_pri_guardian_spirit(); @@ -339,4 +384,5 @@ void AddSC_priest_spell_scripts() new spell_pri_reflective_shield_trigger(); new spell_pri_mind_sear(); new spell_pri_prayer_of_mending_heal(); + new spell_pri_vampiric_touch(); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 7e2756f28a5..4cb3818cdb8 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -42,6 +42,10 @@ enum ShamanSpells // For Earthen Power SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM = 6474, SHAMAN_TOTEM_SPELL_EARTHEN_POWER = 59566, + + ICON_ID_SHAMAN_LAVA_FLOW = 3087, + SHAMAN_LAVA_FLOWS_R1 = 51480, + SHAMAN_LAVA_FLOWS_TRIGGERED_R1 = 64694, }; // 51474 - Astral shift @@ -652,6 +656,52 @@ class spell_sha_chain_heal : public SpellScriptLoader } }; +class spell_sha_flame_shock : public SpellScriptLoader +{ + public: + spell_sha_flame_shock() : SpellScriptLoader("spell_sha_flame_shock") { } + + class spell_sha_flame_shock_AuraScript : public AuraScript + { + PrepareAuraScript(spell_sha_flame_shock_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SHAMAN_LAVA_FLOWS_R1)) + return false; + if (!sSpellMgr->GetSpellInfo(SHAMAN_LAVA_FLOWS_TRIGGERED_R1)) + return false; + return true; + } + + void HandleDispel(DispelInfo* /*dispelInfo*/) + { + if (Unit* caster = GetCaster()) + { + // Lava Flows + if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, ICON_ID_SHAMAN_LAVA_FLOW, 0)) + { + if (sSpellMgr->GetFirstSpellInChain(SHAMAN_LAVA_FLOWS_R1) != sSpellMgr->GetFirstSpellInChain(aurEff->GetId())) + return; + + uint8 rank = sSpellMgr->GetSpellRank(aurEff->GetId()); + caster->CastSpell(caster, sSpellMgr->GetSpellWithRank(SHAMAN_LAVA_FLOWS_TRIGGERED_R1, rank), true); + } + } + } + + void Register() + { + AfterDispel += AuraDispelFn(spell_sha_flame_shock_AuraScript::HandleDispel); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_sha_flame_shock_AuraScript(); + } +}; + void AddSC_shaman_spell_scripts() { new spell_sha_astral_shift(); @@ -667,4 +717,5 @@ void AddSC_shaman_spell_scripts() new spell_sha_mana_spring_totem(); new spell_sha_lava_lash(); new spell_sha_chain_heal(); + new spell_sha_flame_shock(); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 838b9e4f932..1b24a9ec09f 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -37,6 +37,8 @@ enum WarlockSpells WARLOCK_DEMONIC_CIRCLE_SUMMON = 48018, WARLOCK_DEMONIC_CIRCLE_TELEPORT = 48020, WARLOCK_DEMONIC_CIRCLE_ALLOW_CAST = 62388, + WARLOCK_HAUNT_HEAL = 48210, + WARLOCK_UNSTABLE_AFFLICTION_DISPEL = 31117, }; class spell_warl_banish : public SpellScriptLoader @@ -523,6 +525,106 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader } }; +class spell_warl_haunt : public SpellScriptLoader +{ + public: + spell_warl_haunt() : SpellScriptLoader("spell_warl_haunt") { } + + class spell_warl_haunt_SpellScript : public SpellScript + { + PrepareSpellScript(spell_warl_haunt_SpellScript); + + void HandleOnHit() + { + if (Aura* aura = GetHitAura()) + if (AuraEffect* aurEff = aura->GetEffect(EFFECT_1)) + aurEff->SetAmount(CalculatePctN(aurEff->GetAmount(), GetHitDamage())); + } + + void Register() + { + OnHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleOnHit); + } + }; + + class spell_warl_haunt_AuraScript : public AuraScript + { + PrepareAuraScript(spell_warl_haunt_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(WARLOCK_HAUNT_HEAL)) + return false; + return true; + } + + void HandleRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + { + int32 amount = aurEff->GetAmount(); + GetTarget()->CastCustomSpell(caster, WARLOCK_HAUNT_HEAL, &amount, NULL, NULL, true, NULL, aurEff, GetCasterGUID()); + } + } + + void Register() + { + OnEffectRemove += AuraEffectApplyFn(spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_warl_haunt_SpellScript(); + } + + AuraScript* GetAuraScript() const + { + return new spell_warl_haunt_AuraScript(); + } +}; + +class spell_warl_unstable_affliction : public SpellScriptLoader +{ + public: + spell_warl_unstable_affliction() : SpellScriptLoader("spell_warl_unstable_affliction") { } + + class spell_warl_unstable_affliction_AuraScript : public AuraScript + { + PrepareAuraScript(spell_warl_unstable_affliction_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(WARLOCK_UNSTABLE_AFFLICTION_DISPEL)) + return false; + return true; + } + + void HandleDispel(DispelInfo* dispelInfo) + { + if (Unit* caster = GetCaster()) + { + if (AuraEffect const* aurEff = GetEffect(EFFECT_0)) + { + int32 damage = aurEff->GetAmount() * 9; + // backfire damage and silence + caster->CastCustomSpell(dispelInfo->GetDispeller(), WARLOCK_UNSTABLE_AFFLICTION_DISPEL, &damage, NULL, NULL, true, NULL, aurEff); + } + } + } + + void Register() + { + AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_warl_unstable_affliction_AuraScript(); + } +}; + void AddSC_warlock_spell_scripts() { new spell_warl_banish(); @@ -535,4 +637,6 @@ void AddSC_warlock_spell_scripts() new spell_warl_life_tap(); new spell_warl_demonic_circle_summon(); new spell_warl_demonic_circle_teleport(); + new spell_warl_haunt(); + new spell_warl_unstable_affliction(); } -- cgit v1.2.3 From 423d7814f001f8f222b8e3e701c2afce4855ad73 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Mon, 28 May 2012 10:30:34 +0200 Subject: DB/Creature: Spawn Deadmire & Add pathing Closes #1705 Commit: fix filenaming --- .../world/2012_05_28_00_world_creature_ai_scripts.sql | 9 +++++++++ sql/updates/world/2012_05_28_01_world_creature.sql | 18 ++++++++++++++++++ .../world/2012_05_28_world_creature_ai_scripts.sql | 9 --------- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2012_05_28_00_world_creature_ai_scripts.sql create mode 100644 sql/updates/world/2012_05_28_01_world_creature.sql delete mode 100644 sql/updates/world/2012_05_28_world_creature_ai_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_00_world_creature_ai_scripts.sql b/sql/updates/world/2012_05_28_00_world_creature_ai_scripts.sql new file mode 100644 index 00000000000..aef4e4c6f67 --- /dev/null +++ b/sql/updates/world/2012_05_28_00_world_creature_ai_scripts.sql @@ -0,0 +1,9 @@ +-- Fix recent DB errors +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27135; -- Attunement To Dalaran Kill Credit +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=32400; -- Tukemuth + +-- Fix recent DB errors (credits to Vincent-Michael) +DELETE FROM `creature_addon` WHERE `guid` = 2593; +DELETE FROM `creature_template_addon` WHERE `entry` = 2676; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(2676,0,0,0,4097,0,NULL); diff --git a/sql/updates/world/2012_05_28_01_world_creature.sql b/sql/updates/world/2012_05_28_01_world_creature.sql new file mode 100644 index 00000000000..d39aa7230b5 --- /dev/null +++ b/sql/updates/world/2012_05_28_01_world_creature.sql @@ -0,0 +1,18 @@ +-- Spawn Deadmire +SET @GUID := 33909; +SET @NPC := @GUID*10; +DELETE FROM `creature` WHERE `id`=4841; +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,4841,1,1,1,0,0,-3949.688,-3471.041,29.15445,4.288023,360,0,0,1902,0,0,0,0,0); -- respawn Deadmire on old guid +-- Set movement info +UPDATE `creature_addon` SET `path_id`=@NPC WHERE `guid`=@GUID; +UPDATE `creature_template` SET `MovementType`=2 WHERE `entry`=4841; +-- Add Waypoint Data +DELETE FROM `waypoint_data` WHERE `id`=@NPC; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@NPC,1,-3942.966,-3455.51,28.89743,0,0,0,0,0,0), +(@NPC,2,-3943.117,-3456.498,28.89743,0,0,0,0,0,0), +(@NPC,3,-3948.063,-3467.443,29.64743,0,0,0,0,0,0), +(@NPC,4,-3950.123,-3472.004,29.02243,0,0,0,0,0,0), +(@NPC,5,-3953.303,-3479.054,28.64743,0,0,0,0,0,0), +(@NPC,6,-3953.303,-3479.054,28.64743,0,0,0,0,0,0); diff --git a/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql b/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql deleted file mode 100644 index aef4e4c6f67..00000000000 --- a/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Fix recent DB errors -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27135; -- Attunement To Dalaran Kill Credit -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=32400; -- Tukemuth - --- Fix recent DB errors (credits to Vincent-Michael) -DELETE FROM `creature_addon` WHERE `guid` = 2593; -DELETE FROM `creature_template_addon` WHERE `entry` = 2676; -INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(2676,0,0,0,4097,0,NULL); -- cgit v1.2.3 From 380c046892ecdc189bf7ced007b1b06a3cbe9b87 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Mon, 28 May 2012 10:46:12 +0200 Subject: DB/Creature: add waypoints for Vyragosa --- sql/updates/world/2012_05_28_02_world_creature.sql | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sql/updates/world/2012_05_28_02_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_02_world_creature.sql b/sql/updates/world/2012_05_28_02_world_creature.sql new file mode 100644 index 00000000000..77da626d89e --- /dev/null +++ b/sql/updates/world/2012_05_28_02_world_creature.sql @@ -0,0 +1,26 @@ +-- Spawn Deadmire +SET @GUID := 202606; +SET @NPC := @GUID*10; +-- Set movement info +UPDATE `creature_addon` SET `path_id`=@NPC WHERE `guid`=@GUID; +UPDATE `creature_template` SET `MovementType`=2 WHERE `entry`=32630; +-- Add Waypoint Data +DELETE FROM `waypoint_data` WHERE `id`=@NPC; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@NPC,1,7024.75,-1625.538,957.3694,0,0,0,0,0,0), +(@NPC,2,7025.494,-1624.87,957.3694,0,0,0,0,0,0), +(@NPC,3,7167.578,-1501.694,962.5693,0,0,0,0,0,0), +(@NPC,4,7440.402,-1295.861,997.2911,0,0,0,0,0,0), +(@NPC,5,7210.958,-1046.892,1006.18,0,0,0,0,0,0), +(@NPC,6,6998.465,-1076.847,1024.819,0,0,0,0,0,0), +(@NPC,7,6874.249,-1097.382,927.736,0,0,0,0,0,0), +(@NPC,8,6614.792,-875.7547,812.7645,0,0,0,0,0,0), +(@NPC,9,6563.275,-811.7673,749.8757,0,0,0,0,0,0), +(@NPC,10,6299.502,-797.577,529.1257,0,0,0,0,0,0), +(@NPC,11,6194.549,-1013.144,501.5424,0,0,0,0,0,0), +(@NPC,12,6319.254,-1251.661,468.6258,0,0,0,0,0,0), +(@NPC,13,6309.161,-1537.857,615.0423,0,0,0,0,0,0), +(@NPC,14,6748.211,-1664.307,919.3118,0,0,0,0,0,0), +(@NPC,15,6913.308,-1725.261,954.7917,0,0,0,0,0,0), +(@NPC,16,7167.578,-1501.694,962.5693,0,0,0,0,0,0), +(@NPC,17,7440.402,-1295.861,997.2911,0,0,0,0,0,0); -- cgit v1.2.3 From ed9ad370722217b12f3a77576cd8a7885481c76c Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Mon, 28 May 2012 11:00:00 +0200 Subject: DB/Waypoint: correct id to guid*10 --- sql/updates/world/2012_05_28_03_waypoint_data.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_05_28_03_waypoint_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_03_waypoint_data.sql b/sql/updates/world/2012_05_28_03_waypoint_data.sql new file mode 100644 index 00000000000..aa0e0ddd5ef --- /dev/null +++ b/sql/updates/world/2012_05_28_03_waypoint_data.sql @@ -0,0 +1,3 @@ +-- correct waypointid to guid*10 +UPDATE `waypoint_data` SET `id`=2026020 WHERE `id`=2026060; +UPDATE `creature_addon` SET `path_id`=2026020 WHERE `guid`=202602; -- cgit v1.2.3 From 2a7e701f69b093bdaa22e66052de781b215a7c1d Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Mon, 28 May 2012 13:13:45 +0200 Subject: DB/Creature: set MovementType in Creature, not _template --- sql/updates/world/2012_05_28_04_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_05_28_04_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_04_world_creature_template.sql b/sql/updates/world/2012_05_28_04_world_creature_template.sql new file mode 100644 index 00000000000..d8c9a15e412 --- /dev/null +++ b/sql/updates/world/2012_05_28_04_world_creature_template.sql @@ -0,0 +1,3 @@ +-- malcroms request +UPDATE `creature_template` SET `MovementType`=0 WHERE `entry`=32630; +UPDATE `creature` SET `MovementType`=2 WHERE `id`=32630; -- cgit v1.2.3 From 5957a2b10d571ac924db0488de96b5f6f877fd06 Mon Sep 17 00:00:00 2001 From: qaywsx Date: Mon, 28 May 2012 13:16:25 +0200 Subject: DB/Creature: Add phasing for Crusader's Pinnacle all credits for qaywsx who worked on this --- sql/updates/world/2012_05_28_05_world_creature.sql | 216 +++++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 sql/updates/world/2012_05_28_05_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_05_world_creature.sql b/sql/updates/world/2012_05_28_05_world_creature.sql new file mode 100644 index 00000000000..c7d4af5b494 --- /dev/null +++ b/sql/updates/world/2012_05_28_05_world_creature.sql @@ -0,0 +1,216 @@ +-- Guid for inserts +SET @NEXT := 134704; -- need 129 +-- Correct Phasing/Quest relation for the Argent Vanguard,Crusader's Pinnacle,Scourgeholme,The Breach,Valley of Echoes and Pit of Fiends (I didn't use Phase IV spell id: 57675 since it sets phase to one,I don't see the point since that's the default phase) +-- The spells are Argent Vanguard Chapter I (id: 57673),Argent Vanguard Chapter II (id: 57569) and Argent Vanguard Chapter III (id: 57674) +DELETE FROM `spell_area` WHERE `spell` IN (57673,57569,57674); +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(57673,4501,0,0,13070,0,0,2,1), +(57673,4504,0,0,13070,0,0,2,1), +(57673,4505,0,0,13086,0,0,2,1), +(57673,4506,0,0,13086,0,0,2,1), +(57673,4580,0,0,13086,0,0,2,1), +(57673,4593,0,0,13086,0,0,2,1), +(57569,4501,13070,0,13086,0,0,2,1), +(57569,4504,13070,0,13086,0,0,2,1), +(57674,4501,13086,0,13141,0,0,2,1), +(57674,4504,13086,0,13141,0,0,2,1), +(57674,4505,13086,0,13141,0,0,2,1), +(57674,4506,13086,0,13141,0,0,2,1), +(57674,4593,13086,0,13141,0,0,2,1), +(57674,4580,13086,0,13141,0,0,2,1); +-- Phase for objects in Crusader's Pinnacle (Scourge controlled) +UPDATE `gameobject` SET `phaseMask`=194 WHERE `id` IN (192936,192938,192953,192954,192955,192956,192957,192982,192995,193003,192958,192959,192960,192961,192962,192963,192964,192965,192966,192967,192968,192969,192970,192971,192972,192973,192974,192975,192976,192977,192978,192979,192980,192981,192983,192985,192986,192987,192988,192989,192990,192991,192994,192934,192935,192992,192993,193002,192997,192996,192999,193000,193001,192936,192937); +-- Phase for a few objects in Scourgeholme +UPDATE `gameobject` SET `phaseMask`=195 WHERE `id` IN (192576,192577,192575,192579,192578); +-- Misc Objects in Argent Vanguard to be visible in all phases +UPDATE `gameobject` SET `phaseMask`=195 WHERE `guid` IN (62021,62027,62356,62359,62353,62071,62061); +-- Duplicates of the objects in Argent Vanguard,no need to have 2 of each if they have no special interaction with a particular phase +DELETE FROM `gameobject` WHERE `guid` IN (100101,100484,100097,100433,100098,100432,100104,100485); +-- Phase for the walls and towers for all phases except during "The last line of defense" +UPDATE `gameobject` SET `phaseMask`=131 WHERE `guid` IN (61089,61066,61027,61056,61004,60999,60996,60976); +-- Phase for walls during "The last line of defense",they need a separate object here because they interact directly with the phase +UPDATE `gameobject` SET `phaseMask`=64 WHERE `guid` IN (100441,100440,100438,100439,100437,100436,100435,100434); +-- Phase for objects in The Breach after "The last line of defense" +UPDATE `gameobject` SET `phaseMask`=129 WHERE `id` IN (192797,192798,192799,192800,192801,192802,192803,192804,192805); +-- Phase for objects in The Breach before "The last line of defense" +UPDATE `gameobject` SET `phaseMask`=66 WHERE `id` IN (192161,192162,192166,192806,192807,192808,192809,192810,192811,192812,192813,192814,192815,192816,192817); +-- Phase for NPCs in Argent Vanguard that should be in all phases (except during "The last line of defense) +UPDATE `creature` SET `phaseMask`=131 WHERE `guid` IN (121664,124618,124483,121684,121671,121696,121668,121693,121669,121677,121697,121666,121662,121678,121670,121680,121685,121683,121665,121682,121686,121663,121695,124527,124491,124661,123618,124497,124323,124340,124332,207301,207298,207296,207297,207299,207300,124442); +-- Same as with the objects,delete duplicate creatures that have no direct interaction with a particular phase,a single creature can fulfill that role. +DELETE FROM `creature` WHERE `guid` IN (207239,207264,207260,207251,207245,207256,207242,207254,207243,207246,207257,207241,207237,207247,207244,207248,207252,207250,207240,207249,207253,207238,207255,207263,207261,207265,207258,207262,207259); +-- Phase for NPCs only present until "The last line of defense" +UPDATE `creature` SET `phaseMask`=2 WHERE `guid` IN (207229,207228,207234,207233,207232,207235,207236,207227,207222,207230,207231,207223,202409,207225,207226); +-- Phase for Siegemaster Fezzik (He is the only one present up until and during "the last line of defense") +UPDATE `creature` SET `phaseMask`=66 WHERE `guid`=207224; +-- Phase for NPCs in the Valley of Echoes before "The last line of defense" +UPDATE `creature` SET `phaseMask`=2 WHERE `guid` IN (207290,207289,207288,207294,207293,207295,207284,207282,207286,207285,207287,207291,207283,207281,207292,207280); +-- Phase for Creatures on the Valley of Echoes before "The last line of defense" +UPDATE `creature` SET `phaseMask`=2 WHERE `id` IN (30206,30273); +-- Phase for mobs and NPCs in the Valley of Echoes and The breach after "The last line of defense" +UPDATE `creature` SET `phaseMask`=129 WHERE `guid` IN (124320,124302,124297,124317,124338,124333,124329,124341,124301,124307,124319,124339,124337,124324,124298,124308,124303,124302,124320,124330,124326,124309,124335,124318,124299,124311,124310,124325,124327,124300,124315,124314,124313,124312,124321,124336,124334,124331,124328,121679,121667,121681,121694,121700,121692,203393,121698,121672); +-- Set correct faction for Crusade Architect Silas +UPDATE `creature_template` SET `faction_H`=2070,`faction_A`=2070 WHERE `entry`=30686; +-- Mount for Highlord Tirion Fordring in Argent Vanguard after "the last line of defense" +DELETE FROM `creature_template_addon` WHERE `entry`=30677; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(30677,0,2325,0,0,0,NULL); +-- Phase for Father Gustav in Valley of Echoes after "the last line of defense" +UPDATE `creature` SET `phaseMask`=128 WHERE `id`=30683; +-- Lich King flag,non attackable unless he engages first +UPDATE `creature_template` SET `unit_flags`=256 WHERE `entry`=30443; +-- Set right exp value and level for Underking Talonox +UPDATE `creature_template` SET `exp`=2,`minlevel`=79,`maxlevel`=79 WHERE `entry`=30830; +-- Set the right phase for the already existing creatures (Including Captured crusaders) +UPDATE `creature` SET `phaseMask`=1 WHERE `id` IN (31037,31039,31043,31040); +UPDATE `creature` SET `phaseMask`=2 WHERE `id` IN (30544,30407); +-- Set flag extra to 64 for creatures in Scourgeholme during the first phase,they should not give XP. +UPDATE `creature_template` SET `flags_extra`=64 WHERE `entry` IN (30544,30407); +-- Set right inhabit type for the second phase version of Wrathstrike Gargoyle (They should be able to fly) +UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=30482; +-- Set right faction for previously not spawned creatures +UPDATE `creature_template` SET `faction_H`=2068,`faction_A`=2068 WHERE `entry` IN (30541,30203,30543,30202,30482,30830,30831,30829,30443); +-- ---------------- +-- -- Spawnfixes -- +-- ---------------- +-- Add the right mobs for each phase,they have a different id for each phase. Some mobs are only on 2 phases,not all 3 (Reanimated crusader and Gargoyles). They have the exact same points as their already spawned counterparts which belong to the final phase. +-- NOTE: The ones with a currentwaypoint set have it simply because that's the waypoint the of their already spawned counterpart. I use it simply as a guideline for me to create the paths for all these new ones and its changed back to 0 after I set the new paths with creature_addon later in this SQL. +DELETE FROM `creature` WHERE `id` IN (30596,30686,30714,30677,30443,30829,30830,30831,30203,30543,30202,30541,30482,30333,30205); +DELETE FROM `creature` WHERE `guid` BETWEEN @NEXT+83 and @NEXT+89 AND `id`=30544; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`MovementType`) VALUES +-- Add missing creatures (Highlord Tirion Fordring in Argent Vanguard after "the last line of defense",The Ebon Watcher,Crusade Architect Silas and Crusade Engineer Spitzpatrick in Valley of Echoes after "the last line of defense") +(@NEXT,30596,571,1,128,6376.657227,239.053055,396.047028,4.8044,300,0,0,0), +(@NEXT+1,30686,571,1,128,6370.632324,232.238022,396.046051,1.352186,300,0,0,0), +(@NEXT+2,30714,571,1,128,6371.689941,239.699265,396.899902,4.792617,300,0,0,0), +(@NEXT+3,30677,571,1,128,6259.583496,50.420799,388.508667,0.846391,300,0,0,0), +-- Add missing unique creatures in Scorugeholme (The Lich king,Salranax the Flesh Render,High Priest Yath'amon and Underking Talonox -- One for each phase they are in,since they are hostile mobs) +(@NEXT+4,30443,571,1,2,6697.528809,583.609131,428.332916,4.108414,300,0,0,0), +(@NEXT+5,30829,571,1,2,6838.717285,594.347046,426.230652,4.020655,300,0,0,0), +(@NEXT+6,30831,571,1,2,6869.587891,422.763397,470.783386,1.087875,300,0,0,0), +(@NEXT+7,30830,571,1,2,7211.243652,667.650146,488.187103,2.689305,300,0,0,0), +(@NEXT+8,30829,571,1,128,6838.717285,594.347046,426.230652,4.020655,300,0,0,0), +(@NEXT+9,30831,571,1,128,6869.587891,422.763397,470.783386,1.087875,300,0,0,0), +(@NEXT+10,30830,571,1,128,7211.243652,667.650146,488.187103,2.689305,300,0,0,0), +-- Forgotten Depths High Priest +(@NEXT+11,30203,571,1,2,6879.92,493.899,467.957,1.67552,300,0,0,0), +(@NEXT+12,30203,571,1,2,6916.07,467.629,468.799,0.977384,300,0,0,0), +(@NEXT+13,30203,571,1,2,6858.02,453.902,471.767,4.7822,300,0,0,0), +(@NEXT+14,30203,571,1,2,6835.59,414.643,471.77,0.802851,300,0,0,0), +(@NEXT+15,30203,571,1,2,6903.22,430.778,471.764,3.56047,300,0,0,0), +(@NEXT+16,30203,571,1,2,6881.51,391.672,471.771,1.93731,300,0,0,0), +(@NEXT+17,30203,571,1,2,6877.89,665.768,425.523,1.29154,300,0,0,0), +(@NEXT+18,30203,571,1,2,6553.27,579.069,419.185,3.90954,300,0,0,0), +(@NEXT+19,30203,571,1,2,6560.22,584.094,419.185,0.645772,300,0,0,0), +(@NEXT+20,30203,571,1,2,6747.13,456.848,419.284,1.39626,300,0,0,0), +(@NEXT+21,30203,571,1,2,7062.78,521.156,526.362,5.75959,300,0,0,0), +(@NEXT+22,30203,571,1,2,7068.11,477.927,530.313,0.558505,300,0,0,0), +(@NEXT+23,30203,571,1,2,6689.02,570.998,424.525,3.9968,300,0,0,0), +(@NEXT+24,30203,571,1,2,6745.99,449.016,419.284,4.4855,300,0,0,0), +(@NEXT+25,30203,571,1,2,6809.11,843.341,381.335,3.23154,300,0,1217160,2), +(@NEXT+26,30203,571,1,2,6901.58,727.055,420.546,3.24233,300,0,1217170,2), +(@NEXT+27,30203,571,1,2,7002.27,602.799,476.138,5.93303,300,0,1217200,2), +(@NEXT+28,30543,571,1,128,6879.92,493.899,467.957,1.67552,300,0,0,0), +(@NEXT+29,30543,571,1,128,6916.07,467.629,468.799,0.977384,300,0,0,0), +(@NEXT+30,30543,571,1,128,6858.02,453.902,471.767,4.7822,300,0,0,0), +(@NEXT+31,30543,571,1,128,6835.59,414.643,471.77,0.802851,300,0,0,0), +(@NEXT+32,30543,571,1,128,6903.22,430.778,471.764,3.56047,300,0,0,0), +(@NEXT+33,30543,571,1,128,6881.51,391.672,471.771,1.93731,300,0,0,0), +(@NEXT+34,30543,571,1,128,6877.89,665.768,425.523,1.29154,300,0,0,0), +(@NEXT+35,30543,571,1,128,6553.27,579.069,419.185,3.90954,300,0,0,0), +(@NEXT+36,30543,571,1,128,6560.22,584.094,419.185,0.645772,300,0,0,0), +(@NEXT+37,30543,571,1,128,6747.13,456.848,419.284,1.39626,300,0,0,0), +(@NEXT+38,30543,571,1,128,7062.78,521.156,526.362,5.75959,300,0,0,0), +(@NEXT+39,30543,571,1,128,7068.11,477.927,530.313,0.558505,300,0,0,0), +(@NEXT+40,30543,571,1,128,6689.02,570.998,424.525,3.9968,300,0,0,0), +(@NEXT+41,30543,571,1,128,6745.99,449.016,419.284,4.4855,300,0,0,0), +(@NEXT+42,30543,571,1,128,6809.11,843.341,381.335,3.23154,300,0,1217160,2), +(@NEXT+43,30543,571,1,128,6901.58,727.055,420.546,3.24233,300,0,1217170,2), +(@NEXT+44,30543,571,1,128,7002.27,602.799,476.138,5.93303,300,0,1217200,2), +-- Reanimated Crusader +(@NEXT+45,30202,571,1,128,6770.55,386.311,421.153,2.7317,300,5,0,1), +(@NEXT+46,30202,571,1,128,6655.04,328.894,442.276,0.929563,300,5,0,1), +(@NEXT+47,30202,571,1,128,6448.62,618.154,432.265,2.1122,300,5,0,1), +(@NEXT+48,30202,571,1,128,6471.01,562.99,438.4,3.5549,300,5,0,1), +(@NEXT+49,30202,571,1,128,6448.03,608.829,433.982,1.32629,300,5,0,1), +(@NEXT+50,30202,571,1,128,6526.88,512.588,412.274,2.77181,300,5,0,1), +(@NEXT+51,30202,571,1,128,6513.35,523.34,415.136,0.501217,300,5,0,1), +(@NEXT+52,30202,571,1,128,6556.12,636.946,408.191,1.22528,300,5,0,1), +(@NEXT+53,30202,571,1,128,6697.52,476.907,401.588,2.99677,300,5,0,1), +(@NEXT+54,30202,571,1,128,6704.82,441.489,406.499,3.35221,300,5,0,1), +(@NEXT+55,30202,571,1,128,6723.74,417.997,412.953,4.18409,300,5,0,1), +(@NEXT+56,30202,571,1,128,6644.93,422.78,401.853,3.19711,300,5,0,1), +(@NEXT+57,30202,571,1,128,6654.72,492.468,398.206,2.81552,300,5,0,1), +(@NEXT+58,30202,571,1,128,6630.65,458.047,398.995,5.84132,300,5,0,1), +(@NEXT+59,30202,571,1,128,6661.41,584.323,408.676,0.785398,300,5,0,1), +(@NEXT+60,30202,571,1,128,6518.07,616.422,410.051,2.1325,300,5,0,1), +(@NEXT+61,30202,571,1,128,6514.78,664.2,399.383,0.291176,300,5,0,1), +(@NEXT+62,30202,571,1,128,6563.32,539.29,404.559,0.919091,300,5,0,1), +(@NEXT+63,30202,571,1,128,6617.92,519.797,396.795,1.55615,300,5,0,1), +(@NEXT+64,30202,571,1,128,6643.92,633.926,404.904,1.84373,300,5,0,1), +(@NEXT+65,30202,571,1,128,6592.97,620.213,408.135,1.80125,300,5,0,1), +(@NEXT+66,30202,571,1,128,6707.83,535.834,405.493,5.84095,300,5,0,1), +(@NEXT+67,30202,571,1,128,6758.07,512.831,410.903,2.78648,300,5,0,1), +(@NEXT+68,30202,571,1,128,6764.6,535.115,415.201,3.48219,300,5,0,1), +(@NEXT+69,30202,571,1,128,6669.68,527.603,401.525,5.13205,300,5,0,1), +(@NEXT+70,30202,571,1,128,6613,590.876,403.789,2.88047,300,5,0,1), +(@NEXT+71,30202,571,1,128,6545.45,535.57,407.359,1.50529,300,5,0,1), +(@NEXT+72,30202,571,1,128,6623.12,684.658,405.968,4.4761,300,5,0,1), +(@NEXT+73,30202,571,1,128,6584.43,679.969,406.644,2.11574,300,5,0,1), +(@NEXT+74,30202,571,1,128,6576.55,460.06,408.104,0.763302,300,5,0,1), +(@NEXT+75,30202,571,1,128,6606.58,489.339,398.158,5.60417,300,5,0,1), +(@NEXT+76,30202,571,1,128,6563.66,505.381,403.489,0.430917,300,5,0,1), +(@NEXT+77,30202,571,1,128,6579.71,401.572,416.112,6.10437,300,5,0,1), +(@NEXT+78,30202,571,1,128,6632.51,382.456,412.855,5.91518,300,5,0,1), +(@NEXT+79,30202,571,1,128,6721.48,346.299,424.582,5.91108,300,5,0,1), +(@NEXT+80,30202,571,1,128,6657.63,385.761,411.832,2.05191,300,5,0,1), +(@NEXT+81,30202,571,1,128,6709.57,384.33,414.698,3.57468,300,5,0,1), +(@NEXT+82,30202,571,1,128,6722.58,492.852,405.603,5.6035,300,5,0,1), +-- Forgotten Depths Underking +(@NEXT+83,30544,571,1,2,6962.62,734.955,445.296,4.4855,300,0,0,0), +(@NEXT+84,30544,571,1,2,7056.29,572.491,497.073,2.23402,300,0,0,0), +(@NEXT+85,30544,571,1,2,7005.75,714.752,468.614,3.07178,300,0,0,0), +(@NEXT+86,30544,571,1,2,6809.11,843.341,381.335,5.7554,300,0,1217280,0), +(@NEXT+87,30544,571,1,2,6437.59,604.262,439.155,0.369627,300,0,1217310,2), +(@NEXT+89,30544,571,1,2,7002.27,602.799,476.138,5.7192,300,0,1217350,0), +(@NEXT+90,30541,571,1,128,6962.62,734.955,445.296,4.4855,300,0,0,0), +(@NEXT+91,30541,571,1,128,7056.29,572.491,497.073,2.23402,300,0,0,0), +(@NEXT+92,30541,571,1,128,7005.75,714.752,468.614,3.07178,300,0,0,0), +(@NEXT+93,30541,571,1,128,6760.42,515.039,411.837,3.66099,300,0,1217270,2), +(@NEXT+94,30541,571,1,128,6809.11,843.341,381.335,5.7554,300,0,1217280,0), +(@NEXT+95,30541,571,1,128,7002.27,602.799,476.138,5.7192,300,0,1217350,0), +(@NEXT+96,30541,571,1,128,6769.89,628.623,425.97,-1.65443,300,0,1217290,2), +(@NEXT+97,30541,571,1,128,6697.87,429.598,406.569,1.77104,300,0,1217300,2), +(@NEXT+98,30541,571,1,128,6437.59,604.262,439.155,0.369627,300,0,1217310,2), +(@NEXT+99,30541,571,1,128,6622.62,585.661,402.875,5.61246,300,0,1217320,2), +(@NEXT+100,30541,571,1,128,6710.23,685.938,408.296,3.24837,300,0,1217330,2), +(@NEXT+101,30541,571,1,128,6575.6,465.094,407.446,2.69257,300,0,1217360,2), +(@NEXT+102,30541,571,1,128,6641.92,396.595,408.673,2.55359,300,0,1217370,2), +-- Wrathstrike Gargoyle +(@NEXT+103,30482,571,1,128,7059.52,455.611,581.574,3.35148,300,0,1217550,2), +(@NEXT+104,30482,571,1,128,7009.05,544.408,610.468,3.23607,300,0,1217540,2), +(@NEXT+105,30482,571,1,128,6804.5,702.568,436.191,0.0303077,300,0,1217530,2), +(@NEXT+106,30482,571,1,128,6799.31,642.302,459.819,3.88908,300,0,1217520,2), +(@NEXT+107,30482,571,1,128,6753.66,410.408,446.625,3.19529,300,0,1217510,2), +(@NEXT+108,30482,571,1,128,6597.14,566.743,445.037,1.40898,300,0,1217500,2), +(@NEXT+109,30482,571,1,128,6596.2,564.031,445.111,4.27718,300,0,1217490,2), +(@NEXT+110,30482,571,1,128,6559.29,413.281,462.263,6.13325,300,0,1217480,2), +-- Add missing mobs in the Valley of Echoes during the first phase. The DB has no spawn info on these ones so I added them in a logical number and places,feel free to skip this part if its not "correct" enough. (If anyone has actual sniffs for the location of these mobs feel free to share) +-- Forgotten Depths Slayer for first phase (id:30333,not the same one that should appear during "The last line of defense) +(@NEXT+111,30333,571,1,2,6150.518066,147.111313,372.771057,0.197990,300,7,0,1), +(@NEXT+112,30333,571,1,2,6212.446777,130.204849,377.827118,0.657450,300,7,0,1), +(@NEXT+113,30333,571,1,2,6110.951660,83.364746,371.154419,1.230786,300,7,0,1), +(@NEXT+114,30333,571,1,2,6047.241699,178.537430,353.744293,5.322711,300,7,0,1), +(@NEXT+115,30333,571,1,2,6182.750000,199.942261,380.134705,4.996765,300,7,0,1), +(@NEXT+116,30333,571,1,2,6219.042480,236.113785,388.062317,5.134206,300,7,0,1), +(@NEXT+117,30333,571,1,2,6421.106445,188.232880,395.621826,2.247868,300,7,0,1), +(@NEXT+118,30333,571,1,2,6351.036621,91.049683,392.077698,1.969049,300,7,0,1), +(@NEXT+119,30333,571,1,2,6264.502930,147.837006,383.335876,2.346035,300,7,0,1), +-- Forgotten Depths Acolyte +(@NEXT+120,30205,571,1,2,6278.386230,199.642899,385.989258,5.377527,300,0,0,0), +(@NEXT+121,30205,571,1,2,6229.345703,133.398743,379.961639,3.759608,300,0,0,0), +(@NEXT+122,30205,571,1,2,6087.062012,136.313293,367.117310,4.827752,300,0,0,0), +(@NEXT+123,30205,571,1,2,6127.606445,172.50610,370.652832,6.190416,300,0,0,0), +(@NEXT+124,30205,571,1,2,6149.881836,220.209808,379.919403,5.361032,300,0,0,0), +(@NEXT+125,30205,571,1,2,6422.211426,148.303436,395.890137,1.964183,300,0,0,0), +(@NEXT+126,30205,571,1,2,6375.815918,81.636124,394.968140,2.337249,300,0,0,0), +(@NEXT+127,30205,571,1,2,6333.330566,29.062647,389.581329,1.508653,300,0,0,0), +(@NEXT+128,30205,571,1,2,6130.472656,172.082047,370.962646,5.695776,300,0,0,0); -- cgit v1.2.3 From a8f2c7ccab633e86e74d2e2bf957ed0b04f0dc7b Mon Sep 17 00:00:00 2001 From: qaywsx Date: Mon, 28 May 2012 13:51:17 +0200 Subject: DB/Creatures: Add pathings for the phased creatures in previous commit --- .../world/2012_05_28_06_world_waypoint_data.sql | 524 +++++++++++++++++++++ 1 file changed, 524 insertions(+) create mode 100644 sql/updates/world/2012_05_28_06_world_waypoint_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_06_world_waypoint_data.sql b/sql/updates/world/2012_05_28_06_world_waypoint_data.sql new file mode 100644 index 00000000000..1c738cacdc9 --- /dev/null +++ b/sql/updates/world/2012_05_28_06_world_waypoint_data.sql @@ -0,0 +1,524 @@ +-- The following are the paths for the newly added mobs that have the same spawn spot as a mob (different phase and id) that already had a path. The paths are exactly the same as their already spawned counterparts. +-- Pathing for newly added Wrathstrike Gargoyles +-- ----------------------------------------------------------------------------------------------------------- +SET @NEXT := 134704; +-- Wrathstrike Gargoyle 1 +SET @NPC = @NEXT+103; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7060.05,455.727,581.492,0,0,0,100,0), +(@PATH,2,6982.99,465.858,581.492,0,0,0,100,0), +(@PATH,3,6963.94,516.342,581.492,0,0,0,100,0), +(@PATH,4,7012.51,555.944,581.492,0,0,0,100,0), +(@PATH,5,7062.92,517.784,566.464,0,0,0,100,0), +(@PATH,6,7074.5,487.171,566.464,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217550; +-- ----------------------------------------------------------------------------------------------------------- +-- Wrathstrike Gargoyle 2 +SET @NPC = @NEXT+104; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6975.12,457.238,608.122,0,0,0,100,0), +(@PATH,2,6994.13,442.679,608.122,0,0,0,100,0), +(@PATH,3,7024.58,437.239,608.122,0,0,0,100,0), +(@PATH,4,7055.78,456.622,580.705,0,0,0,100,0), +(@PATH,5,7069.78,488.277,580.705,0,0,0,100,0), +(@PATH,6,7057.18,540.235,608.205,0,0,0,100,0), +(@PATH,7,6978.62,537.405,608.205,0,0,0,100,0), +(@PATH,8,6960.95,489.864,595.233,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217540; +-- ----------------------------------------------------------------------------------------------------------- +-- Wrathstrike Gargoyle 3 +SET @NPC = @NEXT+105; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6817.71,701.731,436.81,0,0,0,100,0), +(@PATH,2,6839.81,671.33,438.476,0,0,0,100,0), +(@PATH,3,6771.48,625.298,444.032,0,0,0,100,0), +(@PATH,4,6729.31,607.063,451.504,0,0,0,100,0), +(@PATH,5,6689.26,569.483,444.032,0,0,0,100,0), +(@PATH,6,6664.17,580.683,449.976,0,0,0,100,0), +(@PATH,7,6657.52,638.465,440.893,0,0,0,100,0), +(@PATH,8,6664.19,665.048,444.032,0,0,0,100,0), +(@PATH,9,6735.33,692.836,433.938,0,0,0,100,0), +(@PATH,10,6741.25,694.33,433.56,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217530; +-- ----------------------------------------------------------------------------------------------------------- +-- Wrathstrike Gargoyle 4 +SET @NPC = @NEXT+106; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6808.92,649.929,459.327,0,0,0,100,0), +(@PATH,2,6779.63,606.717,465.077,0,0,0,100,0), +(@PATH,3,6799.14,541.206,474.66,0,0,0,100,0), +(@PATH,4,6863.37,520.467,465.077,0,0,0,100,0), +(@PATH,5,6900.8,554.799,459.216,0,0,0,100,0), +(@PATH,6,6904.96,624.433,471.549,0,0,0,100,0), +(@PATH,7,6860.9,661.477,465.077,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217520; +-- ----------------------------------------------------------------------------------------------------------- +-- Wrathstrike Gargoyle 5 +SET @NPC = @NEXT+107; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6764.29,413.94,446.625,0,0,0,100,0), +(@PATH,2,6727.13,417.659,446.625,0,0,0,100,0), +(@PATH,3,6709.2,445.43,446.625,0,0,0,100,0), +(@PATH,4,6714.21,476.942,446.625,0,0,0,100,0), +(@PATH,5,6760.44,491.312,446.625,0,0,0,100,0), +(@PATH,6,6786.47,463.163,446.625,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217510; +-- ----------------------------------------------------------------------------------------------------------- +-- Wrathstrike Gargoyle 6 +SET @NPC = @NEXT+108; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6589.56,608.719,445.037,0,0,0,100,0), +(@PATH,2,6536.49,613.397,445.037,0,0,0,100,0), +(@PATH,3,6515.31,571.263,445.037,0,0,0,100,0), +(@PATH,4,6540.83,538.391,445.037,0,0,0,100,0), +(@PATH,5,6561.1,543.055,445.037,0,0,0,100,0), +(@PATH,6,6595.09,559.099,445.037,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217500; +-- ----------------------------------------------------------------------------------------------------------- +-- Wrathstrike Gargoyle 7 +SET @NPC = @NEXT+109; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6661.58,545.496,432.795,0,0,0,100,0), +(@PATH,2,6659.48,589.326,447.184,0,0,0,100,0), +(@PATH,3,6628.78,594.459,446.434,0,0,0,100,0), +(@PATH,4,6613.69,584.967,446.434,0,0,0,100,0), +(@PATH,5,6595.45,562.222,444.795,0,0,0,100,0), +(@PATH,6,6595.77,535.16,436.934,0,0,0,100,0), +(@PATH,7,6631,528.616,450.823,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217490; +-- ----------------------------------------------------------------------------------------------------------- +-- Wrathstrike Gargoyle 8 +SET @NPC = @NEXT+110; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6585.6,408.848,446.514,0,0,0,100,0), +(@PATH,2,6607.57,400.701,444.745,0,0,0,100,0), +(@PATH,3,6647.89,401.573,444.745,0,0,0,100,0), +(@PATH,4,6667.63,414.847,433.912,0,0,0,100,0), +(@PATH,5,6648.87,462.506,444.745,0,0,0,100,0), +(@PATH,6,6592.11,478.371,444.745,0,0,0,100,0), +(@PATH,7,6501.26,474.703,444.745,0,0,0,100,0), +(@PATH,8,6484.09,430.145,485.097,0,0,0,100,0), +(@PATH,9,6519.88,419.711,485.097,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30482 AND `currentwaypoint`=1217480; +-- ----------------------------------------------------------------------------------------------------------- +-- Pathing for newly added Forgotten Depths Underkings +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 1 +SET @NPC = @NEXT+96; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6788.09,633.101,426.095,0,0,0,100,0), +(@PATH,2,6789.98,619.743,423.47,0,0,0,100,0), +(@PATH,3,6766.65,606.497,423.42,0,0,0,100,0), +(@PATH,4,6740.19,597.458,425.39,0,0,0,100,0), +(@PATH,5,6725.25,595.632,423.432,0,0,0,100,0), +(@PATH,6,6713.96,602.526,423.595,0,0,0,100,0), +(@PATH,7,6720.27,613.862,423.47,0,0,0,100,0), +(@PATH,8,6736.25,614.921,423.545,0,0,0,100,0), +(@PATH,9,6769.89,628.623,425.97,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217290; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 2 +SET @NPC = @NEXT+97; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6698.5,458.598,404.586,0,0,0,100,0), +(@PATH,2,6695.69,473.044,401.838,0,0,0,100,0), +(@PATH,3,6665,494.007,397.863,0,0,0,100,0), +(@PATH,4,6621.27,520.385,397.423,0,0,0,100,0), +(@PATH,5,6601.79,552.183,399.092,0,0,0,100,0), +(@PATH,6,6579.75,536.627,401.438,0,0,0,100,0), +(@PATH,7,6599.6,508.629,398.578,0,0,0,100,0), +(@PATH,8,6627.41,480.195,397.408,0,0,0,100,0), +(@PATH,9,6643.31,442.918,399.225,0,0,0,100,0), +(@PATH,10,6674.23,416.566,405.944,0,0,0,100,0), +(@PATH,11,6697.87,429.598,406.569,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217300; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 3-A +SET @NPC = @NEXT+98; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6395.82,618.184,452.633,0,0,0,100,0), +(@PATH,2,6358.26,637.18,462.167,0,0,0,100,0), +(@PATH,3,6370.71,666.535,453.289,0,0,0,100,0), +(@PATH,4,6375.45,676.189,445.42,0,0,0,100,0), +(@PATH,5,6407.42,688.589,434.416,0,0,0,100,0), +(@PATH,6,6429.66,650.562,435.434,0,0,0,100,0), +(@PATH,7,6461.86,627.093,426.405,0,0,0,100,0), +(@PATH,8,6482.61,623.854,419.051,0,0,0,100,0), +(@PATH,9,6486.97,594.615,420.488,0,0,0,100,0), +(@PATH,10,6457.97,595.352,432.948,0,0,0,100,0), +(@PATH,11,6437.59,604.262,439.155,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217310; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 3-B +SET @NPC = @Next+87; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6395.82,618.184,452.633,0,0,0,100,0), +(@PATH,2,6358.26,637.18,462.167,0,0,0,100,0), +(@PATH,3,6370.71,666.535,453.289,0,0,0,100,0), +(@PATH,4,6375.45,676.189,445.42,0,0,0,100,0), +(@PATH,5,6407.42,688.589,434.416,0,0,0,100,0), +(@PATH,6,6429.66,650.562,435.434,0,0,0,100,0), +(@PATH,7,6461.86,627.093,426.405,0,0,0,100,0), +(@PATH,8,6482.61,623.854,419.051,0,0,0,100,0), +(@PATH,9,6486.97,594.615,420.488,0,0,0,100,0), +(@PATH,10,6457.97,595.352,432.948,0,0,0,100,0), +(@PATH,11,6437.59,604.262,439.155,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30544 AND `currentwaypoint`=1217310; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 4 +SET @NPC = @NEXT+99; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6618.91,606.085,403.839,0,0,0,100,0), +(@PATH,2,6608.22,599.539,403.875,0,0,0,100,0), +(@PATH,3,6613.37,574.047,401.125,0,0,0,100,0), +(@PATH,4,6638.76,543.87,399.563,0,0,0,100,0), +(@PATH,5,6667.59,521.002,401.025,0,0,0,100,0), +(@PATH,6,6697.97,501.482,400.775,0,0,0,100,0), +(@PATH,7,6711.98,522.746,404.353,0,0,0,100,0), +(@PATH,8,6702.31,534.57,405.75,0,0,0,100,0), +(@PATH,9,6679.62,541.533,402.209,0,0,0,100,0), +(@PATH,10,6660.61,557.771,404.938,0,0,0,100,0), +(@PATH,11,6639.28,577.426,402.927,0,0,0,100,0), +(@PATH,12,6622.62,585.661,402.875,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217320; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 5 +SET @NPC = @NEXT+100; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6746.43,700.445,407.534,0,0,0,100,0), +(@PATH,2,6767.77,702.447,407.514,0,0,0,100,0), +(@PATH,3,6780.88,716.948,410.264,0,0,0,100,0), +(@PATH,4,6761.32,729.055,407.659,0,0,0,100,0), +(@PATH,5,6723.36,725.67,406.194,0,0,0,100,0), +(@PATH,6,6706.1,712.006,411.069,0,0,0,100,0), +(@PATH,7,6687.8,701.721,412.302,0,0,0,100,0), +(@PATH,8,6668.08,685.327,409.231,0,0,0,100,0), +(@PATH,9,6660.25,674.05,407.891,0,0,0,100,0), +(@PATH,10,6667.72,662.234,407.017,0,0,0,100,0), +(@PATH,11,6710.23,685.938,408.296,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217330; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 6 +SET @NPC = @NEXT+101; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6552.96,457.401,412.93,0,0,0,100,0), +(@PATH,2,6551.69,432.508,416.436,0,0,0,100,0), +(@PATH,3,6568.85,415.311,415.444,0,0,0,100,0), +(@PATH,4,6572.9,410.44,415.694,0,0,0,100,0), +(@PATH,5,6577.95,406.559,415.694,0,0,0,100,0), +(@PATH,6,6591.15,393.959,416.312,0,0,0,100,0), +(@PATH,7,6624.85,389.377,412.855,0,0,0,100,0), +(@PATH,8,6642.71,398.137,408.048,0,0,0,100,0), +(@PATH,9,6642.51,414.137,403.978,0,0,0,100,0), +(@PATH,10,6613.73,435.694,403.495,0,0,0,100,0), +(@PATH,11,6598.72,453.969,403.196,0,0,0,100,0), +(@PATH,12,6575.6,465.094,407.446,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217360; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 7 +SET @NPC = @NEXT+102; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6665.69,385.118,411.923,0,0,0,100,0), +(@PATH,2,6688.12,372.121,414.309,0,0,0,100,0), +(@PATH,3,6681.71,337.864,421.782,0,0,0,100,0), +(@PATH,4,6711.15,330.663,422.912,0,0,0,100,0), +(@PATH,5,6729,353.407,426.957,0,0,0,100,0), +(@PATH,6,6759.39,371.963,426.169,0,0,0,100,0), +(@PATH,7,6742.83,378.436,419.544,0,0,0,100,0), +(@PATH,8,6710.78,380.507,415.679,0,0,0,100,0), +(@PATH,9,6685.82,397.148,408.809,0,0,0,100,0), +(@PATH,10,6655.42,406.866,405.478,0,0,0,100,0), +(@PATH,11,6641.92,396.595,408.673,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217370; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths Underking 8 +SET @NPC = @NEXT+93; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6751.58,521.709,409.087,0,0,0,100,0), +(@PATH,2,6775.59,535.639,418.22,0,0,0,100,0), +(@PATH,3,6790.69,546.924,424.095,0,0,0,100,0), +(@PATH,4,6797.82,545.099,424.47,0,0,0,100,0), +(@PATH,5,6787.22,530.424,421.059,0,0,0,100,0), +(@PATH,6,6760.42,515.039,411.837,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217270; +-- ----------------------------------------------------------------------------------------------------------- +-- Pathing for newly added Forgotten Depths High Priests. There are A and B versions because only the ones from the last phase were already spawned in DB and had their pathing. This didn't occur with the Forgotten Depths Underkings because their first phase counterpats were already spawned (at least the ones with paths,the rest weren't). 2 of them don't get the current waypoint removed yet because its used for a guideline for creature_formations later. +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths High Priest 1-A +SET @NPC = @NEXT+25; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6845.23,827.966,390.654,0,0,0,100,0), +(@PATH,2,6869.87,814.437,394.231,0,0,0,100,0), +(@PATH,3,6885.91,795.247,398.76,0,0,0,100,0), +(@PATH,4,6889.42,776.747,410.135,0,0,0,100,0), +(@PATH,5,6887.17,765.483,417.106,0,0,0,100,0), +(@PATH,6,6916.54,751.385,415.552,0,0,0,100,0), +(@PATH,7,6922.71,770.234,412.379,0,0,0,100,0), +(@PATH,8,6936.68,795.657,409.292,0,0,0,100,0), +(@PATH,9,6946.95,821.291,405.551,0,0,0,100,0), +(@PATH,10,6940.67,819.911,406.551,0,0,0,100,0), +(@PATH,11,6918.09,776.126,411.879,0,0,0,100,0), +(@PATH,12,6903.68,745.868,416.802,0,0,0,100,0), +(@PATH,13,6892.57,727.713,418.396,0,0,0,100,0), +(@PATH,14,6855.19,723.309,414.328,0,0,0,100,0), +(@PATH,15,6810.95,714.736,409.567,0,0,0,100,0), +(@PATH,16,6778.23,711.31,408.139,0,0,0,100,0), +(@PATH,17,6749.77,708.742,407.159,0,0,0,100,0), +(@PATH,18,6724.11,709.65,409.563,0,0,0,100,0), +(@PATH,19,6720.02,695.631,407.296,0,0,0,100,0), +(@PATH,20,6730.44,731.649,404.319,0,0,0,100,0), +(@PATH,21,6727.1,774.371,385.328,0,0,0,100,0), +(@PATH,22,6722.82,816.964,376.654,0,0,0,100,0), +(@PATH,23,6733.84,849.984,376.012,0,0,0,100,0), +(@PATH,24,6753.25,867.14,376.46,0,0,0,100,0), +(@PATH,25,6786.71,850.127,379.337,0,0,0,100,0), +(@PATH,26,6817.16,840.912,382.21,0,0,0,100,0); +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths High Priest 1-B +SET @NPC = @NEXT+42; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6845.23,827.966,390.654,0,0,0,100,0), +(@PATH,2,6869.87,814.437,394.231,0,0,0,100,0), +(@PATH,3,6885.91,795.247,398.76,0,0,0,100,0), +(@PATH,4,6889.42,776.747,410.135,0,0,0,100,0), +(@PATH,5,6887.17,765.483,417.106,0,0,0,100,0), +(@PATH,6,6916.54,751.385,415.552,0,0,0,100,0), +(@PATH,7,6922.71,770.234,412.379,0,0,0,100,0), +(@PATH,8,6936.68,795.657,409.292,0,0,0,100,0), +(@PATH,9,6946.95,821.291,405.551,0,0,0,100,0), +(@PATH,10,6940.67,819.911,406.551,0,0,0,100,0), +(@PATH,11,6918.09,776.126,411.879,0,0,0,100,0), +(@PATH,12,6903.68,745.868,416.802,0,0,0,100,0), +(@PATH,13,6892.57,727.713,418.396,0,0,0,100,0), +(@PATH,14,6855.19,723.309,414.328,0,0,0,100,0), +(@PATH,15,6810.95,714.736,409.567,0,0,0,100,0), +(@PATH,16,6778.23,711.31,408.139,0,0,0,100,0), +(@PATH,17,6749.77,708.742,407.159,0,0,0,100,0), +(@PATH,18,6724.11,709.65,409.563,0,0,0,100,0), +(@PATH,19,6720.02,695.631,407.296,0,0,0,100,0), +(@PATH,20,6730.44,731.649,404.319,0,0,0,100,0), +(@PATH,21,6727.1,774.371,385.328,0,0,0,100,0), +(@PATH,22,6722.82,816.964,376.654,0,0,0,100,0), +(@PATH,23,6733.84,849.984,376.012,0,0,0,100,0), +(@PATH,24,6753.25,867.14,376.46,0,0,0,100,0), +(@PATH,25,6786.71,850.127,379.337,0,0,0,100,0), +(@PATH,26,6817.16,840.912,382.21,0,0,0,100,0); +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths High Priest 2-A +SET @NPC = @NEXT+26; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6877.06,727.294,415.646,0,0,0,100,0), +(@PATH,2,6840.86,720.367,413.578,0,0,0,100,0), +(@PATH,3,6804.06,715.519,409.067,0,0,0,100,0), +(@PATH,4,6775.7,711.378,408.139,0,0,0,100,0), +(@PATH,5,6775.7,706.114,408.014,0,0,0,100,0), +(@PATH,6,6806.69,710.446,409.317,0,0,0,100,0), +(@PATH,7,6840.86,715.128,414.078,0,0,0,100,0), +(@PATH,8,6885.64,719.654,417.771,0,0,0,100,0), +(@PATH,9,6901.58,727.055,420.546,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30203 AND `currentwaypoint`=1217170; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths High Priest 2-B +SET @NPC = @NEXT+43; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6877.06,727.294,415.646,0,0,0,100,0), +(@PATH,2,6840.86,720.367,413.578,0,0,0,100,0), +(@PATH,3,6804.06,715.519,409.067,0,0,0,100,0), +(@PATH,4,6775.7,711.378,408.139,0,0,0,100,0), +(@PATH,5,6775.7,706.114,408.014,0,0,0,100,0), +(@PATH,6,6806.69,710.446,409.317,0,0,0,100,0), +(@PATH,7,6840.86,715.128,414.078,0,0,0,100,0), +(@PATH,8,6885.64,719.654,417.771,0,0,0,100,0), +(@PATH,9,6901.58,727.055,420.546,0,0,0,100,0); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30543 AND `currentwaypoint`=1217170; +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths High Priest 3-A +SET @NPC = @NEXT+27; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7028.06,593.528,484.848,0,0,0,100,0), +(@PATH,2,7050.86,587.232,490.487,0,0,0,100,0), +(@PATH,3,7088.02,583.536,496.767,0,0,0,100,0), +(@PATH,4,7135.53,587.626,498.11,0,0,0,100,0), +(@PATH,5,7174.15,581.088,498.373,0,0,0,100,0), +(@PATH,6,7200,579.166,498.248,0,0,0,100,0), +(@PATH,7,7217.31,586.021,496.983,0,0,0,100,0), +(@PATH,8,7203.83,615.728,490.388,0,0,0,100,0), +(@PATH,9,7164.62,625.286,496.707,0,0,0,100,0), +(@PATH,10,7126.29,619.13,497.944,0,0,0,100,0), +(@PATH,11,7094.89,587.951,498.017,0,0,0,100,0), +(@PATH,12,7050.28,590.763,490.362,0,0,0,100,0), +(@PATH,13,7013.81,602.295,479.513,0,0,0,100,0), +(@PATH,14,6987.71,624.076,465.805,0,0,0,100,0), +(@PATH,15,6964.91,625.148,460.924,0,0,0,100,0), +(@PATH,16,6944.73,587.153,467.576,0,0,0,100,0), +(@PATH,17,6927.86,556.953,466.828,0,0,0,100,0), +(@PATH,18,6919.79,527.804,467.056,0,0,0,100,0), +(@PATH,19,6907.68,497.326,466.719,0,0,0,100,0), +(@PATH,20,6914.34,512.11,466.681,0,0,0,100,0), +(@PATH,21,6926.01,537.956,466.578,0,0,0,100,0), +(@PATH,22,6938.29,577.003,466.951,0,0,0,100,0), +(@PATH,23,6952.16,594.699,466.951,0,0,0,100,0), +(@PATH,24,6969.78,616.559,463.68,0,0,0,100,0), +(@PATH,25,6985.14,615.594,467.305,0,0,0,100,0), +(@PATH,26,7002.27,602.799,476.138,0,0,0,100,0); +-- ----------------------------------------------------------------------------------------------------------- +-- Forgotten Depths High Priest 3-B +SET @NPC = @NEXT+44; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (@NPC,@PATH); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7028.06,593.528,484.848,0,0,0,100,0), +(@PATH,2,7050.86,587.232,490.487,0,0,0,100,0), +(@PATH,3,7088.02,583.536,496.767,0,0,0,100,0), +(@PATH,4,7135.53,587.626,498.11,0,0,0,100,0), +(@PATH,5,7174.15,581.088,498.373,0,0,0,100,0), +(@PATH,6,7200,579.166,498.248,0,0,0,100,0), +(@PATH,7,7217.31,586.021,496.983,0,0,0,100,0), +(@PATH,8,7203.83,615.728,490.388,0,0,0,100,0), +(@PATH,9,7164.62,625.286,496.707,0,0,0,100,0), +(@PATH,10,7126.29,619.13,497.944,0,0,0,100,0), +(@PATH,11,7094.89,587.951,498.017,0,0,0,100,0), +(@PATH,12,7050.28,590.763,490.362,0,0,0,100,0), +(@PATH,13,7013.81,602.295,479.513,0,0,0,100,0), +(@PATH,14,6987.71,624.076,465.805,0,0,0,100,0), +(@PATH,15,6964.91,625.148,460.924,0,0,0,100,0), +(@PATH,16,6944.73,587.153,467.576,0,0,0,100,0), +(@PATH,17,6927.86,556.953,466.828,0,0,0,100,0), +(@PATH,18,6919.79,527.804,467.056,0,0,0,100,0), +(@PATH,19,6907.68,497.326,466.719,0,0,0,100,0), +(@PATH,20,6914.34,512.11,466.681,0,0,0,100,0), +(@PATH,21,6926.01,537.956,466.578,0,0,0,100,0), +(@PATH,22,6938.29,577.003,466.951,0,0,0,100,0), +(@PATH,23,6952.16,594.699,466.951,0,0,0,100,0), +(@PATH,24,6969.78,616.559,463.68,0,0,0,100,0), +(@PATH,25,6985.14,615.594,467.305,0,0,0,100,0), +(@PATH,26,7002.27,602.799,476.138,0,0,0,100,0); +-- -------------------------------------------------------------------------------------------------- +-- Create creature formations based on already existing ones. Also remove the final current waypoints. +-- Creature Formation 1-A +-- -------------------------------------------------------------------------------------------------- +SET @LEADER = @NEXT+27; +SET @NPC = @NEXT+89; +DELETE FROM `creature_formations` WHERE `leaderGUID`=@LEADER; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@LEADER,@LEADER,0,0,2), +(@LEADER,@NPC,3,0,2); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30203 AND `currentwaypoint`=1217200; +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30544 AND `currentwaypoint`=1217350; +-- Creature Formation 1-B +SET @LEADER = @NEXT+44; +SET @NPC = @NEXT+95; +DELETE FROM `creature_formations` WHERE `leaderGUID`=@LEADER; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@LEADER,@LEADER,0,0,2), +(@LEADER,@NPC,3,0,2); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30543 AND `currentwaypoint`=1217200; +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217350; +-- Creature Formation 2-A +SET @LEADER = @NEXT+25; +SET @NPC = @NEXT+86; +DELETE FROM `creature_formations` WHERE `leaderGUID`=@LEADER; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@LEADER,@LEADER,0,0,2), +(@LEADER,@NPC,3,0,2); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30203 AND `currentwaypoint`=1217160; +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30544 AND `currentwaypoint`=1217280; +-- Creature Formation 2-B +SET @LEADER = @NEXT+42; +SET @NPC = @NEXT+94; +DELETE FROM `creature_formations` WHERE `leaderGUID`=@LEADER; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(@LEADER,@LEADER,0,0,2), +(@LEADER,@NPC,3,0,2); +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30543 AND `currentwaypoint`=1217160; +UPDATE `creature` SET `currentwaypoint`=0 WHERE `id`=30541 AND `currentwaypoint`=1217280; -- cgit v1.2.3 From 3fff4c9e96eb0114254612aa13f1734e33cebf21 Mon Sep 17 00:00:00 2001 From: Nay Date: Mon, 28 May 2012 19:21:07 +0100 Subject: DB/NPC: Delete forgotten data from creature_addon Closes #6619 --- sql/updates/world/2012_05_28_06_world_creature_addon.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_28_06_world_creature_addon.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_06_world_creature_addon.sql b/sql/updates/world/2012_05_28_06_world_creature_addon.sql new file mode 100644 index 00000000000..a2b573da10a --- /dev/null +++ b/sql/updates/world/2012_05_28_06_world_creature_addon.sql @@ -0,0 +1,2 @@ +-- Delete forgotten data from creature_addon +DELETE FROM `creature_addon` WHERE `guid` IN (207262,207257,207254,207251,207246,207243,207241,207237); -- cgit v1.2.3 From 642cf04776784b98c7a4c4a18433b7d642199062 Mon Sep 17 00:00:00 2001 From: qaywsx Date: Mon, 28 May 2012 21:42:32 +0200 Subject: DB/Quest: Correct Quest chaining and requirements up until the quest "Crusader's Pinnacle" thx to thesensei for DK additions --- .../world/2012_05_28_07_world_quest_template.sql | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sql/updates/world/2012_05_28_07_world_quest_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_07_world_quest_template.sql b/sql/updates/world/2012_05_28_07_world_quest_template.sql new file mode 100644 index 00000000000..3cdf1895a9d --- /dev/null +++ b/sql/updates/world/2012_05_28_07_world_quest_template.sql @@ -0,0 +1,20 @@ +-- Correct Quest chaining and requirements up until the quest "Crusader's Pinnacle", when the Argent Base in the pinnacle phases in +UPDATE `quest_template` SET `PrevQuestId`=13036, `NextQuestId`=13044, `ExclusiveGroup`=-13008 WHERE `id`=13008; -- Scourge Tactics +UPDATE `quest_template` SET `PrevQuestId`=13036, `NextQuestId`=13044, `ExclusiveGroup`=-13008 WHERE `id`=13039; -- Defending The Vanguard +UPDATE `quest_template` SET `PrevQuestId`=13036, `NextQuestId`=13044, `ExclusiveGroup`=-13008 WHERE `id`=13040; -- Curing The Incurable +UPDATE `quest_template` SET `PrevQuestId`=0, `NextQuestId`=13045, `ExclusiveGroup`=0, `NextQuestIdChain`=13045 WHERE `id`=13044; -- If There Are Survivors +UPDATE `quest_template` SET `PrevQuestId`=13044, `NextQuestId`=13070, `ExclusiveGroup`=0, `NextQuestIdChain`=13070 WHERE `id`=13045; -- Into The Wild Green Yonder +UPDATE `quest_template` SET `Method`=0, `PrevQuestId`=13045, `NextQuestId`=13086, `ExclusiveGroup`=0, `NextQuestIdChain`=13086 WHERE `id`=13070; -- A Cold Front Approaches +UPDATE `quest_template` SET `PrevQuestId`=13070, `NextQuestId`=0, `ExclusiveGroup`=0, `NextQuestidChain`=0 WHERE `id`=13086; -- The Last Line Of Defense +-- Fix restrictions for DK and all rest classes without DK +UPDATE `quest_template` SET `PrevQuestId`=13086, `RequiredClasses`=32,`NextQuestId`=0, `ExclusiveGroup`=0, `NextQuestIdChain`=0 WHERE `id`=13104; -- Once More Unto The Breach, Hero /Death Knight's Special/ +UPDATE `quest_template` SET `PrevQuestId`=13086, `RequiredClasses`=1502,`NextQuestId`=0, `ExclusiveGroup`=0, `NextQuestIdChain`=0 WHERE `id`=13105; -- Once More Unto The Breach, Hero +UPDATE `quest_template` SET `PrevQuestId`=13104, `NextQuestId`=13139, `ExclusiveGroup`=-13122, `NextQuestIdChain`=0 WHERE `id`=13122; -- The Scourgestone +UPDATE `quest_template` SET `PrevQuestId`=13104, `NextQuestId`=13139, `ExclusiveGroup`=-13122, `NextQuestIdChain`=0 WHERE `id`=13118; -- The Purging of Scourgeholme +UPDATE `quest_template` SET `PrevQuestId`=13104, `NextQuestId`=13139, `ExclusiveGroup`=-13122, `NextQuestIdChain`=0 WHERE `id`=13110; -- The Restless Dead +UPDATE `quest_template` SET `PrevQuestId`=13104, `NextQuestId`=13139, `ExclusiveGroup`=-13122, `NextQuestIdChain`=0 WHERE `id`=13125; -- The Air Stands Still +UPDATE `quest_template` SET `PrevQuestId`=13104, `NextQuestId`=13139, `ExclusiveGroup`=-13122, `NextQuestIdChain`=0 WHERE `id`=13130; -- The Stone That Started a Revolution +UPDATE `quest_template` SET `PrevQuestId`=13104, `NextQuestId`=13139, `ExclusiveGroup`=-13122, `NextQuestIdChain`=0 WHERE `id`=13135; -- It Could Kill Us All +UPDATE `quest_template` SET `PrevQuestId`=0, `NextQuestId`=13141, `ExclusiveGroup`=0, `NextQuestIdChain`=13141 WHERE `id`=13139; -- Into The Cold Heart Of Northrend +UPDATE `quest_template` SET `PrevQuestId`=13139, `NextQuestId`=13157, `ExclusiveGroup`=0, `NextQuestIdChain`=13157 WHERE `id`=13141; -- The Battle For Crusader`s Pinnacle +UPDATE `quest_template` SET `PrevQuestId`=13141, `NextQuestId`=0, `ExclusiveGroup`=0, `NextQuestIdChain`=0 WHERE `id`=13135; -- The Crusader's Pinnacle -- cgit v1.2.3 From 3f4fbf7c9bfa449607a4c7444095c5a52d6bd2f4 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 30 May 2012 23:11:51 +0200 Subject: DB/Loot: re-assign Gunship 10N reference Closes #6648 --- ...2012_05_30_00_world_reference_loot_template.sql | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 sql/updates/world/2012_05_30_00_world_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql b/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql new file mode 100644 index 00000000000..7c6dfa1e11f --- /dev/null +++ b/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql @@ -0,0 +1,36 @@ +SET @Twins := 34329; +DELETE FROM `reference_loot_template` WHERE `entry`=@Twins; +INSERT INTO `reference_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(@Twins,47296,0,1,1,1,1), -- Greaves of Ruthless Judgment +(@Twins,47297,0,1,1,1,1), -- The Executioner's Vice +(@Twins,47298,0,1,1,1,1), -- Armguards of the Shieldmaiden +(@Twins,47299,0,1,1,1,1), -- Belt of the Pitiless Killer +(@Twins,47300,0,1,1,1,1), -- Gouge of the Frigid Heart +(@Twins,47301,0,1,1,1,1), -- Skyweaver Vestments +(@Twins,47302,0,1,1,1,1), -- Twin's Pact +(@Twins,47303,0,1,1,1,1), -- Death's Choice +(@Twins,47304,0,1,1,1,1), -- Legplates of Ascension +(@Twins,47305,0,1,1,1,1); -- Legionnaire's Gorget +SET @Gunship10N := 28057; -- Data1 for 201872 & 202177 +SET @Ref10J := 12036; +-- Gunship_Armory10N_reference +DELETE FROM `reference_loot_template` WHERE `entry`=@Ref10J; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak +(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering +(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter +(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver +(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun +(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots +(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope +(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass +(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm +(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring +(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers +(@Ref10J,50796,0,1,1,1,1); -- Bracers of Pale Illumination +-- Bind the refs to the objects +DELETE FROM `gameobject_loot_template` WHERE `entry`=@Gunship10N; +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Gunship10N +(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N +(@Gunship10N,1,100,1,0,-@Ref10J,2); -- 2 from reference 10Normal -- cgit v1.2.3 From 3967d57004db3fee1a000ff45da1399561aa4a5f Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Wed, 30 May 2012 23:14:49 +0200 Subject: DB/Creature: Add some VehicleId info from sniffs&UDB thx Faq for the comparison with UDB, PitCrawler for the additional sniffs Closes #6196 --- .../2012_05_30_01_world_creature_template.sql | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 sql/updates/world/2012_05_30_01_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_01_world_creature_template.sql b/sql/updates/world/2012_05_30_01_world_creature_template.sql new file mode 100644 index 00000000000..4b469a13891 --- /dev/null +++ b/sql/updates/world/2012_05_30_01_world_creature_template.sql @@ -0,0 +1,76 @@ +-- Missing Vehicle_Id's from UDB +UPDATE `creature_template` SET `VehicleId`=22 WHERE `entry`=24806; +UPDATE `creature_template` SET `VehicleId`=22 WHERE `entry`=24821; +UPDATE `creature_template` SET `VehicleId`=22 WHERE `entry`=24823; +UPDATE `creature_template` SET `VehicleId`=22 WHERE `entry`=24825; +UPDATE `creature_template` SET `VehicleId`=35 WHERE `entry`=26586; +UPDATE `creature_template` SET `VehicleId`=35 WHERE `entry`=26590; +UPDATE `creature_template` SET `VehicleId`=42 WHERE `entry`=27061; +UPDATE `creature_template` SET `VehicleId`=80 WHERE `entry`=27886; +UPDATE `creature_template` SET `VehicleId`=88 WHERE `entry`=27923; +UPDATE `creature_template` SET `VehicleId`=90 WHERE `entry`=27932; +UPDATE `creature_template` SET `VehicleId`=134 WHERE `entry`=28115; +UPDATE `creature_template` SET `VehicleId`=152 WHERE `entry`=28182; +UPDATE `creature_template` SET `VehicleId`=118 WHERE `entry`=28399; +UPDATE `creature_template` SET `VehicleId`=121 WHERE `entry`=28468; +UPDATE `creature_template` SET `VehicleId`=126 WHERE `entry`=28665; +UPDATE `creature_template` SET `VehicleId`=138 WHERE `entry`=28817; +UPDATE `creature_template` SET `VehicleId`=146 WHERE `entry`=28875; +UPDATE `creature_template` SET `VehicleId`=148 WHERE `entry`=28985; +UPDATE `creature_template` SET `VehicleId`=148 WHERE `entry`=28999; +UPDATE `creature_template` SET `VehicleId`=149 WHERE `entry`=29005; +UPDATE `creature_template` SET `VehicleId`=179 WHERE `entry`=29579; +UPDATE `creature_template` SET `VehicleId`=186 WHERE `entry`=29677; +UPDATE `creature_template` SET `VehicleId`=197 WHERE `entry`=29754; +UPDATE `creature_template` SET `VehicleId`=203 WHERE `entry`=29863; +UPDATE `creature_template` SET `VehicleId`=216 WHERE `entry`=30108; +UPDATE `creature_template` SET `VehicleId`=231 WHERE `entry`=30331; +UPDATE `creature_template` SET `VehicleId`=240 WHERE `entry`=30487; +UPDATE `creature_template` SET `VehicleId`=257 WHERE `entry`=30895; +UPDATE `creature_template` SET `VehicleId`=258 WHERE `entry`=31050; +UPDATE `creature_template` SET `VehicleId`=259 WHERE `entry`=31110; +UPDATE `creature_template` SET `VehicleId`=262 WHERE `entry`=31125; +UPDATE `creature_template` SET `VehicleId`=264 WHERE `entry`=31157; +UPDATE `creature_template` SET `VehicleId`=287 WHERE `entry`=31838; +UPDATE `creature_template` SET `VehicleId`=315 WHERE `entry`=31857; +UPDATE `creature_template` SET `VehicleId`=315 WHERE `entry`=31858; +UPDATE `creature_template` SET `VehicleId`=315 WHERE `entry`=31861; +UPDATE `creature_template` SET `VehicleId`=315 WHERE `entry`=31862; +UPDATE `creature_template` SET `VehicleId`=296 WHERE `entry`=32198; +UPDATE `creature_template` SET `VehicleId`=296 WHERE `entry`=32208; +UPDATE `creature_template` SET `VehicleId`=302 WHERE `entry`=32348; +UPDATE `creature_template` SET `VehicleId`=305 WHERE `entry`=32483; +UPDATE `creature_template` SET `VehicleId`=295 WHERE `entry`=32511; +UPDATE `creature_template` SET `VehicleId`=287 WHERE `entry`=32513; +UPDATE `creature_template` SET `VehicleId`=308 WHERE `entry`=32535; +UPDATE `creature_template` SET `VehicleId`=313 WHERE `entry`=32640; +UPDATE `creature_template` SET `VehicleId`=90 WHERE `entry`=32682; +UPDATE `creature_template` SET `VehicleId`=347 WHERE `entry`=33108; +UPDATE `creature_template` SET `VehicleId`=356 WHERE `entry`=33364; +UPDATE `creature_template` SET `VehicleId`=357 WHERE `entry`=33366; +UPDATE `creature_template` SET `VehicleId`=358 WHERE `entry`=33369; +UPDATE `creature_template` SET `VehicleId`=370 WHERE `entry`=33432; +UPDATE `creature_template` SET `VehicleId`=371 WHERE `entry`=33651; +UPDATE `creature_template` SET `VehicleId`=373 WHERE `entry`=33670; +UPDATE `creature_template` SET `VehicleId`=392 WHERE `entry`=34146; +UPDATE `creature_template` SET `VehicleId`=395 WHERE `entry`=34150; +UPDATE `creature_template` SET `VehicleId`=396 WHERE `entry`=34151; +UPDATE `creature_template` SET `VehicleId`=399 WHERE `entry`=34183; +UPDATE `creature_template` SET `VehicleId`=435 WHERE `entry`=34776; +UPDATE `creature_template` SET `VehicleId`=514 WHERE `entry`=35069; +UPDATE `creature_template` SET `VehicleId`=548 WHERE `entry`=36812; +UPDATE `creature_template` SET `VehicleId`=615 WHERE `entry`=37980; +UPDATE `creature_template` SET `VehicleId`=647 WHERE `entry`=38711; +UPDATE `creature_template` SET `VehicleId`=648 WHERE `entry`=38712; +UPDATE `creature_template` SET `VehicleId`=700 WHERE `entry`=39682; +UPDATE `creature_template` SET `VehicleId`=753 WHERE `entry`=39759; +UPDATE `creature_template` SET `VehicleId`=763 WHERE `entry`=39819; +UPDATE `creature_template` SET `VehicleId`=711 WHERE `entry`=39860; +UPDATE `creature_template` SET `VehicleId`=747 WHERE `entry`=40479; +UPDATE `creature_template` SET `VehicleId`=604 WHERE `entry`=37827; +UPDATE `creature_template` SET `VehicleId`=610 WHERE `entry`=37952; +-- From PitCrawler +UPDATE `creature_template` SET `vehicleId`=202 WHERE `entry`=29903; -- Frostbite +UPDATE `creature_template` SET `vehicleId`=241 WHERE `entry`=30388; -- Stormhoof +UPDATE `creature_template` SET `vehicleId`=25 WHERE `entry`=25194; -- Kor'kron Riding Wolf +UPDATE `creature_template` SET `vehicleId`=108 WHERE `entry`=28639; -- Heb'Jin's Bat -- cgit v1.2.3 From 10314f913ae29728b4e1e6568608dc23cb9a86c7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 30 May 2012 20:08:28 -0230 Subject: DB/quest_template: Fixing Required Races on Quests 8553 and 8554 to allow for Alliance completion. By warriorpoetex Closes Issue #6629 --- sql/updates/world/2012_05_30_02_world_quest_template.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_05_30_02_world_quest_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_02_world_quest_template.sql b/sql/updates/world/2012_05_30_02_world_quest_template.sql new file mode 100644 index 00000000000..2b829aa0875 --- /dev/null +++ b/sql/updates/world/2012_05_30_02_world_quest_template.sql @@ -0,0 +1,5 @@ +-- Fixing Required Races on Quests 8553 and 8554 to allow for Alliance completion +UPDATE `quest_template` SET `RequiredRaces`=0 WHERE `id`=8554; +UPDATE `quest_template` SET `RequiredRaces`=0 WHERE `id`=8553; +-- Fixing Next Quest for Quest 8552 +UPDATE `quest_template` SET `NextQuestIDChain`=8553 WHERE `id`=8552; -- cgit v1.2.3 From 1c73fa3649322a85e7f2aacb051c25527fb7a390 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 30 May 2012 20:12:58 -0230 Subject: DB/creature_formations: Set Fel Steed Formation/Group Combat Assistance Fix by warriorpoetex. Closes issue #6629 --- sql/updates/world/2012_05_30_03_world_creature_formation.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_05_30_03_world_creature_formation.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_03_world_creature_formation.sql b/sql/updates/world/2012_05_30_03_world_creature_formation.sql new file mode 100644 index 00000000000..2964415e85b --- /dev/null +++ b/sql/updates/world/2012_05_30_03_world_creature_formation.sql @@ -0,0 +1,6 @@ +-- Set Fel Steed Formation/Group Combat Assistance +DELETE FROM `creature_formations` WHERE `leaderGUID`=16441; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(16441,16441,0,0,2), +(16441,16442,10,225,2), +(16441,16440,10,120,2); -- cgit v1.2.3 From e2302d2cc78319dac9fa200acb61dbec1d403f94 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 30 May 2012 20:15:56 -0230 Subject: DB/gossip: Add missing gossip for Book "Soothsaying for Dummies" Closes Issue #6652 --- sql/updates/world/2012_05_30_04_world_gossip.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_05_30_04_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_04_world_gossip.sql b/sql/updates/world/2012_05_30_04_world_gossip.sql new file mode 100644 index 00000000000..0abbea7b964 --- /dev/null +++ b/sql/updates/world/2012_05_30_04_world_gossip.sql @@ -0,0 +1,3 @@ +-- Add missing gossip for Book "Soothsaying for Dummies" +DELETE FROM `gossip_menu` WHERE `entry`=7058; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7058,8321); -- cgit v1.2.3 From 7d4d296e2f60b2d42fe51b92b666238d4513bbd1 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 30 May 2012 22:55:30 -0230 Subject: DB?Gossip: Bladesedge Mountains gossips By Pitcrawler the awesome --- sql/updates/world/2012_05_30_05_world_gossip.sql | 429 +++++++++++++++++++++++ 1 file changed, 429 insertions(+) create mode 100644 sql/updates/world/2012_05_30_05_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_05_world_gossip.sql b/sql/updates/world/2012_05_30_05_world_gossip.sql new file mode 100644 index 00000000000..37c7586cd60 --- /dev/null +++ b/sql/updates/world/2012_05_30_05_world_gossip.sql @@ -0,0 +1,429 @@ +-- Creature Gossip_menu_id Update from sniff +UPDATE `creature_template` SET `gossip_menu_id`=8388 WHERE `entry`=21118; -- Razak Ironsides +UPDATE `creature_template` SET `gossip_menu_id`=8306 WHERE `entry`=21494; -- Smiles O'Byron +UPDATE `creature_template` SET `gossip_menu_id`=8385 WHERE `entry`=21824; -- Dizzy Dina +UPDATE `creature_template` SET `gossip_menu_id`=8303 WHERE `entry`=21460; -- Tally Zapnabber +UPDATE `creature_template` SET `gossip_menu_id`=8304 WHERE `entry`=21461; -- Rally Zapnabber +UPDATE `creature_template` SET `gossip_menu_id`=8351 WHERE `entry`=21690; -- R-3D0 +UPDATE `creature_template` SET `gossip_menu_id`=8370 WHERE `entry`=21755; -- Nickwinkle the Metro-Gnome +UPDATE `creature_template` SET `gossip_menu_id`=8429 WHERE `entry`=21981; -- Overseer Nuaar +UPDATE `creature_template` SET `gossip_menu_id`=8432 WHERE `entry`=21983; -- Samia Inkling +UPDATE `creature_template` SET `gossip_menu_id`=8431 WHERE `entry`=22007; -- Tree Warden Chawn +UPDATE `creature_template` SET `gossip_menu_id`=8436 WHERE `entry`=22019; -- Kolphis Darkscale +UPDATE `creature_template` SET `gossip_menu_id`=8447 WHERE `entry`=22020; -- O'Mally Zapnabber +UPDATE `creature_template` SET `gossip_menu_id`=8508 WHERE `entry`=22053; -- Mosswood the Ancient +UPDATE `creature_template` SET `gossip_menu_id`=8490 WHERE `entry`=22099; -- Wyrmcult Provisioner +UPDATE `creature_template` SET `gossip_menu_id`=8491 WHERE `entry`=22103; -- Baron Sablemane +UPDATE `creature_template` SET `gossip_menu_id`=8523 WHERE `entry`=22127; -- Wildlord Antelarion +UPDATE `creature_template` SET `gossip_menu_id`=8496 WHERE `entry`=22149; -- Commander Haephus Stonewall +UPDATE `creature_template` SET `gossip_menu_id`=8506 WHERE `entry`=22215; -- Treebole +UPDATE `creature_template` SET `gossip_menu_id`=8723 WHERE `entry`=22264; -- Ogri'la Steelshaper +UPDATE `creature_template` SET `gossip_menu_id`=8717, `npcflag`=`npcflag`|1 WHERE `entry`=22266; -- Food Vendor +UPDATE `creature_template` SET `gossip_menu_id`=8716, `npcflag`=`npcflag`|1 WHERE `entry`=22270; -- Ogri'la Merchant +UPDATE `creature_template` SET `gossip_menu_id`=8722, `npcflag`=`npcflag`|1 WHERE `entry`=22271; -- Ogri'la Trader +UPDATE `creature_template` SET `gossip_menu_id`=8529 WHERE `entry`=22386; -- Watcher Moonshade +UPDATE `creature_template` SET `gossip_menu_id`=8615 WHERE `entry`=22924; -- Arthorn Windsong +UPDATE `creature_template` SET `gossip_menu_id`=8620 WHERE `entry`=22941; -- Mog'dorg the Wizened +UPDATE `creature_template` SET `gossip_menu_id`=8657 WHERE `entry`=22995; -- Chort +UPDATE `creature_template` SET `gossip_menu_id`=8753 WHERE `entry`=23038; -- Sky Commander Adaris +UPDATE `creature_template` SET `gossip_menu_id`=8630 WHERE `entry`=23048; -- Sky Sergeant Doryn +UPDATE `creature_template` SET `gossip_menu_id`=8640, `npcflag`=`npcflag`|1 WHERE `entry`=23052; -- Bloodmaul Supplicant +UPDATE `creature_template` SET `gossip_menu_id`=8640, `npcflag`=`npcflag`|1 WHERE `entry`=23053; -- Bladespire Supplicant +UPDATE `creature_template` SET `gossip_menu_id`=8721, `npcflag`=`npcflag`|1 WHERE `entry`=23110; -- Ogri'la Keg King +UPDATE `creature_template` SET `gossip_menu_id`=8724 WHERE `entry`=23112; -- Mingo +UPDATE `creature_template` SET `gossip_menu_id`=8642, `npcflag`=`npcflag`|1 WHERE `entry`=23120; -- Sky Sergeant Vanderlip +UPDATE `creature_template` SET `gossip_menu_id`=8737 WHERE `entry`=23208; -- Skyguard Pyrotechnician +UPDATE `creature_template` SET `gossip_menu_id`=8679 WHERE `entry`=23253; -- Kronk +UPDATE `creature_template` SET `gossip_menu_id`=8667 WHERE `entry`=23306; -- Hazzik +UPDATE `creature_template` SET `gossip_menu_id`=8670 WHERE `entry`=23335; -- Skyguard Khatie +UPDATE `creature_template` SET `gossip_menu_id`=8683 WHERE `entry`=23363; -- Sahaak +UPDATE `creature_template` SET `gossip_menu_id`=8718 WHERE `entry`=23413; -- Skyguard Handler Irena +UPDATE `creature_template` SET `gossip_menu_id`=8719 WHERE `entry`=23415; -- Skyguard Handler Deesak +UPDATE `creature_template` SET `gossip_menu_id`=8726 WHERE `entry`=23428; -- Jho'nass +UPDATE `creature_template` SET `gossip_menu_id`=8736 WHERE `entry`=23473; -- Aether-tech Apprentice + +-- Gossip Menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=8303 AND `text_id` IN (10359,10569); +DELETE FROM `gossip_menu` WHERE `entry`=8304 AND `text_id` IN (10360,10537); +DELETE FROM `gossip_menu` WHERE `entry`=8306 AND `text_id`=10410; +DELETE FROM `gossip_menu` WHERE `entry`=8343 AND `text_id`=10363; +DELETE FROM `gossip_menu` WHERE `entry`=8351 AND `text_id`=10422; +DELETE FROM `gossip_menu` WHERE `entry`=8370 AND `text_id`=10444; +DELETE FROM `gossip_menu` WHERE `entry`=8385 AND `text_id`=10466; +DELETE FROM `gossip_menu` WHERE `entry`=8388 AND `text_id`=10469; +DELETE FROM `gossip_menu` WHERE `entry`=8429 AND `text_id`=10532; +DELETE FROM `gossip_menu` WHERE `entry`=8430 AND `text_id`=10533; +DELETE FROM `gossip_menu` WHERE `entry`=8431 AND `text_id`=10534; +DELETE FROM `gossip_menu` WHERE `entry`=8432 AND `text_id`=10538; +DELETE FROM `gossip_menu` WHERE `entry`=8435 AND `text_id`=10541; +DELETE FROM `gossip_menu` WHERE `entry`=8436 AND `text_id`=10539; +DELETE FROM `gossip_menu` WHERE `entry`=8437 AND `text_id`=10542; +DELETE FROM `gossip_menu` WHERE `entry`=8438 AND `text_id`=10543; +DELETE FROM `gossip_menu` WHERE `entry`=8439 AND `text_id`=10544; +DELETE FROM `gossip_menu` WHERE `entry`=8440 AND `text_id`=10545; +DELETE FROM `gossip_menu` WHERE `entry`=8447 AND `text_id`=10554; +DELETE FROM `gossip_menu` WHERE `entry`=8454 AND `text_id`=10561; +DELETE FROM `gossip_menu` WHERE `entry`=8455 AND `text_id`=10562; +DELETE FROM `gossip_menu` WHERE `entry`=8490 AND `text_id`=10602; +DELETE FROM `gossip_menu` WHERE `entry`=8491 AND `text_id`=10603; +DELETE FROM `gossip_menu` WHERE `entry`=8496 AND `text_id`=10612; +DELETE FROM `gossip_menu` WHERE `entry`=8506 AND `text_id`=10637; +DELETE FROM `gossip_menu` WHERE `entry`=8508 AND `text_id`=10640; +DELETE FROM `gossip_menu` WHERE `entry`=8523 AND `text_id`=10657; +DELETE FROM `gossip_menu` WHERE `entry`=8529 AND `text_id`=10667; +DELETE FROM `gossip_menu` WHERE `entry`=8615 AND `text_id`=10793; +DELETE FROM `gossip_menu` WHERE `entry`=8620 AND `text_id` IN (10800,10860); +DELETE FROM `gossip_menu` WHERE `entry`=8630 AND `text_id`=10819; +DELETE FROM `gossip_menu` WHERE `entry`=8640 AND `text_id`=10838; +DELETE FROM `gossip_menu` WHERE `entry`=8642 AND `text_id` IN (10841,10992,10994,10995); +DELETE FROM `gossip_menu` WHERE `entry`=8657 AND `text_id` IN (10877,10878); +DELETE FROM `gossip_menu` WHERE `entry`=8660 AND `text_id` IN (10888,11057); +DELETE FROM `gossip_menu` WHERE `entry`=8667 AND `text_id`=10903; +DELETE FROM `gossip_menu` WHERE `entry`=8669 AND `text_id` IN (10906,10938,10988,10989,10990,10991); +DELETE FROM `gossip_menu` WHERE `entry`=8670 AND `text_id` IN (10907,10997,11001,11002,11004); +DELETE FROM `gossip_menu` WHERE `entry`=8671 AND `text_id` IN (10909,10951); +DELETE FROM `gossip_menu` WHERE `entry`=8672 AND `text_id` IN (10910,10922); +DELETE FROM `gossip_menu` WHERE `entry`=8674 AND `text_id`=10912; +DELETE FROM `gossip_menu` WHERE `entry`=8675 AND `text_id`=10915; +DELETE FROM `gossip_menu` WHERE `entry`=8678 AND `text_id` IN (10916,10917,10918,11013,11015,11018); +DELETE FROM `gossip_menu` WHERE `entry`=8679 AND `text_id` IN (10919,10920,11027,11028); +DELETE FROM `gossip_menu` WHERE `entry`=8680 AND `text_id` IN (10923,10924,10925,11019,11020,11021); +DELETE FROM `gossip_menu` WHERE `entry`=8681 AND `text_id` IN (10926,10927,11007,11009,11010,11011); +DELETE FROM `gossip_menu` WHERE `entry`=8683 AND `text_id`=10953; +DELETE FROM `gossip_menu` WHERE `entry`=8685 AND `text_id` IN (10931,10932); +DELETE FROM `gossip_menu` WHERE `entry`=8687 AND `text_id`=11058; +DELETE FROM `gossip_menu` WHERE `entry`=8689 AND `text_id` IN (10931,10932); +DELETE FROM `gossip_menu` WHERE `entry`=8690 AND `text_id` IN (10931,10932); +DELETE FROM `gossip_menu` WHERE `entry`=8691 AND `text_id` IN (10931,10932); +DELETE FROM `gossip_menu` WHERE `entry`=8716 AND `text_id` IN (10965,10966,10967,10968,10969); +DELETE FROM `gossip_menu` WHERE `entry`=8717 AND `text_id` IN (10972,10973,10974,10975,10976); +DELETE FROM `gossip_menu` WHERE `entry`=8718 AND `text_id` IN (10977,10978); +DELETE FROM `gossip_menu` WHERE `entry`=8719 AND `text_id` IN (10979,10980); +DELETE FROM `gossip_menu` WHERE `entry`=8721 AND `text_id` IN (10983,10984,10985,10986,10987); +DELETE FROM `gossip_menu` WHERE `entry`=8722 AND `text_id` IN (10993,10996,10998,10999,11000); +DELETE FROM `gossip_menu` WHERE `entry`=8723 AND `text_id` IN (11008,11012,11014,11016,11017); +DELETE FROM `gossip_menu` WHERE `entry`=8724 AND `text_id` IN (11022,11023,11024,11025,11026); +DELETE FROM `gossip_menu` WHERE `entry`=8726 AND `text_id` IN (11029,11036,11037,11038); +DELETE FROM `gossip_menu` WHERE `entry`=8736 AND `text_id`=11066; +DELETE FROM `gossip_menu` WHERE `entry`=8737 AND `text_id` IN (11059,11060,11061,11063); +DELETE FROM `gossip_menu` WHERE `entry`=8753 AND `text_id`=11089; +DELETE FROM `gossip_menu` WHERE `entry`=8757 AND `text_id` IN (11094,11095); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(8303,10359),(8303,10569), +(8304,10537),(8304,10360), +(8306,10410), +(8343,10363), +(8351,10422), +(8370,10444), +(8385,10466), +(8388,10469), +(8429,10532), +(8430,10533), +(8431,10534), +(8435,10541), +(8436,10539), +(8437,10542), +(8438,10543), +(8439,10544), +(8440,10545), +(8447,10554), +(8454,10561), +(8455,10562), +(8490,10602), +(8491,10603), +(8496,10612), +(8506,10637), +(8508,10640), +(8523,10657), +(8529,10667), +(8615,10793), +(8620,10800),(8620,10860), +(8630,10819), +(8640,10838), +(8642,10841),(8642,10992),(8642,10994),(8642,10995), +(8657,10877),(8657,10878), +(8660,10888),(8660,11057), +(8667,10903), +(8669,10906),(8669,10938),(8669,10988),(8669,10989),(8669,10990),(8669,10991), +(8670,10907),(8670,10997),(8670,11001),(8670,11002),(8670,11004), +(8671,10909),(8671,10951), +(8672,10910),(8672,10922), +(8674,10912), +(8675,10915), +(8678,10916),(8678,10917),(8678,10918),(8678,11013),(8678,11015),(8678,11018), +(8679,10919),(8679,10920),(8679,11027),(8679,11028), +(8680,10923),(8680,10924),(8680,10925),(8680,11019),(8680,11020),(8680,11021), +(8681,10926),(8681,10927),(8681,11007),(8681,11009),(8681,11010),(8681,11011), +(8683,10953), +(8685,10931),(8685,10932), +(8687,11058), +(8689,10931),(8689,10932), +(8690,10931),(8690,10932), +(8691,10931),(8691,10932), +(8716,10965),(8716,10966),(8716,10967),(8716,10968),(8716,10969), +(8717,10976),(8717,10975),(8717,10974),(8717,10973),(8717,10972), +(8718,10977),(8718,10978), +(8719,10979),(8719,10980), +(8721,10983),(8721,10984),(8721,10985),(8721,10986),(8721,10987), +(8722,10993),(8722,10996),(8722,10998),(8722,10999),(8722,11000), +(8723,11008),(8723,11012),(8723,11014),(8723,11016),(8723,11017), +(8724,11022),(8724,11023),(8724,11024),(8724,11025),(8724,11026), +(8726,11029),(8726,11036),(8726,11037),(8726,11038), +(8736,11066), +(8737,11059),(8737,11060),(8737,11061),(8737,11063), +(8753,11089), +(8757,11094),(8757,11095); + +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8429,8435,8436,8437,8438,8439,8454,8490,8660,8661,8671,8672,8673,8674,8675,8676,8677,8679,8683,8685,8687,8689,8690,8691,8716,8717,8718,8719,8721,8722,8723,8724,8726,8737) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id`=8304 AND `id` IN (0,1,2,3,4,5); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=8306 AND `id` IN (0,1); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=8455 AND `id` IN (0,1,2,3,4); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=8660 AND `id` IN (0,1,2,3); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=8679 AND `id` IN (0,1); +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 +(8303,0,0,'I need another waiver!',1,1,0,0,0,0,''), -- Spellcast 38255 +(8304,0,0,'I''m ready for my test flight!',1,1,0,0,0,0,''), +(8304,1,0,'Take me to Singing Ridge.',1,1,8454,0,0,0,''), +(8304,2,0,'Send me to Razaan''s Landing!',1,1,0,0,0,0,''), +(8304,3,0,'Take me to Ruuan.',1,1,0,0,0,0,''), +(8304,4,0,'Send me to Raven''s Wood!',1,1,0,0,0,0,''), +(8304,5,0,'I want to fly to an old location!',1,1,8455,0,0,0,''), +(8306,1,0,'Why are you so far from Toshley''s Station?',1,1,8343,0,0,0,''), +(8429,0,0,'Overseer, I am here to negotiate on behalf of the Cenarion Expedition.',1,1,8430,0,0,0,''), +(8435,0,0,'Oh, it''s not my fault, I can assure you.',1,1,8437,0,0,0,''), +(8436,0,0,'I''m fine, thank you. You asked for me?',1,1,8435,0,0,0,''), +(8437,0,0,'Um, no... no, I don''t want that at all.',1,1,8438,0,0,0,''), +(8438,0,0,'Impressive. When do we attack?',1,1,8439,0,0,0,''), +(8439,0,0,'Absolutely!',1,1,8440,0,0,0,''), +(8454,0,0,'I have the signed waiver! Fire me into the Singing Ridge!',1,1,0,0,0,0,''), +(8455,0,0,'Send me back to the Jagged Ridge.',1,1,0,0,0,0,''), +(8455,1,0,'Send me back to the Singing Ridge.',1,1,0,0,0,0,''), +(8455,2,0,'Send me back to Razaan''s Landing.',1,1,0,0,0,0,''), +(8455,3,0,'Send me back to Ruuan.',1,1,0,0,0,0,''), +(8455,4,0,'Send me back to Raven''s Wood.',1,1,0,0,0,0,''), +(8490,0,1,'Very well, let me see what you''ve got.',3,128,0,0,0,0,''), +(8660,0,0,'',1,1,0,0,0,0,''), +(8660,1,0,'',1,1,0,0,0,0,''), +(8660,2,0,'',1,1,0,0,0,0,''), +(8660,3,0,'',1,1,0,0,0,0,''), +(8661,0,1,'Show me your assortment of, err... things.',3,128,0,0,0,0,''), +(8671,0,0,'Place 35 Apexis Shards into the prism.',1,1,0,0,0,0,''), +(8672,0,0,'Purchase 1 Unstable Flask of the Beast for the cost of 10 Apexis Shards',1,1,8673,0,0,0,''), +(8672,1,0,'Purchase 5 Unstable Flasks of the Beast for the cost of 50 Apexis Shards',1,1,8674,0,0,0,''), +(8673,0,0,'Use the fel crystalforge to make another purchase.',1,1,8672,0,0,0,''), +(8674,0,0,'Use the fel crystalforge to make another purchase.',1,1,8672,0,0,0,''), +(8675,0,0,'Use the Bash''ir crystalforge to make another purchase.',1,1,8677,0,0,0,''), +(8676,0,0,'Use the Bash''ir crystalforge to make another purchase.',1,1,8677,0,0,0,''), +(8677,0,0,'Purchase 1 Unstable Flask of the Sorcerer for the cost of 10 Apexis Shards',1,1,8676,0,0,0,''), +(8677,1,0,'Purchase 5 Unstable Flasks of the Sorcerer for the cost of 50 Apexis Shards',1,1,8675,0,0,0,''), +(8679,0,0,'Kronk, tell me about the charged crystal foci.',1,1,8757,0,0,0,''), +(8683,0,1,'Skwak!',3,128,0,0,0,0,''), +(8685,0,0,'Place 35 Apexis Shards near the dragon egg to crack it open.',1,1,0,0,0,0,''), +(8687,0,0,'',1,1,0,0,0,0,''), +(8689,0,0,'Place 35 Apexis Shards near the dragon egg to crack it open.',1,1,0,0,0,0,''), +(8690,0,0,'Place 35 Apexis Shards near the dragon egg to crack it open.',1,1,0,0,0,0,''), +(8691,0,0,'Place 35 Apexis Shards near the dragon egg to crack it open.',1,1,0,0,0,0,''), +(8716,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(8717,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(8718,1,0,'Yes, I''d love a ride to Blackwind Landing.',1,1,0,0,0,0,''), +(8719,1,0,'Absolutely! Send me to the Skyguard Outpost.',1,1,0,0,0,0,''), +(8721,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(8722,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(8723,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(8724,0,1,'Let me browse your goods.',3,128,0,0,0,0,''), +(8726,0,1,'Jho''nass, let me see what you have to offer.',3,128,0,0,0,0,''), +(8737,0,1,'Let me browse your goods.',3,128,0,0,0,0,''); + +-- Insert npc_text from sniff +DELETE FROM `npc_text` WHERE `ID` IN (10838,10878,10909,10915,10918,10968,10977,10984,10985,10986,10987,10990,10991,10993,10996,10998,10999,11012,11013,11014,11015,11020,11022,11023,11024,11037,11063); +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 +(10838,'Yes, $g king : queen;?','',0,1,0,1,0,0,0,0,'You kill gronn! Now you fight things from sky?','',0,1,0,15,0,0,0,0,'Me life for $N!','',0,1,0,15,0,0,0,0,'Dis drink good!','',0,1,0,1,0,0,0,0,'If $G King : Queen; $N dance, me dance!','',0,1,0,1,0,0,0,0,'$G King : Queen; not angry with me?','',0,1,0,1,0,0,0,0,'Why you look at me like dat? You not gonna kiss me, right!?','',0,1,0,1,0,0,0,0,'Now all Sons of Gruul dead! Now new $g king : queen; lead all ogres to Ogri''la!','',0,1,0,15,0,0,0,0,12340), +(10878,'Da $g king : queen;! Chort ready to serve.','',0,1,0,2,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), +(10909,'Burning eyes within the prism fill your mind with a sense of dread...','',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), +(10915,'','',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), +(10918,'The boy''s too stupid still to say it -- not enough crystal exposure yet -- but, he''s thankful for what you did in getting him those flasks.$B$BNow, only nine more sons to go. Gah!$B$B$B$BWant to take one of them off of our hands? We''ll sell him to you cheap.','',0,1,0,1,0,5,0,6,'','',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), +(10968,'Mighty one! How can we serve you?','',0,1,1,396,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), +(10977,'','Hey, comrade. If you get yourself in good with the Skyguard, I can offer you a direct flight to our base, Blackwind Landing, in the Skethyl Mountains.$B$BDo you like my beautiful nether ray? It is lovely.',0,1,0,1,0,6,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), +(10984,'Everyone''s gotta drink. What can we get for you?','',0,1,1,396,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), +(10985,'Greetings $G brother:sister;, how can we help?','',0,1,1,396,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), +(10986,'Our drinks should quench even the mightiest of thirsts.','',0,1,1,396,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), +(10987,'Drink or be gone!','',0,1,1,396,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), +(10990,'Yer gettin'' ta be something of a revered figure ''round here, $g boy : girl;! If''n I didn''t know better, I''d say ye were gunnin'' fer me job!!!$B$BAll the same, if ye keep up the way ye have been, ye''ll deserve it!','',0,1,0,5,0,396,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), +(10991,'What can I say, $N? Yer the finest o'' the Sha''tari Skyguard!$B$BJust don''t be lettin'' that go ta yer head. I can still teach ya a thing or two, $g lad : lass;!$B$B','',0,1,0,2,0,11,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), +(10993,'How can we be of service, exalted one?','',0,1,1,16,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), +(10996,'We are happy to provide you with supplies.','',0,1,1,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,12340), +(10998,'Honored $G brother:sister;, how can we help?','',0,1,1,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,12340), +(10999,'Friend! It''s been too long. What can we get for you?','',0,1,1,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,12340), +(11013,'It''s an honor to have a $r such as yourself aiding us ogres. You''re keeping our hope of a better future alive.$B$BNow if we could just get rid of these headaches. Are you sure you don''t want one of our sons?','',0,1,0,1,0,6,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), +(11012,'There are few things you can trust in life. Steel, you can trust.','',0,1,1,396,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), +(11014,'What is steel compared to the hand that shapes it?','',0,1,1,396,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), +(11015,'It''s amazing how much you''ve helped us out. We dare say that if it weren''t for you, we''d already have been overrun by the demons, or fried to a crisp by the Black Dragonflight!$B$BOn a side note, we did mention that we''d sell you one of our sons, cheap, right? No, not interested?','',0,1,0,1,0,6,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), +(11020,'Gahk like little, $r $N. Yous kill da big demon; make all da little demons scared!$B$B','',0,1,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,12340), +(11022,'What can we get for you, our exalted $G brother:sister;?','',0,1,1,16,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), +(11023,'How might we be of assistance?','',0,1,1,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,12340), +(11024,'Honored $G brother:sister;, how may we help?','',0,1,1,396,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), +(11037,'You''re like something of a revered figure around here, $g man : kitten;. Seems like everyone''s talking about you. That''s cool.$B$BLet''s see if there''s something in stock that you''re interested in. We have a lot of nice stuff.','',0,1,0,25,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,12340), +(11063,'You can never be too prepared.','',0,1,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,12340); + +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8303 AND `SourceEntry`=10569; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8304 AND `SourceEntry`=10537; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8620 AND `SourceEntry`=10860; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8642 AND `SourceEntry` IN (10992,10994,10995); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8657 AND `SourceEntry`=10878; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8660 AND `SourceEntry`=11057; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8669 AND `SourceEntry` IN (10938,10988,10989,10990,10991); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8670 AND `SourceEntry` IN (10997,11001,11002,11004); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8671 AND `SourceEntry`=10951; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8672 AND `SourceEntry`=10922; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8677 AND `SourceEntry`=10913; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8678 AND `SourceEntry` IN (10917,10918,11013,11015,11018); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8679 AND `SourceEntry` IN (10920,11027,11028); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8680 AND `SourceEntry` IN (10923,10924,10925,11019,11020,11021); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8681 AND `SourceEntry` IN (10926,10927,11007,11009,11010,11011); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup` IN (8685,8689,8690,8691) AND `SourceEntry`=10932; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8716 AND `SourceEntry` IN (10965,10966,10968,10969); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8717 AND `SourceEntry` IN (10972,10973,10974,10975,10976); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8718 AND `SourceEntry`=10978; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8719 AND `SourceEntry`=10979; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8721 AND `SourceEntry` IN (10983,10984,10985,10986,10987); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8722 AND `SourceEntry` IN (10993,10996,10998,10999,11000); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8723 AND `SourceEntry` IN (11008,11012,11014,11016,11017); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8724 AND `SourceEntry` IN (11022,11023,11024,11025,11026); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8726 AND `SourceEntry` IN (11036,11037,11038); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8737 AND `SourceEntry` IN (11060,11061,11063); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8757 AND `SourceEntry`=11095; + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8304 AND `SourceEntry` IN (0,1,2,3,4,5); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8429 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8454 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8455 AND `SourceEntry` IN (0,1,2,3,4); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8660 AND `SourceEntry` IN (0,1,2,3); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8671 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8672 AND `SourceEntry` IN (0,1); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8677 AND `SourceEntry` IN (0,1); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8685 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8687 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8689 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8690 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8691 AND `SourceEntry`=0; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8718 AND `SourceEntry`=1; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8719 AND `SourceEntry`=1; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,8303,10569,0,0,8,10557,0,0,0,0,'','Tally Zapnabber - Show different gossip if player has completed quest 10557'), +(14,8304,10537,0,0,1,37108,0,0,0,0,'','Rally Zapnabber - Show different gossip if player is affected by aura 37108'), +(14,8620,10860,0,0,8,11000,0,0,0,0,'','Mog''dorg the Wizened - Show different gossip if player has rewarded quest 11000'), +(14,8642,10992,0,0,5,1031,32,0,0,0,'','Sky Sergeant Vanderlip - Show different gossip if player is honored with Sha''tari Skyguards'), +(14,8642,10994,0,0,5,1031,64,0,0,0,'','Sky Sergeant Vanderlip - Show different gossip if player is revered with Sha''tari Skyguards'), +(14,8642,10995,0,0,5,1031,128,0,0,0,'','Sky Sergeant Vanderlip - Show different gossip if player is exalted with Sha''tari Skyguards'), +(14,8657,10878,0,0,8,11000,0,0,0,0,'','Chort - Show different gossip if player has rewarded quest 11000'), +(14,8660,11057,0,0,2,32620,1,0,0,0,'','Skull Pile - Show different gossip if player has item 32620'), +(14,8669,10938,0,0,8,11065,0,0,0,0,'','Sky Commander Keller - Show different gossip if player has rewarded quest 11065'), +(14,8669,10938,0,0,8,11010,0,0,0,0,'','Sky Commander Keller - Show different gossip if player has rewarded quest 11010'), +(14,8669,10988,0,0,8,11062,0,0,0,0,'','Sky Commander Keller - Show different gossip if player has rewarded quest 11062'), +(14,8669,10989,0,0,5,1031,32,0,0,0,'','Sky Commander Keller - Show different gossip if player is honored with Sha''tari Skyguards'), +(14,8669,10990,0,0,5,1031,64,0,0,0,'','Sky Commander Keller - Show different gossip if player is revered with Sha''tari Skyguards'), +(14,8669,10991,0,0,5,1031,128,0,0,0,'','Sky Commander Keller - Show different gossip if player is exalted with Sha''tari Skyguards'), +(14,8670,10997,0,0,8,11065,0,0,0,0,'','Skyguard Khatie - Show different gossip if player has rewarded quest 11065'), +(14,8670,11001,0,0,5,1031,32,0,0,0,'','Skyguard Khatie - Show different gossip if player is honored with Sha''tari Skyguards'), +(14,8670,11002,0,0,5,1031,64,0,0,0,'','Skyguard Khatie - Show different gossip if player is revered with Sha''tari Skyguards'), +(14,8670,11004,0,0,5,1031,128,0,0,0,'','Skyguard Khatie - Show different gossip if player is exalted with Sha''tari Skyguards'), +(14,8671,10951,0,0,2,32569,35,0,1,0,'','Fel Crystal Prism - Show different gossip if player does not have 35 of item 32569'), +(14,8672,10922,0,0,2,32569,10,0,1,0,'','Fel Crystalforge - Show different gossip if player has 10 of item 32569'), +(14,8677,10913,0,0,2,32569,10,0,0,0,'','Bash''ir Crystalforge - Show different gossip if player has 10 of item 32569'), +(14,8678,10917,0,0,8,11030,0,0,0,0,'','Torkus - Show different gossip if player has rewarded quest 11030'), +(14,8678,10918,0,0,8,11061,0,0,0,0,'','Torkus - Show different gossip if player has rewarded quest 11061'), +(14,8678,11013,0,0,5,1038,32,0,0,0,'','Torkus - Show different gossip if player is honored with Ogri''la'), +(14,8678,11015,0,0,5,1038,64,0,0,0,'','Torkus - Show different gossip if player is revered with Ogri''la'), +(14,8678,11018,0,0,5,1038,128,0,0,0,'','Torkus - Show different gossip if player is exalted with Ogri''la'), +(14,8679,10920,0,0,8,11026,0,0,0,0,'','Kronk - Show different gossip if player has rewarded quest 11026'), +(14,8679,11027,0,0,5,1038,64,0,0,0,'','Kronk - Show different gossip if player is revered with Ogri''la'), +(14,8679,11028,0,0,5,1038,128,0,0,0,'','Kronk - Show different gossip if player is exalted with Ogri''la'), +(14,8680,10923,0,0,5,1038,32+16+8,0,0,0,'','Gahk - Show different gossip if player is neutral, friendly or honored with Ogri''la'), +(14,8680,10924,0,0,8,11026,0,0,0,0,'','Gahk - Show different gossip if player has rewarded quest 11026'), +(14,8680,10925,0,0,8,11060,0,0,0,0,'','Gahk - Show different gossip if player has rewarded quest 11060'), +(14,8680,11019,0,0,5,1038,64,0,0,0,'','Gahk - Show different gossip if player is revered with Ogri''la'), +(14,8680,11020,0,0,8,11079,0,0,0,0,'','Gahk - Show different gossip if player has rewarded quest 11079'), +(14,8680,11021,0,0,5,1038,128,0,0,0,'','Gahk - Show different gossip if player is exalted with Ogri''la'), +(14,8681,10926,0,0,5,1038,16+8,0,0,0,'','Chu''a''lor - Show different gossip if player is neutral or friendly with Ogri''la'), +(14,8681,10927,0,0,8,11025,0,0,0,0,'','Chu''a''lor - Show different gossip if player has rewarded quest 11025'), +(14,8681,11007,0,0,8,11058,0,0,0,0,'','Chu''a''lor - Show different gossip if player has rewarded quest 11058'), +(14,8681,11009,0,0,5,1038,32,0,0,0,'','Chu''a''lor - Show different gossip if player is honored with Ogri''la'), +(14,8681,11010,0,0,5,1038,64,0,0,0,'','Chu''a''lor - Show different gossip if player is revered with Ogri''la'), +(14,8681,11011,0,0,5,1038,128,0,0,0,'','Chu''a''lor - Show different gossip if player is exalted with Ogri''la'), +(14,8685,10932,0,0,2,32569,35,0,1,0,'','Show different gossip if player has 35 of item 32569'), +(14,8689,10932,0,0,2,32569,35,0,1,0,'','Show different gossip if player has 35 of item 32569'), +(14,8690,10932,0,0,2,32569,35,0,1,0,'','Show different gossip if player has 35 of item 32569'), +(14,8691,10932,0,0,2,32569,35,0,1,0,'','Show different gossip if player has 35 of item 32569'), +(14,8716,10965,0,0,5,1038,16,0,0,0,'','Ogri''la Merchant - Show different gossip if player is friendly with Ogri''la'), +(14,8716,10966,0,0,5,1038,32,0,0,0,'','Ogri''la Merchant - Show different gossip if player is honored with Ogri''la'), +(14,8716,10968,0,0,5,1038,64,0,0,0,'','Ogri''la Merchant - Show different gossip if player is revered with Ogri''la'), +(14,8716,10969,0,0,5,1038,128,0,0,0,'','Ogri''la Merchant - Show different gossip if player is exalted with Ogri''la'), +(14,8717,10972,0,0,5,1038,128,0,0,0,'','Food Vendor - Show different gossip if player is exalted with Ogri''la'), +(14,8717,10973,0,0,5,1038,64,0,0,0,'','Food Vendor - Show different gossip if player is revered with Ogri''la'), +(14,8717,10974,0,0,5,1038,32,0,0,0,'','Food Vendor - Show different gossip if player is honored with Ogri''la'), +(14,8717,10975,0,0,5,1038,16,0,0,0,'','Food Vendor - Show different gossip if player is friendly with Ogri''la'), +(14,8717,10976,0,0,5,1038,8,0,0,0,'','Food Vendor - Show different gossip if player is neutral with Ogri''la'), +(14,8718,10978,0,0,5,1031,224,0,0,0,'','Skyguard Handler Irena - Show different gossip if player is honored, revered or exalted with Sha''tari Skyguards'), +(14,8719,10979,0,0,5,1031,224,0,0,0,'','Skyguard Handler Deesak - Show different gossip if player is honored, revered or exalted with Sha''tari Skyguards'), +(14,8721,10983,0,0,5,1038,128,0,0,0,'','Ogri''la Keg King - Show different gossip if player is exalted with Ogri''la'), +(14,8721,10984,0,0,5,1038,64,0,0,0,'','Ogri''la Keg King - Show different gossip if player is revered with Ogri''la'), +(14,8721,10985,0,0,5,1038,32,0,0,0,'','Ogri''la Keg King - Show different gossip if player is honored with Ogri''la'), +(14,8721,10986,0,0,5,1038,16,0,0,0,'','Ogri''la Keg King - Show different gossip if player is friendly with Ogri''la'), +(14,8721,10987,0,0,5,1038,8,0,0,0,'','Ogri''la Keg King - Show different gossip if player is neutral with Ogri''la'), +(14,8722,10993,0,0,5,1038,128,0,0,0,'','Ogri''la Trader - Show different gossip if player is exalted with Ogri''la'), +(14,8722,10996,0,0,5,1038,64,0,0,0,'','Ogri''la Trader - Show different gossip if player is revered with Ogri''la'), +(14,8722,10998,0,0,5,1038,32,0,0,0,'','Ogri''la Trader - Show different gossip if player is honored with Ogri''la'), +(14,8722,10999,0,0,5,1038,16,0,0,0,'','Ogri''la Trader - Show different gossip if player is friendly with Ogri''la'), +(14,8722,11000,0,0,5,1038,8,0,0,0,'','Ogri''la Trader - Show different gossip if player is neutral with Ogri''la'), +(14,8723,11008,0,0,5,1038,128,0,0,0,'','Ogri''la Steelshaper - Show different gossip if player is exalted with Ogri''la'), +(14,8723,11012,0,0,5,1038,64,0,0,0,'','Ogri''la Steelshaper - Show different gossip if player is revered with Ogri''la'), +(14,8723,11014,0,0,5,1038,32,0,0,0,'','Ogri''la Steelshaper - Show different gossip if player is honored with Ogri''la'), +(14,8723,11016,0,0,5,1038,16,0,0,0,'','Ogri''la Steelshaper - Show different gossip if player is friendly with Ogri''la'), +(14,8723,11017,0,0,5,1038,8,0,0,0,'','Ogri''la Steelshaper - Show different gossip if player is neutral with Ogri''la'), +(14,8724,11022,0,0,5,1038,128,0,0,0,'','Mingo - Show different gossip if player is exalted with Ogri''la'), +(14,8724,11023,0,0,5,1038,64,0,0,0,'','Mingo - Show different gossip if player is revered with Ogri''la'), +(14,8724,11024,0,0,5,1038,32,0,0,0,'','Mingo - Show different gossip if player is honored with Ogri''la'), +(14,8724,11025,0,0,5,1038,16,0,0,0,'','Mingo - Show different gossip if player is friendly with Ogri''la'), +(14,8724,11026,0,0,5,1038,8,0,0,0,'','Mingo - Show different gossip if player is neutral with Ogri''la'), +(14,8726,11036,0,0,5,1038,32,0,0,0,'','Jho''nass - Show different gossip if player is honored with Ogri''la'), +(14,8726,11037,0,0,5,1038,64,0,0,0,'','Jho''nass - Show different gossip if player is revered with Ogri''la'), +(14,8726,11038,0,0,5,1038,128,0,0,0,'','Jho''nass - Show different gossip if player is exalted with Ogri''la'), +(14,8737,11063,0,0,5,1031,32,0,0,0,'','Skyguard Pyrotechnician - Show different gossip if player is honored with Sha''tari Skyguards'), +(14,8737,11061,0,0,5,1031,64,0,0,0,'','Skyguard Pyrotechnician - Show different gossip if player is revered with Sha''tari Skyguards'), +(14,8737,11060,0,0,5,1031,128,0,0,0,'','Skyguard Pyrotechnician - Show different gossip if player is exalted with Sha''tari Skyguards'), +(14,8757,11095,0,0,5,1038,224,0,0,0,'','Kronk - Show different gossip if player is honored, revered or exalted with Ogri''la'), + +(15,8304,0,0,0,9,10557,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has taken quest 10557'), +(15,8304,1,0,0,9,10710,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has taken quest 10710'), +(15,8304,2,0,0,9,10711,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has taken quest 10711'), +(15,8304,3,0,0,9,10712,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has taken quest 10712'), +(15,8304,4,0,0,9,10716,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has taken quest 10716'), +(15,8304,5,0,0,8,10557,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has taken quest 10557'), +(15,8429,0,0,0,9,10682,0,0,0,0,'','Overseer Nuaar - Show gossip option only if player has taken quest 10682'), +(15,8454,0,0,0,2,30539,1,0,0,0,'','Rally Zapnabber - Show gossip option only if player has item 30539'), +(15,8455,1,0,0,8,10710,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has completed quest 10710'), +(15,8455,2,0,0,8,10711,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has completed quest 10711'), +(15,8455,3,0,0,8,10712,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has completed quest 10712'), +(15,8455,4,0,0,8,10716,0,0,0,0,'','Rally Zapnabber - Show gossip option only if player has completed quest 10716'), +(15,8660,0,0,0,9,11885,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11885'), +(15,8660,1,0,0,9,11885,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11885'), +(15,8660,2,0,0,9,11885,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11885'), +(15,8660,3,0,0,9,11885,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11885'), +(15,8660,0,0,1,9,11074,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11074'), +(15,8660,1,0,1,9,11074,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11074'), +(15,8660,2,0,1,9,11074,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11074'), +(15,8660,3,0,1,9,11074,0,0,0,0,'','Skull Pile - Show gossip option only if player has taken quest 11074'), +(15,8671,0,0,0,2,32569,35,0,0,0,'','Fel Crystal Prism - Show gossip option only if player has 35 of item 32569'), +(15,8672,0,0,0,2,32569,10,0,0,0,'','Fel Crystalforge - Show gossip option only if player has 10 of item 32569'), +(15,8672,1,0,0,2,32569,50,0,0,0,'','Fel Crystalforge - Show gossip option only if player has 50 of item 32569'), +(15,8677,0,0,0,2,32569,10,0,0,0,'','Bash''ir Crystalforge - Show gossip option only if player has 10 of item 32569'), +(15,8677,1,0,0,2,32569,50,0,0,0,'','Bash''ir Crystalforge - Show gossip option only if player has 50 of item 32569'), +(15,8685,0,0,0,2,32569,35,0,0,0,'','Show gossip option only if player has 35 of item 32569'), +(15,8687,0,0,0,2,32720,1,0,0,0,'','Ancient Skull Pile - Show gossip option only if player has 1 of item 32720'), +(15,8689,0,0,0,2,32569,35,0,0,0,'','Show gossip option only if player has 35 of item 32569'), +(15,8690,0,0,0,2,32569,35,0,0,0,'','Show gossip option only if player has 35 of item 32569'), +(15,8691,0,0,0,2,32569,35,0,0,0,'','Show gossip option only if player has 35 of item 32569'), +(15,8718,1,0,0,5,1031,224,0,0,0,'','Skyguard Handler Irena - Show gossip option only if player is honored, revered or exalted with Sha''tari Skyguards'), +(15,8719,1,0,0,5,1031,224,0,0,0,'','Skyguard Handler Deesak - Show gossip option only if player is honored, revered or exalted with Sha''tari Skyguards'); -- cgit v1.2.3 From b5443af772f54800321a30cc789cfa6ae85c5188 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Thu, 31 May 2012 11:44:41 +0200 Subject: DB/Loot: Reassign a reference, fix an error in previous commit with missing @variable --- sql/updates/world/2012_05_30_00_world_reference_loot_template.sql | 1 + sql/updates/world/2012_05_31_00_world_reference_loot_template.sql | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_05_31_00_world_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql b/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql index 7c6dfa1e11f..c2cab663d4a 100644 --- a/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql +++ b/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql @@ -1,4 +1,5 @@ SET @Twins := 34329; +SET @emblem := 49426; DELETE FROM `reference_loot_template` WHERE `entry`=@Twins; INSERT INTO `reference_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES (@Twins,47296,0,1,1,1,1), -- Greaves of Ruthless Judgment diff --git a/sql/updates/world/2012_05_31_00_world_reference_loot_template.sql b/sql/updates/world/2012_05_31_00_world_reference_loot_template.sql new file mode 100644 index 00000000000..03723c82536 --- /dev/null +++ b/sql/updates/world/2012_05_31_00_world_reference_loot_template.sql @@ -0,0 +1,2 @@ +UPDATE `reference_loot_template` SET `entry`=14011 WHERE `entry`=3014; +UPDATE `creature_loot_template` SET `mincountOrRef`=-14011 WHERE `mincountOrRef`=-3014; -- cgit v1.2.3 From 5eee40249c51b35719a18907da94d64d98f89258 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 31 May 2012 15:39:18 +0200 Subject: Core/Items: Added custom flags field to item_template, currently 2 flag values are available * ITEM_FLAGS_CU_DURATION_REAL_TIME determines item duration counts even if offline (replaced ugly negative duration workaround, easy to lose data when importing fresh wdb) * ITEM_FLAGS_CU_IGNORE_QUEST_STATUS quest status will not affect this item appearing in loot, currently needed for Arena Master trinket --- sql/updates/world/2012_05_31_01_world_item_template.sql | 4 ++++ src/server/game/Entities/Item/Item.cpp | 4 ++-- src/server/game/Entities/Item/ItemPrototype.h | 9 ++++++++- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Globals/ObjectMgr.cpp | 15 +++++++++++---- src/server/game/Handlers/ItemHandler.cpp | 2 +- src/server/game/Loot/LootMgr.cpp | 15 +++------------ 7 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 sql/updates/world/2012_05_31_01_world_item_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_01_world_item_template.sql b/sql/updates/world/2012_05_31_01_world_item_template.sql new file mode 100644 index 00000000000..144ee6715a9 --- /dev/null +++ b/sql/updates/world/2012_05_31_01_world_item_template.sql @@ -0,0 +1,4 @@ +ALTER TABLE `item_template` ADD `flagsCustom` INT(10) UNSIGNED NOT NULL DEFAULT 0 AFTER `maxMoneyLoot`; +UPDATE `item_template` SET `flagsCustom`=`flagsCustom`|0x1 WHERE `Duration`<0; +UPDATE `item_template` SET `duration`=ABS(`duration`); +ALTER TABLE `item_template` CHANGE `Duration` `duration` INT(10) UNSIGNED NOT NULL DEFAULT 0 AFTER `ArmorDamageModifier`; diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index af867dad76a..209fdae8ce6 100755 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -274,7 +274,7 @@ bool Item::Create(uint32 guidlow, uint32 itemid, Player const* owner) for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) SetSpellCharges(i, itemProto->Spells[i].SpellCharges); - SetUInt32Value(ITEM_FIELD_DURATION, abs(itemProto->Duration)); + SetUInt32Value(ITEM_FIELD_DURATION, itemProto->Duration); SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, 0); return true; } @@ -420,7 +420,7 @@ bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, Field* fields, uint32 entr // update duration if need, and remove if not need if ((proto->Duration == 0) != (duration == 0)) { - SetUInt32Value(ITEM_FIELD_DURATION, abs(proto->Duration)); + SetUInt32Value(ITEM_FIELD_DURATION, proto->Duration); need_save = true; } diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h index 2eae7234229..1b5eec7fbaf 100755 --- a/src/server/game/Entities/Item/ItemPrototype.h +++ b/src/server/game/Entities/Item/ItemPrototype.h @@ -192,6 +192,12 @@ enum ItemFlagsExtra ITEM_FLAGS_EXTRA_NEED_ROLL_DISABLED = 0x00000100 }; +enum ItemFlagsCustom +{ + ITEM_FLAGS_CU_DURATION_REAL_TIME = 0x0001, // Item duration will tick even if player is offline + ITEM_FLAGS_CU_IGNORE_QUEST_STATUS = 0x0002, // No quest status will be checked when this item drops +}; + enum BAG_FAMILY_MASK { BAG_FAMILY_MASK_NONE = 0x00000000, @@ -644,7 +650,7 @@ struct ItemTemplate uint32 GemProperties; // id from GemProperties.dbc uint32 RequiredDisenchantSkill; float ArmorDamageModifier; - int32 Duration; // negative = realtime, positive = ingame time + uint32 Duration; uint32 ItemLimitCategory; // id from ItemLimitCategory.dbc uint32 HolidayId; // id from Holidays.dbc uint32 ScriptId; @@ -652,6 +658,7 @@ struct ItemTemplate uint32 FoodType; uint32 MinMoneyLoot; uint32 MaxMoneyLoot; + uint32 FlagsCu; // helpers bool CanChangeEquipStateInCombat() const diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d5e2d8ba956..4cf6d4ad979 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -13665,7 +13665,7 @@ void Player::UpdateItemDuration(uint32 time, bool realtimeonly) Item* item = *itr; ++itr; // current element can be erased in UpdateDuration - if ((realtimeonly && item->GetTemplate()->Duration < 0) || !realtimeonly) + if (!realtimeonly || item->GetTemplate()->FlagsCu & ITEM_FLAGS_CU_DURATION_REAL_TIME) item->UpdateDuration(this, time); } } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 1e36b4c732b..df6018faf39 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2111,9 +2111,9 @@ void ObjectMgr::LoadItemTemplates() // 118 119 120 121 122 123 124 125 "TotemCategory, socketColor_1, socketContent_1, socketColor_2, socketContent_2, socketColor_3, socketContent_3, socketBonus, " // 126 127 128 129 130 131 132 133 - "GemProperties, RequiredDisenchantSkill, ArmorDamageModifier, Duration, ItemLimitCategory, HolidayId, ScriptName, DisenchantID, " + "GemProperties, RequiredDisenchantSkill, ArmorDamageModifier, duration, ItemLimitCategory, HolidayId, ScriptName, DisenchantID, " // 134 135 136 - "FoodType, minMoneyLoot, maxMoneyLoot FROM item_template"); + "FoodType, minMoneyLoot, maxMoneyLoot, flagsCustom FROM item_template"); if (!result) { @@ -2230,7 +2230,7 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.GemProperties = fields[126].GetUInt32(); itemTemplate.RequiredDisenchantSkill = uint32(fields[127].GetInt16()); itemTemplate.ArmorDamageModifier = fields[128].GetFloat(); - itemTemplate.Duration = fields[129].GetInt32(); + itemTemplate.Duration = fields[129].GetUInt32(); itemTemplate.ItemLimitCategory = uint32(fields[130].GetInt16()); itemTemplate.HolidayId = fields[131].GetUInt32(); itemTemplate.ScriptId = sObjectMgr->GetScriptId(fields[132].GetCString()); @@ -2238,6 +2238,7 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.FoodType = uint32(fields[134].GetUInt8()); itemTemplate.MinMoneyLoot = fields[135].GetUInt32(); itemTemplate.MaxMoneyLoot = fields[136].GetUInt32(); + itemTemplate.FlagsCu = fields[137].GetUInt32(); // Checks @@ -2645,6 +2646,12 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.HolidayId = 0; } + if (itemTemplate.FlagsCu & ITEM_FLAGS_CU_DURATION_REAL_TIME && !itemTemplate.Duration) + { + sLog->outErrorDb("Item (Entry %u) has flag ITEM_FLAGS_CU_DURATION_REAL_TIME but it does not have duration limit", entry); + itemTemplate.FlagsCu &= ~ITEM_FLAGS_CU_DURATION_REAL_TIME; + } + ++count; } while (result->NextRow()); @@ -2731,7 +2738,7 @@ void ObjectMgr::LoadItemSetNames() if (setEntry->itemId[i]) itemSetItems.insert(setEntry->itemId[i]); } - + // 0 1 2 QueryResult result = WorldDatabase.Query("SELECT `entry`, `name`, `InventoryType` FROM `item_set_names`"); diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index d537fc5b4aa..a569c914be0 100755 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -423,7 +423,7 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket & recv_data) data << pProto->GemProperties; data << pProto->RequiredDisenchantSkill; data << pProto->ArmorDamageModifier; - data << uint32(abs(pProto->Duration)); // added in 2.4.2.8209, duration (seconds) + data << pProto->Duration; // added in 2.4.2.8209, duration (seconds) data << pProto->ItemLimitCategory; // WotLK, ItemLimitCategory data << pProto->HolidayId; // Holiday.dbc? SendPacket(&data); diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 75065158ef6..a5ad46c9ec4 100755 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -356,18 +356,9 @@ bool LootItem::AllowedForPlayer(Player const* player) const if ((pProto->Flags2 & ITEM_FLAGS_EXTRA_ALLIANCE_ONLY) && player->GetTeam() != ALLIANCE) return false; - if (needs_quest) - { - // Checking quests for quest-only drop (check only quests requirements in this case) - if (!player->HasQuestForItem(itemid)) - return false; - } - else - { - // Not quest only drop (check quest starting items for already accepted non-repeatable quests) - if (pProto->StartQuest && player->GetQuestStatus(pProto->StartQuest) != QUEST_STATUS_NONE && !player->HasQuestForItem(itemid)) - return false; - } + // check quest requirements + if (!(pProto->FlagsCu & ITEM_FLAGS_CU_IGNORE_QUEST_STATUS) && ((needs_quest || (pProto->StartQuest && player->GetQuestStatus(pProto->StartQuest) != QUEST_STATUS_NONE)) && !player->HasQuestForItem(itemid))) + return false; return true; } -- cgit v1.2.3 From d1856cfb0a339f15657590c44f9f034a2b2e1a4a Mon Sep 17 00:00:00 2001 From: Nay Date: Thu, 31 May 2012 16:09:07 +0100 Subject: DB/SAI: Fix quest Questioning Reethe - Closes #129 --- sql/updates/world/2012_05_31_01_world_sai.sql | 139 ++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 sql/updates/world/2012_05_31_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_01_world_sai.sql b/sql/updates/world/2012_05_31_01_world_sai.sql new file mode 100644 index 00000000000..3055e98f167 --- /dev/null +++ b/sql/updates/world/2012_05_31_01_world_sai.sql @@ -0,0 +1,139 @@ +-- http://www.youtube.com/watch?v=G89A9ITuTfs +-- Missing combat spell entries; Cata spells: 70316 (Cleave),84419 (Challenging Shout) + +-- Paval should also attack --- faction 35 to 232 ---- +-- Couldn't fix Ogron evading when entering combat + +-- [Q] Questioning Reethe +SET @ENTRY_OGRON := 4983; -- Ogron +SET @ENTRY_PAVAL := 4980; -- Paval Reethe +SET @ENTRY_CALDWELL := 5046; -- Lieutenant Caldwell +SET @ENTRY_SKIRM := 5044; -- Theramore Skirmisher +SET @ENTRY_HALAN := 5045; -- Private Hallan +SET @SPELL_FAKE_SHOT := 7105; + +-- Quest completable by external event +UPDATE `quest_template` SET `SpecialFlags`=`SpecialFlags`|2 WHERE `Id`=1273; -- Questioning Reethe + +-- Set SAI AIName +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@ENTRY_OGRON,@ENTRY_PAVAL,@ENTRY_CALDWELL,@ENTRY_SKIRM,@ENTRY_HALAN); + +-- Template updates +UPDATE `creature` SET `spawntimesecs`=120 WHERE `id`=@ENTRY_PAVAL; +UPDATE `creature_template` SET `faction_A`=35,`faction_H`=35 WHERE `entry` IN (@ENTRY_CALDWELL,@ENTRY_SKIRM,@ENTRY_HALAN); -- Script changes faction to 151 later +UPDATE `creature_template` SET `equipment_id`=189 WHERE `entry`=@ENTRY_HALAN; +UPDATE `creature_model_info` SET `bounding_radius`=1.29485,`combat_reach`=2.175,`gender`=0 WHERE `modelid`=10704; -- Ogron +DELETE FROM `creature_template_addon` WHERE `entry` IN (@ENTRY_OGRON,@ENTRY_PAVAL); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@ENTRY_OGRON,0,0,257,0,NULL),-- Ogron +(@ENTRY_PAVAL,0,0,1,0,NULL); -- Paval Reethe + +-- Waypoints +DELETE FROM `waypoints` WHERE `entry`=@ENTRY_OGRON; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY_OGRON,1,-3349.78,-3134.81,28.5267,'Ogron'), +(@ENTRY_OGRON,2,-3366.01,-3144.31,35.2659,'Ogron'), +(@ENTRY_OGRON,3,-3367.34,-3164.10,35.9618,'Ogron'), +(@ENTRY_OGRON,4,-3372.77,-3174.81,35.8517,'Ogron'), +(@ENTRY_OGRON,5,-3378.53,-3191.64,35.7204,'Ogron'), +(@ENTRY_OGRON,6,-3370.92,-3190.48,34.1671,'Ogron'), +(@ENTRY_OGRON,7,-3366.86,-3209.47,33.9713,'Ogron'); +-- (@ENTRY_OGRON,8,-3365.56,-3209.19,34.0187,'Ogron'); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_OGRON,@ENTRY_HALAN,@ENTRY_SKIRM,@ENTRY_CALDWELL,@ENTRY_PAVAL) AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_OGRON*100,@ENTRY_OGRON*100+1,@ENTRY_CALDWELL*100,@ENTRY_HALAN*100,@ENTRY_PAVAL*100,@ENTRY_CALDWELL*100+1,@ENTRY_PAVAL*100+1,@ENTRY_OGRON*100+2) AND `source_type`=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 +(@ENTRY_OGRON,0,0,0,6,0,100,0,0,0,0,0,6,1273,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ogron - On Death - Fail Quest'), +(@ENTRY_OGRON,0,1,0,19,0,100,0,1273,0,0,0,80,@ENTRY_OGRON*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - On Quest Accept - Script'), +(@ENTRY_OGRON*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Ogron - On Script - Say "I noticed some fire.."'), +(@ENTRY_OGRON*100,9,1,0,0,0,100,0,0,0,0,0,53,0,@ENTRY_OGRON,0,0,0,2,1,0,0,0,0,0,0,0,'Ogron - On Script - Start WP'), +(@ENTRY_OGRON,0,2,0,40,0,100,0,5,@ENTRY_OGRON,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - On WP 5 - Pause Path'), +(@ENTRY_OGRON,0,3,4,55,0,100,0,5,@ENTRY_OGRON,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - On WP 5 - Say "That''s Reethe..."'), -- Link to 4 +(@ENTRY_OGRON,0,4,0,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,6.281,'Ogron - On Link (WP 5) - Set Orientation'), +(@ENTRY_OGRON,0,5,0,58,0,100,0,7,@ENTRY_OGRON,0,0,80,@ENTRY_OGRON*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - On WP 7 - Run Second Script'), +(@ENTRY_OGRON*100+1,9,0,0,0,0,100,0,0,0,0,0,54,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Paval - On Script - Pause WP'), +(@ENTRY_OGRON*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "W-what do you..."'), +(@ENTRY_OGRON*100+1,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "I swear, I didn''t..."'), +(@ENTRY_OGRON*100+1,9,3,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - On Script - Say "Just tell us..."'), +(@ENTRY_OGRON*100+1,9,4,0,0,0,100,0,3500,3500,0,0,1,2,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "I... Well, I may..."'), +(@ENTRY_OGRON*100+1,9,5,0,0,0,100,0,3500,3500,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - On Script - Say "Look here,if you..."'), +(@ENTRY_OGRON*100+1,9,6,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "Not one step closer..."'), +(@ENTRY_OGRON*100+1,9,7,0,0,0,100,0,3000,3000,0,0,1,4,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "And I don''t know..."'), +(@ENTRY_OGRON*100+1,9,8,0,0,0,100,0,3500,3500,0,0,1,5,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "What was that? Did..."'), +(@ENTRY_OGRON*100+1,9,9,0,0,0,100,0,0,0,0,0,12,@ENTRY_HALAN,2,5*60*1000,0,0,0,8,0,0,0,-3384.600098,-3211.340088,34.868,0,'Ogron - On Script - Summon Private Hallan'), +(@ENTRY_OGRON*100+1,9,10,0,0,0,100,0,0,0,0,0,12,@ENTRY_SKIRM,2,5*60*1000,0,0,0,8,0,0,0,-3384.443604,-3208.477539,34.849,0,'Ogron - On Script - Summon Theramore Skirmisher'), +(@ENTRY_OGRON*100+1,9,11,0,0,0,100,0,0,0,0,0,12,@ENTRY_SKIRM,2,5*60*1000,0,0,0,8,0,0,0,-3385.615234,-3209.867432,34.904,0,'Ogron - On Script - Summon Theramore Skirmisher'), +(@ENTRY_OGRON*100+1,9,12,0,0,0,100,0,0,0,0,0,12,@ENTRY_CALDWELL,2,5*60*1000,0,0,0,8,0,0,0,-3381.498535,-3209.195068,35.037,0,'Ogron - On Script - Summon Lieutenant Caldwell'), +(@ENTRY_OGRON*100+1,9,13,0,0,0,100,0,0,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - On Script - Set react state aggresive'), + +(@ENTRY_HALAN,0,0,0,11,0,100,0,0,0,0,0,46,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hallan - On Spawn - Move forward'), +(@ENTRY_SKIRM,0,0,0,11,0,100,0,0,0,0,0,46,4.5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Skirmisher - On Spawn - Move forward'), +(@ENTRY_HALAN,0,1,0,11,0,100,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hallan - On Spawn - Set Run 0'), +(@ENTRY_SKIRM,0,1,0,11,0,100,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Skirmisher - On Spawn - Set Run 0'), + +(@ENTRY_CALDWELL,0,0,0,11,0,100,0,0,0,0,0,80,@ENTRY_CALDWELL*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Caldwell - On spawn - Script'), +(@ENTRY_CALDWELL*100,9,0,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-3373.983398,-3210.881104,34.711,0,'Caldwell - On Script - Move'), +(@ENTRY_CALDWELL*100,9,1,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Caldwell - On Script - Say "Paval Reethe! Found..."'), +(@ENTRY_CALDWELL*100,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Caldwell - On Script - Say "Private, show Lieutenant..."'), +(@ENTRY_CALDWELL*100,9,3,0,0,0,100,0,500,500,0,0,45,1,1,0,0,0,0,11,@ENTRY_HALAN,20,0,0,0,0,0,'Caldwell - On Script - Set Data Hallan'), + +(@ENTRY_HALAN,0,2,0,38,0,100,0,1,1,0,0,80,@ENTRY_HALAN*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hallan - On Data Set - Run Script'), +(@ENTRY_HALAN*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Hallan - On Script - Say "Gladly, sir."'), +(@ENTRY_HALAN*100,9,1,0,0,0,100,0,0,0,0,0,11,@SPELL_FAKE_SHOT,0,0,0,0,0,11,@ENTRY_PAVAL,60,0,0,0,0,0,'Hallan - On Script - Cast Fake Shot'), + +(@ENTRY_PAVAL,0,0,0,8,0,100,0,@SPELL_FAKE_SHOT,0,0,0,80,@ENTRY_PAVAL*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Paval - On Spellhit - Run Script'), +(@ENTRY_PAVAL*100,9,0,0,0,0,100,0,0,0,0,0,1,6,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "Paval staggers back..."'), +(@ENTRY_PAVAL*100,9,1,0,0,0,100,0,2000,2000,0,0,1,7,0,0,0,0,0,9,@ENTRY_PAVAL,0,15,0,0,0,0,'Paval - On Script - Say "Ugh... Hallan..."'), +(@ENTRY_PAVAL*100,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.771,'Paval - On Script - Face Caldwell'), +(@ENTRY_PAVAL*100,9,3,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,9,@ENTRY_CALDWELL,0,15,0,0,0,0,'Caldwell - On Script - Say "Now let''s..."'), +(@ENTRY_PAVAL*100,9,4,0,0,0,100,0,1000,1000,0,0,1,4,0,0,0,0,0,9,@ENTRY_OGRON,0,15,0,0,0,0,'Ogron - On Script - Say "Damn it! You..."'), +(@ENTRY_PAVAL*100,9,5,0,0,0,100,0,0,0,0,0,2,16,0,0,0,0,0,9,@ENTRY_HALAN,0,15,0,0,0,0,'Paval - On Script - Set faction 151 on Hallan'), +(@ENTRY_PAVAL*100,9,6,0,0,0,100,0,0,0,0,0,2,16,0,0,0,0,0,9,@ENTRY_SKIRM,0,15,0,0,0,0,'Paval - On Script - Set faction 151 on Skirm'), +(@ENTRY_PAVAL*100,9,7,0,0,0,100,0,0,0,0,0,2,16,0,0,0,0,0,9,@ENTRY_CALDWELL,0,15,0,0,0,0,'Paval - On Script - Set faction 151 on Caldwell'), + +(@ENTRY_CALDWELL,0,1,0,6,0,100,0,0,0,0,0,45,1,1,0,0,0,0,11,@ENTRY_PAVAL,20,0,0,0,0,0,'Caldwell - On Death - Set data to Paval'), +(@ENTRY_CALDWELL,0,2,0,6,0,100,0,0,0,0,0,45,1,1,0,0,0,0,11,@ENTRY_OGRON,20,0,0,0,0,0,'Caldwell - On Death - Set data to Ogron'), +(@ENTRY_OGRON,0,7,0,38,0,100,0,1,1,0,0,69,0,0,0,0,0,0,8,0,0,0,-3366.86,-3209.47,33.9713,0,'Ogron - On Data set - Move to pos'), +(@ENTRY_PAVAL,0,6,0,38,0,100,0,1,1,0,0,80,@ENTRY_PAVAL*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Paval - On Data Set - Run second timed action list'), +(@ENTRY_PAVAL*100+1,9,0,0,0,0,100,0,0,0,0,0,15,1273,0,0,0,0,0,17,0,15,0,0,0,0,0,'Paval - On Script - Quest Credit'), +(@ENTRY_PAVAL*100+1,9,1,0,0,0,100,0,2000,2000,0,0,84,5,0,0,0,0,0,9,@ENTRY_OGRON,0,15,0,0,0,0,'Ogron - On Script - Say "Still with us..."'), +(@ENTRY_PAVAL*100+1,9,2,0,0,0,100,0,2000,2000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,'Paval - On Script - Say "Must be your lucky day..."'), +(@ENTRY_PAVAL*100+1,9,3,0,0,0,100,0,0,0,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Paval - On Script - Die'), +(@ENTRY_PAVAL*100+1,9,4,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Paval - On Script - Despawn'), +(@ENTRY_PAVAL*100+1,9,5,0,0,0,100,0,1000,1000,0,0,84,6,0,0,0,0,0,9,@ENTRY_OGRON,0,15,0,0,0,0,'Ogron - On Script - Say "Looks dead to me..."'), +(@ENTRY_PAVAL*100+1,9,6,0,0,0,100,0,3500,3500,0,0,84,7,0,0,0,0,0,9,@ENTRY_OGRON,0,15,0,0,0,0,'Ogron - On Script - Say "By the way..."'), +(@ENTRY_PAVAL*100+1,9,7,0,0,0,100,0,0,0,0,0,45,4,4,0,0,0,0,9,@ENTRY_OGRON,0,15,0,0,0,0,'Paval - On Script - Set Data Ogron'), + +(@ENTRY_OGRON,0,8,0,0,0,100,1,500,1500,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ogron - In combat say "Me smash.." or "I''ll crush you!"'); + +-- Texts +DELETE FROM `creature_text` WHERE `entry` IN (@ENTRY_OGRON,@ENTRY_PAVAL,@ENTRY_CALDWELL,@ENTRY_HALAN); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY_OGRON,0,0,'I noticed some fire on that island over there. A human, too. Let''s go check it out, $N.',12,0,0,0,0,0,'Ogron'), +(@ENTRY_OGRON,1,0,'That''s Reethe alright. Let''s go see what he has to say, yeah?',12,0,0,0,0,0,'Ogron'), + +(@ENTRY_PAVAL,0,0,'W-what do you want? Just leave me alone...',12,0,0,0,0,0,'Paval'), +(@ENTRY_PAVAL,1,0,'I swear, I didn''t steal anything from you! Here, take some of my supplies, just go away!',12,0,0,0,0,0,'Paval'), +(@ENTRY_OGRON,2,0,'Just tell us what you know about the Shady Rest Inn, and I won''t bash your skull in.',12,0,0,0,0,0,'Ogron'), +(@ENTRY_PAVAL,2,0,'I... Well, I may of taken a little thing or two from the inn... but what would an ogre care about that?',12,0,0,0,0,0,'Paval'), +(@ENTRY_OGRON,3,0,'Look here, if you don''t tell me about the fire--',12,0,0,0,0,0,'Ogron'), +(@ENTRY_PAVAL,3,0,'Not one step closer, ogre!',12,0,0,0,0,0,'Paval'), +(@ENTRY_PAVAL,4,0,'And I don''t know anything about this fire of yours...',12,0,0,0,0,0,'Paval'), +(@ENTRY_PAVAL,5,0,'What was that? Did you hear something?',12,0,0,0,0,0,'Paval'), + +(@ENTRY_CALDWELL,0,0,'Paval Reethe! Found you at last. And consorting with ogres now? No fear, even deserters and traitors are afforded some mercy.',12,0,0,0,0,0,'Caldwell'), +(@ENTRY_CALDWELL,1,0,'Private, show Lieutenant Reethe some mercy.',12,0,0,0,0,0,'Caldwell'), +(@ENTRY_HALAN,0,0,'Gladly, sir.',12,0,0,0,0,0,'Hallan'), +(@ENTRY_PAVAL,6,0,'%s staggers back as the arrow lodges itself deeply in his chest.',16,0,0,0,0,0,'Paval'), +(@ENTRY_PAVAL,7,0,'Ugh... Hallan, didn''t think you had it in you...',12,0,0,16,0,0,'Paval'), +(@ENTRY_CALDWELL,2,0,'Now, let''s clean up the rest of the trash, men!',12,0,0,0,0,0,'Caldwell'), +(@ENTRY_OGRON,4,0,'Damn it! You''d better not die on me, human!',12,0,0,0,0,0,'Ogron'), +-- QC +(@ENTRY_OGRON,5,0,'Still with us, Reethe?',12,0,0,0,0,0,'Ogron'), +(@ENTRY_PAVAL,8,0,'Must be your lucky day. Alright, I''ll talk. Just leave me alone. Look, you''re not going to believe me, but it wa... oh, Light, looks like the girl could shoot...',12,0,0,0,0,0,'Paval'), +-- Paval dies & despawns +(@ENTRY_OGRON,6,0,'Looks dead to me. Not much use to us like this. You''d better go back and tell Krog what happened.',12,0,0,0,0,0,'Ogron'), +(@ENTRY_OGRON,7,0,'By the way, thanks for watching my back.',12,0,0,0,0,0,'Ogron'), + +(@ENTRY_OGRON,8,0,'Me smash! You die!',12,0,0,0,0,0,'Ogron'), +(@ENTRY_OGRON,8,1,'I''ll crush you!',12,0,0,0,0,0,'Ogron'); -- cgit v1.2.3 From 7824b84e3af4eb2bca8d22d5b1a0b18a2b9452be Mon Sep 17 00:00:00 2001 From: Nay Date: Thu, 31 May 2012 16:55:51 +0100 Subject: DB/NPCs: Grunt Ounda should only have a female model --- sql/updates/world/2012_05_31_02_world_creature_model_info.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_31_02_world_creature_model_info.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_02_world_creature_model_info.sql b/sql/updates/world/2012_05_31_02_world_creature_model_info.sql new file mode 100644 index 00000000000..a1aa1155aa6 --- /dev/null +++ b/sql/updates/world/2012_05_31_02_world_creature_model_info.sql @@ -0,0 +1,4 @@ +-- Grunt Ounda should only have a female model +UPDATE `creature_model_info` SET + `modelid_other_gender` = 0 +WHERE `modelid` = 4260; -- cgit v1.2.3 From 851f43b0a618fa1977197d53ab005c8d0da91327 Mon Sep 17 00:00:00 2001 From: gecko32 Date: Thu, 31 May 2012 18:40:34 +0100 Subject: DB/Loot: Update drop chance of Ensorcelled Parchment from 0.2% to 100% Change respawn time of that chest from 2 secs to 3 minutes Closes #6445 --- sql/updates/world/2012_05_31_03_world_gameobject_loot_template.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_31_03_world_gameobject_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_03_world_gameobject_loot_template.sql b/sql/updates/world/2012_05_31_03_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..5dcedaaf342 --- /dev/null +++ b/sql/updates/world/2012_05_31_03_world_gameobject_loot_template.sql @@ -0,0 +1,4 @@ +-- Update drop chance of Ensorcelled Parchment from 0.2% to 100% +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=100 WHERE `entry`=1570 AND `item`=3706; +-- Change spawntime from 2 secs to 3 minutes +UPDATE `gameobject` SET `spawntimesecs`=180 WHERE `id`=1765; -- cgit v1.2.3 From 2172705b998003e7ea276c9efce00ad6a6c26128 Mon Sep 17 00:00:00 2001 From: warriorpoetex Date: Thu, 31 May 2012 20:50:35 +0100 Subject: DB/SAI: Ragefire Chasm Boss SAI Fix/Addition - Converted some EAI to SAI as well as added SAI to Taragaman the Hungerer. Closes #6661 --- sql/updates/world/2012_05_31_05_world_sai.sql | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 sql/updates/world/2012_05_31_05_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_05_world_sai.sql b/sql/updates/world/2012_05_31_05_world_sai.sql new file mode 100644 index 00000000000..aa95c93aae1 --- /dev/null +++ b/sql/updates/world/2012_05_31_05_world_sai.sql @@ -0,0 +1,30 @@ +-- Ai and Script Update/Addition for Taragaman the Hungerer +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11520; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11520; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11520; +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 +(11520, 0, 0, 0, 0, 0, 85, 2, 5000, 5000, 15000, 20000, 11, 18072, 1, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Taragaman the Hungerer - Cast Uppercut'), +(11520, 0, 1, 0, 0, 0, 75, 2, 8000, 8000, 20000, 25000, 11, 11970, 1, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 'Taragaman the Hungerer - Cast Fire Nova'); + +-- Ai and Script Update/Addition for Jergosh the Invoker +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11518; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11518; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11518; +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 +(11518, 0, 1, 0, 0, 0, 75, 2, 12000, 12000, 30000, 30000, 11, 20800, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Jergosh the Invoker - Cast Immolat'), +(11518, 0, 0, 0, 0, 0, 85, 2, 30000, 30000, 120000, 120000, 11, 11980, 1, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Jergosh the Invoker - Cast Curse of Weakness'); + +-- Ai and Script Update/Addition for Bazzalan +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11519; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11519; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11519; +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 +(11519, 0, 1, 0, 0, 0, 75, 2, 3000, 5000, 12000, 15000, 11, 2818, 1, 32, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Bazzalan - Cast Poison'), +(11519, 0, 0, 0, 0, 0, 85, 2, 8000, 8000, 16000, 17000, 11, 14873, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Bazzalan - Cast Sinister Strike'); + +-- Ai and Script Update/Addition for Oggleflint +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11517; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11517; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11517; +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 +(11517, 0, 0, 0, 0, 0, 70, 2, 8000, 8000, 15000, 15000, 11, 40505, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Oggleflint - Cast Cleave'); -- cgit v1.2.3 From 2f557f507d075c55c3f913cba51bd2ae4f795172 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 31 May 2012 17:48:30 -0230 Subject: DB/gameobject: Add Missing Draconic for Dummies Objects --- sql/updates/world/2012_05_31_06_world_gameobject.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_05_31_06_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_06_world_gameobject.sql b/sql/updates/world/2012_05_31_06_world_gameobject.sql new file mode 100644 index 00000000000..1db1d6fbd76 --- /dev/null +++ b/sql/updates/world/2012_05_31_06_world_gameobject.sql @@ -0,0 +1,7 @@ +-- Add Missing Draconic for Dummies Objects +SET @GUID := 4595; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+2; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,180665,0,1,1,-8340.196,413.7499,124.489677,2.82742977,0,0,0.987688,0.156436,180,255,1), +(@GUID+1,180666,0,1,1,1628.83984,133.9376,-60.96726,-0.401424885,0,0,-0.199368,0.979925,180,255,1), +(@GUID+2,180667,469,1,1,-7526.57,-924.776,458.826,0.558504,0,0,0.275637,0.961262,180,255,1); -- cgit v1.2.3 From a696860236eb529272af03b5db6b7e75b0b9a5ef Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 31 May 2012 18:11:55 -0230 Subject: DB/gossip: Add missing gossip for Draconic for Dummies objects --- sql/updates/world/2012_05_31_07_world_gossip.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_05_31_07_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_07_world_gossip.sql b/sql/updates/world/2012_05_31_07_world_gossip.sql new file mode 100644 index 00000000000..9b82f333a4c --- /dev/null +++ b/sql/updates/world/2012_05_31_07_world_gossip.sql @@ -0,0 +1,4 @@ +-- Add missing gossip for Draconic for Dummies objects +DELETE FROM `gossip_menu` WHERE `entry` IN (6668,6669,6670); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(6668,7937),(6669,7937),(6670,7937); -- cgit v1.2.3 From 34735a1ea4cb7c85839880e09b7460302710421d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 31 May 2012 18:14:24 -0230 Subject: DB/gameobject template: Fix faction for Draconic for Dummies objects --- sql/updates/world/2012_05_31_08_world_gameobject_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_31_08_world_gameobject_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_08_world_gameobject_template.sql b/sql/updates/world/2012_05_31_08_world_gameobject_template.sql new file mode 100644 index 00000000000..41527e22919 --- /dev/null +++ b/sql/updates/world/2012_05_31_08_world_gameobject_template.sql @@ -0,0 +1,2 @@ +-- Fix faction for Draconic for Dummies objects +UPDATE `gameobject_template` SET `faction`=35 WHERE `entry` IN (180665,180667); -- cgit v1.2.3 From 7cb1935010d91232d103b602e1db7af1d59a4af0 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 31 May 2012 18:31:22 -0230 Subject: DB/SAI: Some Ragefire Trash Mob EAI to SAI Conversions By; Ragefire Trash Mob EAI to SAI Conversions Closes Issue 6662 --- sql/updates/world/2012_05_31_09_world_sai.sql | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 sql/updates/world/2012_05_31_09_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_09_world_sai.sql b/sql/updates/world/2012_05_31_09_world_sai.sql new file mode 100644 index 00000000000..a7eb1248905 --- /dev/null +++ b/sql/updates/world/2012_05_31_09_world_sai.sql @@ -0,0 +1,27 @@ + -- EAI to SAI Convert Ragefire Trogg +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11318; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11318; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11318; +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 (11318, 0, 0, 0, 9, 0, 100, 2, 0, 5, 5000, 8000, 11, 11976, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Ragefire Trogg - Cast Strike'); + +-- EAI to SAI Convert Earthborer +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11320; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11320; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11320; +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 (11320, 0, 0, 0, 0, 0, 70, 2, 6000, 6000, 10000, 10000, 11, 18070, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Earthborer - Cast Earthborer Acid'); + +-- EAI to SAI Convert Searing Blade Cultist +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11322; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11322; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11322; +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 (11322, 0, 0, 0, 0, 0, 85, 2, 12000, 12000, 30000, 30000, 11, 18266, 1, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Searing Blade Cultist - Cast Curse of Agony'); + +-- EAI to SAI Convert Searing Blade Enforcer +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=11323; +DELETE FROM `smart_scripts` WHERE `entryorguid`=11323; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=11323; +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 (11323, 0, 0, 0, 0, 0, 75, 2, 8000, 8000, 10000, 10000, 11, 8242, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Searing Blade Enforcer - Cast Shield Slam'); -- cgit v1.2.3 From faaf22d628b538511478a579ef1d95eb61251176 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Thu, 31 May 2012 23:10:44 +0200 Subject: DB/Loot: bump Draconic for Dummies to 100% if on quest Closes #6653 --- sql/updates/world/2012_05_31_10_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_05_31_10_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_10_world_creature_template.sql b/sql/updates/world/2012_05_31_10_world_creature_template.sql new file mode 100644 index 00000000000..5499d26b0e3 --- /dev/null +++ b/sql/updates/world/2012_05_31_10_world_creature_template.sql @@ -0,0 +1,2 @@ +-- update the book to always drop of ragnaros +UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=11502 AND `item`=21110; -- cgit v1.2.3 From 189e32cab99bc5a2cc8987298089b90dafa8c222 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 31 May 2012 22:24:44 -0230 Subject: DB/creature: Add a couple more Domesticated Felboar Spawns --- sql/updates/world/2012_05_31_11_world_creature.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_05_31_11_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_11_world_creature.sql b/sql/updates/world/2012_05_31_11_world_creature.sql new file mode 100644 index 00000000000..177c6230964 --- /dev/null +++ b/sql/updates/world/2012_05_31_11_world_creature.sql @@ -0,0 +1,6 @@ +-- Add a couple more Domesticated Felboar Spawns +SET @GUID := 42567; +DELETE FROM `creature` WHERE `guid` IN (@GUID,@GUID+1); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,21195,530,1,1,0,0,-2678.16016,1477.65625,26.9172077,4.86340427,300,5,0,1,0,1), +(@GUID+1,21195,530,1,1,0,0,-2691.666,1525,21.3857346,0.3155697,300,5,0,1,0,1); -- cgit v1.2.3 From 2b3b8f6dde22c645d4288a8402feabb2bde825f7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 31 May 2012 23:35:05 -0230 Subject: DB/creature: Add missing 7th Legion Chain Gun spawns for quest "The Chain Gun and You" --- sql/updates/world/2012_05_31_12_world_creature.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2012_05_31_12_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_31_12_world_creature.sql b/sql/updates/world/2012_05_31_12_world_creature.sql new file mode 100644 index 00000000000..cad0364d021 --- /dev/null +++ b/sql/updates/world/2012_05_31_12_world_creature.sql @@ -0,0 +1,9 @@ +-- Add missing 7th Legion Chain Gun spawns +DELETE FROM `creature` WHERE `guid` IN (42569,42570,42663,42664); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(42569,27714,571,1,1,25331,0,3665.613,-1209.412,102.4201,4.206244,120,0,0,1,0,0), +(42570,27714,571,1,1,25331,0,3660.56,-1207.094,102.4201,4.29351,120,0,0,1,0,0), +(42663,27714,571,1,1,25331,0,3677.009,-1174.462,102.3367,1.169371,120,0,0,1,0,0), +(42664,27714,571,1,1,25331,0,3682.874,-1177.179,102.4757,1.169371,120,0,0,1,0,0); +-- Add Spells for 7th Legion Chain Gun +UPDATE `creature_template` SET `spell1`=49190,`spell2`=49550 WHERE `entry`=27714; -- cgit v1.2.3 From 99b23429db65adf4d4e7463f74ba5278d930e196 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 1 Jun 2012 10:43:36 -0400 Subject: Core/Spells: fix damage from touch the nightmare for the caster and fix damage and healing for dream funnel. closes #6669 closes #6676 --- .../2012_06_01_00_world_spell_script_names.sql | 4 + src/server/scripts/Spells/spell_generic.cpp | 93 ++++++++++++++++++---- 2 files changed, 80 insertions(+), 17 deletions(-) create mode 100644 sql/updates/world/2012_06_01_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_01_00_world_spell_script_names.sql b/sql/updates/world/2012_06_01_00_world_spell_script_names.sql new file mode 100644 index 00000000000..cc024fe71cb --- /dev/null +++ b/sql/updates/world/2012_06_01_00_world_spell_script_names.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (50341,50344); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(50341, 'spell_gen_touch_the_nightmare'), +(50344, 'spell_gen_dream_funnel'); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 0c879cfb029..e23e21cf2cd 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2052,9 +2052,9 @@ class spell_gen_defend : public SpellScriptLoader public: spell_gen_defend() : SpellScriptLoader("spell_gen_defend") { } - class spell_gen_defendAuraScript : public AuraScript + class spell_gen_defend_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_defendAuraScript); + PrepareAuraScript(spell_gen_defend_AuraScript); bool Validate(SpellInfo const* /*spellEntry*/) { @@ -2103,26 +2103,26 @@ class spell_gen_defend : public SpellScriptLoader // Defend spells casted by NPCs (add visuals) if (spell->Effects[EFFECT_0].ApplyAuraName == SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN) { - AfterEffectApply += AuraEffectApplyFn(spell_gen_defendAuraScript::RefreshVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_defendAuraScript::RemoveVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectApply += AuraEffectApplyFn(spell_gen_defend_AuraScript::RefreshVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectRemove += AuraEffectRemoveFn(spell_gen_defend_AuraScript::RemoveVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } // Remove Defend spell from player when he dismounts if (spell->Effects[EFFECT_2].ApplyAuraName == SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN) - OnEffectRemove += AuraEffectRemoveFn(spell_gen_defendAuraScript::RemoveDummyFromDriver, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_gen_defend_AuraScript::RemoveDummyFromDriver, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); // Defend spells casted by players (add/remove visuals) if (spell->Effects[EFFECT_1].ApplyAuraName == SPELL_AURA_DUMMY) { - AfterEffectApply += AuraEffectApplyFn(spell_gen_defendAuraScript::RefreshVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_defendAuraScript::RemoveVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectApply += AuraEffectApplyFn(spell_gen_defend_AuraScript::RefreshVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectRemove += AuraEffectRemoveFn(spell_gen_defend_AuraScript::RemoveVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } } }; AuraScript* GetAuraScript() const { - return new spell_gen_defendAuraScript(); + return new spell_gen_defend_AuraScript(); } }; @@ -2326,9 +2326,9 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader public: spell_gen_on_tournament_mount() : SpellScriptLoader("spell_gen_on_tournament_mount") { } - class spell_gen_on_tournament_mountAuraScript : public AuraScript + class spell_gen_on_tournament_mount_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_on_tournament_mountAuraScript); + PrepareAuraScript(spell_gen_on_tournament_mount_AuraScript); uint32 _pennantSpellId; @@ -2468,14 +2468,14 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader void Register() { - AfterEffectApply += AuraEffectApplyFn(spell_gen_on_tournament_mountAuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_on_tournament_mountAuraScript::HandleRemoveEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply += AuraEffectApplyFn(spell_gen_on_tournament_mount_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectRemove += AuraEffectRemoveFn(spell_gen_on_tournament_mount_AuraScript::HandleRemoveEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; AuraScript* GetAuraScript() const { - return new spell_gen_on_tournament_mountAuraScript(); + return new spell_gen_on_tournament_mount_AuraScript(); } }; @@ -2484,9 +2484,9 @@ class spell_gen_tournament_pennant : public SpellScriptLoader public: spell_gen_tournament_pennant() : SpellScriptLoader("spell_gen_tournament_pennant") { } - class spell_gen_tournament_pennantAuraScript : public AuraScript + class spell_gen_tournament_pennant_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_tournament_pennantAuraScript); + PrepareAuraScript(spell_gen_tournament_pennant_AuraScript); bool Load() { @@ -2502,13 +2502,13 @@ class spell_gen_tournament_pennant : public SpellScriptLoader void Register() { - OnEffectApply += AuraEffectApplyFn(spell_gen_tournament_pennantAuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectApply += AuraEffectApplyFn(spell_gen_tournament_pennant_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; AuraScript* GetAuraScript() const { - return new spell_gen_tournament_pennantAuraScript(); + return new spell_gen_tournament_pennant_AuraScript(); } }; @@ -2688,6 +2688,63 @@ public: } }; +class spell_gen_touch_the_nightmare : public SpellScriptLoader +{ +public: + spell_gen_touch_the_nightmare() : SpellScriptLoader("spell_gen_touch_the_nightmare") { } + + class spell_gen_touch_the_nightmare_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_touch_the_nightmare_SpellScript); + + void HandleDamageCalc(SpellEffIndex effIndex) + { + uint32 bp = GetCaster()->GetMaxHealth() * 0.3f; + SetHitDamage(bp); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_gen_touch_the_nightmare_SpellScript::HandleDamageCalc, EFFECT_2, SPELL_EFFECT_SCHOOL_DAMAGE); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gen_touch_the_nightmare_SpellScript(); + } +}; + +class spell_gen_dream_funnel: public SpellScriptLoader +{ +public: + spell_gen_dream_funnel() : SpellScriptLoader("spell_gen_dream_funnel") { } + + class spell_gen_dream_funnel_AuraScript : public AuraScript + { + PrepareAuraScript(spell_gen_dream_funnel_AuraScript); + + void HandleEffectCalcAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) + { + if (GetCaster()) + amount = GetCaster()->GetMaxHealth() * 0.05f; + + canBeRecalculated = false; + } + + void Register() + { + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_gen_dream_funnel_AuraScript(); + } +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -2742,4 +2799,6 @@ void AddSC_generic_spell_scripts() new spell_gen_count_pct_from_max_hp("spell_gen_default_count_pct_from_max_hp"); new spell_gen_count_pct_from_max_hp("spell_gen_50pct_count_pct_from_max_hp", 50); new spell_gen_despawn_self(); + new spell_gen_touch_the_nightmare(); + new spell_gen_dream_funnel(); } -- cgit v1.2.3 From dfbd7a820b6f577d7a38bc88e6152903571b3dd1 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 1 Jun 2012 12:23:55 -0230 Subject: Core/scripts: Add generic script to prevent cannon movement. --- .../world/2012_06_01_01_world_creature_script.sql | 2 ++ src/server/scripts/World/npcs_special.cpp | 27 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 sql/updates/world/2012_06_01_01_world_creature_script.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_01_01_world_creature_script.sql b/sql/updates/world/2012_06_01_01_world_creature_script.sql new file mode 100644 index 00000000000..d90800bd1af --- /dev/null +++ b/sql/updates/world/2012_06_01_01_world_creature_script.sql @@ -0,0 +1,2 @@ +-- Add Generic Harpoon gun script to prevent movement +UPDATE `creature_template` SET `ScriptName`= 'npc_generic_harpoon_cannon' WHERE `entry` IN (27714,30066,30337); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index ecd1a439a58..bfe4ac07bdc 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2988,6 +2988,32 @@ public: }; }; +/*###### +## npc_generic_harpoon_cannon +######*/ + +class npc_generic_harpoon_cannon : public CreatureScript +{ +public: + npc_generic_harpoon_cannon() : CreatureScript("npc_generic_harpoon_cannon") { } + + struct npc_generic_harpoon_cannonAI : public ScriptedAI + { + npc_generic_harpoon_cannonAI(Creature* creature) : ScriptedAI(creature) {} + + void Reset() + { + me->SetUnitMovementFlags(MOVEMENTFLAG_ROOT); + me->SetExtraUnitMovementFlags(MOVEMENTFLAG2_NO_STRAFE | MOVEMENTFLAG2_NO_JUMPING | MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING); + } + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_generic_harpoon_cannonAI(creature); + } +}; + void AddSC_npcs_special() { new npc_air_force_bots(); @@ -3020,4 +3046,5 @@ void AddSC_npcs_special() new npc_earth_elemental(); new npc_firework(); new npc_spring_rabbit(); + new npc_generic_harpoon_cannon(); } -- cgit v1.2.3 From 925657cc9885c2c2b1cd6b379bfdd72555af49ea Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 1 Jun 2012 19:48:43 +0100 Subject: Scripts/Sholazar: Fix quest Kick, What Kick? - Closes #370 --- sql/updates/world/2012_06_01_02_world_misc.sql | 70 ++++++++++++++ src/server/scripts/Northrend/sholazar_basin.cpp | 122 ++++++++++++++++++++++++ 2 files changed, 192 insertions(+) create mode 100644 sql/updates/world/2012_06_01_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_01_02_world_misc.sql b/sql/updates/world/2012_06_01_02_world_misc.sql new file mode 100644 index 00000000000..23663ef9270 --- /dev/null +++ b/sql/updates/world/2012_06_01_02_world_misc.sql @@ -0,0 +1,70 @@ +/* Quest: Kick, What Kick? - 12589 by Nay */ + +-- Lucky Wilhelm: 0xF150006D960041CB +-- Drostan: 0xF130006EA80041CA +-- Apple: 0xF130006D950041C8 + +-- Remove old conditions, now done in cpp +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=51330; + +-- Spells conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (51331,51332,51366); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 51331, 0, 0, 31, 0, 3, 28053, 0, 0, 0, '', 'Hit Apple - Apple - Q: Kick, What Kick?'), +(13, 1, 51332, 0, 0, 31, 0, 3, 28054, 0, 0, 0, '', 'Miss Apple - Wilhelm - Q: Kick, What Kick?'), +(13, 1, 51366, 0, 0, 31, 0, 3, 28093, 0, 0, 0, '', 'Miss Apple, Hit Bird - Sholazar Tickbird - Q: Kick, What Kick?'); + +-- Assign script to spell +DELETE FROM `spell_script_names` WHERE `spell_id`=51330; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(51330, 'spell_q12589_shoot_rjr'); + +-- Spellclick spell for Wilhelm +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=28054; +INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES +(28054,50556,1,0); + +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (28053,28328,30737,28346); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(28053,0,0,1,0, NULL), -- Apple +(28328,0,0,257,0, NULL), -- Drostan +(30737,0,0,256,0, NULL), -- Nesingwary Game Warden +(28346,0,0,1,0, NULL); -- Crunchy + +-- Put Apple in Wilhelm's head +DELETE FROM `vehicle_template_accessory` WHERE `entry`=28054 AND `accessory_entry`=28053; +INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`, `seat_id`, `minion`, `description`, `summontype`, `summontimer`) VALUES +(28054, 28053, -1, 0, 'Lucky Wilhelm - Apple', 6, 10000); + +-- Says and yells +DELETE FROM `creature_text` WHERE `entry`=28328 OR (`entry`=28054 AND `groupid` IN (0,1)); +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(28328, 0, 0, 'The only thing hurt is your pride, lad. Buck up!', 12, 0, 100, 11, 0, 0, 'Drostan to Lucky Wilhelm'), +(28328, 0, 1, 'Stop whining. You''ve still got your luck.', 12, 0, 100, 11, 0, 0, 'Drostan to Lucky Wilhelm'), +(28328, 0, 2, 'Bah, it''s an improvement.', 12, 0, 100, 0, 0, 0, 'Drostan to Lucky Wilhelm'), +(28328, 0, 3, 'Calm down lad, it''s just a birdshot!', 12, 0, 100, 0, 0, 0, 'Drostan to Lucky Wilhelm'), +(28054, 0, 0, 'Not the ''stache! Now I''m asymmetrical!', 12, 0, 100, 5, 0, 0, 'Lucky Wilhelm'), +(28054, 0, 1, 'Ouch! That''s it, I quit the target business!', 12, 0, 100, 0, 0, 0, 'Lucky Wilhelm'), +(28054, 0, 2, 'My ear! You grazed my ear!', 12, 0, 100, 0, 0, 0, 'Lucky Wilhelm'), +(28054, 1, 0, 'Good shot!', 12, 0, 100, 4, 0, 0, 'Lucky Wilhelm'); + +/* * Hit: */ +/* player casts Shoot RJR on Lucky */ +/* apple gets hit by 51331 (Hit Apple) by player */ +/* after that apple casts 51371 (Apple Falls to ground) on self */ +/* Wilhelm says Good shot! */ +/* reward killcredit 28053 */ + +/* * Miss: */ +/* player casts Shoot RJR on Lucky */ +/* lucky gets hit by 51332 (Miss Apple) by player */ +/* lucky says random text */ +/* drostan says random text */ + +/* * Miss, Hit Bird - guessed */ +/* player casts Shoot RJR on Lucky */ +/* bird gets hit by 51366 (Miss Apple, Hit Bird and dies) */ +/* bird gets hit by 51369 (Tickbird Signal to Fall) */ +/* lucky says random text */ +/* drostan says random text */ diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 93d0182ea08..2a03e44d5b2 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -746,6 +746,127 @@ public: } }; +/*###### +## Quest Kick, What Kick? (12589) +######*/ + +enum KickWhatKick +{ + NPC_LUCKY_WILHELM = 28054, + NPC_APPLE = 28053, + NPC_DROSTAN = 28328, + NPC_CRUNCHY = 28346, + NPC_THICKBIRD = 28093, + + SPELL_HIT_APPLE = 51331, + SPELL_MISS_APPLE = 51332, + SPELL_MISS_BIRD_APPLE = 51366, + SPELL_APPLE_FALL = 51371, + SPELL_BIRD_FALL = 51369, + + EVENT_MISS = 0, + EVENT_HIT = 1, + EVENT_MISS_BIRD = 2, + + SAY_WILHELM_MISS = 0, + SAY_WILHELM_HIT = 1, + SAY_DROSTAN_REPLY_MISS = 0, +}; + +class spell_q12589_shoot_rjr : public SpellScriptLoader +{ +public: + spell_q12589_shoot_rjr() : SpellScriptLoader("spell_q12589_shoot_rjr") { } + + class spell_q12589_shoot_rjr_SpellScript : public SpellScript + { + PrepareSpellScript(spell_q12589_shoot_rjr_SpellScript); + + SpellCastResult CheckCast() + { + if (Unit* target = GetExplTargetUnit()) + if (target->GetEntry() == NPC_LUCKY_WILHELM) + return SPELL_CAST_OK; + + SetCustomCastResultMessage(SPELL_CUSTOM_ERROR_MUST_TARGET_WILHELM); + return SPELL_FAILED_CUSTOM_ERROR; + } + + void HandleDummy(SpellEffIndex /*effIndex*/) + { + uint32 roll = urand(1, 100); + + uint8 ev; + if (roll <= 50) + ev = EVENT_MISS; + else if (roll <= 83) + ev = EVENT_HIT; + else + ev = EVENT_MISS_BIRD; + + Unit* shooter = GetCaster(); + Creature* wilhelm = GetHitUnit()->ToCreature(); + Creature* apple = shooter->FindNearestCreature(NPC_APPLE, 30); + Creature* bird = shooter->FindNearestCreature(NPC_THICKBIRD, 30); + Creature* drostan = shooter->FindNearestCreature(NPC_DROSTAN, 30); + Creature* crunchy = shooter->FindNearestCreature(NPC_CRUNCHY, 30); + + if (!wilhelm || !apple || !drostan) + return; + + switch (ev) + { + case EVENT_MISS_BIRD: + { + if (!bird || !crunchy) + ; // fall to EVENT_MISS + else + { + shooter->CastSpell(bird, SPELL_MISS_BIRD_APPLE); + shooter->CastSpell(bird, SPELL_BIRD_FALL); + wilhelm->AI()->Talk(SAY_WILHELM_MISS); + drostan->AI()->Talk(SAY_DROSTAN_REPLY_MISS); + + bird->Kill(bird); + crunchy->GetMotionMaster()->MovePoint(0, bird->GetPositionX(), bird->GetPositionY(), + bird->GetMap()->GetWaterOrGroundLevel(bird->GetPositionX(), bird->GetPositionY(), bird->GetPositionZ())); + // TODO: Make crunchy perform emote eat when he reaches the bird + } + } + case EVENT_MISS: + { + shooter->CastSpell(wilhelm, SPELL_MISS_APPLE); + wilhelm->AI()->Talk(SAY_WILHELM_MISS); + drostan->AI()->Talk(SAY_DROSTAN_REPLY_MISS); + break; + } + case EVENT_HIT: + { + shooter->CastSpell(apple, SPELL_HIT_APPLE); + apple->CastSpell(apple, SPELL_APPLE_FALL); + wilhelm->AI()->Talk(SAY_WILHELM_HIT); + if (Player* player = shooter->ToPlayer()) + player->KilledMonsterCredit(NPC_APPLE, 0); + apple->DespawnOrUnsummon(); + + break; + } + } + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_q12589_shoot_rjr_SpellScript::CheckCast); + OnEffectHitTarget += SpellEffectFn(spell_q12589_shoot_rjr_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_q12589_shoot_rjr_SpellScript(); + } +}; + void AddSC_sholazar_basin() { new npc_injured_rainspeaker_oracle(); @@ -756,4 +877,5 @@ void AddSC_sholazar_basin() new npc_adventurous_dwarf(); new npc_jungle_punch_target(); new spell_q12620_the_lifewarden_wrath(); + new spell_q12589_shoot_rjr(); } -- cgit v1.2.3 From f89ef6da5b6d59e9d758059549d95759711d0cf9 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 1 Jun 2012 19:59:44 +0100 Subject: DB/Misc: Fix DB startup errors - Closes #6666 Also add a missing break; to previous commit --- sql/updates/world/2012_06_01_03_world_creature_template.sql | 2 ++ src/server/scripts/Northrend/sholazar_basin.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/2012_06_01_03_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_01_03_world_creature_template.sql b/sql/updates/world/2012_06_01_03_world_creature_template.sql new file mode 100644 index 00000000000..fb20691ad69 --- /dev/null +++ b/sql/updates/world/2012_06_01_03_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Set same flag for diff_entry_1 +UPDATE `creature_template` SET `npcflag`=129 WHERE `entry`=30796; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 2a03e44d5b2..afab9b90a4a 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -807,9 +807,7 @@ public: Unit* shooter = GetCaster(); Creature* wilhelm = GetHitUnit()->ToCreature(); Creature* apple = shooter->FindNearestCreature(NPC_APPLE, 30); - Creature* bird = shooter->FindNearestCreature(NPC_THICKBIRD, 30); Creature* drostan = shooter->FindNearestCreature(NPC_DROSTAN, 30); - Creature* crunchy = shooter->FindNearestCreature(NPC_CRUNCHY, 30); if (!wilhelm || !apple || !drostan) return; @@ -818,12 +816,15 @@ public: { case EVENT_MISS_BIRD: { + Creature* crunchy = shooter->FindNearestCreature(NPC_CRUNCHY, 30); + Creature* bird = shooter->FindNearestCreature(NPC_THICKBIRD, 30); + if (!bird || !crunchy) ; // fall to EVENT_MISS else { shooter->CastSpell(bird, SPELL_MISS_BIRD_APPLE); - shooter->CastSpell(bird, SPELL_BIRD_FALL); + bird->CastSpell(bird, SPELL_BIRD_FALL); wilhelm->AI()->Talk(SAY_WILHELM_MISS); drostan->AI()->Talk(SAY_DROSTAN_REPLY_MISS); @@ -831,6 +832,8 @@ public: crunchy->GetMotionMaster()->MovePoint(0, bird->GetPositionX(), bird->GetPositionY(), bird->GetMap()->GetWaterOrGroundLevel(bird->GetPositionX(), bird->GetPositionY(), bird->GetPositionZ())); // TODO: Make crunchy perform emote eat when he reaches the bird + + break; } } case EVENT_MISS: -- cgit v1.2.3 From d75ea8837b4ede12a8f37f1123ae835228683fc7 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 1 Jun 2012 23:03:57 +0100 Subject: Scripts/Dragonblight: Fix quest Strengthen the Ancients - Closes #2043 --- sql/updates/world/2012_06_01_04_world_misc.sql | 41 +++++++++++ src/server/scripts/Northrend/dragonblight.cpp | 99 ++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 sql/updates/world/2012_06_01_04_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_01_04_world_misc.sql b/sql/updates/world/2012_06_01_04_world_misc.sql new file mode 100644 index 00000000000..d5273cec233 --- /dev/null +++ b/sql/updates/world/2012_06_01_04_world_misc.sql @@ -0,0 +1,41 @@ +-- Creature addon +DELETE FROM `creature_template_addon` WHERE `entry` IN (26421,26321,26333); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(26421,0,0,1,0, NULL), -- Woodlands Walker +(26321,0,0,1,64, '47044'), -- Lothalor Ancient (Cosmetic - Confused State Visual (Big)) +(26333,0,0,1,0, '32566 46967'); -- Corrupted Lothalor Ancient (Purple Banish State, Purple Banish State - Breath) + +-- Woodlands Walker already has spellclick spell: 47575 (Strengthen the Ancients: On Interact Dummy to Woodlands Walker) + +-- Monster emotes +DELETE FROM `creature_text` WHERE `entry` IN (26421,26321); +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(26421, 0, 0, 'Breaking off a piece of its bark, the %s hands it to you before departing.', 16, 0, 100, 0, 0, 0, 'Woodlands Walker'), +(26421, 1, 0, 'The %s is angered by your request and attacks!', 16, 0, 100, 0, 0, 0, 'Woodlands Walker'), +(26321, 0, 0, 'The %s gives you its thanks.', 16, 0, 100, 0, 0, 1525, 'Lothalor Ancient'); + +-- Assign scripts to spells +DELETE FROM `spell_script_names` WHERE `spell_id` IN (47575,47530); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(47575, 'spell_q12096_q12092_dummy'), +(47530, 'spell_q12096_q12092_bark'); + +/* +- player spellclicks Woodlands Walker, casts 47575 on the tree Woodlands Walker: two outcomes: + +- - tree turns enemy: +* say The %s is angered by your request and attacks! +* change faction to 14 +* start attack + +- - tree stays friendly: +* cast 47550 (Create Bark of the Walkers)on player +* say Breaking off a piece of its bark, the %s hands it to you before departing. +* despawn + + +- player uses item on Lothalor Ancient (47530 (Bark of the Walkers)): +* tree says The %s gives you its thanks. +* aura 47044 (Cosmetic - Confused State Visual (Big)) is removed +* despawns after 4 secs +*/ diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp index 4cbe280a9f2..1b339b24549 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/dragonblight.cpp @@ -69,7 +69,106 @@ public: } }; +/*###### +## Quest Strengthen the Ancients (12096|12092) +######*/ + +enum StrengthenAncientsMisc +{ + SAY_WALKER_FRIENDLY = 0, + SAY_WALKER_ENEMY = 1, + SAY_LOTHALOR = 0, + + SPELL_CREATE_ITEM_BARK = 47550, + SPELL_CONFUSED = 47044, + + NPC_LOTHALOR = 26321, + + FACTION_WALKER_ENEMY = 14, +}; + +class spell_q12096_q12092_dummy : public SpellScriptLoader // Strengthen the Ancients: On Interact Dummy to Woodlands Walker +{ +public: + spell_q12096_q12092_dummy() : SpellScriptLoader("spell_q12096_q12092_dummy") { } + + class spell_q12096_q12092_dummy_SpellScript : public SpellScript + { + PrepareSpellScript(spell_q12096_q12092_dummy_SpellScript); + + void HandleDummy(SpellEffIndex /*effIndex*/) + { + uint32 roll = rand() % 2; + + Creature* tree = GetHitCreature(); + Player* player = GetCaster()->ToPlayer(); + + if (!tree || !player) + return; + + tree->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK); + + if (roll == 1) // friendly version + { + tree->CastSpell(player, SPELL_CREATE_ITEM_BARK); + tree->AI()->Talk(SAY_WALKER_FRIENDLY, player->GetGUID()); + tree->DespawnOrUnsummon(1000); + } + else if (roll == 0) // enemy version + { + tree->AI()->Talk(SAY_WALKER_ENEMY, player->GetGUID()); + tree->setFaction(FACTION_WALKER_ENEMY); + tree->Attack(player, true); + } + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_q12096_q12092_dummy_SpellScript(); + } +}; + +class spell_q12096_q12092_bark : public SpellScriptLoader // Bark of the Walkers +{ +public: + spell_q12096_q12092_bark() : SpellScriptLoader("spell_q12096_q12092_bark") { } + + class spell_q12096_q12092_bark_SpellScript : public SpellScript + { + PrepareSpellScript(spell_q12096_q12092_bark_SpellScript); + + void HandleDummy(SpellEffIndex /*effIndex*/) + { + Creature* lothalor = GetHitCreature(); + if (!lothalor || lothalor->GetEntry() != NPC_LOTHALOR) + return; + + lothalor->AI()->Talk(SAY_LOTHALOR); + lothalor->RemoveAura(SPELL_CONFUSED); + lothalor->DespawnOrUnsummon(4000); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_bark_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_q12096_q12092_bark_SpellScript(); + } +}; + void AddSC_dragonblight() { new npc_alexstrasza_wr_gate; + new spell_q12096_q12092_dummy; + new spell_q12096_q12092_bark; } -- cgit v1.2.3 From 5e6daadcd08f5a3d05182a4c48877c2c9a0c7526 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 2 Jun 2012 09:45:37 -0230 Subject: DB/SAI: Fixes for Quest 9738 "Lost in Action". One NPC left to script --- sql/updates/world/2012_06_02_00_world_sai.sql | 118 ++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 sql/updates/world/2012_06_02_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_00_world_sai.sql b/sql/updates/world/2012_06_02_00_world_sai.sql new file mode 100644 index 00000000000..af0b12be244 --- /dev/null +++ b/sql/updates/world/2012_06_02_00_world_sai.sql @@ -0,0 +1,118 @@ +-- Add missing gossip for quest 9738 "Lost in Action" +DELETE FROM `gossip_menu` WHERE `entry` IN (7521,7520,7540,7519,7525); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(7521,9121),(7520,9119),(7540,9144),(7519,9118),(7525,9125); +-- Add Gossip Options +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7520,7540); +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 +(7520,0,0,"Alright, Bite, I'll let you out.",1,1,0,0,0,0,''), +(7540,0,0,"Naturalist, please grant me your boon.",1,1,0,0,0,0,''); +-- Conditions for the gossip options +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (7520,7540); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`comment`) VALUES +(15,7520,0,0,9,9738,'Gossip option 0 requires quest 9738 active'), +(15,7540,0,0,9,9738,'Gossip option 0 requires quest 9738 active'); -- cast 34906 on player +-- Add gossip to creature +UPDATE `creature_template` SET `gossip_menu_id`=7521 WHERE `entry`=17885; +UPDATE `creature_template` SET `gossip_menu_id`=7520 WHERE `entry`=17893; +UPDATE `creature_template` SET `gossip_menu_id`=7519 WHERE `entry`=17890; +UPDATE `creature_template` SET `gossip_menu_id`=7525 WHERE `entry`=17827; +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry` IN (17893,17957); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17893,0,0, 'Over here! Yeah, over here... I''m in this cage!!!',14,0,100,0,0,0, 'Naturalist Bite'), +(17893,1,0, 'Uh oh! It would appear that all of the noise you''ve been making has attracted some unwanted attention!',12,0,100,0,0,0, 'Naturalist Bite'), +(17957,0,0, 'Intrudersss with the prisssoner! Kill them!!!',14,0,100,0,0,0, 'Coilfang Champion'); +-- Earthbinder Rayge SAI +SET @ENTRY := 17885; +UPDATE `creature` SET `position_x`=296.6974,`position_y`=-362.373,`position_z`=50.15062,`orientation`=5.5676 WHERE `guid`=86372; +UPDATE `creature_template` SET `unit_flags`=512,`AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +UPDATE `creature_template_addon` SET `bytes2`=257,`auras`= '31526' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,64,0,100,6,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Earthbinder Rayge - On Gossip Hello - Give Kill Credit'); +-- Weeder Greenthumb SAI +SET @ENTRY := 17890; +UPDATE `creature_template` SET `unit_flags`=512,`AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=257,`auras`= '29266' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,64,0,100,6,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Weeder Greenthumb - On Gossip Hello - Give Kill Credit'); +-- Claw SAI +SET @ENTRY := 17827; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; +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,0,0,100,6,7400,7400,20000,20000,11,39435,0,0,0,0,0,5,0,0,0,0,0,0,0,'Claw - Combat - Cast Feral Charge'), +(@ENTRY,0,1,0,0,0,100,6,2400,2400,10600,21200,11,31429,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Combat - Cast Echoing Roar'), +(@ENTRY,0,2,0,0,0,100,6,5000,5000,30500,30500,11,34971,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Combat - Cast Frenzy'), +(@ENTRY,0,3,0,0,0,100,6,5300,5300,11100,21500,11,34298,0,0,0,0,0,2,0,0,0,0,0,0,0,'Claw - Combat - Cast Maul'), +(@ENTRY,0,4,0,2,1,100,7,0,20,0,0,80,@ENTRY*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - HP@20% - Run Script'), +(@ENTRY,0,5,0,64,0,100,6,0,0,0,0,33,17894,0,0,0,0,0,7,0,0,0,0,0,0,0,'Claw - On Gossip Hello - Give Kill Credit'), +(@ENTRY,0,6,0,6,0,100,6,0,0,0,0,45,0,1,0,0,0,0,19,17826,100,0,0,0,0,0,'Claw - On Death - Set Data on Swamplord Musel''ek'), +(@ENTRY,0,7,0,38,0,100,6,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Swamplord Musel''ek - On dataset - Set Phase 1'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,28,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Remove all auras'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set Run on'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,289.2553,-129.7001,29.82101,2.495821,'Claw - Script - move to'), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,2,1660,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set faction'), +(@ENTRY*100,9,4,0,0,0,100,0,0,0,0,0,18,525072,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set unitflags'), +(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,3,0,2289,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set displayid'), +(@ENTRY*100,9,6,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set npcflags'), +(@ENTRY*100,9,7,0,0,0,100,0,4000,4000,4000,4000,69,0,0,0,0,0,0,8,0,0,0,290.5323,-125.3524,29.69708,1.824913,'Claw - Script - move to'), +(@ENTRY*100,9,8,0,0,0,100,0,0,0,0,0,3,17894,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set entry'), +(@ENTRY*100,9,9,0,0,0,100,0,0,0,0,0,18,557824,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set unitflags'), +(@ENTRY*100,9,10,0,0,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set bytes1'), +(@ENTRY*100,9,11,0,0,0,100,0,500,500,500,500,81,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Claw - Script - Set npcflags'); +-- Swamplord Musel'ek SAI +SET @ENTRY := 17826; +SET @SPELL1 := 18813; -- Knock Away +SET @SPELL2 := 22907; -- Shoot +SET @SPELL3 := 31615; -- Hunter's Mark +SET @SPELL4 := 31946; -- Throw Freezing Trap +SET @SPELL5 := 31623; -- Aimed Shot +SET @SPELL6 := 34974; -- Multi-Shot +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,1,0,0,0,100,6,35000,38000,30000,40000,11,@SPELL1,1,0,0,0,0,2,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Cast Knock Away'), +(@ENTRY,0,2,0,0,0,100,6,500,1000,2300,3900,11,@SPELL2,1,0,0,0,0,2,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Cast Knock Away'), +(@ENTRY,0,3,0,0,0,100,6,4000,8000,12000,16000,11,@SPELL3,0,0,0,0,0,6,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Cast Hunter''s Mark'), +(@ENTRY,0,4,0,0,0,100,6,4000,8000,12000,16000,11,@SPELL4,0,0,0,0,0,5,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Cast Throw Freezing Trap'), +(@ENTRY,0,5,6,0,0,100,6,12500,21500,20000,30000,11,@SPELL5,0,0,0,0,0,2,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Cast Aimed Shot'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Set ranged weapon'), +(@ENTRY,0,7,8,0,0,100,6,12500,21500,20000,30000,11,@SPELL6,0,0,0,0,0,2,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Cast Multi-Shot'), +(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Set ranged weapon'), +(@ENTRY,0,9,0,4,0,100,6,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Swamplord Musel''ek - On Aggro - Say 1'), +(@ENTRY,0,10,0,5,0,100,6,5,5000,5000,1,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Swamplord Musel''ek - On Kill - Say 2'), +(@ENTRY,0,11,12,6,0,100,6,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Swamplord Musel''ek - On Death - Say 3'), +(@ENTRY,0,12,0,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,19,17827,100,0,0,0,0,0,'Swamplord Musel''ek - On Death - Set Data on Claw'), +(@ENTRY,0,13,14,38,0,100,6,0,1,0,0,70,0,0,0,0,0,0,19,17827,100,1,0,0,0,0,'Swamplord Musel''ek - On dataset - Respawn dead claw'), +(@ENTRY,0,14,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Swamplord Musel''ek - Combat - Say 0'); +-- NPC talk text insert from sniff +DELETE FROM `creature_ai_texts` WHERE `entry` BETWEEN -468 AND -463; +DELETE FROM `creature_text` WHERE `entry`=17826; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17826,0,0, 'Beast! Obey me! Kill them at once!',14,0,100,0,0,10383, 'Swamplord Musel''ek bear'), +(17826,1,0, 'We fight to the death!',14,0,100,0,0,10384, 'Swamplord Musel''ek Aggro'), +(17826,1,1, 'I will end this quickly...',14,0,100,0,0,10385, 'Swamplord Musel''ek Aggro'), +(17826,1,2, 'Acalah pek ecta!',14,0,100,0,0,10386, 'Swamplord Musel''ek Aggro'), +(17826,2,0, 'Krypta!',14,0,100,0,0,10387, 'Swamplord Musel''ek Slay'), +(17826,2,1, 'It is finished.',14,0,100,0,0,10388, 'Swamplord Musel''ek Slay'), +(17826,3,0, 'Well... done...',14,0,100,0,0,10389, 'Swamplord Musel''ek Death'); +-- Swamplord Musel'ek +SET @NPC := 56551; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=288.5823,`position_y`=-121.8309,`position_z`=29.70329,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,288.5823,-121.8309,29.70329,0,0,0,100,0), +(@PATH,2,281.5271,-120.3684,29.75141,0,0,0,100,0), +(@PATH,3,274.0677,-122.0538,29.80962,0,0,0,100,0), +(@PATH,4,281.5271,-120.3684,29.75141,0,0,0,100,0); -- cgit v1.2.3 From 9bb1dc63619e1aca85d28617d85b0d0e96dd3bc7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 2 Jun 2012 11:18:51 -0230 Subject: DB/waypoints: Add a few missing paths --- .../world/2012_06_02_01_world_waypoimts.sql | 187 +++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 sql/updates/world/2012_06_02_01_world_waypoimts.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_01_world_waypoimts.sql b/sql/updates/world/2012_06_02_01_world_waypoimts.sql new file mode 100644 index 00000000000..c50436bba8d --- /dev/null +++ b/sql/updates/world/2012_06_02_01_world_waypoimts.sql @@ -0,0 +1,187 @@ +-- Ebon Blade Gargoyle +SET @NPC := 124428; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=8487.13,`position_y`=2648.587,`position_z`=661.3248,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,8487.13,2648.587,661.3248,0,0,0,100,0), +(@PATH,2,8489.394,2639.188,661.9919,0,0,0,100,0), +(@PATH,3,8498.239,2633.008,661.9919,0,0,0,100,0), +(@PATH,4,8514.016,2626.775,661.9919,0,0,0,100,0), +(@PATH,5,8529.975,2622.438,661.9919,0,0,0,100,0), +(@PATH,6,8556.946,2621.273,661.9919,0,0,0,100,0), +(@PATH,7,8576.765,2620.136,661.9919,0,0,0,100,0), +(@PATH,8,8584.989,2627.947,663.3527,0,0,0,100,0), +(@PATH,9,8590.352,2637.264,664.2969,0,0,0,100,0), +(@PATH,10,8597.313,2651.073,666.0464,0,0,0,100,0), +(@PATH,11,8590.045,2668.078,668.6855,0,0,0,100,0), +(@PATH,12,8577.563,2672.175,668.6855,0,0,0,100,0), +(@PATH,13,8567.869,2653.686,668.6855,0,0,0,100,0), +(@PATH,14,8559.406,2635.763,668.6855,0,0,0,100,0), +(@PATH,15,8550.115,2624.132,664.6028,0,0,0,100,0), +(@PATH,16,8538.325,2625.415,664.6028,0,0,0,100,0), +(@PATH,17,8531.294,2636.344,664.6028,0,0,0,100,0), +(@PATH,18,8536.005,2650.634,664.6028,0,0,0,100,0), +(@PATH,19,8536.659,2661.533,667.5744,0,0,0,100,0), +(@PATH,20,8528.161,2665.466,668.5468,0,0,0,100,0), +(@PATH,21,8521.834,2666.234,668.9914,0,0,0,100,0), +(@PATH,22,8506.145,2657.156,666.1024,0,0,0,100,0); + +-- Ebon Blade Gargoyle +SET @NPC := 124429; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=8553.722,`position_y`=2732.757,`position_z`=672.1373,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,8553.722,2732.757,672.1373,0,0,0,100,0), +(@PATH,2,8545.085,2736.81,677.1306,0,0,0,100,0), +(@PATH,3,8538.377,2724.997,676.7698,0,0,0,100,0), +(@PATH,4,8527.725,2701.114,677.464,0,0,0,100,0), +(@PATH,5,8515.729,2672.526,676.4364,0,0,0,100,0), +(@PATH,6,8501.882,2638.781,674.6306,0,0,0,100,0), +(@PATH,7,8492.601,2619.312,672.9641,0,0,0,100,0), +(@PATH,8,8501.216,2604.361,672.7973,0,0,0,100,0), +(@PATH,9,8509.95,2597.643,672.464,0,0,0,100,0), +(@PATH,10,8516.437,2603.336,670.7147,0,0,0,100,0), +(@PATH,11,8526.045,2624.93,675.242,0,0,0,100,0), +(@PATH,12,8538.438,2654.096,677.4644,0,0,0,100,0), +(@PATH,13,8552.567,2688.411,676.0737,0,0,0,100,0), +(@PATH,14,8561.252,2709.44,676.1867,0,0,0,100,0), +(@PATH,15,8564.74,2718.366,676.9643,0,0,0,100,0), +(@PATH,16,8586.875,2713.758,677.4359,0,0,0,100,0), +(@PATH,17,8588.923,2702.79,676.2701,0,0,0,100,0), +(@PATH,18,8580.09,2682.738,673.3813,0,0,0,100,0), +(@PATH,19,8572.153,2664.409,674.4087,0,0,0,100,0), +(@PATH,20,8559.122,2635.23,674.5473,0,0,0,100,0), +(@PATH,21,8547.672,2610.971,677.3528,0,0,0,100,0), +(@PATH,22,8547.112,2593.927,677.77,0,0,0,100,0), +(@PATH,23,8556.546,2591.858,678.7695,0,0,0,100,0), +(@PATH,24,8566.203,2601.376,677.2705,0,0,0,100,0), +(@PATH,25,8576.512,2615.707,675.7764,0,0,0,100,0), +(@PATH,26,8585.419,2632.535,673.7208,0,0,0,100,0), +(@PATH,27,8596.079,2656.51,673.0544,0,0,0,100,0), +(@PATH,28,8594.222,2669.849,673.4442,0,0,0,100,0), +(@PATH,29,8595.935,2690.9,673.4711,0,0,0,100,0), +(@PATH,30,8592.354,2705.919,675.5258,0,0,0,100,0), +(@PATH,31,8571.288,2721.3,668.0258,0,0,0,100,0); + +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=32472; + +-- Vargul Plaguetalon +SET @NPC := 97634; +SET @PATH := @NPC*10; +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=29453; +UPDATE `creature` SET `position_x`=5736.421,`position_y`=-1453.626,`position_z`=267.5013,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,5736.421,-1453.626,267.5013,0,0,0,100,0), +(@PATH,2,5700.896,-1467.002,263.9736,0,0,0,100,0), +(@PATH,3,5665.086,-1462.814,266.2513,0,0,0,100,0), +(@PATH,4,5623.596,-1446.303,258.3903,0,0,0,100,0), +(@PATH,5,5612.131,-1390.983,269.9736,0,0,0,100,0), +(@PATH,6,5630.01,-1325.786,252.9459,0,0,0,100,0), +(@PATH,7,5684.276,-1301.843,263.9736,0,0,0,100,0), +(@PATH,8,5717.019,-1325.604,263.9736,0,0,0,100,0), +(@PATH,9,5730.931,-1363.826,254.0014,0,0,0,100,0), +(@PATH,10,5737.854,-1429.533,273.2791,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121011; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6805.096,`position_y`=3548.115,`position_z`=785.0337,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6805.096,3548.115,785.0337,0,0,0,100,0), +(@PATH,2,6797.807,3599.297,776.1726,0,0,0,100,0), +(@PATH,3,6840.798,3607.1,769.2557,0,0,0,100,0), +(@PATH,4,6880.369,3577.403,779.5615,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121023; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6490.46,`position_y`=3498.933,`position_z`=621.7417,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6490.46,3498.933,621.7417,0,0,0,100,0), +(@PATH,2,6645.542,3512.415,678.8528,0,0,0,100,0), +(@PATH,3,6650.367,3555.357,680.6584,0,0,0,100,0), +(@PATH,4,6602.724,3563.045,661.1863,0,0,0,100,0), +(@PATH,5,6549.287,3554.462,642.825,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121019; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6653.509,`position_y`=3526.14,`position_z`=693.2337,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6653.509,3526.14,693.2337,0,0,0,100,0), +(@PATH,2,6696.053,3579.272,700.4001,0,0,0,100,0), +(@PATH,3,6744.93,3562.146,704.2611,0,0,0,100,0), +(@PATH,4,6738.125,3521.812,692.5392,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121017; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6653.104,`position_y`=3415.26,`position_z`=672.1595,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6653.104,3415.26,672.1595,0,0,0,100,0), +(@PATH,2,6717.518,3468.886,684.6567,0,0,0,100,0), +(@PATH,3,6771.674,3492.333,692.0456,0,0,0,100,0), +(@PATH,4,6728.592,3518.536,683.6566,0,0,0,100,0), +(@PATH,5,6627.954,3487.869,642.6566,0,0,0,100,0), +(@PATH,6,6571.027,3439.741,634.3512,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121014; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6641.402,`position_y`=3330.479,`position_z`=724.3008,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6641.402,3330.479,724.3008,0,0,0,100,0), +(@PATH,2,6637.165,3426.095,701.4395,0,0,0,100,0), +(@PATH,3,6701.476,3449.434,708.6896,0,0,0,100,0), +(@PATH,4,6746.966,3410.158,735.9395,0,0,0,100,0), +(@PATH,5,6697.637,3352.607,725.0784,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121025; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6590.307,`position_y`=3325.47,`position_z`=699.1288,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6590.307,3325.47,699.1288,0,0,0,100,0), +(@PATH,2,6543.557,3237.147,706.6288,0,0,0,100,0), +(@PATH,3,6518.691,3250.313,687.6565,0,0,0,100,0), +(@PATH,4,6512.266,3334.911,685.3231,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121007; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6459.715,`position_y`=3049.952,`position_z`=701.608,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6459.715,3049.952,701.608,0,0,0,100,0), +(@PATH,2,6485.836,3103.517,681.247,0,0,0,100,0), +(@PATH,3,6445.593,3154.588,677.886,0,0,0,100,0), +(@PATH,4,6392.533,3078.925,694.2471,0,0,0,100,0); -- cgit v1.2.3 From a80ee1379e3473a14c995af5f70a9227fe416659 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 2 Jun 2012 13:09:27 -0230 Subject: DB/creature_text: Add text for Drill Sergeant Steamcrank --- .../world/2012_06_02_02_world_creature_text.sql | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 sql/updates/world/2012_06_02_02_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_02_world_creature_text.sql b/sql/updates/world/2012_06_02_02_world_creature_text.sql new file mode 100644 index 00000000000..c38e413617d --- /dev/null +++ b/sql/updates/world/2012_06_02_02_world_creature_text.sql @@ -0,0 +1,22 @@ +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=39368; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(39368,0,0, 'All right, you twisted mess of broken gears, let''s get to work!',12,0,100,1,0,0, 'Drill Sergeant Steamcrank'), +(39368,1,0, 'I am going to teach you all what it takes to be a proper soldier!',12,0,100,5,0,0, 'Drill Sergeant Steamcrank'), +(39368,2,0, 'The first thing you need to learn is proper discipline.',12,0,100,1,0,0, 'Drill Sergeant Steamcrank'), +(39368,3,0, 'Show me that discipline with a proper salute when I say so!',12,0,100,5,0,0, 'Drill Sergeant Steamcrank'), +(39368,4,0, 'Okay, recruits, salute!',12,0,100,66,0,0, 'Drill Sergeant Steamcrank'), +(39368,5,0, 'Nice job!',12,0,100,273,0,0, 'Drill Sergeant Steamcrank'), +(39368,6,0, 'When you go into combat, it is important that you know how to intimidate the enemy with a deafening battle roar!',12,0,100,396,0,0, 'Drill Sergeant Steamcrank'), +(39368,7,0, 'When I give the signal,let loose your greatest roar!',12,0,100,1,0,0, 'Drill Sergeant Steamcrank'), +(39368,8,0, 'Let me hear that battle roar!',12,0,100,5,0,0, 'Drill Sergeant Steamcrank'), +(39368,9,0, 'Wow, nice and scary!',12,0,100,0,0,0, 'Drill Sergeant Steamcrank'), +(39368,10,0, 'Remember though, a key factor in winning any battle is positive reinforcement.',12,0,100,5,0,0, 'Drill Sergeant Steamcrank'), +(39368,11,0, 'Reward your fellow soldiers in battle with a resounding cheer. Now, cheer at me when I tell you to!',12,0,100,1,0,0, 'Drill Sergeant Steamcrank'), +(39368,12,0, 'Everyone, cheer!',12,0,100,0,0,0, 'Drill Sergeant Steamcrank'), +(39368,13,0, 'Fantastic!',12,0,100,273,0,0, 'Drill Sergeant Steamcrank'), +(39368,14,0, 'However, the most important part of battle is how you celebrate a good hard earned victory!',12,0,100,396,0,0, 'Drill Sergeant Steamcrank'), +(39368,15,0, 'Show me your best victory dance when I give the signal!',12,0,100,5,0,0, 'Drill Sergeant Steamcrank'), +(39368,16,0, 'Now, dance!',12,0,100,0,0,0, 'Drill Sergeant Steamcrank'), +(39368,17,0, 'Superb!',12,0,100,273,0,0, 'Drill Sergeant Steamcrank'), +(39368,18,0, 'You might be the best set of recruits I''ve ever seen! Let''s go through all of that again!',12,0,100,396,0,0, 'Drill Sergeant Steamcrank'); -- cgit v1.2.3 From 250565fae5381da54707459a6800b6ce755006fb Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 2 Jun 2012 19:28:36 +0200 Subject: DB/Loot: 100% Rework of all loots in Hellfire Peninsula and Zangermarsh Closes #2161 --- .../2012_06_02_03_creature_loot_template_hp.sql | 1132 ++++++++++++++++++++ .../2012_06_02_03_creature_loot_template_zm.sql | 902 ++++++++++++++++ .../2012_06_02_03_reference_loot_template.sql | 791 ++++++++++++++ 3 files changed, 2825 insertions(+) create mode 100644 sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql create mode 100644 sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql create mode 100644 sql/updates/world/2012_06_02_03_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql b/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql new file mode 100644 index 00000000000..8a0496d88f6 --- /dev/null +++ b/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql @@ -0,0 +1,1132 @@ +SET @RefDLK := 26043; +SET @HFP := 6000; +SET @HFP1 := @HFP+1; +SET @HFP2 := @HFP+2; +SET @Scrolls := @HFP+3; +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `reference_loot_template` WHERE `entry` IN (@RefDLK,@HFP,@HFP1,@HFP2,@Scrolls); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Generic Lowlevel Ref1 +(@HFP,1,20,1,0,-4000,1), -- Grey level 61 +(@HFP,2,5,1,0,-4001,1), -- Grey level 64 +(@HFP,3,2,1,0,-4100,1), -- Green level 57 +(@HFP,4,2,1,0,-4101,1), -- Green level 58 +(@HFP,5,2,1,0,-4102,1), -- Green level 59 +(@HFP,6,2,1,0,-4103,1), -- Green level 60 +(@HFP,7,2,1,0,-4104,1), -- Green level 61 +(@HFP,8,2,1,0,-4105,1), -- Green level 62 +(@HFP,9,0.5,1,0,-4200,1), -- Blue level 60 +(@HFP,10,0.5,1,0,-4201,1), -- Blue level 61 +(@HFP,11,0.5,1,0,-4202,1), -- Blue level 62 +(@HFP,12,0.5,1,0,-4203,1), -- Blue level 63 +(@HFP,13,0.5,1,0,-4204,1), -- Blue level 64 +(@HFP,4500,0.1,1,0,1,1), -- Traveler's Backpack +(@HFP,3914,0.05,1,0,1,1), -- Journeyman's Backpack +-- Generic Lowlevel Ref2 +(@HFP1,1,20,1,0,-4000,1), -- Grey level 61 +(@HFP1,2,5,1,0,-4001,1), -- Grey level 64 +(@HFP1,3,2,1,0,-4103,1), -- Green level 60 +(@HFP1,4,2,1,0,-4104,1), -- Green level 61 +(@HFP1,5,2,1,0,-4105,1), -- Green level 62 +(@HFP1,6,0.5,1,0,-4200,1), -- Blue level 60 +(@HFP1,7,0.5,1,0,-4201,1), -- Blue level 61 +(@HFP1,8,0.5,1,0,-4202,1), -- Blue level 62 +(@HFP1,9,0.5,1,0,-4203,1), -- Blue level 63 +(@HFP1,10,0.5,1,0,-4204,1), -- Blue level 64 +-- High level Ref +(@HFP2,1,30,1,1,-4002,1), -- Grey level 64 items (ilvl 69) +(@HFP2,2,30,1,1,-4002,1), -- Grey level 67 items (ilvl 72) +(@HFP2,3,2,1,2,-4110,1), -- Green level 67 items (ilvl 111) +(@HFP2,4,2,1,2,-4111,1), -- Green level 68 items (ilvl 114) +(@HFP2,5,2,1,2,-4112,1), -- Green level 69 items (ilvl 117) +(@HFP2,6,0.5,1,3,-4208,1), -- Blue level 68 items (ilvl 115) +(@HFP2,7,0.5,1,3,-4209,1), -- Blue level 69 items (ilvl 115) +(@HFP2,8,0.5,1,3,-4210,1), -- Blue level 70 items (ilvl 115) +-- TBC Scrolls +(@Scrolls,33459,0,1,1,1,1), -- Scroll of Protection VI +(@Scrolls,33457,0,1,1,1,1), -- Scroll of Agility VI +(@Scrolls,33458,0,1,1,1,1), -- Scroll of Intellect VI +(@Scrolls,33460,0,1,1,1,1), -- Scroll of Spirit VI +(@Scrolls,33461,0,1,1,1,1), -- Scroll of Stamina VI +(@Scrolls,33462,0,1,1,1,1), -- Scroll of Strength VI +-- Doom Lord Kazzak +(@RefDLK,30732,0,1,1,1,1), -- Exodar Life-Staff +(@RefDLK,30733,0,1,1,1,1), -- Hope Ender +(@RefDLK,30734,0,1,1,1,1), -- Leggings of the Seventh Circle +(@RefDLK,30735,0,1,1,1,1), -- Ancient Spellcloak of the Highborne +(@RefDLK,30736,0,1,1,1,1), -- Ring of Flowing Light +(@RefDLK,30737,0,1,1,1,1), -- Gold-Leaf Wildboots +(@RefDLK,30738,0,1,1,1,1), -- Ring of Reciprocity +(@RefDLK,30739,0,1,1,1,1), -- Scaled Greaves of the Marksman +(@RefDLK,30740,0,1,1,1,1), -- Ripfiend Shoulderplates +(@RefDLK,30741,0,1,1,1,1); -- Topaz-Studded Battlegrips +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `creature_loot_template` WHERE `entry` IN (18728,187281,19191,16977,19354,17084,17057,16873,16871,19422,16907,19424,19423,16903,16901,19701,16876,16925,18952,16972,16973,17014,16844,19299,16847,16863,18981,16959,19434,16938,16937,19312,22461,19190,18733,24918,18977,17034,19459,19136,19264,16954,18678,18827,16947,16845,19457,16967,16966,22374,18978,16880,17058,22323,19261,17035,17053,16978,16846,16912,16911,19408,17039,16857,18677,19192,16946,16950,16934,19189,19188,16932,16933,20798,19458,16974,19415,16878,16870,19295,16867,19414,19413,19410,19411,16960,16879,16929,16928,16927,19282,19335,19443,16951,19349,19350,16968,26222,26223,16975,20145,16904,16906,16905,19527,16939,18679,19263,19298,16964,19442,24919,18975); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Doom Lord Kazzak, NPC 18728 +-- --------------------------------------------------- +(18728,1,100,1,0,-@RefDLK,2), -- Two from Doom Loor Kazzak Reference +(18728,2,5,1,0,-4113,1), -- Level 70 TBC Green Reference +-- --------------------------------------------------- +-- Arazzius the Cruel, NPC 19191 +-- --------------------------------------------------- +(19191,21877,50,1,0,1,3), -- Netherweave Cloth +(19191,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(19191,28399,5,1,0,1,1), -- Filtered Draenic Water +(19191,13446,1.5,1,0,1,1), -- Major Healing Potion +(19191,13444,1.5,1,0,1,1), -- Major Mana Potion +(19191,1,15,1,0,-4000,1), -- Grey itemlevel 66 (level 61 items) +(19191,2,5,1,0,-4001,1), -- Grey itemlevel 69 (lvl 64 items) +(19191,3,7.5,1,0,-4103,1), -- Green itemlevel 90 +(19191,4,5,1,0,-4104,1), -- Green itemlevel 93 +(19191,5,2.5,1,0,-4105,1), -- Green itemlevel 96 +(19191,6,0.5,1,0,-4201,1), -- Blues level 61 +(19191,7,0.5,1,0,-4202,1), -- Blues level 62 +(19191,8,0.5,1,0,-4203,1), -- Blues level 63 +(19191,9,0.5,1,0,-4204,1), -- Blues level 64 +-- --------------------------------------------------- +-- Arch Mage Xintor, NPC 16977 +-- --------------------------------------------------- +(16977,21877,55,1,0,1,1), -- Netherweave Cloth +(16977,14047,15,1,0,1,3), -- Runecloth +(16977,27859,10,1,0,1,1), -- Zanger Caps +(16977,28399,5,1,0,1,1), -- Filtered Draenic Water +(16977,13446,2,1,0,1,1), -- Major Healing Potion +(16977,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Arzeth the Merciless, NPC 19354 +-- --------------------------------------------------- +(19354,21877,70,1,0,1,1), -- Netherweave Cloth +(19354,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(19354,28399,3,1,0,1,1), -- Filtered Draenic Water +(19354,13446,3,1,0,1,1), -- Major Healing Potion +(19354,13444,1,1,0,1,1), -- Major Healing Potion +(19354,5760,1,1,0,1,1), -- Eternium Lockbox +(19354,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Avruu, NPC 17084 +-- --------------------------------------------------- +(17084,23580,80,1,0,1,1), -- Avruu's Orb +(17084,21877,45,1,0,1,3), -- Netherweave Cloth +(17084,17056,30,1,0,1,1), -- Light Feather +(17084,23483,-10,1,0,1,1), -- QItem: Haal'eshi Scroll +(17084,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(17084,28399,3,1,0,1,1), -- Filtered Draenic Water +(17084,13446,3,1,0,1,1), -- Major Healing Potion +(17084,13444,1,1,0,1,1), -- Major Healing Potion +(17084,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Blacktalon teh Savage, NPC 17057 +-- --------------------------------------------------- +(17057,23687,-100,1,0,1,1), -- QItem: Blacktalon's Claws +(17057,24516,75,1,0,1,1), -- Damaged Rock Flayer Talon +(17057,21877,40,1,0,1,1), -- Netherweave Cloth +(17057,24517,20,1,0,1,1), -- Blood Soaked Tail +(17057,27854,3,1,0,1,1), -- Smoked Talbuk Venison +(17057,28399,2,1,0,1,1), -- Filtered Draenic Water +(17057,13446,1.5,1,0,1,1), -- Major Healing Potion +(17057,13444,0.75,1,0,1,1), -- Major Healing Potion +(17057,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Bleeding Hollow Dark Shaman, NPC 16873 +-- --------------------------------------------------- +(16873,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(16873,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(16873,28399,3,1,0,1,1), -- Filtered Draenic Water +(16873,13446,2,1,0,1,1), -- Major Healing Potion +(16873,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16873,1,2,1,0,-6003,1), -- Scroll of * Reference +(16873,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Grunt, NPC 16871 +-- --------------------------------------------------- +(16871,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(16871,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(16871,28399,3,1,0,1,1), -- Filtered Draenic Water +(16871,13446,2,1,0,1,1), -- Major Healing Potion +(16871,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16871,1,2,1,0,-6003,1), -- Scroll of * Reference +(16871,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Necrolyte, NPC 19422 +-- --------------------------------------------------- +(19422,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(19422,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19422,28399,3,1,0,1,1), -- Filtered Draenic Water +(19422,13446,2,1,0,1,1), -- Major Healing Potion +(19422,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19422,1,2,1,0,-6003,1), -- Scroll of * Reference +(19422,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Peon, NPC 16907 +-- --------------------------------------------------- +(16907,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(16907,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(16907,28399,3,1,0,1,1), -- Filtered Draenic Water +(16907,13446,2,1,0,1,1), -- Major Healing Potion +(16907,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16907,1,2,1,0,-6003,1), -- Scroll of * Reference +(16907,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Tormentor, NPC 19424 +-- --------------------------------------------------- +(19424,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(19424,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19424,28399,3,1,0,1,1), -- Filtered Draenic Water +(19424,13446,2,1,0,1,1), -- Major Healing Potion +(19424,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19424,1,2,1,0,-6003,1), -- Scroll of * Reference +(19424,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Worg, NPC 19423 +-- --------------------------------------------------- +(19423,3299,70,1,0,1,1), -- Fractured Canine +(19423,33547,25,1,0,1,1), -- Hardened Claw +(19423,4583,1,1,0,1,1), -- Thick Furry Mane +(19423,4584,1,1,0,1,1), -- Large Trophy Paw +(19423,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19423,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Blistering Oozeling, NPC 16903 +-- --------------------------------------------------- +(16903,25444,100,1,0,1,1), -- Corrosive Ichor +(16903,23339,-25,1,0,1,1), -- QItem: Arelion's Journal +(16903,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Blistering Rot, NPC 16901 +-- --------------------------------------------------- +(16901,25444,80,1,1,1,1), -- Corrosive Ichor +(16901,25446,20,1,1,1,1), -- Brittle Skull +(16901,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16901,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Evoker, NPC 19701 +-- --------------------------------------------------- +(19701,21877,55,1,0,1,1), -- Netherweave Cloth +(19701,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(19701,14047,20,1,0,1,3), -- Runecloth +(19701,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(19701,28399,3,1,0,1,1), -- Filtered Draenic Water +(19701,13446,3,1,0,1,1), -- Major Healing Potion +(19701,13444,1,1,0,1,1), -- Major Healing Potion +(19701,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19701,1,2,1,0,-6003,1), -- Scroll of * Reference +(19701,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Mutant, NPC 16876 +-- --------------------------------------------------- +(16876,21877,55,1,0,1,1), -- Netherweave Cloth +(16876,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(16876,14047,20,1,0,1,3), -- Runecloth +(16876,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(16876,28399,3,1,0,1,1), -- Filtered Draenic Water +(16876,13446,3,1,0,1,1), -- Major Healing Potion +(16876,13444,1,1,0,1,1), -- Major Healing Potion +(16876,5759,0.2,1,0,1,1), -- Thorium Lockbox +(16876,1,2,1,0,-6003,1), -- Scroll of * Reference +(16876,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Raider, NPC 16925 +-- --------------------------------------------------- +(16925,21877,55,1,0,1,1), -- Netherweave Cloth +(16925,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(16925,14047,20,1,0,1,3), -- Runecloth +(16925,27859,7,1,0,1,1), -- Zanger Caps +(16925,28399,3,1,0,1,1), -- Filtered Draenic Water +(16925,13446,3,1,0,1,1), -- Major Healing Potion +(16925,13444,1,1,0,1,1), -- Major Healing Potion +(16925,5759,0.2,1,0,1,1), -- Thorium Lockbox +(16925,1,2,1,0,-6003,1), -- Scroll of * Reference +(16925,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Scavenger, NPC 18952 +-- --------------------------------------------------- +(18952,21877,55,1,0,1,1), -- Netherweave Cloth +(18952,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(18952,14047,20,1,0,1,3), -- Runecloth +(18952,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(18952,28399,3,1,0,1,1), -- Filtered Draenic Water +(18952,13446,3,1,0,1,1), -- Major Healing Potion +(18952,13444,1,1,0,1,1), -- Major Healing Potion +(18952,5759,0.2,1,0,1,1), -- Thorium Lockbox +(18952,1,2,1,0,-6003,1), -- Scroll of * Reference +(18952,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonestripper Buzzard, NPC 16972 +-- --------------------------------------------------- +(16972,25425,80,1,0,1,1), -- Molted Feather +(16972,27671,50,1,0,1,1), -- Buzzard Meat +(16972,23239,-10,1,0,1,1), -- Plump Buzzard Wing +(16972,17056,30,1,0,1,1), -- Light Feather +(16972,25427,19,1,0,1,1), -- Beaten Talon +(16972,5759,0.2,1,0,1,1), -- Thorium Lockbox +(16972,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonestripper Vulture, NPC 16973 +-- --------------------------------------------------- +(16973,25425,80,1,0,1,1), -- Molted Feather +(16973,27671,50,1,0,1,1), -- Buzzard Meat +(16973,23387,-40,1,0,1,1), -- Bonestripper Tail Feather +(16973,25427,19,1,0,1,1), -- Beaten Talon +(16973,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16973,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Collapsing Voidwalker, NPC 17014 +-- --------------------------------------------------- +(17014,29161,-100,1,0,1,3), -- Void Ridge Soul Shard +(17014,22577,20,1,0,1,2), -- Mote of Shadow +(17014,1,50,1,1,-6000,1), -- Generic HellfirePeninsula Loot +(17014,2,50,1,1,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Crust Burster, NPC 16844 +-- --------------------------------------------------- +(16844,25434,80,1,0,1,1), -- Fractured Carapace +(16844,25436,20,1,0,1,1), -- Twitching Leg +(16844,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Deathwhisperer, NPC 19299 +-- --------------------------------------------------- +(19299,21877,10,1,0,2,3), -- Netherweave Cloth +(19299,27854,2,1,0,1,1), -- Smoked Talbuk Venison +(19299,28399,2,1,0,1,1), -- Filtered Draenic Water +(19299,13444,1,1,0,1,1), -- Major Mana Potion +(19299,1,90,1,1,-6000,1), -- Generic HellfirePeninsula Loot +(19299,31902,0.05,1,0,1,1), -- Eight of Furies +(19299,31911,0.05,1,0,1,1), -- Eight of Lunacy +-- --------------------------------------------------- +-- Debilitated Mag'har Grunt, NPC 16847 +-- --------------------------------------------------- +(16847,23589,-50,1,0,1,1), -- QItem: Mag'har Ancestral Beads +(16847,21877,50,1,0,1,1), -- Netherweave Cloth +(16847,14047,15,1,0,1,3), -- Runecloth +(16847,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16847,28399,3,1,0,1,1), -- Filtered Draenic Water +(16847,13446,2,1,0,1,1), -- Major Healing Potion +(16847,13444,1,1,0,1,1), -- Major Healing Potion +(16847,5759,0.15,1,0,1,1), -- Thorium Lockbox +(16847,1,2,1,0,-6003,1), -- Scroll of * Reference +(16847,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Deranged Helboar, NPC 16863 +-- --------------------------------------------------- +(16863,23270,-40,1,0,1,1), -- QItem: Tainted Helboar Meat +(16863,3403,40,1,1,1,1), -- Ivory Boar Tusk +(16863,2295,40,1,1,1,1), -- Large Boar Tusk +(16863,44754,15,1,1,1,1), -- Severed Boar Tusk +(16863,25440,1.5,1,1,1,1), -- Cracked Boar Tusk +(16863,25442,0.5,1,0,1,1), -- Mangled Snout +(16863,1,2,1,0,-6003,1), -- Scroll of * Reference +(16863,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Doomwhisperer, NPC 18981 +-- --------------------------------------------------- +(18981,28513,-50,1,0,1,1), -- QItem: Demonic Rune Stone +(18981,21877,50,1,0,1,1), -- Netherweave Cloth +(18981,14047,15,1,0,1,3), -- Runecloth +(18981,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18981,28399,3,1,0,1,1), -- Filtered Draenic Water +(18981,13446,2,1,0,1,1), -- Major Healing Potion +(18981,13444,1,1,0,1,1), -- Major Healing Potion +(18981,5759,0.15,1,0,1,1), -- Thorium Lockbox +(18981,1,2,1,0,-6003,1), -- Scroll of * Reference +(18981,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Dread Tactician, NPC 16959 +-- --------------------------------------------------- +(16959,21877,13,1,0,1,1), -- Netherweave Cloth +(16959,14047,15,1,0,1,3), -- Runecloth +(16959,27854,2,1,0,1,1), -- Smoked Talbuk Venison +(16959,27860,3,1,0,1,1), -- Purified Draenic Water +(16959,22829,0.5,1,0,1,1), -- Super Healing Potion +(16959,22832,0.25,1,0,1,1), -- Super Mana Potion +(16959,1,80,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Dreadcaller, NPC 19434 +-- --------------------------------------------------- +(19434,21877,60,1,0,1,1), -- Netherweave Cloth +(19434,14047,15,1,0,1,3), -- Runecloth +(19434,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19434,28399,3,1,0,1,1), -- Filtered Draenic Water +(19434,13446,2,1,0,1,1), -- Major Healing Potion +(19434,13444,1,1,0,1,1), -- Major Healing Potion +(19434,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19434,1,2,1,0,-6003,1), -- Scroll of * Reference +(19434,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Dreghood Brute, NPC 16938 +-- --------------------------------------------------- +(16938,21877,70,1,0,1,1), -- Netherweave Cloth +(16938,27854,11,1,0,1,1), -- Mag'har Grainbread +(16938,28399,3,1,0,1,1), -- Filtered Draenic Water +(16938,13446,2,1,0,1,1), -- Major Healing Potion +(16938,13444,1,1,0,1,1), -- Major Healing Potion +(16938,1,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Dreghood Geomancer, NPC 16937 +-- --------------------------------------------------- +(16937,21877,70,1,0,1,1), -- Netherweave Cloth +(16937,27854,11,1,0,1,1), -- Mag'har Grainbread +(16937,28399,3,1,0,1,1), -- Filtered Draenic Water +(16937,13446,2,1,0,1,1), -- Major Healing Potion +(16937,13444,1,1,0,1,1), -- Major Healing Potion +-- --------------------------------------------------- +-- Drillmaster Zurok, NPC 19312 +-- --------------------------------------------------- +(19312,21877,60,1,0,1,1), -- Netherweave Cloth +(19312,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19312,28399,3,1,0,1,1), -- Filtered Draenic Water +(19312,13446,2,1,0,1,1), -- Major Healing Potion +(19312,13444,1,1,0,1,1), -- Major Healing Potion +(19312,5760,0.2,1,0,1,1), -- Eternium Lockbox +(19312,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Fel Canon MKI, NPC 22461 +-- --------------------------------------------------- +(22461,31944,80,1,1,1,1), -- Demonic Capacitor +(22461,31945,20,1,1,1,1), -- Shadow Circuit +-- --------------------------------------------------- +-- Fel Handler, NPC 19190 +-- --------------------------------------------------- +(19190,28513,-50,1,0,1,1), -- QItem: Demonic Rune Stone +(19190,27854,10,1,0,1,1), -- Smoked Talbuk Venison +(19190,28399,5,1,0,1,1), -- Filtered Draenic Water +(19190,13446,3,1,0,1,1), -- Major Healing Potion +(19190,13444,1.5,1,0,1,1), -- Major Mana Potion +(19190,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19190,1,2,1,0,-6003,1), -- Scroll of * Reference +(19190,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Fel Reaver, NPC 18733 +-- --------------------------------------------------- +(18733,1,100,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Felblood Initiate, NPC 24918 +-- --------------------------------------------------- +(24918,21877,75,1,0,1,3), -- Netherweave Cloth +(24918,27857,8,1,0,1,1), -- Garadar Sharp +(24918,27860,5,1,0,1,1), -- Filtered Draenic Water +(24918,22829,3,1,0,1,1), -- Super Healing Potion +(24918,22832,1.5,1,0,1,1), -- Super Healing Potion +(24918,31952,0.2,1,0,1,1), -- Khorium Lockbox +(24918,31888,0.01,1,0,1,1), -- Three of Blessings +(24918,31908,0.01,1,0,1,1), -- Three of Furies +(24918,1,80,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Felguard Destroyer, NPC 18977 +-- --------------------------------------------------- +(18977,21877,40,1,0,1,3), -- Netherweave Cloth +(18977,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(18977,28399,4,1,0,1,1), -- Filtered Draenic Water +(18977,13446,2,1,0,1,1), -- Major Healing Potion +(18977,13444,1,1,0,1,1), -- Major Mana Potion +(18977,5759,0.3,1,0,1,1), -- Thorium Lockbox +(18977,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Female Kaliri Hatchling, NPC 17034 +-- --------------------------------------------------- +(17034,23588,-40,1,0,1,1), -- QItem: Kaliri Feather +(17034,25425,81,1,1,1,1), -- Molted Feather +(17034,25427,19,1,1,1,1), -- Beaten Talon +(17034,5760,0.2,1,0,1,1), -- Eternium Lockbox +(17034,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Feng, NPC 19459 +-- --------------------------------------------------- +(19459,3299,70,1,0,1,1), -- Fractured Canine +(19459,33547,30,1,0,1,1), -- Hardened Claw +(19459,5759,0.3,1,0,1,1), -- Thorium Lockbox +(19459,4583,0.3,1,0,1,1), -- Thick Furry Mane +(19459,4584,0.2,1,0,1,1), -- Large Trophy Paw +(19459,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Flamewalker Imp, NPC 19136 +-- --------------------------------------------------- +(19136,21877,92,1,0,1,1), -- Netherweave Cloth +(19136,22785,0.05,1,0,1,3), -- Felweed +-- --------------------------------------------------- +-- Force-Commander Gorax, NPC 19264 +-- --------------------------------------------------- +(19264,21877,80,1,0,1,3), -- Netherweave Cloth +(19264,27854,10,1,0,1,1), -- Smoked Talbuk Venison +(19264,28399,5,1,0,1,1), -- Filtered Draenic Water +(19264,13446,3,1,0,1,1), -- Major Healing Potion +(19264,13444,1.5,1,0,1,1), -- Major Mana Potion +(19264,5760,0.3,1,0,1,1), -- Eternium Lockbox +(19264,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Forge-Camp Legionnaire, NPC 16954 +-- --------------------------------------------------- +(16954,21877,80,1,0,1,3), -- Netherweave Cloth +(16954,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16954,28399,4,1,0,1,1), -- Filtered Draenic Water +(16954,13446,2,1,0,1,1), -- Major Healing Potion +(16954,13444,1,1,0,1,1), -- Major Mana Potion +(16954,5759,0.3,1,0,1,1), -- Thorium Lockbox +(16954,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16954,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Fulgorge, NPC 18678 +-- --------------------------------------------------- +(18678,31176,0,1,1,1,1), -- Rockwurm Plate Handguards +(18678,31177,0,1,1,1,1), -- Rockwurm Scale Gauntlets +(18678,31179,0,1,1,1,1), -- Rockwurm Hide Gloves +(18678,31181,0,1,1,1,1), -- Rockwurm Hide Handwraps +(18678,25434,1,1,0,1,3), -- Fractured Carapace +(18678,25436,0.2,1,0,2,4), -- Twitching Leg +-- --------------------------------------------------- +-- Gan'arg Sapper, NPC 18827 +-- --------------------------------------------------- +(18827,21877,83,1,0,1,3), -- Netherweave Cloth +(18827,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18827,28399,4,1,0,1,1), -- Filtered Draenic Water +(18827,13446,3,1,0,1,1), -- Major Healing Potion +(18827,13444,1.5,1,0,1,1), -- Major Mana Potion +(18827,5759,0.2,1,0,1,1), -- Thorium Lockbox +(18827,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(18827,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Gan'arg Servant, NPC 16947 +-- --------------------------------------------------- +(16947,21877,83,1,0,1,3), -- Netherweave Cloth +(16947,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16947,28399,4,1,0,1,1), -- Filtered Draenic Water +(16947,13446,3,1,0,1,1), -- Major Healing Potion +(16947,13444,1.5,1,0,1,1), -- Major Mana Potion +(16947,5759,0.1,1,0,1,1), -- Thorium Lockbox +(16947,1,95,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16947,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Gorkan Bloodfist, NPC 16845 +-- --------------------------------------------------- +(16845,21877,3,1,0,2,3), -- Netherweave Cloth +(16845,27854,1,1,0,1,1), -- Smoked Talbuk Venison +(16845,22829,0.5,1,0,1,1), -- Super Healing Potion +(16845,1,2,1,0,-4110,1), -- Level 67 Green Items (ilvl 111) +-- --------------------------------------------------- +-- Grillok "Darkeye", NPC 19457 +-- --------------------------------------------------- +(19457,31529,-100,1,0,1,1), -- QItem: Grillok's Eyepatch +(19457,21877,45,1,0,1,3), -- Netherweave Cloth +(19457,30157,-5,1,0,1,1), -- QItem: Cursed Talisman +(19457,30425,-10,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19457,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(19457,28399,2,1,0,1,1), -- Filtered Draenic Water +(19457,13446,2,1,0,1,1), -- Major Healing Potion +(19457,13444,1,1,0,1,1), -- Major Mana Potion +(19457,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19457,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Haal'eshi Talonguard, NPC 16967 +-- --------------------------------------------------- +(16967,21877,60,1,0,1,3), -- Netherweave Cloth +(16967,17056,42,1,0,1,1), -- Light Feather +(16967,23483,-15,1,0,1,1), -- QItem: Haal'eshi Scroll +(16967,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16967,28399,3,1,0,1,1), -- Filtered Draenic Water +(16967,13446,2,1,0,1,1), -- Major Healing Potion +(16967,13444,1,1,0,1,1), -- Major Mana Potion +(16967,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16967,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16967,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Haal'eshi Windwalker, NPC 16966 +-- --------------------------------------------------- +(16966,21877,60,1,0,1,3), -- Netherweave Cloth +(16966,17056,42,1,0,1,1), -- Light Feather +(16966,23483,-15,1,0,1,1), -- QItem: Haal'eshi Scroll +(16966,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16966,28399,3,1,0,1,1), -- Filtered Draenic Water +(16966,13446,2,1,0,1,1), -- Major Healing Potion +(16966,13444,1,1,0,1,1), -- Major Mana Potion +(16966,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16966,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16966,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Hand of Kargath, NPC 22374 +-- --------------------------------------------------- +(22374,31706,-100,1,0,1,1), -- QItem: The Head of the Hand of Kargath +(22374,21877,40,1,0,1,3), -- Netherweave Cloth +(22374,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(22374,28399,2,1,0,1,1), -- Filtered Draenic Water +(22374,13446,1,1,0,1,1), -- Major Healing Potion +(22374,13444,0.5,1,0,1,1), -- Major Mana Potion +(22374,5760,0.1,1,0,1,1), -- Eternium Lockbox +(22374,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Heckling Fel Sprite, NPC 18978 +-- --------------------------------------------------- +(18978,21877,95,1,0,1,1), -- Netherweave Cloth +-- --------------------------------------------------- +-- Hulking Helboar, NPC 16880 +-- --------------------------------------------------- +(16880,23336,-30,1,0,1,1), -- QItem: Helboar Blood Sample +(16880,23270,-5,1,0,1,1), -- QItem: Tainted Hellboar Meat +(16880,3403,82,1,1,1,1), -- Ivory Boar Tusk +(16880,25440,1.5,1,1,1,1), -- Cracked Boar Tusk +(16880,25442,0.3,1,2,1,1), -- Mangled Snout +(16880,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Illidari Taskmaster, NPC 17058 +-- --------------------------------------------------- +(17058,29113,-50,1,0,1,1), -- QItem: Demonic Essence +(17058,21877,60,1,0,1,3), -- Netherweave Cloth +(17058,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(17058,28399,3,1,0,1,1), -- Filtered Draenic Water +(17058,13446,2,1,0,1,1), -- Major Healing Potion +(17058,13444,1,1,0,1,1), -- Major Mana Potion +(17058,5760,0.2,1,0,1,1), -- Eternium Lockbox +(17058,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +(17058,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Incandescent Fel Spark, NPC 22323 +-- --------------------------------------------------- +(22323,24508,80,1,1,1,1), -- Elemental Fragment +(22323,24511,20,1,1,1,1), -- Primordial Essence +(22323,22574,35,1,0,1,2), -- Mote of Fire +(22323,1,90,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Infernal Warbringer, NPC 19261 +-- --------------------------------------------------- +(19261,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Kaliri Matriarch, NPC 17035 +-- --------------------------------------------------- +(17035,23588,-27,1,0,1,1), -- QItem: Kaliri Feather +(17035,25425,81,1,1,1,1), -- Molted Feather +(17035,25427,19,1,1,1,1), -- Beaten Talon +(17035,5760,0.07,1,0,1,1), -- Eternium Lockbox +(17035,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Kaliri Swooper, NPC 17053 +-- --------------------------------------------------- +(17053,23588,-25,1,0,1,1), -- QItem: Kaliri Feather +(17053,25425,81,1,1,1,1), -- Molted Feather +(17053,25427,19,1,1,1,1), -- Beaten Talon +(17053,5760,0.05,1,0,1,1), -- Eternium Lockbox +(17053,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Lieutenant Commander Thalvos, NPC 16978 +-- --------------------------------------------------- +(16978,28562,-100,1,0,1,1), -- QItem: Unyielding Battle Horn +(16978,21877,55,1,0,1,1), -- Netherweave Cloth +(16978,27859,5,1,0,1,1), -- Zanger Caps +(16978,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(16978,13446,2,1,0,1,1), -- Major Healing Potion +(16978,13444,2,1,0,1,1), -- Major Mana Potion +(16978,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mag'har Grunt, NPC 16846 +-- --------------------------------------------------- +(16846,23589,-50,1,0,1,1), -- QItem: Mag'har Ancestral Beads +(16846,21877,60,1,0,1,1), -- Netherweave Cloth +(16846,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16846,28399,3,1,0,1,1), -- Filtered Draenic Water +(16846,13446,2,1,0,1,1), -- Major Healing Potion +(16846,13444,1,1,0,1,1), -- Major Healing Potion +(16846,5759,0.15,1,0,1,1), -- Eternium Lockbox +(16846,1,2,1,0,-6003,1), -- Scroll of * Reference +(16846,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mag'har Hunter, NPC 16912 +-- --------------------------------------------------- +(16912,21877,60,1,0,1,1), -- Netherweave Cloth +(16912,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16912,28399,3,1,0,1,1), -- Filtered Draenic Water +(16912,13446,2,1,0,1,1), -- Major Healing Potion +(16912,13444,1,1,0,1,1), -- Major Healing Potion +(16912,5759,0.15,1,0,1,1), -- Eternium Lockbox +(16912,1,2,1,0,-6003,1), -- Scroll of * Reference +(16912,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mag'har Watcher, NPC 16911 +-- --------------------------------------------------- +(16911,21877,60,1,0,1,1), -- Netherweave Cloth +(16911,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16911,28399,3,1,0,1,1), -- Filtered Draenic Water +(16911,13446,2,1,0,1,1), -- Major Healing Potion +(16911,13444,1,1,0,1,1), -- Major Healing Potion +(16911,5759,0.15,1,0,1,1), -- Eternium Lockbox +(16911,1,2,1,0,-6003,1), -- Scroll of * Reference +(16911,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Maiden of Pain, NPC 19408 +-- --------------------------------------------------- +(19408,14047,15,1,0,1,3), -- Runecloth +(19408,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19408,28399,4,1,0,1,1), -- Filtered Draenic Water +(19408,13446,3,1,0,1,1), -- Major Healing Potion +(19408,13444,1.5,1,0,1,1), -- Major Healing Potion +(19408,5760,0.15,1,0,1,1), -- Eternium Lockbox +(19408,1,2,1,0,-6003,1), -- Scroll of * Reference +(19408,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Male Kaliri Hatchling, NPC 17039 +-- --------------------------------------------------- +(17039,23588,-25,1,0,1,1), -- QItem: Kaliri Feather +(17039,25425,81,1,1,1,1), -- Molted Feather +(17039,25427,19,1,1,1,1), -- Beaten Talon +(17039,5760,0.2,1,0,1,1), -- Eternium Lockbox +(17039,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Marauding Crust Burster, NPC 16857 +-- --------------------------------------------------- +(16857,23338,7,1,0,1,1), -- Eroded Leather Case +(16857,25434,80,1,0,1,1), -- Fractured Carapace +(16857,25436,20,1,0,1,1), -- Twitching Leg +(16857,5759,0.1,1,0,1,1), -- Thorium Lockbox +(16857,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mekthorg the Wild, NPC 18677 +-- --------------------------------------------------- +(18677,31168,0,1,1,1,1), -- Demon-Forged Chestguard +(18677,31170,0,1,1,1,1), -- Demon-Forged Hauberk +(18677,31172,0,1,1,1,1), -- Demon-Cured Tunic +(18677,31174,0,1,1,1,1), -- Demonweave Raiment +(18677,21877,40,1,0,1,3), -- Netherweave Cloth +(18677,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(18677,28399,2,1,0,1,3), -- Netherweave Cloth +-- --------------------------------------------------- +-- Mistress of Doom, NPC 19192 +-- --------------------------------------------------- +(19192,21877,80,1,0,1,3), -- Netherweave Cloth +(19192,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19192,28399,5,1,0,1,1), -- Filtered Draenic Water +(19192,13446,3,1,0,1,1), -- Major Healing Potion +(19192,13444,1.5,1,0,1,1), -- Major Healing Potion +(19192,5759,0.15,1,0,1,1), -- Eternium Lockbox +(19192,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mo'arg Forgefiend, NPC 16946 +-- --------------------------------------------------- +(16946,21877,80,1,0,1,3), -- Netherweave Cloth +(16946,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(16946,28399,4,1,0,1,1), -- Filtered Draenic Water +(16946,13446,3,1,0,1,1), -- Major Healing Potion +(16946,13444,1.5,1,0,1,1), -- Major Healing Potion +(16946,5760,0.15,1,0,1,1), -- Eternium Lockbox +(16946,1,2,1,0,-6003,1), -- Scroll of * Reference +(16946,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Netherhound, NPC 16950 +-- --------------------------------------------------- +(16950,28513,-60,1,0,1,1), -- QItem: Demonic Rune Stone +(16950,3299,43,1,0,1,1), -- Fractured Canine +(16950,33547,17,1,0,1,1), -- Hardened Claw +(16950,4583,0.5,1,0,1,1), -- Thick Furry Mane +(16950,4584,0.2,1,0,1,1), -- Large Trophy Paw +(16950,5759,0.05,1,0,1,1), -- Thorium Lockbox +(16950,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Quillfang Ravager, NPC 16934 +-- --------------------------------------------------- +(16934,27674,50,1,0,1,1), -- Ravager Flesh +(16934,23965,81,1,1,1,1), -- Chipped Ravager Claw +(16934,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(16934,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Quillfang Skitterer, NPC 19189 +-- --------------------------------------------------- +(19189,27674,50,1,0,1,1), -- Ravager Flesh +(19189,23217,-4,1,0,1,1), -- QItem: Ravager Egg +(19189,23965,81,1,1,1,1), -- Chipped Ravager Claw +(19189,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(19189,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Raging Colossus, NPC 19188 +-- --------------------------------------------------- +(19188,29579,80,1,0,2,4), -- Crystalized Stone Chips +(19188,29476,19,1,0,1,1), -- Crimson Crystal Shard +(19188,29578,19,1,0,2,4), -- Crystalized Stone +(19188,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Razorfang Hatchling, NPC 16932 +-- --------------------------------------------------- +(16932,23217,-1,1,0,1,1), -- QItem: Ravager Egg +(16932,27674,50,1,0,1,1), -- Ravager Flesh +(16932,23976,0,1,1,1,1), -- Gnarled Ravager Carapace +(16932,23977,0,1,1,1,1), -- Gnarled Ravager Fang +(16932,23978,0,1,1,1,1), -- Gnarled Ravager Claw +(16932,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Razorfang Ravager, NPC 16933 +-- --------------------------------------------------- +(16933,23965,81,1,1,1,1), -- Chipped Ravager Claw +(16933,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(16933,27674,50,1,0,1,1), -- Ravager Flesh +(16933,23217,-20,1,0,1,1), -- QItem: Ravager Egg +(16933,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Razorsaw, NPC 20798 +-- --------------------------------------------------- +(20798,29590,55,1,0,1,1), -- Burning Legion Missive +(20798,29586,-100,1,0,1,1), -- QItem: Head of Forgefiend Razorsaw +(20798,21877,50,1,0,1,3), -- Netherweave Cloth +(20798,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(20798,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(20798,13446,1.5,1,0,1,1), -- Major Healing Potion +(20798,13444,0.75,1,0,1,1), -- Major Mana Potion +(20798,5760,0.15,1,0,1,1), -- Eternium Lockbox +(20798,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Ripp, NPC 19458 +-- --------------------------------------------------- +(19458,3299,70,1,0,1,1), -- Fractured Canine +(19458,33547,25,1,0,1,1), -- Hardened Claw +(19458,4583,1,1,0,1,1), -- Thick Furry Mane +(19458,4584,1,1,0,1,1), -- Large Trophy Paw +(19458,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19458,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Rogue Voidwalker, NPC 16974 +-- --------------------------------------------------- +(16974,23218,-85,1,0,1,1), -- Condensed Voidwalker Essence +(16974,22577,20,1,0,1,1), -- Mote of Shadow +(16974,1,90,1,0,-6000,1), -- Generic HellfirePeninsule Loot +-- --------------------------------------------------- +-- Shattered Hand Acolyte, NPC 19415 +-- --------------------------------------------------- +(19415,21877,70,1,0,1,3), -- Netherweave Cloth +(19415,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19415,28399,4,1,0,1,1), -- Filtered Draenic Water +(19415,13446,2,1,0,1,1), -- Major Healing Potion +(19415,13444,1,1,0,1,1), -- Major Healing Potion +(19415,5760,0.2,1,0,1,1), -- Eternium Lockbox +(19415,1,2,1,0,-6003,1), -- Scroll of * Reference +(19415,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Berserker, NPC 16878 +-- --------------------------------------------------- +(16878,21877,82,1,0,1,3), -- Netherweave Cloth +(16878,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16878,28399,4,1,0,1,1), -- Filtered Draenic Water +(16878,13446,3,1,0,1,1), -- Major Healing Potion +(16878,13444,1.5,1,0,1,1), -- Major Healing Potion +(16878,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16878,1,2,1,0,-6003,1), -- Scroll of * Reference +(16878,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Captain, NPC 16870 +-- --------------------------------------------------- +(16870,21877,80,1,0,1,3), -- Netherweave Cloth +(16870,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16870,28399,4,1,0,1,1), -- Filtered Draenic Water +(16870,13446,2,1,0,1,1), -- Major Healing Potion +(16870,13444,1,1,0,1,1), -- Major Healing Potion +(16870,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16870,1,2,1,0,-6003,1), -- Scroll of * Reference +(16870,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Grenadier, NPC 19295 +-- --------------------------------------------------- +(19295,21877,85,1,0,1,3), -- Netherweave Cloth +(19295,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19295,28399,4,1,0,1,1), -- Filtered Draenic Water +(19295,13446,2,1,0,1,1), -- Major Healing Potion +(19295,13444,1,1,0,1,1), -- Major Healing Potion +(19295,1,75,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Grunt, NPC 16867 +-- --------------------------------------------------- +(16867,21877,80,1,0,1,3), -- Netherweave Cloth +(16867,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16867,28399,4,1,0,1,1), -- Filtered Draenic Water +(16867,13446,2,1,0,1,1), -- Major Healing Potion +(16867,13444,1,1,0,1,1), -- Major Healing Potion +(16867,5760,0.18,1,0,1,1), -- Eternium Lockbox +(16867,1,2,1,0,-6003,1), -- Scroll of * Reference +(16867,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Guard, NPC 19414 +-- --------------------------------------------------- +(19414,21877,80,1,0,1,3), -- Netherweave Cloth +(19414,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19414,28399,4,1,0,1,1), -- Filtered Draenic Water +(19414,13446,3,1,0,1,1), -- Major Healing Potion +(19414,13444,1.5,1,0,1,1), -- Major Healing Potion +(19414,5760,0.18,1,0,1,1), -- Eternium Lockbox +(19414,1,2,1,0,-6003,1), -- Scroll of * Reference +(19414,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Mage, NPC 19413 +-- --------------------------------------------------- +(19413,21877,60,1,0,1,3), -- Netherweave Cloth +(19413,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19413,28399,3,1,0,1,1), -- Filtered Draenic Water +(19413,13446,2,1,0,1,1), -- Major Healing Potion +(19413,13444,1,1,0,1,1), -- Major Healing Potion +(19413,1,2,1,0,-6003,1), -- Scroll of * Reference +(19413,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Neophyte, NPC 19410 +-- --------------------------------------------------- +(19410,21877,80,1,0,1,3), -- Netherweave Cloth +(19410,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19410,28399,4,1,0,1,1), -- Filtered Draenic Water +(19410,13446,2,1,0,1,1), -- Major Healing Potion +(19410,13444,1,1,0,1,1), -- Major Healing Potion +(19410,5760,0.18,1,0,1,1), -- Eternium Lockbox +(19410,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Warlock, NPC 19411 +-- --------------------------------------------------- +(19411,21877,80,1,0,1,3), -- Netherweave Cloth +(19411,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19411,28399,4,1,0,1,1), -- Filtered Draenic Water +(19411,13446,2,1,0,1,1), -- Major Healing Potion +(19411,13444,1,1,0,1,1), -- Major Healing Potion +(19411,5760,0.18,1,0,1,1), -- Eternium Lockbox +(19411,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Sister of Grief, NPC 16960 +-- --------------------------------------------------- +(16960,21877,80,1,0,1,3), -- Netherweave Cloth +(16960,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16960,28399,4,1,0,1,1), -- Filtered Draenic Water +(16960,13446,2,1,0,1,1), -- Major Healing Potion +(16960,13444,1,1,0,1,1), -- Major Healing Potion +(16960,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Starving Helboar, NPC 16879 +-- --------------------------------------------------- +(16879,23270,-5,1,0,1,1), -- QItem: Tainted Helboar Meat +(16879,2295,74,1,1,1,1), -- Large Boar Tusk +(16879,44754,24,1,1,1,1), -- Severed Boar Tusk +(16879,25440,2,1,1,1,1), -- Cracked Boar Tusk +(16879,25442,0.5,1,0,1,1), -- Mangled Snout +(16879,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Stonescythe Alpha, NPC 16929 +-- --------------------------------------------------- +(16929,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon +(16929,24517,19,1,1,1,1), -- Blood Soaked Tail +(16929,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(16929,28399,2,1,0,1,1), -- Filtered Draenic Water +(16929,13446,1.2,1,0,1,1), -- Major Healing Potion +(16929,13444,0.6,1,0,1,1), -- Major Healing Potion +(16929,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16929,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Stonescythe Ambusher, NPC 16928 +-- --------------------------------------------------- +(16928,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon +(16928,24517,19,1,1,1,1), -- Blood Soaked Tail +(16928,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Stonescythe Whelp, NPC 16927 +-- --------------------------------------------------- +(16927,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon +(16927,24517,19,1,1,1,1), -- Blood Soaked Tail +(16927,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(16927,28399,2,1,0,1,1), -- Filtered Draenic Water +(16927,13446,1.2,1,0,1,1), -- Major Healing Potion +(16927,13444,0.6,1,0,1,1), -- Major Healing Potion +(16927,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16927,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Subjugator Shi'aziv, NPC 19282 +-- --------------------------------------------------- +(19282,28513,-25,1,0,1,1), -- QItem: Demonic Rune Stone +(19282,27854,3,1,0,1,1), -- Smoked Talbuk Venison +(19282,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(19282,13446,1,1,0,1,1), -- Major Healing Potion +(19282,13444,0.5,1,0,1,1), -- Major Healing Potion +(19282,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Subjugator Yalqiz, NPC 19335 +-- --------------------------------------------------- +(19335,27854,1.2,1,0,1,1), -- Smoked Talbuk Venison +(19335,28399,0.6,1,0,1,1), -- Filtered Draenic Water +(19335,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Tagar Spinebreaker, NPC 19443 +-- --------------------------------------------------- +(19443,21877,33,1,0,1,3), -- Netherweave Cloth +(19443,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(19443,28399,2,1,0,1,1), -- Filtered Draenic Water +(19443,13446,1,1,0,1,1), -- Major Healing Potion +(19443,13444,0.5,1,0,1,1), -- Major Healing Potion +(19443,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Terrorfiend, NPC 16951 +-- --------------------------------------------------- +(16951,21877,70,1,0,1,3), -- Netherweave Cloth +(16951,23269,-25,1,0,1,1), -- Felblood Sample +(16951,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(16951,28399,3.5,1,0,1,1), -- Filtered Draenic Water +(16951,13446,2,1,0,1,1), -- Major Healing Potion +(16951,13444,1,1,0,1,1), -- Major Healing Potion +(16951,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot +(16951,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Thornfang Ravager, NPC 19349 +-- --------------------------------------------------- +(19349,27674,50,1,0,1,1), -- Ravager Flesh +(19349,23965,81,1,1,1,1), -- Chipped Ravager Claw +(19349,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(19349,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19349,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Thornfang Venomspitter, NPC 19350 +-- --------------------------------------------------- +(19350,23965,81,1,1,1,1), -- Chipped Ravager Claw +(19350,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(19350,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Tunneler, NPC 16968 +-- --------------------------------------------------- +(16968,23338,5,1,0,1,1), -- Eroded Leather Case +(16968,25434,81,1,1,1,1), -- Fractured Carapace +(16968,25436,19,1,1,1,1), -- Twitching Leg +(16968,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16968,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Twilight Cryomancer, NPC 26222 +-- --------------------------------------------------- +(26222,14047,85,1,0,1,2), -- Runecloth +(26222,8952,9,1,0,1,2), -- Roasted Quail +(26222,8766,4.5,1,0,1,2), -- Morning Glory Dew +(26222,13446,6,1,0,1,2), -- Major Healing Potion +(26222,13444,3,1,0,1,2), -- Major Mana Potion +(26222,1,10,1,0,-1052,1), -- Level 52 Grey reference +(26222,2,10,1,0,-1053,1), -- Level 53 Grey reference +-- --------------------------------------------------- +-- Twilight Frostblade, NPC 26223 +-- --------------------------------------------------- +(26223,14047,85,1,0,1,2), -- Runecloth +(26223,8952,9,1,0,1,2), -- Roasted Quail +(26223,8766,4.5,1,0,1,2), -- Morning Glory Dew +(26223,13446,6,1,0,1,2), -- Major Healing Potion +(26223,13444,3,1,0,1,2), -- Major Mana Potion +(26223,1,10,1,0,-1052,1), -- Level 52 Grey reference +(26223,2,10,1,0,-1053,1), -- Level 53 Grey reference +-- --------------------------------------------------- +-- Uncontrolled Voidwalker, NPC 16975 +-- --------------------------------------------------- +(16975,23218,-80,1,0,1,1), -- Condensed Voidwalker Essence +(16975,22577,20,1,0,1,1), -- Mote of Shadow +(16975,1,90,1,0,-6000,1), -- Generic HellfirePeninsule Loot +-- --------------------------------------------------- +-- Unstable Voidwalker, NPC 20145 +-- --------------------------------------------------- +(20145,29051,-100,1,0,1,1), -- QItem: Warp Nether +-- --------------------------------------------------- +-- Unyielding Footman, NPC 16904 +-- --------------------------------------------------- +(16904,21877,60,1,0,1,1), -- Netherweave Cloth +(16904,14047,20,1,0,1,3), -- Runecloth +(16904,27859,8,1,0,1,1), -- Zanger Caps +(16904,28399,4,1,0,1,1), -- Filtered Draenic Water +(16904,13446,2,1,0,1,1), -- Major Healing Potion +(16904,13444,1,1,0,1,1), -- Major Mana Potion +(16904,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Unyielding Knight, NPC 16906 +-- --------------------------------------------------- +(16906,28552,15,1,0,1,1), -- A Mysterious Tome +(16906,21877,60,1,0,1,1), -- Netherweave Cloth +(16906,14047,20,1,0,1,3), -- Runecloth +(16906,27859,8,1,0,1,1), -- Zanger Caps +(16906,28399,4,1,0,1,1), -- Filtered Draenic Water +(16906,13446,2,1,0,1,1), -- Major Healing Potion +(16906,13444,1,1,0,1,1), -- Major Mana Potion +(16906,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16906,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Unyielding Sorcerer, NPC 16905 +-- --------------------------------------------------- +(16905,21877,60,1,0,1,1), -- Netherweave Cloth +(16905,14047,20,1,0,1,3), -- Runecloth +(16905,27859,8,1,0,1,1), -- Zanger Caps +(16905,28399,4,1,0,1,1), -- Filtered Draenic Water +(16905,13446,2,1,0,1,1), -- Major Healing Potion +(16905,13444,1,1,0,1,1), -- Major Mana Potion +(16905,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16905,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Vacillating Voidcaller, NPC 19527 +-- --------------------------------------------------- +(19527,29161,-100,1,0,1,3), -- Void Ridge Soul Shard +(19527,22577,20,1,0,1,2), -- Mote of Shadow +(19527,1,50,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Void Baron Galaxis, NPC 16939 +-- --------------------------------------------------- +(16939,29162,-100,1,0,1,1), -- Galaxis Soul Shard +-- --------------------------------------------------- +-- Vorakem Doomspeaker, NPC 18679 +-- --------------------------------------------------- +(18679,31182,0,1,1,1,1), -- Legion Helm +(18679,31183,0,1,1,1,1), -- Legion Coif +(18679,31184,0,1,1,1,1), -- Legion Headguard +(18679,31185,0,1,1,1,1), -- Legion Crown +(18679,21877,40,1,0,1,3), -- Netherweave Cloth +(18679,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(18679,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(18679,13446,1,1,0,1,1), -- Major Healing Potion +(18679,13444,0.5,1,0,1,1), -- Major Healing Potion +-- --------------------------------------------------- +-- Warboss Nekrogg, NPC 19263 +-- --------------------------------------------------- +(19263,21877,90,1,0,1,1), -- Netherweave Cloth +(19263,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Warbringer Arix'Amal, NPC 19298 +-- --------------------------------------------------- +(19298,29795,-85,1,0,1,1), -- QItem: Burning Legion Gate Key +(19298,29588,50,1,0,1,1), -- Burning Legion Gate Key +(19298,21877,46,1,0,1,3), -- Netherweave Cloth +(19298,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(19298,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(19298,13446,1.4,1,0,1,1), -- Major Healing Potion +(19298,13444,0.7,1,0,1,1), -- Major Healing Potion +(19298,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Warlord Morkh, NPC 16964 +-- --------------------------------------------------- +(16964,30158,-100,1,0,1,1), -- QItem: Morkh's Shattered Armor +(16964,21877,35,1,0,1,1), -- Netherweave Cloth +(16964,14047,10,1,0,1,3), -- Runecloth +(16964,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(16964,28399,2,1,0,1,1), -- Filtered Draenic Water +(16964,13446,1,1,0,1,1), -- Major Healing Potion +(16964,13444,0.5,1,0,1,1), -- Major Healing Potion +(16964,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Worg Master Kruush, NPC 19442 +-- --------------------------------------------------- +(19442,31374,-100,1,0,1,1), -- QItem: Worg Master's Head +(19442,30425,-25,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19442,30157,-10,1,0,1,1), -- QItem: Cursed Talisman +(19442,21877,45,1,0,1,3), -- Netherweave Cloth +(19442,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(19442,28399,2,1,0,1,1), -- Filtered Draenic Water +(19442,13446,1,1,0,1,1), -- Major Healing Potion +(19442,13444,0.5,1,0,1,1), -- Major Mana Potion +(19442,5759,0.1,1,0,1,1), -- Thorium Lockbox +(19442,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Wrath Herald, NPC 24919 +-- --------------------------------------------------- +(24919,34259,-100,1,0,1,1), -- Demonic Blood +(24919,21877,45,1,0,1,3), -- Netherweave Cloth +(24919,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(24919,27860,2,1,0,1,1), -- Purified Draenic Water +(24919,22829,1.6,1,0,1,1), -- Super Healing Potion +(24919,22832,0.8,1,0,1,1), -- Super Mana Potion +(24919,1,100,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Wrathguard, NPC 18975 +-- --------------------------------------------------- +(18975,28513,-85,1,0,1,1), -- QItem: Demonic Rune Stone +(18975,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18975,28399,4,1,0,1,1), -- Filtered Draenic Water +(18975,13446,3,1,0,1,1), -- Major Healing Potion +(18975,13444,1.5,1,0,1,1), -- Major Healing Potion +(18975,5759,0.15,1,0,1,1), -- Thorium Lockbox +(18975,1,2,1,0,-6003,1), -- Scroll of * Reference +(18975,2,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot + +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (26222,26223); +DELETE FROM `reference_loot_template` WHERE `entry`=34081; \ No newline at end of file diff --git a/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql b/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql new file mode 100644 index 00000000000..d5130caf8cb --- /dev/null +++ b/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql @@ -0,0 +1,902 @@ +SET @ZM1:=6010; +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `reference_loot_template` WHERE `entry`=@ZM1; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +(@ZM1,1,30,1,0,-4000,1), -- Grey Items level 61 (ilvl 66) +(@ZM1,2,30,1,0,-4001,1), -- Grey Items level 64 (ilvl 69) +(@ZM1,3,2,1,0,-4103,1), -- Green Items level 60 (ilvl 90) +(@ZM1,4,2,1,0,-4104,1), -- Green Items level 61 (ilvl 93) +(@ZM1,5,2,1,0,-4105,1), -- Green Items level 62 (ilvl 96) +(@ZM1,6,2,1,0,-4106,1), -- Green Items level 63 (ilvl 99) +(@ZM1,7,0.5,1,0,-4203,1), -- Blue items level 63 (ilvl 94) +(@ZM1,8,0.5,1,0,-4204,1), -- Blue items level 64 (ilvl 97) +(@ZM1,9,0.5,1,0,-4205,1), -- Blue items level 65 (ilvl 97) +(@ZM1,5760,0.5,1,0,1,1); -- Eternium Lockbox +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `creature_loot_template` WHERE `entry` IN (18285,18119,18120,18117,20443,20444,18118,18121,19732,18283,20792,18088,20088,20090,18089,20089,20196,18127,18682,20197,18281,20293,20295,20294,18159,20442,18992,19174,18681,18116,18115,19733,20079,18087,19946,19947,18086,18122,18134,18214,20198,20270,18113,18114,19734,18129,19730,19729,18080,20290,20291,18282,20445,20292,18137,18136,18135,18130,18131,18133,20283,19706,18680,18213,18286,18212,18160,20324,20279,20280,18046,18044,18128,18280,18154,19519,18125,18340,20477,18138,18077,18079,20115,18132,19402,18124,18123,20387); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- "Count" Ungula, NPC 18285 +-- --------------------------------------------------- +(18285,25459,-100,1,0,1,1), -- QItem: "Count" Ungula's Mandible +(18285,25434,80,1,1,1,1), -- Fractured Carapace +(18285,25436,20,1,1,1,1), -- Twitsching Leg +(18285,24493,-10,1,0,1,1), -- QItem: Marshfang Slicer Blade +(18285,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Brute, NPC 18119 +-- --------------------------------------------------- +(18119,21877,10,1,0,1,3), -- Netherweave Cloth +(18119,27854,1.2,1,0,1,1), -- Smoked Talbuk Venison +(18119,28399,0.6,1,0,1,1), -- Filtered Draenic Water +(18119,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ango'rosh Mauler, NPC 18120 +-- --------------------------------------------------- +(18120,24240,-50,1,0,1,1), -- QItem: Box of Mushrooms +(18120,21877,70,1,0,1,3), -- Netherweave Cloth +(18120,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18120,28399,3,1,0,1,1), -- Filtered Draenic Water +(18120,13446,2,1,0,1,1), -- Major Healing Potion +(18120,13444,1,1,0,1,1), -- Major Mana Potion +(18120,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18120,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Ogre, NPC 18117 +-- --------------------------------------------------- +(18117,24238,-50,1,0,1,1), -- QItem: Mushroom Sample +(18117,21877,62,1,0,1,3), -- Netherweave Cloth +(18117,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18117,28399,3,1,0,1,1), -- Filtered Draenic Water +(18117,13446,2,1,0,1,1), -- Major Healing Potion +(18117,13444,1,1,0,1,1), -- Major Mana Potion +(18117,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18117,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Sentry, NPC 20443 +-- --------------------------------------------------- +(20443,24238,-50,1,0,1,1), -- QItem: Mushroom Sample +(20443,21877,44,1,0,1,3), -- Netherweave Cloth +(20443,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(20443,28399,2,1,0,1,1), -- Filtered Draenic Water +(20443,13446,1.5,1,0,1,1), -- Major Healing Potion +(20443,13444,0.75,1,0,1,1), -- Major Mana Potion +(20443,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ango'rosh Shadowmage, NPC 20444 +-- --------------------------------------------------- +(20444,24240,-40,1,0,1,1), -- QItem: Box of Mushrooms +(20444,21877,70,1,0,1,3), -- Netherweave Cloth +(20444,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(20444,28399,3,1,0,1,1), -- Filtered Draenic Water +(20444,13446,2,1,0,1,1), -- Major Healing Potion +(20444,13444,1,1,0,1,1), -- Major Mana Potion +(20444,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Shaman, NPC 18118 +-- --------------------------------------------------- +(18118,24238,-45,1,0,1,1), -- QItem: Mushroom Sample +(18118,21877,60,1,0,1,3), -- Netherweave Cloth +(18118,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18118,28399,3,1,0,1,1), -- Filtered Draenic Water +(18118,13446,2,1,0,1,1), -- Major Healing Potion +(18118,13444,1,1,0,1,1), -- Major Mana Potion +(18118,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18118,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ango'rosh Souleater, NPC 18121 +-- --------------------------------------------------- +(18121,24240,-35,1,0,1,1), -- QItem: Box of Mushrooms +(18121,21877,70,1,0,1,3), -- Netherweave Cloth +(18121,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18121,28399,3,1,0,1,1), -- Filtered Draenic Water +(18121,13446,2,1,0,1,1), -- Major Healing Potion +(18121,13444,1,1,0,1,1), -- Major Mana Potion +(18121,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18121,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Warlock, NPC 19732 +-- --------------------------------------------------- +(19732,21877,82,1,0,1,3), -- Netherweave Cloth +(19732,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19732,28399,4,1,0,1,1), -- Filtered Draenic Water +(19732,13446,3,1,0,1,1), -- Major Healing Potion +(19732,13444,1.5,1,0,1,1), -- Major Mana Potion +(19732,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Blacksting, NPC 18283 +-- --------------------------------------------------- +(18283,25448,-100,1,0,1,1), -- QItem: Blacksting's Stinger +(18283,25434,80,1,1,1,1), -- Fractured Carapace +(18283,25436,18,1,1,1,1), -- Twitching Leg +(18283,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing +(18283,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bloodscale Elemental, NPC 20792 +-- --------------------------------------------------- +(20792,24507,81,1,1,1,1), -- Elemental Shard +(20792,24510,19,1,1,1,1), -- Primordial Core +(20792,22578,19,1,0,1,2), -- Mote of Water +(20792,7080,1,1,0,1,2), -- Essence of Water +(20792,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bloodscale Enchantress, NPC 18088 +-- --------------------------------------------------- +(18088,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18088,17057,33,1,0,1,1), -- Shiny Fish Scales +(18088,17058,30,1,0,1,1), -- Fish Oil +(18088,24476,19,1,0,1,1), -- Jaggal Clam +(18088,24280,-10,1,0,1,1), -- QItem: Naga Claws +(18088,24330,-1,1,0,1,1), -- QItem: Drain Schematics +(18088,27858,4,1,0,1,3), -- Sunspring Carp +(18088,28399,2,1,0,1,1), -- Filtered Draenic Water +(18088,13446,1.5,1,0,1,1), -- Major Healing Potion +(18088,13444,0.75,1,0,1,1), -- Major Mana Potion +(18088,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18088,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodscale Overseer, NPC 20088 +-- --------------------------------------------------- +(20088,24280,-80,1,0,1,1), -- QItem: Naga Claws +(20088,24401,30,1,0,1,1), -- Unidentified Plant Parts +(20088,17057,25,1,0,1,1), -- Shiny Fish Scales +(20088,17058,20,1,0,1,1), -- Fish Oil +(20088,24476,15,1,0,1,1), -- Jaggal Clam +(20088,24330,-2,1,0,1,1), -- QItem: Drain Schematics +(20088,27858,4,1,0,1,3), -- Sunspring Carp +(20088,28399,2,1,0,1,1), -- Filtered Draenic Water +(20088,13446,1,1,0,1,1), -- Major Healing Potion +(20088,13444,0.5,1,0,1,1), -- Major Mana Potion +(20088,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(20088,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodscale Sentry, NPC 20090 +-- --------------------------------------------------- +(20090,24507,68,1,1,1,1), -- Elemental Shard +(20090,24510,17,1,1,1,1), -- Primordial Core +(20090,22578,15,1,0,1,2), -- Mote of Water +(20090,7080,1,1,0,1,2), -- Essence of Water +(20090,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bloodscale Slavedriver, NPC 18089 +-- --------------------------------------------------- +(18089,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18089,17057,33,1,0,1,1), -- Shiny Fish Scales +(18089,17058,30,1,0,1,1), -- Fish Oil +(18089,24476,19,1,0,1,1), -- Jaggal Clam +(18089,24280,-5,1,0,1,1), -- QItem: Naga Claws +(18089,24330,-0.5,1,0,1,1), -- QItem: Drain Schematics +(18089,27858,4,1,0,1,3), -- Sunspring Carp +(18089,28399,2,1,0,1,1), -- Filtered Draenic Water +(18089,13446,1.5,1,0,1,1), -- Major Healing Potion +(18089,13444,0.75,1,0,1,1), -- Major Mana Potion +(18089,1,1,1,0,-6003,1), -- Scroll of * VI Reference +(18089,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodscale Wavecaller, NPC 20089 +-- --------------------------------------------------- +(20089,24280,-80,1,0,1,1), -- QItem: Naga Claws +(20089,24401,30,1,0,1,1), -- Unidentified Plant Parts +(20089,17057,25,1,0,1,1), -- Shiny Fish Scales +(20089,17058,20,1,0,1,1), -- Fish Oil +(20089,24476,15,1,0,1,1), -- Jaggal Clam +(20089,24330,-2,1,0,1,1), -- QItem: Drain Schematics +(20089,27858,4,1,0,1,3), -- Sunspring Carp +(20089,28399,2,1,0,1,1), -- Filtered Draenic Water +(20089,13446,1,1,0,1,1), -- Major Healing Potion +(20089,13444,0.5,1,0,1,1), -- Major Mana Potion +(20089,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(20089,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodthirsty Marshfang, NPC 20196 +-- --------------------------------------------------- +(20196,28058,81,1,1,1,1), -- Shredded Wyrm Wing +(20196,28059,19,1,1,1,1), -- Iridescent Eye +(20196,22578,19,1,0,1,1), -- Mote of Water +(20196,7080,1,1,0,1,1), -- Essence of Water +(20196,1,95,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Bog Lord, NPC 18127 +-- --------------------------------------------------- +(18127,25450,82,1,0,1,1), -- Creeping Moss +(18127,25452,18,1,1,1,1), -- Blighted Fungus +(18127,24291,-35,1,0,1,1), -- QItem: Bog Lord Tendril +(18127,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18127,22575,19,1,0,1,1), -- Mote of Life +(18127,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bog Lurker, NPC 18682 +-- --------------------------------------------------- +(18682,31247,0,1,1,1,1), -- Bog Pauldrons +(18682,31248,0,1,1,1,1), -- Bog Epaulets +(18682,31249,0,1,1,1,1), -- Bog Spaulders +(18682,31250,0,1,1,1,1), -- Bog Mantle +(18682,25456,80,1,2,1,1), -- Glowing Spores +(18682,25454,20,1,2,1,1), -- Luminescent Globe +-- --------------------------------------------------- +-- Bogflare Needler, NPC 20197 +-- --------------------------------------------------- +(20197,25434,81,1,1,1,1), -- Fractured Carapace +(20197,25436,19,1,1,1,1), -- Twitching Leg +(20197,24372,-2,1,0,1,1), -- QItem: Diaphanous Wing +(20197,29960,0.05,1,0,1,1), -- Captured Firefly +(20197,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Boglash, NPC 18281 +-- --------------------------------------------------- +(18281,25434,80,1,1,1,1), -- Fractured Carapace +(18281,25436,18,1,1,1,1), -- Twitching Leg +(18281,27676,50,1,0,1,1), -- Strange Spores +(18281,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18281,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bogstrok Clacker, NPC 20293 +-- --------------------------------------------------- +(20293,24401,40,1,0,1,1), -- Unidentified Plant Parts +(20293,17057,33,1,0,1,1), -- Shiny Fish Scales +(20293,17058,30,1,0,1,1), -- Fish Oil +(20293,24476,20,1,0,1,1), -- Jaggal Clam +(20293,27858,4,1,0,1,3), -- Sunspring Carp +(20293,28399,2,1,0,1,1), -- Filtered Draenic Water +(20293,13446,1.5,1,0,1,1), -- Major Healing Potion +(20293,13444,0.75,1,0,1,1), -- Major Mana Potion +(20293,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bogstrok Crusher, NPC 20295 +-- --------------------------------------------------- +(20295,24401,40,1,0,1,1), -- Unidentified Plant Parts +(20295,17057,33,1,0,1,1), -- Shiny Fish Scales +(20295,17058,30,1,0,1,1), -- Fish Oil +(20295,24476,20,1,0,1,1), -- Jaggal Clam +(20295,27858,4,1,0,1,3), -- Sunspring Carp +(20295,28399,2,1,0,1,1), -- Filtered Draenic Water +(20295,13446,1.5,1,0,1,1), -- Major Healing Potion +(20295,13444,0.75,1,0,1,1), -- Major Mana Potion +(20295,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bogstrok Razorclaw, NPC 20294 +-- --------------------------------------------------- +(20294,24401,40,1,0,1,1), -- Unidentified Plant Parts +(20294,17057,33,1,0,1,1), -- Shiny Fish Scales +(20294,17058,30,1,0,1,1), -- Fish Oil +(20294,24476,20,1,0,1,1), -- Jaggal Clam +(20294,27858,4,1,0,1,3), -- Sunspring Carp +(20294,28399,2,1,0,1,1), -- Filtered Draenic Water +(20294,13446,1.5,1,0,1,1), -- Major Healing Potion +(20294,13444,0.75,1,0,1,1), -- Major Mana Potion +(20294,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Boss Grog'ak, NPC 18159 +-- --------------------------------------------------- +(18159,24472,-100,1,0,1,1), -- QItem: Boss Grog'ak's Head +(18159,24238,-100,1,0,1,1), -- QItem: Mushroom Sample +(18159,21877,45,1,0,1,3), -- Netherweave Cloth +(18159,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18159,28399,3,1,0,1,1), -- Filtered Draenic Water +(18159,13446,2,1,0,1,1), -- Major Healing Potion +(18159,13444,1,1,0,1,1), -- Major Mana Potion +(18159,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Captain Bo'kar, NPC 20442 +-- --------------------------------------------------- +(20442,24240,-50,1,0,1,1), -- QItem: Box of Mushrooms +(20442,21877,80,1,0,1,3), -- Netherweave Cloth +(20442,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(20442,28399,3,1,0,1,1), -- Filtered Draenic Water +(20442,13446,2,1,0,1,1), -- Major Healing Potion +(20442,13444,1,1,0,1,1), -- Major Mana Potion +(20442,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Captain Krosh, NPC 18992 +-- --------------------------------------------------- +(18992,24240,-5,1,0,1,1), -- QItem: Box of Mushrooms +(18992,21877,25,1,0,1,3), -- Netherweave Cloth +(18992,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18992,28399,3,1,0,1,1), -- Filtered Draenic Water +(18992,13446,2,1,0,1,1), -- Major Healing Potion +(18992,13444,1,1,0,1,1), -- Major Mana Potion +(18992,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Chieftain Mummaki, NPC 19174 +-- --------------------------------------------------- +(19174,27943,-100,1,0,1,1), -- QItem: Chieftain Mummaki's Totem +(19174,21877,25,1,0,1,3), -- Netherweave Cloth +(19174,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19174,28399,3,1,0,1,1), -- Filtered Draenic Water +(19174,13446,2,1,0,1,1), -- Major Healing Potion +(19174,13444,1,1,0,1,1), -- Major Mana Potion +(19174,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Coilfang Emissary, NPC 18681 +-- --------------------------------------------------- +(18681,31242,0,1,1,1,1), -- Nagascale Legplates +(18681,31243,0,1,1,1,1), -- Nagascale Legguard +(18681,31244,0,1,1,1,1), -- Nagahide Pants +(18681,31245,0,1,1,1,1), -- Nagahide Leggings +(18681,17057,40,1,0,1,2), -- Shiny Fish Scales +(18681,21877,40,1,0,1,3), -- Netherweave Cloth +(18681,17058,25,1,0,1,1), -- Fish Oil +-- --------------------------------------------------- +-- Daggerfen Assassin, NPC 18116 +-- --------------------------------------------------- +(18116,21877,75,1,0,1,3), -- Netherweave Cloth +(18116,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18116,28399,4,1,0,1,1), -- Filtered Draenic Water +(18116,13446,2,1,0,1,1), -- Major Healing Potion +(18116,13444,1,1,0,1,1), -- Major Mana Potion +(18116,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Daggerfen Muckdweller, NPC 18115 +-- --------------------------------------------------- +(18115,21877,75,1,0,1,3), -- Netherweave Cloth +(18115,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18115,28399,4,1,0,1,1), -- Filtered Draenic Water +(18115,13446,2,1,0,1,1), -- Major Healing Potion +(18115,13444,1,1,0,1,1), -- Major Mana Potion +(18115,1,80,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Daggerfen Servant, NPC 19733 +-- --------------------------------------------------- +(19733,17057,33,1,0,1,1), -- Shiny Fish Scales +(19733,17058,30,1,0,1,1), -- Fish Oil +(19733,24476,20,1,0,1,1), -- Jaggal Clam +(19733,27858,4,1,0,1,3), -- Sunspring Carp +(19733,28399,2,1,0,1,1), -- Filtered Draenic Water +(19733,13446,1.5,1,0,1,1), -- Major Healing Potion +(19733,13444,0.75,1,0,1,1), -- Major Mana Potion +(19733,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Sentry, NPC 20079 +-- --------------------------------------------------- +(20079,24507,70,1,1,1,1), -- Elemental Shard +(20079,24510,15,1,1,1,1), -- Primordial Core +(20079,22578,15,1,0,1,2), -- Mote of Water +(20079,7080,1,1,0,1,2), -- Essence of Water +(20079,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Siren, NPC 18087 +-- --------------------------------------------------- +(18087,24280,-80,1,0,1,1), -- QItem: Naga Claws +(18087,24401,30,1,0,1,1), -- Unidentified Plant Parts +(18087,17057,25,1,0,1,1), -- Shiny Fish Scales +(18087,17058,20,1,0,1,1), -- Fish Oil +(18087,24476,15,1,0,1,1), -- Jaggal Clam +(18087,27858,3,1,0,1,3), -- Sunspring Carp +(18087,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(18087,13446,1,1,0,1,1), -- Major Healing Potion +(18087,13444,0.5,1,0,1,1), -- Major Mana Potion +(18087,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Slaver, NPC 19946 +-- --------------------------------------------------- +(19946,24280,-95,1,0,1,1), -- QItem: Naga Claws +(19946,24401,30,1,0,1,1), -- Unidentified Plant Parts +(19946,17057,25,1,0,1,1), -- Shiny Fish Scales +(19946,17058,20,1,0,1,1), -- Fish Oil +(19946,24476,15,1,0,1,1), -- Jaggal Clam +(19946,27858,3,1,0,1,3), -- Sunspring Carp +(19946,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(19946,13446,1,1,0,1,1), -- Major Healing Potion +(19946,13444,0.5,1,0,1,1), -- Major Mana Potion +(19946,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(19946,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Sorceress, NPC 19947 +-- --------------------------------------------------- +(19947,24280,-95,1,0,1,1), -- QItem: Naga Claws +(19947,24401,30,1,0,1,1), -- Unidentified Plant Parts +(19947,17057,25,1,0,1,1), -- Shiny Fish Scales +(19947,17058,20,1,0,1,1), -- Fish Oil +(19947,24476,15,1,0,1,1), -- Jaggal Clam +(19947,27858,3,1,0,1,3), -- Sunspring Carp +(19947,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(19947,13446,1,1,0,1,1), -- Major Healing Potion +(19947,13444,0.5,1,0,1,1), -- Major Mana Potion +(19947,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(19947,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Taskmaster, NPC 18086 +-- --------------------------------------------------- +(18086,24280,-80,1,0,1,1), -- QItem: Naga Claws +(18086,24401,30,1,0,1,1), -- Unidentified Plant Parts +(18086,17057,25,1,0,1,1), -- Shiny Fish Scales +(18086,17058,20,1,0,1,1), -- Fish Oil +(18086,24476,15,1,0,1,1), -- Jaggal Clam +(18086,27858,3,1,0,1,3), -- Sunspring Carp +(18086,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(18086,13446,1,1,0,1,1), -- Major Healing Potion +(18086,13444,0.5,1,0,1,1), -- Major Mana Potion +(18086,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18086,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Dreghood Drudge, NPC 18122 +-- --------------------------------------------------- +(18122,21877,60,1,0,1,3), -- Netherweave Cloth +(18122,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18122,27854,3,1,0,1,1), -- Smoked Talbuk Venison +(18122,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(18122,13446,1,1,0,1,1), -- Major Healing Potion +(18122,13444,0.5,1,0,1,1), -- Major Mana Potion +(18122,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Fen Strider, NPC 18134 +-- --------------------------------------------------- +(18134,25434,81,1,1,1,1), -- Fractured Carapace +(18134,25436,19,1,1,1,1), -- Twitching Leg +(18134,27676,50,1,0,1,1), -- Strange Spores +(18134,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18134,24427,20,1,0,1,1), -- QItem: Fen Strider Tentacle +(18134,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Fenclaw Thrasher, NPC 18214 +-- --------------------------------------------------- +(18214,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(18214,25431,19,1,1,1,1), -- Ripped Fin +(18214,24486,-50,1,0,1,1), -- QItem: Fenclaw Hide +(18214,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18214,24476,15,1,0,1,1), -- Jaggal Clam +(18214,24375,-15,1,0,1,1), -- QItem: Thick Hydra Scale +(18214,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Fenglow Stinger, NPC 20198 +-- --------------------------------------------------- +(20198,25434,80,1,1,1,1), -- Fractured Carapace +(20198,25436,20,1,1,1,1), -- Twitching Leg +(20198,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing +(20198,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20198,24485,-30,1,0,1,1), -- QItem: Marshlight Bleeder Venom +(20198,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Feralfen Druid, NPC 20270 +-- --------------------------------------------------- +(20270,24497,-25,1,0,1,1), -- QItem: Feralfen Protection Totem +(20270,21877,60,1,0,1,3), -- Netherweave Cloth +(20270,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(20270,28399,3,1,0,1,1), -- Filtered Draenic Water +(20270,13446,2,1,0,1,1), -- Major Healing Potion +(20270,13444,1,1,0,1,1), -- Major Mana Potion +(20270,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +(20270,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Feralfen Hunter, NPC 18113 +-- --------------------------------------------------- +(18113,24497,-10,1,0,1,1), -- QItem: Feralfen Protection Totem +(18113,21877,60,1,0,1,3), -- Netherweave Cloth +(18113,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18113,28399,3,1,0,1,1), -- Filtered Draenic Water +(18113,13446,2,1,0,1,1), -- Major Healing Potion +(18113,13444,1,1,0,1,1), -- Major Mana Potion +(18113,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18113,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Feralfen Mystic, NPC 18114 +-- --------------------------------------------------- +(18114,24497,-40,1,0,1,1), -- QItem: Feralfen Protection Totem +(18114,21877,60,1,0,1,3), -- Netherweave Cloth +(18114,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18114,28399,3,1,0,1,1), -- Filtered Draenic Water +(18114,13446,2,1,0,1,1), -- Major Healing Potion +(18114,13444,1,1,0,1,1), -- Major Mana Potion +(18114,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18114,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Fungal Giant, NPC 19734 +-- --------------------------------------------------- +(19734,25450,81,1,0,1,1), -- Creeping Moss +(19734,25452,19,1,1,1,1), -- Blighted Fungus +(19734,24401,25,1,0,1,1), -- Unidentified Plant Parts +(19734,22575,19,1,0,1,3), -- Mote of Life +(19734,12803,1,1,0,1,1), -- Living Essence +(19734,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Greater Sporebat, NPC 18129 +-- --------------------------------------------------- +(18129,25456,81,1,1,1,1), -- Glowing Spores +(18129,25454,19,1,1,1,1), -- Luminescent Globe +(18129,27676,50,1,0,1,1), -- Strange Spores +(18129,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18129,24401,26,1,0,1,1), -- Unidentified Plant Parts +(18129,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ironspine Gazer, NPC 19730 +-- --------------------------------------------------- +(19730,1701,80,1,1,1,1), -- Curved Basilisk Claw +(19730,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(19730,29553,2,1,1,1,1), -- Basilisk Guts +(19730,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(19730,27677,45,1,0,1,1), -- Chunk O'Basilisk +(19730,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ironspine Threshalisk, NPC 19729 +-- --------------------------------------------------- +(19729,1701,80,1,1,1,1), -- Curved Basilisk Claw +(19729,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(19729,29553,2,1,1,1,1), -- Basilisk Guts +(19729,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(19729,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Kataru, NPC 18080 +-- --------------------------------------------------- +(18080,21877,60,1,0,1,3), -- Netherweave Cloth +(18080,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18080,28399,3,1,0,1,1), -- Filtered Draenic Water +(18080,13446,2,1,0,1,1), -- Major Healing Potion +(18080,13444,1,1,0,1,1), -- Major Mana Potion +(18080,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Lagoon Eel, NPC 20290 +-- --------------------------------------------------- +(20290,28058,81,1,1,1,1), -- Shredded Wyrm Wing +(20290,28059,19,1,1,1,1), -- Iridescent Eye +(20290,22578,19,1,0,1,1), -- Mote of Water +(20290,7080,1,1,0,1,1), -- Essence of Water +(20290,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Lagoon Walker, NPC 20291 +-- --------------------------------------------------- +(20291,25450,82,1,0,1,1), -- Creeping Moss +(20291,25452,18,1,1,1,1), -- Blighted Fungus +(20291,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20291,22575,19,1,0,1,2), -- Mote of Life +(20291,12803,1.5,1,0,1,2), -- Living Essence +(20291,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Lord Klaq, NPC 18282 +-- --------------------------------------------------- +(18282,24401,30,1,0,1,1), -- Unidentified Plant Parts +(18282,17057,30,1,0,1,1), -- Shiny Fish Scales +(18282,17058,25,1,0,1,1), -- Fish Oil +(18282,24476,15,1,0,1,1), -- Jaggal Clam +(18282,27858,4,1,0,1,3), -- Sunspring Carp +(18282,28399,2,1,0,1,1), -- Filtered Draenic Water +(18282,13446,1,1,0,1,1), -- Major Healing Potion +(18282,13444,0.5,1,0,1,1), -- Major Mana Potion +(18282,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Mal'druk the Soulrender, NPC 20445 +-- --------------------------------------------------- +(20445,21877,72,1,0,1,3), -- Netherweave Cloth +(20445,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(20445,28399,8,1,0,1,1), -- Filtered Draenic Water +(20445,13446,2,1,0,1,1), -- Major Healing Potion +(20445,13444,1,1,0,1,1), -- Major Mana Potion +(20445,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Marsh Baron Brok, NPC 20292 +-- --------------------------------------------------- +(20292,25450,80,1,0,1,1), -- Creeping Moss +(20292,25452,20,1,1,1,1), -- Blighted Fungus +(20292,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20292,22575,19,1,0,1,2), -- Mote of Life +(20292,12803,1,1,0,1,2), -- Living Essence +(20292,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Marsh Dredger, NPC 18137 +-- --------------------------------------------------- +(18137,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18137,17057,33,1,0,1,1), -- Shiny Fish Scales +(18137,17058,30,1,0,1,1), -- Fish Oil +(18137,24476,20,1,0,1,1), -- Jaggal Clam +(18137,27858,4,1,0,1,3), -- Sunspring Carp +(18137,28399,2,1,0,1,1), -- Filtered Draenic Water +(18137,13446,1,1,0,1,1), -- Major Healing Potion +(18137,13444,0.5,1,0,1,1), -- Major Mana Potion +(18137,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18137,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Marsh Lurker, NPC 18136 +-- --------------------------------------------------- +(18136,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18136,17057,33,1,0,1,1), -- Shiny Fish Scales +(18136,17058,30,1,0,1,1), -- Fish Oil +(18136,24476,20,1,0,1,1), -- Jaggal Clam +(18136,27858,4,1,0,1,3), -- Sunspring Carp +(18136,28399,2,1,0,1,1), -- Filtered Draenic Water +(18136,13446,1,1,0,1,1), -- Major Healing Potion +(18136,13444,0.5,1,0,1,1), -- Major Mana Potion +(18136,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18136,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Marsh Walker, NPC 18135 +-- --------------------------------------------------- +(18135,25434,81,1,1,1,1), -- Fractured Carapace +(18135,25436,19,1,1,1,1), -- Twitching Leg +(18135,27676,50,1,0,1,1), -- Strange Spores +(18135,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18135,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Marshfang Ripper, NPC 18130 +-- --------------------------------------------------- +(18130,25434,81,1,1,1,1), -- Fractured Carapace +(18130,25436,19,1,1,1,1), -- Twitching Leg +(18130,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18130,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshfang Slicer, NPC 18131 +-- --------------------------------------------------- +(18131,24493,-100,1,0,1,1), -- QItem: Marshfang Slicer Blade +(18131,25434,81,1,1,1,1), -- Fractured Carapace +(18131,25436,19,1,1,1,1), -- Twitching Leg +(18131,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18131,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshlight Bleeder, NPC 18133 +-- --------------------------------------------------- +(18133,25434,80,1,1,1,1), -- Fractured Carapace +(18133,25436,20,1,1,1,1), -- Twitching Leg +(18133,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18133,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing +(18133,24485,-30,1,0,1,1), -- QItem: Marshlight Bleeder Venom +(18133,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshrock Stomper, NPC 20283 +-- --------------------------------------------------- +(20283,1701,80,1,1,1,1), -- Curved Basilisk Claw +(20283,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(20283,29553,2,1,1,1,1), -- Basilisk Guts +(20283,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(20283,27677,45,1,0,1,1), -- Chunk O'Basilisk +(20283,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshrock Threshalisk, NPC 19706 +-- --------------------------------------------------- +(19706,1701,81,1,1,1,1), -- Curved Basilisk Claw +(19706,11389,18,1,1,1,1), -- Shimmering Basilisk Sking +(19706,29553,1,1,1,1,1), -- Basilisk Guts +(19706,27677,50,1,0,1,1), -- Chunk O'Basilisk +(19706,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marticar, NPC 18680 +-- --------------------------------------------------- +(18680,31254,100,1,0,1,1), -- Striderhide Cloak +(18680,25456,80,1,1,2,4), -- Glowing Spores +(18680,25454,20,1,1,2,4), -- Luminescent Glove +-- --------------------------------------------------- +-- Mire Hydra, NPC 18213 +-- --------------------------------------------------- +(18213,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(18213,25431,19,1,1,1,1), -- Ripped Fin +(18213,24375,-100,1,0,1,1), -- QItem: Thick Hydra Scale +(18213,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18213,24476,15,1,0,1,1), -- Jaggal Clam +(18213,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Mragesh, NPC 18286 +-- --------------------------------------------------- +(18286,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(18286,25431,19,1,1,1,1), -- Ripped Fin +(18286,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18286,24476,15,1,0,1,1), -- Jaggal Clam +(18286,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Mudfin Frenzy, NPC 18212 +-- --------------------------------------------------- +(18212,25429,80,1,1,1,1), -- Grime-Encrusted Scale +(18212,25431,20,1,1,1,1), -- Ripped Fin +(18212,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18212,1,10,1,0,-4000,1), -- Grey lvl 61 Item +(18212,2,10,1,0,-4001,1), -- Grey lvl 64 Item +-- --------------------------------------------------- +-- Overlord Gorefist, NPC 18160 +-- --------------------------------------------------- +(18160,24240,-20,1,0,1,1), -- QItem: Box of Mushrooms +(18160,21877,55,1,0,1,3), -- Netherweave Cloth +(18160,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18160,28399,3,1,0,1,1), -- Filtered Draenic Water +(18160,13446,2,1,0,1,1), -- Major Healing Potion +(18160,13444,1,1,0,1,1), -- Major Mana Potion +(18160,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Parched Hydra, NPC 20324 +-- --------------------------------------------------- +(20324,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(20324,25431,19,1,1,1,1), -- Ripped Fin +(20324,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20324,24375,-100,1,0,1,1), -- QItem: Thick Hydra Scale +(20324,24476,15,1,0,1,1), -- Jaggal Clam +(20324,29480,-15,1,0,1,1), -- QItem: Parched Hydra Sample +(20324,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ragestone Threshalisk, NPC 20279 +-- --------------------------------------------------- +(20279,1701,80,1,1,1,1), -- Curved Basilisk Claw +(20279,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(20279,29553,2,1,1,1,1), -- Basilisk Guts +(20279,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(20279,27677,45,1,0,1,1), -- Chunk O'Basilisk +(20279,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Ragestone Trampler, NPC 20280 +-- --------------------------------------------------- +(20280,1701,80,1,1,1,1), -- Curved Basilisk Claw +(20280,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(20280,29553,2,1,1,1,1), -- Basilisk Guts +(20280,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(20280,27677,45,1,0,1,1), -- Chunk O'Basilisk +(20280,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Rajah Haghazed, NPC 18046 +-- --------------------------------------------------- +(18046,24280,-65,1,0,1,1), -- QItem: Naga Claws +(18046,24476,26,1,0,1,1), -- Jaggal Clam +(18046,17057,25,1,0,1,1), -- Shiny Fish Scales +(18046,17058,20,1,0,1,1), -- Fish Oil +(18046,27858,4,1,0,1,3), -- Sunspring Carp +(18046,28399,2,1,0,1,1), -- Filtered Draenic Water +(18046,13446,1,1,0,1,1), -- Major Healing Potion +(18046,13444,0.5,1,0,1,1), -- Major Mana Potion +(18046,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Rajis Fyashe, NPC 18044 +-- --------------------------------------------------- +(18044,24280,-65,1,0,1,1), -- QItem: Naga Claws +(18044,24476,26,1,0,1,1), -- Jaggal Clam +(18044,17057,25,1,0,1,1), -- Shiny Fish Scales +(18044,17058,20,1,0,1,1), -- Fish Oil +(18044,27858,4,1,0,1,3), -- Sunspring Carp +(18044,28399,2,1,0,1,1), -- Filtered Draenic Water +(18044,13446,1,1,0,1,1), -- Major Healing Potion +(18044,13444,0.5,1,0,1,1), -- Major Mana Potion +(18044,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Sporebat, NPC 18128 +-- --------------------------------------------------- +(18128,25456,80,1,1,1,1), -- Glowing Spores +(18128,25454,20,1,1,1,1), -- Luminescent Globe +(18128,27676,50,1,0,1,1), -- Strange Spores +(18128,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18128,24401,26,1,0,1,1), -- Unidentified Plant Parts +(18128,24426,-20,1,0,1,1), -- QItem: Sporebat Eye +(18128,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Sporewing, NPC 18280 +-- --------------------------------------------------- +(18280,25456,80,1,1,1,1), -- Glowing Spores +(18280,25454,20,1,1,1,1), -- Luminescent Globe +(18280,27676,50,1,0,1,1), -- Strange Spores +(18280,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18280,24401,26,1,0,1,1), -- Unidentified Plant Parts +(18280,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Ssslith, NPC 18154 +-- --------------------------------------------------- +(18154,24476,30,1,0,1,1), -- Jaggal Clam +(18154,17057,25,1,0,1,1), -- Shiny Fish Scales +(18154,17058,20,1,0,1,1), -- Fish Oil +(18154,27858,4,1,0,1,3), -- Sunspring Carp +(18154,28399,2,1,0,1,1), -- Filtered Draenic Water +(18154,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Starving Bog Lord, NPC 19519 +-- --------------------------------------------------- +(19519,25450,80,1,0,1,1), -- Creeping Moss +(19519,25452,20,1,1,1,1), -- Blighted Fungus +(19519,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril +(19519,24401,25,1,0,1,1), -- Unidentified Plant Parts +(19519,22575,19,1,0,1,1), -- Mote of Life +(19519,12803,1,1,0,1,1), -- Living Essence +(19519,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Starving Fungal Giant, NPC 18125 +-- --------------------------------------------------- +(18125,25450,80,1,0,1,1), -- Creeping Moss +(18125,25452,20,1,1,1,1), -- Blighted Fungus +(18125,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril +(18125,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18125,22575,19,1,0,1,1), -- Mote of Life +(18125,12803,1,1,0,1,1), -- Living Essence +(18125,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Steam Pump Overseer, NPC 18340 +-- --------------------------------------------------- +(18340,24280,-45,1,0,1,1), -- QItem: Naga Claws +(18340,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18340,17057,30,1,0,1,1), -- Shiny Fish Scales +(18340,17058,25,1,0,1,1), -- Fish Oil +(18340,24476,15,1,0,1,1), -- Jaggal Clam +(18340,24330,-40,1,0,1,1), -- QItem: Drain Schematics +(18340,27858,4,1,0,1,3), -- Sunspring Carp +(18340,28399,2,1,0,1,1), -- Filtered Draenic Water +(18340,13446,1.5,1,0,1,1), -- Major Healing Potion +(18340,13444,0.75,1,0,1,1), -- Major Mana Potion +(18340,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18340,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Terrorclaw, NPC 20477 +-- --------------------------------------------------- +(20477,17057,34,1,0,1,1), -- Shiny Fish Scales +(20477,24401,34,1,0,1,1), -- Unidentified Plant Parts +(20477,17058,30,1,0,1,1), -- Fish Oil +(20477,24476,20,1,0,1,1), -- Jaggal Clam +(20477,27858,4,1,0,1,3), -- Sunspring Carp +(20477,28399,2,1,0,1,1), -- Filtered Draenic Water +(20477,13446,1.5,1,0,1,1), -- Major Healing Potion +(20477,13444,0.75,1,0,1,1), -- Major Mana Potion +(20477,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Eel, NPC 18138 +-- --------------------------------------------------- +(18138,25429,80,1,1,1,1), -- Grime-Encrusted Scale +(18138,25431,20,1,1,1,1), -- Ripped Fin +(18138,24374,-40,1,0,1,1), -- QItem: Eel Filet +(18138,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Oracle, NPC 18077 +-- --------------------------------------------------- +(18077,21877,80,1,0,1,3), -- Netherweave Cloth +(18077,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18077,28399,4,1,0,1,1), -- Filtered Draenic Water +(18077,13446,2,1,0,1,1), -- Major Healing Potion +(18077,13444,1,1,0,1,1), -- Major Mana Potion +(18077,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18077,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Seer, NPC 18079 +-- --------------------------------------------------- +(18079,21877,80,1,0,1,3), -- Netherweave Cloth +(18079,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18079,28399,4,1,0,1,1), -- Filtered Draenic Water +(18079,13446,2,1,0,1,1), -- Major Healing Potion +(18079,13444,1,1,0,1,1), -- Major Mana Potion +(18079,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18079,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Witchdoctor, NPC 20115 +-- --------------------------------------------------- +(20115,21877,80,1,0,1,3), -- Netherweave Cloth +(20115,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(20115,28399,4,1,0,1,1), -- Filtered Draenic Water +(20115,13446,2,1,0,1,1), -- Major Healing Potion +(20115,13444,1,1,0,1,1), -- Major Mana Potion +(20115,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(20115,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbraglow Stinger, NPC 18132 +-- --------------------------------------------------- +(18132,25434,80,1,1,1,1), -- Fractured Carapace +(18132,25436,20,1,1,1,1), -- Twitching Leg +(18132,24372,-40,1,0,1,1), -- QItem: Diaphanous Wing +(18132,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Withered Bog Lord, NPC 19402 +-- --------------------------------------------------- +(19402,25450,80,1,0,1,1), -- Creeping Moss +(19402,25452,20,1,1,1,1), -- Blighted Fungus +(19402,24291,-30,1,0,1,1), -- QItem: Bog Lord Tendril +(19402,24401,25,1,0,1,1), -- Unidentified Plant Parts +(19402,22575,19,1,0,1,1), -- Mote of Life +(19402,29481,-15,1,0,1,1), -- QItem: Withered Bog Lord Sample +(19402,12803,1,1,0,1,1), -- Living Essence +(19402,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Withered Giant, NPC 18124 +-- --------------------------------------------------- +(18124,25450,80,1,0,1,1), -- Creeping Moss +(18124,25452,20,1,1,1,1), -- Blighted Fungus +(18124,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18124,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril +(18124,22575,19,1,0,1,1), -- Mote of Life +(18124,24373,-5,1,0,1,1), -- QItem: Scout Jyoba's Report +(18124,24483,2,1,0,1,1), -- Withered Basidium Ally +(18124,24484,2,1,0,1,1), -- Withered Basidium Horde +(18124,12803,1,1,0,1,1), -- Living Essence +(18124,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Wrekt Slave, NPC 18123 +-- --------------------------------------------------- +(18123,21877,75,1,0,1,3), -- Netherweave Cloth +(18123,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18123,28399,4,1,0,1,1), -- Filtered Draenic Water +(18123,13446,2,1,0,1,1), -- Major Healing Potion +(18123,13444,1,1,0,1,1), -- Major Mana Potion +(18123,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18123,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Young Sporebat, NPC 20387 +-- --------------------------------------------------- +(20387,25456,80,1,1,1,1), -- Glowing Spores +(20387,25454,20,1,1,1,1), -- Luminescent Globe +(20387,27676,50,1,0,1,1), -- Strange Spores +(20387,24401,26,1,0,1,1), -- Unidentified Plant Parts +(20387,1,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot (YES FOR ZM) \ No newline at end of file diff --git a/sql/updates/world/2012_06_02_03_reference_loot_template.sql b/sql/updates/world/2012_06_02_03_reference_loot_template.sql new file mode 100644 index 00000000000..c712cbe18bd --- /dev/null +++ b/sql/updates/world/2012_06_02_03_reference_loot_template.sql @@ -0,0 +1,791 @@ +SET @Grey := 1001; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Grey AND @Grey+53; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- level 52 Grey Items ilvl 57 +(@Grey+51,3951,0,1,1,1,1), -- Twill Vest +(@Grey+51,3976,0,1,1,1,1), -- Smooth Leather Armor +(@Grey+51,3995,0,1,1,1,1), -- Laminated Scale Cloak +(@Grey+51,8081,0,1,1,1,1), -- Light Plate Belt +(@Grey+51,8753,0,1,1,1,1), -- Smooth Leather Helmet +(@Grey+51,9186,0,1,1,1,1), -- Mind-numbing Poison III +(@Grey+51,13821,0,1,1,1,1), -- Bulky Maul +(@Grey+51,13825,0,1,1,1,1), -- Primed Musket +-- level 53 Grey Items ilvl 58 +(@Grey+52,3948,0,1,1,1,1), -- Twill Gloves +(@Grey+52,3973,0,1,1,1,1), -- Smooth Leather Gloves +(@Grey+52,3994,0,1,1,1,1), -- Laminated Scale Bracers +(@Grey+52,8080,0,1,1,1,1), -- Light Plate Chestpiece +(@Grey+52,13817,0,1,1,1,1); -- Tapered Greatsword +-- -------------------------------------------------------- +-- TBC_Greys_References +-- -------------------------------------------------------- +SET @GreyTBC := 4000; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GreyTBC AND @GreyTBC+2; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- level 61 Greys, ilvl 66 (32 items) +(@GreyTBC,24576,0,1,1,1,1), -- Loosely Threaded Belt +(@GreyTBC,24577,0,1,1,1,1), -- Loosely Threaded Boots +(@GreyTBC,24578,0,1,1,1,1), -- Loosely Threaded Bracers +(@GreyTBC,24580,0,1,1,1,1), -- Loosely Threaded Hat +(@GreyTBC,24782,0,1,1,1,1), -- Loosely Threaded Gloves +(@GreyTBC,25338,0,1,1,1,1), -- Loosely Threaded Pants +(@GreyTBC,25339,0,1,1,1,1), -- Loosely Threaded Shoulderpads +(@GreyTBC,25340,0,1,1,1,1), -- Loosely Threaded Vest +(@GreyTBC,25349,0,1,1,1,1), -- Moldy Leather Armor +(@GreyTBC,25350,0,1,1,1,1), -- Moldy Leather Belt +(@GreyTBC,25351,0,1,1,1,1), -- Moldy Leather Boots +(@GreyTBC,25352,0,1,1,1,1), -- Moldy Leather Bracers +(@GreyTBC,25353,0,1,1,1,1), -- Moldy Leather Gloves +(@GreyTBC,25354,0,1,1,1,1), -- Moldy Leather Helmet +(@GreyTBC,25355,0,1,1,1,1), -- Moldy Leather Pants +(@GreyTBC,25356,0,1,1,1,1), -- Moldy Leather Shoulderpads +(@GreyTBC,25365,0,1,1,1,1), -- Eroded Mail Armor +(@GreyTBC,25366,0,1,1,1,1), -- Eroded Mail Belt +(@GreyTBC,25367,0,1,1,1,1), -- Eroded Mail Boots +(@GreyTBC,25368,0,1,1,1,1), -- Eroded Mail Bracers +(@GreyTBC,25369,0,1,1,1,1), -- Eroded Mail Circlet +(@GreyTBC,25370,0,1,1,1,1), -- Eroded Mail Gloves +(@GreyTBC,25371,0,1,1,1,1), -- Eroded Mail Pants +(@GreyTBC,25372,0,1,1,1,1), -- Eroded Mail Shoulderpads +(@GreyTBC,25381,0,1,1,1,1), -- Tarnished Plate Belt +(@GreyTBC,25382,0,1,1,1,1), -- Tarnished Plate Boots +(@GreyTBC,25383,0,1,1,1,1), -- Tarnished Plate Bracers +(@GreyTBC,25384,0,1,1,1,1), -- Tarnished Plate Chestpiece +(@GreyTBC,25385,0,1,1,1,1), -- Tarnished Plate Gloves +(@GreyTBC,25386,0,1,1,1,1), -- Tarnished Plate Helmet +(@GreyTBC,25387,0,1,1,1,1), -- Tarnished Plate Pants +(@GreyTBC,25388,0,1,1,1,1), -- Tarnished Plate Shoulderpads +-- level 64 Greys, ilvl 69 (10 items) +(@GreyTBC+1,25397,0,1,1,1,1), -- Eroded Axe +(@GreyTBC+1,25398,0,1,1,1,1), -- Stone Reaper +(@GreyTBC+1,25399,0,1,1,1,1), -- Deteriorating Blade +(@GreyTBC+1,25400,0,1,1,1,1), -- Tarnished Claymore +(@GreyTBC+1,25401,0,1,1,1,1), -- Corroded Mace +(@GreyTBC+1,25402,0,1,1,1,1), -- The Stoppable Force +(@GreyTBC+1,25403,0,1,1,1,1), -- Sharpened Stilleto +(@GreyTBC+1,25404,0,1,1,1,1), -- Dense War Staff +(@GreyTBC+1,25405,0,1,1,1,1), -- Rusted Musket +(@GreyTBC+1,25406,0,1,1,1,1), -- Broken Longbow +-- lvl 67 Greys, ilvl 72 (32 items) +(@GreyTBC+2,25341,0,1,1,1,1), -- Dilapidated Cloth Belt +(@GreyTBC+2,25342,0,1,1,1,1), -- Dilapidated Cloth Boots +(@GreyTBC+2,25343,0,1,1,1,1), -- Dilapidated Cloth Bracers +(@GreyTBC+2,25344,0,1,1,1,1), -- Dilapidated Cloth Gloves +(@GreyTBC+2,25345,0,1,1,1,1), -- Dilapidated Cloth Hat +(@GreyTBC+2,25346,0,1,1,1,1), -- Dilapidated Cloth Pants +(@GreyTBC+2,25347,0,1,1,1,1), -- Dilapidated Cloth Shoulderpads +(@GreyTBC+2,25348,0,1,1,1,1), -- Dilapidated Cloth Vest +(@GreyTBC+2,25357,0,1,1,1,1), -- Decaying Leather Armor +(@GreyTBC+2,25358,0,1,1,1,1), -- Decaying Leather Belt +(@GreyTBC+2,25359,0,1,1,1,1), -- Decaying Leather Boots +(@GreyTBC+2,25360,0,1,1,1,1), -- Decaying Leather Bracers +(@GreyTBC+2,25361,0,1,1,1,1), -- Decaying Leather Gloves +(@GreyTBC+2,25362,0,1,1,1,1), -- Decaying Leather Helmet +(@GreyTBC+2,25363,0,1,1,1,1), -- Decaying Leather Pants +(@GreyTBC+2,25364,0,1,1,1,1), -- Decaying Leather Shoulderpads +(@GreyTBC+2,25373,0,1,1,1,1), -- Corroded Mail Armor +(@GreyTBC+2,25374,0,1,1,1,1), -- Corroded Mail Belt +(@GreyTBC+2,25375,0,1,1,1,1), -- Corroded Mail Boots +(@GreyTBC+2,25376,0,1,1,1,1), -- Corroded Mail Bracers +(@GreyTBC+2,25377,0,1,1,1,1), -- Corroded Mail Circlet +(@GreyTBC+2,25378,0,1,1,1,1), -- Corroded Mail Gloves +(@GreyTBC+2,25379,0,1,1,1,1), -- Corroded Mail Pants +(@GreyTBC+2,25380,0,1,1,1,1), -- Corroded Mail Shoulderpads +(@GreyTBC+2,25389,0,1,1,1,1), -- Deteriorating Plate Belt +(@GreyTBC+2,25390,0,1,1,1,1), -- Deteriorating Plate Boots +(@GreyTBC+2,25391,0,1,1,1,1), -- Deteriorating Plate Bracers +(@GreyTBC+2,25392,0,1,1,1,1), -- Deteriorating Plate Chestpiece +(@GreyTBC+2,25393,0,1,1,1,1), -- Deteriorating Plate Gloves +(@GreyTBC+2,25394,0,1,1,1,1), -- Deteriorating Plate Helmet +(@GreyTBC+2,25395,0,1,1,1,1), -- Deteriorating Plate Pants +(@GreyTBC+2,25396,0,1,1,1,1); -- Deteriorating Plate Shoulderpads +-- -------------------------------------------------------- +-- TBC_Greens_References +-- -------------------------------------------------------- +SET @GreenTBC := 4100; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GreenTBC AND @GreenTBC+13; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- lvl 57 ilvl 81 greens (55 items) TBC +(@GreenTBC,25296,0,1,1,1,1), -- Absorption Dagger +(@GreenTBC,25324,0,1,1,1,1), -- Angerstaff +(@GreenTBC,25058,0,1,1,1,1), -- Anglesite Choker +(@GreenTBC,25240,0,1,1,1,1), -- Azerothian Longbow +(@GreenTBC,28531,0,1,1,1,1), -- Barbed Shrike +(@GreenTBC,24700,0,1,1,1,1), -- Bonechewer Bands +(@GreenTBC,24695,0,1,1,1,1), -- Bonechewer Chestpiece +(@GreenTBC,24693,0,1,1,1,1), -- Bonechewer Pelt-Girdle +(@GreenTBC,24698,0,1,1,1,1), -- Bonechewer Ripleggings +(@GreenTBC,24699,0,1,1,1,1), -- Bonechewer Shoulderguards +(@GreenTBC,24694,0,1,1,1,1), -- Bonechewer Shredboots +(@GreenTBC,24697,0,1,1,1,1), -- Bonechewer Skincloak +(@GreenTBC,24696,0,1,1,1,1), -- Bonechewer Spikegloves +(@GreenTBC,25114,0,1,1,1,1), -- Doomsayer's Mace +(@GreenTBC,25086,0,1,1,1,1), -- Dreamseeker Dandelion +(@GreenTBC,24920,0,1,1,1,1), -- Grimscale Armor +(@GreenTBC,24918,0,1,1,1,1), -- Grimscale Belt +(@GreenTBC,24921,0,1,1,1,1), -- Grimscale Gauntlets +(@GreenTBC,24922,0,1,1,1,1), -- Grimscale Helm +(@GreenTBC,24923,0,1,1,1,1), -- Grimscale Legguards +(@GreenTBC,24924,0,1,1,1,1), -- Grimscale Pauldrons +(@GreenTBC,24919,0,1,1,1,1), -- Grimscale Sabatons +(@GreenTBC,24925,0,1,1,1,1), -- Grimscale Vambraces +(@GreenTBC,25198,0,1,1,1,1), -- Karaborian Battle Axe +(@GreenTBC,25268,0,1,1,1,1), -- Lead-Slug Shotgun +(@GreenTBC,25100,0,1,1,1,1), -- Liege Blade +(@GreenTBC,25212,0,1,1,1,1), -- Lucky Strike Axe +(@GreenTBC,25282,0,1,1,1,1), -- Mahogany Wand +(@GreenTBC,25310,0,1,1,1,1), -- Naaru Lightmace +(@GreenTBC,25072,0,1,1,1,1), -- Northman's Shield +(@GreenTBC,24582,0,1,1,1,1), -- Outlander's Boots +(@GreenTBC,24588,0,1,1,1,1), -- Outlander's Bracers +(@GreenTBC,24585,0,1,1,1,1), -- Outlander's Facewrap +(@GreenTBC,24575,0,1,1,1,1), -- Outlander's Girdle +(@GreenTBC,24584,0,1,1,1,1), -- Outlander's Gloves +(@GreenTBC,24586,0,1,1,1,1), -- Outlander's Leggings +(@GreenTBC,24587,0,1,1,1,1), -- Outlander's Pauldrons +(@GreenTBC,24583,0,1,1,1,1), -- Outlander's Tunic +(@GreenTBC,25170,0,1,1,1,1), -- Rattan Bo Staff +(@GreenTBC,25184,0,1,1,1,1), -- Ravager Claws +(@GreenTBC,25156,0,1,1,1,1), -- Royal Crusader Sword +(@GreenTBC,25044,0,1,1,1,1), -- Rubellite Ring +(@GreenTBC,25128,0,1,1,1,1), -- Shining Mace +(@GreenTBC,25030,0,1,1,1,1), -- Silky Velvet Cloak +(@GreenTBC,25142,0,1,1,1,1), -- Telaari Longblade +(@GreenTBC,25254,0,1,1,1,1), -- Tower Crossbow +(@GreenTBC,24813,0,1,1,1,1), -- Unyielding Bindings +(@GreenTBC,24808,0,1,1,1,1), -- Unyielding Chain Vest +(@GreenTBC,24809,0,1,1,1,1), -- Unyielding Fists +(@GreenTBC,24807,0,1,1,1,1), -- Unyielding Footwraps +(@GreenTBC,24810,0,1,1,1,1), -- Unyielding Helm +(@GreenTBC,24811,0,1,1,1,1), -- Unyielding Leggings +(@GreenTBC,24812,0,1,1,1,1), -- Unyielding Spaulders +(@GreenTBC,24806,0,1,1,1,1), -- Unyielding Waistband +(@GreenTBC,25226,0,1,1,1,1), -- War Scythe +-- lvl 58 ilvl 84 greens (55 items) TBC +(@GreenTBC+1,24926,0,1,1,1,1), -- Ango'rosh Belt +(@GreenTBC+1,24928,0,1,1,1,1), -- Ango'rosh Breastplate +(@GreenTBC+1,24929,0,1,1,1,1), -- Ango'rosh Gauntlets +(@GreenTBC+1,24930,0,1,1,1,1), -- Ango'rosh Helm +(@GreenTBC+1,24931,0,1,1,1,1), -- Ango'rosh Legguards +(@GreenTBC+1,24932,0,1,1,1,1), -- Ango'rosh Pauldrons +(@GreenTBC+1,24927,0,1,1,1,1), -- Ango'rosh Sabatons +(@GreenTBC+1,24933,0,1,1,1,1), -- Ango'rosh Vambraces +(@GreenTBC+1,25241,0,1,1,1,1), -- Ashenvale Longbow +(@GreenTBC+1,25045,0,1,1,1,1), -- Azurite Ring +(@GreenTBC+1,25087,0,1,1,1,1), -- Bleeding Eye +(@GreenTBC+1,25325,0,1,1,1,1), -- Brutal Scar-Limb +(@GreenTBC+1,25101,0,1,1,1,1), -- Cross Pommel Dagger +(@GreenTBC+1,25283,0,1,1,1,1), -- Crystallized Ebony Wand +(@GreenTBC+1,25073,0,1,1,1,1), -- Emperor Shield +(@GreenTBC+1,24821,0,1,1,1,1), -- Felstone Bindings +(@GreenTBC+1,24816,0,1,1,1,1), -- Felstone Chain Vest +(@GreenTBC+1,24817,0,1,1,1,1), -- Felstone Gauntlets +(@GreenTBC+1,24815,0,1,1,1,1), -- Felstone Greaves +(@GreenTBC+1,24818,0,1,1,1,1), -- Felstone Helm +(@GreenTBC+1,24819,0,1,1,1,1), -- Felstone Leggings +(@GreenTBC+1,24820,0,1,1,1,1), -- Felstone Spaulders +(@GreenTBC+1,24814,0,1,1,1,1), -- Felstone Waistband +(@GreenTBC+1,25213,0,1,1,1,1), -- Fel-Touched Axe +(@GreenTBC+1,25059,0,1,1,1,1), -- Fire Opal Collar +(@GreenTBC+1,24590,0,1,1,1,1), -- Fireheart Boots +(@GreenTBC+1,24596,0,1,1,1,1), -- Fireheart Bracers +(@GreenTBC+1,24591,0,1,1,1,1), -- Fireheart Chestpiece +(@GreenTBC+1,24589,0,1,1,1,1), -- Fireheart Girdle +(@GreenTBC+1,24592,0,1,1,1,1), -- Fireheart Gloves +(@GreenTBC+1,24594,0,1,1,1,1), -- Fireheart Leggings +(@GreenTBC+1,24595,0,1,1,1,1), -- Fireheart Shoulderpads +(@GreenTBC+1,24593,0,1,1,1,1), -- Fireheart Skullcap +(@GreenTBC+1,25129,0,1,1,1,1), -- Giant's Leg Bone +(@GreenTBC+1,24708,0,1,1,1,1), -- Haal'eshi Bindings +(@GreenTBC+1,24702,0,1,1,1,1), -- Haal'eshi Boots +(@GreenTBC+1,24701,0,1,1,1,1), -- Haal'eshi Cord +(@GreenTBC+1,24704,0,1,1,1,1), -- Haal'eshi Gloves +(@GreenTBC+1,24705,0,1,1,1,1), -- Haal'eshi Hat +(@GreenTBC+1,24703,0,1,1,1,1), -- Haal'eshi Jerkin +(@GreenTBC+1,24706,0,1,1,1,1), -- Haal'eshi Leggings +(@GreenTBC+1,24707,0,1,1,1,1), -- Haal'eshi Pauldrons +(@GreenTBC+1,25199,0,1,1,1,1), -- Knight's War Axe +(@GreenTBC+1,25269,0,1,1,1,1), -- Longbeard Rifle +(@GreenTBC+1,25255,0,1,1,1,1), -- Ram's Head Crossbow +(@GreenTBC+1,25311,0,1,1,1,1), -- Revitalizing Hammer +(@GreenTBC+1,25115,0,1,1,1,1), -- Riversong Mace +(@GreenTBC+1,25157,0,1,1,1,1), -- Serpentlord Claymore +(@GreenTBC+1,25227,0,1,1,1,1), -- Sha'tari Longspear +(@GreenTBC+1,25143,0,1,1,1,1), -- Silver Hand Blade +(@GreenTBC+1,28532,0,1,1,1,1), -- Silver Throwing Knives +(@GreenTBC+1,25031,0,1,1,1,1), -- Silvermoon Royal Cloak +(@GreenTBC+1,25171,0,1,1,1,1), -- Straight Hardwood Staff +(@GreenTBC+1,25185,0,1,1,1,1), -- Thrasher Blades +(@GreenTBC+1,25297,0,1,1,1,1), -- Tuning Knife +-- lvl 59 ilvl 87 greens (55 items) TBC +(@GreenTBC+2,25298,0,1,1,1,1), -- Combustion Dagger +(@GreenTBC+2,24934,0,1,1,1,1), -- Darkcrest Belt +(@GreenTBC+2,24941,0,1,1,1,1), -- Darkcrest Bracers +(@GreenTBC+2,24936,0,1,1,1,1), -- Darkcrest Breastplate +(@GreenTBC+2,24937,0,1,1,1,1), -- Darkcrest Gauntlets +(@GreenTBC+2,24938,0,1,1,1,1), -- Darkcrest Helm +(@GreenTBC+2,24939,0,1,1,1,1), -- Darkcrest Legguards +(@GreenTBC+2,24940,0,1,1,1,1), -- Darkcrest Pauldrons +(@GreenTBC+2,24935,0,1,1,1,1), -- Darkcrest Sabatons +(@GreenTBC+2,25312,0,1,1,1,1), -- Glorious Scepter +(@GreenTBC+2,25270,0,1,1,1,1), -- Gnomish Assault Rifle +(@GreenTBC+2,25130,0,1,1,1,1), -- Gronn-Bone Club +(@GreenTBC+2,25228,0,1,1,1,1), -- Halberd Polearm +(@GreenTBC+2,25032,0,1,1,1,1), -- Hellfire Cloak +(@GreenTBC+2,25102,0,1,1,1,1), -- Jaedenis Dagger +(@GreenTBC+2,25200,0,1,1,1,1), -- Jagged Broadaxe +(@GreenTBC+2,25172,0,1,1,1,1), -- Jinbali Warp-Staff +(@GreenTBC+2,25088,0,1,1,1,1), -- Laughing Skull Orb +(@GreenTBC+2,25214,0,1,1,1,1), -- Mok'Nathal Battleaxe +(@GreenTBC+2,24824,0,1,1,1,1), -- Netherstalker Armor +(@GreenTBC+2,24822,0,1,1,1,1), -- Netherstalker Belt +(@GreenTBC+2,24829,0,1,1,1,1), -- Netherstalker Bracer +(@GreenTBC+2,24825,0,1,1,1,1), -- Netherstalker Gloves +(@GreenTBC+2,24823,0,1,1,1,1), -- Netherstalker Greaves +(@GreenTBC+2,24826,0,1,1,1,1), -- Netherstalker Helmet +(@GreenTBC+2,24827,0,1,1,1,1), -- Netherstalker Legguards +(@GreenTBC+2,24828,0,1,1,1,1), -- Netherstalker Mantle +(@GreenTBC+2,25116,0,1,1,1,1), -- Pneumatic War Hammer +(@GreenTBC+2,25326,0,1,1,1,1), -- Primal Lore-Staff +(@GreenTBC+2,25284,0,1,1,1,1), -- Purpleheart Wand +(@GreenTBC+2,25158,0,1,1,1,1), -- Skeletal Broadsword +(@GreenTBC+2,25144,0,1,1,1,1), -- Skettis Curved Blade +(@GreenTBC+2,25046,0,1,1,1,1), -- Spined Ring +(@GreenTBC+2,24601,0,1,1,1,1), -- Starfire Circlet +(@GreenTBC+2,24600,0,1,1,1,1), -- Starfire Gloves +(@GreenTBC+2,24603,0,1,1,1,1), -- Starfire Mantle +(@GreenTBC+2,24598,0,1,1,1,1), -- Starfire Sandals +(@GreenTBC+2,24597,0,1,1,1,1), -- Starfire Sash +(@GreenTBC+2,24602,0,1,1,1,1), -- Starfire Trousers +(@GreenTBC+2,24599,0,1,1,1,1), -- Starfire Vest +(@GreenTBC+2,24604,0,1,1,1,1), -- Starfire Wristwraps +(@GreenTBC+2,25256,0,1,1,1,1), -- Stronghold Crossbow +(@GreenTBC+2,25060,0,1,1,1,1), -- Sunstone Necklace +(@GreenTBC+2,25242,0,1,1,1,1), -- Telaari Longbow +(@GreenTBC+2,25074,0,1,1,1,1), -- Telaari Shield +(@GreenTBC+2,25186,0,1,1,1,1), -- Vampiric Handscythes +(@GreenTBC+2,24716,0,1,1,1,1), -- Vengeance Bands +(@GreenTBC+2,24709,0,1,1,1,1), -- Vengeance Belt +(@GreenTBC+2,24710,0,1,1,1,1), -- Vengeance Boots +(@GreenTBC+2,24711,0,1,1,1,1), -- Vengeance Chestpiece +(@GreenTBC+2,24712,0,1,1,1,1), -- Vengeance Gloves +(@GreenTBC+2,24713,0,1,1,1,1), -- Vengeance Helm +(@GreenTBC+2,24714,0,1,1,1,1), -- Vengeance Legguards +(@GreenTBC+2,24715,0,1,1,1,1), -- Vengeance Pauldrons +(@GreenTBC+2,28533,0,1,1,1,1), -- Wooden Boomerang +-- lvl 60 ilvl 90 greens (51 items) TBC +(@GreenTBC+3,24605,0,1,1,1,1), -- Laughing Skull Waistguard +(@GreenTBC+3,24606,0,1,1,1,1), -- Laughing Skull Boot +(@GreenTBC+3,24607,0,1,1,1,1), -- Laughing Skull Tunic +(@GreenTBC+3,24608,0,1,1,1,1), -- Laughing Skull Gloves +(@GreenTBC+3,24609,0,1,1,1,1), -- Laughing Skull Cap +(@GreenTBC+3,24610,0,1,1,1,1), -- Laughing Skull Pants +(@GreenTBC+3,24611,0,1,1,1,1), -- Laughing Skull Shoulderpads +(@GreenTBC+3,24612,0,1,1,1,1), -- Laughing Skull Bracelets +(@GreenTBC+3,24717,0,1,1,1,1), -- Dreghood Belt +(@GreenTBC+3,24718,0,1,1,1,1), -- Dreghood Boots +(@GreenTBC+3,24719,0,1,1,1,1), -- Dreghood Chestpiece +(@GreenTBC+3,24720,0,1,1,1,1), -- Dreghood Gloves +(@GreenTBC+3,24721,0,1,1,1,1), -- Dreghood Cowl +(@GreenTBC+3,24722,0,1,1,1,1), -- Dreghood Trousers +(@GreenTBC+3,24723,0,1,1,1,1), -- Dreghood Pauldrons +(@GreenTBC+3,24724,0,1,1,1,1), -- Dreghood Bands +(@GreenTBC+3,24830,0,1,1,1,1), -- Nexus-Strider Belt +(@GreenTBC+3,24831,0,1,1,1,1), -- Nexus-Strider Greaves +(@GreenTBC+3,24832,0,1,1,1,1), -- Nexus-Strider Breastplate +(@GreenTBC+3,24833,0,1,1,1,1), -- Nexus-Strider Gloves +(@GreenTBC+3,24834,0,1,1,1,1), -- Nexus-Strider Helmet +(@GreenTBC+3,24835,0,1,1,1,1), -- Nexus-Strider Legwraps +(@GreenTBC+3,24836,0,1,1,1,1), -- Nexus-Strider Mantle +(@GreenTBC+3,24837,0,1,1,1,1), -- Nexus-Strider Bracer +(@GreenTBC+3,24942,0,1,1,1,1), -- Bloodscale Belt +(@GreenTBC+3,24943,0,1,1,1,1), -- Bloodscale Sabatons +(@GreenTBC+3,24944,0,1,1,1,1), -- Bloodscale Breastplate +(@GreenTBC+3,24945,0,1,1,1,1), -- Bloodscale Gauntlets +(@GreenTBC+3,24946,0,1,1,1,1), -- Bloodscale Helm +(@GreenTBC+3,24947,0,1,1,1,1), -- Bloodscale Legguards +(@GreenTBC+3,24948,0,1,1,1,1), -- Bloodscale Pauldrons +(@GreenTBC+3,24949,0,1,1,1,1), -- Bloodscale Bracers +(@GreenTBC+3,25033,0,1,1,1,1), -- Scavenger's Cloak +(@GreenTBC+3,25047,0,1,1,1,1), -- Tourmaline Loop +(@GreenTBC+3,25061,0,1,1,1,1), -- Hiddenite Necklace +(@GreenTBC+3,25075,0,1,1,1,1), -- Hardened Steel Shield +(@GreenTBC+3,25089,0,1,1,1,1), -- Supplicant's Rod +(@GreenTBC+3,25103,0,1,1,1,1), -- Nightstalker Dagger +(@GreenTBC+3,25117,0,1,1,1,1), -- Flanged Battle Mace +(@GreenTBC+3,25131,0,1,1,1,1), -- Hateful Bludgeon +(@GreenTBC+3,25187,0,1,1,1,1), -- Shekketh Talons +(@GreenTBC+3,25201,0,1,1,1,1), -- Reaver's Sickle +(@GreenTBC+3,25215,0,1,1,1,1), -- Spiked Battle Axe +(@GreenTBC+3,25229,0,1,1,1,1), -- Partisan Polearm +(@GreenTBC+3,25243,0,1,1,1,1), -- Windtalker Bow +(@GreenTBC+3,25257,0,1,1,1,1), -- Citadel Crossbow +(@GreenTBC+3,25271,0,1,1,1,1), -- Croc-Hunter's Rifle +(@GreenTBC+3,25299,0,1,1,1,1), -- Siphoning Dagger +(@GreenTBC+3,25313,0,1,1,1,1), -- Cold-Iron Scepter +(@GreenTBC+3,25327,0,1,1,1,1), -- Frenzied Staff +(@GreenTBC+3,28534,0,1,1,1,1), -- Fel Tipped Dart +-- lvl 61 ilvl 93 greens (55 items) TBC +(@GreenTBC+4,24613,0,1,1,1,1), -- Vindicator Belt +(@GreenTBC+4,24614,0,1,1,1,1), -- Vindicator Boots +(@GreenTBC+4,24615,0,1,1,1,1), -- Vindicator Tunic +(@GreenTBC+4,24616,0,1,1,1,1), -- Vindicator Gloves +(@GreenTBC+4,24617,0,1,1,1,1), -- Vindicator Cap +(@GreenTBC+4,24618,0,1,1,1,1), -- Vindicator Pants +(@GreenTBC+4,24619,0,1,1,1,1), -- Vindicator Shoulderpads +(@GreenTBC+4,24620,0,1,1,1,1), -- Vindicator Bracers +(@GreenTBC+4,24725,0,1,1,1,1), -- Dementia Cord +(@GreenTBC+4,24726,0,1,1,1,1), -- Dementia Boots +(@GreenTBC+4,24727,0,1,1,1,1), -- Dementia Vest +(@GreenTBC+4,24728,0,1,1,1,1), -- Dementia Gloves +(@GreenTBC+4,24729,0,1,1,1,1), -- Dementia Hood +(@GreenTBC+4,24730,0,1,1,1,1), -- Dementia Trousers +(@GreenTBC+4,24731,0,1,1,1,1), -- Dementia Shoulderguards +(@GreenTBC+4,24732,0,1,1,1,1), -- Dementia Armguards +(@GreenTBC+4,24838,0,1,1,1,1), -- Wrathfin Waistband +(@GreenTBC+4,24839,0,1,1,1,1), -- Wrathfin Greaves +(@GreenTBC+4,24840,0,1,1,1,1), -- Wrathfin Armor +(@GreenTBC+4,24841,0,1,1,1,1), -- Wrathfin Gloves +(@GreenTBC+4,24842,0,1,1,1,1), -- Wrathfin Helmet +(@GreenTBC+4,24843,0,1,1,1,1), -- Wrathfin Legguards +(@GreenTBC+4,24844,0,1,1,1,1), -- Wrathfin Mantle +(@GreenTBC+4,24845,0,1,1,1,1), -- Wrathfin Bindings +(@GreenTBC+4,24950,0,1,1,1,1), -- Bogslayer Belt +(@GreenTBC+4,24951,0,1,1,1,1), -- Bogslayer Sabatons +(@GreenTBC+4,24952,0,1,1,1,1), -- Bogslayer Breastplate +(@GreenTBC+4,24953,0,1,1,1,1), -- Bogslayer Gauntlets +(@GreenTBC+4,24954,0,1,1,1,1), -- Bogslayer Helm +(@GreenTBC+4,24955,0,1,1,1,1), -- Bogslayer Legplates +(@GreenTBC+4,24956,0,1,1,1,1), -- Bogslayer Pauldrons +(@GreenTBC+4,24957,0,1,1,1,1), -- Bogslayer Bracers +(@GreenTBC+4,25034,0,1,1,1,1), -- Elementalist Cloak +(@GreenTBC+4,25048,0,1,1,1,1), -- Smoky Quartz Ring +(@GreenTBC+4,25062,0,1,1,1,1), -- Zircon Amulet +(@GreenTBC+4,25076,0,1,1,1,1), -- Screaming Shield +(@GreenTBC+4,25090,0,1,1,1,1), -- Slavehandler Rod +(@GreenTBC+4,25104,0,1,1,1,1), -- Anzac Dagger +(@GreenTBC+4,25118,0,1,1,1,1), -- Battle Star +(@GreenTBC+4,25132,0,1,1,1,1), -- Thrallmar War Hammer +(@GreenTBC+4,25146,0,1,1,1,1), -- Light-Etched Longsword +(@GreenTBC+4,25160,0,1,1,1,1), -- Vengeance Blade +(@GreenTBC+4,25174,0,1,1,1,1), -- Hanbo Staff +(@GreenTBC+4,25188,0,1,1,1,1), -- Spleenripper Claws +(@GreenTBC+4,25202,0,1,1,1,1), -- Kingly Axe +(@GreenTBC+4,25216,0,1,1,1,1), -- Ogre Splitting Axe +(@GreenTBC+4,25230,0,1,1,1,1), -- Voulge Blade +(@GreenTBC+4,25244,0,1,1,1,1), -- Viper Bow +(@GreenTBC+4,25258,0,1,1,1,1), -- Repeater Crossbow +(@GreenTBC+4,25272,0,1,1,1,1), -- PC-54 Shotgun +(@GreenTBC+4,25286,0,1,1,1,1), -- Yew Wand +(@GreenTBC+4,25300,0,1,1,1,1), -- Lightning Dagger +(@GreenTBC+4,25314,0,1,1,1,1), -- Ceremonial Hammer +(@GreenTBC+4,25328,0,1,1,1,1), -- Faerie-Kind Staff +(@GreenTBC+4,28535,0,1,1,1,1), -- Amani Throwing Axe +-- lvl 62 ilvl 96 greens (55 items) TBC +(@GreenTBC+5,24621,0,1,1,1,1), -- Slavehandler Belt +(@GreenTBC+5,24622,0,1,1,1,1), -- Slavehandler Footpads +(@GreenTBC+5,24623,0,1,1,1,1), -- Slavehandler Jerkin +(@GreenTBC+5,24624,0,1,1,1,1), -- Slavehandler Handwraps +(@GreenTBC+5,24625,0,1,1,1,1), -- Slavehandler Cap +(@GreenTBC+5,24626,0,1,1,1,1), -- Slavehandler Pants +(@GreenTBC+5,24627,0,1,1,1,1), -- Slavehandler Amice +(@GreenTBC+5,24628,0,1,1,1,1), -- Slavehandler Wristguards +(@GreenTBC+5,24733,0,1,1,1,1), -- Sunroc Waistband +(@GreenTBC+5,24734,0,1,1,1,1), -- Sunroc Boots +(@GreenTBC+5,24735,0,1,1,1,1), -- Sunroc Chestpiece +(@GreenTBC+5,24736,0,1,1,1,1), -- Sunroc Gloves +(@GreenTBC+5,24737,0,1,1,1,1), -- Sunroc Mask +(@GreenTBC+5,24738,0,1,1,1,1), -- Sunroc Pants +(@GreenTBC+5,24739,0,1,1,1,1), -- Sunroc Shoulderguards +(@GreenTBC+5,24740,0,1,1,1,1), -- Sunroc Armguards +(@GreenTBC+5,24846,0,1,1,1,1), -- Fenclaw Waistband +(@GreenTBC+5,24847,0,1,1,1,1), -- Fenclaw Footwraps +(@GreenTBC+5,24848,0,1,1,1,1), -- Fenclaw Armor +(@GreenTBC+5,24849,0,1,1,1,1), -- Fenclaw Fists +(@GreenTBC+5,24850,0,1,1,1,1), -- Fenclaw Helm +(@GreenTBC+5,24851,0,1,1,1,1), -- Fenclaw Legguards +(@GreenTBC+5,24852,0,1,1,1,1), -- Fenclaw Mantle +(@GreenTBC+5,24853,0,1,1,1,1), -- Fenclaw Bindings +(@GreenTBC+5,24958,0,1,1,1,1), -- Khan'aish Girdle +(@GreenTBC+5,24959,0,1,1,1,1), -- Khan'aish Greaves +(@GreenTBC+5,24960,0,1,1,1,1), -- Khan'aish Breastplate +(@GreenTBC+5,24961,0,1,1,1,1), -- Khan'aish Gloves +(@GreenTBC+5,24962,0,1,1,1,1), -- Khan'aish Helmet +(@GreenTBC+5,24963,0,1,1,1,1), -- Khan'aish Legplates +(@GreenTBC+5,24964,0,1,1,1,1), -- Khan'aish Epaulets +(@GreenTBC+5,24965,0,1,1,1,1), -- Khan'aish Bracers +(@GreenTBC+5,25035,0,1,1,1,1), -- Silver-Lined Cloak +(@GreenTBC+5,25049,0,1,1,1,1), -- Scheelite Ring +(@GreenTBC+5,25063,0,1,1,1,1), -- Multi-Colored Beads +(@GreenTBC+5,25077,0,1,1,1,1), -- Modani War-Shield +(@GreenTBC+5,25091,0,1,1,1,1), -- Mistyreed Torch +(@GreenTBC+5,25105,0,1,1,1,1), -- Arachnid Dagger +(@GreenTBC+5,25119,0,1,1,1,1), -- Silvermoon War-Mace +(@GreenTBC+5,25133,0,1,1,1,1), -- Stormwind Maul +(@GreenTBC+5,25147,0,1,1,1,1), -- Skystrider Katana +(@GreenTBC+5,25161,0,1,1,1,1), -- Dragon Wing Blade +(@GreenTBC+5,25175,0,1,1,1,1), -- Demoniac Longstaff +(@GreenTBC+5,25189,0,1,1,1,1), -- Ironspine Point +(@GreenTBC+5,25203,0,1,1,1,1), -- Chipped Woodchopper +(@GreenTBC+5,25217,0,1,1,1,1), -- Sundering Axe +(@GreenTBC+5,25231,0,1,1,1,1), -- Fel-Wrought Halberd +(@GreenTBC+5,25245,0,1,1,1,1), -- Razorsong Bow +(@GreenTBC+5,25259,0,1,1,1,1), -- Collapsible Crossbow +(@GreenTBC+5,25273,0,1,1,1,1), -- Sawed-Off Shotgun +(@GreenTBC+5,25287,0,1,1,1,1), -- Magician's Wand +(@GreenTBC+5,25301,0,1,1,1,1), -- Shattering Dagger +(@GreenTBC+5,25315,0,1,1,1,1), -- Restorative Mace +(@GreenTBC+5,25329,0,1,1,1,1), -- Tranquility Staff +(@GreenTBC+5,28536,0,1,1,1,1), -- Jagged Guillotine +-- lvl 63 ilvl 99 greens (55 items) TBC +(@GreenTBC+6,24629,0,1,1,1,1), -- Feralfen Sash +(@GreenTBC+6,24630,0,1,1,1,1), -- Feralfen Sandals +(@GreenTBC+6,24631,0,1,1,1,1), -- Feralfen Jerkin +(@GreenTBC+6,24632,0,1,1,1,1), -- Feralfen Hand +(@GreenTBC+6,24633,0,1,1,1,1), -- Feralfen Hood +(@GreenTBC+6,24634,0,1,1,1,1), -- Feralfen Pants +(@GreenTBC+6,24635,0,1,1,1,1), -- Feralfen Amice +(@GreenTBC+6,24636,0,1,1,1,1), -- Feralfen Cuffs +(@GreenTBC+6,24741,0,1,1,1,1), -- Ranger Belt +(@GreenTBC+6,24742,0,1,1,1,1), -- Ranger Boots +(@GreenTBC+6,24743,0,1,1,1,1), -- Ranger Jerkin +(@GreenTBC+6,24744,0,1,1,1,1), -- Ranger Gloves +(@GreenTBC+6,24745,0,1,1,1,1), -- Ranger Hat +(@GreenTBC+6,24746,0,1,1,1,1), -- Ranger Pants +(@GreenTBC+6,24747,0,1,1,1,1), -- Ranger Pauldrons +(@GreenTBC+6,24748,0,1,1,1,1), -- Ranger Armguards +(@GreenTBC+6,24854,0,1,1,1,1), -- Marshcreeper Belt +(@GreenTBC+6,24855,0,1,1,1,1), -- Marshcreeper Sludgeboots +(@GreenTBC+6,24856,0,1,1,1,1), -- Marshcreeper Fen-Vest +(@GreenTBC+6,24857,0,1,1,1,1), -- Marshcreeper Gloves +(@GreenTBC+6,24858,0,1,1,1,1), -- Marshcreeper Helm +(@GreenTBC+6,24859,0,1,1,1,1), -- Marshcreeper Leggings +(@GreenTBC+6,24860,0,1,1,1,1), -- Marshcreeper Mantle +(@GreenTBC+6,24861,0,1,1,1,1), -- Marshcreeper Bracelets +(@GreenTBC+6,24966,0,1,1,1,1), -- Talonguard Girdle +(@GreenTBC+6,24967,0,1,1,1,1), -- Talonguard Greaves +(@GreenTBC+6,24968,0,1,1,1,1), -- Talonguard Armor +(@GreenTBC+6,24969,0,1,1,1,1), -- Talonguard Gloves +(@GreenTBC+6,24970,0,1,1,1,1), -- Talonguard Helmet +(@GreenTBC+6,24971,0,1,1,1,1), -- Talonguard Legplates +(@GreenTBC+6,24972,0,1,1,1,1), -- Talonguard Epaulets +(@GreenTBC+6,24973,0,1,1,1,1), -- Talonguard Bracers +(@GreenTBC+6,25036,0,1,1,1,1), -- Boulderfist Cloak +(@GreenTBC+6,25050,0,1,1,1,1), -- Moldavite Ring +(@GreenTBC+6,25064,0,1,1,1,1), -- Amethyst Pendant +(@GreenTBC+6,25078,0,1,1,1,1), -- Zangari Shield +(@GreenTBC+6,25092,0,1,1,1,1), -- Consortium Crystal +(@GreenTBC+6,25106,0,1,1,1,1), -- Cobra Shortblade +(@GreenTBC+6,25120,0,1,1,1,1), -- Rockshard Club +(@GreenTBC+6,25134,0,1,1,1,1), -- Highmountain Hammer +(@GreenTBC+6,25148,0,1,1,1,1), -- Bone Collector Sword +(@GreenTBC+6,25162,0,1,1,1,1), -- Darkened Broadsword +(@GreenTBC+6,25176,0,1,1,1,1), -- Taiji Quarterstaff +(@GreenTBC+6,25190,0,1,1,1,1), -- Wight's Claws +(@GreenTBC+6,25204,0,1,1,1,1), -- Colossal War Axe +(@GreenTBC+6,25218,0,1,1,1,1), -- Silver-Edged Axe +(@GreenTBC+6,25232,0,1,1,1,1), -- War Glaive +(@GreenTBC+6,25246,0,1,1,1,1), -- Thalassian Compound Bow +(@GreenTBC+6,25260,0,1,1,1,1), -- Archer's Crossbow +(@GreenTBC+6,25274,0,1,1,1,1), -- Cliffjumper Shotgun +(@GreenTBC+6,25288,0,1,1,1,1), -- Conjurer's Wand +(@GreenTBC+6,25302,0,1,1,1,1), -- Soul-Drain Dagger +(@GreenTBC+6,25316,0,1,1,1,1), -- Spirit-Clad Mace +(@GreenTBC+6,25330,0,1,1,1,1), -- Starshine Staff +(@GreenTBC+6,28537,0,1,1,1,1), -- Wildhammer Throwing Axe +-- lvl 67 ilvl 111 greens (55 items) TBC +(@GreenTBC+10,24661,0,1,1,1,1), -- Shadow Council Chain +(@GreenTBC+10,24662,0,1,1,1,1), -- Shadow Council Boots +(@GreenTBC+10,24663,0,1,1,1,1), -- Shadow Council Tunic +(@GreenTBC+10,24664,0,1,1,1,1), -- Shadow Council Gloves +(@GreenTBC+10,24665,0,1,1,1,1), -- Shadow Council Cowl +(@GreenTBC+10,24666,0,1,1,1,1), -- Shadow Council Pants +(@GreenTBC+10,24667,0,1,1,1,1), -- Shadow Council Mantle +(@GreenTBC+10,24668,0,1,1,1,1), -- Shadow Council Bracer +(@GreenTBC+10,24773,0,1,1,1,1), -- Boneshredder Belt +(@GreenTBC+10,24774,0,1,1,1,1), -- Boneshredder Boots +(@GreenTBC+10,24775,0,1,1,1,1), -- Boneshredder Jerkin +(@GreenTBC+10,24776,0,1,1,1,1), -- Boneshredder Gloves +(@GreenTBC+10,24777,0,1,1,1,1), -- Boneshredder Skullcap +(@GreenTBC+10,24778,0,1,1,1,1), -- Boneshredder Britches +(@GreenTBC+10,24779,0,1,1,1,1), -- Boneshredder Shoulderguards +(@GreenTBC+10,24780,0,1,1,1,1), -- Boneshredder Wristguards +(@GreenTBC+10,24886,0,1,1,1,1), -- Skettis Belt +(@GreenTBC+10,24887,0,1,1,1,1), -- Skettis Footwraps +(@GreenTBC+10,24888,0,1,1,1,1), -- Skettis Chestpiece +(@GreenTBC+10,24889,0,1,1,1,1), -- Skettis Gauntlets +(@GreenTBC+10,24890,0,1,1,1,1), -- Skettis Helmet +(@GreenTBC+10,24891,0,1,1,1,1), -- Skettis Legguards +(@GreenTBC+10,24892,0,1,1,1,1), -- Skettis Spaulders +(@GreenTBC+10,24893,0,1,1,1,1), -- Skettis Bracer +(@GreenTBC+10,24998,0,1,1,1,1), -- Bloodfist Girdle +(@GreenTBC+10,24999,0,1,1,1,1), -- Bloodfist Greaves +(@GreenTBC+10,25000,0,1,1,1,1), -- Bloodfist Breastplate +(@GreenTBC+10,25001,0,1,1,1,1), -- Bloodfist Gloves +(@GreenTBC+10,25002,0,1,1,1,1), -- Bloodfist Helmet +(@GreenTBC+10,25003,0,1,1,1,1), -- Bloodfist Legplates +(@GreenTBC+10,25004,0,1,1,1,1), -- Bloodfist Epaulets +(@GreenTBC+10,25005,0,1,1,1,1), -- Bloodfist Vambraces +(@GreenTBC+10,25040,0,1,1,1,1), -- Murkblood Cape +(@GreenTBC+10,25054,0,1,1,1,1), -- Sodalite Band +(@GreenTBC+10,25068,0,1,1,1,1), -- Kunzite Necklace +(@GreenTBC+10,25082,0,1,1,1,1), -- Fel-Iron Shield +(@GreenTBC+10,25096,0,1,1,1,1), -- Elementalist Star +(@GreenTBC+10,25110,0,1,1,1,1), -- Sharp Bowie Knife +(@GreenTBC+10,25124,0,1,1,1,1), -- Footman Mace +(@GreenTBC+10,25138,0,1,1,1,1), -- Blood Knight Maul +(@GreenTBC+10,25152,0,1,1,1,1), -- Howling Sword +(@GreenTBC+10,25166,0,1,1,1,1), -- Mok'Nathal Warblade +(@GreenTBC+10,25180,0,1,1,1,1), -- Calenda Fighting Stick +(@GreenTBC+10,25194,0,1,1,1,1), -- Serpent's Fangs +(@GreenTBC+10,25208,0,1,1,1,1), -- Bladespire Broadaxe +(@GreenTBC+10,25222,0,1,1,1,1), -- Ceremonial Slayer's Axe +(@GreenTBC+10,25236,0,1,1,1,1), -- Grim Scythe +(@GreenTBC+10,25250,0,1,1,1,1), -- Rocslayer Longbow +(@GreenTBC+10,25264,0,1,1,1,1), -- Pocket Ballista +(@GreenTBC+10,25278,0,1,1,1,1), -- Nesingwary Longrifle +(@GreenTBC+10,25292,0,1,1,1,1), -- Mechano-Wand +(@GreenTBC+10,25306,0,1,1,1,1), -- Permafrost Dagger +(@GreenTBC+10,25320,0,1,1,1,1), -- Queen's Insignia +(@GreenTBC+10,25334,0,1,1,1,1), -- Intimidating Greatstaff +(@GreenTBC+10,28541,0,1,1,1,1), -- Sawshrike +(@GreenTBC+10,30520,0,1,1,1,1), -- Gold-Trimmed Cuffs +(@GreenTBC+10,30986,0,1,1,1,1), -- Bloodforged Guard +-- lvl 68 ilvl 114 greens (55 items) TBC +(@GreenTBC+11,25055,0,1,1,1,1), -- Alexandrite Ring +(@GreenTBC+11,25139,0,1,1,1,1), -- Algaz Battle Hammer +(@GreenTBC+11,25209,0,1,1,1,1), -- Amani Tomahawk +(@GreenTBC+11,25041,0,1,1,1,1), -- Ambusher's Cloak +(@GreenTBC+11,25097,0,1,1,1,1), -- Astralaan Orb +(@GreenTBC+11,25265,0,1,1,1,1), -- Barreled Crossbow +(@GreenTBC+11,25008,0,1,1,1,1), -- Conqueror's Breastplate +(@GreenTBC+11,25012,0,1,1,1,1), -- Conqueror's Epaulets +(@GreenTBC+11,25009,0,1,1,1,1), -- Conqueror's Gauntlets +(@GreenTBC+11,25006,0,1,1,1,1), -- Conqueror's Girdle +(@GreenTBC+11,25007,0,1,1,1,1), -- Conqueror's Greaves +(@GreenTBC+11,25010,0,1,1,1,1), -- Conqueror's Helmet +(@GreenTBC+11,25011,0,1,1,1,1), -- Conqueror's Legplates +(@GreenTBC+11,25013,0,1,1,1,1), -- Conqueror's Vambraces +(@GreenTBC+11,25195,0,1,1,1,1), -- Diamond Tipped Claws +(@GreenTBC+11,25321,0,1,1,1,1), -- Divine Hammer +(@GreenTBC+11,25293,0,1,1,1,1), -- Draenethyst Wand +(@GreenTBC+11,24669,0,1,1,1,1), -- Eldr'naan Belt +(@GreenTBC+11,24670,0,1,1,1,1), -- Eldr'naan Boots +(@GreenTBC+11,24676,0,1,1,1,1), -- Eldr'naan Bracelets +(@GreenTBC+11,24672,0,1,1,1,1), -- Eldr'naan Gloves +(@GreenTBC+11,24673,0,1,1,1,1), -- Eldr'naan Hood +(@GreenTBC+11,24671,0,1,1,1,1), -- Eldr'naan Jerkin +(@GreenTBC+11,24674,0,1,1,1,1), -- Eldr'naan Pants +(@GreenTBC+11,24675,0,1,1,1,1), -- Eldr'naan Shoulderpads +(@GreenTBC+11,25069,0,1,1,1,1), -- Epidote Stone Necklace +(@GreenTBC+11,25335,0,1,1,1,1), -- Feral Warp-Staff +(@GreenTBC+11,25153,0,1,1,1,1), -- Gladiator Greatblade +(@GreenTBC+11,28542,0,1,1,1,1), -- Heartseeker Knives +(@GreenTBC+11,25111,0,1,1,1,1), -- Lionhead Dagger +(@GreenTBC+11,24781,0,1,1,1,1), -- Murkblood Belt +(@GreenTBC+11,24783,0,1,1,1,1), -- Murkblood Boots +(@GreenTBC+11,24789,0,1,1,1,1), -- Murkblood Bracers +(@GreenTBC+11,24784,0,1,1,1,1), -- Murkblood Chestpiece +(@GreenTBC+11,24786,0,1,1,1,1), -- Murkblood Cover +(@GreenTBC+11,24785,0,1,1,1,1), -- Murkblood Gloves +(@GreenTBC+11,24787,0,1,1,1,1), -- Murkblood Pants +(@GreenTBC+11,24788,0,1,1,1,1), -- Murkblood Shoulderguards +(@GreenTBC+11,25237,0,1,1,1,1), -- Nether Trident +(@GreenTBC+11,25167,0,1,1,1,1), -- Nethersteel Claymore +(@GreenTBC+11,25251,0,1,1,1,1), -- Orc Flatbow +(@GreenTBC+11,25125,0,1,1,1,1), -- Retro-Spike Club +(@GreenTBC+11,25279,0,1,1,1,1), -- Sen'jin Longrifle +(@GreenTBC+11,25307,0,1,1,1,1), -- Shadow Dagger +(@GreenTBC+11,25083,0,1,1,1,1), -- Smouldering Shield +(@GreenTBC+11,24896,0,1,1,1,1), -- Sundered Chestpiece +(@GreenTBC+11,24895,0,1,1,1,1), -- Sundered Footwraps +(@GreenTBC+11,24897,0,1,1,1,1), -- Sundered Gauntlets +(@GreenTBC+11,24898,0,1,1,1,1), -- Sundered Helmet +(@GreenTBC+11,24899,0,1,1,1,1), -- Sundered Legguards +(@GreenTBC+11,24900,0,1,1,1,1), -- Sundered Spaulders +(@GreenTBC+11,24894,0,1,1,1,1), -- Sundered Waistband +(@GreenTBC+11,25181,0,1,1,1,1), -- Tapered Staff +(@GreenTBC+11,24901,0,1,1,1,1), -- Tortured Bracer +(@GreenTBC+11,25223,0,1,1,1,1), -- Windcaller Hatchet +-- lvl 69 ilvl 117 greens (55 items) TBC +(@GreenTBC+12,25056,0,1,1,1,1), -- Almandine Ring +(@GreenTBC+12,25126,0,1,1,1,1), -- Anvilmar Hammer +(@GreenTBC+12,24677,0,1,1,1,1), -- Archmage Belt +(@GreenTBC+12,24684,0,1,1,1,1), -- Archmage Bracelets +(@GreenTBC+12,24680,0,1,1,1,1), -- Archmage Gloves +(@GreenTBC+12,24681,0,1,1,1,1), -- Archmage Headpiece +(@GreenTBC+12,24683,0,1,1,1,1), -- Archmage Mantle +(@GreenTBC+12,24682,0,1,1,1,1), -- Archmage Pants +(@GreenTBC+12,24679,0,1,1,1,1), -- Archmage Robe +(@GreenTBC+12,24678,0,1,1,1,1), -- Archmage Slippers +(@GreenTBC+12,25154,0,1,1,1,1), -- Blood Groove Blade +(@GreenTBC+12,25196,0,1,1,1,1), -- Boneshredder Claws +(@GreenTBC+12,25140,0,1,1,1,1), -- Commanding Mallet +(@GreenTBC+12,25070,0,1,1,1,1), -- Coral Beads +(@GreenTBC+12,25182,0,1,1,1,1), -- Crystal-Etched Warstaff +(@GreenTBC+12,25210,0,1,1,1,1), -- Double-Bladed Axe +(@GreenTBC+12,25294,0,1,1,1,1), -- Dragonscale Wand +(@GreenTBC+12,25252,0,1,1,1,1), -- Dream Catcher Bow +(@GreenTBC+12,28543,0,1,1,1,1), -- Dreghood Throwing Axe +(@GreenTBC+12,24791,0,1,1,1,1), -- Expedition Boots +(@GreenTBC+12,24797,0,1,1,1,1), -- Expedition Bracers +(@GreenTBC+12,24790,0,1,1,1,1), -- Expedition Girdle +(@GreenTBC+12,24793,0,1,1,1,1), -- Expedition Gloves +(@GreenTBC+12,24794,0,1,1,1,1), -- Expedition Hood +(@GreenTBC+12,24795,0,1,1,1,1), -- Expedition Pants +(@GreenTBC+12,24796,0,1,1,1,1), -- Expedition Shoulderguards +(@GreenTBC+12,24792,0,1,1,1,1), -- Expedition Tunic +(@GreenTBC+12,25112,0,1,1,1,1), -- Fel Ripper +(@GreenTBC+12,25280,0,1,1,1,1), -- Game Hunter Musket +(@GreenTBC+12,25238,0,1,1,1,1), -- Hellfire War Spear +(@GreenTBC+12,25322,0,1,1,1,1), -- Lordly Scepter +(@GreenTBC+12,25042,0,1,1,1,1), -- Nether Cloak +(@GreenTBC+12,25168,0,1,1,1,1), -- Sha'tari Longsword +(@GreenTBC+12,25014,0,1,1,1,1), -- Shattered Hand Belt +(@GreenTBC+12,25016,0,1,1,1,1), -- Shattered Hand Breastplate +(@GreenTBC+12,25020,0,1,1,1,1), -- Shattered Hand Epaulets +(@GreenTBC+12,25017,0,1,1,1,1), -- Shattered Hand Gauntlets +(@GreenTBC+12,25018,0,1,1,1,1), -- Shattered Hand Helmet +(@GreenTBC+12,25019,0,1,1,1,1), -- Shattered Hand Legplates +(@GreenTBC+12,25015,0,1,1,1,1), -- Shattered Hand Sabatons +(@GreenTBC+12,25021,0,1,1,1,1), -- Shattered Hand Vambraces +(@GreenTBC+12,25224,0,1,1,1,1), -- Slavemaster Axe +(@GreenTBC+12,25336,0,1,1,1,1), -- Splintering Greatstaff +(@GreenTBC+12,24904,0,1,1,1,1), -- Talhide Chestpiece +(@GreenTBC+12,24906,0,1,1,1,1), -- Talhide Helmet +(@GreenTBC+12,24903,0,1,1,1,1), -- Talhide Lined-Boots +(@GreenTBC+12,24909,0,1,1,1,1), -- Talhide Lined-Bracers +(@GreenTBC+12,24905,0,1,1,1,1), -- Talhide Lined-Gloves +(@GreenTBC+12,24907,0,1,1,1,1), -- Talhide Lined-Leggings +(@GreenTBC+12,24908,0,1,1,1,1), -- Talhide Shoulderguards +(@GreenTBC+12,24902,0,1,1,1,1), -- Talhide Stitched-Belt +(@GreenTBC+12,25308,0,1,1,1,1), -- Thunder Spike +(@GreenTBC+12,25098,0,1,1,1,1), -- Tuurik Torch +(@GreenTBC+12,25266,0,1,1,1,1), -- Well-Balanced Crossbow +(@GreenTBC+12,25084,0,1,1,1,1), -- Zeth'Gor Shield +-- lvl 70 ilvl 120 greens (55 items) TBC +(@GreenTBC+13,25057,0,1,1,1,1), -- Amber Band +(@GreenTBC+13,25043,0,1,1,1,1), -- Amber Cape +(@GreenTBC+13,25323,0,1,1,1,1), -- Ascendant's Scepter +(@GreenTBC+13,28544,0,1,1,1,1), -- Assassin's Shuriken +(@GreenTBC+13,25281,0,1,1,1,1), -- Big-Boar Battle Rifle +(@GreenTBC+13,25225,0,1,1,1,1), -- Deepforge Broadaxe +(@GreenTBC+13,25099,0,1,1,1,1), -- Draenei Crystal Rod +(@GreenTBC+13,24805,0,1,1,1,1), -- Dragonhawk Bands +(@GreenTBC+13,24798,0,1,1,1,1), -- Dragonhawk Belt +(@GreenTBC+13,24799,0,1,1,1,1), -- Dragonhawk Boots +(@GreenTBC+13,24801,0,1,1,1,1), -- Dragonhawk Gloves +(@GreenTBC+13,24802,0,1,1,1,1), -- Dragonhawk Hat +(@GreenTBC+13,24803,0,1,1,1,1), -- Dragonhawk Pants +(@GreenTBC+13,24804,0,1,1,1,1), -- Dragonhawk Shoulderguards +(@GreenTBC+13,24800,0,1,1,1,1), -- Dragonhawk Tunic +(@GreenTBC+13,25085,0,1,1,1,1), -- Dragonscale Shield +(@GreenTBC+13,24685,0,1,1,1,1), -- Elementalist Belt +(@GreenTBC+13,24686,0,1,1,1,1), -- Elementalist Boots +(@GreenTBC+13,24692,0,1,1,1,1), -- Elementalist Bracelets +(@GreenTBC+13,24688,0,1,1,1,1), -- Elementalist Gloves +(@GreenTBC+13,24690,0,1,1,1,1), -- Elementalist Leggings +(@GreenTBC+13,24691,0,1,1,1,1), -- Elementalist Mantle +(@GreenTBC+13,24689,0,1,1,1,1), -- Elementalist Skullcap +(@GreenTBC+13,24687,0,1,1,1,1), -- Elementalist Tunic +(@GreenTBC+13,25169,0,1,1,1,1), -- Fel Orc Brute Sword +(@GreenTBC+13,25295,0,1,1,1,1), -- Flawless Wand +(@GreenTBC+13,25141,0,1,1,1,1), -- Halaani Hammer +(@GreenTBC+13,25155,0,1,1,1,1), -- Iron Skull Sword +(@GreenTBC+13,25127,0,1,1,1,1), -- Knight's War Hammer +(@GreenTBC+13,25239,0,1,1,1,1), -- Legend's Glaive +(@GreenTBC+13,24910,0,1,1,1,1), -- Netherstorm Belt +(@GreenTBC+13,24917,0,1,1,1,1), -- Netherstorm Bracer +(@GreenTBC+13,24912,0,1,1,1,1), -- Netherstorm Chestpiece +(@GreenTBC+13,24913,0,1,1,1,1), -- Netherstorm Gauntlets +(@GreenTBC+13,24911,0,1,1,1,1), -- Netherstorm Greaves +(@GreenTBC+13,24914,0,1,1,1,1), -- Netherstorm Helm +(@GreenTBC+13,24915,0,1,1,1,1), -- Netherstorm Legguards +(@GreenTBC+13,24916,0,1,1,1,1), -- Netherstorm Shoulderguards +(@GreenTBC+13,25113,0,1,1,1,1), -- Phantom Dagger +(@GreenTBC+13,25267,0,1,1,1,1), -- Rampant Crossbow +(@GreenTBC+13,25197,0,1,1,1,1), -- Razor Scythes +(@GreenTBC+13,25211,0,1,1,1,1), -- Rockbiter Cutter +(@GreenTBC+13,25337,0,1,1,1,1), -- Swarming Sting-Staff +(@GreenTBC+13,25071,0,1,1,1,1), -- Tanzanite Pendant +(@GreenTBC+13,25183,0,1,1,1,1), -- Voodoo Hex-Staff +(@GreenTBC+13,25024,0,1,1,1,1), -- Warlord's Iron-Breastplate +(@GreenTBC+13,25028,0,1,1,1,1), -- Warlord's Iron-Epaulets +(@GreenTBC+13,25025,0,1,1,1,1), -- Warlord's Iron-Gauntlets +(@GreenTBC+13,25022,0,1,1,1,1), -- Warlord's Iron-Girdle +(@GreenTBC+13,25026,0,1,1,1,1), -- Warlord's Iron-Helm +(@GreenTBC+13,25027,0,1,1,1,1), -- Warlord's Iron-Legplates +(@GreenTBC+13,25029,0,1,1,1,1), -- Warlord's Iron-Vambraces +(@GreenTBC+13,25023,0,1,1,1,1), -- Warlord's Sabatons +(@GreenTBC+13,25309,0,1,1,1,1), -- Warpdagger +(@GreenTBC+13,25253,0,1,1,1,1); -- Windspear Longbow +-- -------------------------------------------------------- +-- TBC_Blues_References +-- -------------------------------------------------------- +SET @BlueTBC := 4200; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @BlueTBC AND @BlueTBC+10; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- lvl 60 blues ilvl 85((6 items) +(@BlueTBC,31125,0,1,1,1,1), -- Boots of the Decimator +(@BlueTBC,31126,0,1,1,1,1), -- Gloves of Ferocity +(@BlueTBC,31127,0,1,1,1,1), -- Hauberk of Totemic Rage +(@BlueTBC,31131,0,1,1,1,1), -- Sash of Silent Blades +(@BlueTBC,31133,0,1,1,1,1), -- Leggings of Concentrated Darkness +(@BlueTBC,31134,0,1,1,1,1), -- Blade of Misfortune +-- lvl 61 blues ilvl 88 (6 items) +(@BlueTBC+1,31136,0,1,1,1,1), -- Breastplate of Blade Turning +(@BlueTBC+1,31137,0,1,1,1,1), -- Gauntlets of Purification +(@BlueTBC+1,31138,0,1,1,1,1), -- Storm Lord's Girdle +(@BlueTBC+1,31139,0,1,1,1,1), -- Fist of Reckoning +(@BlueTBC+1,31140,0,1,1,1,1), -- Cloak of Entropy +(@BlueTBC+1,31142,0,1,1,1,1), -- Blade of Trapped Knowledge +-- lvl 62 blues ilvl 91 (6 items) +(@BlueTBC+2,31143,0,1,1,1,1), -- Shroud of Frenzy +(@BlueTBC+2,31145,0,1,1,1,1), -- Headdress of the Sleeper +(@BlueTBC+2,31147,0,1,1,1,1), -- Pendant of Cunning +(@BlueTBC+2,31148,0,1,1,1,1), -- Demon Hide Spaulders +(@BlueTBC+2,31149,0,1,1,1,1), -- Gloves of Pandemonium +(@BlueTBC+2,31150,0,1,1,1,1), -- Gloves of Piety +-- lvl 63 blues ilvl 94 (6 items) +(@BlueTBC+3,31151,0,1,1,1,1), -- Girdle of Siege +(@BlueTBC+3,31152,0,1,1,1,1), -- Girdle of SiegeChestguard of Illumination +(@BlueTBC+3,31153,0,1,1,1,1), -- Girdle of SiegeAxe of the Legion +(@BlueTBC+3,31173,0,1,1,1,1), -- Girdle of SiegeBoots of Savagery +(@BlueTBC+3,31175,0,1,1,1,1), -- Girdle of SiegeBlade Dancer's Wristguards +(@BlueTBC+3,31178,0,1,1,1,1), -- Girdle of SiegeAmulet of Unstable Power +-- lvl 64 blues ilvl 97 (6 items) +(@BlueTBC+4,31180,0,1,1,1,1), -- Gauntlets of the Skullsplitter +(@BlueTBC+4,31186,0,1,1,1,1), -- Braxxis' Staff of Slumber +(@BlueTBC+4,31187,0,1,1,1,1), -- Boots of the Pathfinder +(@BlueTBC+4,31190,0,1,1,1,1), -- The Dreamer's Shoulderpads +(@BlueTBC+4,31193,0,1,1,1,1), -- Blade of Unquenched Thirst +(@BlueTBC+4,31196,0,1,1,1,1), -- Amulet of Sanctification +-- lvl 65 blues ilvl 100 (6 items) +(@BlueTBC+5,31200,0,1,1,1,1), -- Shield of the Wayward Footman +(@BlueTBC+5,31202,0,1,1,1,1), -- Girdle of Divine Blessing +(@BlueTBC+5,31204,0,1,1,1,1), -- The Gunblade +(@BlueTBC+5,31222,0,1,1,1,1), -- Headdress of Inner Rage +(@BlueTBC+5,31226,0,1,1,1,1), -- Leggings of the Sly +(@BlueTBC+5,31230,0,1,1,1,1), -- Abyss Walker's Boots +-- lvl 68 blues ilvl 109 (6 items) +(@BlueTBC+8,31284,0,1,1,1,1), -- Bracers of Recklessness +(@BlueTBC+8,31285,0,1,1,1,1), -- Chestguard of the Talon +(@BlueTBC+8,31286,0,1,1,1,1), -- Breastplate of Rapid Striking +(@BlueTBC+8,31287,0,1,1,1,1), -- Draenei Honor Guard Shield +(@BlueTBC+8,31288,0,1,1,1,1), -- The Master's Treads +(@BlueTBC+8,31289,0,1,1,1,1), -- Staff of Divine Infusion +-- lvl 69 blues ilvl 112 (6 items) +(@BlueTBC+9,31291,0,1,1,1,1), -- Crystalforged War Axe +(@BlueTBC+9,31292,0,1,1,1,1), -- Crystal Pulse Shield +(@BlueTBC+9,31293,0,1,1,1,1), -- Girdle of Gale Force +(@BlueTBC+9,31294,0,1,1,1,1), -- Pauldrons of Surging Mana +(@BlueTBC+9,31295,0,1,1,1,1), -- Chestguard of the Dark Stalker +(@BlueTBC+9,31297,0,1,1,1,1), -- Robe of the Crimson Order +-- lvl 70 blues ilvl 115 (7 items) +(@BlueTBC+10,31298,0,1,1,1,1), -- Legguards of the Shattered Hand +(@BlueTBC+10,31299,0,1,1,1,1), -- The Oathkeeper +(@BlueTBC+10,31303,0,1,1,1,1), -- Valanos' Longbow +(@BlueTBC+10,31304,0,1,1,1,1), -- The Essence Focuser +(@BlueTBC+10,31305,0,1,1,1,1), -- Ced's Carver +(@BlueTBC+10,31306,0,1,1,1,1), -- Leggings of the Sacred Crest +(@BlueTBC+10,31308,0,1,1,1,1); -- The Bringer of Death -- cgit v1.2.3 From 3b87f1d29bd9c5a613f3bd96c75d88781c5782fe Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 2 Jun 2012 19:50:39 +0200 Subject: Commit: Add newlines to end of files --- sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql | 2 +- sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql b/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql index 8a0496d88f6..cd6015929b1 100644 --- a/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql +++ b/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql @@ -1129,4 +1129,4 @@ INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`loot (18975,2,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (26222,26223); -DELETE FROM `reference_loot_template` WHERE `entry`=34081; \ No newline at end of file +DELETE FROM `reference_loot_template` WHERE `entry`=34081; diff --git a/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql b/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql index d5130caf8cb..e739f81407b 100644 --- a/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql +++ b/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql @@ -899,4 +899,4 @@ INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`loot (20387,25454,20,1,1,1,1), -- Luminescent Globe (20387,27676,50,1,0,1,1), -- Strange Spores (20387,24401,26,1,0,1,1), -- Unidentified Plant Parts -(20387,1,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot (YES FOR ZM) \ No newline at end of file +(20387,1,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot (YES FOR ZM) -- cgit v1.2.3 From beb91af01192600db9510eb24a95146a374bb027 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 2 Jun 2012 20:03:12 +0200 Subject: DB/Loot: Fix WOTLK items dropping off level 20 mobs Closes #6692 --- sql/updates/world/2012_06_02_04_reference_loot_template.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/2012_06_02_04_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_04_reference_loot_template.sql b/sql/updates/world/2012_06_02_04_reference_loot_template.sql new file mode 100644 index 00000000000..57be9083048 --- /dev/null +++ b/sql/updates/world/2012_06_02_04_reference_loot_template.sql @@ -0,0 +1,11 @@ +DELETE FROM `reference_loot_template` WHERE `entry` IN (14011,14012); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(14011,37759,0,1,1,1,1), -- Rhie-ay's Clutching Gauntlets +(14011,37768,0,1,1,1,1), -- Leggings of Violent Exsanguination +(14011,37790,0,1,1,1,1), -- Belt of Crystalline Tears +(14011,37806,0,1,1,1,1), -- Zabra's Misplaced Staff +(14011,37808,0,1,1,1,1), -- Dragonjaw Mauler +(14011,37809,0,1,1,1,1), -- Roc-Feather Longbow +(14012,3014,-70,1,0,1,1), -- Battleworn Axe +(14012,7906,-8,1,0,1,1); -- Horns of Nez'ra +UPDATE `creature_loot_template` SET `mincountOrRef`=14012 WHERE `mincountOrRef`=14011 AND `entry` IN (4464,436,437,440,485,615,4064,4065,4462,4463,435); -- cgit v1.2.3 From c729aa5d5a2f9bb635f194cbda88f5b3e9e5171d Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 2 Jun 2012 20:15:42 +0200 Subject: DB/Commit: reference values are negative, im jumping a cliff, bye --- sql/updates/world/2012_06_02_05_reference_loot_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_06_02_05_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_05_reference_loot_template.sql b/sql/updates/world/2012_06_02_05_reference_loot_template.sql new file mode 100644 index 00000000000..51dee84ad9b --- /dev/null +++ b/sql/updates/world/2012_06_02_05_reference_loot_template.sql @@ -0,0 +1,2 @@ +-- freaking -, im jumping from a cliff now... +UPDATE `creature_loot_template` SET `mincountOrRef`=-14012 WHERE `mincountOrRef`=-14011 AND `entry` IN (4464,436,437,440,485,615,4064,4065,4462,4463,435); -- cgit v1.2.3 From 9899ba7a9ef7b344b5c4d60ab5a951eeef986be8 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 2 Jun 2012 21:04:29 -0230 Subject: DB/waypoints: Fix up Dragons around Wymrest temple --- .../world/2012_06_02_06_world_waypoints.sql | 1343 ++++++++++++++++++++ 1 file changed, 1343 insertions(+) create mode 100644 sql/updates/world/2012_06_02_06_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_06_world_waypoints.sql b/sql/updates/world/2012_06_02_06_world_waypoints.sql new file mode 100644 index 00000000000..65d5d43bad2 --- /dev/null +++ b/sql/updates/world/2012_06_02_06_world_waypoints.sql @@ -0,0 +1,1343 @@ +-- Azure Drake +-- Delete old spawns +DELETE FROM `creature` WHERE `id` IN (27682,27608); +UPDATE `creature_template` SET `speed_walk`=9/2,`speed_run`=17/7,`InhabitType`=4 WHERE `entry`=26838; + +SET @NPC := 99078; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3433.348,274.121,192.7347,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3441.997,218.066,169.347,0,0,0,100,0), +(@PATH,2,3495.446,178.1635,169.347,0,0,0,100,0), +(@PATH,3,3562.124,172.6228,169.347,0,0,0,100,0), +(@PATH,4,3645.859,193.9786,169.347,0,0,0,100,0), +(@PATH,5,3689.068,295.8872,169.347,0,0,0,100,0), +(@PATH,6,3624.446,375.1689,169.347,0,0,0,100,0), +(@PATH,7,3510.095,372.0045,169.347,0,0,0,100,0), +(@PATH,8,3446.488,300.4381,169.347,0,0,0,100,0), +(@PATH,9,3420.008,195.1058,169.347,0,0,0,100,0), +(@PATH,10,3474.376,103.4208,169.347,0,0,0,100,0), +(@PATH,11,3587.787,78.41341,169.347,0,0,0,100,0), +(@PATH,12,3680.552,168.1343,169.347,0,0,0,100,0), +(@PATH,13,3682.222,340.8562,169.347,0,0,0,100,0), +(@PATH,14,3563.545,458.4753,169.347,0,0,0,100,0), +(@PATH,15,3452.104,480.9653,169.347,0,0,0,100,0), +(@PATH,16,3344.437,382.5979,169.347,0,0,0,100,0), +(@PATH,17,3232.114,340.6778,169.347,0,0,0,100,0), +(@PATH,18,3127.326,347.8484,169.347,0,0,0,100,0), +(@PATH,19,3027.017,384.9972,169.347,0,0,0,100,0), +(@PATH,20,2989.474,458.5701,169.347,0,0,0,100,0), +(@PATH,21,3013.37,539.2202,169.347,0,0,0,100,0), +(@PATH,22,3066.603,566.7353,169.347,0,0,0,100,0), +(@PATH,23,3134.078,551.7691,169.347,0,0,0,100,0), +(@PATH,24,3244.26,486.8306,169.347,0,0,0,100,0), +(@PATH,25,3327.64,383.2903,169.347,0,0,0,100,0), +(@PATH,26,3382.149,279.6307,169.347,0,0,0,100,0); + +SET @NPC := 99079; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3434.632,268.5218,212.5722,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3449.962,350.2704,185.3083,0,0,0,100,0), +(@PATH,2,3546.571,399.454,185.3083,0,0,0,100,0), +(@PATH,3,3649.095,344.2626,185.3083,0,0,0,100,0), +(@PATH,4,3648.6,203.3825,185.3083,0,0,0,100,0), +(@PATH,5,3557.447,156.6613,185.3083,0,0,0,100,0), +(@PATH,6,3438.763,197.2433,185.3083,0,0,0,100,0), +(@PATH,7,3364.301,251.3537,185.3083,0,0,0,100,0), +(@PATH,8,3245.05,295.2606,185.3083,0,0,0,100,0), +(@PATH,9,3127.677,330.6631,185.3083,0,0,0,100,0), +(@PATH,10,3045.42,426.6257,185.3083,0,0,0,100,0), +(@PATH,11,3033.423,500.1823,185.3083,0,0,0,100,0), +(@PATH,12,3074.555,584.5701,185.3083,0,0,0,100,0), +(@PATH,13,3167.413,579.3245,185.3083,0,0,0,100,0), +(@PATH,14,3254.766,477.3121,185.3083,0,0,0,100,0), +(@PATH,15,3328.997,355.7176,185.3083,0,0,0,100,0), +(@PATH,16,3403.051,340.1719,185.3083,0,0,0,100,0), +(@PATH,17,3446.086,384.896,185.3083,0,0,0,100,0), +(@PATH,18,3503.323,407.0888,185.3083,0,0,0,100,0), +(@PATH,19,3593.65,392.4026,185.3083,0,0,0,100,0), +(@PATH,20,3658.26,283.8229,185.3083,0,0,0,100,0), +(@PATH,21,3604.809,176.3996,185.3083,0,0,0,100,0), +(@PATH,22,3500.686,159.6379,185.3083,0,0,0,100,0), +(@PATH,23,3441.441,249.5543,185.3083,0,0,0,100,0); + +SET @NPC := 99083; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3639.789,321.911,195.744,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3654.995,228.2284,204.7075,0,0,0,100,0), +(@PATH,2,3750.065,190.3719,204.7075,0,0,0,100,0), +(@PATH,3,3793.781,239.5784,204.7075,0,0,0,100,0), +(@PATH,4,3793.007,322.9862,204.7075,0,0,0,100,0), +(@PATH,5,3712.435,337.7213,204.7075,0,0,0,100,0), +(@PATH,6,3649.212,273.7653,204.7075,0,0,0,100,0), +(@PATH,7,3627.809,181.2728,204.7075,0,0,0,100,0), +(@PATH,8,3575.202,116.1518,204.7075,0,0,0,100,0), +(@PATH,9,3452.9,157.833,204.7075,0,0,0,100,0), +(@PATH,10,3395.156,279.1096,204.7075,0,0,0,100,0), +(@PATH,11,3459.034,403.4866,204.7075,0,0,0,100,0), +(@PATH,12,3610.543,437.9186,204.7075,0,0,0,100,0), +(@PATH,13,3715.638,355.6098,204.7075,0,0,0,100,0), +(@PATH,14,3721.246,203.5534,204.7075,0,0,0,100,0), +(@PATH,15,3583.16,147.8227,204.7075,0,0,0,100,0), +(@PATH,16,3467.958,184.451,204.7075,0,0,0,100,0), +(@PATH,17,3341.041,241.3563,204.7075,0,0,0,100,0), +(@PATH,18,3259.652,326.3573,204.7075,0,0,0,100,0), +(@PATH,19,3325.962,453.1619,204.7075,0,0,0,100,0), +(@PATH,20,3430.271,470.1731,204.7075,0,0,0,100,0), +(@PATH,21,3474.818,389.2108,204.7075,0,0,0,100,0), +(@PATH,22,3422.128,277.9353,204.7075,0,0,0,100,0), +(@PATH,23,3278.513,235.3488,204.7075,0,0,0,100,0), +(@PATH,24,3139.333,309.1593,204.7075,0,0,0,100,0), +(@PATH,25,3124.315,442.8726,204.7075,0,0,0,100,0), +(@PATH,26,3166.636,500.1602,204.7075,0,0,0,100,0), +(@PATH,27,3252.777,537.1607,204.7075,0,0,0,100,0), +(@PATH,28,3365.404,500.6408,204.7075,0,0,0,100,0), +(@PATH,29,3497.347,437.8124,204.7075,0,0,0,100,0), +(@PATH,30,3610.069,345.1742,204.7075,0,0,0,100,0); + +SET @NPC := 99084; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3419.562,219.4669,185.8007,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3476.15,177.9767,151.9461,0,0,0,100,0), +(@PATH,2,3545.193,113.4851,151.9461,0,0,0,100,0), +(@PATH,3,3639.261,157.7231,151.9461,0,0,0,100,0), +(@PATH,4,3676.142,330.9362,151.9461,0,0,0,100,0), +(@PATH,5,3568.025,452.4464,151.9461,0,0,0,100,0), +(@PATH,6,3440.924,381.5191,151.9461,0,0,0,100,0), +(@PATH,7,3406.76,247.0661,151.9461,0,0,0,100,0), +(@PATH,8,3489.703,142.3122,151.9461,0,0,0,100,0), +(@PATH,9,3573.337,130.2329,151.9461,0,0,0,100,0), +(@PATH,10,3668.767,202.5275,151.9461,0,0,0,100,0), +(@PATH,11,3660.667,365.0258,151.9461,0,0,0,100,0), +(@PATH,12,3546.228,441.4885,151.9461,0,0,0,100,0), +(@PATH,13,3414.354,479.1683,151.9461,0,0,0,100,0), +(@PATH,14,3298.711,513.6075,151.9461,0,0,0,100,0), +(@PATH,15,3152.929,563.3295,151.9461,0,0,0,100,0), +(@PATH,16,3061.01,598.1893,151.9461,0,0,0,100,0), +(@PATH,17,3028.564,548.2512,151.9461,0,0,0,100,0), +(@PATH,18,3066.851,499.9897,151.9461,0,0,0,100,0), +(@PATH,19,3126.102,457.3964,151.9461,0,0,0,100,0), +(@PATH,20,3209.258,379.5157,151.9461,0,0,0,100,0), +(@PATH,21,3290.067,313.6936,151.9461,0,0,0,100,0), +(@PATH,22,3381.995,245.4414,151.9461,0,0,0,100,0); + +SET @NPC := 99085; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3431.814,203.5959,199.4538,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3469.755,211.1012,252.1057,0,0,0,100,0), +(@PATH,2,3543.436,184.6182,282.9112,0,0,0,100,0), +(@PATH,3,3605.144,211.1016,313.2445,0,0,0,100,0), +(@PATH,4,3629.088,281.4026,342.355,0,0,0,100,0), +(@PATH,5,3586.889,335.8259,342.355,0,0,0,100,0), +(@PATH,6,3534.959,340.7828,342.355,0,0,0,100,0), +(@PATH,7,3488.181,299.2897,342.355,0,0,0,100,0), +(@PATH,8,3490.962,242.9244,342.355,0,0,0,100,0), +(@PATH,9,3544.176,216.1916,342.355,0,0,0,100,0), +(@PATH,10,3607.393,238.2059,342.355,0,0,0,100,0), +(@PATH,11,3606.415,315.159,342.355,0,0,0,100,0), +(@PATH,12,3529.92,347.5442,342.355,0,0,0,100,0), +(@PATH,13,3442.581,379.9305,309.9662,0,0,0,100,0), +(@PATH,14,3363.314,409.6005,272.7996,0,0,0,100,0), +(@PATH,15,3271.624,451.7768,231.7996,0,0,0,100,0), +(@PATH,16,3222.875,508.5536,210.5774,0,0,0,100,0), +(@PATH,17,3178.339,552.9731,195.4663,0,0,0,100,0), +(@PATH,18,3119.579,592.5015,182.2996,0,0,0,100,0), +(@PATH,19,3079.527,558.9856,175.383,0,0,0,100,0), +(@PATH,20,3110.969,495.2063,173.9941,0,0,0,100,0), +(@PATH,21,3133.366,466.6834,176.5779,0,0,0,100,0), +(@PATH,22,3236.847,383.9943,176.5779,0,0,0,100,0), +(@PATH,23,3382.743,269.2179,222.0501,0,0,0,100,0); + +SET @NPC := 99086; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3408.915,276.3928,180.561,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3451.428,175.6206,154.7629,0,0,0,100,0), +(@PATH,2,3461.289,67.8521,154.7629,0,0,0,100,0), +(@PATH,3,3401.216,31.08062,154.7629,0,0,0,100,0), +(@PATH,4,3348.744,62.37424,154.7629,0,0,0,100,0), +(@PATH,5,3352.888,148.2122,154.7629,0,0,0,100,0), +(@PATH,6,3405.2,335.0623,154.7629,0,0,0,100,0), +(@PATH,7,3399.393,397.5138,154.7629,0,0,0,100,0), +(@PATH,8,3346.986,426.0631,154.7629,0,0,0,100,0), +(@PATH,9,3262.085,383.6502,154.7629,0,0,0,100,0), +(@PATH,10,3156.926,352.7438,154.7629,0,0,0,100,0), +(@PATH,11,3057.544,393.0464,154.7629,0,0,0,100,0), +(@PATH,12,3000.647,466.7132,154.7629,0,0,0,100,0), +(@PATH,13,2989.147,516.5572,154.7629,0,0,0,100,0), +(@PATH,14,3049.945,587.7933,154.7629,0,0,0,100,0), +(@PATH,15,3160.802,556.4007,154.7629,0,0,0,100,0), +(@PATH,16,3268.329,422.1047,154.7629,0,0,0,100,0); + +SET @NPC := 99087; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3748.954,236.7544,178.6408,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3712.221,418.183,178.6408,0,0,0,100,0), +(@PATH,2,3540.502,499.2345,178.6408,0,0,0,100,0), +(@PATH,3,3358.373,445.1452,178.6408,0,0,0,100,0), +(@PATH,4,3200.13,472.7363,178.6408,0,0,0,100,0), +(@PATH,5,3101.38,584.3835,178.6408,0,0,0,100,0), +(@PATH,6,3040.255,596.7429,178.6408,0,0,0,100,0), +(@PATH,7,2997.37,550.3453,178.6408,0,0,0,100,0), +(@PATH,8,2999.847,500.0373,178.6408,0,0,0,100,0), +(@PATH,9,3048.254,460.723,178.6408,0,0,0,100,0), +(@PATH,10,3140.818,390.9225,178.6408,0,0,0,100,0), +(@PATH,11,3219.294,333.4928,178.6408,0,0,0,100,0), +(@PATH,12,3318.04,264.8529,178.6408,0,0,0,100,0), +(@PATH,13,3436.765,193.0778,178.6408,0,0,0,100,0), +(@PATH,14,3552.843,154.3912,178.6408,0,0,0,100,0), +(@PATH,15,3668.381,197.8079,178.6408,0,0,0,100,0), +(@PATH,16,3711.96,284.6768,178.6408,0,0,0,100,0), +(@PATH,17,3627.375,410.4442,178.6408,0,0,0,100,0), +(@PATH,18,3466.029,404.0347,178.6408,0,0,0,100,0), +(@PATH,19,3375.764,293.2045,178.6408,0,0,0,100,0), +(@PATH,20,3426.16,142.911,178.6408,0,0,0,100,0), +(@PATH,21,3611.036,90.26421,178.6408,0,0,0,100,0), +(@PATH,22,3748.954,236.7544,178.6408,0,0,0,100,0); + + +SET @NPC := 99088; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3412.463,216.0972,212.123,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3412.65,215.8015,241.2928,0,0,0,100,0), +(@PATH,2,3544.712,83.40093,241.2928,0,0,0,100,0), +(@PATH,3,3729.527,148.4322,241.2928,0,0,0,100,0), +(@PATH,4,3770.91,456.7697,241.2928,0,0,0,100,0), +(@PATH,5,3592.973,601.0773,241.2928,0,0,0,100,0), +(@PATH,6,3431.349,566.7643,241.2928,0,0,0,100,0), +(@PATH,7,3298.04,548.691,241.2928,0,0,0,100,0), +(@PATH,8,3180.431,663.6898,241.2928,0,0,0,100,0), +(@PATH,9,3069.867,677.9128,241.2928,0,0,0,100,0), +(@PATH,10,2984.272,605.6987,241.2928,0,0,0,100,0), +(@PATH,11,3000.096,533.4483,241.2928,0,0,0,100,0), +(@PATH,12,3144.4,405.446,241.2928,0,0,0,100,0), +(@PATH,13,3301.554,308.331,241.2928,0,0,0,100,0); + +SET @NPC := 99089; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3100.95,567.1441,118.4118,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3100.912,567.1385,122.3331,0,0,0,100,0), +(@PATH,2,3214.064,524.5076,122.3331,0,0,0,100,0), +(@PATH,3,3307.77,498.1685,122.3331,0,0,0,100,0), +(@PATH,4,3399.335,473.5195,122.3331,0,0,0,100,0), +(@PATH,5,3545.675,446.1954,122.3331,0,0,0,100,0), +(@PATH,6,3631.807,357.087,122.3331,0,0,0,100,0), +(@PATH,7,3640.708,229.0423,122.3331,0,0,0,100,0), +(@PATH,8,3616.36,137.7545,122.3331,0,0,0,100,0), +(@PATH,9,3558.458,113.3069,122.3331,0,0,0,100,0), +(@PATH,10,3457.288,142.8311,122.3331,0,0,0,100,0), +(@PATH,11,3387.124,248.1035,122.3331,0,0,0,100,0), +(@PATH,12,3419.464,398.1638,122.3331,0,0,0,100,0), +(@PATH,13,3366.308,507.4259,122.3331,0,0,0,100,0), +(@PATH,14,3243.456,494.2254,122.3331,0,0,0,100,0), +(@PATH,15,3121.018,428.1757,122.3331,0,0,0,100,0), +(@PATH,16,3003.428,487.8239,122.3331,0,0,0,100,0), +(@PATH,17,3001.53,566.4896,122.3331,0,0,0,100,0), +(@PATH,18,3059.883,577.261,122.3331,0,0,0,100,0); + +-- static +DELETE FROM `creature` WHERE `guid` IN (99090,99091); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(99090,27682,571,1,1,24743,0,2954.845,625.8646,146.2928,2.094395,120,0,0,38440,0,0), +(99091,27682,571,1,1,24743,0,3256.357,585.8403,136.8419,0.4363323,120,0,0,38440,0,0); + +-- waypoints +SET @NPC := 99092; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3017.465,301.0079,204.943,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3014.38,371.552,204.943,0,0,0,100,0), +(@PATH,2,3066.132,433.5229,204.943,0,0,0,100,0), +(@PATH,3,3168.017,532.116,204.943,0,0,0,100,0), +(@PATH,4,3341.228,644.3932,204.943,0,0,0,100,0), +(@PATH,5,3480.533,600.2273,204.943,0,0,0,100,0), +(@PATH,6,3485.514,465.1431,204.943,0,0,0,100,0), +(@PATH,7,3362.191,369.4394,204.943,0,0,0,100,0), +(@PATH,8,3193.452,330.4968,204.943,0,0,0,100,0), +(@PATH,9,3117.152,256.1553,204.943,0,0,0,100,0), +(@PATH,10,3017.465,301.0079,204.943,0,0,0,100,0); + +SET @NPC := 99094; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3138.133,520.6823,53.44044,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3120.694,487.4651,73.32948,0,0,0,100,0), +(@PATH,2,3094.569,488.8283,89.30162,0,0,0,100,0), +(@PATH,3,3076.394,504.3694,101.9128,0,0,0,100,0), +(@PATH,4,3073.121,536.1434,118.3021,0,0,0,100,0), +(@PATH,5,3100.686,550.8791,135.0522,0,0,0,100,0), +(@PATH,6,3133.567,533.2503,156.4133,0,0,0,100,0), +(@PATH,7,3128.940,498.2000,185.3022,0,0,0,100,0), +(@PATH,8,3104.875,485.1591,211.9410,0,0,0,100,0), +(@PATH,9,3078.965,493.2044,233.2187,0,0,0,100,0), +(@PATH,10,3077.378,529.8601,246.1916,0,0,0,100,0), +(@PATH,11,3104.640,532.739,246.1916,0,0,0,100,0), +(@PATH,12,3124.398,511.3354,246.1916,0,0,0,100,0), +(@PATH,13,3106.461,485.7477,246.1916,0,0,0,100,0), +(@PATH,14,3074.75,501.1113,246.1916,0,0,0,100,0), +(@PATH,15,3080.605,533.5042,222.6366,0,0,0,100,0), +(@PATH,16,3108.456,548.174,194.8869,0,0,0,100,0), +(@PATH,17,3138.865,510.0685,159.4426,0,0,0,100,0), +(@PATH,18,3107.084,484.058,121.3038,0,0,0,100,0), +(@PATH,19,3066.059,511.5332,94.97042,0,0,0,100,0), +(@PATH,20,3084.679,555.8902,74.52598,0,0,0,100,0), +(@PATH,21,3128.865,543.4575,51.55369,0,0,0,100,0), +(@PATH,22,3132.671,497.0408,51.55369,0,0,0,100,0), +(@PATH,23,3083.713,484.3025,51.55369,0,0,0,100,0), +(@PATH,24,3062.465,530.1815,51.55369,0,0,0,100,0), +(@PATH,25,3100.407,561.9063,51.55369,0,0,0,100,0), +(@PATH,26,3138.133,520.6823,53.44044,0,0,0,100,0); + +SET @NPC := 99095; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3199.019,490.8836,212.5729,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3131.874,451.6094,212.5729,0,0,0,100,0), +(@PATH,2,3066.175,466.9917,212.5729,0,0,0,100,0), +(@PATH,3,3015.529,515.9183,212.5729,0,0,0,100,0), +(@PATH,4,3032.398,624.4706,212.5729,0,0,0,100,0), +(@PATH,5,3123.448,648.5508,212.5729,0,0,0,100,0), +(@PATH,6,3201.826,572.715,212.5729,0,0,0,100,0), +(@PATH,7,3199.019,490.8836,212.5729,0,0,0,100,0); + +SET @NPC := 99096; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3214.422,579.9131,196.0033,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3133.856,625.1009,196.0033,0,0,0,100,0), +(@PATH,2,3066.991,599.8026,196.0033,0,0,0,100,0), +(@PATH,3,3045.829,536.076,196.0033,0,0,0,100,0), +(@PATH,4,3064.8,436.205,196.0033,0,0,0,100,0), +(@PATH,5,3149.34,424.2586,196.0033,0,0,0,100,0), +(@PATH,6,3217.921,481.3083,196.0033,0,0,0,100,0), +(@PATH,7,3214.422,579.9131,196.0033,0,0,0,100,0); + +SET @NPC := 99097; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3106.429,348.3322,212.4711,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3184.002,431.2766,212.4711,0,0,0,100,0), +(@PATH,2,3166.134,532.8875,212.4711,0,0,0,100,0), +(@PATH,3,3080.641,574.7059,212.4711,0,0,0,100,0), +(@PATH,4,2963.504,564.834,212.4711,0,0,0,100,0), +(@PATH,5,2918.588,502.0504,212.4711,0,0,0,100,0), +(@PATH,6,2949.235,405.6514,212.4711,0,0,0,100,0), +(@PATH,7,3106.429,348.3322,212.4711,0,0,0,100,0); + +SET @NPC := 99098; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3129.027,582.4556,247.3863,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3188.686,528.622,247.3863,0,0,0,100,0), +(@PATH,2,3166.479,466.4643,247.3863,0,0,0,100,0), +(@PATH,3,3107.782,429.4197,247.3863,0,0,0,100,0), +(@PATH,4,3030.916,459.3344,247.3863,0,0,0,100,0), +(@PATH,5,3014.312,531.3731,247.3863,0,0,0,100,0), +(@PATH,6,3058.55,581.8262,247.3863,0,0,0,100,0), +(@PATH,7,3129.027,582.4556,247.3863,0,0,0,100,0); + +SET @NPC := 99099; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3691.676,352.0933,342.2254,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3662.692,328.2304,338.4197,0,0,0,100,0), +(@PATH,2,3648.806,293.8063,321.0587,0,0,0,100,0), +(@PATH,3,3677.441,213.8859,320.1976,0,0,0,100,0), +(@PATH,4,3615.31,209.5691,324.1698,0,0,0,100,0), +(@PATH,5,3637.643,254.0089,332.7251,0,0,0,100,0), +(@PATH,6,3699.886,260.6509,327.8641,0,0,0,100,0), +(@PATH,7,3720.373,308.941,337.7808,0,0,0,100,0), +(@PATH,8,3691.676,352.0933,342.2254,0,0,0,100,0); + +SET @NPC := 99093; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3036.494,602.2036,179.671,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3100.145,600.0773,179.671,0,0,0,100,0), +(@PATH,2,3230.972,531.9783,179.671,0,0,0,100,0), +(@PATH,3,3261.28,445.4492,179.671,0,0,0,100,0), +(@PATH,4,3185.334,349.6381,179.671,0,0,0,100,0), +(@PATH,5,3031.361,375.153,179.671,0,0,0,100,0), +(@PATH,6,2951.565,490.5297,179.671,0,0,0,100,0), +(@PATH,7,3006.273,602.823,179.671,0,0,0,100,0), +(@PATH,8,3140.882,604.8052,179.671,0,0,0,100,0), +(@PATH,9,3279.177,536.7864,179.671,0,0,0,100,0), +(@PATH,10,3342.035,451.1805,179.671,0,0,0,100,0), +(@PATH,11,3373.871,409.5802,179.671,0,0,0,100,0), +(@PATH,12,3418.399,323.2935,179.671,0,0,0,100,0), +(@PATH,13,3432.266,253.5685,179.671,0,0,0,100,0), +(@PATH,14,3376.006,177.8496,179.671,0,0,0,100,0), +(@PATH,15,3328.437,226.3789,179.671,0,0,0,100,0), +(@PATH,16,3336.244,307.4113,179.671,0,0,0,100,0), +(@PATH,17,3381.182,333.7066,179.671,0,0,0,100,0), +(@PATH,18,3478.52,398.1222,179.671,0,0,0,100,0), +(@PATH,19,3574.011,383.5956,179.671,0,0,0,100,0), +(@PATH,20,3661.792,400.2125,179.671,0,0,0,100,0), +(@PATH,21,3700.764,494.1714,179.671,0,0,0,100,0), +(@PATH,22,3602.784,552.9866,179.671,0,0,0,100,0), +(@PATH,23,3539.342,521.9033,179.671,0,0,0,100,0), +(@PATH,24,3523.356,456.0128,179.671,0,0,0,100,0), +(@PATH,25,3618.041,362.6289,179.671,0,0,0,100,0), +(@PATH,26,3723.684,327.7586,179.671,0,0,0,100,0), +(@PATH,27,3773.446,249.6754,179.671,0,0,0,100,0), +(@PATH,28,3749.611,152.5128,179.671,0,0,0,100,0), +(@PATH,29,3695.312,141.0493,179.671,0,0,0,100,0), +(@PATH,30,3651.431,217.0924,179.671,0,0,0,100,0), +(@PATH,31,3683.438,319.0038,179.671,0,0,0,100,0), +(@PATH,32,3748.601,338.1269,179.671,0,0,0,100,0), +(@PATH,33,3792.042,245.4839,179.671,0,0,0,100,0), +(@PATH,34,3735.548,180.4323,179.671,0,0,0,100,0), +(@PATH,35,3618.281,171.1228,179.671,0,0,0,100,0), +(@PATH,36,3474.684,137.1242,179.671,0,0,0,100,0), +(@PATH,37,3479.782,49.90799,179.671,0,0,0,100,0), +(@PATH,38,3558.278,30.76975,179.671,0,0,0,100,0), +(@PATH,39,3629.689,60.77876,179.671,0,0,0,100,0), +(@PATH,40,3630.145,127.0798,179.671,0,0,0,100,0), +(@PATH,41,3490.695,175.1472,179.671,0,0,0,100,0), +(@PATH,42,3366.718,224.9415,179.671,0,0,0,100,0), +(@PATH,43,3212.591,294.8876,179.671,0,0,0,100,0), +(@PATH,44,3076.071,364.5977,179.671,0,0,0,100,0), +(@PATH,45,2990.75,457.3708,179.671,0,0,0,100,0), +(@PATH,46,2984.907,530.0489,179.671,0,0,0,100,0), +(@PATH,47,3036.494,602.2036,179.671,0,0,0,100,0); + +SET @NPC := 99103; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3065.57,646.0688,229.7383,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3133.651,599.4818,229.7383,0,0,0,100,0), +(@PATH,2,3196.173,510.7455,229.7383,0,0,0,100,0), +(@PATH,3,3310.401,346.2189,229.7383,0,0,0,100,0), +(@PATH,4,3407.27,144.2138,229.7383,0,0,0,100,0), +(@PATH,5,3526.717,72.89225,229.7383,0,0,0,100,0), +(@PATH,6,3672.079,141.219,229.7383,0,0,0,100,0), +(@PATH,7,3713.506,314.0188,229.7383,0,0,0,100,0), +(@PATH,8,3602.6,431.6985,229.7383,0,0,0,100,0), +(@PATH,9,3408.532,364.4567,229.7383,0,0,0,100,0), +(@PATH,10,3217.656,309.1964,229.7383,0,0,0,100,0), +(@PATH,11,3061.193,324.0175,229.7383,0,0,0,100,0), +(@PATH,12,2959.836,412.4154,229.7383,0,0,0,100,0), +(@PATH,13,2945.925,545.2357,229.7383,0,0,0,100,0), +(@PATH,14,3065.57,646.0688,229.7383,0,0,0,100,0); + +SET @NPC := 99104; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3112.661,560.2861,197.5214,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3166.947,533.783,197.5214,0,0,0,100,0), +(@PATH,2,3204.218,503.2988,197.5214,0,0,0,100,0), +(@PATH,3,3258.251,466.3165,197.5214,0,0,0,100,0), +(@PATH,4,3367.959,364.4092,197.5214,0,0,0,100,0), +(@PATH,5,3407.955,305.4363,197.5214,0,0,0,100,0), +(@PATH,6,3451.267,201.594,197.5214,0,0,0,100,0), +(@PATH,7,3508.874,166.8426,197.5214,0,0,0,100,0), +(@PATH,8,3633.496,151.127,197.5214,0,0,0,100,0), +(@PATH,9,3678.77,73.99848,197.5214,0,0,0,100,0), +(@PATH,10,3653.132,23.86263,197.5214,0,0,0,100,0), +(@PATH,11,3582.038,62.69965,197.5214,0,0,0,100,0), +(@PATH,12,3586.156,134.1242,197.5214,0,0,0,100,0), +(@PATH,13,3645.95,187.412,197.5214,0,0,0,100,0), +(@PATH,14,3699.768,345.5867,197.5214,0,0,0,100,0), +(@PATH,15,3755.733,466.6079,197.5214,0,0,0,100,0), +(@PATH,16,3695.944,599.8013,197.5214,0,0,0,100,0), +(@PATH,17,3631.838,570.2178,197.5214,0,0,0,100,0), +(@PATH,18,3620.732,470.3869,197.5214,0,0,0,100,0), +(@PATH,19,3653.033,441.836,197.5214,0,0,0,100,0), +(@PATH,20,3726.417,408.7439,197.5214,0,0,0,100,0), +(@PATH,21,3768.67,340.4243,197.5214,0,0,0,100,0), +(@PATH,22,3734.631,281.2856,197.5214,0,0,0,100,0), +(@PATH,23,3670.002,288.5108,197.5214,0,0,0,100,0), +(@PATH,24,3637.37,399.2112,197.5214,0,0,0,100,0), +(@PATH,25,3572.382,439.8372,197.5214,0,0,0,100,0), +(@PATH,26,3485.629,383.2211,197.5214,0,0,0,100,0), +(@PATH,27,3408.692,361.6136,197.5214,0,0,0,100,0), +(@PATH,28,3363.01,438.3368,197.5214,0,0,0,100,0), +(@PATH,29,3435.608,478.5367,197.5214,0,0,0,100,0), +(@PATH,30,3498.484,443.0669,197.5214,0,0,0,100,0), +(@PATH,31,3470.396,344.2875,197.5214,0,0,0,100,0), +(@PATH,32,3372.963,191.8817,197.5214,0,0,0,100,0), +(@PATH,33,3290.335,164.9094,197.5214,0,0,0,100,0), +(@PATH,34,3226.219,218.6132,197.5214,0,0,0,100,0), +(@PATH,35,3232.448,290.6222,197.5214,0,0,0,100,0), +(@PATH,36,3304.077,350.0902,197.5214,0,0,0,100,0), +(@PATH,37,3418.385,307.068,197.5214,0,0,0,100,0), +(@PATH,38,3440.642,196.0552,197.5214,0,0,0,100,0), +(@PATH,39,3388.76,137.5194,197.5214,0,0,0,100,0), +(@PATH,40,3299.691,166.3526,197.5214,0,0,0,100,0), +(@PATH,41,3197.989,286.0815,197.5214,0,0,0,100,0), +(@PATH,42,3124.057,342.0608,197.5214,0,0,0,100,0), +(@PATH,43,3029.794,412.821,197.5214,0,0,0,100,0), +(@PATH,44,3027.204,518.2308,197.5214,0,0,0,100,0), +(@PATH,45,3112.661,560.2861,197.5214,0,0,0,100,0); + +SET @NPC := 99105; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27682,571,1,1,24743,0,3040.376,545.7573,223.7107,1.91463,120,0,0,38440,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3066.4,533.701,223.7107,0,0,0,100,0), +(@PATH,2,3184.873,458.7727,223.7107,0,0,0,100,0), +(@PATH,3,3308.346,361.982,223.7107,0,0,0,100,0), +(@PATH,4,3472.517,346.546,223.7107,0,0,0,100,0), +(@PATH,5,3580.564,383.8688,223.7107,0,0,0,100,0), +(@PATH,6,3656.45,349.4831,223.7107,0,0,0,100,0), +(@PATH,7,3671.57,291.0071,223.7107,0,0,0,100,0), +(@PATH,8,3637.499,197.3902,223.7107,0,0,0,100,0), +(@PATH,9,3527.828,157.279,223.7107,0,0,0,100,0), +(@PATH,10,3449.215,208.4113,223.7107,0,0,0,100,0), +(@PATH,11,3406.054,178.4773,223.7107,0,0,0,100,0), +(@PATH,12,3456.503,129.8825,223.7107,0,0,0,100,0), +(@PATH,13,3570.421,124.2369,223.7107,0,0,0,100,0), +(@PATH,14,3636.482,214.1168,223.7107,0,0,0,100,0), +(@PATH,15,3649.198,312.7206,223.7107,0,0,0,100,0), +(@PATH,16,3584.864,367.9254,223.7107,0,0,0,100,0), +(@PATH,17,3498.865,377.1867,223.7107,0,0,0,100,0), +(@PATH,18,3446.663,323.5181,223.7107,0,0,0,100,0), +(@PATH,19,3418.987,266.998,223.7107,0,0,0,100,0), +(@PATH,20,3325.219,278.7927,223.7107,0,0,0,100,0), +(@PATH,21,3246.293,325.4047,223.7107,0,0,0,100,0), +(@PATH,22,3136.991,394.2709,223.7107,0,0,0,100,0), +(@PATH,23,3057.987,457.7468,223.7107,0,0,0,100,0), +(@PATH,24,3007.479,511.7082,223.7107,0,0,0,100,0), +(@PATH,25,3012.345,538.7167,223.7107,0,0,0,100,0), +(@PATH,26,3040.376,545.7573,223.7107,0,0,0,100,0); + +-- Azure Dragon +UPDATE `creature_template` SET `speed_walk`=7/2,`speed_run`=15/7,`InhabitType`=4 WHERE `entry`=27608; + +SET @NPC := 99105; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3177.857,623.9463,234.0692,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3062.52,435.5133,234.0692,0,0,0,100,0), +(@PATH,2,3125.572,288.5948,234.0692,0,0,0,100,0), +(@PATH,3,3411.13,158.2311,234.0692,0,0,0,100,0), +(@PATH,4,3681.013,161.0803,234.0692,0,0,0,100,0), +(@PATH,5,3815.275,311.0847,234.0692,0,0,0,100,0), +(@PATH,6,3773.807,472.041,234.0692,0,0,0,100,0), +(@PATH,7,3576.037,531.0521,234.0692,0,0,0,100,0), +(@PATH,8,3435.667,344.3725,234.0692,0,0,0,100,0), +(@PATH,9,3480.011,109.5501,234.0692,0,0,0,100,0), +(@PATH,10,3702.724,-30.66547,234.0692,0,0,0,100,0), +(@PATH,11,3889.816,54.52344,234.0692,0,0,0,100,0), +(@PATH,12,3914.841,319.0804,234.0692,0,0,0,100,0), +(@PATH,13,3695.273,610.4755,234.0692,0,0,0,100,0), +(@PATH,14,3389.431,691.5984,234.0692,0,0,0,100,0), +(@PATH,15,3177.857,623.9463,234.0692,0,0,0,100,0); + +SET @NPC := 99106; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,2980.341,629.1049,218.5251,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3128.300,641.3470,218.5251,0,0,0,100,0), +(@PATH,2,3231.236,534.2712,218.5251,0,0,0,100,0), +(@PATH,3,3229.198,417.0781,218.5251,0,0,0,100,0), +(@PATH,4,3131.435,332.9997,218.5251,0,0,0,100,0), +(@PATH,5,2990.912,336.3741,206.4763,0,0,0,100,0), +(@PATH,6,2871.583,422.1004,206.4763,0,0,0,100,0), +(@PATH,7,2881.663,578.8079,206.4763,0,0,0,100,0), +(@PATH,8,2980.341,629.1049,218.5251,0,0,0,100,0); + +SET @NPC := 99107; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3488.651,-5.619141,169.4104,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3338.837,206.9924,169.4104,0,0,0,100,0), +(@PATH,2,3077.402,282.2865,169.4104,0,0,0,100,0), +(@PATH,3,2799.517,249.9982,169.4104,0,0,0,100,0), +(@PATH,4,2641.98,389.0734,169.4104,0,0,0,100,0), +(@PATH,5,2739.034,565.4708,169.4104,0,0,0,100,0), +(@PATH,6,3044.569,485.4482,169.4104,0,0,0,100,0), +(@PATH,7,3169.199,460.6385,169.4104,0,0,0,100,0), +(@PATH,8,3336.106,465.7545,169.4104,0,0,0,100,0), +(@PATH,9,3630.246,386.4513,169.4104,0,0,0,100,0), +(@PATH,10,3803.202,250.7272,169.4104,0,0,0,100,0), +(@PATH,11,3770.406,24.9643,169.4104,0,0,0,100,0), +(@PATH,12,3488.651,-5.619141,169.4104,0,0,0,100,0); + +SET @NPC := 99108; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3542.247,134.1484,169.6936,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3506.288,141.7649,169.6936,0,0,0,100,0), +(@PATH,2,3378.177,251.381,169.6936,0,0,0,100,0), +(@PATH,3,3448.559,417.0887,169.6936,0,0,0,100,0), +(@PATH,4,3659.633,429.129,169.6936,0,0,0,100,0), +(@PATH,5,3726.806,236.8274,169.6936,0,0,0,100,0), +(@PATH,6,3554.261,69.58746,169.6936,0,0,0,100,0), +(@PATH,7,3337.373,175.2911,169.6936,0,0,0,100,0), +(@PATH,8,3292.872,421.84,169.6936,0,0,0,100,0), +(@PATH,9,3355.351,609.4697,169.6936,0,0,0,100,0), +(@PATH,10,3233.689,777.6954,207.249,0,0,0,100,0), +(@PATH,11,3049.014,721.6703,224.4991,0,0,0,100,0), +(@PATH,12,3044.268,566.5984,169.6936,0,0,0,100,0), +(@PATH,13,3142.397,481.2142,169.6936,0,0,0,100,0), +(@PATH,14,3328.336,435.8111,169.6936,0,0,0,100,0), +(@PATH,15,3583.232,539.7742,169.6936,0,0,0,100,0), +(@PATH,16,3799.81,460.638,169.6936,0,0,0,100,0), +(@PATH,17,3717.946,244.38,169.6936,0,0,0,100,0), +(@PATH,18,3542.247,134.1484,169.6936,0,0,0,100,0); + +SET @NPC := 99109; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3590.88,69.88932,149.1064,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3349.674,233.3671,149.1064,0,0,0,100,0), +(@PATH,2,3050.534,331.2801,149.1064,0,0,0,100,0), +(@PATH,3,2982.76,530.9803,149.1064,0,0,0,100,0), +(@PATH,4,3091.488,621.5792,149.1064,0,0,0,100,0), +(@PATH,5,3227.927,595.5925,149.1064,0,0,0,100,0), +(@PATH,6,3467.181,481.7014,149.1064,0,0,0,100,0), +(@PATH,7,3708.623,396.748,149.1064,0,0,0,100,0), +(@PATH,8,3763.585,194.9491,149.1064,0,0,0,100,0), +(@PATH,9,3590.88,69.88932,149.1064,0,0,0,100,0); + +SET @NPC := 99110; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3424.549,257.6351,132.4231,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3523.625,148.6501,132.4231,0,0,0,100,0), +(@PATH,2,3671.965,176.3331,132.4231,0,0,0,100,0), +(@PATH,3,3721.304,302.0294,132.4231,0,0,0,100,0), +(@PATH,4,3586.378,436.0151,132.4231,0,0,0,100,0), +(@PATH,5,3398.783,363.715,132.4231,0,0,0,100,0), +(@PATH,6,3201.002,184.2853,132.4231,0,0,0,100,0), +(@PATH,7,3033.273,261.4108,132.4231,0,0,0,100,0), +(@PATH,8,3020.73,417.366,132.4231,0,0,0,100,0), +(@PATH,9,3134.54,559.4572,132.4231,0,0,0,100,0), +(@PATH,10,3286.472,590.3685,132.4231,0,0,0,100,0), +(@PATH,11,3370.537,476.4369,132.4231,0,0,0,100,0), +(@PATH,12,3424.549,257.6351,132.4231,0,0,0,100,0); + +SET @NPC := 99111; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3485.543,172.4427,356.9669,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3617.296,247.1156,357.3557,0,0,0,100,0), +(@PATH,2,3589.83,487.236,356.9669,0,0,0,100,0), +(@PATH,3,3417.021,598.9542,356.9669,0,0,0,100,0), +(@PATH,4,3230.356,615.1475,346.9949,0,0,0,100,0), +(@PATH,5,3061.912,567.3838,332.8835,0,0,0,100,0), +(@PATH,6,2990.214,429.7983,332.8835,0,0,0,100,0), +(@PATH,7,3203.85,198.3223,332.8835,0,0,0,100,0), +(@PATH,8,3485.543,172.4427,356.9669,0,0,0,100,0); + +SET @NPC := 99112; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3037.007,696.7842,221.9052,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3232.783,646.5775,221.9052,0,0,0,100,0), +(@PATH,2,3397.601,486.7037,221.9052,0,0,0,100,0), +(@PATH,3,3619.899,375.7408,221.9052,0,0,0,100,0), +(@PATH,4,3828.234,403.8529,221.9052,0,0,0,100,0), +(@PATH,5,3950.75,272.4162,221.9052,0,0,0,100,0), +(@PATH,6,3930.549,80.84885,221.9052,0,0,0,100,0), +(@PATH,7,3731.407,15.2053,221.9052,0,0,0,100,0), +(@PATH,8,3520.57,124.0501,221.9052,0,0,0,100,0), +(@PATH,9,3319.81,205.5578,221.9052,0,0,0,100,0), +(@PATH,10,3141.857,364.067,221.9052,0,0,0,100,0), +(@PATH,11,3020.412,487.4164,211.0165,0,0,0,100,0), +(@PATH,12,2956.715,583.454,211.0165,0,0,0,100,0), +(@PATH,13,3037.007,696.7842,221.9052,0,0,0,100,0); + +SET @NPC := 99113; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3723.934,203.8074,149.416,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3679.447,16.12554,149.416,0,0,0,100,0), +(@PATH,2,3507.391,-64.8457,149.416,0,0,0,100,0), +(@PATH,3,3313.535,24.35514,149.416,0,0,0,100,0), +(@PATH,4,3106.862,208.8542,149.416,0,0,0,100,0), +(@PATH,5,2972.297,312.9027,149.416,0,0,0,100,0), +(@PATH,6,2980.743,486.7836,149.416,0,0,0,100,0), +(@PATH,7,3066.302,566.5879,149.416,0,0,0,100,0), +(@PATH,8,3202.917,598.3837,149.416,0,0,0,100,0), +(@PATH,9,3404.993,515.3446,149.416,0,0,0,100,0), +(@PATH,10,3425.663,255.2629,149.416,0,0,0,100,0), +(@PATH,11,3211.951,114.9269,149.416,0,0,0,100,0), +(@PATH,12,3000.342,217.3278,149.416,0,0,0,100,0), +(@PATH,13,2963.022,422.1858,149.416,0,0,0,100,0), +(@PATH,14,3166.04,544.8924,149.416,0,0,0,100,0), +(@PATH,15,3358.634,487.4157,149.416,0,0,0,100,0), +(@PATH,16,3582.295,398.5222,149.416,0,0,0,100,0), +(@PATH,17,3723.934,203.8074,149.416,0,0,0,100,0); + +SET @NPC := 99114; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3737.246,441.4471,163.1518,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3681.252,275.5609,163.1518,0,0,0,100,0), +(@PATH,2,3715.161,150.0893,163.1518,0,0,0,100,0), +(@PATH,3,3533.266,-10.55339,163.1518,0,0,0,100,0), +(@PATH,4,3173.073,184.9491,151.4297,0,0,0,100,0), +(@PATH,5,2936.554,340.61,144.8464,0,0,0,100,0), +(@PATH,6,2956.506,455.4837,133.5686,0,0,0,100,0), +(@PATH,7,3032.773,515.5552,122.4019,0,0,0,100,0), +(@PATH,8,3178.638,523.1923,126.2074,0,0,0,100,0), +(@PATH,9,3413.29,470.1859,126.2074,0,0,0,100,0), +(@PATH,10,3572.062,487.1479,144.1519,0,0,0,100,0), +(@PATH,11,3523.323,611.9957,144.1519,0,0,0,100,0), +(@PATH,12,3655.581,727.4493,168.9574,0,0,0,100,0), +(@PATH,13,3772.614,626.3416,163.1518,0,0,0,100,0), +(@PATH,14,3737.246,441.4471,163.1518,0,0,0,100,0); + +SET @NPC := 99115; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3490.259,76.95345,197.2588,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3733.682,129.7717,197.2588,0,0,0,100,0), +(@PATH,2,3864.96,508.5689,197.2588,0,0,0,100,0), +(@PATH,3,3552.458,522.002,197.2588,0,0,0,100,0), +(@PATH,4,3285.309,616.7151,197.2588,0,0,0,100,0), +(@PATH,5,3036.671,572.0858,197.2588,0,0,0,100,0), +(@PATH,6,2932.137,492.1258,197.2588,0,0,0,100,0), +(@PATH,7,2908.21,365.3067,197.2588,0,0,0,100,0), +(@PATH,8,3001.178,249.2961,197.2588,0,0,0,100,0), +(@PATH,9,3292.851,156.1309,197.2588,0,0,0,100,0), +(@PATH,10,3490.259,76.95345,197.2588,0,0,0,100,0); + +SET @NPC := 99116; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3484.9,77.65061,181.4013,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3231.553,144.962,181.4013,0,0,0,100,0), +(@PATH,2,3093.218,232.0598,181.4013,0,0,0,100,0), +(@PATH,3,3055.291,416.8134,181.4013,0,0,0,100,0), +(@PATH,4,3167.159,544.8934,181.4013,0,0,0,100,0), +(@PATH,5,3351.382,640.3859,181.4013,0,0,0,100,0), +(@PATH,6,3588.236,561.4211,181.4013,0,0,0,100,0), +(@PATH,7,3702.199,377.5353,181.4013,0,0,0,100,0), +(@PATH,8,3664.586,182.5018,181.4013,0,0,0,100,0), +(@PATH,9,3484.9,77.65061,181.4013,0,0,0,100,0); + +SET @NPC := 99117; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,2938.209,403.6825,200.0642,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3000.396,533.5293,200.0642,0,0,0,100,0), +(@PATH,2,3148.834,635.804,200.0642,0,0,0,100,0), +(@PATH,3,3307.068,630.108,200.0642,0,0,0,100,0), +(@PATH,4,3393.553,425.3046,200.0642,0,0,0,100,0), +(@PATH,5,3413.431,212.6353,200.0642,0,0,0,100,0), +(@PATH,6,3566.631,98.43479,200.0642,0,0,0,100,0), +(@PATH,7,3729.045,218.3996,200.0642,0,0,0,100,0), +(@PATH,8,3698.444,417.5869,200.0642,0,0,0,100,0), +(@PATH,9,3524.363,494.4065,200.0642,0,0,0,100,0), +(@PATH,10,3335.302,374.7052,200.0642,0,0,0,100,0), +(@PATH,11,3255.138,189.5002,200.0642,0,0,0,100,0), +(@PATH,12,3111.794,148.6386,200.0642,0,0,0,100,0), +(@PATH,13,2979.718,214.2472,200.0642,0,0,0,100,0), +(@PATH,14,2938.209,403.6825,200.0642,0,0,0,100,0); + +SET @NPC := 99118; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,27608,571,1,1,24140,0,3756.611,216.3398,142.0742,1.91463,120,0,0,92538,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3746.663,468.0216,142.0742,0,0,0,100,0), +(@PATH,2,3489.741,512.316,142.0742,0,0,0,100,0), +(@PATH,3,3277.682,558.9236,142.0742,0,0,0,100,0), +(@PATH,4,3152.218,477.8159,142.0742,0,0,0,100,0), +(@PATH,5,3082.888,432.7688,142.0742,0,0,0,100,0), +(@PATH,6,3016.838,481.925,142.0742,0,0,0,100,0), +(@PATH,7,3033.647,560.426,142.0742,0,0,0,100,0), +(@PATH,8,3162.152,562.8186,142.0742,0,0,0,100,0), +(@PATH,9,3240.709,468.0213,142.0742,0,0,0,100,0), +(@PATH,10,3371.026,259.9583,142.0742,0,0,0,100,0), +(@PATH,11,3535.323,122.4076,142.0742,0,0,0,100,0), +(@PATH,12,3756.611,216.3398,142.0742,0,0,0,100,0); + +-- Wyrmrest Temple Drake + +DELETE FROM `creature` WHERE `guid` IN (100170,100206,100207,100208,100209,100210,100213,100215,100216,100226,130999,131000,131001,131002,131003,131006,131004,131005,131007,131008,131009); + +UPDATE `creature_template` SET `speed_walk`=9/2,`speed_run`=17/7,`InhabitType`=4 WHERE `entry`=26925; + +SET @NPC := 100170; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3423.212,279.9993,128.0342,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3423.212,279.9993,128.0342,0,0,0,100,0), +(@PATH,2,3452.103,334.373,128.0342,0,0,0,100,0), +(@PATH,3,3463.885,390.2345,128.0342,0,0,0,100,0), +(@PATH,4,3459.316,448.6561,128.0342,0,0,0,100,0), +(@PATH,5,3390.542,472.8465,128.0342,0,0,0,100,0), +(@PATH,6,3343.515,429.0621,128.0342,0,0,0,100,0), +(@PATH,7,3319.781,350.6016,128.0342,0,0,0,100,0), +(@PATH,8,3342.761,276.0052,128.0342,0,0,0,100,0), +(@PATH,9,3381.065,257.5826,128.0342,0,0,0,100,0); + +SET @NPC := 100206; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3662.692,328.2304,338.4197,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3662.692,328.2304,338.4197,0,0,0,100,0), +(@PATH,2,3648.806,293.8063,321.0587,0,0,0,100,0), +(@PATH,3,3677.441,213.8859,320.1976,0,0,0,100,0), +(@PATH,4,3615.31,209.5691,324.1698,0,0,0,100,0), +(@PATH,5,3637.643,254.0089,332.7251,0,0,0,100,0), +(@PATH,6,3699.886,260.6509,327.8641,0,0,0,100,0), +(@PATH,7,3720.373,308.941,337.7808,0,0,0,100,0), +(@PATH,8,3691.676,352.0933,342.2254,0,0,0,100,0); + +SET @NPC := 100207; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3657.962,213.0957,169.3146,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3657.962,213.0957,169.3146,0,0,0,100,0), +(@PATH,2,3667.34,194.262,169.3146,0,0,0,100,0), +(@PATH,3,3675.021,149.4151,169.3146,0,0,0,100,0), +(@PATH,4,3676.687,103.2968,169.3146,0,0,0,100,0), +(@PATH,5,3657.863,59.17426,169.3146,0,0,0,100,0), +(@PATH,6,3622.093,33.20833,169.3146,0,0,0,100,0), +(@PATH,7,3595.094,36.79308,169.3146,0,0,0,100,0), +(@PATH,8,3578.594,58.34657,169.3146,0,0,0,100,0), +(@PATH,9,3553.642,84.92133,169.3146,0,0,0,100,0), +(@PATH,10,3558.182,112.2144,169.3146,0,0,0,100,0), +(@PATH,11,3570.514,135.5537,169.3146,0,0,0,100,0), +(@PATH,12,3596.293,162.6956,169.3146,0,0,0,100,0), +(@PATH,13,3618.115,186.3872,169.3146,0,0,0,100,0), +(@PATH,14,3648.757,225.0738,169.3146,0,0,0,100,0); + +SET @NPC := 100208; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3606.596,396.9579,205.5612,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3606.596,396.9579,205.5612,0,0,0,100,0), +(@PATH,2,3633.08,397.3744,205.5612,0,0,0,100,0), +(@PATH,3,3650.996,425.418,205.5612,0,0,0,100,0), +(@PATH,4,3610.396,457.8707,205.5612,0,0,0,100,0), +(@PATH,5,3510.082,450.9809,205.5612,0,0,0,100,0), +(@PATH,6,3435.127,411.1036,205.5612,0,0,0,100,0), +(@PATH,7,3388.161,429.3571,205.5612,0,0,0,100,0), +(@PATH,8,3406.552,481.8189,205.5612,0,0,0,100,0), +(@PATH,9,3518.298,499.1305,205.5612,0,0,0,100,0), +(@PATH,10,3568.027,418.6763,205.5612,0,0,0,100,0); + +SET @NPC := 100209; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3648.806,293.8063,321.0587,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3648.806,293.8063,321.0587,0,0,0,100,0), +(@PATH,2,3677.441,213.8859,320.1976,0,0,0,100,0), +(@PATH,3,3615.31,209.5691,324.1698,0,0,0,100,0), +(@PATH,4,3637.643,254.0089,332.7251,0,0,0,100,0), +(@PATH,5,3699.886,260.6509,327.8641,0,0,0,100,0), +(@PATH,6,3720.373,308.941,337.7808,0,0,0,100,0), +(@PATH,7,3691.676,352.0933,342.2254,0,0,0,100,0), +(@PATH,8,3662.692,328.2304,338.4197,0,0,0,100,0); + +SET @NPC := 100210; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3452.103,334.373,128.0342,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3452.103,334.373,128.0342,0,0,0,100,0), +(@PATH,2,3334.853,530.1229,197.2842,0,0,0,100,0), +(@PATH,3,3325.103,359.123,195.7842,0,0,0,100,0), +(@PATH,4,3499.853,334.623,195.0342,0,0,0,100,0), +(@PATH,5,3263.353,527.8729,197.2842,0,0,0,100,0), +(@PATH,6,3706.853,80.87296,195.7842,0,0,0,100,0), +(@PATH,7,3499.853,334.623,195.0342,0,0,0,100,0), +(@PATH,8,3495.603,493.623,197.2842,0,0,0,100,0), +(@PATH,9,3218.353,177.623,195.7842,0,0,0,100,0); + +SET @NPC := 100213; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3648.806,293.8063,321.0587,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3648.806,293.8063,321.0587,0,0,0,100,0), +(@PATH,2,3588.806,84.30627,390.3087,0,0,0,100,0), +(@PATH,3,3827.556,468.8063,388.3087,0,0,0,100,0), +(@PATH,4,3731.556,38.55627,388.5587,0,0,0,100,0), +(@PATH,5,3454.556,53.30627,390.3087,0,0,0,100,0), +(@PATH,6,3756.306,434.3063,388.3087,0,0,0,100,0), +(@PATH,7,3503.556,54.30627,388.5587,0,0,0,100,0), +(@PATH,8,3795.056,64.55627,390.3087,0,0,0,100,0); + +SET @NPC := 100215; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3606.596,396.9579,205.5612,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3606.596,396.9579,205.5612,0,0,0,100,0), +(@PATH,2,3688.846,165.4579,274.8112,0,0,0,100,0), +(@PATH,3,3601.846,450.2079,273.3112,0,0,0,100,0), +(@PATH,4,3585.346,505.2079,272.8112,0,0,0,100,0), +(@PATH,5,3602.096,174.2079,274.8112,0,0,0,100,0), +(@PATH,6,3446.596,562.4579,273.3112,0,0,0,100,0), +(@PATH,7,3585.346,505.2079,272.8112,0,0,0,100,0), +(@PATH,8,3500.346,153.9579,274.8112,0,0,0,100,0), +(@PATH,9,3571.096,180.2079,273.3112,0,0,0,100,0), +(@PATH,10,3585.346,505.2079,272.8112,0,0,0,100,0); + +SET @NPC := 100216; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3772.475,266.6113,254.1891,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3772.475,266.6113,254.1891,0,0,0,100,0), +(@PATH,2,3887.975,92.86133,323.4391,0,0,0,100,0), +(@PATH,3,3532.475,436.8613,321.6891,0,0,0,100,0), +(@PATH,4,3798.725,252.1113,321.4391,0,0,0,100,0), +(@PATH,5,3886.225,81.11133,323.4391,0,0,0,100,0), +(@PATH,6,3636.975,32.11133,321.6891,0,0,0,100,0), +(@PATH,7,3798.725,252.1113,321.4391,0,0,0,100,0), +(@PATH,8,3747.725,77.61133,323.4391,0,0,0,100,0), +(@PATH,9,3772.475,165.6113,321.6891,0,0,0,100,0), +(@PATH,10,3798.725,252.1113,321.4391,0,0,0,100,0), +(@PATH,11,3899.725,81.86133,323.4391,0,0,0,100,0), +(@PATH,12,3936.975,216.1113,321.6891,0,0,0,100,0), +(@PATH,13,3798.725,252.1113,321.4391,0,0,0,100,0), +(@PATH,14,3755.975,93.86133,323.4391,0,0,0,100,0), +(@PATH,15,3785.475,362.1113,321.9391,0,0,0,100,0), +(@PATH,16,3798.725,252.1113,321.4391,0,0,0,100,0); + +SET @NPC := 100226; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3447.796,171.34,125.7842,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3447.796,171.34,125.7842,0,0,0,100,0), +(@PATH,2,3456.033,100.7345,125.7842,0,0,0,100,0), +(@PATH,3,3388.28,76.85818,125.7842,0,0,0,100,0), +(@PATH,4,3360.649,126.0434,125.7842,0,0,0,100,0), +(@PATH,5,3368.991,199.87,125.7842,0,0,0,100,0), +(@PATH,6,3432.052,296.2538,125.7842,0,0,0,100,0), +(@PATH,7,3465.493,406.8654,125.7842,0,0,0,100,0), +(@PATH,8,3397.028,457.6761,125.7842,0,0,0,100,0), +(@PATH,9,3354.537,408.359,125.7842,0,0,0,100,0), +(@PATH,10,3384.226,319.0551,125.7842,0,0,0,100,0), +(@PATH,11,3433.646,226.0049,125.7842,0,0,0,100,0); + +SET @NPC := 130999; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26925,571,1,1,6376,0,3750.984,407.8766,254.1891,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3750.984,407.8766,254.1891,0,0,0,100,0), +(@PATH,2,3786.711,439.0684,254.1891,0,0,0,100,0), +(@PATH,3,3830.952,442.1341,254.1891,0,0,0,100,0), +(@PATH,4,3862.503,430.8392,254.1891,0,0,0,100,0), +(@PATH,5,3882.549,422.6376,254.1891,0,0,0,100,0), +(@PATH,6,3890.228,394.8426,254.1891,0,0,0,100,0), +(@PATH,7,3871.091,383.1622,254.1891,0,0,0,100,0), +(@PATH,8,3860.575,369.1732,254.1891,0,0,0,100,0), +(@PATH,9,3840.769,340.5143,257.8279,0,0,0,100,0), +(@PATH,10,3832.232,320.8624,264.8557,0,0,0,100,0), +(@PATH,11,3801.307,290.9948,262.5502,0,0,0,100,0), +(@PATH,12,3775.203,268.874,254.1891,0,0,0,100,0), +(@PATH,13,3772.475,266.6113,254.1891,0,0,0,100,0), +(@PATH,14,3748.613,298.5957,254.1891,0,0,0,100,0), +(@PATH,15,3725.111,325.421,254.1891,0,0,0,100,0), +(@PATH,16,3718.476,358.75,254.1891,0,0,0,100,0), +(@PATH,17,3726.624,371.3951,254.1891,0,0,0,100,0); + +-- Wyrmrest Guardian + +DELETE FROM `creature` WHERE `guid` IN (100823,100824,100825,100826,131035,131036,131037,131038,131039,131040,131041,131042,131043,131044,131045,131046,131047,131048,131049,131050); +UPDATE `creature_template` SET `speed_walk`=7/2,`speed_run`=15/7,`InhabitType`=4 WHERE `entry`=26933; + +SET @NPC := 100823; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3791.882,255.4148,152.3366,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3791.882,255.4148,152.3366,0,0,0,100,0), +(@PATH,2,3834.405,230.3203,152.3366,0,0,0,100,0), +(@PATH,3,3876.825,233.7821,152.3366,0,0,0,100,0), +(@PATH,4,3900.443,242.9511,152.3366,0,0,0,100,0), +(@PATH,5,3916.114,280.9176,152.3366,0,0,0,100,0), +(@PATH,6,3906.543,328.6796,152.3366,0,0,0,100,0), +(@PATH,7,3897.018,362.4748,152.3366,0,0,0,100,0), +(@PATH,8,3881.718,402.3574,152.3366,0,0,0,100,0), +(@PATH,9,3858.27,431.4729,152.3366,0,0,0,100,0), +(@PATH,10,3816.65,448.8396,152.3366,0,0,0,100,0), +(@PATH,11,3767.092,457.8965,152.3366,0,0,0,100,0), +(@PATH,12,3720.177,443.4765,152.3366,0,0,0,100,0), +(@PATH,13,3699.901,410.0056,152.3366,0,0,0,100,0), +(@PATH,14,3723.531,374.0899,152.3366,0,0,0,100,0), +(@PATH,15,3739.026,327.0149,152.3366,0,0,0,100,0), +(@PATH,16,3762.99,312.7233,152.3366,0,0,0,100,0), +(@PATH,17,3774.031,299.9361,152.3366,0,0,0,100,0), +(@PATH,18,3786.234,277.9988,152.3366,0,0,0,100,0); + +SET @NPC := 100824; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3559.792,412.912,244.8625,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3559.792,412.912,244.8625,0,0,0,100,0), +(@PATH,2,3625.949,456.7731,244.8625,0,0,0,100,0), +(@PATH,3,3683.285,437.189,244.8625,0,0,0,100,0), +(@PATH,4,3727.341,385.3615,244.8625,0,0,0,100,0), +(@PATH,5,3786.656,388.9702,244.8625,0,0,0,100,0), +(@PATH,6,3811.097,463.1342,244.8625,0,0,0,100,0), +(@PATH,7,3769.007,516.1342,244.8625,0,0,0,100,0), +(@PATH,8,3685.209,493.7117,244.8625,0,0,0,100,0), +(@PATH,9,3589.482,475.7777,244.8625,0,0,0,100,0), +(@PATH,10,3491.84,496.9259,244.8625,0,0,0,100,0), +(@PATH,11,3406.895,485.8197,244.8625,0,0,0,100,0), +(@PATH,12,3370.333,427.0351,244.8625,0,0,0,100,0), +(@PATH,13,3411.417,366.7467,244.8625,0,0,0,100,0), +(@PATH,14,3479.214,376.5652,244.8625,0,0,0,100,0); + +SET @NPC := 100825; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3424.446,300.7501,194.3189,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3424.446,300.7501,194.3189,0,0,0,100,0), +(@PATH,2,3427.025,177.7048,194.3189,0,0,0,100,0), +(@PATH,3,3508.415,97.62153,194.3189,0,0,0,100,0), +(@PATH,4,3635.289,110.5046,194.3189,0,0,0,100,0), +(@PATH,5,3728.01,244.8104,194.3189,0,0,0,100,0), +(@PATH,6,3655.76,402.0861,194.3189,0,0,0,100,0), +(@PATH,7,3513.567,405.2664,194.3189,0,0,0,100,0); + +SET @NPC := 100826; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3457.605,232.8917,280.631,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3457.605,232.8917,280.631,0,0,0,100,0), +(@PATH,2,3414.099,307.4206,280.631,0,0,0,100,0), +(@PATH,3,3470.344,415.2286,280.631,0,0,0,100,0), +(@PATH,4,3607.002,418.6074,280.631,0,0,0,100,0), +(@PATH,5,3711.957,340.5557,280.631,0,0,0,100,0), +(@PATH,6,3720.49,226.3188,280.631,0,0,0,100,0), +(@PATH,7,3642.503,140.184,280.631,0,0,0,100,0), +(@PATH,8,3516.544,159.0889,280.631,0,0,0,100,0); + +SET @NPC := 131035; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3559.792,412.912,244.8625,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3559.792,412.912,244.8625,0,0,0,100,0), +(@PATH,2,3625.949,456.7731,244.8625,0,0,0,100,0), +(@PATH,3,3683.285,437.189,244.8625,0,0,0,100,0), +(@PATH,4,3727.341,385.3615,244.8625,0,0,0,100,0), +(@PATH,5,3786.656,388.9702,244.8625,0,0,0,100,0), +(@PATH,6,3811.097,463.1342,244.8625,0,0,0,100,0), +(@PATH,7,3769.007,516.1342,244.8625,0,0,0,100,0), +(@PATH,8,3685.209,493.7117,244.8625,0,0,0,100,0), +(@PATH,9,3589.482,475.7777,244.8625,0,0,0,100,0), +(@PATH,10,3491.84,496.9259,244.8625,0,0,0,100,0), +(@PATH,11,3406.895,485.8197,244.8625,0,0,0,100,0), +(@PATH,12,3370.333,427.0351,244.8625,0,0,0,100,0), +(@PATH,13,3411.417,366.7467,244.8625,0,0,0,100,0), +(@PATH,14,3479.214,376.5652,244.8625,0,0,0,100,0); + +SET @NPC := 131036; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3438.608,283.5485,224.3952,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3438.608,283.5485,224.3952,0,0,0,100,0), +(@PATH,2,3422.991,341.0565,224.3952,0,0,0,100,0), +(@PATH,3,3372.117,385.6395,224.3952,0,0,0,100,0), +(@PATH,4,3315.855,342.7029,224.3952,0,0,0,100,0), +(@PATH,5,3294.378,270.6668,224.3952,0,0,0,100,0), +(@PATH,6,3321.572,194.6726,224.3952,0,0,0,100,0), +(@PATH,7,3385.174,162.3308,224.3952,0,0,0,100,0), +(@PATH,8,3437.712,218.1042,224.3952,0,0,0,100,0); + +SET @NPC := 131037; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3337.373,175.2911,169.6936,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3337.373,175.2911,169.6936,0,0,0,100,0), +(@PATH,2,3292.872,421.84,169.6936,0,0,0,100,0), +(@PATH,3,3355.351,609.4697,169.6936,0,0,0,100,0), +(@PATH,4,3233.689,777.6954,207.249,0,0,0,100,0), +(@PATH,5,3049.014,721.6703,224.4991,0,0,0,100,0), +(@PATH,6,3044.268,566.5984,169.6936,0,0,0,100,0), +(@PATH,7,3142.397,481.2142,169.6936,0,0,0,100,0), +(@PATH,8,3328.336,435.8111,169.6936,0,0,0,100,0), +(@PATH,9,3583.232,539.7742,169.6936,0,0,0,100,0), +(@PATH,10,3799.81,460.638,169.6936,0,0,0,100,0), +(@PATH,11,3717.946,244.38,169.6936,0,0,0,100,0), +(@PATH,12,3542.247,134.1484,169.6936,0,0,0,100,0), +(@PATH,13,3378.177,251.381,169.6936,0,0,0,100,0), +(@PATH,14,3448.559,417.0887,169.6936,0,0,0,100,0), +(@PATH,15,3659.633,429.129,169.6936,0,0,0,100,0), +(@PATH,16,3726.806,236.8274,169.6936,0,0,0,100,0), +(@PATH,17,3554.261,69.58746,169.6936,0,0,0,100,0); + +SET @NPC := 131038; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26933,571,1,1,0,0,3738.288,310.6056,206.0655,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3738.288,310.6056,206.0655,0,0,0,100,0), +(@PATH,1,3775.943,320.1521,206.0655,0,0,0,100,0), +(@PATH,1,3791.984,364.0035,206.0655,0,0,0,100,0), +(@PATH,1,3821.821,375.4122,206.0655,0,0,0,100,0), +(@PATH,1,3862.769,402.7154,206.0655,0,0,0,100,0), +(@PATH,1,3833.872,426.7561,206.0655,0,0,0,100,0), +(@PATH,1,3796.899,413.8476,206.0655,0,0,0,100,0), +(@PATH,1,3780.125,433.8598,206.0655,0,0,0,100,0), +(@PATH,1,3736.043,443.3744,206.0655,0,0,0,100,0), +(@PATH,1,3713.603,445.3026,206.0655,0,0,0,100,0), +(@PATH,1,3683.613,406.9387,206.0655,0,0,0,100,0), +(@PATH,1,3706.474,364.4982,206.0655,0,0,0,100,0), +(@PATH,1,3712.073,324.8767,206.0655,0,0,0,100,0); -- cgit v1.2.3 From 4392b499837d5ac2927e422186110a5b160d00fa Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 2 Jun 2012 21:49:58 -0230 Subject: DB/misc: Fix up some flying creatures and remove some creature_addons. --- sql/updates/world/2012_06_02_07_world_Misc.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_06_02_07_world_Misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_07_world_Misc.sql b/sql/updates/world/2012_06_02_07_world_Misc.sql new file mode 100644 index 00000000000..c541819841c --- /dev/null +++ b/sql/updates/world/2012_06_02_07_world_Misc.sql @@ -0,0 +1,6 @@ +-- Fix some Flying Stormpeaks Wyms +UPDATE `creature_addon` SET `bytes1`=50331648 WHERE `guid` IN (101109,101111,101112,101121,101123,101124); +-- Fix some Flying Wild Wyms +UPDATE `creature_addon` SET `bytes1`=50331648 WHERE `guid` IN (202972,202973,202974,202975,202976,202977); +-- remove some bad creature_addon records +DELETE FROM `creature_addon` WHERE `guid` NOT IN (SELECT `guid` FROM `creature`); -- cgit v1.2.3 From 7e454b26ac28250967dbd3519a39ecb5eb6cd014 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Sun, 3 Jun 2012 02:35:00 +0200 Subject: more updates --- .../2012_05_28_01_world_spell_script_names.sql | 28 +- .../2012_05_28_02_world_spelldifficulty_dbc.sql | 7 +- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 122 +------- src/server/game/Spells/Spell.cpp | 43 --- src/server/game/Spells/SpellEffects.cpp | 340 +-------------------- .../BattleForMountHyjal/boss_kazrogal.cpp | 102 +++++-- .../Ulduar/HallsOfStone/boss_krystallus.cpp | 78 ++++- .../scripts/Outland/GruulsLair/boss_gruul.cpp | 89 +++++- .../scripts/Outland/boss_doomlord_kazzak.cpp | 54 +++- src/server/scripts/Spells/spell_dk.cpp | 11 - src/server/scripts/Spells/spell_druid.cpp | 167 +++++++++- src/server/scripts/Spells/spell_generic.cpp | 242 +++++++++++++++ src/server/scripts/Spells/spell_hunter.cpp | 55 +++- src/server/scripts/Spells/spell_paladin.cpp | 39 +++ src/server/scripts/Spells/spell_shaman.cpp | 49 +++ 15 files changed, 882 insertions(+), 544 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_01_world_spell_script_names.sql b/sql/updates/world/2012_05_28_01_world_spell_script_names.sql index 78054aa1555..e1db8fff869 100644 --- a/sql/updates/world/2012_05_28_01_world_spell_script_names.sql +++ b/sql/updates/world/2012_05_28_01_world_spell_script_names.sql @@ -1,9 +1,13 @@ -DELETE FROM `spell_script_names` WHERE `spell_id` IN (-633,781,-746,-8050,-34914,-44457,-48181,-30108,34438,34439,35183,43522,65812,68154,68155,68156,-33763,43421,52551,53608,57762,59990,66093,67957,67958,67959,7057,28832,28833,28834,28835,27831,55638,52942,59837,63322); +DELETE FROM `spell_script_names` WHERE `spell_id` IN (-633,781,-746,1515,6495,-8050,-16972,31789,-34914,-44457,-48181,-30108,34438,34439,35183,43522,65812,68154,68155,68156,52610,61336,-33763,40133,40132,43421,52551,53608,57762,59990,66093,67957,67958,67959,7057,28832,28833,28834,28835,27831,55638,31447,32960,33654,33671,50810,61546,50811,61547,52942,59837,63322,47977,48025,54729,71342,72286,74856,75614,75973); INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (-633, 'spell_pal_lay_on_hands'), (781, 'spell_hun_disengage'), (-746, 'spell_gen_bandage'), +(1515, 'spell_hun_tame_beast'), +(6495, 'spell_sha_sentry_totem'), (-8050, 'spell_sha_flame_shock'), +(-16972,'spell_dru_predatory_strikes'), +(31789, 'spell_pal_righteous_defense'), (-34914,'spell_pri_vampiric_touch'), (-44457,'spell_mage_living_bomb'), (-48181,'spell_warl_haunt'), @@ -16,7 +20,11 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (68154, 'spell_faction_champion_warl_unstable_affliction'), (68155, 'spell_faction_champion_warl_unstable_affliction'), (68156, 'spell_faction_champion_warl_unstable_affliction'), +(52610, 'spell_dru_savage_roar'), +(61336, 'spell_dru_survival_instincts'), (-33763,'spell_dru_lifebloom'), +(40133, 'spell_gen_summon_fire_elemental'), +(40132, 'spell_gen_summon_earth_elemental'), (43421, 'spell_hexlord_lifebloom'), (52551, 'spell_tur_ragepaw_lifebloom'), (53608, 'spell_cenarion_scout_lifebloom'), @@ -33,6 +41,22 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (28835, 'spell_four_horsemen_mark'), (27831, 'spell_gothic_shadow_bolt_volley'), (55638, 'spell_gothic_shadow_bolt_volley'), +(31447, 'spell_mark_of_kazrogal'), +(32960, 'spell_mark_of_kazzak'), +(33654, 'spell_gruul_shatter'), +(33671, 'spell_gruul_shatter_effect'), +(50810, 'spell_krystallus_shatter'), +(61546, 'spell_krystallus_shatter'), +(50811, 'spell_krystallus_shatter_effect'), +(61547, 'spell_krystallus_shatter_effect'), (52942, 'spell_loken_pulsing_shockwave'), (59837, 'spell_loken_pulsing_shockwave'), -(63322, 'spell_general_vezax_saronite_vapors'); +(63322, 'spell_general_vezax_saronite_vapors'), +(47977, 'spell_magic_broom'), +(48025, 'spell_headless_horseman_mount'), +(54729, 'spell_winged_steed_of_the_ebon_blade'), +(71342, 'spell_big_love_rocket'), +(72286, 'spell_invincible'), +(74856, 'spell_blazing_hippogryph'), +(75614, 'spell_celestial_steed'), +(75973, 'spell_x53_touring_rocket'); diff --git a/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql b/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql index 93749c9c5cd..8caaf1a6fc7 100644 --- a/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql +++ b/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql @@ -1,5 +1,6 @@ SET @DIFF := xxxx; -- set by TDB team -DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (@DIFF+0,@DIFF+1); +DELETE FROM `spelldifficulty_dbc` WHERE `id` BETWEEN @DIFF+0 AND @DIFF+2; INSERT INTO `spelldifficulty_dbc` (`id`,`spelld0`,`spellid1`,`spelld2`,`spellid3`) VALUES -(@DIFF+0,57762,57763,0,0), -(@DIFF+1,59990,61489,0,0); +(@DIFF+0,50811,61547,0,0), +(@DIFF+1,57762,59990,0,0), +(@DIFF+2,57763,61489,0,0); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 84007370a9a..6783efea5f9 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4948,38 +4948,6 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool target->SetEntry(apply ? 17654 : 17326); break; } - //Summon Fire Elemental - case 40133: - { - if (!caster) - break; - - Unit* owner = caster->GetOwner(); - if (owner && owner->GetTypeId() == TYPEID_PLAYER) - { - if (apply) - owner->CastSpell(owner, 8985, true); - else - owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); - } - break; - } - //Summon Earth Elemental - case 40132 : - { - if (!caster) - break; - - Unit* owner = caster->GetOwner(); - if (owner && owner->GetTypeId() == TYPEID_PLAYER) - { - if (apply) - owner->CastSpell(owner, 19704, true); - else - owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); - } - break; - } case 57819: // Argent Champion case 57820: // Ebon Champion case 57821: // Champion of the Kirin Tor @@ -5072,69 +5040,14 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool } case SPELLFAMILY_DRUID: { - if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) - break; - switch (GetId()) - { - case 52610: // Savage Roar - { - uint32 spellId = 62071; - if (apply) - { - if (target->GetShapeshiftForm() != FORM_CAT) - break; - - target->CastSpell(target, spellId, true, NULL, NULL, GetCasterGUID()); - break; - } - target->RemoveAurasDueToSpell(spellId); - break; - } - case 61336: // Survival Instincts - { - if (!(mode & AURA_EFFECT_HANDLE_REAL)) - break; - - if (apply) - { - if (!target->IsInFeralForm()) - break; - - int32 bp0 = int32(target->CountPctFromMaxHealth(GetAmount())); - target->CastCustomSpell(target, 50322, &bp0, NULL, NULL, true); - } - else - target->RemoveAurasDueToSpell(50322); - break; - } - } - // Predatory Strikes - if (target->GetTypeId() == TYPEID_PLAYER && GetSpellInfo()->SpellIconID == 1563) - { - target->ToPlayer()->UpdateAttackPowerAndDamage(); - } + //if (!(mode & AURA_EFFECT_HANDLE_REAL)) + //break; break; } case SPELLFAMILY_SHAMAN: { - if (!(mode & AURA_EFFECT_HANDLE_REAL)) - break; - // Sentry Totem - if (GetId() == 6495 && caster && caster->GetTypeId() == TYPEID_PLAYER) - { - if (apply) - { - if (uint64 guid = caster->m_SummonSlot[4]) - { - if (Creature* totem = caster->GetMap()->GetCreature(guid)) - if (totem->isTotem()) - caster->ToPlayer()->CastSpell(totem, 6277, true); - } - } - else - caster->ToPlayer()->StopCastingBindSight(); - return; - } + //if (!(mode & AURA_EFFECT_HANDLE_REAL)) + //break; break; } case SPELLFAMILY_PALADIN: @@ -6428,33 +6341,6 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con target->AddThreat(caster, float(gainedAmount) * 0.5f, GetSpellInfo()->GetSchoolMask(), GetSpellInfo()); } - // spell-specific code - switch (GetId()) - { - case 31447: // Mark of Kaz'rogal - if (target->GetPower(powerType) == 0) - { - target->CastSpell(target, 31463, true, 0, this); - // Remove aura - GetBase()->SetDuration(0); - } - break; - case 32960: // Mark of Kazzak - { - int32 modifier = int32(target->GetPower(powerType) * 0.05f); - target->ModifyPower(powerType, -modifier); - - if (target->GetPower(powerType) == 0) - { - target->CastSpell(target, 32961, true, 0, this); - // Remove aura - GetBase()->SetDuration(0); - } - break; - } - default: - break; - } // Drain Mana if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->SpellFamilyFlags[0] & 0x00000010) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index e2fe6159ac5..8165c8172d7 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4960,20 +4960,6 @@ SpellCastResult Spell::CheckCast(bool strict) // for effects of spells that have only one target switch (m_spellInfo->Effects[i].Effect) { - case SPELL_EFFECT_DUMMY: - { - if (m_spellInfo->Id == 31789) // Righteous Defense - { - if (m_caster->GetTypeId() != TYPEID_PLAYER) - return SPELL_FAILED_DONT_REPORT; - - Unit* target = m_targets.GetUnitTarget(); - if (!target || !target->IsFriendlyTo(m_caster) || target->getAttackers().empty()) - return SPELL_FAILED_BAD_TARGETS; - - } - break; - } case SPELL_EFFECT_LEARN_SPELL: { if (m_caster->GetTypeId() != TYPEID_PLAYER) @@ -5320,35 +5306,6 @@ SpellCastResult Spell::CheckCast(bool strict) //custom check switch (m_spellInfo->Id) { - case 61336: - if (m_caster->GetTypeId() != TYPEID_PLAYER || !m_caster->ToPlayer()->IsInFeralForm()) - return SPELL_FAILED_ONLY_SHAPESHIFT; - break; - case 1515: - { - if (m_caster->GetTypeId() != TYPEID_PLAYER) - return SPELL_FAILED_BAD_TARGETS; - - if (!m_targets.GetUnitTarget() || m_targets.GetUnitTarget()->GetTypeId() == TYPEID_PLAYER) - return SPELL_FAILED_BAD_IMPLICIT_TARGETS; - - Creature* target = m_targets.GetUnitTarget()->ToCreature(); - - if (target->getLevel() > m_caster->getLevel()) - return SPELL_FAILED_HIGHLEVEL; - - // use SMSG_PET_TAME_FAILURE? - if (!target->GetCreatureTemplate()->isTameable (m_caster->ToPlayer()->CanTameExoticPets())) - return SPELL_FAILED_BAD_TARGETS; - - if (m_caster->GetPetGUID()) - return SPELL_FAILED_ALREADY_HAVE_SUMMON; - - if (m_caster->GetCharmGUID()) - return SPELL_FAILED_ALREADY_HAVE_CHARM; - - break; - } case 44795: // Parachute { float x, y, z; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 547a384920a..2f98bbcf7ec 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -353,21 +353,6 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) return; break; } - case 33671: // gruul's shatter - case 50811: // krystallus shatter ( Normal ) - case 61547: // krystallus shatter ( Heroic ) - { - // don't damage self and only players - if (unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - float radius = m_spellInfo->Effects[EFFECT_0].CalcRadius(m_caster); - if (!radius) - return; - float distance = m_caster->GetDistance2d(unitTarget); - damage = (distance > radius) ? 0 : int32(m_spellInfo->Effects[EFFECT_0].CalcValue(m_caster) * ((radius - distance)/radius)); - break; - } // Gargoyle Strike case 51963: { @@ -3774,12 +3759,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!itemTarget && m_caster->GetTypeId() != TYPEID_PLAYER) return; - uint32 spell_id = 0; - switch (urand(1, 5)) - { - case 1: spell_id = 8854; break; - default: spell_id = 8855; break; - } + uint32 spell_id = roll_chance_i(20) ? 8854 : 8855; m_caster->CastSpell(m_caster, spell_id, true, NULL); return; @@ -3826,10 +3806,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) unitTarget->HandleEmoteCommand(EMOTE_STATE_DANCE); return; } - // Escape artist - case 20589: - m_caster->RemoveMovementImpairingAuras(); - return; // Decimate case 28374: case 54426: @@ -3860,15 +3836,8 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) DoCreateItem(effIndex, item); break; } - // Improved Sprint - case 30918: - { - // Removes snares and roots. - unitTarget->RemoveMovementImpairingAuras(); - break; - } - // Spirit Walk - case 58876: + case 20589: // Escape artist + case 30918: // Improved Sprint { // Removes snares and roots. unitTarget->RemoveMovementImpairingAuras(); @@ -3886,96 +3855,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } } break; - case 48025: // Headless Horseman's Mount - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill and zone - bool canFly = true; - uint32 v_map = GetVirtualMapForMapAndZone(unitTarget->GetMapId(), unitTarget->GetZoneId()); - if (v_map != 530 && v_map != 571) - canFly = false; - - if (canFly && v_map == 571 && !unitTarget->ToPlayer()->HasSpell(54197)) - canFly = false; - - float x, y, z; - unitTarget->GetPosition(x, y, z); - uint32 areaFlag = unitTarget->GetBaseMap()->GetAreaFlag(x, y, z); - AreaTableEntry const* pArea = sAreaStore.LookupEntry(areaFlag); - if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) - canFly = false; - - switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) - { - case 75: unitTarget->CastSpell(unitTarget, 51621, true); break; - case 150: unitTarget->CastSpell(unitTarget, 48024, true); break; - case 225: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 51617, true); - else - unitTarget->CastSpell(unitTarget, 48024, true); - }break; - case 300: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 48023, true); - else - unitTarget->CastSpell(unitTarget, 48024, true); - }break; - } - return; - } - case 47977: // Magic Broom - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill and zone - bool canFly = true; - uint32 v_map = GetVirtualMapForMapAndZone(unitTarget->GetMapId(), unitTarget->GetZoneId()); - if (v_map != 530 && v_map != 571) - canFly = false; - - if (canFly && v_map == 571 && !unitTarget->ToPlayer()->HasSpell(54197)) - canFly = false; - - float x, y, z; - unitTarget->GetPosition(x, y, z); - uint32 areaFlag = unitTarget->GetBaseMap()->GetAreaFlag(x, y, z); - AreaTableEntry const* pArea = sAreaStore.LookupEntry(areaFlag); - if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) - canFly = false; - - switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) - { - case 75: unitTarget->CastSpell(unitTarget, 42680, true); break; - case 150: unitTarget->CastSpell(unitTarget, 42683, true); break; - case 225: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 42667, true); - else - unitTarget->CastSpell(unitTarget, 42683, true); - }break; - case 300: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 42668, true); - else - unitTarget->CastSpell(unitTarget, 42683, true); - }break; - } - return; - } // Mug Transformation case 41931: { @@ -4167,25 +4046,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (unitTarget) unitTarget->CastSpell(m_caster, damage, true); return; - // Winged Steed of the Ebon Blade - case 54729: - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill - if (uint16 skillval = unitTarget->ToPlayer()->GetSkillValue(SKILL_RIDING)) - { - if (skillval >= 300) - unitTarget->CastSpell(unitTarget, 54727, true); - else - unitTarget->CastSpell(unitTarget, 54726, true); - } - return; - } case 57347: // Retrieving (Wintergrasp RP-GG pickup spell) { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER) @@ -4268,188 +4128,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) m_caster->CastSpell(m_caster, 63919, true); return; } - case 71342: // Big Love Rocket - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill and zone - bool canFly = true; - uint32 v_map = GetVirtualMapForMapAndZone(unitTarget->GetMapId(), unitTarget->GetZoneId()); - if (v_map != 530 && v_map != 571) - canFly = false; - - if (canFly && v_map == 571 && !unitTarget->ToPlayer()->HasSpell(54197)) - canFly = false; - - float x, y, z; - unitTarget->GetPosition(x, y, z); - uint32 areaFlag = unitTarget->GetBaseMap()->GetAreaFlag(x, y, z); - AreaTableEntry const* pArea = sAreaStore.LookupEntry(areaFlag); - if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) - canFly = false; - - switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) - { - case 0: unitTarget->CastSpell(unitTarget, 71343, true); break; - case 75: unitTarget->CastSpell(unitTarget, 71344, true); break; - case 150: unitTarget->CastSpell(unitTarget, 71345, true); break; - case 225: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 71346, true); - else - unitTarget->CastSpell(unitTarget, 71345, true); - }break; - case 300: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 71347, true); - else - unitTarget->CastSpell(unitTarget, 71345, true); - }break; - } - return; - } - case 72286: // Invincible - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill and zone - bool canFly = true; - uint32 v_map = GetVirtualMapForMapAndZone(unitTarget->GetMapId(), unitTarget->GetZoneId()); - if (v_map != 530 && v_map != 571) - canFly = false; - - if (canFly && v_map == 571 && !unitTarget->ToPlayer()->HasSpell(54197)) - canFly = false; - - float x, y, z; - unitTarget->GetPosition(x, y, z); - uint32 areaFlag = unitTarget->GetBaseMap()->GetAreaFlag(x, y, z); - AreaTableEntry const* pArea = sAreaStore.LookupEntry(areaFlag); - if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) - canFly = false; - - switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) - { - case 75: unitTarget->CastSpell(unitTarget, 72281, true); break; - case 150: unitTarget->CastSpell(unitTarget, 72282, true); break; - case 225: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 72283, true); - else - unitTarget->CastSpell(unitTarget, 72282, true); - }break; - case 300: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 72284, true); - else - unitTarget->CastSpell(unitTarget, 72282, true); - }break; - } - return; - } - case 74856: // Blazing Hippogryph - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill - if (uint16 skillval = unitTarget->ToPlayer()->GetSkillValue(SKILL_RIDING)) - { - if (skillval >= 300) - unitTarget->CastSpell(unitTarget, 74855, true); - else - unitTarget->CastSpell(unitTarget, 74854, true); - } - return; - } - case 75614: // Celestial Steed - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts and client crashes upon dismounting - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill and zone - bool canFly = true; - uint32 v_map = GetVirtualMapForMapAndZone(unitTarget->GetMapId(), unitTarget->GetZoneId()); - if (v_map != 530 && v_map != 571) - canFly = false; - - if (canFly && v_map == 571 && !unitTarget->ToPlayer()->HasSpell(54197)) - canFly = false; - - float x, y, z; - unitTarget->GetPosition(x, y, z); - uint32 areaFlag = unitTarget->GetBaseMap()->GetAreaFlag(x, y, z); - AreaTableEntry const* pArea = sAreaStore.LookupEntry(areaFlag); - if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) - canFly = false; - - switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) - { - case 75: unitTarget->CastSpell(unitTarget, 75619, true); break; - case 150: unitTarget->CastSpell(unitTarget, 75620, true); break; - case 225: - { - if (canFly) - unitTarget->CastSpell(unitTarget, 75617, true); - else - unitTarget->CastSpell(unitTarget, 75620, true); - }break; - case 300: - { - if (canFly) - { - if (unitTarget->ToPlayer()->Has310Flyer(false)) - unitTarget->CastSpell(unitTarget, 76153, true); - else - unitTarget->CastSpell(unitTarget, 75618, true); - } - else - unitTarget->CastSpell(unitTarget, 75620, true); - }break; - } - return; - } - case 75973: // X-53 Touring Rocket - { - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - // Prevent stacking of mounts - unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED); - - // Triggered spell id dependent on riding skill - if (uint16 skillval = unitTarget->ToPlayer()->GetSkillValue(SKILL_RIDING)) - { - if (skillval >= 300) - { - if (unitTarget->ToPlayer()->Has310Flyer(false)) - unitTarget->CastSpell(unitTarget, 76154, true); - else - unitTarget->CastSpell(unitTarget, 75972, true); - } - else - unitTarget->CastSpell(unitTarget, 75957, true); - } - return; - } case 59317: // Teleporting if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; @@ -5065,16 +4743,14 @@ void Spell::EffectDisEnchant(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (m_caster->GetTypeId() != TYPEID_PLAYER) - return; - - Player* p_caster = (Player*)m_caster; if (!itemTarget || !itemTarget->GetTemplate()->DisenchantID) return; - p_caster->UpdateCraftSkill(m_spellInfo->Id); - - m_caster->ToPlayer()->SendLoot(itemTarget->GetGUID(), LOOT_DISENCHANTING); + if (Player* caster = m_caster->ToPlayer()) + { + caster->UpdateCraftSkill(m_spellInfo->Id); + caster->SendLoot(itemTarget->GetGUID(), LOOT_DISENCHANTING); + } // item will be removed at disenchanting end } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 407faa19eaa..c1ae04cf4c0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -15,13 +15,20 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" #include "hyjal.h" #include "hyjal_trash.h" -#define SPELL_CLEAVE 31436 -#define SPELL_WARSTOMP 31480 -#define SPELL_MARK 31447 +enum Spells +{ + SPELL_CLEAVE = 31436, + SPELL_WARSTOMP = 31480, + SPELL_MARK = 31447, + SPELL_MARK_DAMAGE = 31463 +}; #define SOUND_ONDEATH 11018 @@ -162,22 +169,10 @@ public: WarStompTimer = 60000; } else WarStompTimer -= diff; - if (me->HasAura(SPELL_MARK)) - me->RemoveAurasDueToSpell(SPELL_MARK); if (MarkTimer <= diff) { - //cast dummy, useful for bos addons - me->CastCustomSpell(me, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, me->GetGUID()); + DoCastAOE(SPELL_MARK); - std::list t_list = me->getThreatManager().getThreatList(); - for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) - { - Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (target && target->GetTypeId() == TYPEID_PLAYER && target->getPowerType() == POWER_MANA) - { - target->CastSpell(target, SPELL_MARK, true);//only cast on mana users - } - } MarkTimerBase -= 5000; if (MarkTimerBase < 5500) MarkTimerBase = 5500; @@ -201,7 +196,80 @@ public: }; +class MarkTargetFilter +{ + public: + bool operator()(Unit* target) const + { + if (target->getPowerType() != POWER_MANA) + return true; + + return false; + } +}; + +class spell_mark_of_kazrogal : public SpellScriptLoader +{ + public: + spell_mark_of_kazrogal() : SpellScriptLoader("spell_mark_of_kazrogal") { } + + class spell_mark_of_kazrogal_SpellScript : public SpellScript + { + PrepareSpellScript(spell_mark_of_kazrogal_SpellScript); + + void FilterTargets(std::list& unitList) + { + unitList.remove_if(MarkTargetFilter()); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + class spell_mark_of_kazrogal_AuraScript : public AuraScript + { + PrepareAuraScript(spell_mark_of_kazrogal_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_MARK_DAMAGE)) + return false; + return true; + } + + void OnPeriodic(AuraEffect const* aurEff) + { + Unit* target = GetTarget(); + + if (target->GetPower(POWER_MANA) == 0) + { + target->CastSpell(target, SPELL_MARK_DAMAGE, true, NULL, aurEff); + // Remove aura + SetDuration(0); + } + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_mark_of_kazrogal_SpellScript(); + } + + AuraScript* GetAuraScript() const + { + return new spell_mark_of_kazrogal_AuraScript(); + } +}; + void AddSC_boss_kazrogal() { new boss_kazrogal(); + new spell_mark_of_kazrogal(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index bc57ce21a4d..e5e3daede91 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -23,7 +23,9 @@ SDComment: SDCategory: Script Data End */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" #include "halls_of_stone.h" enum Spells @@ -162,12 +164,7 @@ public: //this part should be in the core if (pSpell->Id == SPELL_SHATTER || pSpell->Id == H_SPELL_SHATTER) { - //this spell must have custom handling in the core, dealing damage based on distance - target->CastSpell(target, DUNGEON_MODE(SPELL_SHATTER_EFFECT, H_SPELL_SHATTER_EFFECT), true); - - if (target->HasAura(SPELL_STONED)) - target->RemoveAurasDueToSpell(SPELL_STONED); - + // todo: we need eventmap to kill this stuff //clear this, if we are still performing if (bIsSlam) { @@ -186,7 +183,74 @@ public: }; +class spell_krystallus_shatter : public SpellScriptLoader +{ + public: + spell_krystallus_shatter() : SpellScriptLoader("spell_krystallus_shatter") { } + + class spell_krystallus_shatter_SpellScript : public SpellScript + { + PrepareSpellScript(spell_krystallus_shatter_SpellScript); + + void HandleScript(SpellEffIndex /*effIndex*/) + { + if (Unit* target = GetHitUnit()) + { + target->RemoveAurasDueToSpell(SPELL_STONED); + target->CastSpell((Unit*)NULL, SPELL_SHATTER_EFFECT, true); + } + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_krystallus_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_krystallus_shatter_SpellScript(); + } +}; + +class spell_krystallus_shatter_effect : public SpellScriptLoader +{ + public: + spell_krystallus_shatter_effect() : SpellScriptLoader("spell_krystallus_shatter_effect") { } + + class spell_krystallus_shatter_effect_SpellScript : public SpellScript + { + PrepareSpellScript(spell_krystallus_shatter_effect_SpellScript); + + void CalculateDamage() + { + if (!GetHitUnit()) + return; + + float radius = GetSpellInfo()->Effects[EFFECT_0].CalcRadius(GetCaster()); + if (!radius) + return; + + float distance = GetCaster()->GetDistance2d(GetHitUnit()); + if (distance > 1.0f) + SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); + } + + void Register() + { + OnHit += SpellHitFn(spell_krystallus_shatter_effect_SpellScript::CalculateDamage); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_krystallus_shatter_effect_SpellScript(); + } +}; + void AddSC_boss_krystallus() { new boss_krystallus(); + new spell_krystallus_shatter(); + new spell_krystallus_shatter_effect(); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 0e654ade995..3443103fa70 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -19,11 +19,13 @@ /* ScriptData SDName: Boss_Gruul SD%Complete: 60 -SDComment: Ground Slam need further development (knock back effect and shatter effect must be added to the core) +SDComment: Ground Slam need further development (knock back effect must be added to the core) SDCategory: Gruul's Lair EndScriptData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" #include "gruuls_lair.h" enum eEnums @@ -144,12 +146,7 @@ public: //this part should be in the core if (pSpell->Id == SPELL_SHATTER) { - //this spell must have custom handling in the core, dealing damage based on distance - target->CastSpell(target, SPELL_SHATTER_EFFECT, true); - - if (target->HasAura(SPELL_STONED)) - target->RemoveAurasDueToSpell(SPELL_STONED); - + // todo: use eventmap to kill this stuff //clear this, if we are still performing if (m_bPerformingGroundSlam) { @@ -258,7 +255,83 @@ public: }; +class spell_gruul_shatter : public SpellScriptLoader +{ + public: + spell_gruul_shatter() : SpellScriptLoader("spell_gruul_shatter") { } + + class spell_gruul_shatter_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gruul_shatter_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_STONED)) + return false; + if (!sSpellMgr->GetSpellInfo(SPELL_SHATTER_EFFECT)) + return false; + return true; + } + + void HandleScript(SpellEffIndex /*effIndex*/) + { + if (Unit* target = GetHitUnit()) + { + target->RemoveAurasDueToSpell(SPELL_STONED); + target->CastSpell((Unit*)NULL, SPELL_SHATTER_EFFECT, true); + } + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_gruul_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gruul_shatter_SpellScript(); + } +}; + +class spell_gruul_shatter_effect : public SpellScriptLoader +{ + public: + spell_gruul_shatter_effect() : SpellScriptLoader("spell_gruul_shatter_effect") { } + + class spell_gruul_shatter_effect_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gruul_shatter_effect_SpellScript); + + void CalculateDamage() + { + if (!GetHitUnit()) + return; + + float radius = GetSpellInfo()->Effects[EFFECT_0].CalcRadius(GetCaster()); + if (!radius) + return; + + float distance = GetCaster()->GetDistance2d(GetHitUnit()); + if (distance > 1.0f) + SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); + } + + void Register() + { + OnHit += SpellHitFn(spell_gruul_shatter_effect_SpellScript::CalculateDamage); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_gruul_shatter_effect_SpellScript(); + } +}; + void AddSC_boss_gruul() { new boss_gruul(); + new spell_gruul_shatter(); + new spell_gruul_shatter_effect(); } diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index a213713ae1a..ab568249027 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -16,7 +16,10 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum Texts { @@ -36,6 +39,7 @@ enum Spells SPELL_THUNDERCLAP = 36706, SPELL_VOID_BOLT = 39329, SPELL_MARK_OF_KAZZAK = 32960, + SPELL_MARK_OF_KAZZAK_DAMAGE = 32961, SPELL_ENRAGE = 32964, SPELL_CAPTURE_SOUL = 32966, SPELL_TWISTED_REFLECTION = 21063, @@ -171,7 +175,55 @@ class boss_doomlord_kazzak : public CreatureScript } }; +class spell_mark_of_kazzak : public SpellScriptLoader +{ + public: + spell_mark_of_kazzak() : SpellScriptLoader("spell_mark_of_kazzak") { } + + class spell_mark_of_kazzak_AuraScript : public AuraScript + { + PrepareAuraScript(spell_mark_of_kazzak_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_KAZZAK_DAMAGE)) + return false; + return true; + } + + void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) + { + if (Unit* owner = GetUnitOwner()) + amount = CalculatePctU(owner->GetPower(POWER_MANA), 5); + } + + void OnPeriodic(AuraEffect const* aurEff) + { + Unit* target = GetTarget(); + + if (target->GetPower(POWER_MANA) == 0) + { + target->CastSpell(target, SPELL_MARK_OF_KAZZAK_DAMAGE, true, NULL, aurEff); + // Remove aura + SetDuration(0); + } + } + + void Register() + { + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mark_of_kazzak_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazzak_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_mark_of_kazzak_AuraScript(); + } +}; + void AddSC_boss_doomlordkazzak() { new boss_doomlord_kazzak(); + new spell_mark_of_kazzak(); } diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 4593d955566..b31ee0a7d3e 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -730,17 +730,6 @@ class spell_dk_death_coil : public SpellScriptLoader return true; } - SpellCastResult CheckCast() - { - Unit* caster = GetCaster(); - if (Unit* target = GetExplTargetUnit()) - { - if (target->IsFriendlyTo(caster) && target->GetCreatureType() != CREATURE_TYPE_UNDEAD) - return SPELL_FAILED_BAD_TARGETS; - } - return SPELL_CAST_OK; - } - void HandleDummy(SpellEffIndex /*effIndex*/) { int32 damage = GetEffectValue(); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 1d152e6f208..f759efbee83 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -30,7 +30,9 @@ enum DruidSpells DRUID_INCREASED_MOONFIRE_DURATION = 38414, DRUID_NATURES_SPLENDOR = 57865, DRUID_LIFEBLOOM_FINAL_HEAL = 33778, - DRUID_LIFEBLOOM_ENERGIZE = 64372 + DRUID_LIFEBLOOM_ENERGIZE = 64372, + DRUID_SURVIVAL_INSTINCTS = 50322, + DRUID_SAVAGE_ROAR = 62071 }; // 54846 Glyph of Starfire @@ -481,6 +483,166 @@ class spell_dru_lifebloom : public SpellScriptLoader } }; +class spell_dru_predatory_strikes : public SpellScriptLoader +{ + public: + spell_dru_predatory_strikes() : SpellScriptLoader("spell_dru_predatory_strikes") { } + + class spell_dru_predatory_strikes_AuraScript : public AuraScript + { + PrepareAuraScript(spell_dru_predatory_strikes_AuraScript); + + void UpdateAmount(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Player* target = GetTarget()->ToPlayer()) + target->UpdateAttackPowerAndDamage(); + } + + void Register() + { + AfterEffectApply += AuraEffectApplyFn(spell_dru_predatory_strikes_AuraScript::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectRemove += AuraEffectRemoveFn(spell_dru_predatory_strikes_AuraScript::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_dru_predatory_strikes_AuraScript(); + } +}; + +class spell_dru_savage_roar : public SpellScriptLoader +{ + public: + spell_dru_savage_roar() : SpellScriptLoader("spell_dru_savage_roar") { } + + class spell_dru_savage_roar_SpellScript : public SpellScript + { + PrepareSpellScript(spell_dru_savage_roar_SpellScript); + + SpellCastResult CheckCast() + { + Unit* caster = GetCaster(); + if (caster->GetShapeshiftForm() != FORM_CAT) + return SPELL_FAILED_ONLY_SHAPESHIFT; + + return SPELL_CAST_OK; + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_dru_savage_roar_SpellScript::CheckCast); + } + }; + + class spell_dru_savage_roar_AuraScript : public AuraScript + { + PrepareAuraScript(spell_dru_savage_roar_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(DRUID_SAVAGE_ROAR)) + return false; + return true; + } + + void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + Unit* target = GetTarget(); + int32 bp0 = aurEff->GetAmount(); // todo: check if needed + target->CastCustomSpell(target, DRUID_SAVAGE_ROAR, &bp0, NULL, NULL, true, NULL, aurEff, GetCasterGUID()); + } + + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + GetTarget()->RemoveAurasDueToSpell(DRUID_SAVAGE_ROAR); + } + + void Register() + { + // todo: check AuraEffectHandleModes + AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_dru_savage_roar_SpellScript(); + } + + AuraScript* GetAuraScript() const + { + return new spell_dru_savage_roar_AuraScript(); + } +}; + +class spell_dru_survival_instincts : public SpellScriptLoader +{ + public: + spell_dru_survival_instincts() : SpellScriptLoader("spell_dru_survival_instincts") { } + + class spell_dru_survival_instincts_SpellScript : public SpellScript + { + PrepareSpellScript(spell_dru_survival_instincts_SpellScript); + + SpellCastResult CheckCast() + { + Unit* caster = GetCaster(); + if (!caster->IsInFeralForm()) + return SPELL_FAILED_ONLY_SHAPESHIFT; + + return SPELL_CAST_OK; + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_dru_survival_instincts_SpellScript::CheckCast); + } + }; + + class spell_dru_survival_instincts_AuraScript : public AuraScript + { + PrepareAuraScript(spell_dru_survival_instincts_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(DRUID_SURVIVAL_INSTINCTS)) + return false; + return true; + } + + void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + Unit* target = GetTarget(); + int32 bp0 = target->CountPctFromMaxHealth(aurEff->GetAmount()); + target->CastCustomSpell(target, DRUID_SURVIVAL_INSTINCTS, &bp0, NULL, NULL, true); + } + + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + GetTarget()->RemoveAurasDueToSpell(DRUID_SURVIVAL_INSTINCTS); + } + + void Register() + { + // todo: check AuraEffectHandleModes + AfterEffectApply += AuraEffectApplyFn(spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectRemove += AuraEffectRemoveFn(spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_dru_survival_instincts_SpellScript(); + } + + AuraScript* GetAuraScript() const + { + return new spell_dru_survival_instincts_AuraScript(); + } +}; + void AddSC_druid_spell_scripts() { new spell_dru_glyph_of_starfire(); @@ -492,4 +654,7 @@ void AddSC_druid_spell_scripts() new spell_dru_swift_flight_passive(); new spell_dru_starfall_dummy(); new spell_dru_lifebloom(); + new spell_dru_predatory_strikes(); + new spell_dru_savage_roar(); + new spell_dru_survival_instincts(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index f61bad8db9b..b619dd9ac6f 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2802,6 +2802,238 @@ class spell_gen_lifebloom : public SpellScriptLoader uint32 _spellId; }; +enum SummonElemental +{ + SPELL_SUMMON_FIRE_ELEMENTAL = 8985, + SPELL_SUMMON_EARTH_ELEMENTAL = 19704 +}; + +class spell_gen_summon_elemental : public SpellScriptLoader +{ + public: + spell_gen_summon_elemental(const char* name, uint32 spellId) : SpellScriptLoader(name), _spellId(spellId) { } + + class spell_gen_summon_elemental_AuraScript : public AuraScript + { + PrepareAuraScript(spell_gen_summon_elemental_AuraScript); + + public: + spell_gen_summon_elemental_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(_spellId)) + return false; + return true; + } + + void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (GetCaster()) + if (Unit* owner = GetCaster()->GetOwner()) + if (owner->GetTypeId() == TYPEID_PLAYER) // todo: this check is maybe wrong + owner->CastSpell(owner, _spellId, true); + } + + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (GetCaster()) + if (Unit* owner = GetCaster()->GetOwner()) + if (owner->GetTypeId() == TYPEID_PLAYER) // todo: this check is maybe wrong + owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); + } + + void Register() + { + AfterEffectApply += AuraEffectApplyFn(spell_gen_summon_elemental_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove += AuraEffectRemoveFn(spell_gen_summon_elemental_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + + private: + uint32 _spellId; + }; + + AuraScript* GetAuraScript() const + { + return new spell_gen_summon_elemental_AuraScript(_spellId); + } + + private: + uint32 _spellId; +}; + +enum Mounts +{ + // Magic Broom + SPELL_MAGIC_BROOM_60 = 42680, + SPELL_MAGIC_BROOM_100 = 42683, + SPELL_MAGIC_BROOM_150 = 42667, + SPELL_MAGIC_BROOM_280 = 42668, + + // Headless Horseman's Mount + SPELL_HEADLESS_HORSEMAN_MOUNT_60 = 51621, + SPELL_HEADLESS_HORSEMAN_MOUNT_100 = 48024, + SPELL_HEADLESS_HORSEMAN_MOUNT_150 = 51617, + SPELL_HEADLESS_HORSEMAN_MOUNT_280 = 48023, + + // Winged Steed of the Ebon Blade + SPELL_WINGED_STEED_150 = 54726, + SPELL_WINGED_STEED_280 = 54727, + + // Big Love Rocket + SPELL_BIG_LOVE_ROCKET_0 = 71343, + SPELL_BIG_LOVE_ROCKET_60 = 71344, + SPELL_BIG_LOVE_ROCKET_100 = 71345, + SPELL_BIG_LOVE_ROCKET_150 = 71346, + SPELL_BIG_LOVE_ROCKET_310 = 71347, + + // Invincible + SPELL_INVINCIBLE_60 = 72281, + SPELL_INVINCIBLE_100 = 72282, + SPELL_INVINCIBLE_150 = 72283, + SPELL_INVINCIBLE_310 = 72284, + + // Blazing Hippogryph + SPELL_BLAZING_HIPPOGRYPH_150 = 74854, + SPELL_BLAZING_HIPPOGRYPH_280 = 74855, + + // Celestial Steed + SPELL_CELESTIAL_STEED_60 = 75619, + SPELL_CELESTIAL_STEED_100 = 75620, + SPELL_CELESTIAL_STEED_150 = 75617, + SPELL_CELESTIAL_STEED_280 = 75618, + SPELL_CELESTIAL_STEED_310 = 76153, + + // X-53 Touring Rocket + SPELL_X53_TOURING_ROCKET_150 = 75957, + SPELL_X53_TOURING_ROCKET_280 = 75972, + SPELL_X53_TOURING_ROCKET_310 = 76154, +}; + +class spell_gen_mount : public SpellScriptLoader +{ + public: + spell_gen_mount(const char* name, uint32 mount0 = 0, uint32 mount60 = 0, uint32 mount100 = 0, uint32 mount150 = 0, uint32 mount280 = 0, uint32 mount310 = 0) : SpellScriptLoader(name), + _mount0(mount0), _mount60(mount60), _mount100(mount100), _mount150(mount150), _mount280(mount280), _mount310(mount310) { } + + class spell_gen_mount_SpellScript : public SpellScript + { + PrepareSpellScript(spell_gen_mount_SpellScript); + + public: + spell_gen_mount_SpellScript(uint32 mount0, uint32 mount60, uint32 mount100, uint32 mount150, uint32 mount280, uint32 mount310) : SpellScript(), + _mount0(mount0), _mount60(mount60), _mount100(mount100), _mount150(mount150), _mount280(mount280), _mount310(mount310) { } + + bool Validate(SpellInfo const* /*spell*/) + { + if (_mount0 && !sSpellMgr->GetSpellInfo(_mount0)) + return false; + if (_mount60 && !sSpellMgr->GetSpellInfo(_mount60)) + return false; + if (_mount100 && !sSpellMgr->GetSpellInfo(_mount100)) + return false; + if (_mount150 && !sSpellMgr->GetSpellInfo(_mount150)) + return false; + if (_mount280 && !sSpellMgr->GetSpellInfo(_mount280)) + return false; + if (_mount310 && !sSpellMgr->GetSpellInfo(_mount310)) + return false; + return true; + } + + void HandleMount(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + + if (Player* target = GetHitPlayer()) + { + // Prevent stacking of mounts and client crashes upon dismounting + target->RemoveAurasByType(SPELL_AURA_MOUNTED, 0, GetHitAura()); + + // Triggered spell id dependent on riding skill and zone + bool canFly = false; + uint32 vmap = GetVirtualMapForMapAndZone(target->GetMapId(), target->GetZoneId()); + if (vmap == 530 || (vmap == 571 && target->HasSpell(54197))) + canFly = true; + + float x, y, z; + target->GetPosition(x, y, z); + uint32 areaFlag = target->GetBaseMap()->GetAreaFlag(x, y, z); + AreaTableEntry const* area = sAreaStore.LookupEntry(areaFlag); + if (!area || (canFly && (area->flags & AREA_FLAG_NO_FLY_ZONE))) + canFly = false; + + uint32 mount = 0; + switch (target->GetBaseSkillValue(SKILL_RIDING)) + { + case 0: + mount = _mount0; + break; + case 75: + mount = _mount60; + break; + case 150: + mount = _mount100; + break; + case 225: + if (canFly) + mount = _mount150; + else + mount = _mount100; + break; + case 300: + if (canFly) + { + if (_mount310 && target->Has310Flyer(false)) + mount = _mount310; + else + mount = _mount280; + } + else + mount = _mount100; + break; + default: + break; + } + + if (mount) + { + // Prevent stacking of mounts and client crashes upon dismounting + //target->RemoveAurasByType(SPELL_AURA_MOUNTED, 0, GetHitAura()); + + target->CastSpell(target, mount, true); + } + } + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_gen_mount_SpellScript::HandleMount, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + } + + private: + uint32 _mount0; + uint32 _mount60; + uint32 _mount100; + uint32 _mount150; + uint32 _mount280; + uint32 _mount310; + }; + + SpellScript* GetSpellScript() const + { + return new spell_gen_mount_SpellScript(_mount0, _mount60, _mount100, _mount150, _mount280, _mount310); + } + + private: + uint32 _mount0; + uint32 _mount60; + uint32 _mount100; + uint32 _mount150; + uint32 _mount280; + uint32 _mount310; +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -2862,4 +3094,14 @@ void AddSC_generic_spell_scripts() new spell_gen_lifebloom("spell_cenarion_scout_lifebloom", SPELL_CENARION_SCOUT_LIFEBLOOM_FINAL_HEAL); new spell_gen_lifebloom("spell_twisted_visage_lifebloom", SPELL_TWISTED_VISAGE_LIFEBLOOM_FINAL_HEAL); new spell_gen_lifebloom("spell_faction_champion_dru_lifebloom", SPELL_FACTION_CHAMPIONS_DRU_LIFEBLOOM_FINAL_HEAL); + new spell_gen_summon_elemental("spell_gen_summon_fire_elemental", SPELL_SUMMON_FIRE_ELEMENTAL); + new spell_gen_summon_elemental("spell_gen_summon_earth_elemental", SPELL_SUMMON_EARTH_ELEMENTAL); + new spell_gen_mount("spell_magic_broom", 0, SPELL_MAGIC_BROOM_60, SPELL_MAGIC_BROOM_100, SPELL_MAGIC_BROOM_150, SPELL_MAGIC_BROOM_280); + new spell_gen_mount("spell_headless_horseman_mount", 0, SPELL_HEADLESS_HORSEMAN_MOUNT_60, SPELL_HEADLESS_HORSEMAN_MOUNT_100, SPELL_HEADLESS_HORSEMAN_MOUNT_150, SPELL_HEADLESS_HORSEMAN_MOUNT_280); + new spell_gen_mount("spell_winged_steed_of_the_ebon_blade", 0, 0, 0, SPELL_WINGED_STEED_150, SPELL_WINGED_STEED_280); + new spell_gen_mount("spell_big_love_rocket", SPELL_BIG_LOVE_ROCKET_0, SPELL_BIG_LOVE_ROCKET_60, SPELL_BIG_LOVE_ROCKET_100, SPELL_BIG_LOVE_ROCKET_150, SPELL_BIG_LOVE_ROCKET_310); + new spell_gen_mount("spell_invincible", 0, SPELL_INVINCIBLE_60, SPELL_INVINCIBLE_100, SPELL_INVINCIBLE_150, SPELL_INVINCIBLE_310); + new spell_gen_mount("spell_blazing_hippogryph", 0, 0, 0, SPELL_BLAZING_HIPPOGRYPH_150, SPELL_BLAZING_HIPPOGRYPH_280); + new spell_gen_mount("spell_celestial_steed", 0, SPELL_CELESTIAL_STEED_60, SPELL_CELESTIAL_STEED_100, SPELL_CELESTIAL_STEED_150, SPELL_CELESTIAL_STEED_280, SPELL_CELESTIAL_STEED_310); + new spell_gen_mount("spell_x53_touring_rocket", 0, 0, 0, SPELL_X53_TOURING_ROCKET_150, SPELL_X53_TOURING_ROCKET_280, SPELL_X53_TOURING_ROCKET_310); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 44bc6b43c96..a2ee6c1c3a3 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -629,7 +629,8 @@ class spell_hun_disengage : public SpellScriptLoader SpellCastResult CheckCast() { - if (GetCaster()->GetTypeId() == TYPEID_PLAYER && !GetCaster()->isInCombat()) + Unit* caster = GetCaster(); + if (caster->GetTypeId() == TYPEID_PLAYER && !caster->isInCombat()) return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; return SPELL_CAST_OK; @@ -647,6 +648,57 @@ class spell_hun_disengage : public SpellScriptLoader } }; +class spell_hun_tame_beast : public SpellScriptLoader +{ + public: + spell_hun_tame_beast() : SpellScriptLoader("spell_hun_tame_beast") { } + + class spell_hun_tame_beast_SpellScript : public SpellScript + { + PrepareSpellScript(spell_hun_tame_beast_SpellScript); + + SpellCastResult CheckCast() + { + Unit* caster = GetCaster(); + if (caster->GetTypeId() != TYPEID_PLAYER) + return SPELL_FAILED_DONT_REPORT; + + if (!GetExplTargetUnit()) + return SPELL_FAILED_BAD_IMPLICIT_TARGETS; + + if (Creature* target = GetExplTargetUnit()->ToCreature()) + { + if (target->getLevel() > caster->getLevel()) + return SPELL_FAILED_HIGHLEVEL; + + // use SMSG_PET_TAME_FAILURE? + if (!target->GetCreatureTemplate()->isTameable(caster->ToPlayer()->CanTameExoticPets())) + return SPELL_FAILED_BAD_TARGETS; + + if (caster->GetPetGUID()) + return SPELL_FAILED_ALREADY_HAVE_SUMMON; + + if (caster->GetCharmGUID()) + return SPELL_FAILED_ALREADY_HAVE_CHARM; + } + else + return SPELL_FAILED_BAD_IMPLICIT_TARGETS; + + return SPELL_CAST_OK; + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_hun_tame_beast_SpellScript::CheckCast); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_hun_tame_beast_SpellScript(); + } +}; + void AddSC_hunter_spell_scripts() { new spell_hun_aspect_of_the_beast(); @@ -662,4 +714,5 @@ void AddSC_hunter_spell_scripts() new spell_hun_misdirection(); new spell_hun_misdirection_proc(); new spell_hun_disengage(); + new spell_hun_tame_beast(); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 1bc8bb20a3e..fe681032c1c 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -502,6 +502,44 @@ class spell_pal_lay_on_hands : public SpellScriptLoader } }; +class spell_pal_righteous_defense : public SpellScriptLoader +{ + public: + spell_pal_righteous_defense() : SpellScriptLoader("spell_pal_righteous_defense") { } + + class spell_pal_righteous_defense_SpellScript : public SpellScript + { + PrepareSpellScript(spell_pal_righteous_defense_SpellScript); + + SpellCastResult CheckCast() + { + Unit* caster = GetCaster(); + if (caster->GetTypeId() != TYPEID_PLAYER) + return SPELL_FAILED_DONT_REPORT; + + if (Unit* target = GetExplTargetUnit()) + { + if (!target->IsFriendlyTo(caster) || target->getAttackers().empty()) + return SPELL_FAILED_BAD_TARGETS; + } + else + return SPELL_FAILED_BAD_TARGETS; + + return SPELL_CAST_OK; + } + + void Register() + { + OnCheckCast += SpellCheckCastFn(spell_pal_righteous_defense_SpellScript::CheckCast); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_pal_righteous_defense_SpellScript(); + } +}; + void AddSC_paladin_spell_scripts() { new spell_pal_ardent_defender(); @@ -513,4 +551,5 @@ void AddSC_paladin_spell_scripts() new spell_pal_divine_storm(); new spell_pal_divine_storm_dummy(); new spell_pal_lay_on_hands(); + new spell_pal_righteous_defense(); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 1fcc9da06c4..a7c196701ad 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -43,6 +43,8 @@ enum ShamanSpells SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM = 6474, SHAMAN_TOTEM_SPELL_EARTHEN_POWER = 59566, + SHAMAN_BIND_SIGHT = 6277, + ICON_ID_SHAMAN_LAVA_FLOW = 3087, SHAMAN_LAVA_FLOWS_R1 = 51480, SHAMAN_LAVA_FLOWS_TRIGGERED_R1 = 64694, @@ -702,6 +704,52 @@ class spell_sha_flame_shock : public SpellScriptLoader } }; +class spell_sha_sentry_totem : public SpellScriptLoader +{ + public: + spell_sha_sentry_totem() : SpellScriptLoader("spell_sha_sentry_totem") { } + + class spell_sha_sentry_totem_AuraScript : public AuraScript + { + PrepareAuraScript(spell_sha_sentry_totem_AuraScript); + + bool Validate(SpellInfo const* /*spellEntry*/) + { + if (!sSpellMgr->GetSpellInfo(SHAMAN_BIND_SIGHT)) + return false; + return true; + } + + void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + { + if (Creature* totem = caster->GetMap()->GetCreature(caster->m_SummonSlot[4])) + if (totem->isTotem()) + caster->CastSpell(totem, SHAMAN_BIND_SIGHT, true); + } + } + + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (GetCaster) + if (Player* caster = GetCaster()->ToPlayer()) + caster->StopCastingBindSight(); + } + + void Register() + { + AfterEffectApply += AuraEffectApplyFn(spell_sha_sentry_totem_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove += AuraEffectRemoveFn(spell_sha_sentry_totem_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_sha_sentry_totem_AuraScript(); + } +}; + void AddSC_shaman_spell_scripts() { new spell_sha_astral_shift(); @@ -718,4 +766,5 @@ void AddSC_shaman_spell_scripts() new spell_sha_lava_lash(); new spell_sha_chain_heal(); new spell_sha_flame_shock(); + new spell_sha_sentry_totem(); } -- cgit v1.2.3 From cddc6a8a597ef3d0f47ac34e344125eaf02c767d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 2 Jun 2012 23:48:42 -0230 Subject: DB/waypoints: Pathing for Frigid Proto-Drakes --- .../world/2012_06_02_08_world_waypoints.sql | 256 +++++++++++++++++++++ 1 file changed, 256 insertions(+) create mode 100644 sql/updates/world/2012_06_02_08_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_08_world_waypoints.sql b/sql/updates/world/2012_06_02_08_world_waypoints.sql new file mode 100644 index 00000000000..60b936a7f72 --- /dev/null +++ b/sql/updates/world/2012_06_02_08_world_waypoints.sql @@ -0,0 +1,256 @@ +-- Remove Brunnhildar Drakerider Spawns +DELETE FROM `creature` WHERE `guid` IN (97922,97923); +DELETE FROM `creature_addon` WHERE `guid` IN (97922,97923); + +-- Pathing for Frigid Proto-Drake +SET @NPC := 97991; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,29460,571,1,1,0,0,7138.47,-2166.756,798.66,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7138.47,-2166.756,798.66,0,0,0,100,0), +(@PATH,2,7137.982,-2206.665,805.7148,0,0,0,100,0), +(@PATH,3,7161.205,-2258.269,804.6854,0,0,0,100,0), +(@PATH,4,7192.208,-2308.688,803.2413,0,0,0,100,0), +(@PATH,5,7234.745,-2344.972,803.0753,0,0,0,100,0), +(@PATH,6,7274.754,-2385.471,791.2989,0,0,0,100,0), +(@PATH,7,7279.244,-2432.098,788.5766,0,0,0,100,0), +(@PATH,8,7287.073,-2487.045,787.2991,0,0,0,100,0), +(@PATH,9,7313.09,-2514.464,787.2991,0,0,0,100,0), +(@PATH,10,7371.793,-2525.992,787.2991,0,0,0,100,0), +(@PATH,11,7408.351,-2485.411,787.2991,0,0,0,100,0), +(@PATH,12,7420.525,-2414.975,787.2991,0,0,0,100,0), +(@PATH,13,7408.521,-2337.311,787.2991,0,0,0,100,0), +(@PATH,14,7349.138,-2289.91,787.2991,0,0,0,100,0), +(@PATH,15,7279.763,-2277.351,787.2991,0,0,0,100,0), +(@PATH,16,7206.917,-2239.987,787.2991,0,0,0,100,0), +(@PATH,17,7179.584,-2203.606,787.2991,0,0,0,100,0), +(@PATH,18,7160.147,-2169.823,787.2991,0,0,0,100,0), +(@PATH,19,7134.891,-2128.46,787.2991,0,0,0,100,0), +(@PATH,20,7122.673,-2069.597,787.2991,0,0,0,100,0), +(@PATH,21,7104.583,-2041.353,787.2991,0,0,0,100,0), +(@PATH,22,7060.176,-2045.798,787.2991,0,0,0,100,0), +(@PATH,23,7021.334,-2089.535,787.2991,0,0,0,100,0), +(@PATH,24,7021.683,-2123.516,787.2991,0,0,0,100,0), +(@PATH,25,7055.512,-2136.21,787.2991,0,0,0,100,0), +(@PATH,26,7096.39,-2139.124,787.2991,0,0,0,100,0), +(@PATH,27,7118.583,-2150.815,787.2991,0,0,0,100,0); + +SET @NPC := 97992; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,29460,571,1,1,0,0,7368.505,-2205.943,843.7172,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7368.505,-2205.943,843.7172,0,0,0,100,0), +(@PATH,2,7368.349,-2206.931,843.7172,0,0,0,100,0), +(@PATH,3,7370.282,-2210.494,847.4096,0,0,0,100,0), +(@PATH,4,7355.707,-2244.806,829.2711,0,0,0,100,0), +(@PATH,5,7331.636,-2263.269,812.4655,0,0,0,100,0), +(@PATH,6,7302.835,-2255.226,790.5214,0,0,0,100,0); + +SET @NPC := 98025; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,29460,571,1,1,0,0,7139.471,-2158.159,806.128,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7139.471,-2158.159,806.128,0,0,0,100,0), +(@PATH,2,7174.096,-2197.912,799.7397,0,0,0,100,0), +(@PATH,3,7207.944,-2233.231,799.7397,0,0,0,100,0), +(@PATH,4,7270.875,-2270.113,799.7397,0,0,0,100,0), +(@PATH,5,7326.976,-2290.712,799.7397,0,0,0,100,0), +(@PATH,6,7398.354,-2307.759,858.0721,0,0,0,100,0), +(@PATH,7,7492.969,-2338.019,913.3103,0,0,0,100,0), +(@PATH,8,7516.403,-2341.424,929.4471,0,0,0,100,0), +(@PATH,9,7533.13,-2350.423,930.8928,0,0,0,100,0), +(@PATH,10,7542.375,-2369.76,924.0596,0,0,0,100,0), +(@PATH,11,7540.795,-2388.042,900.4768,0,0,0,100,0), +(@PATH,12,7520.372,-2426.235,856.811,0,0,0,100,0), +(@PATH,13,7490.571,-2460.841,825.395,0,0,0,100,0), +(@PATH,14,7433.976,-2476.923,806.3961,0,0,0,100,0), +(@PATH,15,7363.505,-2480.186,799.9239,0,0,0,100,0), +(@PATH,16,7322.222,-2455.095,799.9239,0,0,0,100,0), +(@PATH,17,7296.217,-2406.509,799.9239,0,0,0,100,0), +(@PATH,18,7250.124,-2348.116,796.2858,0,0,0,100,0), +(@PATH,19,7199.447,-2308.098,791.8962,0,0,0,100,0), +(@PATH,20,7165.64,-2260.306,794.3141,0,0,0,100,0), +(@PATH,21,7126.358,-2218.408,792.2291,0,0,0,100,0), +(@PATH,22,7101.756,-2200.451,797.7845,0,0,0,100,0), +(@PATH,23,7071.807,-2185.584,808.8121,0,0,0,100,0), +(@PATH,24,7043.711,-2175.546,825.1454,0,0,0,100,0), +(@PATH,25,7016.538,-2153.01,825.1454,0,0,0,100,0), +(@PATH,26,7010.379,-2118.062,825.1454,0,0,0,100,0), +(@PATH,27,7031.11,-2081.328,825.1454,0,0,0,100,0), +(@PATH,28,7067.889,-2058.581,825.1454,0,0,0,100,0), +(@PATH,29,7109.583,-2060.563,825.1454,0,0,0,100,0), +(@PATH,30,7129.145,-2089.288,825.1454,0,0,0,100,0), +(@PATH,31,7133.573,-2119.781,811.7565,0,0,0,100,0); + +SET @NPC := 98026; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,29460,571,1,1,0,0,7111.189,-2126.364,809.0059,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7111.189,-2126.364,809.0059,0,0,0,100,0), +(@PATH,2,7112.182,-2126.484,809.0059,0,0,0,100,0), +(@PATH,3,7148.073,-2168.365,801.1813,0,0,0,100,0), +(@PATH,4,7179.175,-2226.085,785.2094,0,0,0,100,0), +(@PATH,5,7223.947,-2286.013,782.9871,0,0,0,100,0), +(@PATH,6,7299.682,-2304.846,784.2374,0,0,0,100,0), +(@PATH,7,7379.366,-2316.926,796.4037,0,0,0,100,0), +(@PATH,8,7415.913,-2373.976,798.6256,0,0,0,100,0), +(@PATH,9,7412.545,-2436.63,796.9036,0,0,0,100,0), +(@PATH,10,7357.321,-2469.256,801.1813,0,0,0,100,0), +(@PATH,11,7324.498,-2460.21,801.1813,0,0,0,100,0), +(@PATH,12,7299.582,-2416.601,796.1536,0,0,0,100,0), +(@PATH,13,7311.903,-2374.752,787.5981,0,0,0,100,0), +(@PATH,14,7312.228,-2301.718,778.1539,0,0,0,100,0), +(@PATH,15,7277.36,-2261.898,778.1539,0,0,0,100,0), +(@PATH,16,7223.409,-2240.653,778.1539,0,0,0,100,0), +(@PATH,17,7146.638,-2228.195,778.1539,0,0,0,100,0), +(@PATH,18,7063.594,-2217.223,802.7003,0,0,0,100,0), +(@PATH,19,7018.785,-2211.49,814.2276,0,0,0,100,0), +(@PATH,20,6971.935,-2170.058,834.7831,0,0,0,100,0), +(@PATH,21,6970.746,-2108.841,872.616,0,0,0,100,0), +(@PATH,22,6991.211,-2071.003,882.1439,0,0,0,100,0), +(@PATH,23,7035.753,-2048.345,872.0881,0,0,0,100,0), +(@PATH,24,7091.613,-2053.953,852.9218,0,0,0,100,0), +(@PATH,25,7120.529,-2096.423,830.6169,0,0,0,100,0), +(@PATH,26,7139.663,-2146.639,806.1729,0,0,0,100,0); + +SET @NPC := 98027; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,29460,571,1,1,0,0,7325.084,-2259.102,789.8701,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7325.084,-2259.102,789.8701,0,0,0,100,0), +(@PATH,2,7324.438,-2258.339,789.8701,0,0,0,100,0), +(@PATH,3,7303.33,-2256.314,797.6193,0,0,0,100,0), +(@PATH,4,7267.175,-2247.528,794.2031,0,0,0,100,0), +(@PATH,5,7214.491,-2258.535,801.3693,0,0,0,100,0), +(@PATH,6,7172.046,-2253.232,805.3967,0,0,0,100,0), +(@PATH,7,7131.951,-2229.063,811.4247,0,0,0,100,0), +(@PATH,8,7094.743,-2214.779,814.9513,0,0,0,100,0), +(@PATH,9,7037.284,-2220.873,816.9806,0,0,0,100,0), +(@PATH,10,7001.552,-2206.268,815.3693,0,0,0,100,0), +(@PATH,11,6987.444,-2184.004,809.9804,0,0,0,100,0), +(@PATH,12,6978.424,-2132.038,810.9526,0,0,0,100,0), +(@PATH,13,7004.174,-2094.79,805.2302,0,0,0,100,0), +(@PATH,14,7061.313,-2081.083,794.8694,0,0,0,100,0), +(@PATH,15,7106.668,-2099.052,785.4243,0,0,0,100,0), +(@PATH,16,7138.966,-2157.915,783.5634,0,0,0,100,0), +(@PATH,17,7148.676,-2194.204,790.7584,0,0,0,100,0), +(@PATH,18,7161.454,-2233.868,796.2581,0,0,0,100,0), +(@PATH,19,7177.563,-2267.763,796.2305,0,0,0,100,0), +(@PATH,20,7208.712,-2314.157,792.0358,0,0,0,100,0), +(@PATH,21,7273.909,-2345.979,783.6465,0,0,0,100,0), +(@PATH,22,7368.229,-2329.532,782.4529,0,0,0,100,0), +(@PATH,23,7446.557,-2387.249,792.8419,0,0,0,100,0), +(@PATH,24,7464.88,-2459.651,777.7035,0,0,0,100,0), +(@PATH,25,7426.007,-2508.458,777.7035,0,0,0,100,0), +(@PATH,26,7367.409,-2517.811,777.7035,0,0,0,100,0), +(@PATH,27,7315.153,-2476.871,777.7035,0,0,0,100,0), +(@PATH,28,7324.871,-2419.788,787.8976,0,0,0,100,0), +(@PATH,29,7343.577,-2356.954,789.7312,0,0,0,100,0), +(@PATH,30,7355.857,-2295.399,785.1757,0,0,0,100,0), +(@PATH,31,7324.438,-2258.339,789.8701,0,0,0,100,0); + +SET @NPC := 97995; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,29460,571,1,1,0,0,7303.549,-2258.753,788.369,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7303.549,-2258.753,788.369,0,0,0,100,0), +(@PATH,2,7302.752,-2258.148,788.369,0,0,0,100,0), +(@PATH,3,7289.952,-2257.048,791.1975,0,0,0,100,0), +(@PATH,4,7258.658,-2235.294,791.1975,0,0,0,100,0), +(@PATH,5,7210.906,-2223.988,791.1975,0,0,0,100,0), +(@PATH,6,7167.373,-2232.4,791.1975,0,0,0,100,0), +(@PATH,7,7124.27,-2224.081,791.1975,0,0,0,100,0), +(@PATH,8,7086.96,-2192.181,791.1975,0,0,0,100,0), +(@PATH,9,7087.704,-2145.958,791.1975,0,0,0,100,0), +(@PATH,10,7127.069,-2118.094,791.1975,0,0,0,100,0), +(@PATH,11,7164.674,-2135.464,793.8918,0,0,0,100,0), +(@PATH,12,7182.364,-2192.978,791.1975,0,0,0,100,0), +(@PATH,13,7182.774,-2277.733,805.3915,0,0,0,100,0), +(@PATH,14,7229.842,-2333.471,805.3915,0,0,0,100,0), +(@PATH,15,7308.383,-2345.623,805.3915,0,0,0,100,0), +(@PATH,16,7376.758,-2335.746,805.3915,0,0,0,100,0), +(@PATH,17,7427.352,-2382.805,805.3915,0,0,0,100,0), +(@PATH,18,7432.168,-2464.934,805.3915,0,0,0,100,0), +(@PATH,19,7370.238,-2513.568,805.3915,0,0,0,100,0), +(@PATH,20,7321.452,-2503.377,805.3915,0,0,0,100,0), +(@PATH,21,7291.445,-2456.148,800.0583,0,0,0,100,0), +(@PATH,22,7306.158,-2414.508,794.0861,0,0,0,100,0), +(@PATH,23,7331.817,-2357.911,790.9471,0,0,0,100,0), +(@PATH,24,7331.193,-2296.791,790.9471,0,0,0,100,0), +(@PATH,25,7305.381,-2260.717,790.9471,0,0,0,100,0); + +SET @NPC := 98028; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,29460,571,1,1,0,0,7133.43,-2118.791,811.7565,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`) VALUES (@NPC,@PATH,50331648); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7133.43,-2118.791,811.7565,0,0,0,100,0), +(@PATH,2,7133.573,-2119.781,811.7565,0,0,0,100,0), +(@PATH,3,7119.039,-2128.233,806.786,0,0,0,100,0), +(@PATH,4,7129.032,-2143.773,806.786,0,0,0,100,0), +(@PATH,5,7131.506,-2163.489,806.786,0,0,0,100,0), +(@PATH,6,7125.905,-2198.75,806.786,0,0,0,100,0), +(@PATH,7,7133.987,-2234.428,806.786,0,0,0,100,0), +(@PATH,8,7170.914,-2282.005,806.786,0,0,0,100,0), +(@PATH,9,7236.963,-2311.655,806.786,0,0,0,100,0), +(@PATH,10,7279.574,-2311.321,806.786,0,0,0,100,0), +(@PATH,11,7320.696,-2339.429,806.786,0,0,0,100,0), +(@PATH,12,7334.366,-2379.159,806.786,0,0,0,100,0), +(@PATH,13,7321.908,-2419.639,819.0636,0,0,0,100,0), +(@PATH,14,7294.696,-2461.332,841.8126,0,0,0,100,0), +(@PATH,15,7277.729,-2494.843,861.1736,0,0,0,100,0), +(@PATH,16,7245.194,-2587.365,911.9794,0,0,0,100,0), +(@PATH,17,7235.221,-2664.447,911.9794,0,0,0,100,0), +(@PATH,18,7267.375,-2723.981,911.9794,0,0,0,100,0), +(@PATH,19,7364.385,-2762.505,956.4234,0,0,0,100,0), +(@PATH,20,7439.538,-2775.097,990.1998,0,0,0,100,0), +(@PATH,21,7538.208,-2706.511,1012.088,0,0,0,100,0), +(@PATH,22,7575.65,-2563.215,985.2554,0,0,0,100,0), +(@PATH,23,7521.32,-2414.249,933.5882,0,0,0,100,0), +(@PATH,24,7438.214,-2348.566,884.2285,0,0,0,100,0), +(@PATH,25,7349.768,-2296.647,830.8118,0,0,0,100,0), +(@PATH,26,7288.613,-2264.192,802.2007,0,0,0,100,0), +(@PATH,27,7231.5,-2246.911,802.2007,0,0,0,100,0), +(@PATH,28,7160.201,-2264.728,829.4783,0,0,0,100,0), +(@PATH,29,7110.628,-2294.354,859.3112,0,0,0,100,0), +(@PATH,30,7061.597,-2313.25,865.6166,0,0,0,100,0), +(@PATH,31,7008.405,-2309.793,865.6166,0,0,0,100,0), +(@PATH,32,6977.473,-2277.743,865.6166,0,0,0,100,0), +(@PATH,33,6976.358,-2204.402,846.9778,0,0,0,100,0), +(@PATH,34,7022.063,-2142,828.7004,0,0,0,100,0), +(@PATH,35,7070.062,-2121.369,822.228,0,0,0,100,0), +(@PATH,36,7112.182,-2126.484,809.0059,0,0,0,100,0); -- cgit v1.2.3 From 0c54d350fd57918761f6decc7f0bc57402915c3d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 3 Jun 2012 00:22:31 -0230 Subject: DB/creature_transport: remove dupe spawn --- sql/updates/world/2012_06_02_09_world_creature_transport.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_06_02_09_world_creature_transport.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_09_world_creature_transport.sql b/sql/updates/world/2012_06_02_09_world_creature_transport.sql new file mode 100644 index 00000000000..49bbaa58df2 --- /dev/null +++ b/sql/updates/world/2012_06_02_09_world_creature_transport.sql @@ -0,0 +1,2 @@ +-- Remove dupe spawn from transport table +DELETE FROM `creature_transport` WHERE `guid`=35; -- cgit v1.2.3 From 3888760e10b39936ceff3ee25530f04161d4a8fe Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 3 Jun 2012 00:32:03 -0230 Subject: DB/creature_transport: fix --- sql/updates/world/2012_06_02_09_world_creature_transport.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_02_09_world_creature_transport.sql b/sql/updates/world/2012_06_02_09_world_creature_transport.sql index 49bbaa58df2..9a0b062f9ea 100644 --- a/sql/updates/world/2012_06_02_09_world_creature_transport.sql +++ b/sql/updates/world/2012_06_02_09_world_creature_transport.sql @@ -1,2 +1,2 @@ -- Remove dupe spawn from transport table -DELETE FROM `creature_transport` WHERE `guid`=35; +DELETE FROM `creature_transport` WHERE `guid`=35 AND `npc_entry`=30755; -- cgit v1.2.3 From 820ce262779c05a95649fcaa10e9310f0563c7e2 Mon Sep 17 00:00:00 2001 From: kaelima Date: Sun, 3 Jun 2012 15:12:32 +0100 Subject: DB/Quests: Fix quest Magic Carpet Ride --- sql/updates/world/2012_06_03_00_world_sai.sql | 71 +++++++++++++++++++++++++++ src/server/game/Spells/SpellMgr.cpp | 3 ++ 2 files changed, 74 insertions(+) create mode 100644 sql/updates/world/2012_06_03_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_03_00_world_sai.sql b/sql/updates/world/2012_06_03_00_world_sai.sql new file mode 100644 index 00000000000..dec53519ee7 --- /dev/null +++ b/sql/updates/world/2012_06_03_00_world_sai.sql @@ -0,0 +1,71 @@ +SET @YANNI := 25459; +SET @CARPET := 25460; +SET @Q_CarpetRide := 11636; + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@YANNI,@CARPET) AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@CARPET*100,@CARPET*101,@CARPET*100+1) AND `source_type`=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 +(@YANNI,0,0,0,62,0,100,0,9162,0,0,0,11,45600,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Yanni - Cast Call of the Carpet on player'), +(@YANNI,0,1,0,62,0,100,0,9162,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Yanni - On Gossip option - Close gossip'), + +(@CARPET,0,0,0,25,0,100,0,0,0,0,0,80,@CARPET*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amazing Carpet - Call actionlist 2546000 on spawn'), +(@CARPET,0,1,0,40,0,100,0,14,0,0,0,80,@CARPET*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amazing Carpet - On WP reach - Call actionlist 2546001'), + +(@CARPET*100,9,0,0,0,0,100,0,1000,1000,0,0,11,45603,0,0,0,0,0,23,0,0,0,0,0,0,0, 'Amazing Carpet - Cast Ride Carpet on summoner'), +(@CARPET*100,9,1,0,0,0,100,0,100,100,0,0,53,0,@CARPET,0,0,0,0,1,0,0,0,0,0,0,0, 'Amazing Carpet - Load waypath'), + +(@CARPET*100+1,9,0,0,0,0,100,0,0,0,0,0,15,@Q_CarpetRide,0,0,0,0,0,23,0,0,0,0,0,0,0, 'Amazing Carpet - Give quest credit'), +(@CARPET*100+1,9,1,0,0,0,100,0,500,500,0,0,28,45602,0,0,0,0,0,23,0,0,0,0,0,0,0, 'Amazing Carpet - Remove aura 45602'), +(@CARPET*100+1,9,2,0,0,0,100,0,100,100,0,0,28,46598,0,0,0,0,0,23,0,0,0,0,0,0,0, 'Amazing Carpet - Remove aura 46598'), +(@CARPET*100+1,9,3,0,0,0,100,0,200,200,0,0,41,200,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amazing Carpet - Despawn'); + +DELETE FROM `waypoints` WHERE `entry`=@CARPET; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@CARPET,1,2751.96,6133.514,214.3789, 'Start WP'), +(@CARPET,2,2728.81,6146.472,213.5733, ''), +(@CARPET,3,2634.248,6188.829,185.9068, ''), +(@CARPET,4,2597.958,6255.91,159.7123, ''), +(@CARPET,5,2538.717,6307.643,138.9901, ''), +(@CARPET,6,2393.912,6321.946,85.79566, ''), +(@CARPET,7,2420.326,6461.604,89.3512, ''), +(@CARPET,8,2439.194,6494.39,84.93455, ''), +(@CARPET,9,2496.371,6496.766,78.76788, ''), +(@CARPET,10,2567.008,6550.509,79.90676, ''), +(@CARPET,11,2652.553,6572.071,58.54562, ''), +(@CARPET,12,2725.122,6642.299,41.57339, ''), +(@CARPET,13,2773.236,6694.341,25.49007, ''), +(@CARPET,14,2797.658,6718.523,9.212306, 'Run SmartAI script 2546001'); + +DELETE FROM `creature_template_addon` WHERE `entry` IN (@CARPET,@YANNI); +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES +(@CARPET,257, '61307'), +(@YANNI,257,NULL); + +-- Update gossip_menu to proper entry from sniff (delete wrong one 21233) +UPDATE `creature_template` SET `gossip_menu_id`=9162,`AiName`= 'SmartAI' WHERE `entry`=@YANNI; +UPDATE `creature_template` SET `exp`=2,`minlevel`=72,`maxlevel`=72,`unit_flags`=`unit_flags`|520,`speed_run`=1.42857,`VehicleId`=317,`AiName`='SmartAI',`InhabitType`=5 WHERE `entry`=@CARPET; + +UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=1,`gender`=2 WHERE `modelid`=28082; -- Amazing Flying Carpet + +DELETE FROM `gossip_menu` WHERE `entry` IN (21233,9162); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9162,12417); + +UPDATE `quest_template` SET `SpecialFlags`=`SpecialFlags`|2 WHERE `Id`=@Q_CarpetRide; + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=9162; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9162; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES +(15,9162,0,0,9,@Q_CarpetRide,0,0,0,'Show gossip option 9162 if player has quest Carpet Ride'); + +DELETE FROM `spell_target_position` WHERE `id`=45601; +INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES +(45601,571,2753.64,6131.41,210.4463,2.892622); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=45602; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,1,45602,0,0,31,0,3,@CARPET,0,0,0, '', 'Ride Carpet - Target Amazing Flying Carpet'); + +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@CARPET; +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES +(@CARPET,46598,1,0); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 06e4978eb58..cdaecdcaa20 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3238,6 +3238,9 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->EffectDieSides[0] = 0; // was 1, that should probably mean seat 0, but instead it's treated as spell 1 spellInfo->EffectBasePoints[0] = 52391; // Ride Vehicle (forces seat 0) break; + case 45602: // Ride Carpet + spellInfo->EffectBasePoints[EFFECT_0] = 0; // force seat 0, vehicle doesn't have the required seat flags for "no seat specified (-1)" + break; case 64745: // Item - Death Knight T8 Tank 4P Bonus case 64936: // Item - Warrior T8 Protection 4P Bonus spellInfo->EffectBasePoints[0] = 100; // 100% chance of procc'ing, not -10% (chance calculated in PrepareTriggersExecutedOnHit) -- cgit v1.2.3 From 87cec6b63850d165b59e3053a0ae1c29a0947317 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 3 Jun 2012 14:16:34 -0230 Subject: DB/creature/misc: Add some felboar spawns and update a few creatures. --- sql/updates/world/2012_06_03_01_world_creature.sql | 16 ++++++++++++++++ sql/updates/world/2012_06_03_02_world_misc.sql | 6 ++++++ 2 files changed, 22 insertions(+) create mode 100644 sql/updates/world/2012_06_03_01_world_creature.sql create mode 100644 sql/updates/world/2012_06_03_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_03_01_world_creature.sql b/sql/updates/world/2012_06_03_01_world_creature.sql new file mode 100644 index 00000000000..68448b31591 --- /dev/null +++ b/sql/updates/world/2012_06_03_01_world_creature.sql @@ -0,0 +1,16 @@ +-- Add more Domesticated Felboar Spawns +SET @GUID := 43456; +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+11; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,21195,530,1,1,0,0,-2547.195,1426.521,65.57381,1.465101,300,5,0,1,0,1), +(@GUID+1,21195,530,1,1,0,0,-2585.524,1448.067,53.78493,2.973133,300,5,0,1,0,1), +(@GUID+2,21195,530,1,1,0,0,-2513.349,1387.699,66.09725,4.945046,300,5,0,1,0,1), +(@GUID+3,21195,530,1,1,0,0,-2629.757,1453.611,47.29396,4.210276,300,5,0,1,0,1), +(@GUID+4,21195,530,1,1,0,0,-2582.189,1378.531,82.12544,6.054177,300,5,0,1,0,1), +(@GUID+5,21195,530,1,1,0,0,-2478.125,1412.92,25.51498,1.570796,300,5,0,1,0,1), +(@GUID+6,21195,530,1,1,0,0,-2543.231,1349.134,80.78722,5.94909,300,5,0,1,0,1), +(@GUID+7,21195,530,1,1,0,0,-2646.627,1379.277,87.30627,5.863042,300,5,0,1,0,1), +(@GUID+8,21195,530,1,1,0,0,-2611.153,1345.497,84.32706,2.073398,300,5,0,1,0,1), +(@GUID+9,21195,530,1,1,0,0,-2518.199,1318.885,70.41351,1.823595,300,5,0,1,0,1), +(@GUID+10,21195,530,1,1,0,0,-2597.69,1311.426,80.75146,3.249409,300,5,0,1,0,1), +(@GUID+11,21195,530,1,1,0,0,-2545.57,1278.59,82.01826,4.833836,300,5,0,1,0,1); diff --git a/sql/updates/world/2012_06_03_02_world_misc.sql b/sql/updates/world/2012_06_03_02_world_misc.sql new file mode 100644 index 00000000000..69de8eacdf3 --- /dev/null +++ b/sql/updates/world/2012_06_03_02_world_misc.sql @@ -0,0 +1,6 @@ +-- Misc db updates +DELETE FROM `creature_template_addon` WHERE `entry`=30476; +INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES (30476,'56852'); +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry` IN (30476,30599,30640,32193,30343); +-- fix Sholazar Tickbird InhabitType +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=28093; -- cgit v1.2.3 From ee82a71cea46c6585712ee2ea88e790c31bb7d17 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 3 Jun 2012 22:08:10 +0100 Subject: DB/Quests: Update OfferRewardText and RequestItemsText for some quests P.S This introduces less new content than what it appears to be, most updates are simple typo fixes or removing or adding an extra space --- sql/updates/world/2012_06_03_00_world_sai.sql | 2 +- .../world/2012_06_03_03_world_quest_template.sql | 603 +++++++++++++++++++++ 2 files changed, 604 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_06_03_03_world_quest_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_03_00_world_sai.sql b/sql/updates/world/2012_06_03_00_world_sai.sql index dec53519ee7..7a5932e61fc 100644 --- a/sql/updates/world/2012_06_03_00_world_sai.sql +++ b/sql/updates/world/2012_06_03_00_world_sai.sql @@ -3,7 +3,7 @@ SET @CARPET := 25460; SET @Q_CarpetRide := 11636; DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@YANNI,@CARPET) AND `source_type`=0; -DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@CARPET*100,@CARPET*101,@CARPET*100+1) AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@CARPET*100,@CARPET*100+1) AND `source_type`=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 (@YANNI,0,0,0,62,0,100,0,9162,0,0,0,11,45600,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Yanni - Cast Call of the Carpet on player'), (@YANNI,0,1,0,62,0,100,0,9162,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Yanni - On Gossip option - Close gossip'), diff --git a/sql/updates/world/2012_06_03_03_world_quest_template.sql b/sql/updates/world/2012_06_03_03_world_quest_template.sql new file mode 100644 index 00000000000..023182aaf1b --- /dev/null +++ b/sql/updates/world/2012_06_03_03_world_quest_template.sql @@ -0,0 +1,603 @@ +-- OfferRewardText +UPDATE `quest_template` SET `OfferRewardText`='Ah yes, the delivery of herbs from Shadowglen. It is a shame Porthannius could not bring it himself, for we have much to discuss, he and I. But I am glad to get the herbs nonetheless, and I am glad you came.$B$BWhile you are here, please, rest yourself. Heroes must keep their strength and spirits high, and must find rest and solace whenever they may. For to neglect one''s peace of body and mind is a sure path to failure.$B$BSo... rest.' WHERE `Id`=2159; -- Dolanaar Delivery +UPDATE `quest_template` SET `OfferRewardText`='You saved my life up there, buddy. Nice flying!' WHERE `Id`=12671; -- Reconnaissance Flight +UPDATE `quest_template` SET `OfferRewardText`='Wow... S.T.O.U.T. didn''t break... Hmm... Who would have guessed?$b$bI mean, hey, you did it! Your aim is true, or at least true enough to help guard the camp. I think you''re ready now to take on the Dark Irons if they show up again.' WHERE `Id`=12191; -- Chug and Chuck! +UPDATE `quest_template` SET `OfferRewardText`='Not bad for a new overseer. I''ve another task for you if you''re feeling brave today.' WHERE `Id`=12906; -- Discipline +UPDATE `quest_template` SET `OfferRewardText`='If I had any reservations regarding your commitment when you first arrived, I no longer have any. With just a little more effort you could be a permanent member of my operation.' WHERE `Id`=12907; -- Examples to be Made +UPDATE `quest_template` SET `OfferRewardText`='I knew you''d be back! Get me out of these shackles and I''ll help you find the goblin.' WHERE `Id`=12908; -- A Certain Prisoner +UPDATE `quest_template` SET `OfferRewardText`='You''re here -- good. I think I know where your goblin is.' WHERE `Id`=12921; -- A Change of Scenery +UPDATE `quest_template` SET `OfferRewardText`='Well done, young one. It looks like our deal has been satisfied on both our ends.' WHERE `Id`=12969; -- Is That Your Goblin? +UPDATE `quest_template` SET `OfferRewardText`='It''s settled then. You will compete in the Hyldsmeet and with my help you''ll restore great Thorim to his rightful place.' WHERE `Id`=12970; -- The Hyldsmeet +UPDATE `quest_template` SET `OfferRewardText`='Ah, the furs I was expecting. Thank you.$B$BThese came faster than I had expected. They will make good blankets for anyone who wishes to stay here.$B$BPlease feel free to stay as long as you like. My inn is always open and all of our people are welcome here. And don''t underestimate a good night''s rest, it can make a great difference while you''re out traveling.' WHERE `Id`=1656; -- A Task Unfinished +UPDATE `quest_template` SET `OfferRewardText`='Ah, $n! I didn''t think you''d have much trouble finding the place, my directions are excellent, you know...$b$bLet me just finish up my report then.$b$b$b$bThere! Well, haha, now this certainly is funny... I don''t suppose, $n, that you would mind doing one last favor for me?' WHERE `Id`=287; -- Frostmane Hold +UPDATE `quest_template` SET `OfferRewardText`='$B$BI remember these...$B$BLesser men would easily crumble beneath their assault. You have done well in removing their threat.' WHERE `Id`=13339; -- Shatter the Shards +UPDATE `quest_template` SET `OfferRewardText`='You did it! Our boys are back!' WHERE `Id`=12843; -- They Took Our Men! +UPDATE `quest_template` SET `OfferRewardText`='You''re definitely not with the Hyldnir... so what are you here for? Ah... you must be looking for the new prisoner!' WHERE `Id`=12846; -- Leave No Goblin Behind +UPDATE `quest_template` SET `OfferRewardText`='I wasn''t sure you were coming back. I dread to think what will happen to me if I stay here for much longer.' WHERE `Id`=12841; -- The Crone's Bargain +UPDATE `quest_template` SET `OfferRewardText`='I was expecting a replacement for one of my overseers. It''s about time you showed up.$B$BLet''s put you to work.' WHERE `Id`=12905; -- Mildred the Cruel +UPDATE `quest_template` SET `OfferRewardText`='Dahlia was taken by the Scourge? This is a sad day for all of us.$B$BI will look to finding a new keeper once the shrine is retaken. Thank you for your efforts... the Ruby Dragonshrine is a sacred place to us, and the sacrifices your kind have made will not be easily forgotten.$B$BIt is good to know there are still heroes such as you - I will call upon you one day. Until that day comes, may your adventures be fruitful.' WHERE `Id`=12419; -- The Fate of the Ruby Dragonshrine +UPDATE `quest_template` SET `OfferRewardText`='$B$BGood... good! So that you know I am being fair, I will first give you your reward as promised.$B$BAnd then you will willingly hand me the key.' WHERE `Id`=13308; -- Mind Tricks +UPDATE `quest_template` SET `OfferRewardText`='They''re being driven insane? Voices in their heads?$B$BVoices in your head?!$B$BI want you to clear your mind of the taint that has crept into that place, $g boy : girl;.$B$BWe''ll try to get the remainder of them out of there again tomorrow when you''ve had a chance to rest.' WHERE `Id`=13300; -- Slaves to Saronite +UPDATE `quest_template` SET `OfferRewardText`='Well done. Training against the other valiants is one of the best ways to prepare yourself for tournament competition. I know you''ll make Stormwind proud, $N.' WHERE `Id`=13665; -- The Grand Melee +UPDATE `quest_template` SET `OfferRewardText`='Well done, $N! You demonstrated uncanny courage on the battlefield. Our war against the Troggs will be won with efforts such as yours. You have served King Magni well.$b$bIf you fancy yourself well-suited for this kind of adventuring, I suggest you speak with Mountaineer Gravelgaw. The Captain has him assigned to a rough patrol that I am sure he can use some help with. Check with Gravelgaw just inside the tower.' WHERE `Id`=224; -- In Defense of the King's Lands +UPDATE `quest_template` SET `OfferRewardText`='I am quite impressed, $N. You have done the Dwarven race a great favor by defending our lands. King Magni Bronzebeard himself would be proud!' WHERE `Id`=267; -- The Trogg Threat +UPDATE `quest_template` SET `OfferRewardText`='Hey, that wasn''t too bad... are you sure you''re not a dwarf?$b$bSo there''s plenty more racing to be had and it''s not just from me. All over the Brewfest grounds you''ll find people in need of a decent ram racer. So go and make yourself useful.$b$bOh and don''t forget, these rams were legally obtained. I just want to make sure we''re clear.' WHERE `Id`=11409; -- Now This is Ram Racing... Almost. +UPDATE `quest_template` SET `OfferRewardText`='You are a kind and compassionate $r, friend.' WHERE `Id`=10804; -- Kindness +UPDATE `quest_template` SET `OfferRewardText`='My children have told me of your heroic deeds, $r. There is more that you can do.' WHERE `Id`=10811; -- Seek Out Neltharaku +UPDATE `quest_template` SET `OfferRewardText`='I am free! You have saved us, $N!' WHERE `Id`=10872; -- Zuluhed the Whacked +UPDATE `quest_template` SET `OfferRewardText`='You have proven yourself as an ally of the Netherwing. My mother is free and my brothers and sisters are saved!$B$BPerhaps someday, we will call for you again. When that day comes, know that you will be welcomed with open arms - a $g brother:sister; to the Netherwing Dragonflight.' WHERE `Id`=10871; -- Ally of the Netherwing +UPDATE `quest_template` SET `OfferRewardText`='You''ve done it, $N. You''ve bested some of the fiercest fighters the Hyldnir race has to offer.' WHERE `Id`=12971; -- Taking on All Challengers +UPDATE `quest_template` SET `OfferRewardText`='Think we''ll give you your own bear just like that? You''ll have to prove yourself before you get anything from us.$B$BDo not think too highly of yourself just because you bested a few challengers in the Hyldsmeet.' WHERE `Id`=12972; -- You'll Need a Bear +UPDATE `quest_template` SET `OfferRewardText`='You have shown yourself a capable combatant, $N and you will serve as an example to the rest of the aspirants who clamor to compete on behalf of the Alliance.' WHERE `Id`=13671; -- Training In The Field +UPDATE `quest_template` SET `OfferRewardText`='$B$BHad Ragemane since pup. Sad day for Rageclaw. First troll attack Rageclaw, then troll make Ragemane bad. Rageclaw never trade with troll again!' WHERE `Id`=12857; -- Wanted: Ragemane's Flipper +UPDATE `quest_template` SET `OfferRewardText`='You place the egg... distress beacon... inside the chicken... homing robot.$B$BHums and whirs are heard from inside the robot as it struggles to stand up. After the robot comes to life, Oglethorpe''s voice is heard once more, but now from inside the robot:$B$B\"OOX-17/TN is working at least, but it needs major repairs! It is much too heavy for you to carry it... but I think I have an idea. Are you up for watching over it some more?\"' WHERE `Id`=351; -- Find OOX-17/TN! +UPDATE `quest_template` SET `OfferRewardText`='Excellent - the more water pouches we are able to reclaim, the further away from disaster we''ll all be! Keep ''em coming, and I will be sure to reward you for every five water pouches you bring me.' WHERE `Id`=1707; -- Water Pouch Bounty +UPDATE `quest_template` SET `OfferRewardText`='Now that''s what I call efficiency! You''ve helped thin out the nomad''s numbers enough now that we can start to think about how we can win back those water wells.$B$BThe Gadgetzan Water Company thanks you for your help, but we''re far from done in dealing with those foul nomads. Listen close - here''s what we need next...' WHERE `Id`=1690; -- Wastewander Justice +UPDATE `quest_template` SET `OfferRewardText`='Finally - justice is served! You have struck a mighty blow against those vile nomads! With Scorpidsting''s demise, this might be just the thing to finally push those squatters off of Gadgetzan''s water wells!$B$BBy the authority of the Gadgetzan Water Company, I gladly award you with this bounty. You''ve done a great service for us all.' WHERE `Id`=2781; -- WANTED: Caliph Scorpidsting +UPDATE `quest_template` SET `OfferRewardText`='$N! You are the $g man:woman;!!!$B$BI''m sure that the Cartel will ease up on me now that you''ve dealt with those Southsea scum. Let''s see, what can I give you as a reward? How about a little coin and you choose from one of these for your trouble?' WHERE `Id`=8366; -- Southsea Shakedown +UPDATE `quest_template` SET `OfferRewardText`='Ah, Andre''s head. So I guess he''ll make his trial after all!$B$BMuch appreciated, $N. Now if you''ll just sign here, I can issue you payment for services rendered.$B$BDon''t worry about the small print. It''s harmless, and... I don''t think there''s a magnifying glass small enough to read it anyway.' WHERE `Id`=2875; -- WANTED: Andre Firebeard +UPDATE `quest_template` SET `OfferRewardText`='Great, thanks for the shipment! Now MacKinley and I can finally settle our wager.' WHERE `Id`=2873; -- Stoley's Shipment +UPDATE `quest_template` SET `OfferRewardText`='You have my sincere thanks for your efforts, $N. Though much remains to be done, it gladdens me to know we have helped some find their long-deserved rest.' WHERE `Id`=10047; -- The Path of Glory +UPDATE `quest_template` SET `OfferRewardText`='Well, I must say, I am impressed, $N. I didn''t think you had the mettle for this mission. Well done. Well done, indeed. +' WHERE `Id`=10394; -- Disruption - Forge Camp: Mageddon +UPDATE `quest_template` SET `OfferRewardText`='It worked! You got the essence! Well done, $N! Well done!$B$BThis essence will be invaluable in my research. I hope to one day learn how to capture living dragon whelps, or perhaps capture their eggs. If I could find a way to do that, then I would be the envy of dragon scholars around the world!$B$BMy employer would also be happy, and as I said before, he''s someone you want to keep happy...' WHERE `Id`=4726; -- Broodling Essence +UPDATE `quest_template` SET `OfferRewardText`='There is no doubt, this is raw saronite. We''ve seen weapons made from it in the hands of the Lich King''s chosen before, but this is the first time it''s been used to arm anything else. The scale of that mining operation must be huge.' WHERE `Id`=13138; -- I'm Smelting... Smelting! +UPDATE `quest_template` SET `OfferRewardText`='$B$BIt is not the burial they deserved, but it is better than nothing, and better for those who yet live. Thank you, $N.' WHERE `Id`=13211; -- By Fire Be Purged +UPDATE `quest_template` SET `OfferRewardText`='$B$BA fitting end for the ''good'' doctor, wouldn''t you say?' WHERE `Id`=13152; -- A Visit to the Doctor +UPDATE `quest_template` SET `OfferRewardText`='You have proven yourself worthy of the title of champion, $N. You will compete at the tournament''s highest level on behalf of Stormwind, riding in the grand melee with your weapon at the ready and our mighty pennant at your back.' WHERE `Id`=13699; -- The Valiant's Challenge +UPDATE `quest_template` SET `OfferRewardText`='I welcome you as a champion of the tournament, $N. As a champion, you will be able to compete for the grand championship of the tournament. You may also choose to become a valiant with another Alliance city''s delegation and in time, a champion for that city as well.$B$BAll champions must have the assistance of a squire, $N, and you are no exception. Allow me to appoint one of ours to accompany you in battle. He will proudly carry the banner of any city that has named you a champion.' WHERE `Id`=13702; -- A Champion Rises +UPDATE `quest_template` SET `OfferRewardText`='Ah yes, these manes will work great! You show a lot of grit, $C - I wager we''ll see great things from you.' WHERE `Id`=313; -- The Grizzled Den +UPDATE `quest_template` SET `OfferRewardText`='By Magni''s beard, you sure did a lot of hunting!! Thank you, $N.' WHERE `Id`=317; -- Stocking Jetsteam +UPDATE `quest_template` SET `OfferRewardText`='Bellowfiz needs some of my Evershine? Hm...all right.' WHERE `Id`=318; -- Evershine +UPDATE `quest_template` SET `OfferRewardText`='Thank you, $N. It''ll be nice to work our crafts without hearing so many growls and snorts outside the village.' WHERE `Id`=319; -- A Favor for Evershine +UPDATE `quest_template` SET `OfferRewardText`='For me? You''re a true hero, $N!' WHERE `Id`=308; -- Distracting Jarven +UPDATE `quest_template` SET `OfferRewardText`='Yes, this will do just fine. I think I''ll open a bottle right now and have a taste...' WHERE `Id`=320; -- Return to Bellowfiz +UPDATE `quest_template` SET `OfferRewardText`='Not bad, $N! Did you have a hard time getting past their guard?$B$BNo matter - many thanks, and if you''re ever in need of stout with a kick, don''t forget the Barleybrews!' WHERE `Id`=311; -- Return to Marleth +UPDATE `quest_template` SET `OfferRewardText`='Great! I can''t wait to use these in some of my recipes. There''s one in particular I think it''ll work great in...' WHERE `Id`=315; -- The Perfect Stout +UPDATE `quest_template` SET `OfferRewardText`='These Gyromechanic Gears and Restabilization Cogs are in perfect accordance with Ozzie''s schematics for the Recombobulation Device. Once I add some hydrolubricant to the inner combustion pistons, adjust the crank-o-ratchet and increase of the viscosity of the electrogum gel, the gnomish race will be as good as new.' WHERE `Id`=412; -- Operation Recombobulation +UPDATE `quest_template` SET `OfferRewardText`='$B$BOh. Whoa! This stuff really puts a shine in your eyes. I feel like I can see in the dark!' WHERE `Id`=413; -- Shimmer Stout +UPDATE `quest_template` SET `OfferRewardText`='The horns of war will soon echo across this land, waking the dead and calling forth the Scourge war machine. Woe unto those that would stand in our way!$B$BYou and your brethren will lead the charge, $N. When next I look upon the Scarlet lands, my sight will be obscured by the legions of Acherus. The march upon New Avalon begins now.' WHERE `Id`=12657; -- The Might Of The Scourge +UPDATE `quest_template` SET `OfferRewardText`='The war has begun, death knight! I shall place you upon my finest gryphon and deliver you to Death''s Breach. Chaos, death, destruction! You will herald in all of this and more! +' WHERE `Id`=12850; -- Report To Scourge Commander Thalanor +UPDATE `quest_template` SET `OfferRewardText`='Do you smell it?$B$B$B$BFresh meat... The scent of Scarlet Crusader wafts through the air.$B$B$B$BApologies, death knight, I''m sure you''re not interested in my choice of fine cuisine. You are here to work! To lead the charge! Yes... I know. The Lich King has told me all that I need to know about you, $N.$B$BThe time for bloodshed is now. +' WHERE `Id`=12670; -- The Scarlet Harvest +UPDATE `quest_template` SET `OfferRewardText`='Do you feel it, $N? That sensation is raw power coursing through your body. Such a thing cannot exist for mortals.$B$BThe front lines are now dismantled. The geist will finish the job and prepare the grounds for Razuvious. We turn our attention now to more tactical targets. +' WHERE `Id`=12678; -- If Chaos Drives, Let Suffering Hold The Reins +UPDATE `quest_template` SET `OfferRewardText`='To the victor goes the glory, death knight! Well done! The Lich King looks favorably upon you on this day. +' WHERE `Id`=12733; -- Death's Challenge +UPDATE `quest_template` SET `OfferRewardText`='Glad to see the Reclaimers aren''t in short supply of work, or adventurers willing to help out.$B$BI''m Kreldig, $N. You''ve made a smart move helpin'' out the Reclaimers. Everyone needs something these days: they''ve lost a family heirloom, a magic item, a loved one. You never can tell. But with the Reclaimers around, there''s no reason, for the right price, everyone can''t find what they''ve lost. ' WHERE `Id`=1453; -- Reclaimers' Business in Desolace +UPDATE `quest_template` SET `OfferRewardText`='I have entered your name in the rolls, $N. As an aspirant you will train with others who wish to compete in the tournament and hone your mounted combat skills. Once you have proven yourself, you will be allowed to enter the lowest rank of competition on behalf of your capital city.' WHERE `Id`=13667; -- The Argent Tournament +UPDATE `quest_template` SET `OfferRewardText`='Commit Valis''s lesson to memory, $N. It will mean the difference between winning and losing your mounted combat matches.' WHERE `Id`=13835; -- Mastery Of The Shield-Breaker +UPDATE `quest_template` SET `OfferRewardText`='So you''re saying this knight''s story is a sham? Most suspicious. Dishonorable at the least, and murderous at the worst. Still, we can''t confront him until we know for certain whether he was involved in these murders.$B$BDo nothing to arouse his suspicions, $N. Discretion will serve us well as we continue to investigate.' WHERE `Id`=13633; -- The Black Knight of Westfall? +UPDATE `quest_template` SET `OfferRewardText`='So there is some truth to those old tales? It seems they did not lie about the quality of the blade. Well done, $N. The champion who wields it will be a lucky man, indeed.' WHERE `Id`=13666; -- A Blade Fit For A Champion +UPDATE `quest_template` SET `OfferRewardText`='So you say Lorien Sunblaze was done in by poison and Sir Wendell was burnt alive? Dreadful ways to die, both of them. Only Conall was killed by cold steel, and from your description, it was a coward''s strike, not honorable combat that laid him in his grave.$B$BAll three sparred with and were scheduled to fight the Black Knight. This cannot be a coincidence. Now, we must find a way to prove it was the Black Knight''s work.' WHERE `Id`=13643; -- The Stories Dead Men Tell +UPDATE `quest_template` SET `OfferRewardText`='$B$BIt''s all here, $N: the poison that killed Lorien, a collection of knives, torches, and oil. No man has cause to possess these things here and no squire would do so without orders from his knightly master. We''ve found our murderer, $N, but who is he working for?' WHERE `Id`=13654; -- There's Something About the Squire +UPDATE `quest_template` SET `OfferRewardText`='$B$BThis can only mean one thing, $N. The Black Knight is a member of the Cult of the Damned and has been sent by Arthas to disrupt the tournament!$B$BThe Black Knight has proven himself a fearsome combatant, and you will need to be every bit as good if you wish to face him. When you are a champion, return to me and we''ll find a way to ensure his defeat.' WHERE `Id`=13663; -- The Black Knight's Orders +UPDATE `quest_template` SET `OfferRewardText`='Grrr. I knew it! He''s sooooo over-protective! This is just embarassing.$B$BNot that I''m not happy to see you... I am! We all are. We can use your help!' WHERE `Id`=11175; -- My Daughter +UPDATE `quest_template` SET `OfferRewardText`='Good job, though I think ye might be wanting a refresher course in basic piloting.$B$BWell, no matter, one warm body''s as good as another. Here''s yer haul for the day. ' WHERE `Id`=11390; -- I've Got a Flying Machine! +UPDATE `quest_template` SET `OfferRewardText`='$B$BIrena was concerned about me? She gets that from her father you know.' WHERE `Id`=11393; -- Where is Explorer Jaren? +UPDATE `quest_template` SET `OfferRewardText`='Without Thredd to lead them, hopefully the riots will be more controllable. We shall see.$B$BI must say, after a half hour, I hardly expected you to come out, but it seems I misjudged you.$B$BI''d guess, then, that you didn''t get much useful information out of him? But I know a thing or two that might be of interest to you about Thredd''s activities.' WHERE `Id`=391; -- The Stockade Riots +UPDATE `quest_template` SET `OfferRewardText`='So these bandanas -- filthy tokens of corruption -- are what my Mac had to die for? Such a waste. Such a tragic sacrifice. $b$bBut alas, I cannot return to the past. Just know, $N, that you have brought my family justice through your deeds.' WHERE `Id`=388; -- The Color of Blood +UPDATE `quest_template` SET `OfferRewardText`='That''s right. I have a task that I can''t do while I''m guarding. In fact, it''ll take you far from Loch Modan.$B$BYour perfect chance for adventure!' WHERE `Id`=1339; -- Mountaineer Stormpike's Task +UPDATE `quest_template` SET `OfferRewardText`='You accomplished your mission well, $r. The King himself would be proud.$b$bThe reinforcements promised to us never showed, however. Apparently the Alliance front is a sea of crimson from the blood of our fallen brethren. The news of the losses leaves a bitter taste in one''s mouth. But we must not let their deaths go for naught. We must rally in these grim times and bring glory back to the Alliance.$b$bSpeak with Mountaineer Wallbang for reassignment. You''re needed now more than ever.' WHERE `Id`=237; -- In Defense of the King's Lands +UPDATE `quest_template` SET `OfferRewardText`='Congratulations are in order, $N. You have bested your challenger and earned the right to advance to the rank of valiant.' WHERE `Id`=13679; -- The Aspirant's Challenge +UPDATE `quest_template` SET `OfferRewardText`='Welcome aboard then, Valiant $N. The Stormwind delegation is proud to count you among its members.' WHERE `Id`=13684; -- A Valiant Of Stormwind +UPDATE `quest_template` SET `OfferRewardText`='My nephew said you aided him with his research in Dustwallow, and that you helped his associate out of a tight spot. Well, we Sterns stick together and we don''t ignore our friends!$B$BSo wash your hands, $N, because we''re about to throw a party in your honor!' WHERE `Id`=1271; -- Feast at the Blue Recluse +UPDATE `quest_template` SET `OfferRewardText`='Thanks for helping out our miner back there, $n! I should be able to put together an antidote no problem.$B$BIf you stumble into Tore again, tell her that she''s a jerk for me, will ya?' WHERE `Id`=12832; -- Bitter Departure +UPDATE `quest_template` SET `OfferRewardText`='And it''s already well-done! I outdo myself sometimes.$B$BThanks much, friend!' WHERE `Id`=12828; -- Ample Inspiration +UPDATE `quest_template` SET `OfferRewardText`='Ha ha! Good to see you''re up for some dirty work.$B$BMuch appreciated there, pal!' WHERE `Id`=12829; -- Moving In +UPDATE `quest_template` SET `OfferRewardText`='Woo! That''s a ripe stench right there! You had to get hands-on with some of those snobolds, didn''t ya?$B$BI do appreciate it though!' WHERE `Id`=12830; -- Ore Repossession +UPDATE `quest_template` SET `OfferRewardText`='With the death of the Black Knight, the tournament may once again serve its purpose. The champions of the Horde and Alliance may demonstrate their skill at arms and train for the day when Arthas and his minions will no longer threaten us.$B$BYou have the thanks of the Argent Crusade, $N, and that of all who have answered our call.' WHERE `Id`=13664; -- The Black Knight's Fall +UPDATE `quest_template` SET `OfferRewardText`='$B$BDo you think they''ve been planning this? I suppose it doesn''t matter, but I don''t like the implication that we''ve been playing into their hands. Whatever is going on, we have to stop it.' WHERE `Id`=14016; -- The Black Knight's Curse +UPDATE `quest_template` SET `OfferRewardText`='The doctor will not have time to complete his work, but his plan is already in motion. From what you''ve reported, the Lich King''s servants have reanimated and empowered the Black Knight and there''s no telling what the knight''s master has in mind. You have done well in uncovering this plot. I will tell High Crusader Adelard of your findings and together, we will alert the tournament''s participants.' WHERE `Id`=14017; -- The Black Knight's Fate +UPDATE `quest_template` SET `OfferRewardText`='You are a true champion, $N, both inside the ring and on the field. We must all be vigilant against the Scourge and you are a great example to our brethren and your own people.' WHERE `Id`=13789; -- Taking Battle To The Enemy +UPDATE `quest_template` SET `OfferRewardText`='Well done. Training against the other champions is one of the best ways to prepare yourself for tournament competition. I know you''ll make the Alliance proud, $N.' WHERE `Id`=13790; -- Among the Champions +UPDATE `quest_template` SET `OfferRewardText`='It seems things are worse than we initially thought. You still made a valiant effort and saved many of The Wavecrest''s crew''s lives.' WHERE `Id`=14152; -- Rescue at Sea +UPDATE `quest_template` SET `OfferRewardText`='Oh, hello there $N. Marcia said you''d be coming by with that poor man''s missing arm.$b$bShe also gave me this bag to give you as a reward. It smells horrible, and I''m anxious to make the trade if you don''t mind.' WHERE `Id`=13836; -- Disarmed! +UPDATE `quest_template` SET `OfferRewardText`='Just what I wanted to hear! A victory in Lake Wintergrasp - even a temporary one - is crucial to our overall strategy against the Horde.' WHERE `Id`=13181; -- Victory in Wintergrasp +UPDATE `quest_template` SET `OfferRewardText`='How many of them could there possibly be? We''ve killed enough to fill ten graveyards and still they come. The situation looks grim, friend.' WHERE `Id`=13039; -- Defending The Vanguard +UPDATE `quest_template` SET `OfferRewardText`='Thank you, $N. I will begin the tests on these samples immediately. It is my hope that a cure will be found soon.' WHERE `Id`=13040; -- Curing The Incurable +UPDATE `quest_template` SET `OfferRewardText`='There are still many Argent Crusade soldiers out on that field and in Scourgeholme, $N. While your help is appreciated, there is still much left to be done.' WHERE `Id`=13008; -- Scourge Tactics +UPDATE `quest_template` SET `OfferRewardText`='$B$BMy kin will help. Together we will battle the Lich King and his undead legions. +' WHERE `Id`=13044; -- If There Are Survivors... +UPDATE `quest_template` SET `OfferRewardText`='Arthas... He strikes recklessly - without care or caution. We have caught him off guard.$B$B$B$BWe will bolster our defenses and weather the storm.$B$BHow good are you with a cannon, $N?' WHERE `Id`=13045; -- Into The Wild Green Yonder +UPDATE `quest_template` SET `OfferRewardText`='My knowledge of Scourge tactics is without equal.$B$B$B$BBefore the battle for Light''s Hope Chapel, my knights and I served under the Lich King - his icy grasp controlling our every action. The light of dawn changed everything...' WHERE `Id`=13104; -- Once More Unto The Breach, Hero +UPDATE `quest_template` SET `OfferRewardText`='You have done well, $N. Keeping their numbers down will give the Argent Crusade the time that they need to set a foundation.' WHERE `Id`=13118; -- The Purging Of Scourgeholme +UPDATE `quest_template` SET `OfferRewardText`='A hard fought victory, $N! The lieutenants will be replaced, but at least for today the air about Scourgeholme stands still.' WHERE `Id`=13125; -- The Air Stands Still +UPDATE `quest_template` SET `OfferRewardText`='Heartwood by nature is resistant to disease, rot and plague. This heartwood, however, goes so far as to repel such things! The masonry, affected by the fallout of the Unbound Thicket, will work in much the same way.$B$BSoon we will break ground. ' WHERE `Id`=13130; -- The Stone That Started A Revolution +UPDATE `quest_template` SET `OfferRewardText`='Your assistance has been integral in securing the front. The first true victory of this war is close at hand - which is why our next step is the most crucial.$B$BRest assured, $N, the Scourge will not give up without a fight. Your most difficult challenge awaits.' WHERE `Id`=13139; -- Into The Frozen Heart Of Northrend +UPDATE `quest_template` SET `OfferRewardText`='Blessed Light! We have taken the pinnacle! Finally, construction of Justice Keep can begin. Highlord Fordring and the knights are already en route to our new base. You must meet them there, $N!' WHERE `Id`=13141; -- The Battle For Crusaders' Pinnacle +UPDATE `quest_template` SET `OfferRewardText`='A long and arduous journey awaits us as we make our way to the gates of Icecrown Citadel. I, and the soldiers of the Argent Crusade, wish to thank you for all that you have done. We rest easier knowing that you will fight alongside us in this cursed place.$B$B +' WHERE `Id`=13157; -- The Crusaders' Pinnacle +UPDATE `quest_template` SET `OfferRewardText`='Bridenbrad has contracted the plague? I cannot imagine a worse fate for one who has devoted his life to the ways of light, nor can I fathom leaving him to die without lifting a finger to help.$B$BNo, undeath shall not be his fate. We shall find a way to aid this hero.' WHERE `Id`=13072; -- A Hero Remains +UPDATE `quest_template` SET `OfferRewardText`='Hello child.$B$BI understand Tirion''s request and trust in his judgment, we will see what we can do for this Crusader Bridenbrad. What you ask is no simple task - the Scourge are not of this world, and many have failed in attempting to strip their corruption over the years.$B$BIn a being of nobility and light, all is not without hope.' WHERE `Id`=13073; -- The Keeper's Favor +UPDATE `quest_template` SET `OfferRewardText`='Tirion sent you to Remulos? I''m... I''m flattered. One does not call favors in with beings of such power idly, no matter how noble or altruistic they might be. You too are kind to have gone to such lengths on my behalf. You have my thanks.$B$BPlant the seed - I am ready.' WHERE `Id`=13075; -- The Boon of Remulos +UPDATE `quest_template` SET `OfferRewardText`='Greetings to you, $r.$B$BThe concern is clear on your face. Please tell me what troubles you.' WHERE `Id`=13077; -- The Touch of an Aspect +UPDATE `quest_template` SET `OfferRewardText`='The breath of Alexstrasza... you have gone to the dragon-queen herself? I''m extremely grateful.$B$BI understand the risks of such cleansing and I am prepared. Proceed, $c.' WHERE `Id`=13079; -- The Boon of Alexstrasza +UPDATE `quest_template` SET `OfferRewardText`='The Scourge plague is no simple foe to defeat. Alexstrasza''s words suggest that perhaps we can yet save our Bridenbrad from the unimaginable fate of the unliving should he fall, but I will not give him up so easily.$B$BThere is yet one more path of light I would like to pursue. One more being who might avert this horrible fate.' WHERE `Id`=13080; -- Hope Yet Remains +UPDATE `quest_template` SET `OfferRewardText`='$B$BSo the acid worked? Good. We''ll need it when the army goes up against the reavers in force.' WHERE `Id`=13335; -- Before the Gate of Horror +UPDATE `quest_template` SET `OfferRewardText`='I was worried for a while there, $N. When he busted out the seals and penguins... Well, I didn''t know what to think to be honest. It looked pretty damn ridiculous.' WHERE `Id`=12935; -- The Amphitheater of Anguish: Tuskarrmageddon! +UPDATE `quest_template` SET `OfferRewardText`='Damn, I remember Korrak from way back in my younger days when I used to work for the Frostwolf Clan. He would never shut up! I think you just did the world a great service, $N.' WHERE `Id`=12936; -- The Amphitheater of Anguish: Korrak the Bloodrager! +UPDATE `quest_template` SET `OfferRewardText`='You did it, $N! That was the most exciting fight yet! What are you going to do with your winnings? Me? I''m going to Dalaran and blowing it all in the Underbelly. Lot of hot action going on down there!' WHERE `Id`=12948; -- The Champion of Anguish +UPDATE `quest_template` SET `OfferRewardText`='I hope they weren''t too hesitant to share the wealth. We''ve been pretty forgiving with them picking through our leftovers thus far.' WHERE `Id`=12827; -- Reclaimed Rations +UPDATE `quest_template` SET `OfferRewardText`='These will do nicely, thanks!$B$BDid you happen to see Dim out there? I sent him out a long while back and he never came back. I hope he''s alright.$B$BSpeaking of which... I wonder where Janks is...' WHERE `Id`=12818; -- Clean Up +UPDATE `quest_template` SET `OfferRewardText`='Thanks, $N! We''ll see what we can do to salvage these parts!' WHERE `Id`=12844; -- Equipment Recovery +UPDATE `quest_template` SET `OfferRewardText`='I see that Skyhopper finally got around to sending help. And none too soon I might add!$B$BWelcome, $g brother : sister;, we need your help badly!' WHERE `Id`=11707; -- Distress Call +UPDATE `quest_template` SET `OfferRewardText`='Have you heard enough? Are you prepared to act? +' WHERE `Id`=3441; -- Divine Retribution +UPDATE `quest_template` SET `OfferRewardText`='$N, by my eternal soul, it is good to see you! I don''t know why the Exodar crashed. Only those of us that were in this part of the ship remain.$B$BThere''s not much time if we''re to save everyone that we can!' WHERE `Id`=9279; -- You Survived! +UPDATE `quest_template` SET `OfferRewardText`='Regrettable that those creatures had to die so that we might live - indiscriminate killing is not the draenei way. However, the blood you gathered will replenish our healing crystals, so their deaths will not be in vain.' WHERE `Id`=9280; -- Replenishing the Healing Crystals +UPDATE `quest_template` SET `OfferRewardText`='I am Firmanvaar and you are wise to seek me out. It is my calling to provide instruction to shaman, especially those who are just beginning to learn.$B$BShamanism is only now being relearned amongst the draenei, $N. You are brave to follow its path as it is not popular amongst your kind.$B$BI will be here when you feel you are ready for further training.' WHERE `Id`=9421; -- Shaman Training +UPDATE `quest_template` SET `OfferRewardText`='Oh, thank goodness you''ve come. We have much to do.' WHERE `Id`=9371; -- Botanist Taerix +UPDATE `quest_template` SET `OfferRewardText`='You''re finished? That''s good news. Hopefully, we can find a way to avoid the killing of these mutated beasts in the future.$b$bI believe I have formed a plan that might give us an alternative solution to this problem, but I will need your help.' WHERE `Id`=10302; -- Volatile Mutations +UPDATE `quest_template` SET `OfferRewardText`='These look like fine specimens. Thank you for performing the field work. Once I can find the time to analyze these, I should be able to tell what it will take to restore the fields.' WHERE `Id`=9799; -- Botanical Legwork +UPDATE `quest_template` SET `OfferRewardText`='These will do. Thank you, $c!$B$BWhile you were out, I managed to gather some equipment together to make an analysis of the samples. This should only take a moment.' WHERE `Id`=9293; -- What Must Be Done... +UPDATE `quest_template` SET `OfferRewardText`='The Light be praised! You''ve done what only a true $g hero : heroine; could have done, $N! The draenei you saved owes their continued life to your selflessness!$B$BPlease, take this supply pouch. You look like you can use it more than I.' WHERE `Id`=9283; -- Rescue the Survivors! +UPDATE `quest_template` SET `OfferRewardText`='With many of the owlkin now inoculated, we can focus on getting out of here and not have to worry about wiping out the owlkin population in the area.$B$BHere, choose from these. You''ve done good work, and you deserve to be rewarded!' WHERE `Id`=9303; -- Inoculation +UPDATE `quest_template` SET `OfferRewardText`='Let me take a look at those.$B$BYes, I think that these will do nicely; good job, $N. The emitter is rather complex so it may take some time to finish the repairs. I''ll let you know when it''s ready.$b$bIn the meantime, you might see if Vindicator Aldar has anything he could use you for.' WHERE `Id`=9305; -- Spare Parts +UPDATE `quest_template` SET `OfferRewardText`='You are bold to seek my wisdom after what your people have done to these islands, stranger! Still, there is much to be said for your bravery, so I will impart to you some knowledge.$B$BThe earth beneath your feet forms the foundation for all things. The sky, the waters, even great fire - all rest upon its shoulders. While those others often form chaotic tempests, the earth abides. It grants strength and fortitude to the core of your being.$B$BNow you will prove yourself, shaman.' WHERE `Id`=9449; -- Call of Earth +UPDATE `quest_template` SET `OfferRewardText`='You have done well. By thinning out the restless spirits you have helped to heal the imbalance between the elements, which your people inadvertently caused.$B$BThroughout your journey as a shaman you must keep this in mind when calling upon our power. The balance must be preserved.' WHERE `Id`=9450; -- Call of Earth +UPDATE `quest_template` SET `OfferRewardText`='You have done well, $N. In helping to restore the balance of the elements at the grove, you have also created a balance between the earth element of this world and the draenei. Perhaps this will help to bring understanding to those amongst us who do not approve of our ways?$B$BI will create for you a totem through which you will be able to call on the power of earth to do your bidding. And with time, more of the mysteries of earth will be revealed to you.$B$BNow, take your totem, shaman.' WHERE `Id`=9451; -- Call of Earth +UPDATE `quest_template` SET `OfferRewardText`='Help... blood elves! They... ambushed... me. Don''t have... long.' WHERE `Id`=9309; -- The Missing Scout +UPDATE `quest_template` SET `OfferRewardText`='I thank you for dealing with the blood elf surveyor. Surely she was their leader. Rest assured, we will deal with whatever remnant of them is still nearby.$B$BPlease, take one of these weapons as a sign of my gratitude.' WHERE `Id`=9311; -- Blood Elf Spy +UPDATE `quest_template` SET `OfferRewardText`='I got it, I got it! I think I managed to fix the emitter! Here, I''ll just activate this last crystal and that should do it.$B$BTake a look at the emitter, $N. It looks like it''s beginning to work... someone is appearing!' WHERE `Id`=9312; -- The Emitter +UPDATE `quest_template` SET `OfferRewardText`='Ah, good to see you again! I''m glad that we were both able to get our emitters fixed or we might never have found one another. And don''t worry, we''ll see to it that Ammen Vale gets help and supplies.$B$BSpeaking of assistance, now that you''re here, go around and introduce yourself to the others. I know that there''s plenty to do.' WHERE `Id`=9313; -- Travel to Azure Watch +UPDATE `quest_template` SET `OfferRewardText`='Oh, you must be one of the survivors we''ve been hearing about!$b$bI''m glad that you came. Don''t worry, we will send someone to see to Aeun''s injured leg.$B$BI''m most interested in hearing all about your harrowing story of survival. You''re a brave one to have made it all the way here.' WHERE `Id`=9314; -- Word from Azure Watch +UPDATE `quest_template` SET `OfferRewardText`='Well done, $n, well done!$b$bHere, I cooked up some tenderloins while you were gone. Maybe you''d like the recipe, too?' WHERE `Id`=9454; -- The Great Moongraze Hunt +UPDATE `quest_template` SET `OfferRewardText`='Wonderful! You''re turning into quite the hunter, $n.$b$bHow would you like to look more like me? Well here is your chance! While you were out hunting, I fashioned these items out of some buck hides I had laying around. Take your pick!' WHERE `Id`=10324; -- The Great Moongraze Hunt +UPDATE `quest_template` SET `OfferRewardText`='Very good. Your efforts do much to keep the Scourge at bay. A commendation will be sent to my superior, Executor Zygand.' WHERE `Id`=356; -- Rear Guard Patrol +UPDATE `quest_template` SET `OfferRewardText`='Good, I see Ageron managed to find you, $n. Let us waste little time with small talk and pleasantries and focus on your training. There is still much you have to learn.' WHERE `Id`=1478; -- Halgar's Summons +UPDATE `quest_template` SET `OfferRewardText`='Very good, $N. I will study this book and determine the identity of that lich. You have served your Queen well.$B$B$B$BAstonishing! The book you retrieved belongs to no one other than Gunther Arcanus!$B$BGunther was a skilled Necromancer in life; he and I were friends and comrades-in-arms, before the Plague. And judging from his book he has grown even more powerful in death.$B$BHis skills would be a great boon to us.' WHERE `Id`=357; -- The Lich's Identity +UPDATE `quest_template` SET `OfferRewardText`='Well done. Training against the other valiants is one of the best ways to prepare yourself for tournament competition. I know you''ll make us proud, $N.' WHERE `Id`=13750; -- The Grand Melee +UPDATE `quest_template` SET `OfferRewardText`='All of Azeroth is fortunate that Timear foresaw the Eredar lord''s arrival and that you were there in time to slay him.' WHERE `Id`=24589; -- Lord Jaraxxus Must Die! +UPDATE `quest_template` SET `OfferRewardText`='This is in better condition than I thought it''d be. Sure, it''s going to take some time to work off all the rust, the char, and the like, but I''ll not complain.' WHERE `Id`=10055; -- Waste Not, Want Not +UPDATE `quest_template` SET `OfferRewardText`='Very good. I''m sure their loss will be felt in Hellfire Citadel. Although that dark bastion looms over us and seems nigh insurmountable, it is only with bold moves like you have made that we will find victory over the fel orcs!' WHERE `Id`=10482; -- Fel Orc Scavengers +UPDATE `quest_template` SET `OfferRewardText`='You''ve come to help my tribe, $r? How unusual. There aren''t many that care about the fate of the Broken in this land. ' WHERE `Id`=10403; -- Naladu +UPDATE `quest_template` SET `OfferRewardText`='Ah, this is very nice temper indeed! And so much of it! I''ll be at work for days before I use it all!$B$BThank you, $N. Please, take this as payment.' WHERE `Id`=3042; -- Troll Temper +UPDATE `quest_template` SET `OfferRewardText`='You found it! Well done, $N! Did you have to fight Bly for it? I hope you knocked him and his band down good and hard!' WHERE `Id`=2768; -- Divino-matic Rod +UPDATE `quest_template` SET `OfferRewardText`='What the vrykul did to our scouts was a gruesome display of savagery. It was a scare tactic, meant to weaken our resolve... to send us running in fear for our lives.$B$BIt failed.$B$BWe are going to show those monsters what it means to wage war against the Alliance!' WHERE `Id`=11244; -- Rescuing the Rescuers +UPDATE `quest_template` SET `OfferRewardText`='A bit worse for the wear but still functional.$B$B$B$BNow to place them in the fire and inhale!$B$B$B$B$B$BWha... What... It cannot be... I cannot...' WHERE `Id`=11333; -- Into the World of Spirits +UPDATE `quest_template` SET `OfferRewardText`='You''ve found Pulroy. A bit too late it seems.$B$BWhile looking over the corpse you see a journal clenched tightly in Pulroy''s death grip. Upon examining the journal you read what appears to be the scribbling of a dying dwarf.' WHERE `Id`=11273; -- The Human League +UPDATE `quest_template` SET `OfferRewardText`='You''ve found Zedd. You''re no doctor but the prognosis for Zedd is most assuredly negative.$B$BIt looks as if they were preparing to feed him to the worgs. Gruesome...' WHERE `Id`=11274; -- Zedd's Probably Dead +UPDATE `quest_template` SET `OfferRewardText`='About bloody time! Pulroy and Zedd are dead.$B$BAnd Daegarn...$B$B$B$BTaken by the Dragonflayer chieftain into the depths of these catacombs. I overheard that oversized mongrel mention something ''bout a sacrifice to the \"Dread King.\"$B$BThe cipher is hidden away in Daegarn''s grimy beard.$B$BWhat? Dwarves hide things in their beards all the time!' WHERE `Id`=11276; -- And Then There Were Two... +UPDATE `quest_template` SET `OfferRewardText`='You feel compelled to place the sacred blade next to the body of Ares.$B$BUpon doing this you are once again blinded by light.' WHERE `Id`=11288; -- The Shining Light +UPDATE `quest_template` SET `OfferRewardText`='You''ve done well, mate. Now that we''ve secured the tablets we can try and save Daegarn''s life and recover the cipher that will help us decode the meaning behind these ancient relics!$B$BI''ll hold on to these tablets, you rescue Daegarn. + +' WHERE `Id`=11277; -- The Depths of Depravity +UPDATE `quest_template` SET `OfferRewardText`='$B$BOutstanding! By the looks of things, there are many more vrykul villages in the fjord. A different tribe of vrykul is preparing an assault on Westguard Keep. Hell, for all I know it may already be too late. We haven''t heard from Westguard in days. Either way, we must alert Westguard!' WHERE `Id`=11290; -- Dragonflayer Battle Plans +UPDATE `quest_template` SET `OfferRewardText`='$B$BHrm, interesting...$B$BAccording to the manual, the vrykul have a special tool that allows them to control the harpoon guns with deadly accuracy. It looks a bit like the wheel of one of our ships. Furthermore, it''s portable and seems to plug into the harpoon guns like a key. We need to get our hands on one of those!' WHERE `Id`=11420; -- The Path to Payback +UPDATE `quest_template` SET `OfferRewardText`='Many men and women died to recover this blade. Alas, I fear valiant Ares will not be the last.$B$BBut you do the Light''s work, hero. This sacred blade will be wielded by Lord Tirion Fordring himself. Even now the Argent Crusade works toward Icecrown. Lord Fordring has vowed that he will tear down the walls of the cursed place himself! And with the blade, he just might stand a chance against the Lich King.$B$BLord Fordring remains our greatest hope.' WHERE `Id`=11289; -- Guided by Honor +UPDATE `quest_template` SET `OfferRewardText`='Nicely done, $g old chap : m''lady;!' WHERE `Id`=194; -- Raptor Mastery +UPDATE `quest_template` SET `OfferRewardText`='Thank you, $c... thank you!$B$BYou''ve given me the satisfaction of knowing that the coward who made me into this will rot for all eternity as surely as I will.$B$BNow leave before I lose control of myself and cut you down.' WHERE `Id`=13059; -- Revenge for the Vargul +UPDATE `quest_template` SET `OfferRewardText`='You discovered and put an end to the doctor''s machinations.$B$B$B$BThat''s a fine poke in the eye for the Lich King, but I think we can do better.' WHERE `Id`=13043; -- The Sum is Greater than the Parts +UPDATE `quest_template` SET `OfferRewardText`='$N is my bestest little $r!' WHERE `Id`=12992; -- Crush Dem Vrykuls! +UPDATE `quest_template` SET `OfferRewardText`='$B$BYou''re inflicting horrible mental trauma on the Jotunheim vrykul. This is where they were first reawakened. It is a place of significant importance to them, second only to Ymirheim.$B$BYou must keep up the pressure there while I hold the vault from the assault of the Lich King.' WHERE `Id`=13084; -- Vandalizing Jotunheim +UPDATE `quest_template` SET `OfferRewardText`='You got both our foodstuff AND our research equipment back! You''ve not only saved the expedition, you''ve also saved our lives. I and the rest of my team can''t thank you enough; we just might make it here for a while now thanks to you.$B$BWhile we don''t have much, I''m certainly not going to leave you high and dry for the invaluable help you''ve given us. Thank you, $N - you''ve got a friend in Marshal Expeditions! +' WHERE `Id`=3881; -- Expedition Salvation +UPDATE `quest_template` SET `OfferRewardText`='Yes, this will do nicely. You''ve been a great help... I wish I could give you more than this, but being virtually stranded in the middle of a savage land does limit what I can and cannot give. Rest assured though - the research done here would not have been possible without your assistance!' WHERE `Id`=3883; -- Alien Ecology +UPDATE `quest_template` SET `OfferRewardText`='This will do nicely, $N. It seems Lar''korwi eats well these days. Although, I wonder where he found a threshadon in this area. Odd.$B$BRegardless, I will hold onto this until you are ready for your confrontation with the beast. Do not worry for my safety--I am sure you''ve angered Lar''korwi enough that he will not kill me until after he''s tasted your flesh.' WHERE `Id`=4290; -- The Fare of Lar'korwi +UPDATE `quest_template` SET `OfferRewardText`='You did it! You actually found it!$B$BI don''t know... I don''t know how to thank you!' WHERE `Id`=12624; -- It Could Be Anywhere! +UPDATE `quest_template` SET `OfferRewardText`='What a relief to hear that the Venture Company will trouble us no more. You have my thanks, and that of Hemet for dealing with this problem. A game hunter cannot, in good conscience, lift her weapon against another person.' WHERE `Id`=12525; -- Wipe That Grin Off His Face +UPDATE `quest_template` SET `OfferRewardText`='The professor sent you my way? All right.' WHERE `Id`=12696; -- Aerial Surveillance +UPDATE `quest_template` SET `OfferRewardText`='Excellent! ' WHERE `Id`=12699; -- An Embarassing Incident +UPDATE `quest_template` SET `OfferRewardText`='Thank you, this will go far to treat our soldiers'' wounds.' WHERE `Id`=13201; -- Healing with Roses +UPDATE `quest_template` SET `OfferRewardText`='You are a brave one, $N. I hope you didn''t lose any extremities making your fishing spot. If you''ve still got the fishing bug, come back tomorrow and we''ll talk some more.' WHERE `Id`=13833; -- Blood Is Thicker +UPDATE `quest_template` SET `OfferRewardText`='$B$BGood work, $N, and quick thinking. I''m sure the theft of this trinket won''t slow them down for long, but I think you''ve bought us time to warn the leaders of the Horde and Alliance about the impending attacks.' WHERE `Id`=24442; -- Battle Plans Of The Kvaldir +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=8676; -- Wildmane the Elder +UPDATE `quest_template` SET `OfferRewardText`='Wonderful! You found it! And what''s just as important--Velratha no longer has it! Thank you, $N. I am forever in your debt!$B$BAnd if I sounded a little... mean before, pay it no mind. You''ll find me a much nicer person to those who haven''t stolen from me.' WHERE `Id`=2846; -- Tiara of the Deep +UPDATE `quest_template` SET `OfferRewardText`='Ah! Longbeard sent you with a load of helmets! Hooray!$B$BNow maybe we can talk a pilot into driving our car...' WHERE `Id`=1179; -- The Brassbolts Brothers +UPDATE `quest_template` SET `OfferRewardText`='$b$bIt is DONE!$b$b$R! Your name shall be recorded in the history of our people.$b$bI am in your debt....' WHERE `Id`=13167; -- Death to the Traitor King +UPDATE `quest_template` SET `OfferRewardText`='$B$BI know why you have come.' WHERE `Id`=13081; -- The Will of the Naaru +UPDATE `quest_template` SET `OfferRewardText`='$B$BYou have returned to me, $c. I must admit... it is good to see you again... your face renews my hope that this land will be free of Arthas''s grasp one day soon. I''m proud to have met you...$B$B' WHERE `Id`=13082; -- The Boon of A'dal +UPDATE `quest_template` SET `OfferRewardText`='$B$BHe was a damn fine soldier. Damn the Horde and damn the Scourge!' WHERE `Id`=13225; -- The Skybreaker +UPDATE `quest_template` SET `OfferRewardText`='Really, $c?$b$bNothing notable to report?$b$b$b$bI beg to differ...' WHERE `Id`=13287; -- Poke and Prod +UPDATE `quest_template` SET `OfferRewardText`='Yes, yes, yes! A thousand times, hello!' WHERE `Id`=13383; -- Killohertz +UPDATE `quest_template` SET `OfferRewardText`='I could hear your explosions from here, $N. How did the shields work? Did they keep your bomber intact?$B$BI hope they did, because now I have more missions for you....' WHERE `Id`=13380; -- Leading the Charge +UPDATE `quest_template` SET `OfferRewardText`='Welcome to hell, soldier.$B$BMy men are leading the assault on the gate from this position, and we''re dropping some infiltrators in the city via air - we need more people on both fronts. I have a feeling that this attack will be going on for some time.' WHERE `Id`=13341; -- Joining the Assault +UPDATE `quest_template` SET `OfferRewardText`='Hail, $N. Thassarian mentioned you''d be dropping by. Any friend of Thassarian''s is my friend. Well, any living friend of Thassarian, that is... He does keep odd company.' WHERE `Id`=13386; -- Exploiting an Opening +UPDATE `quest_template` SET `OfferRewardText`='You''re as good as Thassarian said. Good job!' WHERE `Id`=13387; -- Securing the Perimeter +UPDATE `quest_template` SET `OfferRewardText`='These bombs look pretty potent. They should at least put a dent in the surrounding structure.' WHERE `Id`=13388; -- Set it Off! +UPDATE `quest_template` SET `OfferRewardText`='This pulsing object is covered in a thick layer of ice. It shimmers strangely beneath the water.' WHERE `Id`=13389; -- A Short Fuse +UPDATE `quest_template` SET `OfferRewardText`='I saw him get rid of it, you know? He threw it all the way down here.$B$BSaid he wouldn''t need it anymore. Said it made him weak.' WHERE `Id`=13390; -- A Voice in the Dark +UPDATE `quest_template` SET `OfferRewardText`='What are you waiting for? You have to rub it on you!$B$BQuick! Or he''ll see you!' WHERE `Id`=13391; -- Time to Hide +UPDATE `quest_template` SET `OfferRewardText`='It''s you, $N! We thought you were a goner.$B$BThat explosion of yours put quite a bit of hurt on the Scourge. Nearly took Captain''s Kendall''s eyebrows off in the process...' WHERE `Id`=13392; -- Return to the Surface +UPDATE `quest_template` SET `OfferRewardText`='The demolisher has seen better days, but the structure hasn''t suffered any permanent damage. The parts you obtained should be enough to get it running again, at least temporarily.' WHERE `Id`=13393; -- Field Repairs +UPDATE `quest_template` SET `OfferRewardText`='You see? You killed your fair share, but for every one you destroyed, another rose from the dirt to take its place.$B$BYou don''t know what you''re up against, $N. Let me show you.' WHERE `Id`=13394; -- Do Your Worst +UPDATE `quest_template` SET `OfferRewardText`='The prince''s true power wasn''t his ability to make armies out of corpses... that was easy.$B$BBut killing his own men, with whom he''d shared many battles... the prince''s true power was his ability to do what had to be done.' WHERE `Id`=13395; -- Army of the Damned +UPDATE `quest_template` SET `OfferRewardText`='Nice shooting, $N. The Scourge never had a chance.$B$BAre you feeling okay? You look like you''ve seen a ghost. Not that it would be an unusual thing around these parts, now that I think about it.' WHERE `Id`=13396; -- Futility +UPDATE `quest_template` SET `OfferRewardText`='Nice job, $N. You make the rest of us look bad!' WHERE `Id`=13397; -- Sindragosa's Fall +UPDATE `quest_template` SET `OfferRewardText`='Nothing to it, eh? Any intelligent being should have little trouble controlling lesser undead. I suspect only the likes of a true necromancer could use these to sieze control of any of the more powerful undead. That won''t be a problem though - I can already think of quite a variety of destruction we can wreak with even the most paltry minions.$B$BShall we have at it then?' WHERE `Id`=13168; -- Parting Gifts +UPDATE `quest_template` SET `OfferRewardText`='Quiet! I''m in a delicate juncture and mustn''t be disturbed!$B$BOne moment...' WHERE `Id`=1947; -- Journey to the Marsh +UPDATE `quest_template` SET `OfferRewardText`='Ah, so you''ve been speaking with MacKinley, have you?$B$BIt''s not what he thinks! I''m not afraid to give him some Steamwheedle Bilge Rum...$B$BI just don''t have any rum to give him!' WHERE `Id`=2872; -- Stoley's Debt +UPDATE `quest_template` SET `OfferRewardText`='Out-frikkin-standing! As of right now $T Civvy : Civvy; $N, you are my favorite person on the sorry remains of this sorry planet!$B$BI''m sure that the eggheads are going to wet themselves when I hand that blood over to them for study. Who knows, maybe we''ll find a new weapon in the fight against those damned fel orcs?' WHERE `Id`=9589; -- The Blood is Life +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=8619; -- Morndeep the Elder +UPDATE `quest_template` SET `OfferRewardText`='Wonderful! We thank you for your generous donation, $N!' WHERE `Id`=7807; -- A Donation of Wool +UPDATE `quest_template` SET `OfferRewardText`='Wonderful! We thank you for your generous donation, $N!' WHERE `Id`=7808; -- A Donation of Silk +UPDATE `quest_template` SET `OfferRewardText`='Vanira''s frogs be tellin'' de truth, den? Dis tiger be a druid and an ally? We couldn''t be hopin'' for a better outcome. Dis be a good omen for de coming battle.' WHERE `Id`=25470; -- Lady Of Da Tigers +UPDATE `quest_template` SET `OfferRewardText`='$n, you''d be a mighty warrior and a fierce commrade to da Darkspear trolls. De Echo Isles are OURS now and we couldn''ta done it wit''out ya.$B$BTake dis cloak. Wear it wit pride. You''d be a member of da tribe now!$B$BIn no time, da trolls will have a home again and we have you to thank for dat.' WHERE `Id`=25445; -- Zalazane's Fall +UPDATE `quest_template` SET `OfferRewardText`='15.9 pounds! That may be a new record for blood and gut weight on apparel! Congratulations, $c!' WHERE `Id`=7729; -- JOB OPPORTUNITY: Culling the Competition +UPDATE `quest_template` SET `OfferRewardText`='Ye''re a good $g lad:lass;, ye are. I got ye a lil'' present fer yer troubles.' WHERE `Id`=7723; -- Curse These Fat Fingers +UPDATE `quest_template` SET `OfferRewardText`='I never thunk I''d be lookin'' at thish ugly mug again!$B$BHe acshually looksh better without the resht o'' him attached.$B$BHere''s yer reward *hic*, $r.' WHERE `Id`=7701; -- WANTED: Overseer Maltorius +UPDATE `quest_template` SET `OfferRewardText`='Wonderful! Those sleepy Dark Irons will head back to their homes in the Depths to get some rest, greatly slowing down the productivity of the Slag Pit.' WHERE `Id`=7702; -- Kill 'Em With Sleep Deprivation +UPDATE `quest_template` SET `OfferRewardText`='There is one final task that you must complete. +' WHERE `Id`=3453; -- The Torch of Retribution +UPDATE `quest_template` SET `OfferRewardText`='Are you prepared to make your strike? +' WHERE `Id`=3462; -- Squire Maltrake +UPDATE `quest_template` SET `OfferRewardText`='It is glorious! Is it not glorious master? ' WHERE `Id`=3463; -- Set Them Ablaze! +UPDATE `quest_template` SET `OfferRewardText`='Oh, this is great! Nice feel to it too!$B$BWhat? Oh, yeah... geologists. Got ''em good, did ya? I can''t thank ya enough, $N. That''ll give me some time to finish up in here... Thanks again, $N.' WHERE `Id`=4449; -- Caught! +UPDATE `quest_template` SET `OfferRewardText`='Keep the residue pouring in!' WHERE `Id`=13662; -- Gaining Acceptance +UPDATE `quest_template` SET `OfferRewardText`='You have struck a decisive blow against the Undermarket. Their leaders will think twice before sending more cronies into the gorge.$B$BOh, and I also found nothing of use in the trader''s satchel. You may keep whatever you find inside.' WHERE `Id`=3385; -- The Undermarket +UPDATE `quest_template` SET `OfferRewardText`='Perfect! I just hope the Dalaran Destroyers finally win one!' WHERE `Id`=13107; -- Mustard Dogs! +UPDATE `quest_template` SET `OfferRewardText`='$B$BThat ore... I can''t touch it. It seethes with unnatural energy. No creature of stone can handle it. What do they mean to do with this?' WHERE `Id`=12964; -- The Dark Ore +UPDATE `quest_template` SET `OfferRewardText`='$B$BYou''ve weakened the stormforged considerably, but they''ll keep fighting. Their casualties matter nothing to them, while our defenders continue to fall. Even if it costs them a hundred or a thousand iron corpses, they''ll keep fighting until we''ve been pounded to gravel.' WHERE `Id`=12965; -- The Gifts of Loken +UPDATE `quest_template` SET `OfferRewardText`='Ruined? What d''you mean, the camp''s been ruined?$B$B$B$BThose iron dwarves will pay for this! There''s little we can do now, and we have to focus on finishing the key. But once I get into the halls of Ulduar, the irons and their masters will answer for what they''ve done!' WHERE `Id`=13273; -- Going After the Core +UPDATE `quest_template` SET `OfferRewardText`='$B$BBrann may prove to be just the ally we need to discover what is truly happening in Ulduar. You''ve done well in aiding him. We need all the help we can get against this Loken and his iron dwarf minions.' WHERE `Id`=13285; -- Forging the Keystone +UPDATE `quest_template` SET `OfferRewardText`='The Sons of Hodir accept your tribute, small one. You continue to prove your worth as an ally in more ways than one.' WHERE `Id`=13559; -- Hodir's Tribute +UPDATE `quest_template` SET `OfferRewardText`='Yes... these will do. Let us hope my plan works, $N.$B$BVeranus is a great drake. I''d hate to have to settle for a lesser one.' WHERE `Id`=13050; -- Veranus +UPDATE `quest_template` SET `OfferRewardText`='It''s good to have my old friend back. It appears that my luck is finally starting to change... and it''s all thanks to you, little friend.' WHERE `Id`=13051; -- Territorial Trespass +UPDATE `quest_template` SET `OfferRewardText`='So it is done.$b$bWe have heard the screams of Jormuttar as they echoed from across the valley.$b$bYou have done our people a service this day, little $r.' WHERE `Id`=13011; -- Jormuttar is Soo Fat... +UPDATE `quest_template` SET `OfferRewardText`='We''re here, $N. My brother''s forces will learn the meaning of defeat today.' WHERE `Id`=13057; -- The Terrace of the Makers +UPDATE `quest_template` SET `OfferRewardText`='It''s a good start. But my brother''s forces will not take long to regroup. We must make our victory a decisive one.' WHERE `Id`=13005; -- The Earthen Oath +UPDATE `quest_template` SET `OfferRewardText`='One by one, my brother''s servants have fallen. Loken''s insurrection will soon come to an end.' WHERE `Id`=13035; -- Loken's Lackeys +UPDATE `quest_template` SET `OfferRewardText`='No... it cannot be...$B$BNo one can defeat Thorim in single combat. Not a giant, nor a beast... no one! Especially not that coward of a brother of his.$B$BOn my forefathers'' names, this I swear...$B$BLoken will pay for this!' WHERE `Id`=13047; -- The Reckoning +UPDATE `quest_template` SET `OfferRewardText`='The heavens, in their countless stars, hold answers to earthly mysteries, $N. Might, then, the wise, and the lucky, gaze up and find truth?' WHERE `Id`=8727; -- Farwhisper the Elder +UPDATE `quest_template` SET `OfferRewardText`='Human children born of vrykul? And Ymiron ordered the deaths of all human born offspring?$B$B$B$BAs much as I wish to deny what is so plainly presented to me, I cannot. There is no extinct \"missing link\" to humans as the Explorers'' League proposed. The vrykul are the missing link. They are the progenitors of humanity.' WHERE `Id`=11344; -- Anguish of Nifflevar +UPDATE `quest_template` SET `OfferRewardText`='This is quite a find, $N. I can''t have you selling this to anyone else, so I''m willing to offer generously.' WHERE `Id`=24431; -- Waterlogged Recipe +UPDATE `quest_template` SET `OfferRewardText`='You have rescued the sacred text!$b$bYour journey was long and acquiring the book was undoubtedly no easy task. But the dwarves of Ironforge stand to benefit from your success.$b$bThank you, $n, on behalf of the Explorers'' League.' WHERE `Id`=1050; -- Mythology of the Titans +UPDATE `quest_template` SET `OfferRewardText`='So Stormpike sent you, did he? Good.$B$BI have a big task for you...' WHERE `Id`=707; -- Ironband Wants You! +UPDATE `quest_template` SET `OfferRewardText`='Fantastic, I thought you looked to be the heroic type! We''ve got our work cut out for us $N, I''m not going to lie to you. If we stay focused on the task at hand, we should be able to come out on top.$B$BNow, let me bring you up to speed on what''s been going on...' WHERE `Id`=3523; -- Scourge of the Downs +UPDATE `quest_template` SET `OfferRewardText`='You have my thanks.$B$BThis has been a brutal operation, but we haven''t had any great options otherwise - they''re being equally as unforgiving to our aerial assault. We need to rout these vrykul if we''re going to stand any chance of pressing on in Icecrown.$B$BWe''re likely to need more help later. Please lend yourself to the battle again should the chance present itself.' WHERE `Id`=13284; -- Assault by Ground +UPDATE `quest_template` SET `OfferRewardText`='Let''s see here... what do we have...$B$B$B$BMalykriss! The Vile Hold. It seems Arthas did not take the loss of his death knights so well... I''m not exactly sure what he''s doing with all of that saronite, but I have a feeling he might be overcompensating for something.$B$BThat boy is not used to losing.' WHERE `Id`=13174; -- Amidst the Confusion +UPDATE `quest_template` SET `OfferRewardText`='I''ve chained the wretch to the post over there and I''ll look into getting my hands on more of them.$B$BNow let''s make some use of that eye.' WHERE `Id`=13143; -- New Recruit +UPDATE `quest_template` SET `OfferRewardText`='Excellent work. It seems more death knights remained loyal to Arthas than I initially thought.$B$BHe certainly is sparing nothing in his attempt to replace Acherus. A pure saronite citadel would be hard to destroy indeed. There''s no need to destroy it though... we can halt production and put down these death knight leaders here and now, before they become a real threat.$B$BMost importantly, we need to disrupt them enough to get those death knights away from from the leaders so that we can make our strike.' WHERE `Id`=13145; -- The Vile Hold +UPDATE `quest_template` SET `OfferRewardText`='Yay, yay! $N is best proto-drake stealer.$B$BYou come back tomorrow and we make more fire!!!' WHERE `Id`=13071; -- Vile Like Fire! +UPDATE `quest_template` SET `OfferRewardText`='Well done, $N. Let them see the desecrated corpses of their fallen comrades and think twice about striking at us!$B$BIf you come back tomorrow, I will make certain to have more banners prepared for you.' WHERE `Id`=12995; -- Leave Our Mark +UPDATE `quest_template` SET `OfferRewardText`='You are a true champion for the cause, $N!$B$BWon''t you please come speak to me again tomorrow? I''m certain that there will be more of those nasty proto-drakes to shoot down.' WHERE `Id`=13069; -- Shoot 'Em Up +UPDATE `quest_template` SET `OfferRewardText`='$B$BGood. It''s not much protection, but it''s better than nothing. That gate is still the perfect choke point if the Scourge commanders know what they''re doing. We must gain control of as much of the surrounding area as possible.' WHERE `Id`=13332; -- Raise the Barricades +UPDATE `quest_template` SET `OfferRewardText`='Words cannot describe what I''m feeling at the moment, $N. My revenge is complete and there is naught else for me to do.$B$BIf only I could be there when the Lich King is finally taken down.$B$BDon''t fool yourself though, Jotunheim is far from ''dealt'' with. I will remain in possession of this witch until such time as the vrykul are no longer a threat.$B$BLook around, there are many items of value in this cave. Take your pick.' WHERE `Id`=13142; -- Banshee's Revenge +UPDATE `quest_template` SET `OfferRewardText`='You have bested our finest warriors. Your name is renowned, $N.$B$BPerhaps you think that this concerns me: it does not. If they can fall to you then they are not worthy and should be nothing but lowly vargul!$B$BBut perhaps I can give you and your friends different sport. Valhalas is also a place for combat of all types with many different kinds of foes.$B$BSpeak to me again when you and your friends are ready to proceed. We shall see if you are truly worthy.' WHERE `Id`=13213; -- Battle at Valhalas +UPDATE `quest_template` SET `OfferRewardText`='It''s good to have someone competent running missions, $N. If only we had an army of $cs like you, we could show the Horde what we''re made of. These captured reports will help us to maintain the upper hand in this fight. We may be down, but we''re far from out.' WHERE `Id`=13314; -- Get the Message +UPDATE `quest_template` SET `OfferRewardText`='New blood.$B$B$B$BYou all think that you have what it takes to fight here.$B$BYou are nothing before the might of the vrykul and the Scourge!$B$BStill, you did manage to defeat six incompetent corpses, so you must have some skill in you. Not likely enough for the next challenge though.' WHERE `Id`=13214; -- Battle at Valhalas: Fallen Heroes +UPDATE `quest_template` SET `OfferRewardText`='You want me to be impressed by the fact that you and your friends were able to bring down a lone Nerubian priest?$B$BGet out of my sight before I summon my ghouls upon you!' WHERE `Id`=13215; -- Battle at Valhalas: Khit'rix the Dark Master +UPDATE `quest_template` SET `OfferRewardText`='The defeat of one of the hyldnir is mildly impressive, $r, but you did have the help of your friends.$B$BYou''re lucky that her drake didn''t get involved.' WHERE `Id`=13216; -- Battle at Valhalas: The Return of Sigrid Iceborn +UPDATE `quest_template` SET `OfferRewardText`='I''m starting to respect your prowess in the ring, $N. Now I really don''t like you.$B$BI would much rather have preferred to see you and your friends stuck to the bottom of that flesh giant''s foot!' WHERE `Id`=13217; -- Battle at Valhalas: Carnage! +UPDATE `quest_template` SET `OfferRewardText`='I don''t know what trickery it was that you used to bring down the thane -- I couldn''t see it from this angle -- but I can assure you that you will not survive your next match.$B$BYes, I know who it is. Run, little $r. Flee to the far corners of the world.$B$BOr stay and die. It matters little to me.' WHERE `Id`=13218; -- Battle at Valhalas: Thane Deathblow +UPDATE `quest_template` SET `OfferRewardText`='Your defeat of Prince Sandoval sickens me. An unwashed peasant such as yourself should have willingly given over $g his : her; life simply for the chance to meet him and kneel at his feet.$B$BYou''ve earned your damned reward. Be quick about your choosing.' WHERE `Id`=13219; -- Battle at Valhalas: Final Challenge +UPDATE `quest_template` SET `OfferRewardText`='This will allow us to patch up more of the fallen. Thank you, $N, on behalf of all who defend the refuge.' WHERE `Id`=12930; -- Rare Earth +UPDATE `quest_template` SET `OfferRewardText`='You''ve done well, $N!' WHERE `Id`=192; -- Panther Mastery +UPDATE `quest_template` SET `OfferRewardText`='So the great Bhag''thera is dead! Cheers to you, $N. You are a mighty $c indeed!' WHERE `Id`=193; -- Panther Mastery +UPDATE `quest_template` SET `OfferRewardText`='Ho ho!! We have ourselves a true raptor slayer! Nicely done, $g old chap : fair lady;!' WHERE `Id`=196; -- Raptor Mastery +UPDATE `quest_template` SET `OfferRewardText`='$G Master : Mistress; $N, the raptor slayer!$b$bHas a nice ring to it, eh?' WHERE `Id`=197; -- Raptor Mastery +UPDATE `quest_template` SET `OfferRewardText`='Bloody well done! Right-o! Congratulations, $N, for succeeding where others have failed.$b$bI am honored to count you as a comrade of our great hunting party here. No one will ever doubt your expertise in hunting and tracking!$b$bCheers to you, I say! Cheers!' WHERE `Id`=208; -- Big Game Hunter +UPDATE `quest_template` SET `OfferRewardText`='You''re a good $g man : woman;, $N. We''re fortunate that you happened to stop by.$B$BStick around a while. I''m sure that we have much that a capable $c such as yourself can do.' WHERE `Id`=12740; -- Parachutes for the Argent Crusade +UPDATE `quest_template` SET `OfferRewardText`='$B$BAre those new orders for me, $g mister : miss;?' WHERE `Id`=12505; -- New Orders for Sergeant Stackhammer +UPDATE `quest_template` SET `OfferRewardText`='Perfect! I just hope the Dalaran Destroyers finally win one!' WHERE `Id`=13116; -- Mustard Dogs! +UPDATE `quest_template` SET `OfferRewardText`='Good. $n, I know of you. You''ll be perfect for these tasks.$B$BWe''ve been afforded a rare chance to delve into Icecrown Citadel, but we must move quickly if we''re to avoid Arthas'' notice.' WHERE `Id`=24506; -- Inside the Frozen Citadel +UPDATE `quest_template` SET `OfferRewardText`='Well done, $N. Mounted combat is often hard to pick up for those accustomed to fighting on foot. I have no doubt that you''ll continue to improve with practice, which is more than I can say for some warriors.' WHERE `Id`=13677; -- Learning The Reins +UPDATE `quest_template` SET `OfferRewardText`='You have shown yourself a capable combatant, $N and you will serve as an example to the rest of the aspirants who clamor to compete on behalf of the Horde.' WHERE `Id`=13676; -- Training In The Field +UPDATE `quest_template` SET `OfferRewardText`='So you''re saying this knight''s story is a sham? Most suspicious. Dishonorable at the least, and murderous at the worst. Still, we can''t confront him until we know for certain whether he was involved in these murders.$B$BDo nothing to arouse his suspicions, $N. Discretion will serve us well as we continue to investigate.' WHERE `Id`=13634; -- The Black Knight of Silverpine? +UPDATE `quest_template` SET `OfferRewardText`='Welcome to Orgrim''s Hammer.$B$BFrom here we are laying our groundwork for the assault on Arthas. There''s a lot of preparation to be done, but before we can get into the real meat of it, we want to make sure that the Argent Crusade is adequately reinforced - we''re going to need their help later.$B$BIf you have not already, speak to Brother Keltan on the main deck.' WHERE `Id`=13419; -- Preparations for War +UPDATE `quest_template` SET `OfferRewardText`='Perhaps now we can really get something done. Don''t be fooled though, the Lich King can still ''see'' through his Scourge minions.$B$BThat''s why you''re here.' WHERE `Id`=12892; -- It's All Fun and Games +UPDATE `quest_template` SET `OfferRewardText`='Quickly, hand them to me and stay out of sight!$B$BThe rod, the hook, and the rope are all very self-evident in their usage when combined. I just need to infuse the result with the essences and we''ll be ready to proceed.$B$BIt''s all very mundane in its composition, but extraordinary in its application!' WHERE `Id`=12891; -- I Have an Idea, But First... +UPDATE `quest_template` SET `OfferRewardText`='We will put those three to good use once we finally take the vault.$B$BSpeaking of which....' WHERE `Id`=12893; -- Free Your Mind +UPDATE `quest_template` SET `OfferRewardText`='Careful, now. Keep that plate as far away from me as you can. Even being in its presence is enough to inflict pain.$B$BBut you''re right, $N, these are gigantic armor plates for a war golem of normal size. What would the stormforged be doing with them? There''s only one way to find out.' WHERE `Id`=12979; -- Armor of Darkness +UPDATE `quest_template` SET `OfferRewardText`='There may be hope for victory, $N. We have never been able to sustain an attack on the stormforged, but with your efforts, Valduran may yet fall!' WHERE `Id`=12978; -- Facing the Storm +UPDATE `quest_template` SET `OfferRewardText`='Always more questions than answers, eh, $g lad:lass;? +' WHERE `Id`=13207; -- Halls of Stone +UPDATE `quest_template` SET `OfferRewardText`='So... here I sat, basking in the awesomeness that is me, and in the distance, I hear a pop! Then another! Then a dozen more! And a smile crept onto my face at the thought of all those magnataur and snobolds eagerly rushing to their own deaths.$B$BWas it glorious?' WHERE `Id`=12820; -- A Delicate Touch +UPDATE `quest_template` SET `OfferRewardText`='Excellent!$B$B$B$BLet the destruction begin!' WHERE `Id`=12821; -- Opening the Backdoor +UPDATE `quest_template` SET `OfferRewardText`='I know that we Forsaken appear monstrous to your eyes, but I assure you we mean your people no harm. We are here because of a common enemy: Dar''Khan the traitor! He has returned and now commands the Scourge that are invading this land from his steadfast, Deatholme, to the south.$B$BOur leader, Lady Sylvanas Windrunner, originally hails from these lands, and in fact used to be an elf. She has a history with Dar''Khan and wants him dead as much as your people do.$B$BWe will defeat him together, $c!' WHERE `Id`=9327; -- The Forsaken +UPDATE `quest_template` SET `OfferRewardText`='Oh good, there you are! And just in time... there is much to be done!' WHERE `Id`=9758; -- Return to Arcanist Vandril +UPDATE `quest_template` SET `OfferRewardText`='Very well, these will have to do. No, don''t describe them crawling around, I don''t want to know! I''ll work my magic upon these legs and they''ll turn out quite tasty. A little spice here, a pinch of herb there, and then of course some arcane ingredients, and voila, a meal fit for a queen... or in this case, a dame.$B$BYour service has been adequate, $c. Here, take this recipe and some samples.' WHERE `Id`=9171; -- Culinary Crunch +UPDATE `quest_template` SET `OfferRewardText`='My family... What have I done... What could I have done?$b$bWhy must I be punished so?' WHERE `Id`=10428; -- The Missing Fisherman +UPDATE `quest_template` SET `OfferRewardText`='[Furbolg] The prophecy spoke of one that would rise and deliver us from the oppressive grasp of Bristlelimb -- that the spirits themselves would herald the arrival of this hero.$B$BAnd now, you have come.$B$BI humble myself before you, great one.' WHERE `Id`=9544; -- The Prophecy of Akida +UPDATE `quest_template` SET `OfferRewardText`='You''re a resourceful one! With our navigation gear, we can figure out just how far we''ve veered off course.$b$bBut wait, what''s this? There''s something rolled up in the map. Let me see...$b$bThese are orders from Mogul Razdunk of the Venture Company. According to these plans, they''re here to strip-mine the island of the crystal wreckage, then hijack our ships once they''re finished.$b$bBy Bronzebeard''s bushy brow! This is why they forced us to land? How could they know of our plans?$b$bI smell a traitor...' WHERE `Id`=9506; -- A Small Start +UPDATE `quest_template` SET `OfferRewardText`='Bless yer heart, stranger. This''ll go a long ways in liftin'' the morale o'' the crew. +' WHERE `Id`=9512; -- Cookie's Jumbo Gumbo +UPDATE `quest_template` SET `OfferRewardText`='My pappy would be proud! His boy strikes it big at the first set of night elf ruins he comes across... With your help, of course. Yes, don''t worry, I won''t leave you out of the discovery. Your name is $N, right? They''ll learn all about you in Ironforge. +' WHERE `Id`=9523; -- Precious and Fragile Things Need Special Handling +UPDATE `quest_template` SET `OfferRewardText`='$B$BThis will have to do for now! Hopefully one of the shaman will be able to repair the damage.' WHERE `Id`=9564; -- Gurf's Dignity +UPDATE `quest_template` SET `OfferRewardText`='You place the gem inside the essence font.$B$B\"Thank you mortal, you have - no... this, this cannot be! No! The corruption of this accursed god even taints the sanctity of a Green Dragonflight essence font! No please, I feel my essence ripping from me! THE PAIN! I feel the grip of an eternal nightmare taking hold on me...\"$B$B\"Mortal, I implore you! Find one of the Green Dragonflight to stop this... help me... I am chained in darkness... forever in agony... please do not torture...\"' WHERE `Id`=3373; -- The Essence of Eranikus +UPDATE `quest_template` SET `OfferRewardText`='Well done, $N. I am pleased. You have done a great thing here today.$B$BU''cha was one of the greatest apes I had ever seen. The fact that you have bested his strength speaks well of your own strength... and courage.$B$BIt is only fitting that I give you this as a sign of respect. You have earned it.' WHERE `Id`=4301; -- The Mighty U'cha +UPDATE `quest_template` SET `OfferRewardText`='The Earth Mother be praised! You''ve done it! Fair play to you, $N. You have proven to be a great hunter in your own right. Your spirit is strong. Your bravery unmatched. And your strength has been fortified. I bow down to your skills.$B$BOnly the greatest of my ancestors could have accomplished something so incredible. Congratulations.' WHERE `Id`=4292; -- The Bait for Lar'korwi +UPDATE `quest_template` SET `OfferRewardText`='I''ll need one vial to make sure that this is truly the elixir... Yes... This is the stuff. ' WHERE `Id`=3909; -- The Videre Elixir +UPDATE `quest_template` SET `OfferRewardText`='Thanks so much, $N! Now I can get back to work here.$B$BDid you find anything of interest at the Winterfall camp?' WHERE `Id`=5082; -- Threat of the Winterfall +UPDATE `quest_template` SET `OfferRewardText`='This thing... it is in the shape of a Winterfall Ritual Totem, but it has been twisted by forces I cannot begin to comprehend. Whatever taint that has set the Winterfall against us is surely present in this object.$B$BDivine wisdom has brought both this and you to us, $N. We will study this object intently; perhaps one day, the Winterfall will rage against us no longer.$B$BThank you, friend - please accept these offerings in exchange for your benevolence.' WHERE `Id`=8471; -- Winterfall Ritual Totem +UPDATE `quest_template` SET `OfferRewardText`='Thank you again, $C, for rescuing me from Baltharus''s clutches!$B$BThere is still much work to be done, however....' WHERE `Id`=26013; -- Assault on the Sanctum +UPDATE `quest_template` SET `OfferRewardText`='It''s locked, isn''t it? It looks pretty ordinary.$B$B$B$BNo matter, I suppose. If this gets us the edge we need against the Horde, then I could care less if the cure for the Plague was in there. ' WHERE `Id`=12292; -- Local Support +UPDATE `quest_template` SET `OfferRewardText`='With Malygos defeated, the Nexus War should come to a swift conclusion. You have the gratitude of the Kirin Tor, $N.' WHERE `Id`=24584; -- Malygos Must Die! +UPDATE `quest_template` SET `OfferRewardText`='Shiver me timbers and timber me shivers! Ye found me beautiful eye! Let''s see if she still fits.$b$b$n ho! Blimey, I can see!!' WHERE `Id`=576; -- Keep An Eye Out +UPDATE `quest_template` SET `OfferRewardText`='Good show, $n! And just before I need to ship out too! Can''t thank you enough, old friend.' WHERE `Id`=587; -- Up to Snuff +UPDATE `quest_template` SET `OfferRewardText`='Perfect, $n. Now that we know their plan, it''s just a matter of time.$b$bAnd to think the fools have dropped anchor just off the cape....' WHERE `Id`=604; -- The Bloodsail Buccaneers +UPDATE `quest_template` SET `OfferRewardText`='Witch Doctor Unbagwa like Gorilla Fangs! For you I talk to spirits. Make Mokk the Savage come.$b$bYou protect Witch Doctor Unbagwa from other Gorilla-beast though or no Mokk for you!' WHERE `Id`=349; -- Stranglethorn Fever +UPDATE `quest_template` SET `OfferRewardText`='Ack! Where''d you get these? No, don''t tell me. I don''t want to know!$B$BWho sent you? Sea Wolf?' WHERE `Id`=606; -- Scaring Shaky +UPDATE `quest_template` SET `OfferRewardText`='Ah, very good! Here is your pay.$B$BAnd here is a little something extra... for your discretion.' WHERE `Id`=621; -- Zanzil's Secret +UPDATE `quest_template` SET `OfferRewardText`='Ah, what a great day for the Blackwater Raiders! Three cheers to you, $n!' WHERE `Id`=608; -- The Bloodsail Buccaneers +UPDATE `quest_template` SET `OfferRewardText`='Heh heh, well done! And when you showed Shaky those giblets, how hard did he shake?$B$BHah! He''s so easy to read, when I play cards with him I can''t help but win!$B$BThanks for your help, $N. Now it''s your turn to get paid...' WHERE `Id`=607; -- Return to MacKinley +UPDATE `quest_template` SET `OfferRewardText`='...feel strength returning....$b$bWhere might be? Booty Bay? Oh my! I had the strangest dream...$b$b...the weakness has not completely left me....' WHERE `Id`=348; -- Stranglethorn Fever +UPDATE `quest_template` SET `OfferRewardText`='What?! I got a lot better things to do then talk to the likes of you, $c. Make it worth my while or get outta my face.$B$BHuh? Bloads sent ya, huh? Well, whaddaya got for me?$B$B$B$BNot bad, not bad at all. Another bundle will make my client quite happy.$B$BI suppose yer next question''s gonna be about money, huh, $c? Of course it is!$B$BHere, take this coin and some advice: get off my docks.' WHERE `Id`=623; -- Akiris by the Bundle +UPDATE `quest_template` SET `OfferRewardText`='James Hyal, James Hyal... Why does that name sound so familiar?$b$bOf course! The Shady Rest Inn incident. If you have any information about what happened there, I would urge you to speak with Captain Vimes about it. He''s handling the investigation.' WHERE `Id`=1302; -- James Hyal +UPDATE `quest_template` SET `OfferRewardText`='What''s this? Ah! It smells like Dark Iron Ale! Drink has blurred my sight, but I can tell that you, $gsir:my lady;, are a real friend!' WHERE `Id`=4295; -- Rocknot's Ale +UPDATE `quest_template` SET `OfferRewardText`='You have the heart! Amazing! It is even more beautiful than I imagined!$B$BPlease, $N, take this as payment!' WHERE `Id`=4123; -- The Heart of the Mountain +UPDATE `quest_template` SET `OfferRewardText`='Ah, you found the tablet! And your transcription is superb! Are you sure you''re a $c and not a scribe?$B$BHere you are, $N. Here is the payment I promised.' WHERE `Id`=4296; -- Tablet of the Seven +UPDATE `quest_template` SET `OfferRewardText`='Oh my goodness, you made it! I was uncertain.$B$BYou flickered in and out of the time stream there for a moment during the fight! I thought for sure that we''d lost you!$B$BBut here you are safe and sound, with your past self rescued, on the other side of the time loop you were in.$B$BYou''re quite the temporal $g hero : heroine;, $N!' WHERE `Id`=13343; -- Mystery of the Infinite, Redux +UPDATE `quest_template` SET `OfferRewardText`='$B$BTh... They say these Vargul are the... the ones that weren''t found worthy by the Lich King. Can... Can you im... imagine it? Just th... think how powerful the... the... worthy must be...$B$BI''ll say a prayer for you in the hereafter, hero... May you never have to face them in number.' WHERE `Id`=12904; -- Light Won't Grant Me Vengeance +UPDATE `quest_template` SET `OfferRewardText`='A... A storm giant? I don''t know about this, $N. That sounds risky. On the other hand, I don''t think we have too many other options.$B$BIf I do this you have to promise me that you will get your giant friend to help us deal with Navarius and his cronies.' WHERE `Id`=12912; -- A Great Storm Approaches +UPDATE `quest_template` SET `OfferRewardText`='Excellent work, $n. The tremors have already begun to subside.$b$bWith any luck, your efforts have granted us sufficient time to find a way to thwart Malygos'' efforts.' WHERE `Id`=11905; -- Postponing the Inevitable +UPDATE `quest_template` SET `OfferRewardText`='Ah, that''s the spice! Now here''s some swampy good stew.' WHERE `Id`=1218; -- Marsh Frog Legs +UPDATE `quest_template` SET `OfferRewardText`='A report from an orc spy! How did you find this? No matter -- let''s see what it says...' WHERE `Id`=1220; -- Captain Vimes +UPDATE `quest_template` SET `OfferRewardText`='The freed captives have already begun returning from Blackhoof Village. The information the captain is receiving from the prisoners will give us an advantage in our next battle against the Grimtotems.$B$BYou have my thanks and that of the men. ' WHERE `Id`=11145; -- Prisoners of the Grimtotems +UPDATE `quest_template` SET `OfferRewardText`='Hm, I''m no expert with the construction of arms and armor. Their use, yes, but not their making.$b$bThis shield seems as ordinary as any, excepting the damage from the fire that engulfed the inn.' WHERE `Id`=1253; -- The Black Shield +UPDATE `quest_template` SET `OfferRewardText`='Hoofprints, eh? It is true that there is an extraordinary amount of centaur activity in the lands near the Dustwallow Marsh. In brief excursions into the Barrens, we found their camps and holdings dotting the area.$b$bI''ll send out Falgran Hastil, one of our trackers, to see if he can find where the tracks lead.' WHERE `Id`=1284; -- Suspicious Hoofprints +UPDATE `quest_template` SET `OfferRewardText`='It''s never good news when a guard''s badge is brought to me.$b$bSometimes it''s a man or woman who''s fallen in battle, and I''m left to bring the news to the grieving family. Other times we never find out what happened to them. And other times it''s even worse than that.' WHERE `Id`=1252; -- Lieutenant Paval Reethe +UPDATE `quest_template` SET `OfferRewardText`='Hello, $n. You''d like information about a specific member of the Theramore guard? Reethe, was it?$b$bJust give me a moment to find the right book.' WHERE `Id`=1259; -- Lieutenant Paval Reethe +UPDATE `quest_template` SET `OfferRewardText`='Missing? That would be Tesoran''s kind way of saying traitor.$b$bNo doubt he''s one of those fools so blindly loyal to Admiral Daelin that he turned traitor. Isn''t that a delicious irony? The deserters accuse us of betraying the Alliance.' WHERE `Id`=1285; -- Daelin's Men +UPDATE `quest_template` SET `OfferRewardText`='Mr. Ignatz was just here with the bogbean leaves, and he told me you helped him out of some real trouble.$B$BThank you, $N. I will ask my uncle to treat you to a feast the next time you visit the Blue Recluse in Stormwind.' WHERE `Id`=1222; -- Stinky's Escape +UPDATE `quest_template` SET `OfferRewardText`='You and Renn have done excellent work in bringing this information to light and reporting it immediately. Now, we must confirm your findings. The implications are too great if we are wrong.' WHERE `Id`=11141; -- Jaina Must Know +UPDATE `quest_template` SET `OfferRewardText`='$B$BA rune circle, dragonkin? The Defias have allied themselves with HER? The traitor?$B$B' WHERE `Id`=11142; -- Survey Alcaz Island +UPDATE `quest_template` SET `OfferRewardText`='Excellent news, $c! If our tactical deployments continue to be this successful, the Horde will be in full retreat before long.' WHERE `Id`=24220; -- Call to Arms: Arathi Basin +UPDATE `quest_template` SET `OfferRewardText`='You''ve done well! That''s less Templars for me to worry about.$B$BHere you go, $N. Hope there''s something useful in there for you.' WHERE `Id`=8362; -- Abyssal Crests +UPDATE `quest_template` SET `OfferRewardText`='What Huum says is true. I believe I know how to summon a lord of the Abyssal Council! Listen on, and I will explain...' WHERE `Id`=8343; -- Goldleaf's Discovery +UPDATE `quest_template` SET `OfferRewardText`='This wine is quite amazing! I must know where it''s from.' WHERE `Id`=13115; -- Cheese for Glowergold +UPDATE `quest_template` SET `OfferRewardText`='I never cease to be amazed by the horrors that can be created through the use of technology.' WHERE `Id`=24585; -- Flame Leviathan Must Die! +UPDATE `quest_template` SET `OfferRewardText`='$B$BIt looks familiar... The Might of Kalimdor trampled a thousand bugs like this one in the desert of Silithus.$B$BThis is a different place - a different environment - but the result will be the same.$B$B$B$BYou will bring pride and honor to the Horde in Northrend, $N.$B$B' WHERE `Id`=11632; -- What the Cold Wind Brings... +UPDATE `quest_template` SET `OfferRewardText`='$B$BWHAT! This can''t be right. I''ve known some of these orcs for years!$B$BLeave me, $N. I have much work to do and many traitors to execute.$B$BTake one of these items for your trouble. You''ve done a great service for the Horde this day.' WHERE `Id`=12136; -- The Translated Tome +UPDATE `quest_template` SET `OfferRewardText`='Icefist, eh? I''ve heard his name before. Dat''s some good work, mon. Hopefully we Darkspear can turn our attention back to dat dragon menace now. ' WHERE `Id`=12145; -- Canyon Chase +UPDATE `quest_template` SET `OfferRewardText`='There is risk in dispelling the evil from a scourgestone, for it attracts the attention of undead for countless miles. But you are strong in the Light, $n, and I do not fear for you...' WHERE `Id`=8414; -- Dispelling Evil +UPDATE `quest_template` SET `OfferRewardText`='You have done as I asked without question, $n.$b$bTrust is achieved, it seems. Perhaps I can reveal our plan in more detail to you now.' WHERE `Id`=8416; -- Inert Scourgestones +UPDATE `quest_template` SET `OfferRewardText`='It''s good to see fresh troops here, $N, but with a little luck you''ll get into some action and won''t be fresh for long!$B$BSpeak with me again. I have tasks I must discuss with you....' WHERE `Id`=7121; -- The Quartermaster +UPDATE `quest_template` SET `OfferRewardText`='$B$BExcellent. Their loss is my... our gain!$B$BYou didn''t have trouble with any of these along the way? Some of them look rather unstable. I may be undead, but I value my existence!' WHERE `Id`=12230; -- Stealing from the Siegesmiths +UPDATE `quest_template` SET `OfferRewardText`='Excellent work, $g sir : ma''am;!$B$BI''ll see to it that the commander is apprised of your mission results.' WHERE `Id`=12562; -- The Drakkari Do Not Need Water Elementals! +UPDATE `quest_template` SET `OfferRewardText`='$B$BOld news. The Argent Crusade is - once again - late to the party. We''ve been tracking Drakuru since Grizzly Hills. He is slated for eradication. +' WHERE `Id`=12884; -- The Ebon Watch +UPDATE `quest_template` SET `OfferRewardText`='Saved them all, did you? Outstanding!$b$bMaybe you''d consider sticking around the post here? We could sure use someone like you....' WHERE `Id`=12512; -- Leave No One Behind +UPDATE `quest_template` SET `OfferRewardText`='Fine specimens, $n.$b$bOn behalf of my soldiers, I thank you for your efforts today.$b$bCaptain Rupert is likely the next stop on your patrol. He''s stationed at the wall just east of here.' WHERE `Id`=12564; -- Troll Patrol: Something for the Pain +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13017; -- Jarten the Elder +UPDATE `quest_template` SET `OfferRewardText`='Just what I wanted to hear! A victory in Alterac Valley - even a temporary one - is crucial to our overall strategy against the Horde.' WHERE `Id`=11336; -- Call to Arms: Alterac Valley +UPDATE `quest_template` SET `OfferRewardText`='The heavens, in their countless stars, hold answers to earthly mysteries, $N. Might, then, the wise, and the lucky, gaze up and find truth?' WHERE `Id`=8715; -- Bladeleaf the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=8680; -- Windtotem the Elder +UPDATE `quest_template` SET `OfferRewardText`='Thank you for heeding Rhonin''s call, brave adventurer.$B$BLet me share with you what we know regarding recent events, and any assistance you might offer would be greatly appreciated.' WHERE `Id`=26012; -- Trouble at Wyrmrest +UPDATE `quest_template` SET `OfferRewardText`='To atone for the sins I committed as one of the Lich King''s Death Knights, I''ve dedicated myself to creating rings of great power for our brothers and sisters to use in the struggle.$B$BYou''ve proven yourself as a valuable ally in the fight against the Scourge, $N. As your dedication continues I can improve on the ring''s original design.$B$BChoose your path carefully. A change of heart will come at a price.' WHERE `Id`=24815; -- Choose Your Path +UPDATE `quest_template` SET `OfferRewardText`='You have seen the Chamber of Khaz''mul? Amazing! Baelog was sure it existed, but I must admit that I had my doubts.$B$BThank you, $N. With luck your finding will incite our leaders to renew their efforts to retake Uldaman. And if it is ever again under Ironforge control, then the secrets of the Chamber of Khaz''mul will be ours!' WHERE `Id`=2240; -- The Hidden Chamber +UPDATE `quest_template` SET `OfferRewardText`='Well done, $N. Your actions in the field are instrumental in our battle for Hellfire Peninsula.' WHERE `Id`=13408; -- Hellfire Fortifications +UPDATE `quest_template` SET `OfferRewardText`='I have to hand it to you, $N, you''re a fighter born! Those Horde yokels may never know how close they came to the end. It takes real character to step in harm''s way on behalf of your enemies. That''s the kind of honor and commitment that holds the Alliance together! $B$B +' WHERE `Id`=10396; -- Enemy of my Enemy... +UPDATE `quest_template` SET `OfferRewardText`='It is fortuitous that you intercepted this missive when you did, $N. Though it will take me some time to decipher, I can already sense the hatred and urgency woven into this scroll. I fear the Legion''s true motives in this land will soon be made evident...$B$BGive me a moment to decipher this script. $B$B +' WHERE `Id`=10395; -- The Dark Missive +UPDATE `quest_template` SET `OfferRewardText`='Are you certain of your choice, $N? The Aldor will welcome you as an ally, but the Scryers will not easily forgive your decision.' WHERE `Id`=10551; -- Allegiance to the Aldor +UPDATE `quest_template` SET `OfferRewardText`='Welcome back from your exercises, $N. I''m confident that you will make us proud when the competition starts.' WHERE `Id`=13749; -- A Valiant's Field Training +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=8654; -- Primestone the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=8681; -- Thunderhorn the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=8671; -- Ragetotem the Elder +UPDATE `quest_template` SET `OfferRewardText`='$N, you and your allies have spared the tournament from a devastating attack. Though our skytalon riders are brave, they have their hands full keeping the peace on the tournament grounds and would be hard-pressed to defend the skies against the cult''s attack. You have the thanks of the Argent Crusade and all who have gathered here to compete.' WHERE `Id`=13682; -- Threat From Above +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13015; -- Fargal the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13028; -- Graymane the Elder +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13020; -- Stonebeard the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13032; -- Muraco the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13027; -- Tauros the Elder +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13013; -- Beldak the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13025; -- Lunaro the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13030; -- Whurain the Elder +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13019; -- Thoim the Elder +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13014; -- Morthie the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13031; -- Skywarden the Elder +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13012; -- Sardis the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13033; -- Arp the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13029; -- Pamuya the Elder +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13016; -- Northal the Elder +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=13018; -- Sandrene the Elder +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=13024; -- Wanikaya the Elder +UPDATE `quest_template` SET `OfferRewardText`='Here is your Dalaran Jewelcrafter''s Token as promised. Come back tomorrow and I am sure I will have another item I need from you!' WHERE `Id`=12961; -- Shipment: Intricate Bone Figurine +UPDATE `quest_template` SET `OfferRewardText`='Your spirit burns with life, young $c. I accept the homage you pay, and offer in return this token...' WHERE `Id`=8684; -- Dreamseer the Elder +UPDATE `quest_template` SET `OfferRewardText`='You did it! $N, you are the champion of Zul''Drak!$B$BWe will never be able to repay the debt that we owe to you, but the Zandalari have given into my trust a number of objects they believe you might have an interest in.$B$BPlease, I want you to have a token of our appreciation, but hurry. I sense another issue of urgency!' WHERE `Id`=12730; -- Convocation at Zol'Heb +UPDATE `quest_template` SET `OfferRewardText`='Ay, mon. I been expectin'' you.$B$B$B$BTake a peek. Across dat tundra be death, mon... death.' WHERE `Id`=11634; -- Wind Master To'bor +UPDATE `quest_template` SET `OfferRewardText`='NO MERCY FOR THE DEAD!$B$BNone of ''em had the guts to stay behind to defend our glorious tanks after Hellscream deemed the coast ''condemned.'' It''s mostly quiet here, seein'' as how the Scourge are formin'' up ranks to assault Warsong Hold. Sometimes I get a stray zombie or ghoul, but they don''t last very long.$B$B$B$B''Course, there''s the mist...$B$B +' WHERE `Id`=11636; -- Magic Carpet Ride +UPDATE `quest_template` SET `OfferRewardText`='You''re the new tank driver, buddy? Fine by me! We just need to get these things up and running again. Yea, you try to go out into the Plains of Nasam without a tank and you''re as good as dead.' WHERE `Id`=11642; -- Tank Ain't Gonna Fix Itself +UPDATE `quest_template` SET `OfferRewardText`='Great work, buddy! Now where''d I put that pneumatic tank transjigamarig. +' WHERE `Id`=11644; -- Super Strong Metal Plates! +UPDATE `quest_template` SET `OfferRewardText`='$B$BRuin... That is all they leave in their wake. They must be taught a lesson.' WHERE `Id`=11655; -- Into the Mist +UPDATE `quest_template` SET `OfferRewardText`='Great work, buddy! Now where''d I put those spare parts...' WHERE `Id`=11643; -- Mobu's Pneumatic Tank Transjigamarig +UPDATE `quest_template` SET `OfferRewardText`='It seems that the loss of their lieutenant has only stirred the nest. They are more angry and aggressive than before!$B$B$B$BYou''ve done what you can here, friend. At the very least you deserve some form of compensation for thinning their numbers. +' WHERE `Id`=11661; -- Orabus the Helmsman +UPDATE `quest_template` SET `OfferRewardText`='This is it? Hellscream sent a single $r $g boy:girl;?$B$BIf I still had a jaw it would be on the floor right now.' WHERE `Id`=11618; -- Reinforcements Incoming... +UPDATE `quest_template` SET `OfferRewardText`='Most of them made it back. The ones smart enough to know that we''re inside the gigantic metal and stone building, anyway...$B$BRegardless, a job well done. I hear you sprung more than a couple peons loose.$B$BOh yes, you''re the talk of the... um... fortress.' WHERE `Id`=11611; -- Taken by the Scourge +UPDATE `quest_template` SET `OfferRewardText`='Kel''Thuzad? So it''s true - Naxxramas returns...$B$BPerhaps I underestimated you, $N. You''ve done the Horde a great service. The Warchief would be proud!$B$B$B$BIf Kel''Thuzad is controlling these Scourge, there''s no telling what else the Lich King has in store for us... I''ll need time to think through this new information, $N. You are dismissed.' WHERE `Id`=11652; -- The Plains of Nasam +UPDATE `quest_template` SET `OfferRewardText`='You are foolish to come here, little $r.$B$BWhat is it that you seek?' WHERE `Id`=11624; -- The Sky Will Know +UPDATE `quest_template` SET `OfferRewardText`='I am pleased, though no doubt they will still continue to quarrel a bit longer.$B$BHowever, there is something else that you will need to accomplish before you can return to your spirit talker.' WHERE `Id`=11627; -- Boiling Point +UPDATE `quest_template` SET `OfferRewardText`='I regret the loss of those tempests, but my word is my bond... even to a mortal such as yourself.$B$BNow, let us see if we can fashion something of use to you.' WHERE `Id`=11649; -- Motes of the Enraged +UPDATE `quest_template` SET `OfferRewardText`='Imperean gave you a primal essence of herself? I can hear its howling winds!$B$BI know a ritual we can make use of it in. We must hurry before her primal rips itself apart!' WHERE `Id`=11629; -- Return to the Spirit Talker +UPDATE `quest_template` SET `OfferRewardText`='They''ve shackled his spirit. $N, we have to put an end to his torture!$B$BYou must descend into the bowels of Magmoth and find a way to free him!' WHERE `Id`=11631; -- Vision of Air +UPDATE `quest_template` SET `OfferRewardText`='These are for me? Is this some sort of $r trick? No?$B$BWell then, thank you! Come back any time that you have more clams, and we''ll do business!' WHERE `Id`=11559; -- Winterfin Commerce +UPDATE `quest_template` SET `OfferRewardText`='It does not surprise me that the orc chieftain does not have time to hear of our troubles. The ambassador''s efforts will likely be like so much mist blowing in the wind.$B$BBut you are here now. We shall see if he chose well in sending you.' WHERE `Id`=11888; -- Ride to Taunka'le Village +UPDATE `quest_template` SET `OfferRewardText`='It is good to know the people of this land still pay homage to the olden races. I bid you well, $N, and offer you this token...' WHERE `Id`=8652; -- Graveborn the Elder +UPDATE `quest_template` SET `OfferRewardText`='May you find what you''re looking for, $g brother:sister;.' WHERE `Id`=24819; -- A Change of Heart +UPDATE `quest_template` SET `OfferRewardText`='At last, we have live specimens to study! You have helped to save countless lives this day, $N.$B$BPlease, take this as a token of thanks for this great deed.' WHERE `Id`=24873; -- Residue Rendezvous +UPDATE `quest_template` SET `OfferRewardText`='You continue to prove yourself, $N. Accept this, not as a gift, but as a tool for the fight against the Scourge.' WHERE `Id`=24823; -- Path of Destruction +UPDATE `quest_template` SET `OfferRewardText`='May you find what you''re looking for, $g brother:sister;.' WHERE `Id`=24840; -- A Change of Heart +UPDATE `quest_template` SET `OfferRewardText`='The giant is dead? Praise the Light!$B$BThe way onward and upward is clear. Take some of these spoils of the battle as a token of our gratitude, and we will drink together in celebration once the Frozen Throne has been ground to dust!' WHERE `Id`=24871; -- Securing the Ramparts +UPDATE `quest_template` SET `OfferRewardText`='I trust that you did not have to face too many of his iron construct assistants?' WHERE `Id`=24587; -- Ignis the Furnace Master Must Die! +UPDATE `quest_template` SET `OfferRewardText`='Now that is what I call dedication! Those traitors might have a new master now, but they''ll never forget their sisters'' parting gift.' WHERE `Id`=12953; -- Valkyrion Must Burn +UPDATE `quest_template` SET `OfferRewardText`='The val''kyr are nothing but the Lich King''s lapdogs. They will be put down like the scum they are. They''ve made their choice, now they have to live with the consequences.' WHERE `Id`=12942; -- Off With Their Black Wings +UPDATE `quest_template` SET `OfferRewardText`='Yulda had it coming. No one gets away with insulting the Hyldsmeet. Not even one of our own.' WHERE `Id`=12968; -- Yulda's Folly +UPDATE `quest_template` SET `OfferRewardText`='You have our thanks, sister. We cannot allow our valiant traditions to be corrupted.' WHERE `Id`=12925; -- Aberrations +UPDATE `quest_template` SET `OfferRewardText`='Your efforts appear to have been successful, sister.$b$bYou have brought glory to the Brunnhildar!' WHERE `Id`=12856; -- Cold Hearted +UPDATE `quest_template` SET `OfferRewardText`='So, sister, you think that completing a few simple chores makes you a heroine?$b$bYou shall learn....' WHERE `Id`=13063; -- Deemed Worthy +UPDATE `quest_template` SET `OfferRewardText`='These will do nicely. I''ll have the harness ready for you in no time.' WHERE `Id`=12900; -- Making a Harness +UPDATE `quest_template` SET `OfferRewardText`='I''m impressed. I never thought I would see an icemaw matriarch again. Especially not one this size.' WHERE `Id`=12983; -- The Last of Her Kind +UPDATE `quest_template` SET `OfferRewardText`='The jormungar are vile creatures. You did well in destroying them.' WHERE `Id`=12989; -- The Slithering Darkness +UPDATE `quest_template` SET `OfferRewardText`='Not bad. I was hoping Kirgaraak would snap your neck so I could keep your bear.$B$BJust joking, sister. Well... half-joking. That''s a really nice bear you''ve got.' WHERE `Id`=12996; -- The Warm-Up +UPDATE `quest_template` SET `OfferRewardText`='You really did it! You made it out with your health. Wish we could say the same for your bear.$B$BIt''s going to take a while for her to recover. Fortunately you won''t need her for a while.' WHERE `Id`=12997; -- Into the Pit +UPDATE `quest_template` SET `OfferRewardText`='You''ve really made it this far. Never would I have thought you''d progress so quickly among the hyldnir.' WHERE `Id`=13061; -- Prepare for Glory +UPDATE `quest_template` SET `OfferRewardText`='Are you ready to ride, sister? There is no coming back.' WHERE `Id`=13062; -- Lok'lira's Parting Gift +UPDATE `quest_template` SET `OfferRewardText`='Your bravery seems boundless, $N.$B$BPlease hand me the heart and the essence, and I will fashion them into that which will compel the prophet to appear before you.' WHERE `Id`=12729; -- The Gods Have Spoken +UPDATE `quest_template` SET `OfferRewardText`='Above the stale, unwashed stench, you catch a whiff of a familiar smell! It appears as if this once-mighty adventurer has a real love for kungaloosh.$b$bPeeking through the bars, you can barely make out the recipe written on his arm....' WHERE `Id`=13571; -- Fletcher's Lost and Found +UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Ghostlands bonfire!' WHERE `Id`=11774; -- Desecrate this Fire! +UPDATE `quest_template` SET `OfferRewardText`='Oh, bless ya, $N, bless ya!$B$BJust set ''em down right where yer standin''. I''ll have one o'' the boys come load ''em up soon enough and we can stop worryin'' ''bout runnin'' out o'' balls ta shoot at Skorn.' WHERE `Id`=11190; -- One Size Does Not Fit All +UPDATE `quest_template` SET `OfferRewardText`='This will make a fine meal for the men.$B$B$B$BHere, $g boy : deary;, take some for yourself. You look like you could use some more meat on your bones!' WHERE `Id`=11155; -- Shoveltusk Soup Again? +UPDATE `quest_template` SET `OfferRewardText`='Incredible! What skill!$B$BThought you''d be easy prey, $N. Got me good, you did.$B$BHere''s the coin I promised... not as much as I said it''d be, but that''s on a count o'' me lying to ya in the first place.' WHERE `Id`=590; -- A Rogue's Deal +UPDATE `quest_template` SET `OfferRewardText`='Honor the Tirisfal Glades flame.' WHERE `Id`=11862; -- Honor the Flame +UPDATE `quest_template` SET `OfferRewardText`='Captain Perrine''s death will undoubtedly please The Dark Lady. You have performed your duty well, $c.' WHERE `Id`=370; -- At War With The Scarlet Crusade +UPDATE `quest_template` SET `OfferRewardText`='Varimathras would be proud. You serve your leaders well, $c.' WHERE `Id`=374; -- Proof of Demise +UPDATE `quest_template` SET `OfferRewardText`='It is troubling to hear of the Scourge slipping past the Bulwark. The Lich King and his minions are ceaseless in their assaults.$B$BBut we will not give in. He will not take us again!' WHERE `Id`=360; -- Return to the Magistrate +UPDATE `quest_template` SET `OfferRewardText`='Captain Vachon''s death will slow down the Scarlet Crusade''s advancement in Tirisfal quite a bit. But other threats loom.' WHERE `Id`=371; -- At War With The Scarlet Crusade +UPDATE `quest_template` SET `OfferRewardText`='The ore gave you a strange feeling? Maybe we won''t use that stuff after all.$B$B$B$BThose gems look really nice! I wonder what I can get for them? Of course, there are always repairs, and new stuff to be made.$B$BYou know, I''ve really found working with you to be profitable. Take this... it''s the least that I can do!' WHERE `Id`=11218; -- Danger! Explosives! +UPDATE `quest_template` SET `OfferRewardText`='Well timed, $c!$B$BThe Pit of Saron lies ahead, and if our scouts are correct, past that will be the Halls of Reflection. It is there that Arthas lets his guard down, and it is there that we hope to find a clue to his weakness... and a route to vengeance long overdue.' WHERE `Id`=24511; -- Echoes of Tortured Souls +UPDATE `quest_template` SET `OfferRewardText`='Incapable fools. I begin to wonder if any of these louts from the tournament will be of any use at all. Perhaps you''ll prove me wrong.' WHERE `Id`=24682; -- The Pit of Saron +UPDATE `quest_template` SET `OfferRewardText`='You''ve done well this day. With many of the slaves freed and now with access to the forges, it will not be long before I have a strong force to aid in delivering us from Scourgelord Tyrannus and this foul pit.' WHERE `Id`=24507; -- The Path to the Citadel +UPDATE `quest_template` SET `OfferRewardText`='The Halls of Reflection lie ahead. If what that vile gnome said is to be trusted, Frostmourne should be there, and with it, answers to confronting Arthas.' WHERE `Id`=24712; -- Deliverance from the Pit +UPDATE `quest_template` SET `OfferRewardText`='The Halls of Reflection. Finally.$B$BLet me know when you are ready, $c. I will not be so naive as to think that Arthas left his precious sword entirely unguarded.' WHERE `Id`=24713; -- Frostmourne +UPDATE `quest_template` SET `OfferRewardText`='Yet again, vengeance slips through my grasp. It''s hard to believe how much stronger he''s gotten.$B$BIt was foolish of you to come for me, but it''s good to know that there are still some champions of the Horde that aren''t useless cowards. The information Uther gave us may well be key to finally killing Arthas, though it is becoming more and more clear that the Horde will not be able to accomplish this on their own.$B$BGo, $c. I expect your prowess may be needed again very soon.' WHERE `Id`=24802; -- Wrath of the Lich King +UPDATE `quest_template` SET `OfferRewardText`='Excellent! This will help fuel the flames of war for days to come. ' WHERE `Id`=236; -- Fueling the Demolishers +UPDATE `quest_template` SET `OfferRewardText`='You continue to prove yourself, $N. Accept this, not as a gift, but as a tool for the fight against the Scourge.' WHERE `Id`=24828; -- Path of Destruction +UPDATE `quest_template` SET `OfferRewardText`='Stew looks good. Thanks for your help.' WHERE `Id`=13114; -- Sewer Stew +UPDATE `quest_template` SET `OfferRewardText`='I have never seen such terror in the eyes of a vrykul. They think themselves masters of their world.$B$BYou and I are going to prove them wrong. Very wrong.' WHERE `Id`=13091; -- The Art of Being a Water Terror +UPDATE `quest_template` SET `OfferRewardText`='It''s about damned time! No doubt that Baron Sliver took his sweet time in sending you to me.$B$BI should have that empty space above his shoulders removed!' WHERE `Id`=12806; -- To the Rise with all Due Haste! +UPDATE `quest_template` SET `OfferRewardText`='In their folly, the Argent Crusade has chosen to turn a blind eye upon the presence of the Scarlet Onslaught. We will not.$B$BWe do not care if they might assist in the battle against the Lich King. We do not believe them worthy of existence. We will be their end, once and for all!' WHERE `Id`=12807; -- The Story Thus Far... +UPDATE `quest_template` SET `OfferRewardText`='I thought so! I couldn''t quite make out the destruction from here, but I can imagine how it must have looked. Splendid!$B$BWell done, $n. Thrallmar command will be happy to hear of your success!' WHERE `Id`=10087; -- Burn It Up... For the Horde! +UPDATE `quest_template` SET `OfferRewardText`='Well done, $C, That''s one less forge camp we''ll need to worry about. It''ll take the Legion a while to get that facility back up and running. You''ve just bought us the one thing we''d run out of - time. +' WHERE `Id`=10390; -- Forge Camp: Mageddon +UPDATE `quest_template` SET `OfferRewardText`='Now Veranus can finally rest in peace.' WHERE `Id`=24586; -- Razorscale Must Die! +UPDATE `quest_template` SET `OfferRewardText`='That will keep our recruits fed! Here''s how you cook it.' WHERE `Id`=13088; -- Northern Cooking +UPDATE `quest_template` SET `OfferRewardText`='Honor the Stranglethorn Vale flame.' WHERE `Id`=11832; -- Honor the Flame +UPDATE `quest_template` SET `OfferRewardText`='As a hero of the Stormpike, you may choose one item from these recently plun... er, recovered treasures.' WHERE `Id`=8271; -- Hero of the Stormpike +UPDATE `quest_template` SET `OfferRewardText`='You are brave to have carried this. If even one drop were to touch your skin, you''d have died an agonizing death.$b$bAllow me to pay you for it... I can always use venom of exceptional potency.' WHERE `Id`=13845; -- Sealed Vial of Poison +UPDATE `quest_template` SET `OfferRewardText`='Well done, $N. I''ll take these to the Argent Crusade''s keepers right away. They''ll have no choice but to acknowledge that we''re doing far more than the Sunreavers to keep the coliseum running smoothly.' WHERE `Id`=14076; -- Breakfast Of Champions +UPDATE `quest_template` SET `OfferRewardText`='He''s a fine specimen and will serve us well.$B$BNow, we have to make sure to use him properly to trap Vardmadra!' WHERE `Id`=13133; -- Find the Ancient Hero +UPDATE `quest_template` SET `OfferRewardText`='$B$BThank you. The book was a gift from Confessor Paletress herself. She would be honored to know that you have used it to bring tranquility to the slain.' WHERE `Id`=14077; -- The Light's Mercy +UPDATE `quest_template` SET `OfferRewardText`='At last, we can finally fish in peace! ''Course, by the time we catch anything, the expedition''ll arrive and claim it all for themselves.$B$BYou have our thanks, $N. Don''t be a stranger ''round here.' WHERE `Id`=11410; -- The One That Got Away +UPDATE `quest_template` SET `OfferRewardText`='$B$BIt is good to finally meet you, $N. We have long hoped that you and the other newcomers might send representatives. We don''t often venture beyond the borders of our glades, especially amid the changes the land is going through.' WHERE `Id`=11302; -- The Enigmatic Frost Nymphs +UPDATE `quest_template` SET `OfferRewardText`='$B$BThank you, $N.$B$B$B$BI promise, my friends, I will do all I can to restore you.' WHERE `Id`=11313; -- Spirits of the Ice +UPDATE `quest_template` SET `OfferRewardText`='Thank you for your help, $N. The Vibrant Glade was once a beautiful place, and when we return to it, we shall make it so again.' WHERE `Id`=11315; -- Wild Vines +UPDATE `quest_template` SET `OfferRewardText`='So there is hope for my sisters?$B$B$B$BI feel guilty for not thinking of the pendant sooner. We might have saved even more of the sisters.' WHERE `Id`=11314; -- The Fallen Sisters +UPDATE `quest_template` SET `OfferRewardText`='Thank goodness! This should be enough to finish the order in time. Of course, I won''t sleep until the troops arrive, but that''s far better than risking Captain Adams'' wrath.$B$BI''ve heard the stories they tell about him!' WHERE `Id`=11269; -- Down to the Wire +UPDATE `quest_template` SET `OfferRewardText`='$B$BNicely done. Some of these will fetch a better price than others, but I should have plenty to trade with the locals.' WHERE `Id`=11292; -- Preying Upon the Weak +UPDATE `quest_template` SET `OfferRewardText`='Beaut! Yer a good one you are.$B$BTilt one back wi'' me! Let us celebrae'' this glorious find!' WHERE `Id`=12870; -- Ancient Relics +UPDATE `quest_template` SET `OfferRewardText`='Medical supplies? Thank you! Not exactly sure what to do with them to be honest, but I''m sure they''ll be useful.$B$BIt''s good to meet you... there''s such a colorful variety among your peoples. We''re not used to having visitors up this way very often - it''s good to have some fresh company.' WHERE `Id`=12863; -- Offering Thanks +UPDATE `quest_template` SET `OfferRewardText`='$B$BYou were supposed to come back with Brann, not a piece of paper. What''s going on here?' WHERE `Id`=12854; -- On Brann's Trail +UPDATE `quest_template` SET `OfferRewardText`='When a scout doesn''t come back for this long... that''s about the expected result. The harpies then?$B$BKing Stormheart has us train hard year round... he''s turned us into amazing fighters. At times like this, I understand why it''s necessary. He''s the wisest and strongest leader I''ve yet seen among our people... don''t let his peachy skin fool ya.' WHERE `Id`=12864; -- Missing Scouts +UPDATE `quest_template` SET `OfferRewardText`='Good stuff, $G lad:lass;. You''re making fast friends.$B$BIf you stop back by soon, I''m sure we can find one that will let you ride... they should know that you''re trustworthy now.' WHERE `Id`=12867; -- Baby Stealers +UPDATE `quest_template` SET `OfferRewardText`='It''s done then. Thank you.$B$BI''ve spoken with Fjorlin - he said that his men will take charge of keeping the harpies down a bit. As long as we don''t let up again, they won''t find the courage to think they can attack our people.$B$BI know this wasn''t the most tasteful work - take this as a token of my appreciation.' WHERE `Id`=12868; -- Sirana Iceshriek +UPDATE `quest_template` SET `OfferRewardText`='That''s one less thorn in our side. With Noth destroyed, Scourge research into refining the means of creating the undead will grind to a halt.' WHERE `Id`=24581; -- Noth the Plaguebringer Must Die! +UPDATE `quest_template` SET `OfferRewardText`='I underestimated this Scourgelord, and it''s my men that paid for it. When I think that my guilt over Arthas'' betrayal cannot go any deeper, he proves me wrong yet again.$B$BWe have to press on. We cannot let their sacrifice be meaningless.' WHERE `Id`=24683; -- The Pit of Saron +UPDATE `quest_template` SET `OfferRewardText`='You''ve done well this day. With many of the slaves freed and now with access to the forges, it will not be long before I have a strong force to aid in delivering us from Scourgelord Tyrannus and this foul pit.' WHERE `Id`=24498; -- The Path to the Citadel +UPDATE `quest_template` SET `OfferRewardText`='Such a senseless waste! Arthas goes too far! I can only hope what we find in the Halls of Reflection makes this somehow worth it.$B$BIf what that vile gnome said is to be trusted, Frostmourne should be there, and with it, answers to confronting Arthas.' WHERE `Id`=24710; -- Deliverance from the Pit +UPDATE `quest_template` SET `OfferRewardText`='The Halls of Reflection. Finally.$B$BLet me know when you are ready. Arthas may not be here, but it would be naive to think that he would leave Frostmourne unguarded entirely.' WHERE `Id`=24711; -- Frostmourne +UPDATE `quest_template` SET `OfferRewardText`='$B$BHave you ever ridden one of those? It''s simple, friend. Just hop on and tell it where to go. +' WHERE `Id`=12235; -- Naxxramas and the Fall of Wintergarde +UPDATE `quest_template` SET `OfferRewardText`='$B$BI can barely believe we''re still alive. It was foolish of me to follow him. I''ve made that mistake too many times. And you... it was reckless of you to come after me instead of escaping with the information! But... well... thank you. You truly are a hero.$B$BWith Uther''s guidance, we may stand a chance at defeating Arthas. All the lives lost today were not in vain.' WHERE `Id`=24500; -- Wrath of the Lich King +UPDATE `quest_template` SET `OfferRewardText`='$B$BSo Valduran''s master has given him this sinister metal to construct a giant weapon? That must be what he intends to use for the final strike against us! We need to stop him before he''s able to complete it and unleash this weapon.' WHERE `Id`=12980; -- The Armor's Secrets +UPDATE `quest_template` SET `OfferRewardText`='$B$BI had no idea the irons were capable of this! Our men will have no chance against this behemoth if it''s completed. Fortunately, it looks like they''re still lacking a key part.' WHERE `Id`=12993; -- A Colossal Threat + +-- RequestItemsText +UPDATE `quest_template` SET `RequestItemsText`='How might I be of service to you, young one? Are you here to rest in the inn? Do you require a hearthstone?' WHERE `Id`=2159; -- Dolanaar Delivery +UPDATE `quest_template` SET `RequestItemsText`='Yes, young one? What can Kauth do for you?$B$BThe journey here from the Mesa can be a tremendous burden for some, but a welcome sight for others. Which is it for you, I wonder?' WHERE `Id`=1656; -- A Task Unfinished +UPDATE `quest_template` SET `RequestItemsText`='It takes a lot of work to be the strongest woman alive! My weight set is getting too light and if I''m to stay fit then I''ll need more weights!$B$BDo you think you could bring me some weight stones? If you do, then I''ll give you a Darkmoon Faire ticket.' WHERE `Id`=7889; -- Coarse Weightstone +UPDATE `quest_template` SET `RequestItemsText`='The first lesson in drawing a crowd is: lure them with gadgets and trinkets! Can you help me?$B$BI need small furry paws to use for prizes. You can find those on the cats of the Barrens or Darkshore....$B$BBring me some paws and I''ll trade you a Darkmoon Faire ticket for them.' WHERE `Id`=7899; -- Small Furry Paws +UPDATE `quest_template` SET `RequestItemsText`='Yebb is developing a new attraction for the Zoo Bizarre, one that will drive people crazy with wonder, and delight! But it will take a lot of work, and a lot of materials...$B$BThat includes copper modulators. We need lots of modulators for the mechanical parts of the attraction. Bring me copper modulators and I''ll trade for them with a Darkmoon Faire ticket.' WHERE `Id`=7894; -- Copper Modulator +UPDATE `quest_template` SET `RequestItemsText`='We at the Darkmoon Faire do much walking. We walk from one faire site to another... in fact, you''ll never see us sitting down on the job! So it is no surprise that we wear out quite a lot of boots! We need boots that are both durable and stylish, and embossed leather boots fit that bill rather well.$B$BYou! You''re a leatherworker; make me embossed leather boots and I''ll give you a Darkmoon Faire ticket for the work.' WHERE `Id`=7881; -- Carnival Boots +UPDATE `quest_template` SET `RequestItemsText`='King Varian has placed great importance on learning, and thus has provided funds for making copies of various tomes and writings available to the public. It''s very simple. You bring me a library scrip, and I can give you a copy of one of the available books.' WHERE `Id`=579; -- Stormwind Library +UPDATE `quest_template` SET `RequestItemsText`='My runes, $N? Do you have them?' WHERE `Id`=12841; -- The Crone's Bargain +UPDATE `quest_template` SET `RequestItemsText`='You will be richly rewarded for your service to me.$B$B$B$BYou will not regret unfettering me.' WHERE `Id`=13308; -- Mind Tricks +UPDATE `quest_template` SET `RequestItemsText`='Do you have 8 Trogg Stone Teeth to show me? If not, there is still work to be done, $N.' WHERE `Id`=267; -- The Trogg Threat +UPDATE `quest_template` SET `RequestItemsText`='You appear to have uncovered the wreckage of... a robotic chicken? The voice from within the egg crackles to life again:$B$B\"Yes, excellent work! This is indeed my homing robot, though my sensors indicate that it needs a jump start before it can fly back to Booty Bay for repairs. Go ahead and place the beacon inside the rover. The beacon will take care of the rest!\"' WHERE `Id`=351; -- Find OOX-17/TN! +UPDATE `quest_template` SET `RequestItemsText`='Got the five Wastewander water pouches we need? If you do, then the Gadgetzan Water Company Care Package, Model 103-XB, will be yours!' WHERE `Id`=1707; -- Water Pouch Bounty +UPDATE `quest_template` SET `RequestItemsText`='Yes $c, I am an official of the Gadgetzan Water Company. What can I assist you with?' WHERE `Id`=2781; -- WANTED: Caliph Scorpidsting +UPDATE `quest_template` SET `RequestItemsText`='You look a little dazed. Have you been reading our legal documents?' WHERE `Id`=2875; -- WANTED: Andre Firebeard +UPDATE `quest_template` SET `RequestItemsText`='The cries seem somehow... fainter than they were before. The Light grant it''s more than wishful thinking.' WHERE `Id`=10047; -- The Path of Glory +UPDATE `quest_template` SET `RequestItemsText`='The Legion could start shelling the Horde at any time, $N! You need to destroy those blasted cannons! +' WHERE `Id`=10396; -- Enemy of my Enemy... +UPDATE `quest_template` SET `RequestItemsText`='Do you have the broodling essence, $N? I can''t wait to study it.$B$BAnd besides that... my patron is not the type of person you want to disappoint.' WHERE `Id`=4726; -- Broodling Essence +UPDATE `quest_template` SET `RequestItemsText`='Hey, $N. Been to the Grizzled Den yet? Those Wendigos can be fierce.' WHERE `Id`=313; -- The Grizzled Den +UPDATE `quest_template` SET `RequestItemsText`='Preparations are going well. How goes your hunting?' WHERE `Id`=317; -- Stocking Jetsteam +UPDATE `quest_template` SET `RequestItemsText`='Hmph! There is all this booze down here, but I have strict orders not to touch it. If only I could get a taste of some of our Thunder Ale...that would sharpen my wits, no lying!' WHERE `Id`=308; -- Distracting Jarven +UPDATE `quest_template` SET `RequestItemsText`='Do you have that shimmerweed? I almost have a batch of stout ready to brew, and I want to try throwing the weed in with this mixture.' WHERE `Id`=315; -- The Perfect Stout +UPDATE `quest_template` SET `RequestItemsText`='Hello, $C! And what business takes you all the way out here?$B$BSomething exciting, I hope. I haven''t been in a good fight in days, and this barrel of ale is almost dry...' WHERE `Id`=413; -- Shimmer Stout +UPDATE `quest_template` SET `RequestItemsText`='I see you are back, $c. Have you collected 10 Red Wool Bandanas from those Defias Scum in The Stockade yet?' WHERE `Id`=388; -- The Color of Blood +UPDATE `quest_template` SET `RequestItemsText`='Loch Modan is under siege, $N! We need every able-bodied member of the Alliance to aid our cause. Have you killed 10 Stonesplinter Troggs and 10 Stonesplinter Scouts yet?' WHERE `Id`=224; -- In Defense of the King's Lands +UPDATE `quest_template` SET `RequestItemsText`='I know my plan was brilliant. Don''t even worry about it.$B$BDoes it feel good to be in the presence of greatness? A little tingly maybe?' WHERE `Id`=12828; -- Ample Inspiration +UPDATE `quest_template` SET `RequestItemsText`='If Janks were here, I could have just sent him on this errand. Oh... on second thought... I''m not sure I told him where the safe path is anyway.$B$BGood thing I have you resourceful adventure types around, eh?' WHERE `Id`=12819; -- Just Around the Corner +UPDATE `quest_template` SET `RequestItemsText`='Hi there. Do you have something for me?' WHERE `Id`=13836; -- Disarmed! +UPDATE `quest_template` SET `RequestItemsText`='Stand easy, $N. What have you to report? +' WHERE `Id`=13139; -- Into The Frozen Heart Of Northrend +UPDATE `quest_template` SET `RequestItemsText`='Well met, $c. I knew that you would return, despite my warnings, but I''m pleased that you heeded my desire to not risk anyone else.$B$BWhy have you come back to me?' WHERE `Id`=13075; -- The Boon of Remulos +UPDATE `quest_template` SET `RequestItemsText`='You want to talk about the bounty for Haghazed? Well, is he dead? There isn''t much else to talk about!' WHERE `Id`=9730; -- Leader of the Darkcrest +UPDATE `quest_template` SET `RequestItemsText`='We have to have something we can use to insulate our engines against this cold... think, Jeer, think!$B$BOh hey! Did you get some of that wreckage for me?' WHERE `Id`=12818; -- Clean Up +UPDATE `quest_template` SET `RequestItemsText`='Any luck with our equipment, $N?' WHERE `Id`=12844; -- Equipment Recovery +UPDATE `quest_template` SET `RequestItemsText`='Hello, $c. What have you there? Is it for me?' WHERE `Id`=9409; -- Urgent Delivery! +UPDATE `quest_template` SET `RequestItemsText`='Hello, $c. Do you have those flowers yet?' WHERE `Id`=9799; -- Botanical Legwork +UPDATE `quest_template` SET `RequestItemsText`='I''ll need all of the samples in good condition if we''re to have a chance of cleansing the lake.$B$BWe don''t have much time, $c!' WHERE `Id`=9293; -- What Must Be Done... +UPDATE `quest_template` SET `RequestItemsText`='The more we can do to clear up Nestlewood, the faster Zhanaa can get back to work.' WHERE `Id`=9303; -- Inoculation +UPDATE `quest_template` SET `RequestItemsText`='Together, the Broken and the draenei will regain a deeper understanding of the mysteries that the elements hold.$B$BHave you returned with that which is necessary for the creation of your earth totem?' WHERE `Id`=9451; -- Call of Earth +UPDATE `quest_template` SET `RequestItemsText`='The stag hides are frail which tend to make for tender, succulent flesh.' WHERE `Id`=9454; -- The Great Moongraze Hunt +UPDATE `quest_template` SET `RequestItemsText`='Do not waste time, $g boy:girl;.' WHERE `Id`=9473; -- An Alternative Alternative +UPDATE `quest_template` SET `RequestItemsText`='Have you done what I asked of you, $N?' WHERE `Id`=11913; -- Take No Chances +UPDATE `quest_template` SET `RequestItemsText`='Reporting from Honor Hold, $n? That''s good -- our campaign against the demons and the fel orcs is running thin on able bodies!' WHERE `Id`=10483; -- Ill Omens +UPDATE `quest_template` SET `RequestItemsText`='The ring, $N! Please... tell me you''ve found it!' WHERE `Id`=12624; -- It Could Be Anywhere! +UPDATE `quest_template` SET `RequestItemsText`='You find anything yet, $N?' WHERE `Id`=12699; -- An Embarassing Incident +UPDATE `quest_template` SET `RequestItemsText`='Any luck with the bloodtooth? Don''t forget what I told you about making blood pools.' WHERE `Id`=13833; -- Blood Is Thicker +UPDATE `quest_template` SET `RequestItemsText`='What is it that you''ve found, $N?' WHERE `Id`=24442; -- Battle Plans Of The Kvaldir +UPDATE `quest_template` SET `RequestItemsText`='Watch where you''re stepping! Watch watch watch!! This is delicate stuff you see here, and if we''re to win then it must all work perfectly!' WHERE `Id`=1179; -- The Brassbolts Brothers +UPDATE `quest_template` SET `RequestItemsText`='Tell me, $N, has the deed been done? Has the Legionlord been vanquished? +' WHERE `Id`=10400; -- Overlord +UPDATE `quest_template` SET `RequestItemsText`='We need to get this information to the Alliance! It may well be the key to Arthas'' defeat.' WHERE `Id`=24500; -- Wrath of the Lich King +UPDATE `quest_template` SET `RequestItemsText`='We are currently accepting donations for wool cloth. A donation of sixty pieces of wool cloth will net you full recognition by the Gnomeregan Exiles for your generous actions. Our stores are such on wool that we would only need sixty pieces from you total; we should be able to acquire enough from others in the realm to support our drive.$B$BIf you have the sixty pieces of wool cloth on you and are ready to donate them, I''m able to take them from you now.' WHERE `Id`=7807; -- A Donation of Wool +UPDATE `quest_template` SET `RequestItemsText`='As with most other fabrics, our stocks of silk are at an all-time low. Our stores are such that we''d only need sixty pieces of silk from you total; we should be able to reach our goal with the support of others.$B$BA benevolent gift such as silk, might I add, would certainly increase your local standing in the community! If you have the sixty pieces of silk cloth on you and are ready to donate them, I''m able to take them from you now.' WHERE `Id`=7808; -- A Donation of Silk +UPDATE `quest_template` SET `RequestItemsText`='$B$BDon''t just stand there, grab some oil and a luffa and get to scrubbin'' these bunions.$B$BYe don''t have a luffa? Well then! Perhaps it''s time I sent you out to find a luffa?$B$BHey, where are ye goin''?' WHERE `Id`=7727; -- Incendosaurs? Whateverosaur is More Like It +UPDATE `quest_template` SET `RequestItemsText`='Eight, $N. I need eight! ' WHERE `Id`=3443; -- Forging the Shaft +UPDATE `quest_template` SET `RequestItemsText`='Don''t let the crazy goggles fool you, $N. I''m the smart one here.' WHERE `Id`=7702; -- Kill 'Em With Sleep Deprivation +UPDATE `quest_template` SET `RequestItemsText`='Let''s not waste more of my precious time with jibber jabber, $r. It''s time to focus on replenishing our dwindling fiery flux supply.$B$BWhat I''m gonna need from you is the following:$B$B*Incendosaur scales.$B$B*Heavy Leather.$B$B*Coal.$B$BI''ll take all that you can offer!$B$BAnd you''ll do it fast if you wanna get in good with the Brotherhood. +' WHERE `Id`=8242; -- Restoring Fiery Flux Supplies via Heavy Leather +UPDATE `quest_template` SET `RequestItemsText`='You''ve worked your way up through the Brotherhood''s corporate hierarchy, $r. We have begun to look favorably upon you. Quite an accomplishment!$B$BIf you''re interested in more work and earning more respect amongst us, listen up.$B$BWe can refine the fiery flux by adding a simple Dark Iron residue to the mix. The Dark Iron residue can be found in Blackrock Depths.$B$BBring me all the Dark Iron residue you find!' WHERE `Id`=7737; -- Gaining Even More Acceptance +UPDATE `quest_template` SET `RequestItemsText`='You''ve worked your way up through the Brotherhood''s corporate hierarchy, $r. We have begun to look favorably upon you. Quite an accomplishment!$B$BIf you''re interested in more work and earning more respect amongst us, listen up.$B$BWe can refine the fiery flux by adding a simple Dark Iron residue to the mix. The Dark Iron residue can be found in Blackrock Depths.$B$BBring me all the Dark Iron residue you find!' WHERE `Id`=13662; -- Gaining Acceptance +UPDATE `quest_template` SET `RequestItemsText`='The Thorium Brotherhood sympathizes with your plight, $r. This is why Lokthos has been empowered to bargain.$B$BOffer 1 Lava Core and you shall be granted favor amongst the Brotherhood.' WHERE `Id`=6644; -- Favor Amongst the Brotherhood, Lava Core +UPDATE `quest_template` SET `RequestItemsText`='No ordinary tributes were good enough for the great Hodir when he walked among the frost giants.$B$BHe might not be with us anymore, but we''ve kept the tradition of offering tribute to his strength and wisdom. It would do much for your renown to partake in this tradition, small $c.' WHERE `Id`=13559; -- Hodir's Tribute +UPDATE `quest_template` SET `RequestItemsText`='Did you obtain the eggs, $N?' WHERE `Id`=13050; -- Veranus +UPDATE `quest_template` SET `RequestItemsText`='The power of this chapel gives me the strength to resist the corruption in my heart. If I leave it, I will become a death knight. But there is a medallion, the medallion of faith, that will give me the strength I need to leave.$B$BPlease, $N, retrieve the medallion. It is guarded by Malor the Zealous, a crazed member of the Scarlet Crusade who resides deep in the Scarlet Bastion in western Stratholme.' WHERE `Id`=5122; -- The Medallion of Faith +UPDATE `quest_template` SET `RequestItemsText`='Wine is only as fine as the person drinking it, I always say.' WHERE `Id`=24431; -- Waterlogged Recipe +UPDATE `quest_template` SET `RequestItemsText`='The Monastery was a seminary for Paladins-in-training. Once a stronghold of the Light, it fell into the hands of the crazed zealots of the Scarlet Crusade.$b$bThe Crusade believed their goal a noble one: to purify the land of the undead plague. But insanity tainted their plight and now they stand enemies to all.$b$bBring Mythology of the Titans to me so I can study it and house it here in Ironforge.$b$bThe corrupt halls of the Monastery are no place for such a historical treasure.' WHERE `Id`=1050; -- Mythology of the Titans +UPDATE `quest_template` SET `RequestItemsText`='I''m not one for politics; I care not if your affiliations are for either Horde or Alliance. I am more interested in squelching direct and dire threats to all the races... and we have quite a large one in here.$B$BIf you''re willing to be a true hero for all people, then hand me the oathstone I have given you as a sign of commitment. I''m... not from around these parts; an oathstone is important to people of my kind as a bond of agreement.' WHERE `Id`=3523; -- Scourge of the Downs +UPDATE `quest_template` SET `RequestItemsText`='Ach, $N! It''s good to see you, little one.' WHERE `Id`=13047; -- The Reckoning +UPDATE `quest_template` SET `RequestItemsText`='Bhag''thera can prove to be an elusive beast. How fares the hunt?' WHERE `Id`=193; -- Panther Mastery +UPDATE `quest_template` SET `RequestItemsText`='How goes the hunt for Tethis? Tracked her all the way back to camp, did you?' WHERE `Id`=197; -- Raptor Mastery +UPDATE `quest_template` SET `RequestItemsText`='I see you''re back, $g old bloke : lass;. King Bangalash has caused me to come crawling back to camp many times. Hang in there.' WHERE `Id`=208; -- Big Game Hunter +UPDATE `quest_template` SET `RequestItemsText`='Arrr... Yarr... Shiver me timbers... Er, sorry $g lad:lass;, I gotta practice me pirate lest I forget it...' WHERE `Id`=9512; -- Cookie's Jumbo Gumbo +UPDATE `quest_template` SET `RequestItemsText`='As you near the essence font that Eranikus told you of, his voice once again touches your mind.$B$B\"Yes mortal, this essence font will redeem what untainted element of my psyche remains imbued in this gem. Place the gem inside the font, and let the magic of the Green Dragonflight cleanse the corruption and taint from my being. Only then will I find true release, and only then will the Dragonflight be able to reassert their stewardship over the Atal''ai.\"' WHERE `Id`=3373; -- The Essence of Eranikus +UPDATE `quest_template` SET `RequestItemsText`='Here''s the plan, $n: Go out and collect some bloodpetal sprouts -- you know, the plants that haven''t fully sprouted yet, and bring them here. Then I''ll see what the Atal''ai haze can do.$B$BYou may think I''m vengeful... Actually, you''d be right about that! $B$BTruth is, I know the way out of here, but until Larion will admit that I''m right, I''m staying right here!$B$BSo off with you, find those bloodpetal sprouts and let''s have some fun!' WHERE `Id`=4144; -- Bloodpetal Sprouts +UPDATE `quest_template` SET `RequestItemsText`='Do not let fear overpower you, $N. Fear is the great betrayer... you must remain strong!$B$BTake the meat, place it in the small valley, and then use the gland on it. Only then will death come for you.' WHERE `Id`=4292; -- The Bait for Lar'korwi +UPDATE `quest_template` SET `RequestItemsText`='$C - you approach us in a peaceful manner, but I sense that you are here on matters that are grave and severe... for both furbolg and $r alike. What have you come to tell us?' WHERE `Id`=8471; -- Winterfall Ritual Totem +UPDATE `quest_template` SET `RequestItemsText`='Ahoy, me bucko! Might not be able to see but I can smell ye from halfway across port.$b$bCould really use me eye back. Captain''s going to keelhaul me when he finds out me peeper is in the hands of them dirty Bloodsail Buccaneers.$b$bWhat good is a lookout who can''t see? The crow''s nest used to be me home...without me deadlights I''d be lucky to scrub the bilge.' WHERE `Id`=576; -- Keep An Eye Out +UPDATE `quest_template` SET `RequestItemsText`='Ahoy, $n. What word do you bring of the Bloodsail encampment to the south?' WHERE `Id`=604; -- The Bloodsail Buccaneers +UPDATE `quest_template` SET `RequestItemsText`='Witch Doctor Unbagwa know what Mokk the Savage like. Yes, yes!$b$bMe speak with spirits and make he come, I do.$b$bBut other Gorilla-beast like spirit talkin'' too. You protect Witch Doctor Unbagwa and I make he come to you.$b$bWitch Doctor Unbagwa want something first. You bring a Gorilla Fang and me start spirit talking!' WHERE `Id`=349; -- Stranglethorn Fever +UPDATE `quest_template` SET `RequestItemsText`='Hey! I don''t like the look you''re giving me, $gmister:lady;.' WHERE `Id`=606; -- Scaring Shaky +UPDATE `quest_template` SET `RequestItemsText`='Here here, $N. Did you get Shaky''s payment?' WHERE `Id`=607; -- Return to MacKinley +UPDATE `quest_template` SET `RequestItemsText`='Do you have the writings of the Seven, $N? Have you learned the secrets from their tablet?' WHERE `Id`=4296; -- Tablet of the Seven +UPDATE `quest_template` SET `RequestItemsText`='I really don''t know if this plan will work, $N. Just bring me the scrap metal and I''ll do what I can.' WHERE `Id`=12901; -- Making Something Out Of Nothing +UPDATE `quest_template` SET `RequestItemsText`='Well met, $c. What brings you out here?' WHERE `Id`=11138; -- Renn McGill +UPDATE `quest_template` SET `RequestItemsText`='You''ve proved you can handle yourself in a fight, $N. Let''s keep the pressure up on the Twilight''s Hammer. Go fight some more Abyssal Templars, I''ll reward you with some of the stuff Huum and I have found in battle.' WHERE `Id`=8362; -- Abyssal Crests +UPDATE `quest_template` SET `RequestItemsText`='Have you seen a servant with my wine and cheese platter. I am quite peckish!' WHERE `Id`=13115; -- Cheese for Glowergold +UPDATE `quest_template` SET `RequestItemsText`='Their spirits are low, soldier. After our last failed air strike against the Horde, they refuse to fly! It is up to you to bolster their morale.$B$BReturn to the battlefield and strike at the heart of the Frostwolf''s command. Take down their commanders and guardians. Return to me with as many of their medals as you can stuff in your pack! I promise you, when my gryphons see the bounty and smell the blood of our enemies, they will fly again! Go now!' WHERE `Id`=6943; -- Call of Air - Ichman's Fleet +UPDATE `quest_template` SET `RequestItemsText`='You are the delivery $g boy:girl;?' WHERE `Id`=12182; -- To Venomspite! +UPDATE `quest_template` SET `RequestItemsText`='What''s all this?$B$BBy any chance have you seen my no-good apprentice, Pestlepot?$B$BI sent him on an errand quite some time ago and he has yet to return!' WHERE `Id`=12527; -- Gluttonous Lurkers +UPDATE `quest_template` SET `RequestItemsText`='Have you collected the water-poppies, $n?' WHERE `Id`=12564; -- Troll Patrol: Something for the Pain +UPDATE `quest_template` SET `RequestItemsText`='You seek to change the path you walk, $N?' WHERE `Id`=24819; -- A Change of Heart +UPDATE `quest_template` SET `RequestItemsText`='You close down that war-portal yet, $N? While you''re here shuffling your feet, there are more demons entering Outland! +' WHERE `Id`=10397; -- Invasion Point: Annihilator +UPDATE `quest_template` SET `RequestItemsText`='What is it, $C? I sense you''ve found something that speaks of a coming doom. +' WHERE `Id`=10395; -- The Dark Missive +UPDATE `quest_template` SET `RequestItemsText`='I sense a growing darkness within your heart, $C. Have you faced your fear? Or does it still await you at the Pools of Aggonar? +' WHERE `Id`=10399; -- The Heart of Darkness +UPDATE `quest_template` SET `RequestItemsText`='$N, you have returned. What did you learn?$B$BWhat is that sound?' WHERE `Id`=11629; -- Return to the Spirit Talker +UPDATE `quest_template` SET `RequestItemsText`='What''s this? Who are you?$B$BYou''re one of those $r things! How can you speak our tongue?' WHERE `Id`=11559; -- Winterfin Commerce +UPDATE `quest_template` SET `RequestItemsText`='You seek to continue down the path of destruction?' WHERE `Id`=24823; -- Path of Destruction +UPDATE `quest_template` SET `RequestItemsText`='You seek to change the path you walk, $N?' WHERE `Id`=24840; -- A Change of Heart +UPDATE `quest_template` SET `RequestItemsText`='As you draw near, the forge''s flame seems to burn even more ravenously...' WHERE `Id`=24545; -- The Sacred and the Corrupt +UPDATE `quest_template` SET `RequestItemsText`='Did you find the hides yet? You''ll find yeti in the hills below.' WHERE `Id`=12900; -- Making a Harness +UPDATE `quest_template` SET `RequestItemsText`='Do you have that which is required, $N?' WHERE `Id`=12729; -- The Gods Have Spoken +UPDATE `quest_template` SET `RequestItemsText`='We''re runnin'' dangerously low on rounds ''round here, $c. Our enemies need poundin'', especially Skorn!$B$BYa got more balls fer us?' WHERE `Id`=11190; -- One Size Does Not Fit All +UPDATE `quest_template` SET `RequestItemsText`='Have you collected 10 Scarlet Insignia Rings yet, $c?' WHERE `Id`=374; -- Proof of Demise +UPDATE `quest_template` SET `RequestItemsText`='You seek to continue down the path of destruction?' WHERE `Id`=24828; -- Path of Destruction +UPDATE `quest_template` SET `RequestItemsText`='You seek to change the path you walk, $N?' WHERE `Id`=24836; -- A Change of Heart +UPDATE `quest_template` SET `RequestItemsText`='Have you scouted all of the Blood Furnace yet? What do you have to tell me?' WHERE `Id`=9608; -- Heart of Rage +UPDATE `quest_template` SET `RequestItemsText`='The tears of the Fire Lord are a rare find indeed.$B$BOffer 1 Blood of the Mountain and you shall be granted favor amongst the Brotherhood. +' WHERE `Id`=6646; -- Favor Amongst the Brotherhood, Blood of the Mountain -- cgit v1.2.3 From 66ac3e6c80b69724c92422ba982a334e4f5d54a7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 3 Jun 2012 21:44:18 -0230 Subject: DB/misc: Some misc db updates for Shadowmoon Valley --- sql/updates/world/2012_06_03_04_world_misc.sql | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 sql/updates/world/2012_06_03_04_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_03_04_world_misc.sql b/sql/updates/world/2012_06_03_04_world_misc.sql new file mode 100644 index 00000000000..22621d92cbd --- /dev/null +++ b/sql/updates/world/2012_06_03_04_world_misc.sql @@ -0,0 +1,25 @@ +-- Update Felboar +SET @ENTRY := 21878; +UPDATE `creature` SET `spawndist`=5,`MovementType`=1,`curhealth`=1,`spawntimesecs`=300 WHERE `id`=@ENTRY; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +UPDATE `creature_template_addon` SET `bytes2`=1,`auras`='33908' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@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,0,0,100,0,100,100,30000,55000,11,35570,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Felboar - Combat - Cast charge'); + +-- Update Dormant Infernal +SET @ENTRY := 21080; +UPDATE `creature_template_addon` SET `bytes2`=1,`auras`='36055' WHERE `entry`=@ENTRY; + +-- Update Kagrosh +SET @ENTRY := 21725; +UPDATE `creature_template_addon` SET `bytes2`=1,`auras`='29266' WHERE `entry`=@ENTRY; +UPDATE `creature` SET `position_x`=-3421.365,`position_y`=2289.388,`position_z`=33.63479,`orientation`=3.874631 WHERE `guid`=86869; +DELETE FROM `creature` WHERE `guid`=86870; + +-- Update Invis Deathforge Caster +SET @ENTRY := 21210; +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (@ENTRY,1,'36393'); +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY; -- cgit v1.2.3 From ecf4753a6e3f1119932d0aedb8e02e30bf979bb2 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 3 Jun 2012 23:41:48 -0230 Subject: DB/creature: Fix up Shadowmoon Harbinger --- sql/updates/world/2012_06_03_05_world_creature.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_06_03_05_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_03_05_world_creature.sql b/sql/updates/world/2012_06_03_05_world_creature.sql new file mode 100644 index 00000000000..c5bccdbf33c --- /dev/null +++ b/sql/updates/world/2012_06_03_05_world_creature.sql @@ -0,0 +1,7 @@ +-- Fix up Shadowmoon Harbinger +SET @ENTRY := 21795; +UPDATE `creature` SET `spawndist`=5,`MovementType`=1,`curhealth`=1,`curmana`=0 WHERE `id`=@ENTRY; +UPDATE `creature_template` SET `AIName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (@ENTRY,1,'37467 37509'); -- cgit v1.2.3 From 31a08f5ddcf6dc0e34b7726d8aaaa0741754e5f2 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 00:41:31 -0230 Subject: DB/SAI: Replaced an EAI script in Shadowmoon that was Annoying me :) --- sql/updates/world/2012_06_03_06_world_sai.sql | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sql/updates/world/2012_06_03_06_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_03_06_world_sai.sql b/sql/updates/world/2012_06_03_06_world_sai.sql new file mode 100644 index 00000000000..32d1995a092 --- /dev/null +++ b/sql/updates/world/2012_06_03_06_world_sai.sql @@ -0,0 +1,39 @@ +-- Bron Goldhammer SAI +SET @ENTRY := 19395; +SET @SPELL := 33822; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +UPDATE `creature_template` SET `AIName`= '' WHERE `entry`=19394; +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (@ENTRY,19394); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; +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,30000,30000,100000,100000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Bron Goldhammer - OOC - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,11,19394,15,0,0,0,0,0, 'Bron Goldhammer - Script - Barimoke Wildbeard Say 0'), +(@ENTRY*100,9,1,0,0,0,100,0,6000,6000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Bron Goldhammer - Script - Bron Goldhammer Say 0'), +(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Bron Goldhammer - Script - Bron Goldhammer Say 1'), +(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,11,19394,15,0,0,0,0,0, 'Bron Goldhammer - Script - Barimoke Wildbeard Say 1'), +(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Bron Goldhammer - Script - Bron Goldhammer Say 2'), +(@ENTRY*100,9,5,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,11,19394,15,0,0,0,0,0, 'Bron Goldhammer - Script - Barimoke Wildbeard Say 2'), +(@ENTRY*100,9,6,0,0,0,100,0,2500,2500,0,0,11,@SPELL,3,0,0,0,0,11,19394,15,0,0,0,0,0, 'Bron Goldhammer - Script - cast spell'), +(@ENTRY*100,9,7,0,0,0,100,0,1000,1000,0,0,90,7,0,0,0,0,0,11,19394,15,0,0,0,0,0, 'Bron Goldhammer - Script - Barimoke Wildbeard set bytes 1'), +(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Bron Goldhammer - Script - Bron Goldhammer Say 3'), +(@ENTRY*100,9,9,0,0,0,100,0,2000,2000,0,0,91,7,0,0,0,0,0,11,19394,15,0,0,0,0,0, 'Bron Goldhammer - Script - Barimoke Wildbeard remove bytes 1'), +(@ENTRY*100,9,10,0,0,0,100,0,500,500,0,0,1,3,0,0,0,0,0,11,19394,15,0,0,0,0,0, 'Bron Goldhammer - Script - Barimoke Wildbeard Say 3'); +-- Bron Goldhammer text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-325,-326,-327,-328); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, '%s blinks, a perplexed expression crossing his face.',16,0,100,0,0,0, 'Bron Goldhammer'), +(@ENTRY,1,0, 'What, with me fists?',12,0,100,6,0,0, 'Bron Goldhammer'), +(@ENTRY,2,0, 'I''m... not sure that''s a good idea, ''Moke. Ye might get hurt...',12,0,100,1,0,0, 'Bron Goldhammer'), +(@ENTRY,3,0, 'Er... ''Moke?',12,0,100,6,0,0, 'Bron Goldhammer'); +-- Barimoke Wildbeard text +SET @ENTRY := 19394; +UPDATE `creature_template_addon` SET `bytes1`=0 WHERE `entry`=@ENTRY; +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-329,-330,-331,-332); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'Bron! ''Ey Bron! ''Ey Bron! Hit me!',12,0,100,1,0,0, 'Barimoke Wildbeard'), +(@ENTRY,1,0, 'Nae, that''s fer wimps. Hit me with yer hammer!',12,0,100,274,0,0, 'Barimoke Wildbeard'), +(@ENTRY,2,0, 'DO IT, YE PANSEY!',12,0,100,5,0,0, 'Barimoke Wildbeard'), +(@ENTRY,3,0, '...THAT WAS GREAT!',12,0,100,5,0,0, 'Barimoke Wildbeard'); -- cgit v1.2.3 From 5ed89f27e53522e725ead0f18c892fc6289cff08 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 17:39:43 -0230 Subject: DB/SAI: Convert some EAI to SAI to clean out creature_ai_summons table. --- sql/updates/world/2012_06_04_00_world_sai | 134 ++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 sql/updates/world/2012_06_04_00_world_sai (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_00_world_sai b/sql/updates/world/2012_06_04_00_world_sai new file mode 100644 index 00000000000..9497f73041c --- /dev/null +++ b/sql/updates/world/2012_06_04_00_world_sai @@ -0,0 +1,134 @@ +-- Kolkar Pack Runner SAI +SET @ENTRY := 3274; +SET @SPELL := 9128; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_summons` WHERE `id`=8; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-769); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,11,@SPELL,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Pack Runner - On Aggro - Cast Battle Shout'), +(@ENTRY,0,1,2,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Pack Runner - On Death 3% - Say 0'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Pack Runner - On Death 3% - Summon Verog the Dervish'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Pack Runner'); + +-- Kolkar Marauder SAI +SET @ENTRY := 3275; +SET @SPELL := 11976; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,80,0,12000,12000,7000,7000,11,@SPELL,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Kolkar Marauder - Combat - Cast Strike'), +(@ENTRY,0,1,2,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Marauder - On Death 3% - Say 0'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Marauder - On Death 3% - Summon Verog the Dervish'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Marauder'); + +-- Kolkar Bloodcharger SAI +SET @ENTRY := 3397; +SET @SPELL1 := 6742; +SET @SPELL2 := 172; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,0,35000,35000,10000,10000,11,@SPELL1,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - Combat - Cast Bollodlust'), +(@ENTRY,0,1,0,0,0,100,0,20000,20000,5000,5000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - Combat - Cast Corruption'), +(@ENTRY,0,2,3,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - On Death 3% - Say 0'), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Bloodcharger - On Death 3% - Summon Verog the Dervish'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Bloodcharger'); + +-- Clara Charles SAI +SET @ENTRY := 5917; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_summons` WHERE `id` BETWEEN 7 AND 19; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,10,0,100,1,1,15,0,0,12,583,4,60000,0,0,0,8,0,0,0,-9232.11,342.473,74.4399,4.31658, 'Clara Charles - On LOS - Summon Defias Ambusher'); + +-- Defias Dockmaster SAI +SET @ENTRY := 6846; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-232); +DELETE FROM `creature_ai_summons` WHERE `id` IN (4,5,6); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Defias Dockmaster - On Aggro - Say 0'), +(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9967.55,-135.956,24.5909,0.170326, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'), +(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9958.49,-140.526,24.2409,4.0015, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9964.59,-140.567,24.5105,0.741307, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'The Brotherhood will not be hampered by insects.',12,0,100,0,0,0, 'Defias Dockmaster'); + +-- Mekgineer Thermaplugg SAI +SET @ENTRY := 7800; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-188,-189,-190,-191); +DELETE FROM `creature_ai_summons` WHERE `id` IN (2,3); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,3,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - On Aggro - Say 0'), +(@ENTRY,0,1,0,5,0,100,2,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - On Kill - Say 3'), +(@ENTRY,0,2,0,0,0,100,2,40000,40000,40000,60000,11,11130,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Cast Knock Away'), +(@ENTRY,0,3,0,0,0,100,2,15000,15000,15000,35000,11,10101,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Cast Knock Away'), +(@ENTRY,0,4,5,0,0,100,2,30000,30000,30000,30000,12,7915,4,60000,0,0,0,8,0,0,0,-521.934,693.13,-327.005,2.95, 'Mekgineer Thermaplugg - Combat - Summon Walking Bomb'), +(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,12,7915,4,60000,0,0,0,8,0,0,0,-535.318,649.987,-326.494,2.72, 'Mekgineer Thermaplugg - Combat - Summon Walking Bomb'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Say 2'), +(@ENTRY,0,7,0,0,0,100,2,20000,20000,40000,65000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Say 1'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'USURPERS!!! GNOMEREGAN IS MINE!!!',14,0,100,0,0,5807, 'Mekgineer Thermaplugg'), +(@ENTRY,1,0, 'My machines are the future! They''ll destroy you all!',14,0,100,0,0,5808, 'Mekgineer Thermaplugg'), +(@ENTRY,2,0, 'Explosions! MORE explosions! I''ve got to have more explosions!',14,0,100,0,0,5809, 'Mekgineer Thermaplugg'), +(@ENTRY,3,0, '...and stay dead! He got served!',14,0,100,0,0,5810, 'Mekgineer Thermaplugg'); + +-- Shy-Rotam SAI +SET @ENTRY := 10737; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_summons` WHERE `id` IN (1); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,0,5000,5000,5000,10000,11,14100,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Terrifying Roar'), +(@ENTRY,0,1,0,0,0,100,0,7000,9000,22000,27000,11,13443,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Rend'), +(@ENTRY,0,2,0,0,0,100,0,2000,3000,15000,20000,11,3604,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Tendon Rip'), +(@ENTRY,0,3,0,0,0,100,1,0,50,0,0,12,10741,1,180000,0,0,0,8,0,0,0,8074.84,-3840,690.061,4.6, 'Shy-Rotam - @50%HP - Summon Sian-Rotam'); + +-- Jammal'an the Prophet SAI +SET @ENTRY := 5710; +SET @QUEST_SOULGRINDER := 11000; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-821,-822,-823,-824); +DELETE FROM `creature_ai_summons` WHERE `id` IN (20,21); +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,1,10,0,100,0,0,85,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - On OOC Los - Say Line 0 (P0)"), +(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - On OOC Los - Set Phase 1"), +(@ENTRY,0,2,0,0,1,100,0,0,0,31400,76200,1,1,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Say Line 2"), +(@ENTRY,0,3,0,0,1,100,0,8100,35600,20100,52900,11,12468,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Flamestrike"), +(@ENTRY,0,4,0,0,1,100,0,6200,16500,26100,36600,11,8376,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Earthgrab Totem"), +(@ENTRY,0,5,6,1,1,100,0,16300,19900,31400,53500,11,12479,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Hex of Jammal'an"), +(@ENTRY,0,6,0,61,1,100,0,0,0,0,0,1,2,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - On Hex of Jammal'an Cast - Say Line 1"), +(@ENTRY,0,7,8,2,1,100,1,0,30,0,0,11,12492,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - At 30% HP - Cast Healing Wave"), +(@ENTRY,0,8,0,61,1,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - At 30% HP - Say Line 3"), +(@ENTRY,0,9,0,5,1,100,0,0,0,0,0,4,5863,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - Killed Unit - Play Sound 5863"), +(@ENTRY,0,10,11,6,1,100,0,0,0,0,0,12,5721,1,300000,0,0,0,8,0,0,0,-472.02,105.823,-94.6299,0.0301925,"Jammal'an the Prophet - On Death - Summon Dreamscyte"), +(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,12,5720,1,300000,0,0,0,8,0,0,0,-467.099,85.2944,-94.7318,3.95326,"Jammal'an the Prophet - On Death - Summon Weaver"); +-- Jammal'an the Prophet text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"The shield be down! Rise up Atal'ai! Rise up!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 821 +(@ENTRY,1,0,"Join us!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 823 +(@ENTRY,2,0,"The Soulflayer comes!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 822 +(@ENTRY,3,0,"Hakkar shall live again!",14,0,100,0,0,0,"Jammal'an the Prophet"); -- 824 -- cgit v1.2.3 From 5e2296cab109d9e84f63eef7584cd06650ddcc60 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 19:34:32 -0230 Subject: Db/Gossip: Add some missing Winterspring Gossip --- sql/updates/world/2012_06_04_01_world_gossip.sql | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 sql/updates/world/2012_06_04_01_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_01_world_gossip.sql b/sql/updates/world/2012_06_04_01_world_gossip.sql new file mode 100644 index 00000000000..f110a917689 --- /dev/null +++ b/sql/updates/world/2012_06_04_01_world_gossip.sql @@ -0,0 +1,23 @@ +-- Add some missing gossip for winterspring +UPDATE `creature_template` SET `gossip_menu_id`=3049 WHERE `entry`=10918; +DELETE FROM `gossip_menu` WHERE `entry`=3049; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (3049,3758); +UPDATE `creature_template` SET `gossip_menu_id`=7046 WHERE `entry`=16015; +DELETE FROM `gossip_menu` WHERE `entry`=7046; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7046,8292); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=7046 AND `id` IN (0); +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 +(@GOSSIP,0,1, 'Hey Vi''el, show me your wares!',3,128,0,0,0,0, ''); +UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=11119; +UPDATE `creature_template` SET `gossip_menu_id`=6092 WHERE `entry`=14742; +DELETE FROM `gossip_menu` WHERE `entry`=6092; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6092,7249); +UPDATE `creature_template` SET `gossip_menu_id`=6091 WHERE `entry`=11193; +DELETE FROM `gossip_menu` WHERE `entry`=6091; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6091,7247); +UPDATE `creature_template` SET `gossip_menu_id`=6089 WHERE `entry`=11192; +DELETE FROM `gossip_menu` WHERE `entry`=6089; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6089,7243); +UPDATE `creature_template` SET `gossip_menu_id`=6090 WHERE `entry`=11191; +DELETE FROM `gossip_menu` WHERE `entry`=6090; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6090,7245); -- cgit v1.2.3 From 210b5e246eaf8242f80cb1fe5c259e7f3f270862 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 20:44:06 -0230 Subject: DB/SAI: missed .sql in a file sorry. --- sql/updates/world/2012_06_04_00_world_sai | 134 -------------------------- sql/updates/world/2012_06_04_00_world_sai.sql | 134 ++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 134 deletions(-) delete mode 100644 sql/updates/world/2012_06_04_00_world_sai create mode 100644 sql/updates/world/2012_06_04_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_00_world_sai b/sql/updates/world/2012_06_04_00_world_sai deleted file mode 100644 index 9497f73041c..00000000000 --- a/sql/updates/world/2012_06_04_00_world_sai +++ /dev/null @@ -1,134 +0,0 @@ --- Kolkar Pack Runner SAI -SET @ENTRY := 3274; -SET @SPELL := 9128; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `creature_ai_summons` WHERE `id`=8; -DELETE FROM `creature_ai_texts` WHERE `entry` IN (-769); -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,11,@SPELL,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Pack Runner - On Aggro - Cast Battle Shout'), -(@ENTRY,0,1,2,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Pack Runner - On Death 3% - Say 0'), -(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Pack Runner - On Death 3% - Summon Verog the Dervish'); -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Pack Runner'); - --- Kolkar Marauder SAI -SET @ENTRY := 3275; -SET @SPELL := 11976; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,80,0,12000,12000,7000,7000,11,@SPELL,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Kolkar Marauder - Combat - Cast Strike'), -(@ENTRY,0,1,2,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Marauder - On Death 3% - Say 0'), -(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Marauder - On Death 3% - Summon Verog the Dervish'); -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Marauder'); - --- Kolkar Bloodcharger SAI -SET @ENTRY := 3397; -SET @SPELL1 := 6742; -SET @SPELL2 := 172; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,0,35000,35000,10000,10000,11,@SPELL1,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - Combat - Cast Bollodlust'), -(@ENTRY,0,1,0,0,0,100,0,20000,20000,5000,5000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - Combat - Cast Corruption'), -(@ENTRY,0,2,3,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - On Death 3% - Say 0'), -(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Bloodcharger - On Death 3% - Summon Verog the Dervish'); -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Bloodcharger'); - --- Clara Charles SAI -SET @ENTRY := 5917; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `creature_ai_summons` WHERE `id` BETWEEN 7 AND 19; -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,10,0,100,1,1,15,0,0,12,583,4,60000,0,0,0,8,0,0,0,-9232.11,342.473,74.4399,4.31658, 'Clara Charles - On LOS - Summon Defias Ambusher'); - --- Defias Dockmaster SAI -SET @ENTRY := 6846; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `creature_ai_texts` WHERE `entry` IN (-232); -DELETE FROM `creature_ai_summons` WHERE `id` IN (4,5,6); -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,1,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Defias Dockmaster - On Aggro - Say 0'), -(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9967.55,-135.956,24.5909,0.170326, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'), -(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9958.49,-140.526,24.2409,4.0015, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'), -(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9964.59,-140.567,24.5105,0.741307, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'); -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'The Brotherhood will not be hampered by insects.',12,0,100,0,0,0, 'Defias Dockmaster'); - --- Mekgineer Thermaplugg SAI -SET @ENTRY := 7800; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `creature_ai_texts` WHERE `entry` IN (-188,-189,-190,-191); -DELETE FROM `creature_ai_summons` WHERE `id` IN (2,3); -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,4,0,100,3,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - On Aggro - Say 0'), -(@ENTRY,0,1,0,5,0,100,2,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - On Kill - Say 3'), -(@ENTRY,0,2,0,0,0,100,2,40000,40000,40000,60000,11,11130,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Cast Knock Away'), -(@ENTRY,0,3,0,0,0,100,2,15000,15000,15000,35000,11,10101,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Cast Knock Away'), -(@ENTRY,0,4,5,0,0,100,2,30000,30000,30000,30000,12,7915,4,60000,0,0,0,8,0,0,0,-521.934,693.13,-327.005,2.95, 'Mekgineer Thermaplugg - Combat - Summon Walking Bomb'), -(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,12,7915,4,60000,0,0,0,8,0,0,0,-535.318,649.987,-326.494,2.72, 'Mekgineer Thermaplugg - Combat - Summon Walking Bomb'), -(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Say 2'), -(@ENTRY,0,7,0,0,0,100,2,20000,20000,40000,65000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Say 1'); -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0, 'USURPERS!!! GNOMEREGAN IS MINE!!!',14,0,100,0,0,5807, 'Mekgineer Thermaplugg'), -(@ENTRY,1,0, 'My machines are the future! They''ll destroy you all!',14,0,100,0,0,5808, 'Mekgineer Thermaplugg'), -(@ENTRY,2,0, 'Explosions! MORE explosions! I''ve got to have more explosions!',14,0,100,0,0,5809, 'Mekgineer Thermaplugg'), -(@ENTRY,3,0, '...and stay dead! He got served!',14,0,100,0,0,5810, 'Mekgineer Thermaplugg'); - --- Shy-Rotam SAI -SET @ENTRY := 10737; -UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `creature_ai_summons` WHERE `id` IN (1); -DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; -INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(@ENTRY,0,0,0,0,0,100,0,5000,5000,5000,10000,11,14100,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Terrifying Roar'), -(@ENTRY,0,1,0,0,0,100,0,7000,9000,22000,27000,11,13443,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Rend'), -(@ENTRY,0,2,0,0,0,100,0,2000,3000,15000,20000,11,3604,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Tendon Rip'), -(@ENTRY,0,3,0,0,0,100,1,0,50,0,0,12,10741,1,180000,0,0,0,8,0,0,0,8074.84,-3840,690.061,4.6, 'Shy-Rotam - @50%HP - Summon Sian-Rotam'); - --- Jammal'an the Prophet SAI -SET @ENTRY := 5710; -SET @QUEST_SOULGRINDER := 11000; -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; -DELETE FROM `creature_ai_texts` WHERE `entry` IN (-821,-822,-823,-824); -DELETE FROM `creature_ai_summons` WHERE `id` IN (20,21); -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,1,10,0,100,0,0,85,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - On OOC Los - Say Line 0 (P0)"), -(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - On OOC Los - Set Phase 1"), -(@ENTRY,0,2,0,0,1,100,0,0,0,31400,76200,1,1,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Say Line 2"), -(@ENTRY,0,3,0,0,1,100,0,8100,35600,20100,52900,11,12468,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Flamestrike"), -(@ENTRY,0,4,0,0,1,100,0,6200,16500,26100,36600,11,8376,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Earthgrab Totem"), -(@ENTRY,0,5,6,1,1,100,0,16300,19900,31400,53500,11,12479,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Hex of Jammal'an"), -(@ENTRY,0,6,0,61,1,100,0,0,0,0,0,1,2,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - On Hex of Jammal'an Cast - Say Line 1"), -(@ENTRY,0,7,8,2,1,100,1,0,30,0,0,11,12492,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - At 30% HP - Cast Healing Wave"), -(@ENTRY,0,8,0,61,1,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - At 30% HP - Say Line 3"), -(@ENTRY,0,9,0,5,1,100,0,0,0,0,0,4,5863,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - Killed Unit - Play Sound 5863"), -(@ENTRY,0,10,11,6,1,100,0,0,0,0,0,12,5721,1,300000,0,0,0,8,0,0,0,-472.02,105.823,-94.6299,0.0301925,"Jammal'an the Prophet - On Death - Summon Dreamscyte"), -(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,12,5720,1,300000,0,0,0,8,0,0,0,-467.099,85.2944,-94.7318,3.95326,"Jammal'an the Prophet - On Death - Summon Weaver"); --- Jammal'an the Prophet text -DELETE FROM `creature_text` WHERE `entry`=@ENTRY; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(@ENTRY,0,0,"The shield be down! Rise up Atal'ai! Rise up!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 821 -(@ENTRY,1,0,"Join us!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 823 -(@ENTRY,2,0,"The Soulflayer comes!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 822 -(@ENTRY,3,0,"Hakkar shall live again!",14,0,100,0,0,0,"Jammal'an the Prophet"); -- 824 diff --git a/sql/updates/world/2012_06_04_00_world_sai.sql b/sql/updates/world/2012_06_04_00_world_sai.sql new file mode 100644 index 00000000000..9497f73041c --- /dev/null +++ b/sql/updates/world/2012_06_04_00_world_sai.sql @@ -0,0 +1,134 @@ +-- Kolkar Pack Runner SAI +SET @ENTRY := 3274; +SET @SPELL := 9128; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_summons` WHERE `id`=8; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-769); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,11,@SPELL,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Pack Runner - On Aggro - Cast Battle Shout'), +(@ENTRY,0,1,2,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Pack Runner - On Death 3% - Say 0'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Pack Runner - On Death 3% - Summon Verog the Dervish'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Pack Runner'); + +-- Kolkar Marauder SAI +SET @ENTRY := 3275; +SET @SPELL := 11976; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,80,0,12000,12000,7000,7000,11,@SPELL,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Kolkar Marauder - Combat - Cast Strike'), +(@ENTRY,0,1,2,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Marauder - On Death 3% - Say 0'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Marauder - On Death 3% - Summon Verog the Dervish'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Marauder'); + +-- Kolkar Bloodcharger SAI +SET @ENTRY := 3397; +SET @SPELL1 := 6742; +SET @SPELL2 := 172; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,0,35000,35000,10000,10000,11,@SPELL1,32,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - Combat - Cast Bollodlust'), +(@ENTRY,0,1,0,0,0,100,0,20000,20000,5000,5000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - Combat - Cast Corruption'), +(@ENTRY,0,2,3,6,0,3,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kolkar Bloodcharger - On Death 3% - Say 0'), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,12,3395,4,60000,0,0,0,8,0,0,0,-1209.65,-2738.38,102.646,4.99352, 'Kolkar Bloodcharger - On Death 3% - Summon Verog the Dervish'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'I am slain! Summon Verog!',14,0,100,0,0,0, 'Kolkar Bloodcharger'); + +-- Clara Charles SAI +SET @ENTRY := 5917; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_summons` WHERE `id` BETWEEN 7 AND 19; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,10,0,100,1,1,15,0,0,12,583,4,60000,0,0,0,8,0,0,0,-9232.11,342.473,74.4399,4.31658, 'Clara Charles - On LOS - Summon Defias Ambusher'); + +-- Defias Dockmaster SAI +SET @ENTRY := 6846; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-232); +DELETE FROM `creature_ai_summons` WHERE `id` IN (4,5,6); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Defias Dockmaster - On Aggro - Say 0'), +(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9967.55,-135.956,24.5909,0.170326, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'), +(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9958.49,-140.526,24.2409,4.0015, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,12,6866,4,60000,0,0,0,8,0,0,0,-9964.59,-140.567,24.5105,0.741307, 'Defias Dockmaster - On Aggro - Summon Defias Bodyguard'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'The Brotherhood will not be hampered by insects.',12,0,100,0,0,0, 'Defias Dockmaster'); + +-- Mekgineer Thermaplugg SAI +SET @ENTRY := 7800; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-188,-189,-190,-191); +DELETE FROM `creature_ai_summons` WHERE `id` IN (2,3); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,3,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - On Aggro - Say 0'), +(@ENTRY,0,1,0,5,0,100,2,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - On Kill - Say 3'), +(@ENTRY,0,2,0,0,0,100,2,40000,40000,40000,60000,11,11130,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Cast Knock Away'), +(@ENTRY,0,3,0,0,0,100,2,15000,15000,15000,35000,11,10101,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Cast Knock Away'), +(@ENTRY,0,4,5,0,0,100,2,30000,30000,30000,30000,12,7915,4,60000,0,0,0,8,0,0,0,-521.934,693.13,-327.005,2.95, 'Mekgineer Thermaplugg - Combat - Summon Walking Bomb'), +(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,12,7915,4,60000,0,0,0,8,0,0,0,-535.318,649.987,-326.494,2.72, 'Mekgineer Thermaplugg - Combat - Summon Walking Bomb'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Say 2'), +(@ENTRY,0,7,0,0,0,100,2,20000,20000,40000,65000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mekgineer Thermaplugg - Combat - Say 1'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'USURPERS!!! GNOMEREGAN IS MINE!!!',14,0,100,0,0,5807, 'Mekgineer Thermaplugg'), +(@ENTRY,1,0, 'My machines are the future! They''ll destroy you all!',14,0,100,0,0,5808, 'Mekgineer Thermaplugg'), +(@ENTRY,2,0, 'Explosions! MORE explosions! I''ve got to have more explosions!',14,0,100,0,0,5809, 'Mekgineer Thermaplugg'), +(@ENTRY,3,0, '...and stay dead! He got served!',14,0,100,0,0,5810, 'Mekgineer Thermaplugg'); + +-- Shy-Rotam SAI +SET @ENTRY := 10737; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_summons` WHERE `id` IN (1); +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,0,0,100,0,5000,5000,5000,10000,11,14100,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Terrifying Roar'), +(@ENTRY,0,1,0,0,0,100,0,7000,9000,22000,27000,11,13443,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Rend'), +(@ENTRY,0,2,0,0,0,100,0,2000,3000,15000,20000,11,3604,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Shy-Rotam - Combat - Cast Tendon Rip'), +(@ENTRY,0,3,0,0,0,100,1,0,50,0,0,12,10741,1,180000,0,0,0,8,0,0,0,8074.84,-3840,690.061,4.6, 'Shy-Rotam - @50%HP - Summon Sian-Rotam'); + +-- Jammal'an the Prophet SAI +SET @ENTRY := 5710; +SET @QUEST_SOULGRINDER := 11000; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry` IN (-821,-822,-823,-824); +DELETE FROM `creature_ai_summons` WHERE `id` IN (20,21); +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,1,10,0,100,0,0,85,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - On OOC Los - Say Line 0 (P0)"), +(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - On OOC Los - Set Phase 1"), +(@ENTRY,0,2,0,0,1,100,0,0,0,31400,76200,1,1,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Say Line 2"), +(@ENTRY,0,3,0,0,1,100,0,8100,35600,20100,52900,11,12468,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Flamestrike"), +(@ENTRY,0,4,0,0,1,100,0,6200,16500,26100,36600,11,8376,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Earthgrab Totem"), +(@ENTRY,0,5,6,1,1,100,0,16300,19900,31400,53500,11,12479,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - In Combat - Cast Hex of Jammal'an"), +(@ENTRY,0,6,0,61,1,100,0,0,0,0,0,1,2,0,0,0,0,0,2,0,0,0,0,0,0,0,"Jammal'an the Prophet - On Hex of Jammal'an Cast - Say Line 1"), +(@ENTRY,0,7,8,2,1,100,1,0,30,0,0,11,12492,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - At 30% HP - Cast Healing Wave"), +(@ENTRY,0,8,0,61,1,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - At 30% HP - Say Line 3"), +(@ENTRY,0,9,0,5,1,100,0,0,0,0,0,4,5863,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jammal'an the Prophet - Killed Unit - Play Sound 5863"), +(@ENTRY,0,10,11,6,1,100,0,0,0,0,0,12,5721,1,300000,0,0,0,8,0,0,0,-472.02,105.823,-94.6299,0.0301925,"Jammal'an the Prophet - On Death - Summon Dreamscyte"), +(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,12,5720,1,300000,0,0,0,8,0,0,0,-467.099,85.2944,-94.7318,3.95326,"Jammal'an the Prophet - On Death - Summon Weaver"); +-- Jammal'an the Prophet text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"The shield be down! Rise up Atal'ai! Rise up!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 821 +(@ENTRY,1,0,"Join us!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 823 +(@ENTRY,2,0,"The Soulflayer comes!",14,0,100,0,0,0,"Jammal'an the Prophet"), -- 822 +(@ENTRY,3,0,"Hakkar shall live again!",14,0,100,0,0,0,"Jammal'an the Prophet"); -- 824 -- cgit v1.2.3 From 6cf5e9b294336f7979c56067652c1c7a28f98456 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 20:46:56 -0230 Subject: Db/Gossip: I'm having a biohazard moment :) --- sql/updates/world/2012_06_04_01_world_gossip.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_01_world_gossip.sql b/sql/updates/world/2012_06_04_01_world_gossip.sql index f110a917689..f6246967452 100644 --- a/sql/updates/world/2012_06_04_01_world_gossip.sql +++ b/sql/updates/world/2012_06_04_01_world_gossip.sql @@ -7,7 +7,7 @@ DELETE FROM `gossip_menu` WHERE `entry`=7046; INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7046,8292); DELETE FROM `gossip_menu_option` WHERE `menu_id`=7046 AND `id` IN (0); 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 -(@GOSSIP,0,1, 'Hey Vi''el, show me your wares!',3,128,0,0,0,0, ''); +(7046,0,1, 'Hey Vi''el, show me your wares!',3,128,0,0,0,0, ''); UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=11119; UPDATE `creature_template` SET `gossip_menu_id`=6092 WHERE `entry`=14742; DELETE FROM `gossip_menu` WHERE `entry`=6092; -- cgit v1.2.3 From 5651da1119630820e2e3dc6aa778ba5dc3a2e571 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 22:34:54 -0230 Subject: Db/Gossip: Update some old gossip to proper menuid's --- sql/updates/world/2012_06_04_02_world_gossip.sql | 143 +++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 sql/updates/world/2012_06_04_02_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_02_world_gossip.sql b/sql/updates/world/2012_06_04_02_world_gossip.sql new file mode 100644 index 00000000000..0122e9b736e --- /dev/null +++ b/sql/updates/world/2012_06_04_02_world_gossip.sql @@ -0,0 +1,143 @@ +UPDATE `creature_template` SET `gossip_menu_id`=10466 WHERE `entry`=33558; +UPDATE `creature_template` SET `gossip_menu_id`=10471 WHERE `entry`=33561; +UPDATE `creature_template` SET `gossip_menu_id`=10465 WHERE `entry`=33562; + +SET @OLDGOSSIP := 21000; +SET @NEWGOSSIP := 9935; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21007; +SET @NEWGOSSIP := 9941; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21024; +SET @NEWGOSSIP := 9937; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21038; +SET @NEWGOSSIP := 9938; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21049; +SET @NEWGOSSIP := 9931; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21067; +SET @NEWGOSSIP := 9945; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21048; +SET @NEWGOSSIP := 9946; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21039; +SET @NEWGOSSIP := 9948; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21065; +SET @NEWGOSSIP := 9953; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21035; +SET @NEWGOSSIP := 9954; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21010; +SET @NEWGOSSIP := 9959; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21069; +SET @NEWGOSSIP := 9961; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21028; +SET @NEWGOSSIP := 9963; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21001; +SET @NEWGOSSIP := 9964; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21027; +SET @NEWGOSSIP := 9966; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21064; +SET @NEWGOSSIP := 9968; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21041; +SET @NEWGOSSIP := 9971; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21074; +SET @NEWGOSSIP := 9972; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21015; +SET @NEWGOSSIP := 9975; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; + +SET @OLDGOSSIP := 21019; +SET @NEWGOSSIP := 9980; +UPDATE `creature_template` SET `gossip_menu_id`=@NEWGOSSIP WHERE `gossip_menu_id`=@OLDGOSSIP; +UPDATE `gossip_menu` SET `entry`=@NEWGOSSIP WHERE `entry`=@OLDGOSSIP; +UPDATE `gossip_menu_option` SET `menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP; +UPDATE `conditions` SET `SourceGroup`=@NEWGOSSIP WHERE `SourceGroup`=@OLDGOSSIP AND `SourceTypeOrReferenceId`=15; -- cgit v1.2.3 From 1b00a580f1fd74eb7f1ca8dee54640270300737d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 22:41:22 -0230 Subject: DB/conditions: Fix Hellfire Fortifications quest by gecko32 Closes Issue #6713 --- sql/updates/world/2012_06_04_03_world_conditions.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_06_04_03_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_03_world_conditions.sql b/sql/updates/world/2012_06_04_03_world_conditions.sql new file mode 100644 index 00000000000..0eadeb8542e --- /dev/null +++ b/sql/updates/world/2012_06_04_03_world_conditions.sql @@ -0,0 +1,6 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 19 AND `SourceEntry` IN (13408,13409,13410,13411); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19, 0, 13408, 0, 0, 15, 0, 1503, 0, 0, 0, 0, '', 'Hellfire Fortifications - Alliance -All classes other than dk'), +(19, 0, 13409, 0, 0, 15, 0, 1503, 0, 0, 0, 0, '', 'Hellfire Fortifications - Horde -All classes other than dk'), +(19, 0, 13410, 0, 0, 15, 0, 32, 0, 0, 0, 0, '', 'Hellfire Fortifications - Alliance -Only dk'), +(19, 0, 13411, 0, 0, 15, 0, 32, 0, 0, 0, 0, '', 'Hellfire Fortifications - Horde -Only dk'); -- cgit v1.2.3 From f2a3d4c8d7cb759589ae220562406793a70adf21 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 22:48:55 -0230 Subject: DB/SAI: Convert Hogger to SAI by warriorpoetex Closes Issue #6672 --- sql/updates/world/2012_06_04_04_world_sai.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 sql/updates/world/2012_06_04_04_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_04_world_sai.sql b/sql/updates/world/2012_06_04_04_world_sai.sql new file mode 100644 index 00000000000..f38cd1fe63f --- /dev/null +++ b/sql/updates/world/2012_06_04_04_world_sai.sql @@ -0,0 +1,15 @@ +-- Hogger EAI to SAI Conversion +SET @ENTRY := 448; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,1,4,0,100,0,0,0,0,0,11,6268,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Hogger - On aggro - Cast Rushing Charge'), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Hogger - On Aggro - Random Say'), +(@ENTRY,0,2,0,0,0,100,0,1300,3700,20000,25000,11,6730,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Hogger - Combat - Cast Headbutt'), +(@ENTRY,0,3,0,0,0,100,0,4800,6000,30000,30000,11,6016,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Hogger - Combat - Cast Armor Pierce'); +-- Hogger creature text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(@ENTRY,0,0, 'More bones to gnaw on...',12,0,100,0,0,0, 'Hogger Agro Say 1'), +(@ENTRY,0,1, 'Grrrr... fresh meat!',12,0,100,0,0,0, 'Hogger Agro Say 2'); -- cgit v1.2.3 From ee485049ddda2600f5da33369cdd6a9ecdb94020 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 23:01:35 -0230 Subject: DB/SAI: Fix error with SAI for Lothos Riftwaker Closes #6556 --- sql/updates/world/2012_06_04_05_world_sai.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_06_04_05_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_05_world_sai.sql b/sql/updates/world/2012_06_04_05_world_sai.sql new file mode 100644 index 00000000000..51d998c15ab --- /dev/null +++ b/sql/updates/world/2012_06_04_05_world_sai.sql @@ -0,0 +1,3 @@ +-- Fix SAI for Lothos Riftwaker +UPDATE `smart_scripts` SET `event_param1`=5750 WHERE `entryorguid`=14387 AND `id`=0; +UPDATE `smart_scripts` SET `event_param1`=0 WHERE `entryorguid`=14387 AND `id`=1; -- cgit v1.2.3 From 15919f119ab4538b02843d73a9e84a907e1ae355 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 23:09:37 -0230 Subject: DB/SAI: Mok'rash SAI by warriorpoetex Closes #6640 --- sql/updates/world/2012_06_04_06_world_sai.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 sql/updates/world/2012_06_04_06_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_06_world_sai.sql b/sql/updates/world/2012_06_04_06_world_sai.sql new file mode 100644 index 00000000000..455246d82b7 --- /dev/null +++ b/sql/updates/world/2012_06_04_06_world_sai.sql @@ -0,0 +1,18 @@ +-- Mok'rash SAI +SET @ENTRY := 1493; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@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,5000,10000,300000,600000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Mok''Rash - OOC - Random Yell'), +(@ENTRY,0,1,0,0,0,85,0,8000,8000,15000,15000,11,40505,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Mok''Rash - Combat - Cast Cleave'); +-- Mok'rash Text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO creature_text (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY, 0, 0, 'SMOTTS, I HAVE YOUR LITTLE BELT....COME GET IT!', 14, 0, 100, 0, 0, 0, 'Mok''rash Yell'), +(@ENTRY, 0, 1, 'SMOTTS! HEY, SMOTTS! COME OUT AND PLAY!', 14, 0, 100, 0, 0, 0, 'Mok''rash Yell'), +(@ENTRY, 0, 2, 'DON''T LET THIS STATUE BE MY ONLY COMPANY, COME OUT AND PLAY!', 14, 0, 100, 0, 0, 0, 'Mok''rash Yell'), +(@ENTRY, 0, 3, 'COME OUT TO JANEIRO''S POINT. I''M WAITING FOR YOU, SMOTTS...', 14, 0, 100, 0, 0, 0, 'Mok''rash Yell'), +(@ENTRY, 0, 4, 'I PROMISE I WON''T KILL YOUR CREW THIS TIME. HAH! BUT MY BROTHER MIGHT EAT THEM!', 14, 0, 100, 0, 0, 0, 'Mok''rash Yell'), +(@ENTRY, 0, 5, 'HAVE YOU RUN OUT OF SHIPS TO SEND? WHERE IS YOUR COURAGE?', 14, 0, 100, 0, 0, 0, 'Mok''rash Yell'), +(@ENTRY, 0, 6, 'I HAVE YOUR LITTLE BELT TIED AROUND MY FINGER, SMOTTS. DON''T YOU WANT IT BACK?', 14, 0, 100, 0, 0, 0, 'Mok''rash Yell'); -- cgit v1.2.3 From 332e7d4e52321fa253072e553783a2fa62d9ac53 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 4 Jun 2012 23:51:59 -0230 Subject: DB/misc: Some misc updates --- sql/updates/world/2012_06_04_07_world_misc.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/2012_06_04_07_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_04_07_world_misc.sql b/sql/updates/world/2012_06_04_07_world_misc.sql new file mode 100644 index 00000000000..947ba3b31ee --- /dev/null +++ b/sql/updates/world/2012_06_04_07_world_misc.sql @@ -0,0 +1,7 @@ +-- Add Missing spell to Jotunheim Rapid-Fire Harpoon close 6435 +UPDATE `creature_template` SET `spell1`=56585 WHERE `entry`=30337; +-- Wailing Winds missing aura +UPDATE `creature_template_addon` SET `auras`='56769' WHERE `entry`=30450; +-- Disturbed Taunka Ancestor missing aura +DELETE FROM `creature_template_addon` WHERE `entry`=30458; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (30458,1,43167); -- cgit v1.2.3 From 6141c3076f6c73e772a1f6496e2be871a0eaec91 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 5 Jun 2012 19:38:43 -0230 Subject: DB/SAI: Fix Quest Cache of Mau'ari --- sql/updates/world/2012_06_05_00_world_sai.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sql/updates/world/2012_06_05_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_05_00_world_sai.sql b/sql/updates/world/2012_06_05_00_world_sai.sql new file mode 100644 index 00000000000..c43998b7459 --- /dev/null +++ b/sql/updates/world/2012_06_05_00_world_sai.sql @@ -0,0 +1,13 @@ +-- Witch Doctor Mau'ari SAI +SET @ENTRY := 10307; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `quest_start_scripts` WHERE `id`=975; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; +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,19,0,100,0,975,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - On Quest Accept - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - Script - Remove npc flags'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - Script - Set emote state use standing'), +(@ENTRY*100,9,2,0,0,0,100,0,9000,9000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - Script - Set emote state use standing'), +(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - Script - add npc flags'), +(@ENTRY*100,9,4,0,0,0,100,0,0,0,0,0,15,975,0,0,0,0,0,7,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - Script - Complete quest 975'); -- cgit v1.2.3 From 565aa070feb53db2a91b25cdc27f0e166cff48c9 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 5 Jun 2012 20:52:38 -0230 Subject: DB/Gossip Core/Scripts: Fix Gossip for Witch Doctor Mau'ari --- sql/updates/world/2012_06_05_01_world_gossip.sql | 24 ++++++++++++++ src/server/scripts/Kalimdor/winterspring.cpp | 42 ------------------------ 2 files changed, 24 insertions(+), 42 deletions(-) create mode 100644 sql/updates/world/2012_06_05_01_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_05_01_world_gossip.sql b/sql/updates/world/2012_06_05_01_world_gossip.sql new file mode 100644 index 00000000000..11697eeffd4 --- /dev/null +++ b/sql/updates/world/2012_06_05_01_world_gossip.sql @@ -0,0 +1,24 @@ +-- Witch Doctor Mau'ari SAI +SET @ENTRY := 10307; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id` IN (1,2); +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,1,2,62,0,100,0,2703,2,0,0,85,16351,0,0,0,0,0,7,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - On Gossip Option 2 Select - Cast Spell'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Witch Doctor Mau''ari - On Gossip Option 2 Select - Close gossip'); +-- Add some missing gossip for Witch Doctor Mau'ari +UPDATE `creature_template` SET `gossip_menu_id`=2703,`ScriptName`='' WHERE `entry`=10307; +DELETE FROM `gossip_menu` WHERE `entry` IN (2703,21320,21321); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (2703,3375),(2703,3377),(21320,3382),(21321,3383); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=2703 AND `id` IN (0,1,2); +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 +(2703,0,0, 'How do I use the Cache of Mau''ari?',1,1,21320,0,0,0, ''), +(2703,1,0, 'What is E''ko?',1,1,21321,0,0,0, ''), +(2703,2,0, 'I''d like you to make me a new Cache of Mau''ari please',1,1,0,0,0,0, ''); +-- Add conditions for gossip text +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=2703; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,2703,3377,0,8,975,0,0,0,0,'','Only show gossip text 3377 if player has completed quest 975'); +-- Add conditions for gossip options +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=2703; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,2703,2,0,8,975,0,0,0,0,'','Only show gossip option if player has completed quest 975'), +(15,2703,2,0,2,12384,1,1,1,0,'','Only show gossip option if player Does not have item 12384'); diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp index a02156ee110..6143fbaf74b 100644 --- a/src/server/scripts/Kalimdor/winterspring.cpp +++ b/src/server/scripts/Kalimdor/winterspring.cpp @@ -26,7 +26,6 @@ EndScriptData */ /* ContentData npc_lorax npc_rivern_frostwind -npc_witch_doctor_mauari EndContentData */ #include "ScriptMgr.h" @@ -131,49 +130,8 @@ public: }; -/*###### -## npc_witch_doctor_mauari -######*/ - -#define GOSSIP_HWDM "I'd like you to make me a new Cache of Mau'ari please." - -class npc_witch_doctor_mauari : public CreatureScript -{ -public: - npc_witch_doctor_mauari() : CreatureScript("npc_witch_doctor_mauari") { } - - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) - { - player->PlayerTalkClass->ClearMenus(); - if (action == GOSSIP_ACTION_INFO_DEF+1) - { - player->CLOSE_GOSSIP_MENU(); - creature->CastSpell(player, 16351, false); - } - - return true; - } - - bool OnGossipHello(Player* player, Creature* creature) - { - if (creature->isQuestGiver()) - player->PrepareQuestMenu(creature->GetGUID()); - - if (player->GetQuestRewardStatus(975)) - { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - player->SEND_GOSSIP_MENU(3377, creature->GetGUID()); - } - else - player->SEND_GOSSIP_MENU(3375, creature->GetGUID()); - - return true; - } -}; - void AddSC_winterspring() { new npc_lorax(); new npc_rivern_frostwind(); - new npc_witch_doctor_mauari(); } -- cgit v1.2.3 From 4ca77c5b0bf01752f9302a7591ba0c4226b889e1 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 5 Jun 2012 21:50:05 -0230 Subject: DB/Gossip Core/Scripts: Replace core script with db gossip for Lorax --- .../world/2012_06_05_01_world_gossip_sai.sql | 23 ++++++++ src/server/scripts/Kalimdor/winterspring.cpp | 67 ---------------------- 2 files changed, 23 insertions(+), 67 deletions(-) create mode 100644 sql/updates/world/2012_06_05_01_world_gossip_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_05_01_world_gossip_sai.sql b/sql/updates/world/2012_06_05_01_world_gossip_sai.sql new file mode 100644 index 00000000000..84893613c75 --- /dev/null +++ b/sql/updates/world/2012_06_05_01_world_gossip_sai.sql @@ -0,0 +1,23 @@ +-- Lorax SAI +SET @ENTRY := 10918; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,62,0,100,0,3051,0,0,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lorax - On Gossip Option Select - Laugh emote'), +(@ENTRY,0,1,2,62,0,100,0,3054,0,0,0,15,5126,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lorax - On Gossip Option Select - Give Quest Credit'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lorax - On Gossip Option Select - Close gossip'); +-- Lorax Gossip +DELETE FROM `gossip_menu` WHERE `entry` IN (3050,3051,3052,3053,3054); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (3050,3759),(3051,3760),(3052,3761),(3053,3762),(3054,3763); +DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 3049 AND 3054; +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 +(3049,0,0, 'You will have to excuse me, Lorax, I do not speak ''crazy''.',1,1,3050,0,0,0, ''), +(3050,0,0, 'My apologies, I did not realize that you could understand what I was saying. What is it you are doing out here?',1,1,3051,0,0,0, ''), +(3051,0,0, 'Do you? Perhaps you should tell me what it is that is bothering you',1,1,3052,0,0,0, ''), +(3052,0,0, 'What deal?',1,1,3053,0,0,0, ''), +(3053,0,0, 'So how did he break the deal?',1,1,3054,0,0,0, ''), +(3054,0,0, 'Perhaps I can be of some assistance. I will make a deal with you, Satyr. I shall recover this unforged breastplate and slay the beast. In exchange for this task, you will teach me how to create the breastplate',1,1,0,0,0,0, ''); +-- Add conditions for gossip options +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=3049; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,3049,0,0,9,5126,0,0,0,0,'','Only show gossip option if player has quest 5126'); diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp index 6143fbaf74b..cdcfedb9892 100644 --- a/src/server/scripts/Kalimdor/winterspring.cpp +++ b/src/server/scripts/Kalimdor/winterspring.cpp @@ -24,7 +24,6 @@ SDCategory: Winterspring EndScriptData */ /* ContentData -npc_lorax npc_rivern_frostwind EndContentData */ @@ -32,71 +31,6 @@ EndContentData */ #include "ScriptedCreature.h" #include "ScriptedGossip.h" -/*###### -## npc_lorax -######*/ - -#define GOSSIP_HL "Talk to me" - -#define GOSSIP_SL1 "What do you do here?" -#define GOSSIP_SL2 "I can help you" -#define GOSSIP_SL3 "What deal?" -#define GOSSIP_SL4 "Then what happened?" -#define GOSSIP_SL5 "He is not safe, i'll make sure of that." - -class npc_lorax : public CreatureScript -{ -public: - npc_lorax() : CreatureScript("npc_lorax") { } - - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) - { - player->PlayerTalkClass->ClearMenus(); - switch (action) - { - case GOSSIP_ACTION_INFO_DEF: - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - player->SEND_GOSSIP_MENU(3759, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+1: - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - player->SEND_GOSSIP_MENU(3760, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+2: - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - player->SEND_GOSSIP_MENU(3761, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+3: - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - player->SEND_GOSSIP_MENU(3762, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+4: - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - player->SEND_GOSSIP_MENU(3763, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+5: - player->CLOSE_GOSSIP_MENU(); - player->AreaExploredOrEventHappens(5126); - break; - } - return true; - } - - bool OnGossipHello(Player* player, Creature* creature) - { - if (creature->isQuestGiver()) - player->PrepareQuestMenu(creature->GetGUID()); - - if (player->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - - player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); - - return true; - } - -}; - /*###### ## npc_rivern_frostwind ######*/ @@ -132,6 +66,5 @@ public: void AddSC_winterspring() { - new npc_lorax(); new npc_rivern_frostwind(); } -- cgit v1.2.3 From f08bc7d5028d70716c2a2e13473607d85515fc14 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 5 Jun 2012 23:32:09 -0230 Subject: Core/Scripts: Script for Frostblade Shrine to start The Cleansing quest. Quest is not yet scripted. --- sql/updates/world/2012_06_05_03_world_script.sql | 2 ++ src/server/scripts/World/go_scripts.cpp | 28 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 sql/updates/world/2012_06_05_03_world_script.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_05_03_world_script.sql b/sql/updates/world/2012_06_05_03_world_script.sql new file mode 100644 index 00000000000..d10247979d9 --- /dev/null +++ b/sql/updates/world/2012_06_05_03_world_script.sql @@ -0,0 +1,2 @@ +-- Frostblade Shrine Script for Quest The Cleansing +UPDATE `gameobject_template` SET `ScriptName`= 'go_frostblade_shrine' WHERE `entry`=186649; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 790a9d0f814..e691aed7395 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1245,6 +1245,33 @@ class go_veil_skith_cage : public GameObjectScript } }; +/*###### +## go_frostblade_shrine +######*/ + +enum TheCleansing +{ + QUEST_THE_CLEANSING_HORDE = 11317, + QUEST_THE_CLEANSING_ALLIANCE = 11322, + SPELL_CLEANSING_SOUL = 43351, +}; + +class go_frostblade_shrine : public GameObjectScript +{ +public: + go_frostblade_shrine() : GameObjectScript("go_frostblade_shrine") { } + + bool OnGossipHello(Player* player, GameObject* go) + { + if (player->GetQuestStatus(QUEST_THE_CLEANSING_HORDE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_THE_CLEANSING_ALLIANCE) == QUEST_STATUS_INCOMPLETE) + { + go->UseDoorOrButton(10); + player->CastSpell(player,SPELL_CLEANSING_SOUL); + } + return true; + } +}; + void AddSC_go_scripts() { new go_cat_figurine; @@ -1285,4 +1312,5 @@ void AddSC_go_scripts() new go_gjalerbron_cage; new go_large_gjalerbron_cage; new go_veil_skith_cage; + new go_frostblade_shrine; } -- cgit v1.2.3 From a0311b645c34cc34e17d5c3ec53a53cd59016dce Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 6 Jun 2012 16:52:55 -0230 Subject: DB/Gossip: Fix Lorax quest script --- sql/updates/world/2012_06_06_00_world_script.sql | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 sql/updates/world/2012_06_06_00_world_script.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_06_00_world_script.sql b/sql/updates/world/2012_06_06_00_world_script.sql new file mode 100644 index 00000000000..727d28e8ea9 --- /dev/null +++ b/sql/updates/world/2012_06_06_00_world_script.sql @@ -0,0 +1,27 @@ +-- Remove Mistake +DELETE FROM `gossip_menu` WHERE `entry` IN (3050,3051,3052,3053,3054); +DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 3050 AND 3054; +-- Lorax SAI +SET @ENTRY := 10918; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,62,0,100,0,21323,0,0,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lorax - On Gossip Option Select - Laugh emote'), +(@ENTRY,0,1,2,62,0,100,0,21326,0,0,0,15,5126,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lorax - On Gossip Option Select - Give Quest Credit'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Lorax - On Gossip Option Select - Close gossip'); +-- Lorax Gossip +DELETE FROM `gossip_menu` WHERE `entry` IN (21322,21323,21324,21325,21326); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (21322,3759),(21323,3760),(21324,3761),(21325,3762),(21326,3763); +DELETE FROM `gossip_menu_option` WHERE `menu_id`=3049; +DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN 21322 AND 21326; +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 +(3049,0,0, 'You will have to excuse me, Lorax, I do not speak ''crazy''.',1,1,21322,0,0,0, ''), +(21322,0,0, 'My apologies, I did not realize that you could understand what I was saying. What is it you are doing out here?',1,1,21323,0,0,0, ''), +(21323,0,0, 'Do you? Perhaps you should tell me what it is that is bothering you',1,1,21324,0,0,0, ''), +(21324,0,0, 'What deal?',1,1,21325,0,0,0, ''), +(21325,0,0, 'So how did he break the deal?',1,1,21326,0,0,0, ''), +(21326,0,0, 'Perhaps I can be of some assistance. I will make a deal with you, Satyr. I shall recover this unforged breastplate and slay the beast. In exchange for this task, you will teach me how to create the breastplate',1,1,0,0,0,0, ''); +-- Add conditions for gossip options +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=3049; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,3049,0,0,9,5126,0,0,0,0,'','Only show gossip option if player has quest 5126'); -- cgit v1.2.3 From 3e3a940a1c1904353058ef5b00dd683a696968dd Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 6 Jun 2012 18:54:13 -0230 Subject: DB/SAI: Fix for Quest 11317 & 11322 "The Cleansing" --- sql/updates/world/2012_06_06_01_world_sai.sql | 42 +++++++++++++++++++++++++++ src/server/scripts/World/go_scripts.cpp | 1 + 2 files changed, 43 insertions(+) create mode 100644 sql/updates/world/2012_06_06_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_06_01_world_sai.sql b/sql/updates/world/2012_06_06_01_world_sai.sql new file mode 100644 index 00000000000..97e175652d2 --- /dev/null +++ b/sql/updates/world/2012_06_06_01_world_sai.sql @@ -0,0 +1,42 @@ +-- Fix for Quest 11317 & 11322 "The Cleansing" +-- Your Inner Turmoil SAI +SET @ENTRY := 27959; +UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`unit_flags`=`unit_flags`|256,`AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,1,54,0,100,0,0,0,0,0,11,41408,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On Summon - Cast Shadowform on self'), +(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,85,50218,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On Summon - Player Cast The Cleansing: Your Inner Turmoil''s Mirror Image Aura on npc'), +(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,85,41054,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On Summon - Player Cast Copy Weapon on npc'), +(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,85,41055,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On Summon - Player Cast Copy Weapon on npc'), +(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,85,45205,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On Summon - Player Cast Copy Offhand Weapon on npc'), +(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,85,45206,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On Summon - Player Cast Copy Offhand Weapon on npc'), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On Summon - Run Script'), +(@ENTRY,0,7,0,2,0,100,1,0,50,0,0,1,2,2,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - @50%hp - Say 2'), +(@ENTRY,0,8,9,6,0,100,1,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On death - Say 3'), +(@ENTRY,0,9,0,61,0,100,1,0,0,0,0,3,0,11686,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - On death - set model'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Your Inner Turmoil - Script - Turn to invoker'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Your Inner Turmoil - Script - Say 0'), +(@ENTRY*100,9,2,0,0,0,100,0,6000,6000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Your Inner Turmoil - Script - Turn to invoker'), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,'Your Inner Turmoil - Script - Say 1'), +(@ENTRY*100,9,4,0,0,0,100,0,7000,7000,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,'Your Inner Turmoil - Script - remove unit flags'), +(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Your Inner Turmoil - Script - Attack invoker'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,'You think that you can get rid of me through meditation?',15,0,100,0,0,0,'Your Inner Turmoil text 0'), +(@ENTRY,1,0,'Fool! I will destroy you and finally become that which has been building inside of you all of these years!',15,0,100,0,0,0,'Your Inner Turmoil text 1'), +(@ENTRY,2,0,'You cannot defeat me. I''m an inseparable part of you!',15,0,100,0,0,0,'Your Inner Turmoil text 50%'), +(@ENTRY,3,0,'NOOOOOOOoooooooooo!',15,0,100,0,0,0,'Your Inner Turmoil text death'); +-- Spell Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (50218,41054,41055,45205,45206); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,50218,0,31,3,27959,0,0,'','Spell 50218 can target Your Inner Turmoil'), +(13,1,41054,0,31,3,27959,0,0,'','Spell 41054 can target Your Inner Turmoil'), +(13,1,41055,0,31,3,27959,0,0,'','Spell 41055 can target Your Inner Turmoil'), +(13,1,45205,0,31,3,27959,0,0,'','Spell 45205 can target Your Inner Turmoil'), +(13,1,45206,0,31,3,27959,0,0,'','Spell 45206 can target Your Inner Turmoil'); +-- Spell Linking +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-43351; +INSERT INTO spell_linked_spell VALUES +(-43351,50167,0, ''), +(-43351,61720,0, ''); diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index b566b3d3b5b..308c7f9afa3 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1269,6 +1269,7 @@ public: { go->UseDoorOrButton(10); player->CastSpell(player, SPELL_CLEANSING_SOUL); + player->SetStandState(UNIT_STAND_STATE_SIT); } return true; } -- cgit v1.2.3 From 5ed8d2ccd401a1133b4caa6c2d574efb84645724 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 6 Jun 2012 22:30:58 -0230 Subject: DB/SAI: Fix Quest 11307 "Field Test" Now more like offi --- sql/updates/world/2012_06_06_02_world_sai.sql | 91 +++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 sql/updates/world/2012_06_06_02_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_06_02_world_sai.sql b/sql/updates/world/2012_06_06_02_world_sai.sql new file mode 100644 index 00000000000..297409ed776 --- /dev/null +++ b/sql/updates/world/2012_06_06_02_world_sai.sql @@ -0,0 +1,91 @@ +-- Fix Quest 11307 "Field Test" + +-- Remove hack +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=43385; + +-- Fix Plagued Proto-Dragon +UPDATE `creature_addon` SET `bytes1`=50331648 WHERE guid=107626; + +-- Plagued Dragonflayer Tribesman SAI +SET @ENTRY := 23564; +SET @SPELL1 := 15496; -- Cleave +SET @SPELL2 := 32736; -- Mortal Strike +SET @SPELL3 := 43506; -- Plague Blight +SET @SPELL4 := 43381; -- Plague Spray +SET @SPELL5 := 43384; -- Plague Credit +SET @SPELL6 := 43327; -- Vomit +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +UPDATE `creature_addon` SET `auras`= '21862' WHERE guid IN (SELECT guid FROM creature WHERE id=@ENTRY); +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (@ENTRY,1,'21862'); +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,2,0,100,1,0,95,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - HP@95% - Set Phase 1'), +(@ENTRY,0,1,0,0,0,100,0,1000,1000,4000,5000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - Combat - Cast Cleave'), +(@ENTRY,0,2,0,0,0,100,0,2000,4000,5000,8000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - Combat - Cast Mortal Strike'), +(@ENTRY,0,3,0,2,0,100,1,0,75,0,0,11,@SPELL3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - HP@75% - Cast Plague Blight'), +(@ENTRY,0,4,0,23,1,100,0,@SPELL4,1,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - On Aura - Set phase 0 (phase 1)'), +(@ENTRY,0,5,0,0,1,100,0,1000,1000,1000,1000,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - Combat - Set phase 2 (phase 1)'), +(@ENTRY,0,6,0,23,2,100,0,@SPELL4,1,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - On Spell Hit - Set Phase 3 (phase 2)'), +(@ENTRY,0,7,0,0,4,100,0,0,0,10000,10000,49,0,0,0,0,0,0,5,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - Combat - Attack Random target (phase 3)'), +(@ENTRY,0,8,0,6,4,100,0,0,0,0,0,85,@SPELL5,0,0,0,0,0,16,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - On Death - Give Killcredit (phase 3)'), +(@ENTRY,0,9,0,1,0,35,0,0,30000,25000,45000,11,@SPELL6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - OOC - Cast 43327 on self'), +(@ENTRY,0,10,11,23,0,100,1,@SPELL4,1,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - On Spell Hit - Say 0'), +(@ENTRY,0,11,0,61,0,100,0,0,0,0,0,2,1925,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Tribesman - On Spell Hit - Set Faction'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,'%s loses all self control and begins to attack friend and foe alike!',16,0,100,0,0,0,'Plagued Dragonflayer Tribesman'); + +-- Plagued Dragonflayer Rune-Caster SAI +SET @ENTRY := 24199; +SET @SPELL1 := 47782; -- Corruption +SET @SPELL2 := 15616; -- Flame Shock +SET @SPELL3 := 43381; -- Plague Spray +SET @SPELL4 := 43384; -- Plague Credit +SET @SPELL5 := 43327; -- Vomit +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +UPDATE `creature_addon` SET `auras`= '21862' WHERE guid IN (SELECT guid FROM creature WHERE id=@ENTRY); +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (@ENTRY,1,'21862'); +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,2,0,100,1,0,95,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - HP@95% - Set Phase 1'), +(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - On aggro - Cast Corruption'), +(@ENTRY,0,2,0,0,0,100,0,2000,4000,15000,17000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - Combat - Cast Flame Shock'), +(@ENTRY,0,3,0,23,1,100,0,@SPELL3,1,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - On Aura - Set phase 0 (phase 1)'), +(@ENTRY,0,4,0,0,1,100,0,1000,1000,1000,1000,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - Combat - Set phase 2 (phase 1)'), +(@ENTRY,0,5,0,23,2,100,0,@SPELL3,1,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - On Spell Hit - Set Phase 3 (phase 2)'), +(@ENTRY,0,6,0,0,4,100,0,0,0,10000,10000,49,0,0,0,0,0,0,5,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - Combat - Attack Random target (phase 3)'), +(@ENTRY,0,7,0,6,4,100,0,0,0,0,0,85,@SPELL4,0,0,0,0,0,16,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - On Death - Give Killcredit (phase 3)'), +(@ENTRY,0,8,0,1,0,35,0,0,30000,25000,45000,11,@SPELL5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - OOC - Cast 43327 on self'), +(@ENTRY,0,9,10,23,0,100,1,@SPELL3,1,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - On Spell Hit - Say 0'), +(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,2,1925,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Rune-Caster - On Spell Hit - Set Faction'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,'%s loses all self control and begins to attack friend and foe alike!',16,0,100,0,0,0,'Plagued Dragonflayer Rune-Caster'); + +-- Plagued Dragonflayer Handler SAI +SET @ENTRY := 24199; +SET @SPELL1 := 43506; -- Plague Blight +SET @SPELL2 := 43381; -- Plague Spray +SET @SPELL3 := 43384; -- Plague Credit +SET @SPELL4 := 43327; -- Vomit +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +UPDATE `creature_addon` SET `auras`= '21862' WHERE guid IN (SELECT guid FROM creature WHERE id=@ENTRY); +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (@ENTRY,1,'21862'); +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,2,0,100,1,0,95,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - HP@95% - Set Phase 1'), +(@ENTRY,0,1,0,2,0,100,1,0,75,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - HP@75% - Cast Plague Blight'), +(@ENTRY,0,2,0,23,1,100,0,@SPELL2,1,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - On Aura - Set phase 0 (phase 1)'), +(@ENTRY,0,3,0,0,1,100,0,1000,1000,1000,1000,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - Combat - Set phase 2 (phase 1)'), +(@ENTRY,0,4,0,23,2,100,0,@SPELL2,1,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - On Spell Hit - Set Phase 3 (phase 2)'), +(@ENTRY,0,5,0,0,4,100,0,0,0,10000,10000,49,0,0,0,0,0,0,5,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - Combat - Attack Random target (phase 3)'), +(@ENTRY,0,6,0,6,4,100,0,0,0,0,0,85,@SPELL3,0,0,0,0,0,16,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - On Death - Give Killcredit (phase 3)'), +(@ENTRY,0,7,0,1,0,35,0,0,30000,25000,45000,11,@SPELL4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - OOC - Cast 43327 on self'), +(@ENTRY,0,8,9,23,0,100,1,@SPELL2,1,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - On Spell Hit - Say 0'), +(@ENTRY,0,9,0,61,0,100,0,0,0,0,0,2,1925,0,0,0,0,0,1,0,0,0,0,0,0,0,'Plagued Dragonflayer Handler - On Spell Hit - Set Faction'); +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,'%s loses all self control and begins to attack friend and foe alike!',16,0,100,0,0,0,'Plagued Dragonflayer Handler'); -- cgit v1.2.3 From 3968d2e2d22b38b6796c4f793bf97ccc83d281c9 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 6 Jun 2012 22:54:49 -0230 Subject: Db/Conditions: Remove unneeded spell conditions. --- sql/updates/world/2012_06_06_03_world_conditions.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_06_06_03_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_06_03_world_conditions.sql b/sql/updates/world/2012_06_06_03_world_conditions.sql new file mode 100644 index 00000000000..c9af2a1bcbc --- /dev/null +++ b/sql/updates/world/2012_06_06_03_world_conditions.sql @@ -0,0 +1,2 @@ +-- Spell conditions shouldn't have been added +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (41054,41055,45205,45206); -- cgit v1.2.3 From 7b5bdc2fe55090c42d0256b65d5246bfb5c8857d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 6 Jun 2012 23:39:52 -0230 Subject: DB/SAI: Add SAI for Forsaken Plaguebringer and fix weapon. --- sql/updates/world/2012_06_06_04_world_sai.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 sql/updates/world/2012_06_06_04_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_06_04_world_sai.sql b/sql/updates/world/2012_06_06_04_world_sai.sql new file mode 100644 index 00000000000..af820f418be --- /dev/null +++ b/sql/updates/world/2012_06_06_04_world_sai.sql @@ -0,0 +1,19 @@ +-- Forsaken Plaguebringer SAI +SET @ENTRY := 23760; +SET @SPELL1 := 44005; -- Shoot Plague +SET @SPELL2 := 3436; -- Wandering Plague +SET @SPELL3 := 11978; -- Kick +SET @SPELL4 := 43333; -- Shoot Plague +UPDATE `creature_template` SET `equipment_id`=509,`AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`) VALUES (@ENTRY,2); +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,0,0,100,0,4000,11000,7000,11000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Forsaken Plaguebringer - Combat - Cast Shoot Plague'), +(@ENTRY,0,1,0,0,0,100,0,4000,10000,40000,50000,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0,'Forsaken Plaguebringer - Combat - Cast Wandering Plague'), +(@ENTRY,0,2,0,0,0,80,0,4000,12000,12000,18000,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0,'Forsaken Plaguebringer - Combat - Cast Kick'), +(@ENTRY,0,3,0,10,0,100,0,24042,40,6000,11000,11,@SPELL4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Forsaken Plaguebringer - OOC - Cast Shoot Plague'); -- Not working correctly +-- Spell Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (43333); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,43333,0,31,3,24042,0,0,'','Spell 43333 can target Generic Trigger LAB - OLD'); -- cgit v1.2.3 From 8223bcea04aba481d5fc4faa12bd3cb82cbfb122 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 7 Jun 2012 14:56:41 +0200 Subject: SQL: Corrected file names --- .../world/2012_05_19_04_creature_loot_template.sql | 1 - .../2012_05_19_04_world_creature_loot_template.sql | 1 + .../2012_05_19_05_gameobject_loot_template.sql | 93 -- ...012_05_19_05_world_gameobject_loot_template.sql | 93 ++ .../2012_05_19_06_gameobject_loot_template.sql | 13 - ...012_05_19_06_world_gameobject_loot_template.sql | 13 + sql/updates/world/2012_05_28_03_waypoint_data.sql | 3 - .../world/2012_05_28_03_world_waypoint_data.sql | 3 + .../2012_06_02_03_creature_loot_template_hp.sql | 1132 -------------------- .../2012_06_02_03_creature_loot_template_zm.sql | 902 ---------------- .../2012_06_02_03_reference_loot_template.sql | 791 -------------- ...12_06_02_03_world_creature_loot_template_hp.sql | 1132 ++++++++++++++++++++ ...12_06_02_03_world_creature_loot_template_zm.sql | 902 ++++++++++++++++ ...2012_06_02_03_world_reference_loot_template.sql | 791 ++++++++++++++ .../2012_06_02_04_reference_loot_template.sql | 11 - ...2012_06_02_04_world_reference_loot_template.sql | 11 + .../2012_06_02_05_reference_loot_template.sql | 2 - ...2012_06_02_05_world_reference_loot_template.sql | 2 + 18 files changed, 2948 insertions(+), 2948 deletions(-) delete mode 100644 sql/updates/world/2012_05_19_04_creature_loot_template.sql create mode 100644 sql/updates/world/2012_05_19_04_world_creature_loot_template.sql delete mode 100644 sql/updates/world/2012_05_19_05_gameobject_loot_template.sql create mode 100644 sql/updates/world/2012_05_19_05_world_gameobject_loot_template.sql delete mode 100644 sql/updates/world/2012_05_19_06_gameobject_loot_template.sql create mode 100644 sql/updates/world/2012_05_19_06_world_gameobject_loot_template.sql delete mode 100644 sql/updates/world/2012_05_28_03_waypoint_data.sql create mode 100644 sql/updates/world/2012_05_28_03_world_waypoint_data.sql delete mode 100644 sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql delete mode 100644 sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql delete mode 100644 sql/updates/world/2012_06_02_03_reference_loot_template.sql create mode 100644 sql/updates/world/2012_06_02_03_world_creature_loot_template_hp.sql create mode 100644 sql/updates/world/2012_06_02_03_world_creature_loot_template_zm.sql create mode 100644 sql/updates/world/2012_06_02_03_world_reference_loot_template.sql delete mode 100644 sql/updates/world/2012_06_02_04_reference_loot_template.sql create mode 100644 sql/updates/world/2012_06_02_04_world_reference_loot_template.sql delete mode 100644 sql/updates/world/2012_06_02_05_reference_loot_template.sql create mode 100644 sql/updates/world/2012_06_02_05_world_reference_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_19_04_creature_loot_template.sql b/sql/updates/world/2012_05_19_04_creature_loot_template.sql deleted file mode 100644 index ae996e01956..00000000000 --- a/sql/updates/world/2012_05_19_04_creature_loot_template.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM `creature_loot_template` WHERE `entry`=31813 AND `item`=36912; -- Saronite Ore diff --git a/sql/updates/world/2012_05_19_04_world_creature_loot_template.sql b/sql/updates/world/2012_05_19_04_world_creature_loot_template.sql new file mode 100644 index 00000000000..ae996e01956 --- /dev/null +++ b/sql/updates/world/2012_05_19_04_world_creature_loot_template.sql @@ -0,0 +1 @@ +DELETE FROM `creature_loot_template` WHERE `entry`=31813 AND `item`=36912; -- Saronite Ore diff --git a/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql deleted file mode 100644 index f95cb45efe4..00000000000 --- a/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql +++ /dev/null @@ -1,93 +0,0 @@ --- Set Variables -SET @Gunship10N := 28057; -- Data1 for 201872 & 202177 -SET @Gunship10H := 28045; -- Data1 for 201873 & 202178 -SET @Gunship25N := 28072; -- Data1 for 201874 & 202179 -SET @Gunship25H := 28090; -- Data1 for 201875 & 202180 -SET @emblem := 49426; -- Emblem of Frost -SET @SfShard := 50274; -- Shadowfrost Shard -SET @PriSar := 49908; -- Primordial Saronite --- Dug up the old references i created for UP34: -SET @Ref10J := 34329; -SET @Ref25J := 34251; -SET @RefJ10H := 34263; -SET @RefJ25H := 34275; --- Gunship_Armory10N_reference -DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref10J,@Ref25J,@RefJ10H,@RefJ25H); -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak -(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering -(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter -(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver -(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun -(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots -(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope -(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass -(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm -(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring -(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers -(@Ref10J,50796,0,1,1,1,1), -- Bracers of Pale Illumination --- Gunship_Armory25N_reference -(@Ref25J,50011,0,1,1,1,1), -- Gunship Captain's Mittens -(@Ref25J,50002,0,1,1,1,1), -- Polar Bear Claw Bracers -(@Ref25J,50006,0,1,1,1,1), -- Corp'rethar Ceremonial Crown -(@Ref25J,50010,0,1,1,1,1), -- Waistband of Righteous Fury -(@Ref25J,50003,0,1,1,1,1), -- Boneguard Commander's Pauldrons -(@Ref25J,50000,0,1,1,1,1), -- Scourge Hunter's Vambraces -(@Ref25J,50359,0,1,1,1,1), -- Althor's Abacus -(@Ref25J,50352,0,1,1,1,1), -- Corpse Tongue Coin -(@Ref25J,49999,0,1,1,1,1), -- Skeleton Lord's Circle -(@Ref25J,50009,0,1,1,1,1), -- Boots of Unnatural Growth -(@Ref25J,50008,0,1,1,1,1), -- Ring of Rapid Ascent -(@Ref25J,49998,0,1,1,1,1), -- Shadowvault Slayer's Cloak -(@Ref25J,50005,0,1,1,1,1), -- Amulet of the Silent Eulogy -(@Ref25J,50411,0,1,1,1,1), -- Scourgeborne Waraxe -(@Ref25J,50001,0,1,1,1,1), -- Ikfirus's Sack of Wonder --- Gunship_Armory10H_reference -(@RefJ10H,51912,0,1,1,1,1), -- Saronite Gargoyle Cloak (heroic) -(@RefJ10H,51908,0,1,1,1,1), -- Cord of Dark Suffering (heroic) -(@RefJ10H,51909,0,1,1,1,1), -- Neverending Winter (heroic) -(@RefJ10H,51916,0,1,1,1,1), -- Frost Giant's Cleaver (heroic) -(@RefJ10H,51910,0,1,1,1,1), -- Midnight Sun (heroic) -(@RefJ10H,51915,0,1,1,1,1), -- Bone Drake's Enameled Boots (heroic) -(@RefJ10H,51911,0,1,1,1,1), -- Pauldrons of Lost Hope (heroic) -(@RefJ10H,50345,0,1,1,1,1), -- Muradin's Spyglass (heroic) -(@RefJ10H,51906,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm (heroic) -(@RefJ10H,51913,0,1,1,1,1), -- Abomination's Bloody Ring (heroic) -(@RefJ10H,51914,0,1,1,1,1), -- Icecrown Rampart Bracers (heroic) -(@RefJ10H,51907,0,1,1,1,1), -- Bracers of Pale Illumination (heroic) --- Gunship_Armory25H_reference -(@RefJ25H,50663,0,1,1,1,1), -- Gunship Captain's Mittens (heroic) -(@RefJ25H,50659,0,1,1,1,1), -- Polar Bear Claw Bracers (heroic) -(@RefJ25H,50661,0,1,1,1,1), -- Corp'rethar Ceremonial Crown (heroic) -(@RefJ25H,50667,0,1,1,1,1), -- Waistband of Righteous Fury (heroic) -(@RefJ25H,50660,0,1,1,1,1), -- Boneguard Commander's Pauldrons (heroic) -(@RefJ25H,50655,0,1,1,1,1), -- Scourge Hunter's Vambraces (heroic) -(@RefJ25H,50366,0,1,1,1,1), -- Althor's Abacus (heroic) -(@RefJ25H,50349,0,1,1,1,1), -- Corpse Tongue Coin (heroic) -(@RefJ25H,50657,0,1,1,1,1), -- Skeleton Lord's Circle (heroic) -(@RefJ25H,50665,0,1,1,1,1), -- Boots of Unnatural Growth (heroic) -(@RefJ25H,50664,0,1,1,1,1), -- Ring of Rapid Ascent (heroic) -(@RefJ25H,50653,0,1,1,1,1), -- Shadowvault Slayer's Cloak (heroic) -(@RefJ25H,50658,0,1,1,1,1), -- Amulet of the Silent Eulogy (heroic) -(@RefJ25H,50654,0,1,1,1,1), -- Scourgeborne Waraxe (heroic) -(@RefJ25H,50656,0,1,1,1,1); -- Ikfirus's Sack of Wonder (heroic) --- Bind the refs to the objects -DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Gunship10N,@Gunship10H,@Gunship25N,@Gunship25H); -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- Gunship10N -(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N -(@Gunship10N,1,100,1,0,-@Ref10J,2), -- 2 from reference 10Normal --- Gunship25N -(@Gunship25N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25N -(@Gunship25N,1,100,1,0,-@Ref25J,2), -- 3 from reference 25Normal -(@Gunship25N,@SfShard,-35,1,0,1,1), -- Shadowfrost Shard @ 38% chance -(@Gunship25N,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 10% chance --- Gunship10H -(@Gunship10H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10H -(@Gunship10H,1,100,1,0,-@RefJ10H,2), -- 2 from reference 10Heroic -(@Gunship10H,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 38% chance --- Gunship25H -(@Gunship25H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25H -(@Gunship25H,1,100,1,0,-@RefJ25H,2), -- 3 from reference 25Heroic -(@Gunship25H,@SfShard,-75,1,0,1,1), -- Shadowfrost Shard @ 75% chance -(@Gunship25H,@PriSar,50,1,0,1,1); -- Primordial Saronite @ 50% chance diff --git a/sql/updates/world/2012_05_19_05_world_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_05_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..f95cb45efe4 --- /dev/null +++ b/sql/updates/world/2012_05_19_05_world_gameobject_loot_template.sql @@ -0,0 +1,93 @@ +-- Set Variables +SET @Gunship10N := 28057; -- Data1 for 201872 & 202177 +SET @Gunship10H := 28045; -- Data1 for 201873 & 202178 +SET @Gunship25N := 28072; -- Data1 for 201874 & 202179 +SET @Gunship25H := 28090; -- Data1 for 201875 & 202180 +SET @emblem := 49426; -- Emblem of Frost +SET @SfShard := 50274; -- Shadowfrost Shard +SET @PriSar := 49908; -- Primordial Saronite +-- Dug up the old references i created for UP34: +SET @Ref10J := 34329; +SET @Ref25J := 34251; +SET @RefJ10H := 34263; +SET @RefJ25H := 34275; +-- Gunship_Armory10N_reference +DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref10J,@Ref25J,@RefJ10H,@RefJ25H); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak +(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering +(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter +(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver +(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun +(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots +(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope +(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass +(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm +(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring +(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers +(@Ref10J,50796,0,1,1,1,1), -- Bracers of Pale Illumination +-- Gunship_Armory25N_reference +(@Ref25J,50011,0,1,1,1,1), -- Gunship Captain's Mittens +(@Ref25J,50002,0,1,1,1,1), -- Polar Bear Claw Bracers +(@Ref25J,50006,0,1,1,1,1), -- Corp'rethar Ceremonial Crown +(@Ref25J,50010,0,1,1,1,1), -- Waistband of Righteous Fury +(@Ref25J,50003,0,1,1,1,1), -- Boneguard Commander's Pauldrons +(@Ref25J,50000,0,1,1,1,1), -- Scourge Hunter's Vambraces +(@Ref25J,50359,0,1,1,1,1), -- Althor's Abacus +(@Ref25J,50352,0,1,1,1,1), -- Corpse Tongue Coin +(@Ref25J,49999,0,1,1,1,1), -- Skeleton Lord's Circle +(@Ref25J,50009,0,1,1,1,1), -- Boots of Unnatural Growth +(@Ref25J,50008,0,1,1,1,1), -- Ring of Rapid Ascent +(@Ref25J,49998,0,1,1,1,1), -- Shadowvault Slayer's Cloak +(@Ref25J,50005,0,1,1,1,1), -- Amulet of the Silent Eulogy +(@Ref25J,50411,0,1,1,1,1), -- Scourgeborne Waraxe +(@Ref25J,50001,0,1,1,1,1), -- Ikfirus's Sack of Wonder +-- Gunship_Armory10H_reference +(@RefJ10H,51912,0,1,1,1,1), -- Saronite Gargoyle Cloak (heroic) +(@RefJ10H,51908,0,1,1,1,1), -- Cord of Dark Suffering (heroic) +(@RefJ10H,51909,0,1,1,1,1), -- Neverending Winter (heroic) +(@RefJ10H,51916,0,1,1,1,1), -- Frost Giant's Cleaver (heroic) +(@RefJ10H,51910,0,1,1,1,1), -- Midnight Sun (heroic) +(@RefJ10H,51915,0,1,1,1,1), -- Bone Drake's Enameled Boots (heroic) +(@RefJ10H,51911,0,1,1,1,1), -- Pauldrons of Lost Hope (heroic) +(@RefJ10H,50345,0,1,1,1,1), -- Muradin's Spyglass (heroic) +(@RefJ10H,51906,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm (heroic) +(@RefJ10H,51913,0,1,1,1,1), -- Abomination's Bloody Ring (heroic) +(@RefJ10H,51914,0,1,1,1,1), -- Icecrown Rampart Bracers (heroic) +(@RefJ10H,51907,0,1,1,1,1), -- Bracers of Pale Illumination (heroic) +-- Gunship_Armory25H_reference +(@RefJ25H,50663,0,1,1,1,1), -- Gunship Captain's Mittens (heroic) +(@RefJ25H,50659,0,1,1,1,1), -- Polar Bear Claw Bracers (heroic) +(@RefJ25H,50661,0,1,1,1,1), -- Corp'rethar Ceremonial Crown (heroic) +(@RefJ25H,50667,0,1,1,1,1), -- Waistband of Righteous Fury (heroic) +(@RefJ25H,50660,0,1,1,1,1), -- Boneguard Commander's Pauldrons (heroic) +(@RefJ25H,50655,0,1,1,1,1), -- Scourge Hunter's Vambraces (heroic) +(@RefJ25H,50366,0,1,1,1,1), -- Althor's Abacus (heroic) +(@RefJ25H,50349,0,1,1,1,1), -- Corpse Tongue Coin (heroic) +(@RefJ25H,50657,0,1,1,1,1), -- Skeleton Lord's Circle (heroic) +(@RefJ25H,50665,0,1,1,1,1), -- Boots of Unnatural Growth (heroic) +(@RefJ25H,50664,0,1,1,1,1), -- Ring of Rapid Ascent (heroic) +(@RefJ25H,50653,0,1,1,1,1), -- Shadowvault Slayer's Cloak (heroic) +(@RefJ25H,50658,0,1,1,1,1), -- Amulet of the Silent Eulogy (heroic) +(@RefJ25H,50654,0,1,1,1,1), -- Scourgeborne Waraxe (heroic) +(@RefJ25H,50656,0,1,1,1,1); -- Ikfirus's Sack of Wonder (heroic) +-- Bind the refs to the objects +DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Gunship10N,@Gunship10H,@Gunship25N,@Gunship25H); +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- Gunship10N +(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N +(@Gunship10N,1,100,1,0,-@Ref10J,2), -- 2 from reference 10Normal +-- Gunship25N +(@Gunship25N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25N +(@Gunship25N,1,100,1,0,-@Ref25J,2), -- 3 from reference 25Normal +(@Gunship25N,@SfShard,-35,1,0,1,1), -- Shadowfrost Shard @ 38% chance +(@Gunship25N,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 10% chance +-- Gunship10H +(@Gunship10H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10H +(@Gunship10H,1,100,1,0,-@RefJ10H,2), -- 2 from reference 10Heroic +(@Gunship10H,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 38% chance +-- Gunship25H +(@Gunship25H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25H +(@Gunship25H,1,100,1,0,-@RefJ25H,2), -- 3 from reference 25Heroic +(@Gunship25H,@SfShard,-75,1,0,1,1), -- Shadowfrost Shard @ 75% chance +(@Gunship25H,@PriSar,50,1,0,1,1); -- Primordial Saronite @ 50% chance diff --git a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql deleted file mode 100644 index 9b2dcbb9363..00000000000 --- a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql +++ /dev/null @@ -1,13 +0,0 @@ -DELETE FROM `reference_loot_template` WHERE `entry`=34172; -DELETE FROM `creature_loot_template` WHERE `entry`=38013; -DELETE FROM `gameobject_loot_template` WHERE `entry`=28683; -INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(28683,35498,3,1,0,1,1), -- Formula: Enchant Weapon - Deathfrost -(28683,35557,28,1,0,1,2), -- Huge Snowball -(28683,35720,3,1,0,5,6), -- Lord of Frost's Private Label -(28683,35723,12,1,0,1,1), -- Shards of Ahune -(28683,54801,0,1,1,1,1), -- Icebound Cloak -(28683,54802,0,1,1,1,1), -- The Frost Lord's War Cloak -(28683,54803,0,1,1,1,1), -- The Frost Lord's Battle Shroud -(28683,54804,0,1,1,1,1), -- Shroud of Winter's Chill -(28683,54805,0,1,1,1,1); -- Cloak of the Frigid Winds diff --git a/sql/updates/world/2012_05_19_06_world_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_06_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..9b2dcbb9363 --- /dev/null +++ b/sql/updates/world/2012_05_19_06_world_gameobject_loot_template.sql @@ -0,0 +1,13 @@ +DELETE FROM `reference_loot_template` WHERE `entry`=34172; +DELETE FROM `creature_loot_template` WHERE `entry`=38013; +DELETE FROM `gameobject_loot_template` WHERE `entry`=28683; +INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(28683,35498,3,1,0,1,1), -- Formula: Enchant Weapon - Deathfrost +(28683,35557,28,1,0,1,2), -- Huge Snowball +(28683,35720,3,1,0,5,6), -- Lord of Frost's Private Label +(28683,35723,12,1,0,1,1), -- Shards of Ahune +(28683,54801,0,1,1,1,1), -- Icebound Cloak +(28683,54802,0,1,1,1,1), -- The Frost Lord's War Cloak +(28683,54803,0,1,1,1,1), -- The Frost Lord's Battle Shroud +(28683,54804,0,1,1,1,1), -- Shroud of Winter's Chill +(28683,54805,0,1,1,1,1); -- Cloak of the Frigid Winds diff --git a/sql/updates/world/2012_05_28_03_waypoint_data.sql b/sql/updates/world/2012_05_28_03_waypoint_data.sql deleted file mode 100644 index aa0e0ddd5ef..00000000000 --- a/sql/updates/world/2012_05_28_03_waypoint_data.sql +++ /dev/null @@ -1,3 +0,0 @@ --- correct waypointid to guid*10 -UPDATE `waypoint_data` SET `id`=2026020 WHERE `id`=2026060; -UPDATE `creature_addon` SET `path_id`=2026020 WHERE `guid`=202602; diff --git a/sql/updates/world/2012_05_28_03_world_waypoint_data.sql b/sql/updates/world/2012_05_28_03_world_waypoint_data.sql new file mode 100644 index 00000000000..aa0e0ddd5ef --- /dev/null +++ b/sql/updates/world/2012_05_28_03_world_waypoint_data.sql @@ -0,0 +1,3 @@ +-- correct waypointid to guid*10 +UPDATE `waypoint_data` SET `id`=2026020 WHERE `id`=2026060; +UPDATE `creature_addon` SET `path_id`=2026020 WHERE `guid`=202602; diff --git a/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql b/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql deleted file mode 100644 index cd6015929b1..00000000000 --- a/sql/updates/world/2012_06_02_03_creature_loot_template_hp.sql +++ /dev/null @@ -1,1132 +0,0 @@ -SET @RefDLK := 26043; -SET @HFP := 6000; -SET @HFP1 := @HFP+1; -SET @HFP2 := @HFP+2; -SET @Scrolls := @HFP+3; --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -DELETE FROM `reference_loot_template` WHERE `entry` IN (@RefDLK,@HFP,@HFP1,@HFP2,@Scrolls); -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ --- Generic Lowlevel Ref1 -(@HFP,1,20,1,0,-4000,1), -- Grey level 61 -(@HFP,2,5,1,0,-4001,1), -- Grey level 64 -(@HFP,3,2,1,0,-4100,1), -- Green level 57 -(@HFP,4,2,1,0,-4101,1), -- Green level 58 -(@HFP,5,2,1,0,-4102,1), -- Green level 59 -(@HFP,6,2,1,0,-4103,1), -- Green level 60 -(@HFP,7,2,1,0,-4104,1), -- Green level 61 -(@HFP,8,2,1,0,-4105,1), -- Green level 62 -(@HFP,9,0.5,1,0,-4200,1), -- Blue level 60 -(@HFP,10,0.5,1,0,-4201,1), -- Blue level 61 -(@HFP,11,0.5,1,0,-4202,1), -- Blue level 62 -(@HFP,12,0.5,1,0,-4203,1), -- Blue level 63 -(@HFP,13,0.5,1,0,-4204,1), -- Blue level 64 -(@HFP,4500,0.1,1,0,1,1), -- Traveler's Backpack -(@HFP,3914,0.05,1,0,1,1), -- Journeyman's Backpack --- Generic Lowlevel Ref2 -(@HFP1,1,20,1,0,-4000,1), -- Grey level 61 -(@HFP1,2,5,1,0,-4001,1), -- Grey level 64 -(@HFP1,3,2,1,0,-4103,1), -- Green level 60 -(@HFP1,4,2,1,0,-4104,1), -- Green level 61 -(@HFP1,5,2,1,0,-4105,1), -- Green level 62 -(@HFP1,6,0.5,1,0,-4200,1), -- Blue level 60 -(@HFP1,7,0.5,1,0,-4201,1), -- Blue level 61 -(@HFP1,8,0.5,1,0,-4202,1), -- Blue level 62 -(@HFP1,9,0.5,1,0,-4203,1), -- Blue level 63 -(@HFP1,10,0.5,1,0,-4204,1), -- Blue level 64 --- High level Ref -(@HFP2,1,30,1,1,-4002,1), -- Grey level 64 items (ilvl 69) -(@HFP2,2,30,1,1,-4002,1), -- Grey level 67 items (ilvl 72) -(@HFP2,3,2,1,2,-4110,1), -- Green level 67 items (ilvl 111) -(@HFP2,4,2,1,2,-4111,1), -- Green level 68 items (ilvl 114) -(@HFP2,5,2,1,2,-4112,1), -- Green level 69 items (ilvl 117) -(@HFP2,6,0.5,1,3,-4208,1), -- Blue level 68 items (ilvl 115) -(@HFP2,7,0.5,1,3,-4209,1), -- Blue level 69 items (ilvl 115) -(@HFP2,8,0.5,1,3,-4210,1), -- Blue level 70 items (ilvl 115) --- TBC Scrolls -(@Scrolls,33459,0,1,1,1,1), -- Scroll of Protection VI -(@Scrolls,33457,0,1,1,1,1), -- Scroll of Agility VI -(@Scrolls,33458,0,1,1,1,1), -- Scroll of Intellect VI -(@Scrolls,33460,0,1,1,1,1), -- Scroll of Spirit VI -(@Scrolls,33461,0,1,1,1,1), -- Scroll of Stamina VI -(@Scrolls,33462,0,1,1,1,1), -- Scroll of Strength VI --- Doom Lord Kazzak -(@RefDLK,30732,0,1,1,1,1), -- Exodar Life-Staff -(@RefDLK,30733,0,1,1,1,1), -- Hope Ender -(@RefDLK,30734,0,1,1,1,1), -- Leggings of the Seventh Circle -(@RefDLK,30735,0,1,1,1,1), -- Ancient Spellcloak of the Highborne -(@RefDLK,30736,0,1,1,1,1), -- Ring of Flowing Light -(@RefDLK,30737,0,1,1,1,1), -- Gold-Leaf Wildboots -(@RefDLK,30738,0,1,1,1,1), -- Ring of Reciprocity -(@RefDLK,30739,0,1,1,1,1), -- Scaled Greaves of the Marksman -(@RefDLK,30740,0,1,1,1,1), -- Ripfiend Shoulderplates -(@RefDLK,30741,0,1,1,1,1); -- Topaz-Studded Battlegrips --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -DELETE FROM `creature_loot_template` WHERE `entry` IN (18728,187281,19191,16977,19354,17084,17057,16873,16871,19422,16907,19424,19423,16903,16901,19701,16876,16925,18952,16972,16973,17014,16844,19299,16847,16863,18981,16959,19434,16938,16937,19312,22461,19190,18733,24918,18977,17034,19459,19136,19264,16954,18678,18827,16947,16845,19457,16967,16966,22374,18978,16880,17058,22323,19261,17035,17053,16978,16846,16912,16911,19408,17039,16857,18677,19192,16946,16950,16934,19189,19188,16932,16933,20798,19458,16974,19415,16878,16870,19295,16867,19414,19413,19410,19411,16960,16879,16929,16928,16927,19282,19335,19443,16951,19349,19350,16968,26222,26223,16975,20145,16904,16906,16905,19527,16939,18679,19263,19298,16964,19442,24919,18975); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ --- Doom Lord Kazzak, NPC 18728 --- --------------------------------------------------- -(18728,1,100,1,0,-@RefDLK,2), -- Two from Doom Loor Kazzak Reference -(18728,2,5,1,0,-4113,1), -- Level 70 TBC Green Reference --- --------------------------------------------------- --- Arazzius the Cruel, NPC 19191 --- --------------------------------------------------- -(19191,21877,50,1,0,1,3), -- Netherweave Cloth -(19191,27854,5,1,0,1,1), -- Smoked Talbuk Venison -(19191,28399,5,1,0,1,1), -- Filtered Draenic Water -(19191,13446,1.5,1,0,1,1), -- Major Healing Potion -(19191,13444,1.5,1,0,1,1), -- Major Mana Potion -(19191,1,15,1,0,-4000,1), -- Grey itemlevel 66 (level 61 items) -(19191,2,5,1,0,-4001,1), -- Grey itemlevel 69 (lvl 64 items) -(19191,3,7.5,1,0,-4103,1), -- Green itemlevel 90 -(19191,4,5,1,0,-4104,1), -- Green itemlevel 93 -(19191,5,2.5,1,0,-4105,1), -- Green itemlevel 96 -(19191,6,0.5,1,0,-4201,1), -- Blues level 61 -(19191,7,0.5,1,0,-4202,1), -- Blues level 62 -(19191,8,0.5,1,0,-4203,1), -- Blues level 63 -(19191,9,0.5,1,0,-4204,1), -- Blues level 64 --- --------------------------------------------------- --- Arch Mage Xintor, NPC 16977 --- --------------------------------------------------- -(16977,21877,55,1,0,1,1), -- Netherweave Cloth -(16977,14047,15,1,0,1,3), -- Runecloth -(16977,27859,10,1,0,1,1), -- Zanger Caps -(16977,28399,5,1,0,1,1), -- Filtered Draenic Water -(16977,13446,2,1,0,1,1), -- Major Healing Potion -(16977,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Arzeth the Merciless, NPC 19354 --- --------------------------------------------------- -(19354,21877,70,1,0,1,1), -- Netherweave Cloth -(19354,27854,7,1,0,1,1), -- Smoked Talbuk Venison -(19354,28399,3,1,0,1,1), -- Filtered Draenic Water -(19354,13446,3,1,0,1,1), -- Major Healing Potion -(19354,13444,1,1,0,1,1), -- Major Healing Potion -(19354,5760,1,1,0,1,1), -- Eternium Lockbox -(19354,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Avruu, NPC 17084 --- --------------------------------------------------- -(17084,23580,80,1,0,1,1), -- Avruu's Orb -(17084,21877,45,1,0,1,3), -- Netherweave Cloth -(17084,17056,30,1,0,1,1), -- Light Feather -(17084,23483,-10,1,0,1,1), -- QItem: Haal'eshi Scroll -(17084,27854,5,1,0,1,1), -- Smoked Talbuk Venison -(17084,28399,3,1,0,1,1), -- Filtered Draenic Water -(17084,13446,3,1,0,1,1), -- Major Healing Potion -(17084,13444,1,1,0,1,1), -- Major Healing Potion -(17084,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Blacktalon teh Savage, NPC 17057 --- --------------------------------------------------- -(17057,23687,-100,1,0,1,1), -- QItem: Blacktalon's Claws -(17057,24516,75,1,0,1,1), -- Damaged Rock Flayer Talon -(17057,21877,40,1,0,1,1), -- Netherweave Cloth -(17057,24517,20,1,0,1,1), -- Blood Soaked Tail -(17057,27854,3,1,0,1,1), -- Smoked Talbuk Venison -(17057,28399,2,1,0,1,1), -- Filtered Draenic Water -(17057,13446,1.5,1,0,1,1), -- Major Healing Potion -(17057,13444,0.75,1,0,1,1), -- Major Healing Potion -(17057,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Bleeding Hollow Dark Shaman, NPC 16873 --- --------------------------------------------------- -(16873,30157,-25,1,0,1,1), -- QItem: Cursed Talisman -(16873,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood -(16873,28399,3,1,0,1,1), -- Filtered Draenic Water -(16873,13446,2,1,0,1,1), -- Major Healing Potion -(16873,5760,0.1,1,0,1,1), -- Eternium Lockbox -(16873,1,2,1,0,-6003,1), -- Scroll of * Reference -(16873,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bleeding Hollow Grunt, NPC 16871 --- --------------------------------------------------- -(16871,30157,-25,1,0,1,1), -- QItem: Cursed Talisman -(16871,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood -(16871,28399,3,1,0,1,1), -- Filtered Draenic Water -(16871,13446,2,1,0,1,1), -- Major Healing Potion -(16871,5760,0.1,1,0,1,1), -- Eternium Lockbox -(16871,1,2,1,0,-6003,1), -- Scroll of * Reference -(16871,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bleeding Hollow Necrolyte, NPC 19422 --- --------------------------------------------------- -(19422,30157,-25,1,0,1,1), -- QItem: Cursed Talisman -(19422,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood -(19422,28399,3,1,0,1,1), -- Filtered Draenic Water -(19422,13446,2,1,0,1,1), -- Major Healing Potion -(19422,5760,0.1,1,0,1,1), -- Eternium Lockbox -(19422,1,2,1,0,-6003,1), -- Scroll of * Reference -(19422,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bleeding Hollow Peon, NPC 16907 --- --------------------------------------------------- -(16907,30157,-25,1,0,1,1), -- QItem: Cursed Talisman -(16907,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood -(16907,28399,3,1,0,1,1), -- Filtered Draenic Water -(16907,13446,2,1,0,1,1), -- Major Healing Potion -(16907,5760,0.1,1,0,1,1), -- Eternium Lockbox -(16907,1,2,1,0,-6003,1), -- Scroll of * Reference -(16907,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bleeding Hollow Tormentor, NPC 19424 --- --------------------------------------------------- -(19424,30157,-25,1,0,1,1), -- QItem: Cursed Talisman -(19424,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood -(19424,28399,3,1,0,1,1), -- Filtered Draenic Water -(19424,13446,2,1,0,1,1), -- Major Healing Potion -(19424,5760,0.1,1,0,1,1), -- Eternium Lockbox -(19424,1,2,1,0,-6003,1), -- Scroll of * Reference -(19424,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bleeding Hollow Worg, NPC 19423 --- --------------------------------------------------- -(19423,3299,70,1,0,1,1), -- Fractured Canine -(19423,33547,25,1,0,1,1), -- Hardened Claw -(19423,4583,1,1,0,1,1), -- Thick Furry Mane -(19423,4584,1,1,0,1,1), -- Large Trophy Paw -(19423,5759,0.2,1,0,1,1), -- Thorium Lockbox -(19423,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Blistering Oozeling, NPC 16903 --- --------------------------------------------------- -(16903,25444,100,1,0,1,1), -- Corrosive Ichor -(16903,23339,-25,1,0,1,1), -- QItem: Arelion's Journal -(16903,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Blistering Rot, NPC 16901 --- --------------------------------------------------- -(16901,25444,80,1,1,1,1), -- Corrosive Ichor -(16901,25446,20,1,1,1,1), -- Brittle Skull -(16901,5760,0.2,1,0,1,1), -- Eternium Lockbox -(16901,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bonechewer Evoker, NPC 19701 --- --------------------------------------------------- -(19701,21877,55,1,0,1,1), -- Netherweave Cloth -(19701,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood -(19701,14047,20,1,0,1,3), -- Runecloth -(19701,27854,7,1,0,1,1), -- Smoked Talbuk Venison -(19701,28399,3,1,0,1,1), -- Filtered Draenic Water -(19701,13446,3,1,0,1,1), -- Major Healing Potion -(19701,13444,1,1,0,1,1), -- Major Healing Potion -(19701,5759,0.2,1,0,1,1), -- Thorium Lockbox -(19701,1,2,1,0,-6003,1), -- Scroll of * Reference -(19701,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bonechewer Mutant, NPC 16876 --- --------------------------------------------------- -(16876,21877,55,1,0,1,1), -- Netherweave Cloth -(16876,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood -(16876,14047,20,1,0,1,3), -- Runecloth -(16876,27854,7,1,0,1,1), -- Smoked Talbuk Venison -(16876,28399,3,1,0,1,1), -- Filtered Draenic Water -(16876,13446,3,1,0,1,1), -- Major Healing Potion -(16876,13444,1,1,0,1,1), -- Major Healing Potion -(16876,5759,0.2,1,0,1,1), -- Thorium Lockbox -(16876,1,2,1,0,-6003,1), -- Scroll of * Reference -(16876,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bonechewer Raider, NPC 16925 --- --------------------------------------------------- -(16925,21877,55,1,0,1,1), -- Netherweave Cloth -(16925,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood -(16925,14047,20,1,0,1,3), -- Runecloth -(16925,27859,7,1,0,1,1), -- Zanger Caps -(16925,28399,3,1,0,1,1), -- Filtered Draenic Water -(16925,13446,3,1,0,1,1), -- Major Healing Potion -(16925,13444,1,1,0,1,1), -- Major Healing Potion -(16925,5759,0.2,1,0,1,1), -- Thorium Lockbox -(16925,1,2,1,0,-6003,1), -- Scroll of * Reference -(16925,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bonechewer Scavenger, NPC 18952 --- --------------------------------------------------- -(18952,21877,55,1,0,1,1), -- Netherweave Cloth -(18952,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood -(18952,14047,20,1,0,1,3), -- Runecloth -(18952,27854,7,1,0,1,1), -- Smoked Talbuk Venison -(18952,28399,3,1,0,1,1), -- Filtered Draenic Water -(18952,13446,3,1,0,1,1), -- Major Healing Potion -(18952,13444,1,1,0,1,1), -- Major Healing Potion -(18952,5759,0.2,1,0,1,1), -- Thorium Lockbox -(18952,1,2,1,0,-6003,1), -- Scroll of * Reference -(18952,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bonestripper Buzzard, NPC 16972 --- --------------------------------------------------- -(16972,25425,80,1,0,1,1), -- Molted Feather -(16972,27671,50,1,0,1,1), -- Buzzard Meat -(16972,23239,-10,1,0,1,1), -- Plump Buzzard Wing -(16972,17056,30,1,0,1,1), -- Light Feather -(16972,25427,19,1,0,1,1), -- Beaten Talon -(16972,5759,0.2,1,0,1,1), -- Thorium Lockbox -(16972,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Bonestripper Vulture, NPC 16973 --- --------------------------------------------------- -(16973,25425,80,1,0,1,1), -- Molted Feather -(16973,27671,50,1,0,1,1), -- Buzzard Meat -(16973,23387,-40,1,0,1,1), -- Bonestripper Tail Feather -(16973,25427,19,1,0,1,1), -- Beaten Talon -(16973,5760,0.2,1,0,1,1), -- Eternium Lockbox -(16973,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Collapsing Voidwalker, NPC 17014 --- --------------------------------------------------- -(17014,29161,-100,1,0,1,3), -- Void Ridge Soul Shard -(17014,22577,20,1,0,1,2), -- Mote of Shadow -(17014,1,50,1,1,-6000,1), -- Generic HellfirePeninsula Loot -(17014,2,50,1,1,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Crust Burster, NPC 16844 --- --------------------------------------------------- -(16844,25434,80,1,0,1,1), -- Fractured Carapace -(16844,25436,20,1,0,1,1), -- Twitching Leg -(16844,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Deathwhisperer, NPC 19299 --- --------------------------------------------------- -(19299,21877,10,1,0,2,3), -- Netherweave Cloth -(19299,27854,2,1,0,1,1), -- Smoked Talbuk Venison -(19299,28399,2,1,0,1,1), -- Filtered Draenic Water -(19299,13444,1,1,0,1,1), -- Major Mana Potion -(19299,1,90,1,1,-6000,1), -- Generic HellfirePeninsula Loot -(19299,31902,0.05,1,0,1,1), -- Eight of Furies -(19299,31911,0.05,1,0,1,1), -- Eight of Lunacy --- --------------------------------------------------- --- Debilitated Mag'har Grunt, NPC 16847 --- --------------------------------------------------- -(16847,23589,-50,1,0,1,1), -- QItem: Mag'har Ancestral Beads -(16847,21877,50,1,0,1,1), -- Netherweave Cloth -(16847,14047,15,1,0,1,3), -- Runecloth -(16847,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(16847,28399,3,1,0,1,1), -- Filtered Draenic Water -(16847,13446,2,1,0,1,1), -- Major Healing Potion -(16847,13444,1,1,0,1,1), -- Major Healing Potion -(16847,5759,0.15,1,0,1,1), -- Thorium Lockbox -(16847,1,2,1,0,-6003,1), -- Scroll of * Reference -(16847,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Deranged Helboar, NPC 16863 --- --------------------------------------------------- -(16863,23270,-40,1,0,1,1), -- QItem: Tainted Helboar Meat -(16863,3403,40,1,1,1,1), -- Ivory Boar Tusk -(16863,2295,40,1,1,1,1), -- Large Boar Tusk -(16863,44754,15,1,1,1,1), -- Severed Boar Tusk -(16863,25440,1.5,1,1,1,1), -- Cracked Boar Tusk -(16863,25442,0.5,1,0,1,1), -- Mangled Snout -(16863,1,2,1,0,-6003,1), -- Scroll of * Reference -(16863,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Doomwhisperer, NPC 18981 --- --------------------------------------------------- -(18981,28513,-50,1,0,1,1), -- QItem: Demonic Rune Stone -(18981,21877,50,1,0,1,1), -- Netherweave Cloth -(18981,14047,15,1,0,1,3), -- Runecloth -(18981,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18981,28399,3,1,0,1,1), -- Filtered Draenic Water -(18981,13446,2,1,0,1,1), -- Major Healing Potion -(18981,13444,1,1,0,1,1), -- Major Healing Potion -(18981,5759,0.15,1,0,1,1), -- Thorium Lockbox -(18981,1,2,1,0,-6003,1), -- Scroll of * Reference -(18981,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Dread Tactician, NPC 16959 --- --------------------------------------------------- -(16959,21877,13,1,0,1,1), -- Netherweave Cloth -(16959,14047,15,1,0,1,3), -- Runecloth -(16959,27854,2,1,0,1,1), -- Smoked Talbuk Venison -(16959,27860,3,1,0,1,1), -- Purified Draenic Water -(16959,22829,0.5,1,0,1,1), -- Super Healing Potion -(16959,22832,0.25,1,0,1,1), -- Super Mana Potion -(16959,1,80,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 --- --------------------------------------------------- --- Dreadcaller, NPC 19434 --- --------------------------------------------------- -(19434,21877,60,1,0,1,1), -- Netherweave Cloth -(19434,14047,15,1,0,1,3), -- Runecloth -(19434,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(19434,28399,3,1,0,1,1), -- Filtered Draenic Water -(19434,13446,2,1,0,1,1), -- Major Healing Potion -(19434,13444,1,1,0,1,1), -- Major Healing Potion -(19434,5759,0.2,1,0,1,1), -- Thorium Lockbox -(19434,1,2,1,0,-6003,1), -- Scroll of * Reference -(19434,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Dreghood Brute, NPC 16938 --- --------------------------------------------------- -(16938,21877,70,1,0,1,1), -- Netherweave Cloth -(16938,27854,11,1,0,1,1), -- Mag'har Grainbread -(16938,28399,3,1,0,1,1), -- Filtered Draenic Water -(16938,13446,2,1,0,1,1), -- Major Healing Potion -(16938,13444,1,1,0,1,1), -- Major Healing Potion -(16938,1,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Dreghood Geomancer, NPC 16937 --- --------------------------------------------------- -(16937,21877,70,1,0,1,1), -- Netherweave Cloth -(16937,27854,11,1,0,1,1), -- Mag'har Grainbread -(16937,28399,3,1,0,1,1), -- Filtered Draenic Water -(16937,13446,2,1,0,1,1), -- Major Healing Potion -(16937,13444,1,1,0,1,1), -- Major Healing Potion --- --------------------------------------------------- --- Drillmaster Zurok, NPC 19312 --- --------------------------------------------------- -(19312,21877,60,1,0,1,1), -- Netherweave Cloth -(19312,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(19312,28399,3,1,0,1,1), -- Filtered Draenic Water -(19312,13446,2,1,0,1,1), -- Major Healing Potion -(19312,13444,1,1,0,1,1), -- Major Healing Potion -(19312,5760,0.2,1,0,1,1), -- Eternium Lockbox -(19312,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Fel Canon MKI, NPC 22461 --- --------------------------------------------------- -(22461,31944,80,1,1,1,1), -- Demonic Capacitor -(22461,31945,20,1,1,1,1), -- Shadow Circuit --- --------------------------------------------------- --- Fel Handler, NPC 19190 --- --------------------------------------------------- -(19190,28513,-50,1,0,1,1), -- QItem: Demonic Rune Stone -(19190,27854,10,1,0,1,1), -- Smoked Talbuk Venison -(19190,28399,5,1,0,1,1), -- Filtered Draenic Water -(19190,13446,3,1,0,1,1), -- Major Healing Potion -(19190,13444,1.5,1,0,1,1), -- Major Mana Potion -(19190,5759,0.2,1,0,1,1), -- Thorium Lockbox -(19190,1,2,1,0,-6003,1), -- Scroll of * Reference -(19190,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Fel Reaver, NPC 18733 --- --------------------------------------------------- -(18733,1,100,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 --- --------------------------------------------------- --- Felblood Initiate, NPC 24918 --- --------------------------------------------------- -(24918,21877,75,1,0,1,3), -- Netherweave Cloth -(24918,27857,8,1,0,1,1), -- Garadar Sharp -(24918,27860,5,1,0,1,1), -- Filtered Draenic Water -(24918,22829,3,1,0,1,1), -- Super Healing Potion -(24918,22832,1.5,1,0,1,1), -- Super Healing Potion -(24918,31952,0.2,1,0,1,1), -- Khorium Lockbox -(24918,31888,0.01,1,0,1,1), -- Three of Blessings -(24918,31908,0.01,1,0,1,1), -- Three of Furies -(24918,1,80,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 --- --------------------------------------------------- --- Felguard Destroyer, NPC 18977 --- --------------------------------------------------- -(18977,21877,40,1,0,1,3), -- Netherweave Cloth -(18977,27854,5,1,0,1,1), -- Smoked Talbuk Venison -(18977,28399,4,1,0,1,1), -- Filtered Draenic Water -(18977,13446,2,1,0,1,1), -- Major Healing Potion -(18977,13444,1,1,0,1,1), -- Major Mana Potion -(18977,5759,0.3,1,0,1,1), -- Thorium Lockbox -(18977,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Female Kaliri Hatchling, NPC 17034 --- --------------------------------------------------- -(17034,23588,-40,1,0,1,1), -- QItem: Kaliri Feather -(17034,25425,81,1,1,1,1), -- Molted Feather -(17034,25427,19,1,1,1,1), -- Beaten Talon -(17034,5760,0.2,1,0,1,1), -- Eternium Lockbox -(17034,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Feng, NPC 19459 --- --------------------------------------------------- -(19459,3299,70,1,0,1,1), -- Fractured Canine -(19459,33547,30,1,0,1,1), -- Hardened Claw -(19459,5759,0.3,1,0,1,1), -- Thorium Lockbox -(19459,4583,0.3,1,0,1,1), -- Thick Furry Mane -(19459,4584,0.2,1,0,1,1), -- Large Trophy Paw -(19459,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Flamewalker Imp, NPC 19136 --- --------------------------------------------------- -(19136,21877,92,1,0,1,1), -- Netherweave Cloth -(19136,22785,0.05,1,0,1,3), -- Felweed --- --------------------------------------------------- --- Force-Commander Gorax, NPC 19264 --- --------------------------------------------------- -(19264,21877,80,1,0,1,3), -- Netherweave Cloth -(19264,27854,10,1,0,1,1), -- Smoked Talbuk Venison -(19264,28399,5,1,0,1,1), -- Filtered Draenic Water -(19264,13446,3,1,0,1,1), -- Major Healing Potion -(19264,13444,1.5,1,0,1,1), -- Major Mana Potion -(19264,5760,0.3,1,0,1,1), -- Eternium Lockbox -(19264,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Forge-Camp Legionnaire, NPC 16954 --- --------------------------------------------------- -(16954,21877,80,1,0,1,3), -- Netherweave Cloth -(16954,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(16954,28399,4,1,0,1,1), -- Filtered Draenic Water -(16954,13446,2,1,0,1,1), -- Major Healing Potion -(16954,13444,1,1,0,1,1), -- Major Mana Potion -(16954,5759,0.3,1,0,1,1), -- Thorium Lockbox -(16954,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16954,2,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Fulgorge, NPC 18678 --- --------------------------------------------------- -(18678,31176,0,1,1,1,1), -- Rockwurm Plate Handguards -(18678,31177,0,1,1,1,1), -- Rockwurm Scale Gauntlets -(18678,31179,0,1,1,1,1), -- Rockwurm Hide Gloves -(18678,31181,0,1,1,1,1), -- Rockwurm Hide Handwraps -(18678,25434,1,1,0,1,3), -- Fractured Carapace -(18678,25436,0.2,1,0,2,4), -- Twitching Leg --- --------------------------------------------------- --- Gan'arg Sapper, NPC 18827 --- --------------------------------------------------- -(18827,21877,83,1,0,1,3), -- Netherweave Cloth -(18827,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(18827,28399,4,1,0,1,1), -- Filtered Draenic Water -(18827,13446,3,1,0,1,1), -- Major Healing Potion -(18827,13444,1.5,1,0,1,1), -- Major Mana Potion -(18827,5759,0.2,1,0,1,1), -- Thorium Lockbox -(18827,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(18827,2,3,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Gan'arg Servant, NPC 16947 --- --------------------------------------------------- -(16947,21877,83,1,0,1,3), -- Netherweave Cloth -(16947,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(16947,28399,4,1,0,1,1), -- Filtered Draenic Water -(16947,13446,3,1,0,1,1), -- Major Healing Potion -(16947,13444,1.5,1,0,1,1), -- Major Mana Potion -(16947,5759,0.1,1,0,1,1), -- Thorium Lockbox -(16947,1,95,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16947,2,3,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Gorkan Bloodfist, NPC 16845 --- --------------------------------------------------- -(16845,21877,3,1,0,2,3), -- Netherweave Cloth -(16845,27854,1,1,0,1,1), -- Smoked Talbuk Venison -(16845,22829,0.5,1,0,1,1), -- Super Healing Potion -(16845,1,2,1,0,-4110,1), -- Level 67 Green Items (ilvl 111) --- --------------------------------------------------- --- Grillok "Darkeye", NPC 19457 --- --------------------------------------------------- -(19457,31529,-100,1,0,1,1), -- QItem: Grillok's Eyepatch -(19457,21877,45,1,0,1,3), -- Netherweave Cloth -(19457,30157,-5,1,0,1,1), -- QItem: Cursed Talisman -(19457,30425,-10,1,0,1,1), -- QItem: Bleeding Hollow Blood -(19457,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(19457,28399,2,1,0,1,1), -- Filtered Draenic Water -(19457,13446,2,1,0,1,1), -- Major Healing Potion -(19457,13444,1,1,0,1,1), -- Major Mana Potion -(19457,5760,0.1,1,0,1,1), -- Eternium Lockbox -(19457,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Haal'eshi Talonguard, NPC 16967 --- --------------------------------------------------- -(16967,21877,60,1,0,1,3), -- Netherweave Cloth -(16967,17056,42,1,0,1,1), -- Light Feather -(16967,23483,-15,1,0,1,1), -- QItem: Haal'eshi Scroll -(16967,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(16967,28399,3,1,0,1,1), -- Filtered Draenic Water -(16967,13446,2,1,0,1,1), -- Major Healing Potion -(16967,13444,1,1,0,1,1), -- Major Mana Potion -(16967,5760,0.1,1,0,1,1), -- Eternium Lockbox -(16967,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16967,2,3,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Haal'eshi Windwalker, NPC 16966 --- --------------------------------------------------- -(16966,21877,60,1,0,1,3), -- Netherweave Cloth -(16966,17056,42,1,0,1,1), -- Light Feather -(16966,23483,-15,1,0,1,1), -- QItem: Haal'eshi Scroll -(16966,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(16966,28399,3,1,0,1,1), -- Filtered Draenic Water -(16966,13446,2,1,0,1,1), -- Major Healing Potion -(16966,13444,1,1,0,1,1), -- Major Mana Potion -(16966,5760,0.1,1,0,1,1), -- Eternium Lockbox -(16966,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16966,2,3,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Hand of Kargath, NPC 22374 --- --------------------------------------------------- -(22374,31706,-100,1,0,1,1), -- QItem: The Head of the Hand of Kargath -(22374,21877,40,1,0,1,3), -- Netherweave Cloth -(22374,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(22374,28399,2,1,0,1,1), -- Filtered Draenic Water -(22374,13446,1,1,0,1,1), -- Major Healing Potion -(22374,13444,0.5,1,0,1,1), -- Major Mana Potion -(22374,5760,0.1,1,0,1,1), -- Eternium Lockbox -(22374,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Heckling Fel Sprite, NPC 18978 --- --------------------------------------------------- -(18978,21877,95,1,0,1,1), -- Netherweave Cloth --- --------------------------------------------------- --- Hulking Helboar, NPC 16880 --- --------------------------------------------------- -(16880,23336,-30,1,0,1,1), -- QItem: Helboar Blood Sample -(16880,23270,-5,1,0,1,1), -- QItem: Tainted Hellboar Meat -(16880,3403,82,1,1,1,1), -- Ivory Boar Tusk -(16880,25440,1.5,1,1,1,1), -- Cracked Boar Tusk -(16880,25442,0.3,1,2,1,1), -- Mangled Snout -(16880,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Illidari Taskmaster, NPC 17058 --- --------------------------------------------------- -(17058,29113,-50,1,0,1,1), -- QItem: Demonic Essence -(17058,21877,60,1,0,1,3), -- Netherweave Cloth -(17058,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(17058,28399,3,1,0,1,1), -- Filtered Draenic Water -(17058,13446,2,1,0,1,1), -- Major Healing Potion -(17058,13444,1,1,0,1,1), -- Major Mana Potion -(17058,5760,0.2,1,0,1,1), -- Eternium Lockbox -(17058,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 -(17058,2,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Incandescent Fel Spark, NPC 22323 --- --------------------------------------------------- -(22323,24508,80,1,1,1,1), -- Elemental Fragment -(22323,24511,20,1,1,1,1), -- Primordial Essence -(22323,22574,35,1,0,1,2), -- Mote of Fire -(22323,1,90,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 --- --------------------------------------------------- --- Infernal Warbringer, NPC 19261 --- --------------------------------------------------- -(19261,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Kaliri Matriarch, NPC 17035 --- --------------------------------------------------- -(17035,23588,-27,1,0,1,1), -- QItem: Kaliri Feather -(17035,25425,81,1,1,1,1), -- Molted Feather -(17035,25427,19,1,1,1,1), -- Beaten Talon -(17035,5760,0.07,1,0,1,1), -- Eternium Lockbox -(17035,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Kaliri Swooper, NPC 17053 --- --------------------------------------------------- -(17053,23588,-25,1,0,1,1), -- QItem: Kaliri Feather -(17053,25425,81,1,1,1,1), -- Molted Feather -(17053,25427,19,1,1,1,1), -- Beaten Talon -(17053,5760,0.05,1,0,1,1), -- Eternium Lockbox -(17053,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Lieutenant Commander Thalvos, NPC 16978 --- --------------------------------------------------- -(16978,28562,-100,1,0,1,1), -- QItem: Unyielding Battle Horn -(16978,21877,55,1,0,1,1), -- Netherweave Cloth -(16978,27859,5,1,0,1,1), -- Zanger Caps -(16978,28399,2.5,1,0,1,1), -- Filtered Draenic Water -(16978,13446,2,1,0,1,1), -- Major Healing Potion -(16978,13444,2,1,0,1,1), -- Major Mana Potion -(16978,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Mag'har Grunt, NPC 16846 --- --------------------------------------------------- -(16846,23589,-50,1,0,1,1), -- QItem: Mag'har Ancestral Beads -(16846,21877,60,1,0,1,1), -- Netherweave Cloth -(16846,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(16846,28399,3,1,0,1,1), -- Filtered Draenic Water -(16846,13446,2,1,0,1,1), -- Major Healing Potion -(16846,13444,1,1,0,1,1), -- Major Healing Potion -(16846,5759,0.15,1,0,1,1), -- Eternium Lockbox -(16846,1,2,1,0,-6003,1), -- Scroll of * Reference -(16846,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Mag'har Hunter, NPC 16912 --- --------------------------------------------------- -(16912,21877,60,1,0,1,1), -- Netherweave Cloth -(16912,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(16912,28399,3,1,0,1,1), -- Filtered Draenic Water -(16912,13446,2,1,0,1,1), -- Major Healing Potion -(16912,13444,1,1,0,1,1), -- Major Healing Potion -(16912,5759,0.15,1,0,1,1), -- Eternium Lockbox -(16912,1,2,1,0,-6003,1), -- Scroll of * Reference -(16912,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Mag'har Watcher, NPC 16911 --- --------------------------------------------------- -(16911,21877,60,1,0,1,1), -- Netherweave Cloth -(16911,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(16911,28399,3,1,0,1,1), -- Filtered Draenic Water -(16911,13446,2,1,0,1,1), -- Major Healing Potion -(16911,13444,1,1,0,1,1), -- Major Healing Potion -(16911,5759,0.15,1,0,1,1), -- Eternium Lockbox -(16911,1,2,1,0,-6003,1), -- Scroll of * Reference -(16911,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Maiden of Pain, NPC 19408 --- --------------------------------------------------- -(19408,14047,15,1,0,1,3), -- Runecloth -(19408,27854,9,1,0,1,1), -- Smoked Talbuk Venison -(19408,28399,4,1,0,1,1), -- Filtered Draenic Water -(19408,13446,3,1,0,1,1), -- Major Healing Potion -(19408,13444,1.5,1,0,1,1), -- Major Healing Potion -(19408,5760,0.15,1,0,1,1), -- Eternium Lockbox -(19408,1,2,1,0,-6003,1), -- Scroll of * Reference -(19408,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Male Kaliri Hatchling, NPC 17039 --- --------------------------------------------------- -(17039,23588,-25,1,0,1,1), -- QItem: Kaliri Feather -(17039,25425,81,1,1,1,1), -- Molted Feather -(17039,25427,19,1,1,1,1), -- Beaten Talon -(17039,5760,0.2,1,0,1,1), -- Eternium Lockbox -(17039,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Marauding Crust Burster, NPC 16857 --- --------------------------------------------------- -(16857,23338,7,1,0,1,1), -- Eroded Leather Case -(16857,25434,80,1,0,1,1), -- Fractured Carapace -(16857,25436,20,1,0,1,1), -- Twitching Leg -(16857,5759,0.1,1,0,1,1), -- Thorium Lockbox -(16857,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Mekthorg the Wild, NPC 18677 --- --------------------------------------------------- -(18677,31168,0,1,1,1,1), -- Demon-Forged Chestguard -(18677,31170,0,1,1,1,1), -- Demon-Forged Hauberk -(18677,31172,0,1,1,1,1), -- Demon-Cured Tunic -(18677,31174,0,1,1,1,1), -- Demonweave Raiment -(18677,21877,40,1,0,1,3), -- Netherweave Cloth -(18677,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(18677,28399,2,1,0,1,3), -- Netherweave Cloth --- --------------------------------------------------- --- Mistress of Doom, NPC 19192 --- --------------------------------------------------- -(19192,21877,80,1,0,1,3), -- Netherweave Cloth -(19192,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(19192,28399,5,1,0,1,1), -- Filtered Draenic Water -(19192,13446,3,1,0,1,1), -- Major Healing Potion -(19192,13444,1.5,1,0,1,1), -- Major Healing Potion -(19192,5759,0.15,1,0,1,1), -- Eternium Lockbox -(19192,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Mo'arg Forgefiend, NPC 16946 --- --------------------------------------------------- -(16946,21877,80,1,0,1,3), -- Netherweave Cloth -(16946,27854,9,1,0,1,1), -- Smoked Talbuk Venison -(16946,28399,4,1,0,1,1), -- Filtered Draenic Water -(16946,13446,3,1,0,1,1), -- Major Healing Potion -(16946,13444,1.5,1,0,1,1), -- Major Healing Potion -(16946,5760,0.15,1,0,1,1), -- Eternium Lockbox -(16946,1,2,1,0,-6003,1), -- Scroll of * Reference -(16946,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Netherhound, NPC 16950 --- --------------------------------------------------- -(16950,28513,-60,1,0,1,1), -- QItem: Demonic Rune Stone -(16950,3299,43,1,0,1,1), -- Fractured Canine -(16950,33547,17,1,0,1,1), -- Hardened Claw -(16950,4583,0.5,1,0,1,1), -- Thick Furry Mane -(16950,4584,0.2,1,0,1,1), -- Large Trophy Paw -(16950,5759,0.05,1,0,1,1), -- Thorium Lockbox -(16950,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Quillfang Ravager, NPC 16934 --- --------------------------------------------------- -(16934,27674,50,1,0,1,1), -- Ravager Flesh -(16934,23965,81,1,1,1,1), -- Chipped Ravager Claw -(16934,23979,19,1,1,1,1), -- Chipped Ravager Carapace -(16934,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Quillfang Skitterer, NPC 19189 --- --------------------------------------------------- -(19189,27674,50,1,0,1,1), -- Ravager Flesh -(19189,23217,-4,1,0,1,1), -- QItem: Ravager Egg -(19189,23965,81,1,1,1,1), -- Chipped Ravager Claw -(19189,23979,19,1,1,1,1), -- Chipped Ravager Carapace -(19189,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Raging Colossus, NPC 19188 --- --------------------------------------------------- -(19188,29579,80,1,0,2,4), -- Crystalized Stone Chips -(19188,29476,19,1,0,1,1), -- Crimson Crystal Shard -(19188,29578,19,1,0,2,4), -- Crystalized Stone -(19188,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Razorfang Hatchling, NPC 16932 --- --------------------------------------------------- -(16932,23217,-1,1,0,1,1), -- QItem: Ravager Egg -(16932,27674,50,1,0,1,1), -- Ravager Flesh -(16932,23976,0,1,1,1,1), -- Gnarled Ravager Carapace -(16932,23977,0,1,1,1,1), -- Gnarled Ravager Fang -(16932,23978,0,1,1,1,1), -- Gnarled Ravager Claw -(16932,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Razorfang Ravager, NPC 16933 --- --------------------------------------------------- -(16933,23965,81,1,1,1,1), -- Chipped Ravager Claw -(16933,23979,19,1,1,1,1), -- Chipped Ravager Carapace -(16933,27674,50,1,0,1,1), -- Ravager Flesh -(16933,23217,-20,1,0,1,1), -- QItem: Ravager Egg -(16933,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Razorsaw, NPC 20798 --- --------------------------------------------------- -(20798,29590,55,1,0,1,1), -- Burning Legion Missive -(20798,29586,-100,1,0,1,1), -- QItem: Head of Forgefiend Razorsaw -(20798,21877,50,1,0,1,3), -- Netherweave Cloth -(20798,27854,5,1,0,1,1), -- Smoked Talbuk Venison -(20798,28399,2.5,1,0,1,1), -- Filtered Draenic Water -(20798,13446,1.5,1,0,1,1), -- Major Healing Potion -(20798,13444,0.75,1,0,1,1), -- Major Mana Potion -(20798,5760,0.15,1,0,1,1), -- Eternium Lockbox -(20798,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Ripp, NPC 19458 --- --------------------------------------------------- -(19458,3299,70,1,0,1,1), -- Fractured Canine -(19458,33547,25,1,0,1,1), -- Hardened Claw -(19458,4583,1,1,0,1,1), -- Thick Furry Mane -(19458,4584,1,1,0,1,1), -- Large Trophy Paw -(19458,5759,0.2,1,0,1,1), -- Thorium Lockbox -(19458,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Rogue Voidwalker, NPC 16974 --- --------------------------------------------------- -(16974,23218,-85,1,0,1,1), -- Condensed Voidwalker Essence -(16974,22577,20,1,0,1,1), -- Mote of Shadow -(16974,1,90,1,0,-6000,1), -- Generic HellfirePeninsule Loot --- --------------------------------------------------- --- Shattered Hand Acolyte, NPC 19415 --- --------------------------------------------------- -(19415,21877,70,1,0,1,3), -- Netherweave Cloth -(19415,27854,9,1,0,1,1), -- Smoked Talbuk Venison -(19415,28399,4,1,0,1,1), -- Filtered Draenic Water -(19415,13446,2,1,0,1,1), -- Major Healing Potion -(19415,13444,1,1,0,1,1), -- Major Healing Potion -(19415,5760,0.2,1,0,1,1), -- Eternium Lockbox -(19415,1,2,1,0,-6003,1), -- Scroll of * Reference -(19415,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Berserker, NPC 16878 --- --------------------------------------------------- -(16878,21877,82,1,0,1,3), -- Netherweave Cloth -(16878,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(16878,28399,4,1,0,1,1), -- Filtered Draenic Water -(16878,13446,3,1,0,1,1), -- Major Healing Potion -(16878,13444,1.5,1,0,1,1), -- Major Healing Potion -(16878,5760,0.2,1,0,1,1), -- Eternium Lockbox -(16878,1,2,1,0,-6003,1), -- Scroll of * Reference -(16878,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Captain, NPC 16870 --- --------------------------------------------------- -(16870,21877,80,1,0,1,3), -- Netherweave Cloth -(16870,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(16870,28399,4,1,0,1,1), -- Filtered Draenic Water -(16870,13446,2,1,0,1,1), -- Major Healing Potion -(16870,13444,1,1,0,1,1), -- Major Healing Potion -(16870,5760,0.2,1,0,1,1), -- Eternium Lockbox -(16870,1,2,1,0,-6003,1), -- Scroll of * Reference -(16870,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Grenadier, NPC 19295 --- --------------------------------------------------- -(19295,21877,85,1,0,1,3), -- Netherweave Cloth -(19295,27854,9,1,0,1,1), -- Smoked Talbuk Venison -(19295,28399,4,1,0,1,1), -- Filtered Draenic Water -(19295,13446,2,1,0,1,1), -- Major Healing Potion -(19295,13444,1,1,0,1,1), -- Major Healing Potion -(19295,1,75,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Grunt, NPC 16867 --- --------------------------------------------------- -(16867,21877,80,1,0,1,3), -- Netherweave Cloth -(16867,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(16867,28399,4,1,0,1,1), -- Filtered Draenic Water -(16867,13446,2,1,0,1,1), -- Major Healing Potion -(16867,13444,1,1,0,1,1), -- Major Healing Potion -(16867,5760,0.18,1,0,1,1), -- Eternium Lockbox -(16867,1,2,1,0,-6003,1), -- Scroll of * Reference -(16867,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Guard, NPC 19414 --- --------------------------------------------------- -(19414,21877,80,1,0,1,3), -- Netherweave Cloth -(19414,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(19414,28399,4,1,0,1,1), -- Filtered Draenic Water -(19414,13446,3,1,0,1,1), -- Major Healing Potion -(19414,13444,1.5,1,0,1,1), -- Major Healing Potion -(19414,5760,0.18,1,0,1,1), -- Eternium Lockbox -(19414,1,2,1,0,-6003,1), -- Scroll of * Reference -(19414,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Mage, NPC 19413 --- --------------------------------------------------- -(19413,21877,60,1,0,1,3), -- Netherweave Cloth -(19413,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(19413,28399,3,1,0,1,1), -- Filtered Draenic Water -(19413,13446,2,1,0,1,1), -- Major Healing Potion -(19413,13444,1,1,0,1,1), -- Major Healing Potion -(19413,1,2,1,0,-6003,1), -- Scroll of * Reference -(19413,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Neophyte, NPC 19410 --- --------------------------------------------------- -(19410,21877,80,1,0,1,3), -- Netherweave Cloth -(19410,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(19410,28399,4,1,0,1,1), -- Filtered Draenic Water -(19410,13446,2,1,0,1,1), -- Major Healing Potion -(19410,13444,1,1,0,1,1), -- Major Healing Potion -(19410,5760,0.18,1,0,1,1), -- Eternium Lockbox -(19410,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Shattered Hand Warlock, NPC 19411 --- --------------------------------------------------- -(19411,21877,80,1,0,1,3), -- Netherweave Cloth -(19411,27854,9,1,0,1,1), -- Smoked Talbuk Venison -(19411,28399,4,1,0,1,1), -- Filtered Draenic Water -(19411,13446,2,1,0,1,1), -- Major Healing Potion -(19411,13444,1,1,0,1,1), -- Major Healing Potion -(19411,5760,0.18,1,0,1,1), -- Eternium Lockbox -(19411,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Sister of Grief, NPC 16960 --- --------------------------------------------------- -(16960,21877,80,1,0,1,3), -- Netherweave Cloth -(16960,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(16960,28399,4,1,0,1,1), -- Filtered Draenic Water -(16960,13446,2,1,0,1,1), -- Major Healing Potion -(16960,13444,1,1,0,1,1), -- Major Healing Potion -(16960,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Starving Helboar, NPC 16879 --- --------------------------------------------------- -(16879,23270,-5,1,0,1,1), -- QItem: Tainted Helboar Meat -(16879,2295,74,1,1,1,1), -- Large Boar Tusk -(16879,44754,24,1,1,1,1), -- Severed Boar Tusk -(16879,25440,2,1,1,1,1), -- Cracked Boar Tusk -(16879,25442,0.5,1,0,1,1), -- Mangled Snout -(16879,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Stonescythe Alpha, NPC 16929 --- --------------------------------------------------- -(16929,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon -(16929,24517,19,1,1,1,1), -- Blood Soaked Tail -(16929,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(16929,28399,2,1,0,1,1), -- Filtered Draenic Water -(16929,13446,1.2,1,0,1,1), -- Major Healing Potion -(16929,13444,0.6,1,0,1,1), -- Major Healing Potion -(16929,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16929,2,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Stonescythe Ambusher, NPC 16928 --- --------------------------------------------------- -(16928,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon -(16928,24517,19,1,1,1,1), -- Blood Soaked Tail -(16928,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Stonescythe Whelp, NPC 16927 --- --------------------------------------------------- -(16927,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon -(16927,24517,19,1,1,1,1), -- Blood Soaked Tail -(16927,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(16927,28399,2,1,0,1,1), -- Filtered Draenic Water -(16927,13446,1.2,1,0,1,1), -- Major Healing Potion -(16927,13444,0.6,1,0,1,1), -- Major Healing Potion -(16927,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16927,2,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Subjugator Shi'aziv, NPC 19282 --- --------------------------------------------------- -(19282,28513,-25,1,0,1,1), -- QItem: Demonic Rune Stone -(19282,27854,3,1,0,1,1), -- Smoked Talbuk Venison -(19282,28399,1.5,1,0,1,1), -- Filtered Draenic Water -(19282,13446,1,1,0,1,1), -- Major Healing Potion -(19282,13444,0.5,1,0,1,1), -- Major Healing Potion -(19282,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Subjugator Yalqiz, NPC 19335 --- --------------------------------------------------- -(19335,27854,1.2,1,0,1,1), -- Smoked Talbuk Venison -(19335,28399,0.6,1,0,1,1), -- Filtered Draenic Water -(19335,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Tagar Spinebreaker, NPC 19443 --- --------------------------------------------------- -(19443,21877,33,1,0,1,3), -- Netherweave Cloth -(19443,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(19443,28399,2,1,0,1,1), -- Filtered Draenic Water -(19443,13446,1,1,0,1,1), -- Major Healing Potion -(19443,13444,0.5,1,0,1,1), -- Major Healing Potion -(19443,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Terrorfiend, NPC 16951 --- --------------------------------------------------- -(16951,21877,70,1,0,1,3), -- Netherweave Cloth -(16951,23269,-25,1,0,1,1), -- Felblood Sample -(16951,27854,7,1,0,1,1), -- Smoked Talbuk Venison -(16951,28399,3.5,1,0,1,1), -- Filtered Draenic Water -(16951,13446,2,1,0,1,1), -- Major Healing Potion -(16951,13444,1,1,0,1,1), -- Major Healing Potion -(16951,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot -(16951,2,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Thornfang Ravager, NPC 19349 --- --------------------------------------------------- -(19349,27674,50,1,0,1,1), -- Ravager Flesh -(19349,23965,81,1,1,1,1), -- Chipped Ravager Claw -(19349,23979,19,1,1,1,1), -- Chipped Ravager Carapace -(19349,5760,0.1,1,0,1,1), -- Eternium Lockbox -(19349,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Thornfang Venomspitter, NPC 19350 --- --------------------------------------------------- -(19350,23965,81,1,1,1,1), -- Chipped Ravager Claw -(19350,23979,19,1,1,1,1), -- Chipped Ravager Carapace -(19350,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 --- --------------------------------------------------- --- Tunneler, NPC 16968 --- --------------------------------------------------- -(16968,23338,5,1,0,1,1), -- Eroded Leather Case -(16968,25434,81,1,1,1,1), -- Fractured Carapace -(16968,25436,19,1,1,1,1), -- Twitching Leg -(16968,5760,0.1,1,0,1,1), -- Eternium Lockbox -(16968,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Twilight Cryomancer, NPC 26222 --- --------------------------------------------------- -(26222,14047,85,1,0,1,2), -- Runecloth -(26222,8952,9,1,0,1,2), -- Roasted Quail -(26222,8766,4.5,1,0,1,2), -- Morning Glory Dew -(26222,13446,6,1,0,1,2), -- Major Healing Potion -(26222,13444,3,1,0,1,2), -- Major Mana Potion -(26222,1,10,1,0,-1052,1), -- Level 52 Grey reference -(26222,2,10,1,0,-1053,1), -- Level 53 Grey reference --- --------------------------------------------------- --- Twilight Frostblade, NPC 26223 --- --------------------------------------------------- -(26223,14047,85,1,0,1,2), -- Runecloth -(26223,8952,9,1,0,1,2), -- Roasted Quail -(26223,8766,4.5,1,0,1,2), -- Morning Glory Dew -(26223,13446,6,1,0,1,2), -- Major Healing Potion -(26223,13444,3,1,0,1,2), -- Major Mana Potion -(26223,1,10,1,0,-1052,1), -- Level 52 Grey reference -(26223,2,10,1,0,-1053,1), -- Level 53 Grey reference --- --------------------------------------------------- --- Uncontrolled Voidwalker, NPC 16975 --- --------------------------------------------------- -(16975,23218,-80,1,0,1,1), -- Condensed Voidwalker Essence -(16975,22577,20,1,0,1,1), -- Mote of Shadow -(16975,1,90,1,0,-6000,1), -- Generic HellfirePeninsule Loot --- --------------------------------------------------- --- Unstable Voidwalker, NPC 20145 --- --------------------------------------------------- -(20145,29051,-100,1,0,1,1), -- QItem: Warp Nether --- --------------------------------------------------- --- Unyielding Footman, NPC 16904 --- --------------------------------------------------- -(16904,21877,60,1,0,1,1), -- Netherweave Cloth -(16904,14047,20,1,0,1,3), -- Runecloth -(16904,27859,8,1,0,1,1), -- Zanger Caps -(16904,28399,4,1,0,1,1), -- Filtered Draenic Water -(16904,13446,2,1,0,1,1), -- Major Healing Potion -(16904,13444,1,1,0,1,1), -- Major Mana Potion -(16904,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Unyielding Knight, NPC 16906 --- --------------------------------------------------- -(16906,28552,15,1,0,1,1), -- A Mysterious Tome -(16906,21877,60,1,0,1,1), -- Netherweave Cloth -(16906,14047,20,1,0,1,3), -- Runecloth -(16906,27859,8,1,0,1,1), -- Zanger Caps -(16906,28399,4,1,0,1,1), -- Filtered Draenic Water -(16906,13446,2,1,0,1,1), -- Major Healing Potion -(16906,13444,1,1,0,1,1), -- Major Mana Potion -(16906,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16906,2,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Unyielding Sorcerer, NPC 16905 --- --------------------------------------------------- -(16905,21877,60,1,0,1,1), -- Netherweave Cloth -(16905,14047,20,1,0,1,3), -- Runecloth -(16905,27859,8,1,0,1,1), -- Zanger Caps -(16905,28399,4,1,0,1,1), -- Filtered Draenic Water -(16905,13446,2,1,0,1,1), -- Major Healing Potion -(16905,13444,1,1,0,1,1), -- Major Mana Potion -(16905,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot -(16905,2,2,1,0,-6003,1), -- Scroll of * Reference --- --------------------------------------------------- --- Vacillating Voidcaller, NPC 19527 --- --------------------------------------------------- -(19527,29161,-100,1,0,1,3), -- Void Ridge Soul Shard -(19527,22577,20,1,0,1,2), -- Mote of Shadow -(19527,1,50,1,1,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Void Baron Galaxis, NPC 16939 --- --------------------------------------------------- -(16939,29162,-100,1,0,1,1), -- Galaxis Soul Shard --- --------------------------------------------------- --- Vorakem Doomspeaker, NPC 18679 --- --------------------------------------------------- -(18679,31182,0,1,1,1,1), -- Legion Helm -(18679,31183,0,1,1,1,1), -- Legion Coif -(18679,31184,0,1,1,1,1), -- Legion Headguard -(18679,31185,0,1,1,1,1), -- Legion Crown -(18679,21877,40,1,0,1,3), -- Netherweave Cloth -(18679,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(18679,28399,2.5,1,0,1,1), -- Filtered Draenic Water -(18679,13446,1,1,0,1,1), -- Major Healing Potion -(18679,13444,0.5,1,0,1,1), -- Major Healing Potion --- --------------------------------------------------- --- Warboss Nekrogg, NPC 19263 --- --------------------------------------------------- -(19263,21877,90,1,0,1,1), -- Netherweave Cloth -(19263,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Warbringer Arix'Amal, NPC 19298 --- --------------------------------------------------- -(19298,29795,-85,1,0,1,1), -- QItem: Burning Legion Gate Key -(19298,29588,50,1,0,1,1), -- Burning Legion Gate Key -(19298,21877,46,1,0,1,3), -- Netherweave Cloth -(19298,27854,5,1,0,1,1), -- Smoked Talbuk Venison -(19298,28399,2.5,1,0,1,1), -- Filtered Draenic Water -(19298,13446,1.4,1,0,1,1), -- Major Healing Potion -(19298,13444,0.7,1,0,1,1), -- Major Healing Potion -(19298,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Warlord Morkh, NPC 16964 --- --------------------------------------------------- -(16964,30158,-100,1,0,1,1), -- QItem: Morkh's Shattered Armor -(16964,21877,35,1,0,1,1), -- Netherweave Cloth -(16964,14047,10,1,0,1,3), -- Runecloth -(16964,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(16964,28399,2,1,0,1,1), -- Filtered Draenic Water -(16964,13446,1,1,0,1,1), -- Major Healing Potion -(16964,13444,0.5,1,0,1,1), -- Major Healing Potion -(16964,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Worg Master Kruush, NPC 19442 --- --------------------------------------------------- -(19442,31374,-100,1,0,1,1), -- QItem: Worg Master's Head -(19442,30425,-25,1,0,1,1), -- QItem: Bleeding Hollow Blood -(19442,30157,-10,1,0,1,1), -- QItem: Cursed Talisman -(19442,21877,45,1,0,1,3), -- Netherweave Cloth -(19442,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(19442,28399,2,1,0,1,1), -- Filtered Draenic Water -(19442,13446,1,1,0,1,1), -- Major Healing Potion -(19442,13444,0.5,1,0,1,1), -- Major Mana Potion -(19442,5759,0.1,1,0,1,1), -- Thorium Lockbox -(19442,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot --- --------------------------------------------------- --- Wrath Herald, NPC 24919 --- --------------------------------------------------- -(24919,34259,-100,1,0,1,1), -- Demonic Blood -(24919,21877,45,1,0,1,3), -- Netherweave Cloth -(24919,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(24919,27860,2,1,0,1,1), -- Purified Draenic Water -(24919,22829,1.6,1,0,1,1), -- Super Healing Potion -(24919,22832,0.8,1,0,1,1), -- Super Mana Potion -(24919,1,100,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 --- --------------------------------------------------- --- Wrathguard, NPC 18975 --- --------------------------------------------------- -(18975,28513,-85,1,0,1,1), -- QItem: Demonic Rune Stone -(18975,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(18975,28399,4,1,0,1,1), -- Filtered Draenic Water -(18975,13446,3,1,0,1,1), -- Major Healing Potion -(18975,13444,1.5,1,0,1,1), -- Major Healing Potion -(18975,5759,0.15,1,0,1,1), -- Thorium Lockbox -(18975,1,2,1,0,-6003,1), -- Scroll of * Reference -(18975,2,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot - -UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (26222,26223); -DELETE FROM `reference_loot_template` WHERE `entry`=34081; diff --git a/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql b/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql deleted file mode 100644 index e739f81407b..00000000000 --- a/sql/updates/world/2012_06_02_03_creature_loot_template_zm.sql +++ /dev/null @@ -1,902 +0,0 @@ -SET @ZM1:=6010; --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -DELETE FROM `reference_loot_template` WHERE `entry`=@ZM1; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -(@ZM1,1,30,1,0,-4000,1), -- Grey Items level 61 (ilvl 66) -(@ZM1,2,30,1,0,-4001,1), -- Grey Items level 64 (ilvl 69) -(@ZM1,3,2,1,0,-4103,1), -- Green Items level 60 (ilvl 90) -(@ZM1,4,2,1,0,-4104,1), -- Green Items level 61 (ilvl 93) -(@ZM1,5,2,1,0,-4105,1), -- Green Items level 62 (ilvl 96) -(@ZM1,6,2,1,0,-4106,1), -- Green Items level 63 (ilvl 99) -(@ZM1,7,0.5,1,0,-4203,1), -- Blue items level 63 (ilvl 94) -(@ZM1,8,0.5,1,0,-4204,1), -- Blue items level 64 (ilvl 97) -(@ZM1,9,0.5,1,0,-4205,1), -- Blue items level 65 (ilvl 97) -(@ZM1,5760,0.5,1,0,1,1); -- Eternium Lockbox --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -DELETE FROM `creature_loot_template` WHERE `entry` IN (18285,18119,18120,18117,20443,20444,18118,18121,19732,18283,20792,18088,20088,20090,18089,20089,20196,18127,18682,20197,18281,20293,20295,20294,18159,20442,18992,19174,18681,18116,18115,19733,20079,18087,19946,19947,18086,18122,18134,18214,20198,20270,18113,18114,19734,18129,19730,19729,18080,20290,20291,18282,20445,20292,18137,18136,18135,18130,18131,18133,20283,19706,18680,18213,18286,18212,18160,20324,20279,20280,18046,18044,18128,18280,18154,19519,18125,18340,20477,18138,18077,18079,20115,18132,19402,18124,18123,20387); -INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ --- "Count" Ungula, NPC 18285 --- --------------------------------------------------- -(18285,25459,-100,1,0,1,1), -- QItem: "Count" Ungula's Mandible -(18285,25434,80,1,1,1,1), -- Fractured Carapace -(18285,25436,20,1,1,1,1), -- Twitsching Leg -(18285,24493,-10,1,0,1,1), -- QItem: Marshfang Slicer Blade -(18285,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Ango'rosh Brute, NPC 18119 --- --------------------------------------------------- -(18119,21877,10,1,0,1,3), -- Netherweave Cloth -(18119,27854,1.2,1,0,1,1), -- Smoked Talbuk Venison -(18119,28399,0.6,1,0,1,1), -- Filtered Draenic Water -(18119,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Ango'rosh Mauler, NPC 18120 --- --------------------------------------------------- -(18120,24240,-50,1,0,1,1), -- QItem: Box of Mushrooms -(18120,21877,70,1,0,1,3), -- Netherweave Cloth -(18120,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18120,28399,3,1,0,1,1), -- Filtered Draenic Water -(18120,13446,2,1,0,1,1), -- Major Healing Potion -(18120,13444,1,1,0,1,1), -- Major Mana Potion -(18120,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(18120,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Ango'rosh Ogre, NPC 18117 --- --------------------------------------------------- -(18117,24238,-50,1,0,1,1), -- QItem: Mushroom Sample -(18117,21877,62,1,0,1,3), -- Netherweave Cloth -(18117,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18117,28399,3,1,0,1,1), -- Filtered Draenic Water -(18117,13446,2,1,0,1,1), -- Major Healing Potion -(18117,13444,1,1,0,1,1), -- Major Mana Potion -(18117,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(18117,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Ango'rosh Sentry, NPC 20443 --- --------------------------------------------------- -(20443,24238,-50,1,0,1,1), -- QItem: Mushroom Sample -(20443,21877,44,1,0,1,3), -- Netherweave Cloth -(20443,27854,4,1,0,1,1), -- Smoked Talbuk Venison -(20443,28399,2,1,0,1,1), -- Filtered Draenic Water -(20443,13446,1.5,1,0,1,1), -- Major Healing Potion -(20443,13444,0.75,1,0,1,1), -- Major Mana Potion -(20443,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Ango'rosh Shadowmage, NPC 20444 --- --------------------------------------------------- -(20444,24240,-40,1,0,1,1), -- QItem: Box of Mushrooms -(20444,21877,70,1,0,1,3), -- Netherweave Cloth -(20444,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(20444,28399,3,1,0,1,1), -- Filtered Draenic Water -(20444,13446,2,1,0,1,1), -- Major Healing Potion -(20444,13444,1,1,0,1,1), -- Major Mana Potion -(20444,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Ango'rosh Shaman, NPC 18118 --- --------------------------------------------------- -(18118,24238,-45,1,0,1,1), -- QItem: Mushroom Sample -(18118,21877,60,1,0,1,3), -- Netherweave Cloth -(18118,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18118,28399,3,1,0,1,1), -- Filtered Draenic Water -(18118,13446,2,1,0,1,1), -- Major Healing Potion -(18118,13444,1,1,0,1,1), -- Major Mana Potion -(18118,2,2,1,0,-6003,1), -- Scroll of * VI Reference -(18118,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Ango'rosh Souleater, NPC 18121 --- --------------------------------------------------- -(18121,24240,-35,1,0,1,1), -- QItem: Box of Mushrooms -(18121,21877,70,1,0,1,3), -- Netherweave Cloth -(18121,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18121,28399,3,1,0,1,1), -- Filtered Draenic Water -(18121,13446,2,1,0,1,1), -- Major Healing Potion -(18121,13444,1,1,0,1,1), -- Major Mana Potion -(18121,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(18121,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Ango'rosh Warlock, NPC 19732 --- --------------------------------------------------- -(19732,21877,82,1,0,1,3), -- Netherweave Cloth -(19732,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(19732,28399,4,1,0,1,1), -- Filtered Draenic Water -(19732,13446,3,1,0,1,1), -- Major Healing Potion -(19732,13444,1.5,1,0,1,1), -- Major Mana Potion -(19732,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Blacksting, NPC 18283 --- --------------------------------------------------- -(18283,25448,-100,1,0,1,1), -- QItem: Blacksting's Stinger -(18283,25434,80,1,1,1,1), -- Fractured Carapace -(18283,25436,18,1,1,1,1), -- Twitching Leg -(18283,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing -(18283,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Bloodscale Elemental, NPC 20792 --- --------------------------------------------------- -(20792,24507,81,1,1,1,1), -- Elemental Shard -(20792,24510,19,1,1,1,1), -- Primordial Core -(20792,22578,19,1,0,1,2), -- Mote of Water -(20792,7080,1,1,0,1,2), -- Essence of Water -(20792,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Bloodscale Enchantress, NPC 18088 --- --------------------------------------------------- -(18088,24401,35,1,0,1,1), -- Unidentified Plant Parts -(18088,17057,33,1,0,1,1), -- Shiny Fish Scales -(18088,17058,30,1,0,1,1), -- Fish Oil -(18088,24476,19,1,0,1,1), -- Jaggal Clam -(18088,24280,-10,1,0,1,1), -- QItem: Naga Claws -(18088,24330,-1,1,0,1,1), -- QItem: Drain Schematics -(18088,27858,4,1,0,1,3), -- Sunspring Carp -(18088,28399,2,1,0,1,1), -- Filtered Draenic Water -(18088,13446,1.5,1,0,1,1), -- Major Healing Potion -(18088,13444,0.75,1,0,1,1), -- Major Mana Potion -(18088,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(18088,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Bloodscale Overseer, NPC 20088 --- --------------------------------------------------- -(20088,24280,-80,1,0,1,1), -- QItem: Naga Claws -(20088,24401,30,1,0,1,1), -- Unidentified Plant Parts -(20088,17057,25,1,0,1,1), -- Shiny Fish Scales -(20088,17058,20,1,0,1,1), -- Fish Oil -(20088,24476,15,1,0,1,1), -- Jaggal Clam -(20088,24330,-2,1,0,1,1), -- QItem: Drain Schematics -(20088,27858,4,1,0,1,3), -- Sunspring Carp -(20088,28399,2,1,0,1,1), -- Filtered Draenic Water -(20088,13446,1,1,0,1,1), -- Major Healing Potion -(20088,13444,0.5,1,0,1,1), -- Major Mana Potion -(20088,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(20088,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Bloodscale Sentry, NPC 20090 --- --------------------------------------------------- -(20090,24507,68,1,1,1,1), -- Elemental Shard -(20090,24510,17,1,1,1,1), -- Primordial Core -(20090,22578,15,1,0,1,2), -- Mote of Water -(20090,7080,1,1,0,1,2), -- Essence of Water -(20090,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Bloodscale Slavedriver, NPC 18089 --- --------------------------------------------------- -(18089,24401,35,1,0,1,1), -- Unidentified Plant Parts -(18089,17057,33,1,0,1,1), -- Shiny Fish Scales -(18089,17058,30,1,0,1,1), -- Fish Oil -(18089,24476,19,1,0,1,1), -- Jaggal Clam -(18089,24280,-5,1,0,1,1), -- QItem: Naga Claws -(18089,24330,-0.5,1,0,1,1), -- QItem: Drain Schematics -(18089,27858,4,1,0,1,3), -- Sunspring Carp -(18089,28399,2,1,0,1,1), -- Filtered Draenic Water -(18089,13446,1.5,1,0,1,1), -- Major Healing Potion -(18089,13444,0.75,1,0,1,1), -- Major Mana Potion -(18089,1,1,1,0,-6003,1), -- Scroll of * VI Reference -(18089,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Bloodscale Wavecaller, NPC 20089 --- --------------------------------------------------- -(20089,24280,-80,1,0,1,1), -- QItem: Naga Claws -(20089,24401,30,1,0,1,1), -- Unidentified Plant Parts -(20089,17057,25,1,0,1,1), -- Shiny Fish Scales -(20089,17058,20,1,0,1,1), -- Fish Oil -(20089,24476,15,1,0,1,1), -- Jaggal Clam -(20089,24330,-2,1,0,1,1), -- QItem: Drain Schematics -(20089,27858,4,1,0,1,3), -- Sunspring Carp -(20089,28399,2,1,0,1,1), -- Filtered Draenic Water -(20089,13446,1,1,0,1,1), -- Major Healing Potion -(20089,13444,0.5,1,0,1,1), -- Major Mana Potion -(20089,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(20089,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Bloodthirsty Marshfang, NPC 20196 --- --------------------------------------------------- -(20196,28058,81,1,1,1,1), -- Shredded Wyrm Wing -(20196,28059,19,1,1,1,1), -- Iridescent Eye -(20196,22578,19,1,0,1,1), -- Mote of Water -(20196,7080,1,1,0,1,1), -- Essence of Water -(20196,1,95,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Bog Lord, NPC 18127 --- --------------------------------------------------- -(18127,25450,82,1,0,1,1), -- Creeping Moss -(18127,25452,18,1,1,1,1), -- Blighted Fungus -(18127,24291,-35,1,0,1,1), -- QItem: Bog Lord Tendril -(18127,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18127,22575,19,1,0,1,1), -- Mote of Life -(18127,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Bog Lurker, NPC 18682 --- --------------------------------------------------- -(18682,31247,0,1,1,1,1), -- Bog Pauldrons -(18682,31248,0,1,1,1,1), -- Bog Epaulets -(18682,31249,0,1,1,1,1), -- Bog Spaulders -(18682,31250,0,1,1,1,1), -- Bog Mantle -(18682,25456,80,1,2,1,1), -- Glowing Spores -(18682,25454,20,1,2,1,1), -- Luminescent Globe --- --------------------------------------------------- --- Bogflare Needler, NPC 20197 --- --------------------------------------------------- -(20197,25434,81,1,1,1,1), -- Fractured Carapace -(20197,25436,19,1,1,1,1), -- Twitching Leg -(20197,24372,-2,1,0,1,1), -- QItem: Diaphanous Wing -(20197,29960,0.05,1,0,1,1), -- Captured Firefly -(20197,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Boglash, NPC 18281 --- --------------------------------------------------- -(18281,25434,80,1,1,1,1), -- Fractured Carapace -(18281,25436,18,1,1,1,1), -- Twitching Leg -(18281,27676,50,1,0,1,1), -- Strange Spores -(18281,24449,-35,1,0,1,1), -- QItem: Fertile Spores -(18281,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Bogstrok Clacker, NPC 20293 --- --------------------------------------------------- -(20293,24401,40,1,0,1,1), -- Unidentified Plant Parts -(20293,17057,33,1,0,1,1), -- Shiny Fish Scales -(20293,17058,30,1,0,1,1), -- Fish Oil -(20293,24476,20,1,0,1,1), -- Jaggal Clam -(20293,27858,4,1,0,1,3), -- Sunspring Carp -(20293,28399,2,1,0,1,1), -- Filtered Draenic Water -(20293,13446,1.5,1,0,1,1), -- Major Healing Potion -(20293,13444,0.75,1,0,1,1), -- Major Mana Potion -(20293,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Bogstrok Crusher, NPC 20295 --- --------------------------------------------------- -(20295,24401,40,1,0,1,1), -- Unidentified Plant Parts -(20295,17057,33,1,0,1,1), -- Shiny Fish Scales -(20295,17058,30,1,0,1,1), -- Fish Oil -(20295,24476,20,1,0,1,1), -- Jaggal Clam -(20295,27858,4,1,0,1,3), -- Sunspring Carp -(20295,28399,2,1,0,1,1), -- Filtered Draenic Water -(20295,13446,1.5,1,0,1,1), -- Major Healing Potion -(20295,13444,0.75,1,0,1,1), -- Major Mana Potion -(20295,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Bogstrok Razorclaw, NPC 20294 --- --------------------------------------------------- -(20294,24401,40,1,0,1,1), -- Unidentified Plant Parts -(20294,17057,33,1,0,1,1), -- Shiny Fish Scales -(20294,17058,30,1,0,1,1), -- Fish Oil -(20294,24476,20,1,0,1,1), -- Jaggal Clam -(20294,27858,4,1,0,1,3), -- Sunspring Carp -(20294,28399,2,1,0,1,1), -- Filtered Draenic Water -(20294,13446,1.5,1,0,1,1), -- Major Healing Potion -(20294,13444,0.75,1,0,1,1), -- Major Mana Potion -(20294,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Boss Grog'ak, NPC 18159 --- --------------------------------------------------- -(18159,24472,-100,1,0,1,1), -- QItem: Boss Grog'ak's Head -(18159,24238,-100,1,0,1,1), -- QItem: Mushroom Sample -(18159,21877,45,1,0,1,3), -- Netherweave Cloth -(18159,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18159,28399,3,1,0,1,1), -- Filtered Draenic Water -(18159,13446,2,1,0,1,1), -- Major Healing Potion -(18159,13444,1,1,0,1,1), -- Major Mana Potion -(18159,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Captain Bo'kar, NPC 20442 --- --------------------------------------------------- -(20442,24240,-50,1,0,1,1), -- QItem: Box of Mushrooms -(20442,21877,80,1,0,1,3), -- Netherweave Cloth -(20442,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(20442,28399,3,1,0,1,1), -- Filtered Draenic Water -(20442,13446,2,1,0,1,1), -- Major Healing Potion -(20442,13444,1,1,0,1,1), -- Major Mana Potion -(20442,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Captain Krosh, NPC 18992 --- --------------------------------------------------- -(18992,24240,-5,1,0,1,1), -- QItem: Box of Mushrooms -(18992,21877,25,1,0,1,3), -- Netherweave Cloth -(18992,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18992,28399,3,1,0,1,1), -- Filtered Draenic Water -(18992,13446,2,1,0,1,1), -- Major Healing Potion -(18992,13444,1,1,0,1,1), -- Major Mana Potion -(18992,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Chieftain Mummaki, NPC 19174 --- --------------------------------------------------- -(19174,27943,-100,1,0,1,1), -- QItem: Chieftain Mummaki's Totem -(19174,21877,25,1,0,1,3), -- Netherweave Cloth -(19174,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(19174,28399,3,1,0,1,1), -- Filtered Draenic Water -(19174,13446,2,1,0,1,1), -- Major Healing Potion -(19174,13444,1,1,0,1,1), -- Major Mana Potion -(19174,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Coilfang Emissary, NPC 18681 --- --------------------------------------------------- -(18681,31242,0,1,1,1,1), -- Nagascale Legplates -(18681,31243,0,1,1,1,1), -- Nagascale Legguard -(18681,31244,0,1,1,1,1), -- Nagahide Pants -(18681,31245,0,1,1,1,1), -- Nagahide Leggings -(18681,17057,40,1,0,1,2), -- Shiny Fish Scales -(18681,21877,40,1,0,1,3), -- Netherweave Cloth -(18681,17058,25,1,0,1,1), -- Fish Oil --- --------------------------------------------------- --- Daggerfen Assassin, NPC 18116 --- --------------------------------------------------- -(18116,21877,75,1,0,1,3), -- Netherweave Cloth -(18116,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(18116,28399,4,1,0,1,1), -- Filtered Draenic Water -(18116,13446,2,1,0,1,1), -- Major Healing Potion -(18116,13444,1,1,0,1,1), -- Major Mana Potion -(18116,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Daggerfen Muckdweller, NPC 18115 --- --------------------------------------------------- -(18115,21877,75,1,0,1,3), -- Netherweave Cloth -(18115,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(18115,28399,4,1,0,1,1), -- Filtered Draenic Water -(18115,13446,2,1,0,1,1), -- Major Healing Potion -(18115,13444,1,1,0,1,1), -- Major Mana Potion -(18115,1,80,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Daggerfen Servant, NPC 19733 --- --------------------------------------------------- -(19733,17057,33,1,0,1,1), -- Shiny Fish Scales -(19733,17058,30,1,0,1,1), -- Fish Oil -(19733,24476,20,1,0,1,1), -- Jaggal Clam -(19733,27858,4,1,0,1,3), -- Sunspring Carp -(19733,28399,2,1,0,1,1), -- Filtered Draenic Water -(19733,13446,1.5,1,0,1,1), -- Major Healing Potion -(19733,13444,0.75,1,0,1,1), -- Major Mana Potion -(19733,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Darkcrest Sentry, NPC 20079 --- --------------------------------------------------- -(20079,24507,70,1,1,1,1), -- Elemental Shard -(20079,24510,15,1,1,1,1), -- Primordial Core -(20079,22578,15,1,0,1,2), -- Mote of Water -(20079,7080,1,1,0,1,2), -- Essence of Water -(20079,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Darkcrest Siren, NPC 18087 --- --------------------------------------------------- -(18087,24280,-80,1,0,1,1), -- QItem: Naga Claws -(18087,24401,30,1,0,1,1), -- Unidentified Plant Parts -(18087,17057,25,1,0,1,1), -- Shiny Fish Scales -(18087,17058,20,1,0,1,1), -- Fish Oil -(18087,24476,15,1,0,1,1), -- Jaggal Clam -(18087,27858,3,1,0,1,3), -- Sunspring Carp -(18087,28399,1.5,1,0,1,1), -- Filtered Draenic Water -(18087,13446,1,1,0,1,1), -- Major Healing Potion -(18087,13444,0.5,1,0,1,1), -- Major Mana Potion -(18087,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Darkcrest Slaver, NPC 19946 --- --------------------------------------------------- -(19946,24280,-95,1,0,1,1), -- QItem: Naga Claws -(19946,24401,30,1,0,1,1), -- Unidentified Plant Parts -(19946,17057,25,1,0,1,1), -- Shiny Fish Scales -(19946,17058,20,1,0,1,1), -- Fish Oil -(19946,24476,15,1,0,1,1), -- Jaggal Clam -(19946,27858,3,1,0,1,3), -- Sunspring Carp -(19946,28399,1.5,1,0,1,1), -- Filtered Draenic Water -(19946,13446,1,1,0,1,1), -- Major Healing Potion -(19946,13444,0.5,1,0,1,1), -- Major Mana Potion -(19946,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(19946,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Darkcrest Sorceress, NPC 19947 --- --------------------------------------------------- -(19947,24280,-95,1,0,1,1), -- QItem: Naga Claws -(19947,24401,30,1,0,1,1), -- Unidentified Plant Parts -(19947,17057,25,1,0,1,1), -- Shiny Fish Scales -(19947,17058,20,1,0,1,1), -- Fish Oil -(19947,24476,15,1,0,1,1), -- Jaggal Clam -(19947,27858,3,1,0,1,3), -- Sunspring Carp -(19947,28399,1.5,1,0,1,1), -- Filtered Draenic Water -(19947,13446,1,1,0,1,1), -- Major Healing Potion -(19947,13444,0.5,1,0,1,1), -- Major Mana Potion -(19947,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(19947,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Darkcrest Taskmaster, NPC 18086 --- --------------------------------------------------- -(18086,24280,-80,1,0,1,1), -- QItem: Naga Claws -(18086,24401,30,1,0,1,1), -- Unidentified Plant Parts -(18086,17057,25,1,0,1,1), -- Shiny Fish Scales -(18086,17058,20,1,0,1,1), -- Fish Oil -(18086,24476,15,1,0,1,1), -- Jaggal Clam -(18086,27858,3,1,0,1,3), -- Sunspring Carp -(18086,28399,1.5,1,0,1,1), -- Filtered Draenic Water -(18086,13446,1,1,0,1,1), -- Major Healing Potion -(18086,13444,0.5,1,0,1,1), -- Major Mana Potion -(18086,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(18086,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Dreghood Drudge, NPC 18122 --- --------------------------------------------------- -(18122,21877,60,1,0,1,3), -- Netherweave Cloth -(18122,24401,35,1,0,1,1), -- Unidentified Plant Parts -(18122,27854,3,1,0,1,1), -- Smoked Talbuk Venison -(18122,28399,1.5,1,0,1,1), -- Filtered Draenic Water -(18122,13446,1,1,0,1,1), -- Major Healing Potion -(18122,13444,0.5,1,0,1,1), -- Major Mana Potion -(18122,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Fen Strider, NPC 18134 --- --------------------------------------------------- -(18134,25434,81,1,1,1,1), -- Fractured Carapace -(18134,25436,19,1,1,1,1), -- Twitching Leg -(18134,27676,50,1,0,1,1), -- Strange Spores -(18134,24449,-35,1,0,1,1), -- QItem: Fertile Spores -(18134,24427,20,1,0,1,1), -- QItem: Fen Strider Tentacle -(18134,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Fenclaw Thrasher, NPC 18214 --- --------------------------------------------------- -(18214,25429,81,1,1,1,1), -- Grime-Encrusted Scale -(18214,25431,19,1,1,1,1), -- Ripped Fin -(18214,24486,-50,1,0,1,1), -- QItem: Fenclaw Hide -(18214,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18214,24476,15,1,0,1,1), -- Jaggal Clam -(18214,24375,-15,1,0,1,1), -- QItem: Thick Hydra Scale -(18214,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Fenglow Stinger, NPC 20198 --- --------------------------------------------------- -(20198,25434,80,1,1,1,1), -- Fractured Carapace -(20198,25436,20,1,1,1,1), -- Twitching Leg -(20198,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing -(20198,24401,25,1,0,1,1), -- Unidentified Plant Parts -(20198,24485,-30,1,0,1,1), -- QItem: Marshlight Bleeder Venom -(20198,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Feralfen Druid, NPC 20270 --- --------------------------------------------------- -(20270,24497,-25,1,0,1,1), -- QItem: Feralfen Protection Totem -(20270,21877,60,1,0,1,3), -- Netherweave Cloth -(20270,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(20270,28399,3,1,0,1,1), -- Filtered Draenic Water -(20270,13446,2,1,0,1,1), -- Major Healing Potion -(20270,13444,1,1,0,1,1), -- Major Mana Potion -(20270,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) -(20270,2,2,1,0,-6003,1), -- Scroll of * VI Reference --- --------------------------------------------------- --- Feralfen Hunter, NPC 18113 --- --------------------------------------------------- -(18113,24497,-10,1,0,1,1), -- QItem: Feralfen Protection Totem -(18113,21877,60,1,0,1,3), -- Netherweave Cloth -(18113,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18113,28399,3,1,0,1,1), -- Filtered Draenic Water -(18113,13446,2,1,0,1,1), -- Major Healing Potion -(18113,13444,1,1,0,1,1), -- Major Mana Potion -(18113,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) -(18113,2,2,1,0,-6003,1), -- Scroll of * VI Reference --- --------------------------------------------------- --- Feralfen Mystic, NPC 18114 --- --------------------------------------------------- -(18114,24497,-40,1,0,1,1), -- QItem: Feralfen Protection Totem -(18114,21877,60,1,0,1,3), -- Netherweave Cloth -(18114,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18114,28399,3,1,0,1,1), -- Filtered Draenic Water -(18114,13446,2,1,0,1,1), -- Major Healing Potion -(18114,13444,1,1,0,1,1), -- Major Mana Potion -(18114,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) -(18114,2,2,1,0,-6003,1), -- Scroll of * VI Reference --- --------------------------------------------------- --- Fungal Giant, NPC 19734 --- --------------------------------------------------- -(19734,25450,81,1,0,1,1), -- Creeping Moss -(19734,25452,19,1,1,1,1), -- Blighted Fungus -(19734,24401,25,1,0,1,1), -- Unidentified Plant Parts -(19734,22575,19,1,0,1,3), -- Mote of Life -(19734,12803,1,1,0,1,1), -- Living Essence -(19734,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Greater Sporebat, NPC 18129 --- --------------------------------------------------- -(18129,25456,81,1,1,1,1), -- Glowing Spores -(18129,25454,19,1,1,1,1), -- Luminescent Globe -(18129,27676,50,1,0,1,1), -- Strange Spores -(18129,24449,-35,1,0,1,1), -- QItem: Fertile Spores -(18129,24401,26,1,0,1,1), -- Unidentified Plant Parts -(18129,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Ironspine Gazer, NPC 19730 --- --------------------------------------------------- -(19730,1701,80,1,1,1,1), -- Curved Basilisk Claw -(19730,11389,17,1,1,1,1), -- Shimmering Basilisk Sking -(19730,29553,2,1,1,1,1), -- Basilisk Guts -(19730,29554,1,1,1,1,1), -- Encrusted Basilisk Skin -(19730,27677,45,1,0,1,1), -- Chunk O'Basilisk -(19730,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Ironspine Threshalisk, NPC 19729 --- --------------------------------------------------- -(19729,1701,80,1,1,1,1), -- Curved Basilisk Claw -(19729,11389,17,1,1,1,1), -- Shimmering Basilisk Sking -(19729,29553,2,1,1,1,1), -- Basilisk Guts -(19729,29554,1,1,1,1,1), -- Encrusted Basilisk Skin -(19729,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Kataru, NPC 18080 --- --------------------------------------------------- -(18080,21877,60,1,0,1,3), -- Netherweave Cloth -(18080,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18080,28399,3,1,0,1,1), -- Filtered Draenic Water -(18080,13446,2,1,0,1,1), -- Major Healing Potion -(18080,13444,1,1,0,1,1), -- Major Mana Potion -(18080,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Lagoon Eel, NPC 20290 --- --------------------------------------------------- -(20290,28058,81,1,1,1,1), -- Shredded Wyrm Wing -(20290,28059,19,1,1,1,1), -- Iridescent Eye -(20290,22578,19,1,0,1,1), -- Mote of Water -(20290,7080,1,1,0,1,1), -- Essence of Water -(20290,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Lagoon Walker, NPC 20291 --- --------------------------------------------------- -(20291,25450,82,1,0,1,1), -- Creeping Moss -(20291,25452,18,1,1,1,1), -- Blighted Fungus -(20291,24401,25,1,0,1,1), -- Unidentified Plant Parts -(20291,22575,19,1,0,1,2), -- Mote of Life -(20291,12803,1.5,1,0,1,2), -- Living Essence -(20291,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Lord Klaq, NPC 18282 --- --------------------------------------------------- -(18282,24401,30,1,0,1,1), -- Unidentified Plant Parts -(18282,17057,30,1,0,1,1), -- Shiny Fish Scales -(18282,17058,25,1,0,1,1), -- Fish Oil -(18282,24476,15,1,0,1,1), -- Jaggal Clam -(18282,27858,4,1,0,1,3), -- Sunspring Carp -(18282,28399,2,1,0,1,1), -- Filtered Draenic Water -(18282,13446,1,1,0,1,1), -- Major Healing Potion -(18282,13444,0.5,1,0,1,1), -- Major Mana Potion -(18282,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Mal'druk the Soulrender, NPC 20445 --- --------------------------------------------------- -(20445,21877,72,1,0,1,3), -- Netherweave Cloth -(20445,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(20445,28399,8,1,0,1,1), -- Filtered Draenic Water -(20445,13446,2,1,0,1,1), -- Major Healing Potion -(20445,13444,1,1,0,1,1), -- Major Mana Potion -(20445,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Marsh Baron Brok, NPC 20292 --- --------------------------------------------------- -(20292,25450,80,1,0,1,1), -- Creeping Moss -(20292,25452,20,1,1,1,1), -- Blighted Fungus -(20292,24401,25,1,0,1,1), -- Unidentified Plant Parts -(20292,22575,19,1,0,1,2), -- Mote of Life -(20292,12803,1,1,0,1,2), -- Living Essence -(20292,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Marsh Dredger, NPC 18137 --- --------------------------------------------------- -(18137,24401,35,1,0,1,1), -- Unidentified Plant Parts -(18137,17057,33,1,0,1,1), -- Shiny Fish Scales -(18137,17058,30,1,0,1,1), -- Fish Oil -(18137,24476,20,1,0,1,1), -- Jaggal Clam -(18137,27858,4,1,0,1,3), -- Sunspring Carp -(18137,28399,2,1,0,1,1), -- Filtered Draenic Water -(18137,13446,1,1,0,1,1), -- Major Healing Potion -(18137,13444,0.5,1,0,1,1), -- Major Mana Potion -(18137,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) -(18137,2,2,1,0,-6003,1), -- Scroll of * VI Reference --- --------------------------------------------------- --- Marsh Lurker, NPC 18136 --- --------------------------------------------------- -(18136,24401,35,1,0,1,1), -- Unidentified Plant Parts -(18136,17057,33,1,0,1,1), -- Shiny Fish Scales -(18136,17058,30,1,0,1,1), -- Fish Oil -(18136,24476,20,1,0,1,1), -- Jaggal Clam -(18136,27858,4,1,0,1,3), -- Sunspring Carp -(18136,28399,2,1,0,1,1), -- Filtered Draenic Water -(18136,13446,1,1,0,1,1), -- Major Healing Potion -(18136,13444,0.5,1,0,1,1), -- Major Mana Potion -(18136,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) -(18136,2,2,1,0,-6003,1), -- Scroll of * VI Reference --- --------------------------------------------------- --- Marsh Walker, NPC 18135 --- --------------------------------------------------- -(18135,25434,81,1,1,1,1), -- Fractured Carapace -(18135,25436,19,1,1,1,1), -- Twitching Leg -(18135,27676,50,1,0,1,1), -- Strange Spores -(18135,24449,-35,1,0,1,1), -- QItem: Fertile Spores -(18135,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Marshfang Ripper, NPC 18130 --- --------------------------------------------------- -(18130,25434,81,1,1,1,1), -- Fractured Carapace -(18130,25436,19,1,1,1,1), -- Twitching Leg -(18130,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18130,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Marshfang Slicer, NPC 18131 --- --------------------------------------------------- -(18131,24493,-100,1,0,1,1), -- QItem: Marshfang Slicer Blade -(18131,25434,81,1,1,1,1), -- Fractured Carapace -(18131,25436,19,1,1,1,1), -- Twitching Leg -(18131,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18131,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Marshlight Bleeder, NPC 18133 --- --------------------------------------------------- -(18133,25434,80,1,1,1,1), -- Fractured Carapace -(18133,25436,20,1,1,1,1), -- Twitching Leg -(18133,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18133,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing -(18133,24485,-30,1,0,1,1), -- QItem: Marshlight Bleeder Venom -(18133,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Marshrock Stomper, NPC 20283 --- --------------------------------------------------- -(20283,1701,80,1,1,1,1), -- Curved Basilisk Claw -(20283,11389,17,1,1,1,1), -- Shimmering Basilisk Sking -(20283,29553,2,1,1,1,1), -- Basilisk Guts -(20283,29554,1,1,1,1,1), -- Encrusted Basilisk Skin -(20283,27677,45,1,0,1,1), -- Chunk O'Basilisk -(20283,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Marshrock Threshalisk, NPC 19706 --- --------------------------------------------------- -(19706,1701,81,1,1,1,1), -- Curved Basilisk Claw -(19706,11389,18,1,1,1,1), -- Shimmering Basilisk Sking -(19706,29553,1,1,1,1,1), -- Basilisk Guts -(19706,27677,50,1,0,1,1), -- Chunk O'Basilisk -(19706,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Marticar, NPC 18680 --- --------------------------------------------------- -(18680,31254,100,1,0,1,1), -- Striderhide Cloak -(18680,25456,80,1,1,2,4), -- Glowing Spores -(18680,25454,20,1,1,2,4), -- Luminescent Glove --- --------------------------------------------------- --- Mire Hydra, NPC 18213 --- --------------------------------------------------- -(18213,25429,81,1,1,1,1), -- Grime-Encrusted Scale -(18213,25431,19,1,1,1,1), -- Ripped Fin -(18213,24375,-100,1,0,1,1), -- QItem: Thick Hydra Scale -(18213,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18213,24476,15,1,0,1,1), -- Jaggal Clam -(18213,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Mragesh, NPC 18286 --- --------------------------------------------------- -(18286,25429,81,1,1,1,1), -- Grime-Encrusted Scale -(18286,25431,19,1,1,1,1), -- Ripped Fin -(18286,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18286,24476,15,1,0,1,1), -- Jaggal Clam -(18286,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Mudfin Frenzy, NPC 18212 --- --------------------------------------------------- -(18212,25429,80,1,1,1,1), -- Grime-Encrusted Scale -(18212,25431,20,1,1,1,1), -- Ripped Fin -(18212,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18212,1,10,1,0,-4000,1), -- Grey lvl 61 Item -(18212,2,10,1,0,-4001,1), -- Grey lvl 64 Item --- --------------------------------------------------- --- Overlord Gorefist, NPC 18160 --- --------------------------------------------------- -(18160,24240,-20,1,0,1,1), -- QItem: Box of Mushrooms -(18160,21877,55,1,0,1,3), -- Netherweave Cloth -(18160,27854,6,1,0,1,1), -- Smoked Talbuk Venison -(18160,28399,3,1,0,1,1), -- Filtered Draenic Water -(18160,13446,2,1,0,1,1), -- Major Healing Potion -(18160,13444,1,1,0,1,1), -- Major Mana Potion -(18160,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Parched Hydra, NPC 20324 --- --------------------------------------------------- -(20324,25429,81,1,1,1,1), -- Grime-Encrusted Scale -(20324,25431,19,1,1,1,1), -- Ripped Fin -(20324,24401,25,1,0,1,1), -- Unidentified Plant Parts -(20324,24375,-100,1,0,1,1), -- QItem: Thick Hydra Scale -(20324,24476,15,1,0,1,1), -- Jaggal Clam -(20324,29480,-15,1,0,1,1), -- QItem: Parched Hydra Sample -(20324,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Ragestone Threshalisk, NPC 20279 --- --------------------------------------------------- -(20279,1701,80,1,1,1,1), -- Curved Basilisk Claw -(20279,11389,17,1,1,1,1), -- Shimmering Basilisk Sking -(20279,29553,2,1,1,1,1), -- Basilisk Guts -(20279,29554,1,1,1,1,1), -- Encrusted Basilisk Skin -(20279,27677,45,1,0,1,1), -- Chunk O'Basilisk -(20279,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Ragestone Trampler, NPC 20280 --- --------------------------------------------------- -(20280,1701,80,1,1,1,1), -- Curved Basilisk Claw -(20280,11389,17,1,1,1,1), -- Shimmering Basilisk Sking -(20280,29553,2,1,1,1,1), -- Basilisk Guts -(20280,29554,1,1,1,1,1), -- Encrusted Basilisk Skin -(20280,27677,45,1,0,1,1), -- Chunk O'Basilisk -(20280,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Rajah Haghazed, NPC 18046 --- --------------------------------------------------- -(18046,24280,-65,1,0,1,1), -- QItem: Naga Claws -(18046,24476,26,1,0,1,1), -- Jaggal Clam -(18046,17057,25,1,0,1,1), -- Shiny Fish Scales -(18046,17058,20,1,0,1,1), -- Fish Oil -(18046,27858,4,1,0,1,3), -- Sunspring Carp -(18046,28399,2,1,0,1,1), -- Filtered Draenic Water -(18046,13446,1,1,0,1,1), -- Major Healing Potion -(18046,13444,0.5,1,0,1,1), -- Major Mana Potion -(18046,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Rajis Fyashe, NPC 18044 --- --------------------------------------------------- -(18044,24280,-65,1,0,1,1), -- QItem: Naga Claws -(18044,24476,26,1,0,1,1), -- Jaggal Clam -(18044,17057,25,1,0,1,1), -- Shiny Fish Scales -(18044,17058,20,1,0,1,1), -- Fish Oil -(18044,27858,4,1,0,1,3), -- Sunspring Carp -(18044,28399,2,1,0,1,1), -- Filtered Draenic Water -(18044,13446,1,1,0,1,1), -- Major Healing Potion -(18044,13444,0.5,1,0,1,1), -- Major Mana Potion -(18044,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Sporebat, NPC 18128 --- --------------------------------------------------- -(18128,25456,80,1,1,1,1), -- Glowing Spores -(18128,25454,20,1,1,1,1), -- Luminescent Globe -(18128,27676,50,1,0,1,1), -- Strange Spores -(18128,24449,-35,1,0,1,1), -- QItem: Fertile Spores -(18128,24401,26,1,0,1,1), -- Unidentified Plant Parts -(18128,24426,-20,1,0,1,1), -- QItem: Sporebat Eye -(18128,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Sporewing, NPC 18280 --- --------------------------------------------------- -(18280,25456,80,1,1,1,1), -- Glowing Spores -(18280,25454,20,1,1,1,1), -- Luminescent Globe -(18280,27676,50,1,0,1,1), -- Strange Spores -(18280,24449,-35,1,0,1,1), -- QItem: Fertile Spores -(18280,24401,26,1,0,1,1), -- Unidentified Plant Parts -(18280,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Ssslith, NPC 18154 --- --------------------------------------------------- -(18154,24476,30,1,0,1,1), -- Jaggal Clam -(18154,17057,25,1,0,1,1), -- Shiny Fish Scales -(18154,17058,20,1,0,1,1), -- Fish Oil -(18154,27858,4,1,0,1,3), -- Sunspring Carp -(18154,28399,2,1,0,1,1), -- Filtered Draenic Water -(18154,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Starving Bog Lord, NPC 19519 --- --------------------------------------------------- -(19519,25450,80,1,0,1,1), -- Creeping Moss -(19519,25452,20,1,1,1,1), -- Blighted Fungus -(19519,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril -(19519,24401,25,1,0,1,1), -- Unidentified Plant Parts -(19519,22575,19,1,0,1,1), -- Mote of Life -(19519,12803,1,1,0,1,1), -- Living Essence -(19519,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Starving Fungal Giant, NPC 18125 --- --------------------------------------------------- -(18125,25450,80,1,0,1,1), -- Creeping Moss -(18125,25452,20,1,1,1,1), -- Blighted Fungus -(18125,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril -(18125,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18125,22575,19,1,0,1,1), -- Mote of Life -(18125,12803,1,1,0,1,1), -- Living Essence -(18125,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot --- --------------------------------------------------- --- Steam Pump Overseer, NPC 18340 --- --------------------------------------------------- -(18340,24280,-45,1,0,1,1), -- QItem: Naga Claws -(18340,24401,35,1,0,1,1), -- Unidentified Plant Parts -(18340,17057,30,1,0,1,1), -- Shiny Fish Scales -(18340,17058,25,1,0,1,1), -- Fish Oil -(18340,24476,15,1,0,1,1), -- Jaggal Clam -(18340,24330,-40,1,0,1,1), -- QItem: Drain Schematics -(18340,27858,4,1,0,1,3), -- Sunspring Carp -(18340,28399,2,1,0,1,1), -- Filtered Draenic Water -(18340,13446,1.5,1,0,1,1), -- Major Healing Potion -(18340,13444,0.75,1,0,1,1), -- Major Mana Potion -(18340,1,2,1,0,-6003,1), -- Scroll of * VI Reference -(18340,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Terrorclaw, NPC 20477 --- --------------------------------------------------- -(20477,17057,34,1,0,1,1), -- Shiny Fish Scales -(20477,24401,34,1,0,1,1), -- Unidentified Plant Parts -(20477,17058,30,1,0,1,1), -- Fish Oil -(20477,24476,20,1,0,1,1), -- Jaggal Clam -(20477,27858,4,1,0,1,3), -- Sunspring Carp -(20477,28399,2,1,0,1,1), -- Filtered Draenic Water -(20477,13446,1.5,1,0,1,1), -- Major Healing Potion -(20477,13444,0.75,1,0,1,1), -- Major Mana Potion -(20477,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) --- --------------------------------------------------- --- Umbrafen Eel, NPC 18138 --- --------------------------------------------------- -(18138,25429,80,1,1,1,1), -- Grime-Encrusted Scale -(18138,25431,20,1,1,1,1), -- Ripped Fin -(18138,24374,-40,1,0,1,1), -- QItem: Eel Filet -(18138,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Umbrafen Oracle, NPC 18077 --- --------------------------------------------------- -(18077,21877,80,1,0,1,3), -- Netherweave Cloth -(18077,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(18077,28399,4,1,0,1,1), -- Filtered Draenic Water -(18077,13446,2,1,0,1,1), -- Major Healing Potion -(18077,13444,1,1,0,1,1), -- Major Mana Potion -(18077,2,2,1,0,-6003,1), -- Scroll of * VI Reference -(18077,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Umbrafen Seer, NPC 18079 --- --------------------------------------------------- -(18079,21877,80,1,0,1,3), -- Netherweave Cloth -(18079,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(18079,28399,4,1,0,1,1), -- Filtered Draenic Water -(18079,13446,2,1,0,1,1), -- Major Healing Potion -(18079,13444,1,1,0,1,1), -- Major Mana Potion -(18079,2,2,1,0,-6003,1), -- Scroll of * VI Reference -(18079,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Umbrafen Witchdoctor, NPC 20115 --- --------------------------------------------------- -(20115,21877,80,1,0,1,3), -- Netherweave Cloth -(20115,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(20115,28399,4,1,0,1,1), -- Filtered Draenic Water -(20115,13446,2,1,0,1,1), -- Major Healing Potion -(20115,13444,1,1,0,1,1), -- Major Mana Potion -(20115,2,2,1,0,-6003,1), -- Scroll of * VI Reference -(20115,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Umbraglow Stinger, NPC 18132 --- --------------------------------------------------- -(18132,25434,80,1,1,1,1), -- Fractured Carapace -(18132,25436,20,1,1,1,1), -- Twitching Leg -(18132,24372,-40,1,0,1,1), -- QItem: Diaphanous Wing -(18132,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Withered Bog Lord, NPC 19402 --- --------------------------------------------------- -(19402,25450,80,1,0,1,1), -- Creeping Moss -(19402,25452,20,1,1,1,1), -- Blighted Fungus -(19402,24291,-30,1,0,1,1), -- QItem: Bog Lord Tendril -(19402,24401,25,1,0,1,1), -- Unidentified Plant Parts -(19402,22575,19,1,0,1,1), -- Mote of Life -(19402,29481,-15,1,0,1,1), -- QItem: Withered Bog Lord Sample -(19402,12803,1,1,0,1,1), -- Living Essence -(19402,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Withered Giant, NPC 18124 --- --------------------------------------------------- -(18124,25450,80,1,0,1,1), -- Creeping Moss -(18124,25452,20,1,1,1,1), -- Blighted Fungus -(18124,24401,25,1,0,1,1), -- Unidentified Plant Parts -(18124,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril -(18124,22575,19,1,0,1,1), -- Mote of Life -(18124,24373,-5,1,0,1,1), -- QItem: Scout Jyoba's Report -(18124,24483,2,1,0,1,1), -- Withered Basidium Ally -(18124,24484,2,1,0,1,1), -- Withered Basidium Horde -(18124,12803,1,1,0,1,1), -- Living Essence -(18124,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Wrekt Slave, NPC 18123 --- --------------------------------------------------- -(18123,21877,75,1,0,1,3), -- Netherweave Cloth -(18123,27854,8,1,0,1,1), -- Smoked Talbuk Venison -(18123,28399,4,1,0,1,1), -- Filtered Draenic Water -(18123,13446,2,1,0,1,1), -- Major Healing Potion -(18123,13444,1,1,0,1,1), -- Major Mana Potion -(18123,2,2,1,0,-6003,1), -- Scroll of * VI Reference -(18123,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) --- --------------------------------------------------- --- Young Sporebat, NPC 20387 --- --------------------------------------------------- -(20387,25456,80,1,1,1,1), -- Glowing Spores -(20387,25454,20,1,1,1,1), -- Luminescent Globe -(20387,27676,50,1,0,1,1), -- Strange Spores -(20387,24401,26,1,0,1,1), -- Unidentified Plant Parts -(20387,1,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot (YES FOR ZM) diff --git a/sql/updates/world/2012_06_02_03_reference_loot_template.sql b/sql/updates/world/2012_06_02_03_reference_loot_template.sql deleted file mode 100644 index c712cbe18bd..00000000000 --- a/sql/updates/world/2012_06_02_03_reference_loot_template.sql +++ /dev/null @@ -1,791 +0,0 @@ -SET @Grey := 1001; -- reference starting value TDB Field -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Grey AND @Grey+53; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- level 52 Grey Items ilvl 57 -(@Grey+51,3951,0,1,1,1,1), -- Twill Vest -(@Grey+51,3976,0,1,1,1,1), -- Smooth Leather Armor -(@Grey+51,3995,0,1,1,1,1), -- Laminated Scale Cloak -(@Grey+51,8081,0,1,1,1,1), -- Light Plate Belt -(@Grey+51,8753,0,1,1,1,1), -- Smooth Leather Helmet -(@Grey+51,9186,0,1,1,1,1), -- Mind-numbing Poison III -(@Grey+51,13821,0,1,1,1,1), -- Bulky Maul -(@Grey+51,13825,0,1,1,1,1), -- Primed Musket --- level 53 Grey Items ilvl 58 -(@Grey+52,3948,0,1,1,1,1), -- Twill Gloves -(@Grey+52,3973,0,1,1,1,1), -- Smooth Leather Gloves -(@Grey+52,3994,0,1,1,1,1), -- Laminated Scale Bracers -(@Grey+52,8080,0,1,1,1,1), -- Light Plate Chestpiece -(@Grey+52,13817,0,1,1,1,1); -- Tapered Greatsword --- -------------------------------------------------------- --- TBC_Greys_References --- -------------------------------------------------------- -SET @GreyTBC := 4000; -- reference starting value TDB Field -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GreyTBC AND @GreyTBC+2; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- level 61 Greys, ilvl 66 (32 items) -(@GreyTBC,24576,0,1,1,1,1), -- Loosely Threaded Belt -(@GreyTBC,24577,0,1,1,1,1), -- Loosely Threaded Boots -(@GreyTBC,24578,0,1,1,1,1), -- Loosely Threaded Bracers -(@GreyTBC,24580,0,1,1,1,1), -- Loosely Threaded Hat -(@GreyTBC,24782,0,1,1,1,1), -- Loosely Threaded Gloves -(@GreyTBC,25338,0,1,1,1,1), -- Loosely Threaded Pants -(@GreyTBC,25339,0,1,1,1,1), -- Loosely Threaded Shoulderpads -(@GreyTBC,25340,0,1,1,1,1), -- Loosely Threaded Vest -(@GreyTBC,25349,0,1,1,1,1), -- Moldy Leather Armor -(@GreyTBC,25350,0,1,1,1,1), -- Moldy Leather Belt -(@GreyTBC,25351,0,1,1,1,1), -- Moldy Leather Boots -(@GreyTBC,25352,0,1,1,1,1), -- Moldy Leather Bracers -(@GreyTBC,25353,0,1,1,1,1), -- Moldy Leather Gloves -(@GreyTBC,25354,0,1,1,1,1), -- Moldy Leather Helmet -(@GreyTBC,25355,0,1,1,1,1), -- Moldy Leather Pants -(@GreyTBC,25356,0,1,1,1,1), -- Moldy Leather Shoulderpads -(@GreyTBC,25365,0,1,1,1,1), -- Eroded Mail Armor -(@GreyTBC,25366,0,1,1,1,1), -- Eroded Mail Belt -(@GreyTBC,25367,0,1,1,1,1), -- Eroded Mail Boots -(@GreyTBC,25368,0,1,1,1,1), -- Eroded Mail Bracers -(@GreyTBC,25369,0,1,1,1,1), -- Eroded Mail Circlet -(@GreyTBC,25370,0,1,1,1,1), -- Eroded Mail Gloves -(@GreyTBC,25371,0,1,1,1,1), -- Eroded Mail Pants -(@GreyTBC,25372,0,1,1,1,1), -- Eroded Mail Shoulderpads -(@GreyTBC,25381,0,1,1,1,1), -- Tarnished Plate Belt -(@GreyTBC,25382,0,1,1,1,1), -- Tarnished Plate Boots -(@GreyTBC,25383,0,1,1,1,1), -- Tarnished Plate Bracers -(@GreyTBC,25384,0,1,1,1,1), -- Tarnished Plate Chestpiece -(@GreyTBC,25385,0,1,1,1,1), -- Tarnished Plate Gloves -(@GreyTBC,25386,0,1,1,1,1), -- Tarnished Plate Helmet -(@GreyTBC,25387,0,1,1,1,1), -- Tarnished Plate Pants -(@GreyTBC,25388,0,1,1,1,1), -- Tarnished Plate Shoulderpads --- level 64 Greys, ilvl 69 (10 items) -(@GreyTBC+1,25397,0,1,1,1,1), -- Eroded Axe -(@GreyTBC+1,25398,0,1,1,1,1), -- Stone Reaper -(@GreyTBC+1,25399,0,1,1,1,1), -- Deteriorating Blade -(@GreyTBC+1,25400,0,1,1,1,1), -- Tarnished Claymore -(@GreyTBC+1,25401,0,1,1,1,1), -- Corroded Mace -(@GreyTBC+1,25402,0,1,1,1,1), -- The Stoppable Force -(@GreyTBC+1,25403,0,1,1,1,1), -- Sharpened Stilleto -(@GreyTBC+1,25404,0,1,1,1,1), -- Dense War Staff -(@GreyTBC+1,25405,0,1,1,1,1), -- Rusted Musket -(@GreyTBC+1,25406,0,1,1,1,1), -- Broken Longbow --- lvl 67 Greys, ilvl 72 (32 items) -(@GreyTBC+2,25341,0,1,1,1,1), -- Dilapidated Cloth Belt -(@GreyTBC+2,25342,0,1,1,1,1), -- Dilapidated Cloth Boots -(@GreyTBC+2,25343,0,1,1,1,1), -- Dilapidated Cloth Bracers -(@GreyTBC+2,25344,0,1,1,1,1), -- Dilapidated Cloth Gloves -(@GreyTBC+2,25345,0,1,1,1,1), -- Dilapidated Cloth Hat -(@GreyTBC+2,25346,0,1,1,1,1), -- Dilapidated Cloth Pants -(@GreyTBC+2,25347,0,1,1,1,1), -- Dilapidated Cloth Shoulderpads -(@GreyTBC+2,25348,0,1,1,1,1), -- Dilapidated Cloth Vest -(@GreyTBC+2,25357,0,1,1,1,1), -- Decaying Leather Armor -(@GreyTBC+2,25358,0,1,1,1,1), -- Decaying Leather Belt -(@GreyTBC+2,25359,0,1,1,1,1), -- Decaying Leather Boots -(@GreyTBC+2,25360,0,1,1,1,1), -- Decaying Leather Bracers -(@GreyTBC+2,25361,0,1,1,1,1), -- Decaying Leather Gloves -(@GreyTBC+2,25362,0,1,1,1,1), -- Decaying Leather Helmet -(@GreyTBC+2,25363,0,1,1,1,1), -- Decaying Leather Pants -(@GreyTBC+2,25364,0,1,1,1,1), -- Decaying Leather Shoulderpads -(@GreyTBC+2,25373,0,1,1,1,1), -- Corroded Mail Armor -(@GreyTBC+2,25374,0,1,1,1,1), -- Corroded Mail Belt -(@GreyTBC+2,25375,0,1,1,1,1), -- Corroded Mail Boots -(@GreyTBC+2,25376,0,1,1,1,1), -- Corroded Mail Bracers -(@GreyTBC+2,25377,0,1,1,1,1), -- Corroded Mail Circlet -(@GreyTBC+2,25378,0,1,1,1,1), -- Corroded Mail Gloves -(@GreyTBC+2,25379,0,1,1,1,1), -- Corroded Mail Pants -(@GreyTBC+2,25380,0,1,1,1,1), -- Corroded Mail Shoulderpads -(@GreyTBC+2,25389,0,1,1,1,1), -- Deteriorating Plate Belt -(@GreyTBC+2,25390,0,1,1,1,1), -- Deteriorating Plate Boots -(@GreyTBC+2,25391,0,1,1,1,1), -- Deteriorating Plate Bracers -(@GreyTBC+2,25392,0,1,1,1,1), -- Deteriorating Plate Chestpiece -(@GreyTBC+2,25393,0,1,1,1,1), -- Deteriorating Plate Gloves -(@GreyTBC+2,25394,0,1,1,1,1), -- Deteriorating Plate Helmet -(@GreyTBC+2,25395,0,1,1,1,1), -- Deteriorating Plate Pants -(@GreyTBC+2,25396,0,1,1,1,1); -- Deteriorating Plate Shoulderpads --- -------------------------------------------------------- --- TBC_Greens_References --- -------------------------------------------------------- -SET @GreenTBC := 4100; -- reference starting value TDB Field -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GreenTBC AND @GreenTBC+13; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- lvl 57 ilvl 81 greens (55 items) TBC -(@GreenTBC,25296,0,1,1,1,1), -- Absorption Dagger -(@GreenTBC,25324,0,1,1,1,1), -- Angerstaff -(@GreenTBC,25058,0,1,1,1,1), -- Anglesite Choker -(@GreenTBC,25240,0,1,1,1,1), -- Azerothian Longbow -(@GreenTBC,28531,0,1,1,1,1), -- Barbed Shrike -(@GreenTBC,24700,0,1,1,1,1), -- Bonechewer Bands -(@GreenTBC,24695,0,1,1,1,1), -- Bonechewer Chestpiece -(@GreenTBC,24693,0,1,1,1,1), -- Bonechewer Pelt-Girdle -(@GreenTBC,24698,0,1,1,1,1), -- Bonechewer Ripleggings -(@GreenTBC,24699,0,1,1,1,1), -- Bonechewer Shoulderguards -(@GreenTBC,24694,0,1,1,1,1), -- Bonechewer Shredboots -(@GreenTBC,24697,0,1,1,1,1), -- Bonechewer Skincloak -(@GreenTBC,24696,0,1,1,1,1), -- Bonechewer Spikegloves -(@GreenTBC,25114,0,1,1,1,1), -- Doomsayer's Mace -(@GreenTBC,25086,0,1,1,1,1), -- Dreamseeker Dandelion -(@GreenTBC,24920,0,1,1,1,1), -- Grimscale Armor -(@GreenTBC,24918,0,1,1,1,1), -- Grimscale Belt -(@GreenTBC,24921,0,1,1,1,1), -- Grimscale Gauntlets -(@GreenTBC,24922,0,1,1,1,1), -- Grimscale Helm -(@GreenTBC,24923,0,1,1,1,1), -- Grimscale Legguards -(@GreenTBC,24924,0,1,1,1,1), -- Grimscale Pauldrons -(@GreenTBC,24919,0,1,1,1,1), -- Grimscale Sabatons -(@GreenTBC,24925,0,1,1,1,1), -- Grimscale Vambraces -(@GreenTBC,25198,0,1,1,1,1), -- Karaborian Battle Axe -(@GreenTBC,25268,0,1,1,1,1), -- Lead-Slug Shotgun -(@GreenTBC,25100,0,1,1,1,1), -- Liege Blade -(@GreenTBC,25212,0,1,1,1,1), -- Lucky Strike Axe -(@GreenTBC,25282,0,1,1,1,1), -- Mahogany Wand -(@GreenTBC,25310,0,1,1,1,1), -- Naaru Lightmace -(@GreenTBC,25072,0,1,1,1,1), -- Northman's Shield -(@GreenTBC,24582,0,1,1,1,1), -- Outlander's Boots -(@GreenTBC,24588,0,1,1,1,1), -- Outlander's Bracers -(@GreenTBC,24585,0,1,1,1,1), -- Outlander's Facewrap -(@GreenTBC,24575,0,1,1,1,1), -- Outlander's Girdle -(@GreenTBC,24584,0,1,1,1,1), -- Outlander's Gloves -(@GreenTBC,24586,0,1,1,1,1), -- Outlander's Leggings -(@GreenTBC,24587,0,1,1,1,1), -- Outlander's Pauldrons -(@GreenTBC,24583,0,1,1,1,1), -- Outlander's Tunic -(@GreenTBC,25170,0,1,1,1,1), -- Rattan Bo Staff -(@GreenTBC,25184,0,1,1,1,1), -- Ravager Claws -(@GreenTBC,25156,0,1,1,1,1), -- Royal Crusader Sword -(@GreenTBC,25044,0,1,1,1,1), -- Rubellite Ring -(@GreenTBC,25128,0,1,1,1,1), -- Shining Mace -(@GreenTBC,25030,0,1,1,1,1), -- Silky Velvet Cloak -(@GreenTBC,25142,0,1,1,1,1), -- Telaari Longblade -(@GreenTBC,25254,0,1,1,1,1), -- Tower Crossbow -(@GreenTBC,24813,0,1,1,1,1), -- Unyielding Bindings -(@GreenTBC,24808,0,1,1,1,1), -- Unyielding Chain Vest -(@GreenTBC,24809,0,1,1,1,1), -- Unyielding Fists -(@GreenTBC,24807,0,1,1,1,1), -- Unyielding Footwraps -(@GreenTBC,24810,0,1,1,1,1), -- Unyielding Helm -(@GreenTBC,24811,0,1,1,1,1), -- Unyielding Leggings -(@GreenTBC,24812,0,1,1,1,1), -- Unyielding Spaulders -(@GreenTBC,24806,0,1,1,1,1), -- Unyielding Waistband -(@GreenTBC,25226,0,1,1,1,1), -- War Scythe --- lvl 58 ilvl 84 greens (55 items) TBC -(@GreenTBC+1,24926,0,1,1,1,1), -- Ango'rosh Belt -(@GreenTBC+1,24928,0,1,1,1,1), -- Ango'rosh Breastplate -(@GreenTBC+1,24929,0,1,1,1,1), -- Ango'rosh Gauntlets -(@GreenTBC+1,24930,0,1,1,1,1), -- Ango'rosh Helm -(@GreenTBC+1,24931,0,1,1,1,1), -- Ango'rosh Legguards -(@GreenTBC+1,24932,0,1,1,1,1), -- Ango'rosh Pauldrons -(@GreenTBC+1,24927,0,1,1,1,1), -- Ango'rosh Sabatons -(@GreenTBC+1,24933,0,1,1,1,1), -- Ango'rosh Vambraces -(@GreenTBC+1,25241,0,1,1,1,1), -- Ashenvale Longbow -(@GreenTBC+1,25045,0,1,1,1,1), -- Azurite Ring -(@GreenTBC+1,25087,0,1,1,1,1), -- Bleeding Eye -(@GreenTBC+1,25325,0,1,1,1,1), -- Brutal Scar-Limb -(@GreenTBC+1,25101,0,1,1,1,1), -- Cross Pommel Dagger -(@GreenTBC+1,25283,0,1,1,1,1), -- Crystallized Ebony Wand -(@GreenTBC+1,25073,0,1,1,1,1), -- Emperor Shield -(@GreenTBC+1,24821,0,1,1,1,1), -- Felstone Bindings -(@GreenTBC+1,24816,0,1,1,1,1), -- Felstone Chain Vest -(@GreenTBC+1,24817,0,1,1,1,1), -- Felstone Gauntlets -(@GreenTBC+1,24815,0,1,1,1,1), -- Felstone Greaves -(@GreenTBC+1,24818,0,1,1,1,1), -- Felstone Helm -(@GreenTBC+1,24819,0,1,1,1,1), -- Felstone Leggings -(@GreenTBC+1,24820,0,1,1,1,1), -- Felstone Spaulders -(@GreenTBC+1,24814,0,1,1,1,1), -- Felstone Waistband -(@GreenTBC+1,25213,0,1,1,1,1), -- Fel-Touched Axe -(@GreenTBC+1,25059,0,1,1,1,1), -- Fire Opal Collar -(@GreenTBC+1,24590,0,1,1,1,1), -- Fireheart Boots -(@GreenTBC+1,24596,0,1,1,1,1), -- Fireheart Bracers -(@GreenTBC+1,24591,0,1,1,1,1), -- Fireheart Chestpiece -(@GreenTBC+1,24589,0,1,1,1,1), -- Fireheart Girdle -(@GreenTBC+1,24592,0,1,1,1,1), -- Fireheart Gloves -(@GreenTBC+1,24594,0,1,1,1,1), -- Fireheart Leggings -(@GreenTBC+1,24595,0,1,1,1,1), -- Fireheart Shoulderpads -(@GreenTBC+1,24593,0,1,1,1,1), -- Fireheart Skullcap -(@GreenTBC+1,25129,0,1,1,1,1), -- Giant's Leg Bone -(@GreenTBC+1,24708,0,1,1,1,1), -- Haal'eshi Bindings -(@GreenTBC+1,24702,0,1,1,1,1), -- Haal'eshi Boots -(@GreenTBC+1,24701,0,1,1,1,1), -- Haal'eshi Cord -(@GreenTBC+1,24704,0,1,1,1,1), -- Haal'eshi Gloves -(@GreenTBC+1,24705,0,1,1,1,1), -- Haal'eshi Hat -(@GreenTBC+1,24703,0,1,1,1,1), -- Haal'eshi Jerkin -(@GreenTBC+1,24706,0,1,1,1,1), -- Haal'eshi Leggings -(@GreenTBC+1,24707,0,1,1,1,1), -- Haal'eshi Pauldrons -(@GreenTBC+1,25199,0,1,1,1,1), -- Knight's War Axe -(@GreenTBC+1,25269,0,1,1,1,1), -- Longbeard Rifle -(@GreenTBC+1,25255,0,1,1,1,1), -- Ram's Head Crossbow -(@GreenTBC+1,25311,0,1,1,1,1), -- Revitalizing Hammer -(@GreenTBC+1,25115,0,1,1,1,1), -- Riversong Mace -(@GreenTBC+1,25157,0,1,1,1,1), -- Serpentlord Claymore -(@GreenTBC+1,25227,0,1,1,1,1), -- Sha'tari Longspear -(@GreenTBC+1,25143,0,1,1,1,1), -- Silver Hand Blade -(@GreenTBC+1,28532,0,1,1,1,1), -- Silver Throwing Knives -(@GreenTBC+1,25031,0,1,1,1,1), -- Silvermoon Royal Cloak -(@GreenTBC+1,25171,0,1,1,1,1), -- Straight Hardwood Staff -(@GreenTBC+1,25185,0,1,1,1,1), -- Thrasher Blades -(@GreenTBC+1,25297,0,1,1,1,1), -- Tuning Knife --- lvl 59 ilvl 87 greens (55 items) TBC -(@GreenTBC+2,25298,0,1,1,1,1), -- Combustion Dagger -(@GreenTBC+2,24934,0,1,1,1,1), -- Darkcrest Belt -(@GreenTBC+2,24941,0,1,1,1,1), -- Darkcrest Bracers -(@GreenTBC+2,24936,0,1,1,1,1), -- Darkcrest Breastplate -(@GreenTBC+2,24937,0,1,1,1,1), -- Darkcrest Gauntlets -(@GreenTBC+2,24938,0,1,1,1,1), -- Darkcrest Helm -(@GreenTBC+2,24939,0,1,1,1,1), -- Darkcrest Legguards -(@GreenTBC+2,24940,0,1,1,1,1), -- Darkcrest Pauldrons -(@GreenTBC+2,24935,0,1,1,1,1), -- Darkcrest Sabatons -(@GreenTBC+2,25312,0,1,1,1,1), -- Glorious Scepter -(@GreenTBC+2,25270,0,1,1,1,1), -- Gnomish Assault Rifle -(@GreenTBC+2,25130,0,1,1,1,1), -- Gronn-Bone Club -(@GreenTBC+2,25228,0,1,1,1,1), -- Halberd Polearm -(@GreenTBC+2,25032,0,1,1,1,1), -- Hellfire Cloak -(@GreenTBC+2,25102,0,1,1,1,1), -- Jaedenis Dagger -(@GreenTBC+2,25200,0,1,1,1,1), -- Jagged Broadaxe -(@GreenTBC+2,25172,0,1,1,1,1), -- Jinbali Warp-Staff -(@GreenTBC+2,25088,0,1,1,1,1), -- Laughing Skull Orb -(@GreenTBC+2,25214,0,1,1,1,1), -- Mok'Nathal Battleaxe -(@GreenTBC+2,24824,0,1,1,1,1), -- Netherstalker Armor -(@GreenTBC+2,24822,0,1,1,1,1), -- Netherstalker Belt -(@GreenTBC+2,24829,0,1,1,1,1), -- Netherstalker Bracer -(@GreenTBC+2,24825,0,1,1,1,1), -- Netherstalker Gloves -(@GreenTBC+2,24823,0,1,1,1,1), -- Netherstalker Greaves -(@GreenTBC+2,24826,0,1,1,1,1), -- Netherstalker Helmet -(@GreenTBC+2,24827,0,1,1,1,1), -- Netherstalker Legguards -(@GreenTBC+2,24828,0,1,1,1,1), -- Netherstalker Mantle -(@GreenTBC+2,25116,0,1,1,1,1), -- Pneumatic War Hammer -(@GreenTBC+2,25326,0,1,1,1,1), -- Primal Lore-Staff -(@GreenTBC+2,25284,0,1,1,1,1), -- Purpleheart Wand -(@GreenTBC+2,25158,0,1,1,1,1), -- Skeletal Broadsword -(@GreenTBC+2,25144,0,1,1,1,1), -- Skettis Curved Blade -(@GreenTBC+2,25046,0,1,1,1,1), -- Spined Ring -(@GreenTBC+2,24601,0,1,1,1,1), -- Starfire Circlet -(@GreenTBC+2,24600,0,1,1,1,1), -- Starfire Gloves -(@GreenTBC+2,24603,0,1,1,1,1), -- Starfire Mantle -(@GreenTBC+2,24598,0,1,1,1,1), -- Starfire Sandals -(@GreenTBC+2,24597,0,1,1,1,1), -- Starfire Sash -(@GreenTBC+2,24602,0,1,1,1,1), -- Starfire Trousers -(@GreenTBC+2,24599,0,1,1,1,1), -- Starfire Vest -(@GreenTBC+2,24604,0,1,1,1,1), -- Starfire Wristwraps -(@GreenTBC+2,25256,0,1,1,1,1), -- Stronghold Crossbow -(@GreenTBC+2,25060,0,1,1,1,1), -- Sunstone Necklace -(@GreenTBC+2,25242,0,1,1,1,1), -- Telaari Longbow -(@GreenTBC+2,25074,0,1,1,1,1), -- Telaari Shield -(@GreenTBC+2,25186,0,1,1,1,1), -- Vampiric Handscythes -(@GreenTBC+2,24716,0,1,1,1,1), -- Vengeance Bands -(@GreenTBC+2,24709,0,1,1,1,1), -- Vengeance Belt -(@GreenTBC+2,24710,0,1,1,1,1), -- Vengeance Boots -(@GreenTBC+2,24711,0,1,1,1,1), -- Vengeance Chestpiece -(@GreenTBC+2,24712,0,1,1,1,1), -- Vengeance Gloves -(@GreenTBC+2,24713,0,1,1,1,1), -- Vengeance Helm -(@GreenTBC+2,24714,0,1,1,1,1), -- Vengeance Legguards -(@GreenTBC+2,24715,0,1,1,1,1), -- Vengeance Pauldrons -(@GreenTBC+2,28533,0,1,1,1,1), -- Wooden Boomerang --- lvl 60 ilvl 90 greens (51 items) TBC -(@GreenTBC+3,24605,0,1,1,1,1), -- Laughing Skull Waistguard -(@GreenTBC+3,24606,0,1,1,1,1), -- Laughing Skull Boot -(@GreenTBC+3,24607,0,1,1,1,1), -- Laughing Skull Tunic -(@GreenTBC+3,24608,0,1,1,1,1), -- Laughing Skull Gloves -(@GreenTBC+3,24609,0,1,1,1,1), -- Laughing Skull Cap -(@GreenTBC+3,24610,0,1,1,1,1), -- Laughing Skull Pants -(@GreenTBC+3,24611,0,1,1,1,1), -- Laughing Skull Shoulderpads -(@GreenTBC+3,24612,0,1,1,1,1), -- Laughing Skull Bracelets -(@GreenTBC+3,24717,0,1,1,1,1), -- Dreghood Belt -(@GreenTBC+3,24718,0,1,1,1,1), -- Dreghood Boots -(@GreenTBC+3,24719,0,1,1,1,1), -- Dreghood Chestpiece -(@GreenTBC+3,24720,0,1,1,1,1), -- Dreghood Gloves -(@GreenTBC+3,24721,0,1,1,1,1), -- Dreghood Cowl -(@GreenTBC+3,24722,0,1,1,1,1), -- Dreghood Trousers -(@GreenTBC+3,24723,0,1,1,1,1), -- Dreghood Pauldrons -(@GreenTBC+3,24724,0,1,1,1,1), -- Dreghood Bands -(@GreenTBC+3,24830,0,1,1,1,1), -- Nexus-Strider Belt -(@GreenTBC+3,24831,0,1,1,1,1), -- Nexus-Strider Greaves -(@GreenTBC+3,24832,0,1,1,1,1), -- Nexus-Strider Breastplate -(@GreenTBC+3,24833,0,1,1,1,1), -- Nexus-Strider Gloves -(@GreenTBC+3,24834,0,1,1,1,1), -- Nexus-Strider Helmet -(@GreenTBC+3,24835,0,1,1,1,1), -- Nexus-Strider Legwraps -(@GreenTBC+3,24836,0,1,1,1,1), -- Nexus-Strider Mantle -(@GreenTBC+3,24837,0,1,1,1,1), -- Nexus-Strider Bracer -(@GreenTBC+3,24942,0,1,1,1,1), -- Bloodscale Belt -(@GreenTBC+3,24943,0,1,1,1,1), -- Bloodscale Sabatons -(@GreenTBC+3,24944,0,1,1,1,1), -- Bloodscale Breastplate -(@GreenTBC+3,24945,0,1,1,1,1), -- Bloodscale Gauntlets -(@GreenTBC+3,24946,0,1,1,1,1), -- Bloodscale Helm -(@GreenTBC+3,24947,0,1,1,1,1), -- Bloodscale Legguards -(@GreenTBC+3,24948,0,1,1,1,1), -- Bloodscale Pauldrons -(@GreenTBC+3,24949,0,1,1,1,1), -- Bloodscale Bracers -(@GreenTBC+3,25033,0,1,1,1,1), -- Scavenger's Cloak -(@GreenTBC+3,25047,0,1,1,1,1), -- Tourmaline Loop -(@GreenTBC+3,25061,0,1,1,1,1), -- Hiddenite Necklace -(@GreenTBC+3,25075,0,1,1,1,1), -- Hardened Steel Shield -(@GreenTBC+3,25089,0,1,1,1,1), -- Supplicant's Rod -(@GreenTBC+3,25103,0,1,1,1,1), -- Nightstalker Dagger -(@GreenTBC+3,25117,0,1,1,1,1), -- Flanged Battle Mace -(@GreenTBC+3,25131,0,1,1,1,1), -- Hateful Bludgeon -(@GreenTBC+3,25187,0,1,1,1,1), -- Shekketh Talons -(@GreenTBC+3,25201,0,1,1,1,1), -- Reaver's Sickle -(@GreenTBC+3,25215,0,1,1,1,1), -- Spiked Battle Axe -(@GreenTBC+3,25229,0,1,1,1,1), -- Partisan Polearm -(@GreenTBC+3,25243,0,1,1,1,1), -- Windtalker Bow -(@GreenTBC+3,25257,0,1,1,1,1), -- Citadel Crossbow -(@GreenTBC+3,25271,0,1,1,1,1), -- Croc-Hunter's Rifle -(@GreenTBC+3,25299,0,1,1,1,1), -- Siphoning Dagger -(@GreenTBC+3,25313,0,1,1,1,1), -- Cold-Iron Scepter -(@GreenTBC+3,25327,0,1,1,1,1), -- Frenzied Staff -(@GreenTBC+3,28534,0,1,1,1,1), -- Fel Tipped Dart --- lvl 61 ilvl 93 greens (55 items) TBC -(@GreenTBC+4,24613,0,1,1,1,1), -- Vindicator Belt -(@GreenTBC+4,24614,0,1,1,1,1), -- Vindicator Boots -(@GreenTBC+4,24615,0,1,1,1,1), -- Vindicator Tunic -(@GreenTBC+4,24616,0,1,1,1,1), -- Vindicator Gloves -(@GreenTBC+4,24617,0,1,1,1,1), -- Vindicator Cap -(@GreenTBC+4,24618,0,1,1,1,1), -- Vindicator Pants -(@GreenTBC+4,24619,0,1,1,1,1), -- Vindicator Shoulderpads -(@GreenTBC+4,24620,0,1,1,1,1), -- Vindicator Bracers -(@GreenTBC+4,24725,0,1,1,1,1), -- Dementia Cord -(@GreenTBC+4,24726,0,1,1,1,1), -- Dementia Boots -(@GreenTBC+4,24727,0,1,1,1,1), -- Dementia Vest -(@GreenTBC+4,24728,0,1,1,1,1), -- Dementia Gloves -(@GreenTBC+4,24729,0,1,1,1,1), -- Dementia Hood -(@GreenTBC+4,24730,0,1,1,1,1), -- Dementia Trousers -(@GreenTBC+4,24731,0,1,1,1,1), -- Dementia Shoulderguards -(@GreenTBC+4,24732,0,1,1,1,1), -- Dementia Armguards -(@GreenTBC+4,24838,0,1,1,1,1), -- Wrathfin Waistband -(@GreenTBC+4,24839,0,1,1,1,1), -- Wrathfin Greaves -(@GreenTBC+4,24840,0,1,1,1,1), -- Wrathfin Armor -(@GreenTBC+4,24841,0,1,1,1,1), -- Wrathfin Gloves -(@GreenTBC+4,24842,0,1,1,1,1), -- Wrathfin Helmet -(@GreenTBC+4,24843,0,1,1,1,1), -- Wrathfin Legguards -(@GreenTBC+4,24844,0,1,1,1,1), -- Wrathfin Mantle -(@GreenTBC+4,24845,0,1,1,1,1), -- Wrathfin Bindings -(@GreenTBC+4,24950,0,1,1,1,1), -- Bogslayer Belt -(@GreenTBC+4,24951,0,1,1,1,1), -- Bogslayer Sabatons -(@GreenTBC+4,24952,0,1,1,1,1), -- Bogslayer Breastplate -(@GreenTBC+4,24953,0,1,1,1,1), -- Bogslayer Gauntlets -(@GreenTBC+4,24954,0,1,1,1,1), -- Bogslayer Helm -(@GreenTBC+4,24955,0,1,1,1,1), -- Bogslayer Legplates -(@GreenTBC+4,24956,0,1,1,1,1), -- Bogslayer Pauldrons -(@GreenTBC+4,24957,0,1,1,1,1), -- Bogslayer Bracers -(@GreenTBC+4,25034,0,1,1,1,1), -- Elementalist Cloak -(@GreenTBC+4,25048,0,1,1,1,1), -- Smoky Quartz Ring -(@GreenTBC+4,25062,0,1,1,1,1), -- Zircon Amulet -(@GreenTBC+4,25076,0,1,1,1,1), -- Screaming Shield -(@GreenTBC+4,25090,0,1,1,1,1), -- Slavehandler Rod -(@GreenTBC+4,25104,0,1,1,1,1), -- Anzac Dagger -(@GreenTBC+4,25118,0,1,1,1,1), -- Battle Star -(@GreenTBC+4,25132,0,1,1,1,1), -- Thrallmar War Hammer -(@GreenTBC+4,25146,0,1,1,1,1), -- Light-Etched Longsword -(@GreenTBC+4,25160,0,1,1,1,1), -- Vengeance Blade -(@GreenTBC+4,25174,0,1,1,1,1), -- Hanbo Staff -(@GreenTBC+4,25188,0,1,1,1,1), -- Spleenripper Claws -(@GreenTBC+4,25202,0,1,1,1,1), -- Kingly Axe -(@GreenTBC+4,25216,0,1,1,1,1), -- Ogre Splitting Axe -(@GreenTBC+4,25230,0,1,1,1,1), -- Voulge Blade -(@GreenTBC+4,25244,0,1,1,1,1), -- Viper Bow -(@GreenTBC+4,25258,0,1,1,1,1), -- Repeater Crossbow -(@GreenTBC+4,25272,0,1,1,1,1), -- PC-54 Shotgun -(@GreenTBC+4,25286,0,1,1,1,1), -- Yew Wand -(@GreenTBC+4,25300,0,1,1,1,1), -- Lightning Dagger -(@GreenTBC+4,25314,0,1,1,1,1), -- Ceremonial Hammer -(@GreenTBC+4,25328,0,1,1,1,1), -- Faerie-Kind Staff -(@GreenTBC+4,28535,0,1,1,1,1), -- Amani Throwing Axe --- lvl 62 ilvl 96 greens (55 items) TBC -(@GreenTBC+5,24621,0,1,1,1,1), -- Slavehandler Belt -(@GreenTBC+5,24622,0,1,1,1,1), -- Slavehandler Footpads -(@GreenTBC+5,24623,0,1,1,1,1), -- Slavehandler Jerkin -(@GreenTBC+5,24624,0,1,1,1,1), -- Slavehandler Handwraps -(@GreenTBC+5,24625,0,1,1,1,1), -- Slavehandler Cap -(@GreenTBC+5,24626,0,1,1,1,1), -- Slavehandler Pants -(@GreenTBC+5,24627,0,1,1,1,1), -- Slavehandler Amice -(@GreenTBC+5,24628,0,1,1,1,1), -- Slavehandler Wristguards -(@GreenTBC+5,24733,0,1,1,1,1), -- Sunroc Waistband -(@GreenTBC+5,24734,0,1,1,1,1), -- Sunroc Boots -(@GreenTBC+5,24735,0,1,1,1,1), -- Sunroc Chestpiece -(@GreenTBC+5,24736,0,1,1,1,1), -- Sunroc Gloves -(@GreenTBC+5,24737,0,1,1,1,1), -- Sunroc Mask -(@GreenTBC+5,24738,0,1,1,1,1), -- Sunroc Pants -(@GreenTBC+5,24739,0,1,1,1,1), -- Sunroc Shoulderguards -(@GreenTBC+5,24740,0,1,1,1,1), -- Sunroc Armguards -(@GreenTBC+5,24846,0,1,1,1,1), -- Fenclaw Waistband -(@GreenTBC+5,24847,0,1,1,1,1), -- Fenclaw Footwraps -(@GreenTBC+5,24848,0,1,1,1,1), -- Fenclaw Armor -(@GreenTBC+5,24849,0,1,1,1,1), -- Fenclaw Fists -(@GreenTBC+5,24850,0,1,1,1,1), -- Fenclaw Helm -(@GreenTBC+5,24851,0,1,1,1,1), -- Fenclaw Legguards -(@GreenTBC+5,24852,0,1,1,1,1), -- Fenclaw Mantle -(@GreenTBC+5,24853,0,1,1,1,1), -- Fenclaw Bindings -(@GreenTBC+5,24958,0,1,1,1,1), -- Khan'aish Girdle -(@GreenTBC+5,24959,0,1,1,1,1), -- Khan'aish Greaves -(@GreenTBC+5,24960,0,1,1,1,1), -- Khan'aish Breastplate -(@GreenTBC+5,24961,0,1,1,1,1), -- Khan'aish Gloves -(@GreenTBC+5,24962,0,1,1,1,1), -- Khan'aish Helmet -(@GreenTBC+5,24963,0,1,1,1,1), -- Khan'aish Legplates -(@GreenTBC+5,24964,0,1,1,1,1), -- Khan'aish Epaulets -(@GreenTBC+5,24965,0,1,1,1,1), -- Khan'aish Bracers -(@GreenTBC+5,25035,0,1,1,1,1), -- Silver-Lined Cloak -(@GreenTBC+5,25049,0,1,1,1,1), -- Scheelite Ring -(@GreenTBC+5,25063,0,1,1,1,1), -- Multi-Colored Beads -(@GreenTBC+5,25077,0,1,1,1,1), -- Modani War-Shield -(@GreenTBC+5,25091,0,1,1,1,1), -- Mistyreed Torch -(@GreenTBC+5,25105,0,1,1,1,1), -- Arachnid Dagger -(@GreenTBC+5,25119,0,1,1,1,1), -- Silvermoon War-Mace -(@GreenTBC+5,25133,0,1,1,1,1), -- Stormwind Maul -(@GreenTBC+5,25147,0,1,1,1,1), -- Skystrider Katana -(@GreenTBC+5,25161,0,1,1,1,1), -- Dragon Wing Blade -(@GreenTBC+5,25175,0,1,1,1,1), -- Demoniac Longstaff -(@GreenTBC+5,25189,0,1,1,1,1), -- Ironspine Point -(@GreenTBC+5,25203,0,1,1,1,1), -- Chipped Woodchopper -(@GreenTBC+5,25217,0,1,1,1,1), -- Sundering Axe -(@GreenTBC+5,25231,0,1,1,1,1), -- Fel-Wrought Halberd -(@GreenTBC+5,25245,0,1,1,1,1), -- Razorsong Bow -(@GreenTBC+5,25259,0,1,1,1,1), -- Collapsible Crossbow -(@GreenTBC+5,25273,0,1,1,1,1), -- Sawed-Off Shotgun -(@GreenTBC+5,25287,0,1,1,1,1), -- Magician's Wand -(@GreenTBC+5,25301,0,1,1,1,1), -- Shattering Dagger -(@GreenTBC+5,25315,0,1,1,1,1), -- Restorative Mace -(@GreenTBC+5,25329,0,1,1,1,1), -- Tranquility Staff -(@GreenTBC+5,28536,0,1,1,1,1), -- Jagged Guillotine --- lvl 63 ilvl 99 greens (55 items) TBC -(@GreenTBC+6,24629,0,1,1,1,1), -- Feralfen Sash -(@GreenTBC+6,24630,0,1,1,1,1), -- Feralfen Sandals -(@GreenTBC+6,24631,0,1,1,1,1), -- Feralfen Jerkin -(@GreenTBC+6,24632,0,1,1,1,1), -- Feralfen Hand -(@GreenTBC+6,24633,0,1,1,1,1), -- Feralfen Hood -(@GreenTBC+6,24634,0,1,1,1,1), -- Feralfen Pants -(@GreenTBC+6,24635,0,1,1,1,1), -- Feralfen Amice -(@GreenTBC+6,24636,0,1,1,1,1), -- Feralfen Cuffs -(@GreenTBC+6,24741,0,1,1,1,1), -- Ranger Belt -(@GreenTBC+6,24742,0,1,1,1,1), -- Ranger Boots -(@GreenTBC+6,24743,0,1,1,1,1), -- Ranger Jerkin -(@GreenTBC+6,24744,0,1,1,1,1), -- Ranger Gloves -(@GreenTBC+6,24745,0,1,1,1,1), -- Ranger Hat -(@GreenTBC+6,24746,0,1,1,1,1), -- Ranger Pants -(@GreenTBC+6,24747,0,1,1,1,1), -- Ranger Pauldrons -(@GreenTBC+6,24748,0,1,1,1,1), -- Ranger Armguards -(@GreenTBC+6,24854,0,1,1,1,1), -- Marshcreeper Belt -(@GreenTBC+6,24855,0,1,1,1,1), -- Marshcreeper Sludgeboots -(@GreenTBC+6,24856,0,1,1,1,1), -- Marshcreeper Fen-Vest -(@GreenTBC+6,24857,0,1,1,1,1), -- Marshcreeper Gloves -(@GreenTBC+6,24858,0,1,1,1,1), -- Marshcreeper Helm -(@GreenTBC+6,24859,0,1,1,1,1), -- Marshcreeper Leggings -(@GreenTBC+6,24860,0,1,1,1,1), -- Marshcreeper Mantle -(@GreenTBC+6,24861,0,1,1,1,1), -- Marshcreeper Bracelets -(@GreenTBC+6,24966,0,1,1,1,1), -- Talonguard Girdle -(@GreenTBC+6,24967,0,1,1,1,1), -- Talonguard Greaves -(@GreenTBC+6,24968,0,1,1,1,1), -- Talonguard Armor -(@GreenTBC+6,24969,0,1,1,1,1), -- Talonguard Gloves -(@GreenTBC+6,24970,0,1,1,1,1), -- Talonguard Helmet -(@GreenTBC+6,24971,0,1,1,1,1), -- Talonguard Legplates -(@GreenTBC+6,24972,0,1,1,1,1), -- Talonguard Epaulets -(@GreenTBC+6,24973,0,1,1,1,1), -- Talonguard Bracers -(@GreenTBC+6,25036,0,1,1,1,1), -- Boulderfist Cloak -(@GreenTBC+6,25050,0,1,1,1,1), -- Moldavite Ring -(@GreenTBC+6,25064,0,1,1,1,1), -- Amethyst Pendant -(@GreenTBC+6,25078,0,1,1,1,1), -- Zangari Shield -(@GreenTBC+6,25092,0,1,1,1,1), -- Consortium Crystal -(@GreenTBC+6,25106,0,1,1,1,1), -- Cobra Shortblade -(@GreenTBC+6,25120,0,1,1,1,1), -- Rockshard Club -(@GreenTBC+6,25134,0,1,1,1,1), -- Highmountain Hammer -(@GreenTBC+6,25148,0,1,1,1,1), -- Bone Collector Sword -(@GreenTBC+6,25162,0,1,1,1,1), -- Darkened Broadsword -(@GreenTBC+6,25176,0,1,1,1,1), -- Taiji Quarterstaff -(@GreenTBC+6,25190,0,1,1,1,1), -- Wight's Claws -(@GreenTBC+6,25204,0,1,1,1,1), -- Colossal War Axe -(@GreenTBC+6,25218,0,1,1,1,1), -- Silver-Edged Axe -(@GreenTBC+6,25232,0,1,1,1,1), -- War Glaive -(@GreenTBC+6,25246,0,1,1,1,1), -- Thalassian Compound Bow -(@GreenTBC+6,25260,0,1,1,1,1), -- Archer's Crossbow -(@GreenTBC+6,25274,0,1,1,1,1), -- Cliffjumper Shotgun -(@GreenTBC+6,25288,0,1,1,1,1), -- Conjurer's Wand -(@GreenTBC+6,25302,0,1,1,1,1), -- Soul-Drain Dagger -(@GreenTBC+6,25316,0,1,1,1,1), -- Spirit-Clad Mace -(@GreenTBC+6,25330,0,1,1,1,1), -- Starshine Staff -(@GreenTBC+6,28537,0,1,1,1,1), -- Wildhammer Throwing Axe --- lvl 67 ilvl 111 greens (55 items) TBC -(@GreenTBC+10,24661,0,1,1,1,1), -- Shadow Council Chain -(@GreenTBC+10,24662,0,1,1,1,1), -- Shadow Council Boots -(@GreenTBC+10,24663,0,1,1,1,1), -- Shadow Council Tunic -(@GreenTBC+10,24664,0,1,1,1,1), -- Shadow Council Gloves -(@GreenTBC+10,24665,0,1,1,1,1), -- Shadow Council Cowl -(@GreenTBC+10,24666,0,1,1,1,1), -- Shadow Council Pants -(@GreenTBC+10,24667,0,1,1,1,1), -- Shadow Council Mantle -(@GreenTBC+10,24668,0,1,1,1,1), -- Shadow Council Bracer -(@GreenTBC+10,24773,0,1,1,1,1), -- Boneshredder Belt -(@GreenTBC+10,24774,0,1,1,1,1), -- Boneshredder Boots -(@GreenTBC+10,24775,0,1,1,1,1), -- Boneshredder Jerkin -(@GreenTBC+10,24776,0,1,1,1,1), -- Boneshredder Gloves -(@GreenTBC+10,24777,0,1,1,1,1), -- Boneshredder Skullcap -(@GreenTBC+10,24778,0,1,1,1,1), -- Boneshredder Britches -(@GreenTBC+10,24779,0,1,1,1,1), -- Boneshredder Shoulderguards -(@GreenTBC+10,24780,0,1,1,1,1), -- Boneshredder Wristguards -(@GreenTBC+10,24886,0,1,1,1,1), -- Skettis Belt -(@GreenTBC+10,24887,0,1,1,1,1), -- Skettis Footwraps -(@GreenTBC+10,24888,0,1,1,1,1), -- Skettis Chestpiece -(@GreenTBC+10,24889,0,1,1,1,1), -- Skettis Gauntlets -(@GreenTBC+10,24890,0,1,1,1,1), -- Skettis Helmet -(@GreenTBC+10,24891,0,1,1,1,1), -- Skettis Legguards -(@GreenTBC+10,24892,0,1,1,1,1), -- Skettis Spaulders -(@GreenTBC+10,24893,0,1,1,1,1), -- Skettis Bracer -(@GreenTBC+10,24998,0,1,1,1,1), -- Bloodfist Girdle -(@GreenTBC+10,24999,0,1,1,1,1), -- Bloodfist Greaves -(@GreenTBC+10,25000,0,1,1,1,1), -- Bloodfist Breastplate -(@GreenTBC+10,25001,0,1,1,1,1), -- Bloodfist Gloves -(@GreenTBC+10,25002,0,1,1,1,1), -- Bloodfist Helmet -(@GreenTBC+10,25003,0,1,1,1,1), -- Bloodfist Legplates -(@GreenTBC+10,25004,0,1,1,1,1), -- Bloodfist Epaulets -(@GreenTBC+10,25005,0,1,1,1,1), -- Bloodfist Vambraces -(@GreenTBC+10,25040,0,1,1,1,1), -- Murkblood Cape -(@GreenTBC+10,25054,0,1,1,1,1), -- Sodalite Band -(@GreenTBC+10,25068,0,1,1,1,1), -- Kunzite Necklace -(@GreenTBC+10,25082,0,1,1,1,1), -- Fel-Iron Shield -(@GreenTBC+10,25096,0,1,1,1,1), -- Elementalist Star -(@GreenTBC+10,25110,0,1,1,1,1), -- Sharp Bowie Knife -(@GreenTBC+10,25124,0,1,1,1,1), -- Footman Mace -(@GreenTBC+10,25138,0,1,1,1,1), -- Blood Knight Maul -(@GreenTBC+10,25152,0,1,1,1,1), -- Howling Sword -(@GreenTBC+10,25166,0,1,1,1,1), -- Mok'Nathal Warblade -(@GreenTBC+10,25180,0,1,1,1,1), -- Calenda Fighting Stick -(@GreenTBC+10,25194,0,1,1,1,1), -- Serpent's Fangs -(@GreenTBC+10,25208,0,1,1,1,1), -- Bladespire Broadaxe -(@GreenTBC+10,25222,0,1,1,1,1), -- Ceremonial Slayer's Axe -(@GreenTBC+10,25236,0,1,1,1,1), -- Grim Scythe -(@GreenTBC+10,25250,0,1,1,1,1), -- Rocslayer Longbow -(@GreenTBC+10,25264,0,1,1,1,1), -- Pocket Ballista -(@GreenTBC+10,25278,0,1,1,1,1), -- Nesingwary Longrifle -(@GreenTBC+10,25292,0,1,1,1,1), -- Mechano-Wand -(@GreenTBC+10,25306,0,1,1,1,1), -- Permafrost Dagger -(@GreenTBC+10,25320,0,1,1,1,1), -- Queen's Insignia -(@GreenTBC+10,25334,0,1,1,1,1), -- Intimidating Greatstaff -(@GreenTBC+10,28541,0,1,1,1,1), -- Sawshrike -(@GreenTBC+10,30520,0,1,1,1,1), -- Gold-Trimmed Cuffs -(@GreenTBC+10,30986,0,1,1,1,1), -- Bloodforged Guard --- lvl 68 ilvl 114 greens (55 items) TBC -(@GreenTBC+11,25055,0,1,1,1,1), -- Alexandrite Ring -(@GreenTBC+11,25139,0,1,1,1,1), -- Algaz Battle Hammer -(@GreenTBC+11,25209,0,1,1,1,1), -- Amani Tomahawk -(@GreenTBC+11,25041,0,1,1,1,1), -- Ambusher's Cloak -(@GreenTBC+11,25097,0,1,1,1,1), -- Astralaan Orb -(@GreenTBC+11,25265,0,1,1,1,1), -- Barreled Crossbow -(@GreenTBC+11,25008,0,1,1,1,1), -- Conqueror's Breastplate -(@GreenTBC+11,25012,0,1,1,1,1), -- Conqueror's Epaulets -(@GreenTBC+11,25009,0,1,1,1,1), -- Conqueror's Gauntlets -(@GreenTBC+11,25006,0,1,1,1,1), -- Conqueror's Girdle -(@GreenTBC+11,25007,0,1,1,1,1), -- Conqueror's Greaves -(@GreenTBC+11,25010,0,1,1,1,1), -- Conqueror's Helmet -(@GreenTBC+11,25011,0,1,1,1,1), -- Conqueror's Legplates -(@GreenTBC+11,25013,0,1,1,1,1), -- Conqueror's Vambraces -(@GreenTBC+11,25195,0,1,1,1,1), -- Diamond Tipped Claws -(@GreenTBC+11,25321,0,1,1,1,1), -- Divine Hammer -(@GreenTBC+11,25293,0,1,1,1,1), -- Draenethyst Wand -(@GreenTBC+11,24669,0,1,1,1,1), -- Eldr'naan Belt -(@GreenTBC+11,24670,0,1,1,1,1), -- Eldr'naan Boots -(@GreenTBC+11,24676,0,1,1,1,1), -- Eldr'naan Bracelets -(@GreenTBC+11,24672,0,1,1,1,1), -- Eldr'naan Gloves -(@GreenTBC+11,24673,0,1,1,1,1), -- Eldr'naan Hood -(@GreenTBC+11,24671,0,1,1,1,1), -- Eldr'naan Jerkin -(@GreenTBC+11,24674,0,1,1,1,1), -- Eldr'naan Pants -(@GreenTBC+11,24675,0,1,1,1,1), -- Eldr'naan Shoulderpads -(@GreenTBC+11,25069,0,1,1,1,1), -- Epidote Stone Necklace -(@GreenTBC+11,25335,0,1,1,1,1), -- Feral Warp-Staff -(@GreenTBC+11,25153,0,1,1,1,1), -- Gladiator Greatblade -(@GreenTBC+11,28542,0,1,1,1,1), -- Heartseeker Knives -(@GreenTBC+11,25111,0,1,1,1,1), -- Lionhead Dagger -(@GreenTBC+11,24781,0,1,1,1,1), -- Murkblood Belt -(@GreenTBC+11,24783,0,1,1,1,1), -- Murkblood Boots -(@GreenTBC+11,24789,0,1,1,1,1), -- Murkblood Bracers -(@GreenTBC+11,24784,0,1,1,1,1), -- Murkblood Chestpiece -(@GreenTBC+11,24786,0,1,1,1,1), -- Murkblood Cover -(@GreenTBC+11,24785,0,1,1,1,1), -- Murkblood Gloves -(@GreenTBC+11,24787,0,1,1,1,1), -- Murkblood Pants -(@GreenTBC+11,24788,0,1,1,1,1), -- Murkblood Shoulderguards -(@GreenTBC+11,25237,0,1,1,1,1), -- Nether Trident -(@GreenTBC+11,25167,0,1,1,1,1), -- Nethersteel Claymore -(@GreenTBC+11,25251,0,1,1,1,1), -- Orc Flatbow -(@GreenTBC+11,25125,0,1,1,1,1), -- Retro-Spike Club -(@GreenTBC+11,25279,0,1,1,1,1), -- Sen'jin Longrifle -(@GreenTBC+11,25307,0,1,1,1,1), -- Shadow Dagger -(@GreenTBC+11,25083,0,1,1,1,1), -- Smouldering Shield -(@GreenTBC+11,24896,0,1,1,1,1), -- Sundered Chestpiece -(@GreenTBC+11,24895,0,1,1,1,1), -- Sundered Footwraps -(@GreenTBC+11,24897,0,1,1,1,1), -- Sundered Gauntlets -(@GreenTBC+11,24898,0,1,1,1,1), -- Sundered Helmet -(@GreenTBC+11,24899,0,1,1,1,1), -- Sundered Legguards -(@GreenTBC+11,24900,0,1,1,1,1), -- Sundered Spaulders -(@GreenTBC+11,24894,0,1,1,1,1), -- Sundered Waistband -(@GreenTBC+11,25181,0,1,1,1,1), -- Tapered Staff -(@GreenTBC+11,24901,0,1,1,1,1), -- Tortured Bracer -(@GreenTBC+11,25223,0,1,1,1,1), -- Windcaller Hatchet --- lvl 69 ilvl 117 greens (55 items) TBC -(@GreenTBC+12,25056,0,1,1,1,1), -- Almandine Ring -(@GreenTBC+12,25126,0,1,1,1,1), -- Anvilmar Hammer -(@GreenTBC+12,24677,0,1,1,1,1), -- Archmage Belt -(@GreenTBC+12,24684,0,1,1,1,1), -- Archmage Bracelets -(@GreenTBC+12,24680,0,1,1,1,1), -- Archmage Gloves -(@GreenTBC+12,24681,0,1,1,1,1), -- Archmage Headpiece -(@GreenTBC+12,24683,0,1,1,1,1), -- Archmage Mantle -(@GreenTBC+12,24682,0,1,1,1,1), -- Archmage Pants -(@GreenTBC+12,24679,0,1,1,1,1), -- Archmage Robe -(@GreenTBC+12,24678,0,1,1,1,1), -- Archmage Slippers -(@GreenTBC+12,25154,0,1,1,1,1), -- Blood Groove Blade -(@GreenTBC+12,25196,0,1,1,1,1), -- Boneshredder Claws -(@GreenTBC+12,25140,0,1,1,1,1), -- Commanding Mallet -(@GreenTBC+12,25070,0,1,1,1,1), -- Coral Beads -(@GreenTBC+12,25182,0,1,1,1,1), -- Crystal-Etched Warstaff -(@GreenTBC+12,25210,0,1,1,1,1), -- Double-Bladed Axe -(@GreenTBC+12,25294,0,1,1,1,1), -- Dragonscale Wand -(@GreenTBC+12,25252,0,1,1,1,1), -- Dream Catcher Bow -(@GreenTBC+12,28543,0,1,1,1,1), -- Dreghood Throwing Axe -(@GreenTBC+12,24791,0,1,1,1,1), -- Expedition Boots -(@GreenTBC+12,24797,0,1,1,1,1), -- Expedition Bracers -(@GreenTBC+12,24790,0,1,1,1,1), -- Expedition Girdle -(@GreenTBC+12,24793,0,1,1,1,1), -- Expedition Gloves -(@GreenTBC+12,24794,0,1,1,1,1), -- Expedition Hood -(@GreenTBC+12,24795,0,1,1,1,1), -- Expedition Pants -(@GreenTBC+12,24796,0,1,1,1,1), -- Expedition Shoulderguards -(@GreenTBC+12,24792,0,1,1,1,1), -- Expedition Tunic -(@GreenTBC+12,25112,0,1,1,1,1), -- Fel Ripper -(@GreenTBC+12,25280,0,1,1,1,1), -- Game Hunter Musket -(@GreenTBC+12,25238,0,1,1,1,1), -- Hellfire War Spear -(@GreenTBC+12,25322,0,1,1,1,1), -- Lordly Scepter -(@GreenTBC+12,25042,0,1,1,1,1), -- Nether Cloak -(@GreenTBC+12,25168,0,1,1,1,1), -- Sha'tari Longsword -(@GreenTBC+12,25014,0,1,1,1,1), -- Shattered Hand Belt -(@GreenTBC+12,25016,0,1,1,1,1), -- Shattered Hand Breastplate -(@GreenTBC+12,25020,0,1,1,1,1), -- Shattered Hand Epaulets -(@GreenTBC+12,25017,0,1,1,1,1), -- Shattered Hand Gauntlets -(@GreenTBC+12,25018,0,1,1,1,1), -- Shattered Hand Helmet -(@GreenTBC+12,25019,0,1,1,1,1), -- Shattered Hand Legplates -(@GreenTBC+12,25015,0,1,1,1,1), -- Shattered Hand Sabatons -(@GreenTBC+12,25021,0,1,1,1,1), -- Shattered Hand Vambraces -(@GreenTBC+12,25224,0,1,1,1,1), -- Slavemaster Axe -(@GreenTBC+12,25336,0,1,1,1,1), -- Splintering Greatstaff -(@GreenTBC+12,24904,0,1,1,1,1), -- Talhide Chestpiece -(@GreenTBC+12,24906,0,1,1,1,1), -- Talhide Helmet -(@GreenTBC+12,24903,0,1,1,1,1), -- Talhide Lined-Boots -(@GreenTBC+12,24909,0,1,1,1,1), -- Talhide Lined-Bracers -(@GreenTBC+12,24905,0,1,1,1,1), -- Talhide Lined-Gloves -(@GreenTBC+12,24907,0,1,1,1,1), -- Talhide Lined-Leggings -(@GreenTBC+12,24908,0,1,1,1,1), -- Talhide Shoulderguards -(@GreenTBC+12,24902,0,1,1,1,1), -- Talhide Stitched-Belt -(@GreenTBC+12,25308,0,1,1,1,1), -- Thunder Spike -(@GreenTBC+12,25098,0,1,1,1,1), -- Tuurik Torch -(@GreenTBC+12,25266,0,1,1,1,1), -- Well-Balanced Crossbow -(@GreenTBC+12,25084,0,1,1,1,1), -- Zeth'Gor Shield --- lvl 70 ilvl 120 greens (55 items) TBC -(@GreenTBC+13,25057,0,1,1,1,1), -- Amber Band -(@GreenTBC+13,25043,0,1,1,1,1), -- Amber Cape -(@GreenTBC+13,25323,0,1,1,1,1), -- Ascendant's Scepter -(@GreenTBC+13,28544,0,1,1,1,1), -- Assassin's Shuriken -(@GreenTBC+13,25281,0,1,1,1,1), -- Big-Boar Battle Rifle -(@GreenTBC+13,25225,0,1,1,1,1), -- Deepforge Broadaxe -(@GreenTBC+13,25099,0,1,1,1,1), -- Draenei Crystal Rod -(@GreenTBC+13,24805,0,1,1,1,1), -- Dragonhawk Bands -(@GreenTBC+13,24798,0,1,1,1,1), -- Dragonhawk Belt -(@GreenTBC+13,24799,0,1,1,1,1), -- Dragonhawk Boots -(@GreenTBC+13,24801,0,1,1,1,1), -- Dragonhawk Gloves -(@GreenTBC+13,24802,0,1,1,1,1), -- Dragonhawk Hat -(@GreenTBC+13,24803,0,1,1,1,1), -- Dragonhawk Pants -(@GreenTBC+13,24804,0,1,1,1,1), -- Dragonhawk Shoulderguards -(@GreenTBC+13,24800,0,1,1,1,1), -- Dragonhawk Tunic -(@GreenTBC+13,25085,0,1,1,1,1), -- Dragonscale Shield -(@GreenTBC+13,24685,0,1,1,1,1), -- Elementalist Belt -(@GreenTBC+13,24686,0,1,1,1,1), -- Elementalist Boots -(@GreenTBC+13,24692,0,1,1,1,1), -- Elementalist Bracelets -(@GreenTBC+13,24688,0,1,1,1,1), -- Elementalist Gloves -(@GreenTBC+13,24690,0,1,1,1,1), -- Elementalist Leggings -(@GreenTBC+13,24691,0,1,1,1,1), -- Elementalist Mantle -(@GreenTBC+13,24689,0,1,1,1,1), -- Elementalist Skullcap -(@GreenTBC+13,24687,0,1,1,1,1), -- Elementalist Tunic -(@GreenTBC+13,25169,0,1,1,1,1), -- Fel Orc Brute Sword -(@GreenTBC+13,25295,0,1,1,1,1), -- Flawless Wand -(@GreenTBC+13,25141,0,1,1,1,1), -- Halaani Hammer -(@GreenTBC+13,25155,0,1,1,1,1), -- Iron Skull Sword -(@GreenTBC+13,25127,0,1,1,1,1), -- Knight's War Hammer -(@GreenTBC+13,25239,0,1,1,1,1), -- Legend's Glaive -(@GreenTBC+13,24910,0,1,1,1,1), -- Netherstorm Belt -(@GreenTBC+13,24917,0,1,1,1,1), -- Netherstorm Bracer -(@GreenTBC+13,24912,0,1,1,1,1), -- Netherstorm Chestpiece -(@GreenTBC+13,24913,0,1,1,1,1), -- Netherstorm Gauntlets -(@GreenTBC+13,24911,0,1,1,1,1), -- Netherstorm Greaves -(@GreenTBC+13,24914,0,1,1,1,1), -- Netherstorm Helm -(@GreenTBC+13,24915,0,1,1,1,1), -- Netherstorm Legguards -(@GreenTBC+13,24916,0,1,1,1,1), -- Netherstorm Shoulderguards -(@GreenTBC+13,25113,0,1,1,1,1), -- Phantom Dagger -(@GreenTBC+13,25267,0,1,1,1,1), -- Rampant Crossbow -(@GreenTBC+13,25197,0,1,1,1,1), -- Razor Scythes -(@GreenTBC+13,25211,0,1,1,1,1), -- Rockbiter Cutter -(@GreenTBC+13,25337,0,1,1,1,1), -- Swarming Sting-Staff -(@GreenTBC+13,25071,0,1,1,1,1), -- Tanzanite Pendant -(@GreenTBC+13,25183,0,1,1,1,1), -- Voodoo Hex-Staff -(@GreenTBC+13,25024,0,1,1,1,1), -- Warlord's Iron-Breastplate -(@GreenTBC+13,25028,0,1,1,1,1), -- Warlord's Iron-Epaulets -(@GreenTBC+13,25025,0,1,1,1,1), -- Warlord's Iron-Gauntlets -(@GreenTBC+13,25022,0,1,1,1,1), -- Warlord's Iron-Girdle -(@GreenTBC+13,25026,0,1,1,1,1), -- Warlord's Iron-Helm -(@GreenTBC+13,25027,0,1,1,1,1), -- Warlord's Iron-Legplates -(@GreenTBC+13,25029,0,1,1,1,1), -- Warlord's Iron-Vambraces -(@GreenTBC+13,25023,0,1,1,1,1), -- Warlord's Sabatons -(@GreenTBC+13,25309,0,1,1,1,1), -- Warpdagger -(@GreenTBC+13,25253,0,1,1,1,1); -- Windspear Longbow --- -------------------------------------------------------- --- TBC_Blues_References --- -------------------------------------------------------- -SET @BlueTBC := 4200; -- reference starting value TDB Field -DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @BlueTBC AND @BlueTBC+10; -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES --- lvl 60 blues ilvl 85((6 items) -(@BlueTBC,31125,0,1,1,1,1), -- Boots of the Decimator -(@BlueTBC,31126,0,1,1,1,1), -- Gloves of Ferocity -(@BlueTBC,31127,0,1,1,1,1), -- Hauberk of Totemic Rage -(@BlueTBC,31131,0,1,1,1,1), -- Sash of Silent Blades -(@BlueTBC,31133,0,1,1,1,1), -- Leggings of Concentrated Darkness -(@BlueTBC,31134,0,1,1,1,1), -- Blade of Misfortune --- lvl 61 blues ilvl 88 (6 items) -(@BlueTBC+1,31136,0,1,1,1,1), -- Breastplate of Blade Turning -(@BlueTBC+1,31137,0,1,1,1,1), -- Gauntlets of Purification -(@BlueTBC+1,31138,0,1,1,1,1), -- Storm Lord's Girdle -(@BlueTBC+1,31139,0,1,1,1,1), -- Fist of Reckoning -(@BlueTBC+1,31140,0,1,1,1,1), -- Cloak of Entropy -(@BlueTBC+1,31142,0,1,1,1,1), -- Blade of Trapped Knowledge --- lvl 62 blues ilvl 91 (6 items) -(@BlueTBC+2,31143,0,1,1,1,1), -- Shroud of Frenzy -(@BlueTBC+2,31145,0,1,1,1,1), -- Headdress of the Sleeper -(@BlueTBC+2,31147,0,1,1,1,1), -- Pendant of Cunning -(@BlueTBC+2,31148,0,1,1,1,1), -- Demon Hide Spaulders -(@BlueTBC+2,31149,0,1,1,1,1), -- Gloves of Pandemonium -(@BlueTBC+2,31150,0,1,1,1,1), -- Gloves of Piety --- lvl 63 blues ilvl 94 (6 items) -(@BlueTBC+3,31151,0,1,1,1,1), -- Girdle of Siege -(@BlueTBC+3,31152,0,1,1,1,1), -- Girdle of SiegeChestguard of Illumination -(@BlueTBC+3,31153,0,1,1,1,1), -- Girdle of SiegeAxe of the Legion -(@BlueTBC+3,31173,0,1,1,1,1), -- Girdle of SiegeBoots of Savagery -(@BlueTBC+3,31175,0,1,1,1,1), -- Girdle of SiegeBlade Dancer's Wristguards -(@BlueTBC+3,31178,0,1,1,1,1), -- Girdle of SiegeAmulet of Unstable Power --- lvl 64 blues ilvl 97 (6 items) -(@BlueTBC+4,31180,0,1,1,1,1), -- Gauntlets of the Skullsplitter -(@BlueTBC+4,31186,0,1,1,1,1), -- Braxxis' Staff of Slumber -(@BlueTBC+4,31187,0,1,1,1,1), -- Boots of the Pathfinder -(@BlueTBC+4,31190,0,1,1,1,1), -- The Dreamer's Shoulderpads -(@BlueTBC+4,31193,0,1,1,1,1), -- Blade of Unquenched Thirst -(@BlueTBC+4,31196,0,1,1,1,1), -- Amulet of Sanctification --- lvl 65 blues ilvl 100 (6 items) -(@BlueTBC+5,31200,0,1,1,1,1), -- Shield of the Wayward Footman -(@BlueTBC+5,31202,0,1,1,1,1), -- Girdle of Divine Blessing -(@BlueTBC+5,31204,0,1,1,1,1), -- The Gunblade -(@BlueTBC+5,31222,0,1,1,1,1), -- Headdress of Inner Rage -(@BlueTBC+5,31226,0,1,1,1,1), -- Leggings of the Sly -(@BlueTBC+5,31230,0,1,1,1,1), -- Abyss Walker's Boots --- lvl 68 blues ilvl 109 (6 items) -(@BlueTBC+8,31284,0,1,1,1,1), -- Bracers of Recklessness -(@BlueTBC+8,31285,0,1,1,1,1), -- Chestguard of the Talon -(@BlueTBC+8,31286,0,1,1,1,1), -- Breastplate of Rapid Striking -(@BlueTBC+8,31287,0,1,1,1,1), -- Draenei Honor Guard Shield -(@BlueTBC+8,31288,0,1,1,1,1), -- The Master's Treads -(@BlueTBC+8,31289,0,1,1,1,1), -- Staff of Divine Infusion --- lvl 69 blues ilvl 112 (6 items) -(@BlueTBC+9,31291,0,1,1,1,1), -- Crystalforged War Axe -(@BlueTBC+9,31292,0,1,1,1,1), -- Crystal Pulse Shield -(@BlueTBC+9,31293,0,1,1,1,1), -- Girdle of Gale Force -(@BlueTBC+9,31294,0,1,1,1,1), -- Pauldrons of Surging Mana -(@BlueTBC+9,31295,0,1,1,1,1), -- Chestguard of the Dark Stalker -(@BlueTBC+9,31297,0,1,1,1,1), -- Robe of the Crimson Order --- lvl 70 blues ilvl 115 (7 items) -(@BlueTBC+10,31298,0,1,1,1,1), -- Legguards of the Shattered Hand -(@BlueTBC+10,31299,0,1,1,1,1), -- The Oathkeeper -(@BlueTBC+10,31303,0,1,1,1,1), -- Valanos' Longbow -(@BlueTBC+10,31304,0,1,1,1,1), -- The Essence Focuser -(@BlueTBC+10,31305,0,1,1,1,1), -- Ced's Carver -(@BlueTBC+10,31306,0,1,1,1,1), -- Leggings of the Sacred Crest -(@BlueTBC+10,31308,0,1,1,1,1); -- The Bringer of Death diff --git a/sql/updates/world/2012_06_02_03_world_creature_loot_template_hp.sql b/sql/updates/world/2012_06_02_03_world_creature_loot_template_hp.sql new file mode 100644 index 00000000000..cd6015929b1 --- /dev/null +++ b/sql/updates/world/2012_06_02_03_world_creature_loot_template_hp.sql @@ -0,0 +1,1132 @@ +SET @RefDLK := 26043; +SET @HFP := 6000; +SET @HFP1 := @HFP+1; +SET @HFP2 := @HFP+2; +SET @Scrolls := @HFP+3; +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `reference_loot_template` WHERE `entry` IN (@RefDLK,@HFP,@HFP1,@HFP2,@Scrolls); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Generic Lowlevel Ref1 +(@HFP,1,20,1,0,-4000,1), -- Grey level 61 +(@HFP,2,5,1,0,-4001,1), -- Grey level 64 +(@HFP,3,2,1,0,-4100,1), -- Green level 57 +(@HFP,4,2,1,0,-4101,1), -- Green level 58 +(@HFP,5,2,1,0,-4102,1), -- Green level 59 +(@HFP,6,2,1,0,-4103,1), -- Green level 60 +(@HFP,7,2,1,0,-4104,1), -- Green level 61 +(@HFP,8,2,1,0,-4105,1), -- Green level 62 +(@HFP,9,0.5,1,0,-4200,1), -- Blue level 60 +(@HFP,10,0.5,1,0,-4201,1), -- Blue level 61 +(@HFP,11,0.5,1,0,-4202,1), -- Blue level 62 +(@HFP,12,0.5,1,0,-4203,1), -- Blue level 63 +(@HFP,13,0.5,1,0,-4204,1), -- Blue level 64 +(@HFP,4500,0.1,1,0,1,1), -- Traveler's Backpack +(@HFP,3914,0.05,1,0,1,1), -- Journeyman's Backpack +-- Generic Lowlevel Ref2 +(@HFP1,1,20,1,0,-4000,1), -- Grey level 61 +(@HFP1,2,5,1,0,-4001,1), -- Grey level 64 +(@HFP1,3,2,1,0,-4103,1), -- Green level 60 +(@HFP1,4,2,1,0,-4104,1), -- Green level 61 +(@HFP1,5,2,1,0,-4105,1), -- Green level 62 +(@HFP1,6,0.5,1,0,-4200,1), -- Blue level 60 +(@HFP1,7,0.5,1,0,-4201,1), -- Blue level 61 +(@HFP1,8,0.5,1,0,-4202,1), -- Blue level 62 +(@HFP1,9,0.5,1,0,-4203,1), -- Blue level 63 +(@HFP1,10,0.5,1,0,-4204,1), -- Blue level 64 +-- High level Ref +(@HFP2,1,30,1,1,-4002,1), -- Grey level 64 items (ilvl 69) +(@HFP2,2,30,1,1,-4002,1), -- Grey level 67 items (ilvl 72) +(@HFP2,3,2,1,2,-4110,1), -- Green level 67 items (ilvl 111) +(@HFP2,4,2,1,2,-4111,1), -- Green level 68 items (ilvl 114) +(@HFP2,5,2,1,2,-4112,1), -- Green level 69 items (ilvl 117) +(@HFP2,6,0.5,1,3,-4208,1), -- Blue level 68 items (ilvl 115) +(@HFP2,7,0.5,1,3,-4209,1), -- Blue level 69 items (ilvl 115) +(@HFP2,8,0.5,1,3,-4210,1), -- Blue level 70 items (ilvl 115) +-- TBC Scrolls +(@Scrolls,33459,0,1,1,1,1), -- Scroll of Protection VI +(@Scrolls,33457,0,1,1,1,1), -- Scroll of Agility VI +(@Scrolls,33458,0,1,1,1,1), -- Scroll of Intellect VI +(@Scrolls,33460,0,1,1,1,1), -- Scroll of Spirit VI +(@Scrolls,33461,0,1,1,1,1), -- Scroll of Stamina VI +(@Scrolls,33462,0,1,1,1,1), -- Scroll of Strength VI +-- Doom Lord Kazzak +(@RefDLK,30732,0,1,1,1,1), -- Exodar Life-Staff +(@RefDLK,30733,0,1,1,1,1), -- Hope Ender +(@RefDLK,30734,0,1,1,1,1), -- Leggings of the Seventh Circle +(@RefDLK,30735,0,1,1,1,1), -- Ancient Spellcloak of the Highborne +(@RefDLK,30736,0,1,1,1,1), -- Ring of Flowing Light +(@RefDLK,30737,0,1,1,1,1), -- Gold-Leaf Wildboots +(@RefDLK,30738,0,1,1,1,1), -- Ring of Reciprocity +(@RefDLK,30739,0,1,1,1,1), -- Scaled Greaves of the Marksman +(@RefDLK,30740,0,1,1,1,1), -- Ripfiend Shoulderplates +(@RefDLK,30741,0,1,1,1,1); -- Topaz-Studded Battlegrips +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `creature_loot_template` WHERE `entry` IN (18728,187281,19191,16977,19354,17084,17057,16873,16871,19422,16907,19424,19423,16903,16901,19701,16876,16925,18952,16972,16973,17014,16844,19299,16847,16863,18981,16959,19434,16938,16937,19312,22461,19190,18733,24918,18977,17034,19459,19136,19264,16954,18678,18827,16947,16845,19457,16967,16966,22374,18978,16880,17058,22323,19261,17035,17053,16978,16846,16912,16911,19408,17039,16857,18677,19192,16946,16950,16934,19189,19188,16932,16933,20798,19458,16974,19415,16878,16870,19295,16867,19414,19413,19410,19411,16960,16879,16929,16928,16927,19282,19335,19443,16951,19349,19350,16968,26222,26223,16975,20145,16904,16906,16905,19527,16939,18679,19263,19298,16964,19442,24919,18975); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Doom Lord Kazzak, NPC 18728 +-- --------------------------------------------------- +(18728,1,100,1,0,-@RefDLK,2), -- Two from Doom Loor Kazzak Reference +(18728,2,5,1,0,-4113,1), -- Level 70 TBC Green Reference +-- --------------------------------------------------- +-- Arazzius the Cruel, NPC 19191 +-- --------------------------------------------------- +(19191,21877,50,1,0,1,3), -- Netherweave Cloth +(19191,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(19191,28399,5,1,0,1,1), -- Filtered Draenic Water +(19191,13446,1.5,1,0,1,1), -- Major Healing Potion +(19191,13444,1.5,1,0,1,1), -- Major Mana Potion +(19191,1,15,1,0,-4000,1), -- Grey itemlevel 66 (level 61 items) +(19191,2,5,1,0,-4001,1), -- Grey itemlevel 69 (lvl 64 items) +(19191,3,7.5,1,0,-4103,1), -- Green itemlevel 90 +(19191,4,5,1,0,-4104,1), -- Green itemlevel 93 +(19191,5,2.5,1,0,-4105,1), -- Green itemlevel 96 +(19191,6,0.5,1,0,-4201,1), -- Blues level 61 +(19191,7,0.5,1,0,-4202,1), -- Blues level 62 +(19191,8,0.5,1,0,-4203,1), -- Blues level 63 +(19191,9,0.5,1,0,-4204,1), -- Blues level 64 +-- --------------------------------------------------- +-- Arch Mage Xintor, NPC 16977 +-- --------------------------------------------------- +(16977,21877,55,1,0,1,1), -- Netherweave Cloth +(16977,14047,15,1,0,1,3), -- Runecloth +(16977,27859,10,1,0,1,1), -- Zanger Caps +(16977,28399,5,1,0,1,1), -- Filtered Draenic Water +(16977,13446,2,1,0,1,1), -- Major Healing Potion +(16977,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Arzeth the Merciless, NPC 19354 +-- --------------------------------------------------- +(19354,21877,70,1,0,1,1), -- Netherweave Cloth +(19354,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(19354,28399,3,1,0,1,1), -- Filtered Draenic Water +(19354,13446,3,1,0,1,1), -- Major Healing Potion +(19354,13444,1,1,0,1,1), -- Major Healing Potion +(19354,5760,1,1,0,1,1), -- Eternium Lockbox +(19354,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Avruu, NPC 17084 +-- --------------------------------------------------- +(17084,23580,80,1,0,1,1), -- Avruu's Orb +(17084,21877,45,1,0,1,3), -- Netherweave Cloth +(17084,17056,30,1,0,1,1), -- Light Feather +(17084,23483,-10,1,0,1,1), -- QItem: Haal'eshi Scroll +(17084,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(17084,28399,3,1,0,1,1), -- Filtered Draenic Water +(17084,13446,3,1,0,1,1), -- Major Healing Potion +(17084,13444,1,1,0,1,1), -- Major Healing Potion +(17084,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Blacktalon teh Savage, NPC 17057 +-- --------------------------------------------------- +(17057,23687,-100,1,0,1,1), -- QItem: Blacktalon's Claws +(17057,24516,75,1,0,1,1), -- Damaged Rock Flayer Talon +(17057,21877,40,1,0,1,1), -- Netherweave Cloth +(17057,24517,20,1,0,1,1), -- Blood Soaked Tail +(17057,27854,3,1,0,1,1), -- Smoked Talbuk Venison +(17057,28399,2,1,0,1,1), -- Filtered Draenic Water +(17057,13446,1.5,1,0,1,1), -- Major Healing Potion +(17057,13444,0.75,1,0,1,1), -- Major Healing Potion +(17057,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Bleeding Hollow Dark Shaman, NPC 16873 +-- --------------------------------------------------- +(16873,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(16873,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(16873,28399,3,1,0,1,1), -- Filtered Draenic Water +(16873,13446,2,1,0,1,1), -- Major Healing Potion +(16873,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16873,1,2,1,0,-6003,1), -- Scroll of * Reference +(16873,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Grunt, NPC 16871 +-- --------------------------------------------------- +(16871,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(16871,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(16871,28399,3,1,0,1,1), -- Filtered Draenic Water +(16871,13446,2,1,0,1,1), -- Major Healing Potion +(16871,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16871,1,2,1,0,-6003,1), -- Scroll of * Reference +(16871,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Necrolyte, NPC 19422 +-- --------------------------------------------------- +(19422,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(19422,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19422,28399,3,1,0,1,1), -- Filtered Draenic Water +(19422,13446,2,1,0,1,1), -- Major Healing Potion +(19422,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19422,1,2,1,0,-6003,1), -- Scroll of * Reference +(19422,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Peon, NPC 16907 +-- --------------------------------------------------- +(16907,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(16907,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(16907,28399,3,1,0,1,1), -- Filtered Draenic Water +(16907,13446,2,1,0,1,1), -- Major Healing Potion +(16907,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16907,1,2,1,0,-6003,1), -- Scroll of * Reference +(16907,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Tormentor, NPC 19424 +-- --------------------------------------------------- +(19424,30157,-25,1,0,1,1), -- QItem: Cursed Talisman +(19424,30425,-17,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19424,28399,3,1,0,1,1), -- Filtered Draenic Water +(19424,13446,2,1,0,1,1), -- Major Healing Potion +(19424,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19424,1,2,1,0,-6003,1), -- Scroll of * Reference +(19424,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bleeding Hollow Worg, NPC 19423 +-- --------------------------------------------------- +(19423,3299,70,1,0,1,1), -- Fractured Canine +(19423,33547,25,1,0,1,1), -- Hardened Claw +(19423,4583,1,1,0,1,1), -- Thick Furry Mane +(19423,4584,1,1,0,1,1), -- Large Trophy Paw +(19423,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19423,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Blistering Oozeling, NPC 16903 +-- --------------------------------------------------- +(16903,25444,100,1,0,1,1), -- Corrosive Ichor +(16903,23339,-25,1,0,1,1), -- QItem: Arelion's Journal +(16903,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Blistering Rot, NPC 16901 +-- --------------------------------------------------- +(16901,25444,80,1,1,1,1), -- Corrosive Ichor +(16901,25446,20,1,1,1,1), -- Brittle Skull +(16901,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16901,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Evoker, NPC 19701 +-- --------------------------------------------------- +(19701,21877,55,1,0,1,1), -- Netherweave Cloth +(19701,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(19701,14047,20,1,0,1,3), -- Runecloth +(19701,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(19701,28399,3,1,0,1,1), -- Filtered Draenic Water +(19701,13446,3,1,0,1,1), -- Major Healing Potion +(19701,13444,1,1,0,1,1), -- Major Healing Potion +(19701,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19701,1,2,1,0,-6003,1), -- Scroll of * Reference +(19701,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Mutant, NPC 16876 +-- --------------------------------------------------- +(16876,21877,55,1,0,1,1), -- Netherweave Cloth +(16876,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(16876,14047,20,1,0,1,3), -- Runecloth +(16876,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(16876,28399,3,1,0,1,1), -- Filtered Draenic Water +(16876,13446,3,1,0,1,1), -- Major Healing Potion +(16876,13444,1,1,0,1,1), -- Major Healing Potion +(16876,5759,0.2,1,0,1,1), -- Thorium Lockbox +(16876,1,2,1,0,-6003,1), -- Scroll of * Reference +(16876,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Raider, NPC 16925 +-- --------------------------------------------------- +(16925,21877,55,1,0,1,1), -- Netherweave Cloth +(16925,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(16925,14047,20,1,0,1,3), -- Runecloth +(16925,27859,7,1,0,1,1), -- Zanger Caps +(16925,28399,3,1,0,1,1), -- Filtered Draenic Water +(16925,13446,3,1,0,1,1), -- Major Healing Potion +(16925,13444,1,1,0,1,1), -- Major Healing Potion +(16925,5759,0.2,1,0,1,1), -- Thorium Lockbox +(16925,1,2,1,0,-6003,1), -- Scroll of * Reference +(16925,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonechewer Scavenger, NPC 18952 +-- --------------------------------------------------- +(18952,21877,55,1,0,1,1), -- Netherweave Cloth +(18952,30327,-30,1,0,1,1), -- QItem: Bonechewer Blood +(18952,14047,20,1,0,1,3), -- Runecloth +(18952,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(18952,28399,3,1,0,1,1), -- Filtered Draenic Water +(18952,13446,3,1,0,1,1), -- Major Healing Potion +(18952,13444,1,1,0,1,1), -- Major Healing Potion +(18952,5759,0.2,1,0,1,1), -- Thorium Lockbox +(18952,1,2,1,0,-6003,1), -- Scroll of * Reference +(18952,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonestripper Buzzard, NPC 16972 +-- --------------------------------------------------- +(16972,25425,80,1,0,1,1), -- Molted Feather +(16972,27671,50,1,0,1,1), -- Buzzard Meat +(16972,23239,-10,1,0,1,1), -- Plump Buzzard Wing +(16972,17056,30,1,0,1,1), -- Light Feather +(16972,25427,19,1,0,1,1), -- Beaten Talon +(16972,5759,0.2,1,0,1,1), -- Thorium Lockbox +(16972,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Bonestripper Vulture, NPC 16973 +-- --------------------------------------------------- +(16973,25425,80,1,0,1,1), -- Molted Feather +(16973,27671,50,1,0,1,1), -- Buzzard Meat +(16973,23387,-40,1,0,1,1), -- Bonestripper Tail Feather +(16973,25427,19,1,0,1,1), -- Beaten Talon +(16973,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16973,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Collapsing Voidwalker, NPC 17014 +-- --------------------------------------------------- +(17014,29161,-100,1,0,1,3), -- Void Ridge Soul Shard +(17014,22577,20,1,0,1,2), -- Mote of Shadow +(17014,1,50,1,1,-6000,1), -- Generic HellfirePeninsula Loot +(17014,2,50,1,1,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Crust Burster, NPC 16844 +-- --------------------------------------------------- +(16844,25434,80,1,0,1,1), -- Fractured Carapace +(16844,25436,20,1,0,1,1), -- Twitching Leg +(16844,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Deathwhisperer, NPC 19299 +-- --------------------------------------------------- +(19299,21877,10,1,0,2,3), -- Netherweave Cloth +(19299,27854,2,1,0,1,1), -- Smoked Talbuk Venison +(19299,28399,2,1,0,1,1), -- Filtered Draenic Water +(19299,13444,1,1,0,1,1), -- Major Mana Potion +(19299,1,90,1,1,-6000,1), -- Generic HellfirePeninsula Loot +(19299,31902,0.05,1,0,1,1), -- Eight of Furies +(19299,31911,0.05,1,0,1,1), -- Eight of Lunacy +-- --------------------------------------------------- +-- Debilitated Mag'har Grunt, NPC 16847 +-- --------------------------------------------------- +(16847,23589,-50,1,0,1,1), -- QItem: Mag'har Ancestral Beads +(16847,21877,50,1,0,1,1), -- Netherweave Cloth +(16847,14047,15,1,0,1,3), -- Runecloth +(16847,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16847,28399,3,1,0,1,1), -- Filtered Draenic Water +(16847,13446,2,1,0,1,1), -- Major Healing Potion +(16847,13444,1,1,0,1,1), -- Major Healing Potion +(16847,5759,0.15,1,0,1,1), -- Thorium Lockbox +(16847,1,2,1,0,-6003,1), -- Scroll of * Reference +(16847,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Deranged Helboar, NPC 16863 +-- --------------------------------------------------- +(16863,23270,-40,1,0,1,1), -- QItem: Tainted Helboar Meat +(16863,3403,40,1,1,1,1), -- Ivory Boar Tusk +(16863,2295,40,1,1,1,1), -- Large Boar Tusk +(16863,44754,15,1,1,1,1), -- Severed Boar Tusk +(16863,25440,1.5,1,1,1,1), -- Cracked Boar Tusk +(16863,25442,0.5,1,0,1,1), -- Mangled Snout +(16863,1,2,1,0,-6003,1), -- Scroll of * Reference +(16863,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Doomwhisperer, NPC 18981 +-- --------------------------------------------------- +(18981,28513,-50,1,0,1,1), -- QItem: Demonic Rune Stone +(18981,21877,50,1,0,1,1), -- Netherweave Cloth +(18981,14047,15,1,0,1,3), -- Runecloth +(18981,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18981,28399,3,1,0,1,1), -- Filtered Draenic Water +(18981,13446,2,1,0,1,1), -- Major Healing Potion +(18981,13444,1,1,0,1,1), -- Major Healing Potion +(18981,5759,0.15,1,0,1,1), -- Thorium Lockbox +(18981,1,2,1,0,-6003,1), -- Scroll of * Reference +(18981,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Dread Tactician, NPC 16959 +-- --------------------------------------------------- +(16959,21877,13,1,0,1,1), -- Netherweave Cloth +(16959,14047,15,1,0,1,3), -- Runecloth +(16959,27854,2,1,0,1,1), -- Smoked Talbuk Venison +(16959,27860,3,1,0,1,1), -- Purified Draenic Water +(16959,22829,0.5,1,0,1,1), -- Super Healing Potion +(16959,22832,0.25,1,0,1,1), -- Super Mana Potion +(16959,1,80,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Dreadcaller, NPC 19434 +-- --------------------------------------------------- +(19434,21877,60,1,0,1,1), -- Netherweave Cloth +(19434,14047,15,1,0,1,3), -- Runecloth +(19434,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19434,28399,3,1,0,1,1), -- Filtered Draenic Water +(19434,13446,2,1,0,1,1), -- Major Healing Potion +(19434,13444,1,1,0,1,1), -- Major Healing Potion +(19434,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19434,1,2,1,0,-6003,1), -- Scroll of * Reference +(19434,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Dreghood Brute, NPC 16938 +-- --------------------------------------------------- +(16938,21877,70,1,0,1,1), -- Netherweave Cloth +(16938,27854,11,1,0,1,1), -- Mag'har Grainbread +(16938,28399,3,1,0,1,1), -- Filtered Draenic Water +(16938,13446,2,1,0,1,1), -- Major Healing Potion +(16938,13444,1,1,0,1,1), -- Major Healing Potion +(16938,1,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Dreghood Geomancer, NPC 16937 +-- --------------------------------------------------- +(16937,21877,70,1,0,1,1), -- Netherweave Cloth +(16937,27854,11,1,0,1,1), -- Mag'har Grainbread +(16937,28399,3,1,0,1,1), -- Filtered Draenic Water +(16937,13446,2,1,0,1,1), -- Major Healing Potion +(16937,13444,1,1,0,1,1), -- Major Healing Potion +-- --------------------------------------------------- +-- Drillmaster Zurok, NPC 19312 +-- --------------------------------------------------- +(19312,21877,60,1,0,1,1), -- Netherweave Cloth +(19312,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19312,28399,3,1,0,1,1), -- Filtered Draenic Water +(19312,13446,2,1,0,1,1), -- Major Healing Potion +(19312,13444,1,1,0,1,1), -- Major Healing Potion +(19312,5760,0.2,1,0,1,1), -- Eternium Lockbox +(19312,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Fel Canon MKI, NPC 22461 +-- --------------------------------------------------- +(22461,31944,80,1,1,1,1), -- Demonic Capacitor +(22461,31945,20,1,1,1,1), -- Shadow Circuit +-- --------------------------------------------------- +-- Fel Handler, NPC 19190 +-- --------------------------------------------------- +(19190,28513,-50,1,0,1,1), -- QItem: Demonic Rune Stone +(19190,27854,10,1,0,1,1), -- Smoked Talbuk Venison +(19190,28399,5,1,0,1,1), -- Filtered Draenic Water +(19190,13446,3,1,0,1,1), -- Major Healing Potion +(19190,13444,1.5,1,0,1,1), -- Major Mana Potion +(19190,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19190,1,2,1,0,-6003,1), -- Scroll of * Reference +(19190,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Fel Reaver, NPC 18733 +-- --------------------------------------------------- +(18733,1,100,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Felblood Initiate, NPC 24918 +-- --------------------------------------------------- +(24918,21877,75,1,0,1,3), -- Netherweave Cloth +(24918,27857,8,1,0,1,1), -- Garadar Sharp +(24918,27860,5,1,0,1,1), -- Filtered Draenic Water +(24918,22829,3,1,0,1,1), -- Super Healing Potion +(24918,22832,1.5,1,0,1,1), -- Super Healing Potion +(24918,31952,0.2,1,0,1,1), -- Khorium Lockbox +(24918,31888,0.01,1,0,1,1), -- Three of Blessings +(24918,31908,0.01,1,0,1,1), -- Three of Furies +(24918,1,80,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Felguard Destroyer, NPC 18977 +-- --------------------------------------------------- +(18977,21877,40,1,0,1,3), -- Netherweave Cloth +(18977,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(18977,28399,4,1,0,1,1), -- Filtered Draenic Water +(18977,13446,2,1,0,1,1), -- Major Healing Potion +(18977,13444,1,1,0,1,1), -- Major Mana Potion +(18977,5759,0.3,1,0,1,1), -- Thorium Lockbox +(18977,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Female Kaliri Hatchling, NPC 17034 +-- --------------------------------------------------- +(17034,23588,-40,1,0,1,1), -- QItem: Kaliri Feather +(17034,25425,81,1,1,1,1), -- Molted Feather +(17034,25427,19,1,1,1,1), -- Beaten Talon +(17034,5760,0.2,1,0,1,1), -- Eternium Lockbox +(17034,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Feng, NPC 19459 +-- --------------------------------------------------- +(19459,3299,70,1,0,1,1), -- Fractured Canine +(19459,33547,30,1,0,1,1), -- Hardened Claw +(19459,5759,0.3,1,0,1,1), -- Thorium Lockbox +(19459,4583,0.3,1,0,1,1), -- Thick Furry Mane +(19459,4584,0.2,1,0,1,1), -- Large Trophy Paw +(19459,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Flamewalker Imp, NPC 19136 +-- --------------------------------------------------- +(19136,21877,92,1,0,1,1), -- Netherweave Cloth +(19136,22785,0.05,1,0,1,3), -- Felweed +-- --------------------------------------------------- +-- Force-Commander Gorax, NPC 19264 +-- --------------------------------------------------- +(19264,21877,80,1,0,1,3), -- Netherweave Cloth +(19264,27854,10,1,0,1,1), -- Smoked Talbuk Venison +(19264,28399,5,1,0,1,1), -- Filtered Draenic Water +(19264,13446,3,1,0,1,1), -- Major Healing Potion +(19264,13444,1.5,1,0,1,1), -- Major Mana Potion +(19264,5760,0.3,1,0,1,1), -- Eternium Lockbox +(19264,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Forge-Camp Legionnaire, NPC 16954 +-- --------------------------------------------------- +(16954,21877,80,1,0,1,3), -- Netherweave Cloth +(16954,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16954,28399,4,1,0,1,1), -- Filtered Draenic Water +(16954,13446,2,1,0,1,1), -- Major Healing Potion +(16954,13444,1,1,0,1,1), -- Major Mana Potion +(16954,5759,0.3,1,0,1,1), -- Thorium Lockbox +(16954,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16954,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Fulgorge, NPC 18678 +-- --------------------------------------------------- +(18678,31176,0,1,1,1,1), -- Rockwurm Plate Handguards +(18678,31177,0,1,1,1,1), -- Rockwurm Scale Gauntlets +(18678,31179,0,1,1,1,1), -- Rockwurm Hide Gloves +(18678,31181,0,1,1,1,1), -- Rockwurm Hide Handwraps +(18678,25434,1,1,0,1,3), -- Fractured Carapace +(18678,25436,0.2,1,0,2,4), -- Twitching Leg +-- --------------------------------------------------- +-- Gan'arg Sapper, NPC 18827 +-- --------------------------------------------------- +(18827,21877,83,1,0,1,3), -- Netherweave Cloth +(18827,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18827,28399,4,1,0,1,1), -- Filtered Draenic Water +(18827,13446,3,1,0,1,1), -- Major Healing Potion +(18827,13444,1.5,1,0,1,1), -- Major Mana Potion +(18827,5759,0.2,1,0,1,1), -- Thorium Lockbox +(18827,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(18827,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Gan'arg Servant, NPC 16947 +-- --------------------------------------------------- +(16947,21877,83,1,0,1,3), -- Netherweave Cloth +(16947,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16947,28399,4,1,0,1,1), -- Filtered Draenic Water +(16947,13446,3,1,0,1,1), -- Major Healing Potion +(16947,13444,1.5,1,0,1,1), -- Major Mana Potion +(16947,5759,0.1,1,0,1,1), -- Thorium Lockbox +(16947,1,95,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16947,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Gorkan Bloodfist, NPC 16845 +-- --------------------------------------------------- +(16845,21877,3,1,0,2,3), -- Netherweave Cloth +(16845,27854,1,1,0,1,1), -- Smoked Talbuk Venison +(16845,22829,0.5,1,0,1,1), -- Super Healing Potion +(16845,1,2,1,0,-4110,1), -- Level 67 Green Items (ilvl 111) +-- --------------------------------------------------- +-- Grillok "Darkeye", NPC 19457 +-- --------------------------------------------------- +(19457,31529,-100,1,0,1,1), -- QItem: Grillok's Eyepatch +(19457,21877,45,1,0,1,3), -- Netherweave Cloth +(19457,30157,-5,1,0,1,1), -- QItem: Cursed Talisman +(19457,30425,-10,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19457,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(19457,28399,2,1,0,1,1), -- Filtered Draenic Water +(19457,13446,2,1,0,1,1), -- Major Healing Potion +(19457,13444,1,1,0,1,1), -- Major Mana Potion +(19457,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19457,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Haal'eshi Talonguard, NPC 16967 +-- --------------------------------------------------- +(16967,21877,60,1,0,1,3), -- Netherweave Cloth +(16967,17056,42,1,0,1,1), -- Light Feather +(16967,23483,-15,1,0,1,1), -- QItem: Haal'eshi Scroll +(16967,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16967,28399,3,1,0,1,1), -- Filtered Draenic Water +(16967,13446,2,1,0,1,1), -- Major Healing Potion +(16967,13444,1,1,0,1,1), -- Major Mana Potion +(16967,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16967,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16967,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Haal'eshi Windwalker, NPC 16966 +-- --------------------------------------------------- +(16966,21877,60,1,0,1,3), -- Netherweave Cloth +(16966,17056,42,1,0,1,1), -- Light Feather +(16966,23483,-15,1,0,1,1), -- QItem: Haal'eshi Scroll +(16966,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16966,28399,3,1,0,1,1), -- Filtered Draenic Water +(16966,13446,2,1,0,1,1), -- Major Healing Potion +(16966,13444,1,1,0,1,1), -- Major Mana Potion +(16966,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16966,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16966,2,3,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Hand of Kargath, NPC 22374 +-- --------------------------------------------------- +(22374,31706,-100,1,0,1,1), -- QItem: The Head of the Hand of Kargath +(22374,21877,40,1,0,1,3), -- Netherweave Cloth +(22374,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(22374,28399,2,1,0,1,1), -- Filtered Draenic Water +(22374,13446,1,1,0,1,1), -- Major Healing Potion +(22374,13444,0.5,1,0,1,1), -- Major Mana Potion +(22374,5760,0.1,1,0,1,1), -- Eternium Lockbox +(22374,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Heckling Fel Sprite, NPC 18978 +-- --------------------------------------------------- +(18978,21877,95,1,0,1,1), -- Netherweave Cloth +-- --------------------------------------------------- +-- Hulking Helboar, NPC 16880 +-- --------------------------------------------------- +(16880,23336,-30,1,0,1,1), -- QItem: Helboar Blood Sample +(16880,23270,-5,1,0,1,1), -- QItem: Tainted Hellboar Meat +(16880,3403,82,1,1,1,1), -- Ivory Boar Tusk +(16880,25440,1.5,1,1,1,1), -- Cracked Boar Tusk +(16880,25442,0.3,1,2,1,1), -- Mangled Snout +(16880,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Illidari Taskmaster, NPC 17058 +-- --------------------------------------------------- +(17058,29113,-50,1,0,1,1), -- QItem: Demonic Essence +(17058,21877,60,1,0,1,3), -- Netherweave Cloth +(17058,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(17058,28399,3,1,0,1,1), -- Filtered Draenic Water +(17058,13446,2,1,0,1,1), -- Major Healing Potion +(17058,13444,1,1,0,1,1), -- Major Mana Potion +(17058,5760,0.2,1,0,1,1), -- Eternium Lockbox +(17058,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +(17058,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Incandescent Fel Spark, NPC 22323 +-- --------------------------------------------------- +(22323,24508,80,1,1,1,1), -- Elemental Fragment +(22323,24511,20,1,1,1,1), -- Primordial Essence +(22323,22574,35,1,0,1,2), -- Mote of Fire +(22323,1,90,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Infernal Warbringer, NPC 19261 +-- --------------------------------------------------- +(19261,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Kaliri Matriarch, NPC 17035 +-- --------------------------------------------------- +(17035,23588,-27,1,0,1,1), -- QItem: Kaliri Feather +(17035,25425,81,1,1,1,1), -- Molted Feather +(17035,25427,19,1,1,1,1), -- Beaten Talon +(17035,5760,0.07,1,0,1,1), -- Eternium Lockbox +(17035,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Kaliri Swooper, NPC 17053 +-- --------------------------------------------------- +(17053,23588,-25,1,0,1,1), -- QItem: Kaliri Feather +(17053,25425,81,1,1,1,1), -- Molted Feather +(17053,25427,19,1,1,1,1), -- Beaten Talon +(17053,5760,0.05,1,0,1,1), -- Eternium Lockbox +(17053,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Lieutenant Commander Thalvos, NPC 16978 +-- --------------------------------------------------- +(16978,28562,-100,1,0,1,1), -- QItem: Unyielding Battle Horn +(16978,21877,55,1,0,1,1), -- Netherweave Cloth +(16978,27859,5,1,0,1,1), -- Zanger Caps +(16978,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(16978,13446,2,1,0,1,1), -- Major Healing Potion +(16978,13444,2,1,0,1,1), -- Major Mana Potion +(16978,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mag'har Grunt, NPC 16846 +-- --------------------------------------------------- +(16846,23589,-50,1,0,1,1), -- QItem: Mag'har Ancestral Beads +(16846,21877,60,1,0,1,1), -- Netherweave Cloth +(16846,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16846,28399,3,1,0,1,1), -- Filtered Draenic Water +(16846,13446,2,1,0,1,1), -- Major Healing Potion +(16846,13444,1,1,0,1,1), -- Major Healing Potion +(16846,5759,0.15,1,0,1,1), -- Eternium Lockbox +(16846,1,2,1,0,-6003,1), -- Scroll of * Reference +(16846,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mag'har Hunter, NPC 16912 +-- --------------------------------------------------- +(16912,21877,60,1,0,1,1), -- Netherweave Cloth +(16912,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16912,28399,3,1,0,1,1), -- Filtered Draenic Water +(16912,13446,2,1,0,1,1), -- Major Healing Potion +(16912,13444,1,1,0,1,1), -- Major Healing Potion +(16912,5759,0.15,1,0,1,1), -- Eternium Lockbox +(16912,1,2,1,0,-6003,1), -- Scroll of * Reference +(16912,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mag'har Watcher, NPC 16911 +-- --------------------------------------------------- +(16911,21877,60,1,0,1,1), -- Netherweave Cloth +(16911,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(16911,28399,3,1,0,1,1), -- Filtered Draenic Water +(16911,13446,2,1,0,1,1), -- Major Healing Potion +(16911,13444,1,1,0,1,1), -- Major Healing Potion +(16911,5759,0.15,1,0,1,1), -- Eternium Lockbox +(16911,1,2,1,0,-6003,1), -- Scroll of * Reference +(16911,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Maiden of Pain, NPC 19408 +-- --------------------------------------------------- +(19408,14047,15,1,0,1,3), -- Runecloth +(19408,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19408,28399,4,1,0,1,1), -- Filtered Draenic Water +(19408,13446,3,1,0,1,1), -- Major Healing Potion +(19408,13444,1.5,1,0,1,1), -- Major Healing Potion +(19408,5760,0.15,1,0,1,1), -- Eternium Lockbox +(19408,1,2,1,0,-6003,1), -- Scroll of * Reference +(19408,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Male Kaliri Hatchling, NPC 17039 +-- --------------------------------------------------- +(17039,23588,-25,1,0,1,1), -- QItem: Kaliri Feather +(17039,25425,81,1,1,1,1), -- Molted Feather +(17039,25427,19,1,1,1,1), -- Beaten Talon +(17039,5760,0.2,1,0,1,1), -- Eternium Lockbox +(17039,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Marauding Crust Burster, NPC 16857 +-- --------------------------------------------------- +(16857,23338,7,1,0,1,1), -- Eroded Leather Case +(16857,25434,80,1,0,1,1), -- Fractured Carapace +(16857,25436,20,1,0,1,1), -- Twitching Leg +(16857,5759,0.1,1,0,1,1), -- Thorium Lockbox +(16857,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mekthorg the Wild, NPC 18677 +-- --------------------------------------------------- +(18677,31168,0,1,1,1,1), -- Demon-Forged Chestguard +(18677,31170,0,1,1,1,1), -- Demon-Forged Hauberk +(18677,31172,0,1,1,1,1), -- Demon-Cured Tunic +(18677,31174,0,1,1,1,1), -- Demonweave Raiment +(18677,21877,40,1,0,1,3), -- Netherweave Cloth +(18677,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(18677,28399,2,1,0,1,3), -- Netherweave Cloth +-- --------------------------------------------------- +-- Mistress of Doom, NPC 19192 +-- --------------------------------------------------- +(19192,21877,80,1,0,1,3), -- Netherweave Cloth +(19192,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19192,28399,5,1,0,1,1), -- Filtered Draenic Water +(19192,13446,3,1,0,1,1), -- Major Healing Potion +(19192,13444,1.5,1,0,1,1), -- Major Healing Potion +(19192,5759,0.15,1,0,1,1), -- Eternium Lockbox +(19192,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Mo'arg Forgefiend, NPC 16946 +-- --------------------------------------------------- +(16946,21877,80,1,0,1,3), -- Netherweave Cloth +(16946,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(16946,28399,4,1,0,1,1), -- Filtered Draenic Water +(16946,13446,3,1,0,1,1), -- Major Healing Potion +(16946,13444,1.5,1,0,1,1), -- Major Healing Potion +(16946,5760,0.15,1,0,1,1), -- Eternium Lockbox +(16946,1,2,1,0,-6003,1), -- Scroll of * Reference +(16946,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Netherhound, NPC 16950 +-- --------------------------------------------------- +(16950,28513,-60,1,0,1,1), -- QItem: Demonic Rune Stone +(16950,3299,43,1,0,1,1), -- Fractured Canine +(16950,33547,17,1,0,1,1), -- Hardened Claw +(16950,4583,0.5,1,0,1,1), -- Thick Furry Mane +(16950,4584,0.2,1,0,1,1), -- Large Trophy Paw +(16950,5759,0.05,1,0,1,1), -- Thorium Lockbox +(16950,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Quillfang Ravager, NPC 16934 +-- --------------------------------------------------- +(16934,27674,50,1,0,1,1), -- Ravager Flesh +(16934,23965,81,1,1,1,1), -- Chipped Ravager Claw +(16934,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(16934,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Quillfang Skitterer, NPC 19189 +-- --------------------------------------------------- +(19189,27674,50,1,0,1,1), -- Ravager Flesh +(19189,23217,-4,1,0,1,1), -- QItem: Ravager Egg +(19189,23965,81,1,1,1,1), -- Chipped Ravager Claw +(19189,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(19189,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Raging Colossus, NPC 19188 +-- --------------------------------------------------- +(19188,29579,80,1,0,2,4), -- Crystalized Stone Chips +(19188,29476,19,1,0,1,1), -- Crimson Crystal Shard +(19188,29578,19,1,0,2,4), -- Crystalized Stone +(19188,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Razorfang Hatchling, NPC 16932 +-- --------------------------------------------------- +(16932,23217,-1,1,0,1,1), -- QItem: Ravager Egg +(16932,27674,50,1,0,1,1), -- Ravager Flesh +(16932,23976,0,1,1,1,1), -- Gnarled Ravager Carapace +(16932,23977,0,1,1,1,1), -- Gnarled Ravager Fang +(16932,23978,0,1,1,1,1), -- Gnarled Ravager Claw +(16932,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Razorfang Ravager, NPC 16933 +-- --------------------------------------------------- +(16933,23965,81,1,1,1,1), -- Chipped Ravager Claw +(16933,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(16933,27674,50,1,0,1,1), -- Ravager Flesh +(16933,23217,-20,1,0,1,1), -- QItem: Ravager Egg +(16933,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Razorsaw, NPC 20798 +-- --------------------------------------------------- +(20798,29590,55,1,0,1,1), -- Burning Legion Missive +(20798,29586,-100,1,0,1,1), -- QItem: Head of Forgefiend Razorsaw +(20798,21877,50,1,0,1,3), -- Netherweave Cloth +(20798,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(20798,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(20798,13446,1.5,1,0,1,1), -- Major Healing Potion +(20798,13444,0.75,1,0,1,1), -- Major Mana Potion +(20798,5760,0.15,1,0,1,1), -- Eternium Lockbox +(20798,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Ripp, NPC 19458 +-- --------------------------------------------------- +(19458,3299,70,1,0,1,1), -- Fractured Canine +(19458,33547,25,1,0,1,1), -- Hardened Claw +(19458,4583,1,1,0,1,1), -- Thick Furry Mane +(19458,4584,1,1,0,1,1), -- Large Trophy Paw +(19458,5759,0.2,1,0,1,1), -- Thorium Lockbox +(19458,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Rogue Voidwalker, NPC 16974 +-- --------------------------------------------------- +(16974,23218,-85,1,0,1,1), -- Condensed Voidwalker Essence +(16974,22577,20,1,0,1,1), -- Mote of Shadow +(16974,1,90,1,0,-6000,1), -- Generic HellfirePeninsule Loot +-- --------------------------------------------------- +-- Shattered Hand Acolyte, NPC 19415 +-- --------------------------------------------------- +(19415,21877,70,1,0,1,3), -- Netherweave Cloth +(19415,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19415,28399,4,1,0,1,1), -- Filtered Draenic Water +(19415,13446,2,1,0,1,1), -- Major Healing Potion +(19415,13444,1,1,0,1,1), -- Major Healing Potion +(19415,5760,0.2,1,0,1,1), -- Eternium Lockbox +(19415,1,2,1,0,-6003,1), -- Scroll of * Reference +(19415,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Berserker, NPC 16878 +-- --------------------------------------------------- +(16878,21877,82,1,0,1,3), -- Netherweave Cloth +(16878,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16878,28399,4,1,0,1,1), -- Filtered Draenic Water +(16878,13446,3,1,0,1,1), -- Major Healing Potion +(16878,13444,1.5,1,0,1,1), -- Major Healing Potion +(16878,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16878,1,2,1,0,-6003,1), -- Scroll of * Reference +(16878,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Captain, NPC 16870 +-- --------------------------------------------------- +(16870,21877,80,1,0,1,3), -- Netherweave Cloth +(16870,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16870,28399,4,1,0,1,1), -- Filtered Draenic Water +(16870,13446,2,1,0,1,1), -- Major Healing Potion +(16870,13444,1,1,0,1,1), -- Major Healing Potion +(16870,5760,0.2,1,0,1,1), -- Eternium Lockbox +(16870,1,2,1,0,-6003,1), -- Scroll of * Reference +(16870,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Grenadier, NPC 19295 +-- --------------------------------------------------- +(19295,21877,85,1,0,1,3), -- Netherweave Cloth +(19295,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19295,28399,4,1,0,1,1), -- Filtered Draenic Water +(19295,13446,2,1,0,1,1), -- Major Healing Potion +(19295,13444,1,1,0,1,1), -- Major Healing Potion +(19295,1,75,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Grunt, NPC 16867 +-- --------------------------------------------------- +(16867,21877,80,1,0,1,3), -- Netherweave Cloth +(16867,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16867,28399,4,1,0,1,1), -- Filtered Draenic Water +(16867,13446,2,1,0,1,1), -- Major Healing Potion +(16867,13444,1,1,0,1,1), -- Major Healing Potion +(16867,5760,0.18,1,0,1,1), -- Eternium Lockbox +(16867,1,2,1,0,-6003,1), -- Scroll of * Reference +(16867,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Guard, NPC 19414 +-- --------------------------------------------------- +(19414,21877,80,1,0,1,3), -- Netherweave Cloth +(19414,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19414,28399,4,1,0,1,1), -- Filtered Draenic Water +(19414,13446,3,1,0,1,1), -- Major Healing Potion +(19414,13444,1.5,1,0,1,1), -- Major Healing Potion +(19414,5760,0.18,1,0,1,1), -- Eternium Lockbox +(19414,1,2,1,0,-6003,1), -- Scroll of * Reference +(19414,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Mage, NPC 19413 +-- --------------------------------------------------- +(19413,21877,60,1,0,1,3), -- Netherweave Cloth +(19413,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19413,28399,3,1,0,1,1), -- Filtered Draenic Water +(19413,13446,2,1,0,1,1), -- Major Healing Potion +(19413,13444,1,1,0,1,1), -- Major Healing Potion +(19413,1,2,1,0,-6003,1), -- Scroll of * Reference +(19413,2,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Neophyte, NPC 19410 +-- --------------------------------------------------- +(19410,21877,80,1,0,1,3), -- Netherweave Cloth +(19410,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19410,28399,4,1,0,1,1), -- Filtered Draenic Water +(19410,13446,2,1,0,1,1), -- Major Healing Potion +(19410,13444,1,1,0,1,1), -- Major Healing Potion +(19410,5760,0.18,1,0,1,1), -- Eternium Lockbox +(19410,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Shattered Hand Warlock, NPC 19411 +-- --------------------------------------------------- +(19411,21877,80,1,0,1,3), -- Netherweave Cloth +(19411,27854,9,1,0,1,1), -- Smoked Talbuk Venison +(19411,28399,4,1,0,1,1), -- Filtered Draenic Water +(19411,13446,2,1,0,1,1), -- Major Healing Potion +(19411,13444,1,1,0,1,1), -- Major Healing Potion +(19411,5760,0.18,1,0,1,1), -- Eternium Lockbox +(19411,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Sister of Grief, NPC 16960 +-- --------------------------------------------------- +(16960,21877,80,1,0,1,3), -- Netherweave Cloth +(16960,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(16960,28399,4,1,0,1,1), -- Filtered Draenic Water +(16960,13446,2,1,0,1,1), -- Major Healing Potion +(16960,13444,1,1,0,1,1), -- Major Healing Potion +(16960,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Starving Helboar, NPC 16879 +-- --------------------------------------------------- +(16879,23270,-5,1,0,1,1), -- QItem: Tainted Helboar Meat +(16879,2295,74,1,1,1,1), -- Large Boar Tusk +(16879,44754,24,1,1,1,1), -- Severed Boar Tusk +(16879,25440,2,1,1,1,1), -- Cracked Boar Tusk +(16879,25442,0.5,1,0,1,1), -- Mangled Snout +(16879,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Stonescythe Alpha, NPC 16929 +-- --------------------------------------------------- +(16929,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon +(16929,24517,19,1,1,1,1), -- Blood Soaked Tail +(16929,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(16929,28399,2,1,0,1,1), -- Filtered Draenic Water +(16929,13446,1.2,1,0,1,1), -- Major Healing Potion +(16929,13444,0.6,1,0,1,1), -- Major Healing Potion +(16929,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16929,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Stonescythe Ambusher, NPC 16928 +-- --------------------------------------------------- +(16928,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon +(16928,24517,19,1,1,1,1), -- Blood Soaked Tail +(16928,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Stonescythe Whelp, NPC 16927 +-- --------------------------------------------------- +(16927,24516,81,1,1,1,1), -- Damaged Rock Flayer Talon +(16927,24517,19,1,1,1,1), -- Blood Soaked Tail +(16927,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(16927,28399,2,1,0,1,1), -- Filtered Draenic Water +(16927,13446,1.2,1,0,1,1), -- Major Healing Potion +(16927,13444,0.6,1,0,1,1), -- Major Healing Potion +(16927,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16927,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Subjugator Shi'aziv, NPC 19282 +-- --------------------------------------------------- +(19282,28513,-25,1,0,1,1), -- QItem: Demonic Rune Stone +(19282,27854,3,1,0,1,1), -- Smoked Talbuk Venison +(19282,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(19282,13446,1,1,0,1,1), -- Major Healing Potion +(19282,13444,0.5,1,0,1,1), -- Major Healing Potion +(19282,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Subjugator Yalqiz, NPC 19335 +-- --------------------------------------------------- +(19335,27854,1.2,1,0,1,1), -- Smoked Talbuk Venison +(19335,28399,0.6,1,0,1,1), -- Filtered Draenic Water +(19335,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Tagar Spinebreaker, NPC 19443 +-- --------------------------------------------------- +(19443,21877,33,1,0,1,3), -- Netherweave Cloth +(19443,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(19443,28399,2,1,0,1,1), -- Filtered Draenic Water +(19443,13446,1,1,0,1,1), -- Major Healing Potion +(19443,13444,0.5,1,0,1,1), -- Major Healing Potion +(19443,1,70,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Terrorfiend, NPC 16951 +-- --------------------------------------------------- +(16951,21877,70,1,0,1,3), -- Netherweave Cloth +(16951,23269,-25,1,0,1,1), -- Felblood Sample +(16951,27854,7,1,0,1,1), -- Smoked Talbuk Venison +(16951,28399,3.5,1,0,1,1), -- Filtered Draenic Water +(16951,13446,2,1,0,1,1), -- Major Healing Potion +(16951,13444,1,1,0,1,1), -- Major Healing Potion +(16951,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot +(16951,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Thornfang Ravager, NPC 19349 +-- --------------------------------------------------- +(19349,27674,50,1,0,1,1), -- Ravager Flesh +(19349,23965,81,1,1,1,1), -- Chipped Ravager Claw +(19349,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(19349,5760,0.1,1,0,1,1), -- Eternium Lockbox +(19349,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Thornfang Venomspitter, NPC 19350 +-- --------------------------------------------------- +(19350,23965,81,1,1,1,1), -- Chipped Ravager Claw +(19350,23979,19,1,1,1,1), -- Chipped Ravager Carapace +(19350,1,85,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 +-- --------------------------------------------------- +-- Tunneler, NPC 16968 +-- --------------------------------------------------- +(16968,23338,5,1,0,1,1), -- Eroded Leather Case +(16968,25434,81,1,1,1,1), -- Fractured Carapace +(16968,25436,19,1,1,1,1), -- Twitching Leg +(16968,5760,0.1,1,0,1,1), -- Eternium Lockbox +(16968,1,80,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Twilight Cryomancer, NPC 26222 +-- --------------------------------------------------- +(26222,14047,85,1,0,1,2), -- Runecloth +(26222,8952,9,1,0,1,2), -- Roasted Quail +(26222,8766,4.5,1,0,1,2), -- Morning Glory Dew +(26222,13446,6,1,0,1,2), -- Major Healing Potion +(26222,13444,3,1,0,1,2), -- Major Mana Potion +(26222,1,10,1,0,-1052,1), -- Level 52 Grey reference +(26222,2,10,1,0,-1053,1), -- Level 53 Grey reference +-- --------------------------------------------------- +-- Twilight Frostblade, NPC 26223 +-- --------------------------------------------------- +(26223,14047,85,1,0,1,2), -- Runecloth +(26223,8952,9,1,0,1,2), -- Roasted Quail +(26223,8766,4.5,1,0,1,2), -- Morning Glory Dew +(26223,13446,6,1,0,1,2), -- Major Healing Potion +(26223,13444,3,1,0,1,2), -- Major Mana Potion +(26223,1,10,1,0,-1052,1), -- Level 52 Grey reference +(26223,2,10,1,0,-1053,1), -- Level 53 Grey reference +-- --------------------------------------------------- +-- Uncontrolled Voidwalker, NPC 16975 +-- --------------------------------------------------- +(16975,23218,-80,1,0,1,1), -- Condensed Voidwalker Essence +(16975,22577,20,1,0,1,1), -- Mote of Shadow +(16975,1,90,1,0,-6000,1), -- Generic HellfirePeninsule Loot +-- --------------------------------------------------- +-- Unstable Voidwalker, NPC 20145 +-- --------------------------------------------------- +(20145,29051,-100,1,0,1,1), -- QItem: Warp Nether +-- --------------------------------------------------- +-- Unyielding Footman, NPC 16904 +-- --------------------------------------------------- +(16904,21877,60,1,0,1,1), -- Netherweave Cloth +(16904,14047,20,1,0,1,3), -- Runecloth +(16904,27859,8,1,0,1,1), -- Zanger Caps +(16904,28399,4,1,0,1,1), -- Filtered Draenic Water +(16904,13446,2,1,0,1,1), -- Major Healing Potion +(16904,13444,1,1,0,1,1), -- Major Mana Potion +(16904,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Unyielding Knight, NPC 16906 +-- --------------------------------------------------- +(16906,28552,15,1,0,1,1), -- A Mysterious Tome +(16906,21877,60,1,0,1,1), -- Netherweave Cloth +(16906,14047,20,1,0,1,3), -- Runecloth +(16906,27859,8,1,0,1,1), -- Zanger Caps +(16906,28399,4,1,0,1,1), -- Filtered Draenic Water +(16906,13446,2,1,0,1,1), -- Major Healing Potion +(16906,13444,1,1,0,1,1), -- Major Mana Potion +(16906,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16906,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Unyielding Sorcerer, NPC 16905 +-- --------------------------------------------------- +(16905,21877,60,1,0,1,1), -- Netherweave Cloth +(16905,14047,20,1,0,1,3), -- Runecloth +(16905,27859,8,1,0,1,1), -- Zanger Caps +(16905,28399,4,1,0,1,1), -- Filtered Draenic Water +(16905,13446,2,1,0,1,1), -- Major Healing Potion +(16905,13444,1,1,0,1,1), -- Major Mana Potion +(16905,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +(16905,2,2,1,0,-6003,1), -- Scroll of * Reference +-- --------------------------------------------------- +-- Vacillating Voidcaller, NPC 19527 +-- --------------------------------------------------- +(19527,29161,-100,1,0,1,3), -- Void Ridge Soul Shard +(19527,22577,20,1,0,1,2), -- Mote of Shadow +(19527,1,50,1,1,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Void Baron Galaxis, NPC 16939 +-- --------------------------------------------------- +(16939,29162,-100,1,0,1,1), -- Galaxis Soul Shard +-- --------------------------------------------------- +-- Vorakem Doomspeaker, NPC 18679 +-- --------------------------------------------------- +(18679,31182,0,1,1,1,1), -- Legion Helm +(18679,31183,0,1,1,1,1), -- Legion Coif +(18679,31184,0,1,1,1,1), -- Legion Headguard +(18679,31185,0,1,1,1,1), -- Legion Crown +(18679,21877,40,1,0,1,3), -- Netherweave Cloth +(18679,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(18679,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(18679,13446,1,1,0,1,1), -- Major Healing Potion +(18679,13444,0.5,1,0,1,1), -- Major Healing Potion +-- --------------------------------------------------- +-- Warboss Nekrogg, NPC 19263 +-- --------------------------------------------------- +(19263,21877,90,1,0,1,1), -- Netherweave Cloth +(19263,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Warbringer Arix'Amal, NPC 19298 +-- --------------------------------------------------- +(19298,29795,-85,1,0,1,1), -- QItem: Burning Legion Gate Key +(19298,29588,50,1,0,1,1), -- Burning Legion Gate Key +(19298,21877,46,1,0,1,3), -- Netherweave Cloth +(19298,27854,5,1,0,1,1), -- Smoked Talbuk Venison +(19298,28399,2.5,1,0,1,1), -- Filtered Draenic Water +(19298,13446,1.4,1,0,1,1), -- Major Healing Potion +(19298,13444,0.7,1,0,1,1), -- Major Healing Potion +(19298,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Warlord Morkh, NPC 16964 +-- --------------------------------------------------- +(16964,30158,-100,1,0,1,1), -- QItem: Morkh's Shattered Armor +(16964,21877,35,1,0,1,1), -- Netherweave Cloth +(16964,14047,10,1,0,1,3), -- Runecloth +(16964,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(16964,28399,2,1,0,1,1), -- Filtered Draenic Water +(16964,13446,1,1,0,1,1), -- Major Healing Potion +(16964,13444,0.5,1,0,1,1), -- Major Healing Potion +(16964,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Worg Master Kruush, NPC 19442 +-- --------------------------------------------------- +(19442,31374,-100,1,0,1,1), -- QItem: Worg Master's Head +(19442,30425,-25,1,0,1,1), -- QItem: Bleeding Hollow Blood +(19442,30157,-10,1,0,1,1), -- QItem: Cursed Talisman +(19442,21877,45,1,0,1,3), -- Netherweave Cloth +(19442,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(19442,28399,2,1,0,1,1), -- Filtered Draenic Water +(19442,13446,1,1,0,1,1), -- Major Healing Potion +(19442,13444,0.5,1,0,1,1), -- Major Mana Potion +(19442,5759,0.1,1,0,1,1), -- Thorium Lockbox +(19442,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot +-- --------------------------------------------------- +-- Wrath Herald, NPC 24919 +-- --------------------------------------------------- +(24919,34259,-100,1,0,1,1), -- Demonic Blood +(24919,21877,45,1,0,1,3), -- Netherweave Cloth +(24919,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(24919,27860,2,1,0,1,1), -- Purified Draenic Water +(24919,22829,1.6,1,0,1,1), -- Super Healing Potion +(24919,22832,0.8,1,0,1,1), -- Super Mana Potion +(24919,1,100,1,0,-6002,1), -- Generic HellfirePeninsula Loot2 +-- --------------------------------------------------- +-- Wrathguard, NPC 18975 +-- --------------------------------------------------- +(18975,28513,-85,1,0,1,1), -- QItem: Demonic Rune Stone +(18975,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18975,28399,4,1,0,1,1), -- Filtered Draenic Water +(18975,13446,3,1,0,1,1), -- Major Healing Potion +(18975,13444,1.5,1,0,1,1), -- Major Healing Potion +(18975,5759,0.15,1,0,1,1), -- Thorium Lockbox +(18975,1,2,1,0,-6003,1), -- Scroll of * Reference +(18975,2,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot + +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (26222,26223); +DELETE FROM `reference_loot_template` WHERE `entry`=34081; diff --git a/sql/updates/world/2012_06_02_03_world_creature_loot_template_zm.sql b/sql/updates/world/2012_06_02_03_world_creature_loot_template_zm.sql new file mode 100644 index 00000000000..e739f81407b --- /dev/null +++ b/sql/updates/world/2012_06_02_03_world_creature_loot_template_zm.sql @@ -0,0 +1,902 @@ +SET @ZM1:=6010; +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `reference_loot_template` WHERE `entry`=@ZM1; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +(@ZM1,1,30,1,0,-4000,1), -- Grey Items level 61 (ilvl 66) +(@ZM1,2,30,1,0,-4001,1), -- Grey Items level 64 (ilvl 69) +(@ZM1,3,2,1,0,-4103,1), -- Green Items level 60 (ilvl 90) +(@ZM1,4,2,1,0,-4104,1), -- Green Items level 61 (ilvl 93) +(@ZM1,5,2,1,0,-4105,1), -- Green Items level 62 (ilvl 96) +(@ZM1,6,2,1,0,-4106,1), -- Green Items level 63 (ilvl 99) +(@ZM1,7,0.5,1,0,-4203,1), -- Blue items level 63 (ilvl 94) +(@ZM1,8,0.5,1,0,-4204,1), -- Blue items level 64 (ilvl 97) +(@ZM1,9,0.5,1,0,-4205,1), -- Blue items level 65 (ilvl 97) +(@ZM1,5760,0.5,1,0,1,1); -- Eternium Lockbox +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +DELETE FROM `creature_loot_template` WHERE `entry` IN (18285,18119,18120,18117,20443,20444,18118,18121,19732,18283,20792,18088,20088,20090,18089,20089,20196,18127,18682,20197,18281,20293,20295,20294,18159,20442,18992,19174,18681,18116,18115,19733,20079,18087,19946,19947,18086,18122,18134,18214,20198,20270,18113,18114,19734,18129,19730,19729,18080,20290,20291,18282,20445,20292,18137,18136,18135,18130,18131,18133,20283,19706,18680,18213,18286,18212,18160,20324,20279,20280,18046,18044,18128,18280,18154,19519,18125,18340,20477,18138,18077,18079,20115,18132,19402,18124,18123,20387); +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- "Count" Ungula, NPC 18285 +-- --------------------------------------------------- +(18285,25459,-100,1,0,1,1), -- QItem: "Count" Ungula's Mandible +(18285,25434,80,1,1,1,1), -- Fractured Carapace +(18285,25436,20,1,1,1,1), -- Twitsching Leg +(18285,24493,-10,1,0,1,1), -- QItem: Marshfang Slicer Blade +(18285,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Brute, NPC 18119 +-- --------------------------------------------------- +(18119,21877,10,1,0,1,3), -- Netherweave Cloth +(18119,27854,1.2,1,0,1,1), -- Smoked Talbuk Venison +(18119,28399,0.6,1,0,1,1), -- Filtered Draenic Water +(18119,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ango'rosh Mauler, NPC 18120 +-- --------------------------------------------------- +(18120,24240,-50,1,0,1,1), -- QItem: Box of Mushrooms +(18120,21877,70,1,0,1,3), -- Netherweave Cloth +(18120,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18120,28399,3,1,0,1,1), -- Filtered Draenic Water +(18120,13446,2,1,0,1,1), -- Major Healing Potion +(18120,13444,1,1,0,1,1), -- Major Mana Potion +(18120,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18120,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Ogre, NPC 18117 +-- --------------------------------------------------- +(18117,24238,-50,1,0,1,1), -- QItem: Mushroom Sample +(18117,21877,62,1,0,1,3), -- Netherweave Cloth +(18117,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18117,28399,3,1,0,1,1), -- Filtered Draenic Water +(18117,13446,2,1,0,1,1), -- Major Healing Potion +(18117,13444,1,1,0,1,1), -- Major Mana Potion +(18117,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18117,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Sentry, NPC 20443 +-- --------------------------------------------------- +(20443,24238,-50,1,0,1,1), -- QItem: Mushroom Sample +(20443,21877,44,1,0,1,3), -- Netherweave Cloth +(20443,27854,4,1,0,1,1), -- Smoked Talbuk Venison +(20443,28399,2,1,0,1,1), -- Filtered Draenic Water +(20443,13446,1.5,1,0,1,1), -- Major Healing Potion +(20443,13444,0.75,1,0,1,1), -- Major Mana Potion +(20443,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ango'rosh Shadowmage, NPC 20444 +-- --------------------------------------------------- +(20444,24240,-40,1,0,1,1), -- QItem: Box of Mushrooms +(20444,21877,70,1,0,1,3), -- Netherweave Cloth +(20444,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(20444,28399,3,1,0,1,1), -- Filtered Draenic Water +(20444,13446,2,1,0,1,1), -- Major Healing Potion +(20444,13444,1,1,0,1,1), -- Major Mana Potion +(20444,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Shaman, NPC 18118 +-- --------------------------------------------------- +(18118,24238,-45,1,0,1,1), -- QItem: Mushroom Sample +(18118,21877,60,1,0,1,3), -- Netherweave Cloth +(18118,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18118,28399,3,1,0,1,1), -- Filtered Draenic Water +(18118,13446,2,1,0,1,1), -- Major Healing Potion +(18118,13444,1,1,0,1,1), -- Major Mana Potion +(18118,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18118,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ango'rosh Souleater, NPC 18121 +-- --------------------------------------------------- +(18121,24240,-35,1,0,1,1), -- QItem: Box of Mushrooms +(18121,21877,70,1,0,1,3), -- Netherweave Cloth +(18121,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18121,28399,3,1,0,1,1), -- Filtered Draenic Water +(18121,13446,2,1,0,1,1), -- Major Healing Potion +(18121,13444,1,1,0,1,1), -- Major Mana Potion +(18121,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18121,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ango'rosh Warlock, NPC 19732 +-- --------------------------------------------------- +(19732,21877,82,1,0,1,3), -- Netherweave Cloth +(19732,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(19732,28399,4,1,0,1,1), -- Filtered Draenic Water +(19732,13446,3,1,0,1,1), -- Major Healing Potion +(19732,13444,1.5,1,0,1,1), -- Major Mana Potion +(19732,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Blacksting, NPC 18283 +-- --------------------------------------------------- +(18283,25448,-100,1,0,1,1), -- QItem: Blacksting's Stinger +(18283,25434,80,1,1,1,1), -- Fractured Carapace +(18283,25436,18,1,1,1,1), -- Twitching Leg +(18283,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing +(18283,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bloodscale Elemental, NPC 20792 +-- --------------------------------------------------- +(20792,24507,81,1,1,1,1), -- Elemental Shard +(20792,24510,19,1,1,1,1), -- Primordial Core +(20792,22578,19,1,0,1,2), -- Mote of Water +(20792,7080,1,1,0,1,2), -- Essence of Water +(20792,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bloodscale Enchantress, NPC 18088 +-- --------------------------------------------------- +(18088,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18088,17057,33,1,0,1,1), -- Shiny Fish Scales +(18088,17058,30,1,0,1,1), -- Fish Oil +(18088,24476,19,1,0,1,1), -- Jaggal Clam +(18088,24280,-10,1,0,1,1), -- QItem: Naga Claws +(18088,24330,-1,1,0,1,1), -- QItem: Drain Schematics +(18088,27858,4,1,0,1,3), -- Sunspring Carp +(18088,28399,2,1,0,1,1), -- Filtered Draenic Water +(18088,13446,1.5,1,0,1,1), -- Major Healing Potion +(18088,13444,0.75,1,0,1,1), -- Major Mana Potion +(18088,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18088,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodscale Overseer, NPC 20088 +-- --------------------------------------------------- +(20088,24280,-80,1,0,1,1), -- QItem: Naga Claws +(20088,24401,30,1,0,1,1), -- Unidentified Plant Parts +(20088,17057,25,1,0,1,1), -- Shiny Fish Scales +(20088,17058,20,1,0,1,1), -- Fish Oil +(20088,24476,15,1,0,1,1), -- Jaggal Clam +(20088,24330,-2,1,0,1,1), -- QItem: Drain Schematics +(20088,27858,4,1,0,1,3), -- Sunspring Carp +(20088,28399,2,1,0,1,1), -- Filtered Draenic Water +(20088,13446,1,1,0,1,1), -- Major Healing Potion +(20088,13444,0.5,1,0,1,1), -- Major Mana Potion +(20088,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(20088,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodscale Sentry, NPC 20090 +-- --------------------------------------------------- +(20090,24507,68,1,1,1,1), -- Elemental Shard +(20090,24510,17,1,1,1,1), -- Primordial Core +(20090,22578,15,1,0,1,2), -- Mote of Water +(20090,7080,1,1,0,1,2), -- Essence of Water +(20090,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bloodscale Slavedriver, NPC 18089 +-- --------------------------------------------------- +(18089,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18089,17057,33,1,0,1,1), -- Shiny Fish Scales +(18089,17058,30,1,0,1,1), -- Fish Oil +(18089,24476,19,1,0,1,1), -- Jaggal Clam +(18089,24280,-5,1,0,1,1), -- QItem: Naga Claws +(18089,24330,-0.5,1,0,1,1), -- QItem: Drain Schematics +(18089,27858,4,1,0,1,3), -- Sunspring Carp +(18089,28399,2,1,0,1,1), -- Filtered Draenic Water +(18089,13446,1.5,1,0,1,1), -- Major Healing Potion +(18089,13444,0.75,1,0,1,1), -- Major Mana Potion +(18089,1,1,1,0,-6003,1), -- Scroll of * VI Reference +(18089,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodscale Wavecaller, NPC 20089 +-- --------------------------------------------------- +(20089,24280,-80,1,0,1,1), -- QItem: Naga Claws +(20089,24401,30,1,0,1,1), -- Unidentified Plant Parts +(20089,17057,25,1,0,1,1), -- Shiny Fish Scales +(20089,17058,20,1,0,1,1), -- Fish Oil +(20089,24476,15,1,0,1,1), -- Jaggal Clam +(20089,24330,-2,1,0,1,1), -- QItem: Drain Schematics +(20089,27858,4,1,0,1,3), -- Sunspring Carp +(20089,28399,2,1,0,1,1), -- Filtered Draenic Water +(20089,13446,1,1,0,1,1), -- Major Healing Potion +(20089,13444,0.5,1,0,1,1), -- Major Mana Potion +(20089,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(20089,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bloodthirsty Marshfang, NPC 20196 +-- --------------------------------------------------- +(20196,28058,81,1,1,1,1), -- Shredded Wyrm Wing +(20196,28059,19,1,1,1,1), -- Iridescent Eye +(20196,22578,19,1,0,1,1), -- Mote of Water +(20196,7080,1,1,0,1,1), -- Essence of Water +(20196,1,95,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Bog Lord, NPC 18127 +-- --------------------------------------------------- +(18127,25450,82,1,0,1,1), -- Creeping Moss +(18127,25452,18,1,1,1,1), -- Blighted Fungus +(18127,24291,-35,1,0,1,1), -- QItem: Bog Lord Tendril +(18127,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18127,22575,19,1,0,1,1), -- Mote of Life +(18127,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Bog Lurker, NPC 18682 +-- --------------------------------------------------- +(18682,31247,0,1,1,1,1), -- Bog Pauldrons +(18682,31248,0,1,1,1,1), -- Bog Epaulets +(18682,31249,0,1,1,1,1), -- Bog Spaulders +(18682,31250,0,1,1,1,1), -- Bog Mantle +(18682,25456,80,1,2,1,1), -- Glowing Spores +(18682,25454,20,1,2,1,1), -- Luminescent Globe +-- --------------------------------------------------- +-- Bogflare Needler, NPC 20197 +-- --------------------------------------------------- +(20197,25434,81,1,1,1,1), -- Fractured Carapace +(20197,25436,19,1,1,1,1), -- Twitching Leg +(20197,24372,-2,1,0,1,1), -- QItem: Diaphanous Wing +(20197,29960,0.05,1,0,1,1), -- Captured Firefly +(20197,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Boglash, NPC 18281 +-- --------------------------------------------------- +(18281,25434,80,1,1,1,1), -- Fractured Carapace +(18281,25436,18,1,1,1,1), -- Twitching Leg +(18281,27676,50,1,0,1,1), -- Strange Spores +(18281,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18281,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bogstrok Clacker, NPC 20293 +-- --------------------------------------------------- +(20293,24401,40,1,0,1,1), -- Unidentified Plant Parts +(20293,17057,33,1,0,1,1), -- Shiny Fish Scales +(20293,17058,30,1,0,1,1), -- Fish Oil +(20293,24476,20,1,0,1,1), -- Jaggal Clam +(20293,27858,4,1,0,1,3), -- Sunspring Carp +(20293,28399,2,1,0,1,1), -- Filtered Draenic Water +(20293,13446,1.5,1,0,1,1), -- Major Healing Potion +(20293,13444,0.75,1,0,1,1), -- Major Mana Potion +(20293,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bogstrok Crusher, NPC 20295 +-- --------------------------------------------------- +(20295,24401,40,1,0,1,1), -- Unidentified Plant Parts +(20295,17057,33,1,0,1,1), -- Shiny Fish Scales +(20295,17058,30,1,0,1,1), -- Fish Oil +(20295,24476,20,1,0,1,1), -- Jaggal Clam +(20295,27858,4,1,0,1,3), -- Sunspring Carp +(20295,28399,2,1,0,1,1), -- Filtered Draenic Water +(20295,13446,1.5,1,0,1,1), -- Major Healing Potion +(20295,13444,0.75,1,0,1,1), -- Major Mana Potion +(20295,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Bogstrok Razorclaw, NPC 20294 +-- --------------------------------------------------- +(20294,24401,40,1,0,1,1), -- Unidentified Plant Parts +(20294,17057,33,1,0,1,1), -- Shiny Fish Scales +(20294,17058,30,1,0,1,1), -- Fish Oil +(20294,24476,20,1,0,1,1), -- Jaggal Clam +(20294,27858,4,1,0,1,3), -- Sunspring Carp +(20294,28399,2,1,0,1,1), -- Filtered Draenic Water +(20294,13446,1.5,1,0,1,1), -- Major Healing Potion +(20294,13444,0.75,1,0,1,1), -- Major Mana Potion +(20294,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Boss Grog'ak, NPC 18159 +-- --------------------------------------------------- +(18159,24472,-100,1,0,1,1), -- QItem: Boss Grog'ak's Head +(18159,24238,-100,1,0,1,1), -- QItem: Mushroom Sample +(18159,21877,45,1,0,1,3), -- Netherweave Cloth +(18159,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18159,28399,3,1,0,1,1), -- Filtered Draenic Water +(18159,13446,2,1,0,1,1), -- Major Healing Potion +(18159,13444,1,1,0,1,1), -- Major Mana Potion +(18159,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Captain Bo'kar, NPC 20442 +-- --------------------------------------------------- +(20442,24240,-50,1,0,1,1), -- QItem: Box of Mushrooms +(20442,21877,80,1,0,1,3), -- Netherweave Cloth +(20442,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(20442,28399,3,1,0,1,1), -- Filtered Draenic Water +(20442,13446,2,1,0,1,1), -- Major Healing Potion +(20442,13444,1,1,0,1,1), -- Major Mana Potion +(20442,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Captain Krosh, NPC 18992 +-- --------------------------------------------------- +(18992,24240,-5,1,0,1,1), -- QItem: Box of Mushrooms +(18992,21877,25,1,0,1,3), -- Netherweave Cloth +(18992,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18992,28399,3,1,0,1,1), -- Filtered Draenic Water +(18992,13446,2,1,0,1,1), -- Major Healing Potion +(18992,13444,1,1,0,1,1), -- Major Mana Potion +(18992,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Chieftain Mummaki, NPC 19174 +-- --------------------------------------------------- +(19174,27943,-100,1,0,1,1), -- QItem: Chieftain Mummaki's Totem +(19174,21877,25,1,0,1,3), -- Netherweave Cloth +(19174,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(19174,28399,3,1,0,1,1), -- Filtered Draenic Water +(19174,13446,2,1,0,1,1), -- Major Healing Potion +(19174,13444,1,1,0,1,1), -- Major Mana Potion +(19174,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Coilfang Emissary, NPC 18681 +-- --------------------------------------------------- +(18681,31242,0,1,1,1,1), -- Nagascale Legplates +(18681,31243,0,1,1,1,1), -- Nagascale Legguard +(18681,31244,0,1,1,1,1), -- Nagahide Pants +(18681,31245,0,1,1,1,1), -- Nagahide Leggings +(18681,17057,40,1,0,1,2), -- Shiny Fish Scales +(18681,21877,40,1,0,1,3), -- Netherweave Cloth +(18681,17058,25,1,0,1,1), -- Fish Oil +-- --------------------------------------------------- +-- Daggerfen Assassin, NPC 18116 +-- --------------------------------------------------- +(18116,21877,75,1,0,1,3), -- Netherweave Cloth +(18116,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18116,28399,4,1,0,1,1), -- Filtered Draenic Water +(18116,13446,2,1,0,1,1), -- Major Healing Potion +(18116,13444,1,1,0,1,1), -- Major Mana Potion +(18116,1,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Daggerfen Muckdweller, NPC 18115 +-- --------------------------------------------------- +(18115,21877,75,1,0,1,3), -- Netherweave Cloth +(18115,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18115,28399,4,1,0,1,1), -- Filtered Draenic Water +(18115,13446,2,1,0,1,1), -- Major Healing Potion +(18115,13444,1,1,0,1,1), -- Major Mana Potion +(18115,1,80,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Daggerfen Servant, NPC 19733 +-- --------------------------------------------------- +(19733,17057,33,1,0,1,1), -- Shiny Fish Scales +(19733,17058,30,1,0,1,1), -- Fish Oil +(19733,24476,20,1,0,1,1), -- Jaggal Clam +(19733,27858,4,1,0,1,3), -- Sunspring Carp +(19733,28399,2,1,0,1,1), -- Filtered Draenic Water +(19733,13446,1.5,1,0,1,1), -- Major Healing Potion +(19733,13444,0.75,1,0,1,1), -- Major Mana Potion +(19733,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Sentry, NPC 20079 +-- --------------------------------------------------- +(20079,24507,70,1,1,1,1), -- Elemental Shard +(20079,24510,15,1,1,1,1), -- Primordial Core +(20079,22578,15,1,0,1,2), -- Mote of Water +(20079,7080,1,1,0,1,2), -- Essence of Water +(20079,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Siren, NPC 18087 +-- --------------------------------------------------- +(18087,24280,-80,1,0,1,1), -- QItem: Naga Claws +(18087,24401,30,1,0,1,1), -- Unidentified Plant Parts +(18087,17057,25,1,0,1,1), -- Shiny Fish Scales +(18087,17058,20,1,0,1,1), -- Fish Oil +(18087,24476,15,1,0,1,1), -- Jaggal Clam +(18087,27858,3,1,0,1,3), -- Sunspring Carp +(18087,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(18087,13446,1,1,0,1,1), -- Major Healing Potion +(18087,13444,0.5,1,0,1,1), -- Major Mana Potion +(18087,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Slaver, NPC 19946 +-- --------------------------------------------------- +(19946,24280,-95,1,0,1,1), -- QItem: Naga Claws +(19946,24401,30,1,0,1,1), -- Unidentified Plant Parts +(19946,17057,25,1,0,1,1), -- Shiny Fish Scales +(19946,17058,20,1,0,1,1), -- Fish Oil +(19946,24476,15,1,0,1,1), -- Jaggal Clam +(19946,27858,3,1,0,1,3), -- Sunspring Carp +(19946,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(19946,13446,1,1,0,1,1), -- Major Healing Potion +(19946,13444,0.5,1,0,1,1), -- Major Mana Potion +(19946,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(19946,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Sorceress, NPC 19947 +-- --------------------------------------------------- +(19947,24280,-95,1,0,1,1), -- QItem: Naga Claws +(19947,24401,30,1,0,1,1), -- Unidentified Plant Parts +(19947,17057,25,1,0,1,1), -- Shiny Fish Scales +(19947,17058,20,1,0,1,1), -- Fish Oil +(19947,24476,15,1,0,1,1), -- Jaggal Clam +(19947,27858,3,1,0,1,3), -- Sunspring Carp +(19947,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(19947,13446,1,1,0,1,1), -- Major Healing Potion +(19947,13444,0.5,1,0,1,1), -- Major Mana Potion +(19947,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(19947,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Darkcrest Taskmaster, NPC 18086 +-- --------------------------------------------------- +(18086,24280,-80,1,0,1,1), -- QItem: Naga Claws +(18086,24401,30,1,0,1,1), -- Unidentified Plant Parts +(18086,17057,25,1,0,1,1), -- Shiny Fish Scales +(18086,17058,20,1,0,1,1), -- Fish Oil +(18086,24476,15,1,0,1,1), -- Jaggal Clam +(18086,27858,3,1,0,1,3), -- Sunspring Carp +(18086,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(18086,13446,1,1,0,1,1), -- Major Healing Potion +(18086,13444,0.5,1,0,1,1), -- Major Mana Potion +(18086,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18086,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Dreghood Drudge, NPC 18122 +-- --------------------------------------------------- +(18122,21877,60,1,0,1,3), -- Netherweave Cloth +(18122,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18122,27854,3,1,0,1,1), -- Smoked Talbuk Venison +(18122,28399,1.5,1,0,1,1), -- Filtered Draenic Water +(18122,13446,1,1,0,1,1), -- Major Healing Potion +(18122,13444,0.5,1,0,1,1), -- Major Mana Potion +(18122,2,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Fen Strider, NPC 18134 +-- --------------------------------------------------- +(18134,25434,81,1,1,1,1), -- Fractured Carapace +(18134,25436,19,1,1,1,1), -- Twitching Leg +(18134,27676,50,1,0,1,1), -- Strange Spores +(18134,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18134,24427,20,1,0,1,1), -- QItem: Fen Strider Tentacle +(18134,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Fenclaw Thrasher, NPC 18214 +-- --------------------------------------------------- +(18214,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(18214,25431,19,1,1,1,1), -- Ripped Fin +(18214,24486,-50,1,0,1,1), -- QItem: Fenclaw Hide +(18214,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18214,24476,15,1,0,1,1), -- Jaggal Clam +(18214,24375,-15,1,0,1,1), -- QItem: Thick Hydra Scale +(18214,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Fenglow Stinger, NPC 20198 +-- --------------------------------------------------- +(20198,25434,80,1,1,1,1), -- Fractured Carapace +(20198,25436,20,1,1,1,1), -- Twitching Leg +(20198,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing +(20198,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20198,24485,-30,1,0,1,1), -- QItem: Marshlight Bleeder Venom +(20198,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Feralfen Druid, NPC 20270 +-- --------------------------------------------------- +(20270,24497,-25,1,0,1,1), -- QItem: Feralfen Protection Totem +(20270,21877,60,1,0,1,3), -- Netherweave Cloth +(20270,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(20270,28399,3,1,0,1,1), -- Filtered Draenic Water +(20270,13446,2,1,0,1,1), -- Major Healing Potion +(20270,13444,1,1,0,1,1), -- Major Mana Potion +(20270,1,80,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +(20270,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Feralfen Hunter, NPC 18113 +-- --------------------------------------------------- +(18113,24497,-10,1,0,1,1), -- QItem: Feralfen Protection Totem +(18113,21877,60,1,0,1,3), -- Netherweave Cloth +(18113,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18113,28399,3,1,0,1,1), -- Filtered Draenic Water +(18113,13446,2,1,0,1,1), -- Major Healing Potion +(18113,13444,1,1,0,1,1), -- Major Mana Potion +(18113,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18113,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Feralfen Mystic, NPC 18114 +-- --------------------------------------------------- +(18114,24497,-40,1,0,1,1), -- QItem: Feralfen Protection Totem +(18114,21877,60,1,0,1,3), -- Netherweave Cloth +(18114,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18114,28399,3,1,0,1,1), -- Filtered Draenic Water +(18114,13446,2,1,0,1,1), -- Major Healing Potion +(18114,13444,1,1,0,1,1), -- Major Mana Potion +(18114,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18114,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Fungal Giant, NPC 19734 +-- --------------------------------------------------- +(19734,25450,81,1,0,1,1), -- Creeping Moss +(19734,25452,19,1,1,1,1), -- Blighted Fungus +(19734,24401,25,1,0,1,1), -- Unidentified Plant Parts +(19734,22575,19,1,0,1,3), -- Mote of Life +(19734,12803,1,1,0,1,1), -- Living Essence +(19734,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Greater Sporebat, NPC 18129 +-- --------------------------------------------------- +(18129,25456,81,1,1,1,1), -- Glowing Spores +(18129,25454,19,1,1,1,1), -- Luminescent Globe +(18129,27676,50,1,0,1,1), -- Strange Spores +(18129,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18129,24401,26,1,0,1,1), -- Unidentified Plant Parts +(18129,1,95,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ironspine Gazer, NPC 19730 +-- --------------------------------------------------- +(19730,1701,80,1,1,1,1), -- Curved Basilisk Claw +(19730,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(19730,29553,2,1,1,1,1), -- Basilisk Guts +(19730,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(19730,27677,45,1,0,1,1), -- Chunk O'Basilisk +(19730,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Ironspine Threshalisk, NPC 19729 +-- --------------------------------------------------- +(19729,1701,80,1,1,1,1), -- Curved Basilisk Claw +(19729,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(19729,29553,2,1,1,1,1), -- Basilisk Guts +(19729,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(19729,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Kataru, NPC 18080 +-- --------------------------------------------------- +(18080,21877,60,1,0,1,3), -- Netherweave Cloth +(18080,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18080,28399,3,1,0,1,1), -- Filtered Draenic Water +(18080,13446,2,1,0,1,1), -- Major Healing Potion +(18080,13444,1,1,0,1,1), -- Major Mana Potion +(18080,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Lagoon Eel, NPC 20290 +-- --------------------------------------------------- +(20290,28058,81,1,1,1,1), -- Shredded Wyrm Wing +(20290,28059,19,1,1,1,1), -- Iridescent Eye +(20290,22578,19,1,0,1,1), -- Mote of Water +(20290,7080,1,1,0,1,1), -- Essence of Water +(20290,1,85,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Lagoon Walker, NPC 20291 +-- --------------------------------------------------- +(20291,25450,82,1,0,1,1), -- Creeping Moss +(20291,25452,18,1,1,1,1), -- Blighted Fungus +(20291,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20291,22575,19,1,0,1,2), -- Mote of Life +(20291,12803,1.5,1,0,1,2), -- Living Essence +(20291,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Lord Klaq, NPC 18282 +-- --------------------------------------------------- +(18282,24401,30,1,0,1,1), -- Unidentified Plant Parts +(18282,17057,30,1,0,1,1), -- Shiny Fish Scales +(18282,17058,25,1,0,1,1), -- Fish Oil +(18282,24476,15,1,0,1,1), -- Jaggal Clam +(18282,27858,4,1,0,1,3), -- Sunspring Carp +(18282,28399,2,1,0,1,1), -- Filtered Draenic Water +(18282,13446,1,1,0,1,1), -- Major Healing Potion +(18282,13444,0.5,1,0,1,1), -- Major Mana Potion +(18282,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Mal'druk the Soulrender, NPC 20445 +-- --------------------------------------------------- +(20445,21877,72,1,0,1,3), -- Netherweave Cloth +(20445,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(20445,28399,8,1,0,1,1), -- Filtered Draenic Water +(20445,13446,2,1,0,1,1), -- Major Healing Potion +(20445,13444,1,1,0,1,1), -- Major Mana Potion +(20445,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Marsh Baron Brok, NPC 20292 +-- --------------------------------------------------- +(20292,25450,80,1,0,1,1), -- Creeping Moss +(20292,25452,20,1,1,1,1), -- Blighted Fungus +(20292,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20292,22575,19,1,0,1,2), -- Mote of Life +(20292,12803,1,1,0,1,2), -- Living Essence +(20292,1,100,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Marsh Dredger, NPC 18137 +-- --------------------------------------------------- +(18137,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18137,17057,33,1,0,1,1), -- Shiny Fish Scales +(18137,17058,30,1,0,1,1), -- Fish Oil +(18137,24476,20,1,0,1,1), -- Jaggal Clam +(18137,27858,4,1,0,1,3), -- Sunspring Carp +(18137,28399,2,1,0,1,1), -- Filtered Draenic Water +(18137,13446,1,1,0,1,1), -- Major Healing Potion +(18137,13444,0.5,1,0,1,1), -- Major Mana Potion +(18137,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18137,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Marsh Lurker, NPC 18136 +-- --------------------------------------------------- +(18136,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18136,17057,33,1,0,1,1), -- Shiny Fish Scales +(18136,17058,30,1,0,1,1), -- Fish Oil +(18136,24476,20,1,0,1,1), -- Jaggal Clam +(18136,27858,4,1,0,1,3), -- Sunspring Carp +(18136,28399,2,1,0,1,1), -- Filtered Draenic Water +(18136,13446,1,1,0,1,1), -- Major Healing Potion +(18136,13444,0.5,1,0,1,1), -- Major Mana Potion +(18136,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +(18136,2,2,1,0,-6003,1), -- Scroll of * VI Reference +-- --------------------------------------------------- +-- Marsh Walker, NPC 18135 +-- --------------------------------------------------- +(18135,25434,81,1,1,1,1), -- Fractured Carapace +(18135,25436,19,1,1,1,1), -- Twitching Leg +(18135,27676,50,1,0,1,1), -- Strange Spores +(18135,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18135,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Marshfang Ripper, NPC 18130 +-- --------------------------------------------------- +(18130,25434,81,1,1,1,1), -- Fractured Carapace +(18130,25436,19,1,1,1,1), -- Twitching Leg +(18130,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18130,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshfang Slicer, NPC 18131 +-- --------------------------------------------------- +(18131,24493,-100,1,0,1,1), -- QItem: Marshfang Slicer Blade +(18131,25434,81,1,1,1,1), -- Fractured Carapace +(18131,25436,19,1,1,1,1), -- Twitching Leg +(18131,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18131,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshlight Bleeder, NPC 18133 +-- --------------------------------------------------- +(18133,25434,80,1,1,1,1), -- Fractured Carapace +(18133,25436,20,1,1,1,1), -- Twitching Leg +(18133,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18133,24372,-10,1,0,1,1), -- QItem: Diaphanous Wing +(18133,24485,-30,1,0,1,1), -- QItem: Marshlight Bleeder Venom +(18133,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshrock Stomper, NPC 20283 +-- --------------------------------------------------- +(20283,1701,80,1,1,1,1), -- Curved Basilisk Claw +(20283,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(20283,29553,2,1,1,1,1), -- Basilisk Guts +(20283,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(20283,27677,45,1,0,1,1), -- Chunk O'Basilisk +(20283,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marshrock Threshalisk, NPC 19706 +-- --------------------------------------------------- +(19706,1701,81,1,1,1,1), -- Curved Basilisk Claw +(19706,11389,18,1,1,1,1), -- Shimmering Basilisk Sking +(19706,29553,1,1,1,1,1), -- Basilisk Guts +(19706,27677,50,1,0,1,1), -- Chunk O'Basilisk +(19706,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Marticar, NPC 18680 +-- --------------------------------------------------- +(18680,31254,100,1,0,1,1), -- Striderhide Cloak +(18680,25456,80,1,1,2,4), -- Glowing Spores +(18680,25454,20,1,1,2,4), -- Luminescent Glove +-- --------------------------------------------------- +-- Mire Hydra, NPC 18213 +-- --------------------------------------------------- +(18213,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(18213,25431,19,1,1,1,1), -- Ripped Fin +(18213,24375,-100,1,0,1,1), -- QItem: Thick Hydra Scale +(18213,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18213,24476,15,1,0,1,1), -- Jaggal Clam +(18213,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Mragesh, NPC 18286 +-- --------------------------------------------------- +(18286,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(18286,25431,19,1,1,1,1), -- Ripped Fin +(18286,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18286,24476,15,1,0,1,1), -- Jaggal Clam +(18286,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Mudfin Frenzy, NPC 18212 +-- --------------------------------------------------- +(18212,25429,80,1,1,1,1), -- Grime-Encrusted Scale +(18212,25431,20,1,1,1,1), -- Ripped Fin +(18212,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18212,1,10,1,0,-4000,1), -- Grey lvl 61 Item +(18212,2,10,1,0,-4001,1), -- Grey lvl 64 Item +-- --------------------------------------------------- +-- Overlord Gorefist, NPC 18160 +-- --------------------------------------------------- +(18160,24240,-20,1,0,1,1), -- QItem: Box of Mushrooms +(18160,21877,55,1,0,1,3), -- Netherweave Cloth +(18160,27854,6,1,0,1,1), -- Smoked Talbuk Venison +(18160,28399,3,1,0,1,1), -- Filtered Draenic Water +(18160,13446,2,1,0,1,1), -- Major Healing Potion +(18160,13444,1,1,0,1,1), -- Major Mana Potion +(18160,2,85,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Parched Hydra, NPC 20324 +-- --------------------------------------------------- +(20324,25429,81,1,1,1,1), -- Grime-Encrusted Scale +(20324,25431,19,1,1,1,1), -- Ripped Fin +(20324,24401,25,1,0,1,1), -- Unidentified Plant Parts +(20324,24375,-100,1,0,1,1), -- QItem: Thick Hydra Scale +(20324,24476,15,1,0,1,1), -- Jaggal Clam +(20324,29480,-15,1,0,1,1), -- QItem: Parched Hydra Sample +(20324,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Ragestone Threshalisk, NPC 20279 +-- --------------------------------------------------- +(20279,1701,80,1,1,1,1), -- Curved Basilisk Claw +(20279,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(20279,29553,2,1,1,1,1), -- Basilisk Guts +(20279,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(20279,27677,45,1,0,1,1), -- Chunk O'Basilisk +(20279,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Ragestone Trampler, NPC 20280 +-- --------------------------------------------------- +(20280,1701,80,1,1,1,1), -- Curved Basilisk Claw +(20280,11389,17,1,1,1,1), -- Shimmering Basilisk Sking +(20280,29553,2,1,1,1,1), -- Basilisk Guts +(20280,29554,1,1,1,1,1), -- Encrusted Basilisk Skin +(20280,27677,45,1,0,1,1), -- Chunk O'Basilisk +(20280,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Rajah Haghazed, NPC 18046 +-- --------------------------------------------------- +(18046,24280,-65,1,0,1,1), -- QItem: Naga Claws +(18046,24476,26,1,0,1,1), -- Jaggal Clam +(18046,17057,25,1,0,1,1), -- Shiny Fish Scales +(18046,17058,20,1,0,1,1), -- Fish Oil +(18046,27858,4,1,0,1,3), -- Sunspring Carp +(18046,28399,2,1,0,1,1), -- Filtered Draenic Water +(18046,13446,1,1,0,1,1), -- Major Healing Potion +(18046,13444,0.5,1,0,1,1), -- Major Mana Potion +(18046,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Rajis Fyashe, NPC 18044 +-- --------------------------------------------------- +(18044,24280,-65,1,0,1,1), -- QItem: Naga Claws +(18044,24476,26,1,0,1,1), -- Jaggal Clam +(18044,17057,25,1,0,1,1), -- Shiny Fish Scales +(18044,17058,20,1,0,1,1), -- Fish Oil +(18044,27858,4,1,0,1,3), -- Sunspring Carp +(18044,28399,2,1,0,1,1), -- Filtered Draenic Water +(18044,13446,1,1,0,1,1), -- Major Healing Potion +(18044,13444,0.5,1,0,1,1), -- Major Mana Potion +(18044,2,90,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Sporebat, NPC 18128 +-- --------------------------------------------------- +(18128,25456,80,1,1,1,1), -- Glowing Spores +(18128,25454,20,1,1,1,1), -- Luminescent Globe +(18128,27676,50,1,0,1,1), -- Strange Spores +(18128,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18128,24401,26,1,0,1,1), -- Unidentified Plant Parts +(18128,24426,-20,1,0,1,1), -- QItem: Sporebat Eye +(18128,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Sporewing, NPC 18280 +-- --------------------------------------------------- +(18280,25456,80,1,1,1,1), -- Glowing Spores +(18280,25454,20,1,1,1,1), -- Luminescent Globe +(18280,27676,50,1,0,1,1), -- Strange Spores +(18280,24449,-35,1,0,1,1), -- QItem: Fertile Spores +(18280,24401,26,1,0,1,1), -- Unidentified Plant Parts +(18280,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Ssslith, NPC 18154 +-- --------------------------------------------------- +(18154,24476,30,1,0,1,1), -- Jaggal Clam +(18154,17057,25,1,0,1,1), -- Shiny Fish Scales +(18154,17058,20,1,0,1,1), -- Fish Oil +(18154,27858,4,1,0,1,3), -- Sunspring Carp +(18154,28399,2,1,0,1,1), -- Filtered Draenic Water +(18154,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Starving Bog Lord, NPC 19519 +-- --------------------------------------------------- +(19519,25450,80,1,0,1,1), -- Creeping Moss +(19519,25452,20,1,1,1,1), -- Blighted Fungus +(19519,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril +(19519,24401,25,1,0,1,1), -- Unidentified Plant Parts +(19519,22575,19,1,0,1,1), -- Mote of Life +(19519,12803,1,1,0,1,1), -- Living Essence +(19519,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Starving Fungal Giant, NPC 18125 +-- --------------------------------------------------- +(18125,25450,80,1,0,1,1), -- Creeping Moss +(18125,25452,20,1,1,1,1), -- Blighted Fungus +(18125,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril +(18125,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18125,22575,19,1,0,1,1), -- Mote of Life +(18125,12803,1,1,0,1,1), -- Living Essence +(18125,1,100,1,0,-6010,1), -- Generic Zangermarsh Loot +-- --------------------------------------------------- +-- Steam Pump Overseer, NPC 18340 +-- --------------------------------------------------- +(18340,24280,-45,1,0,1,1), -- QItem: Naga Claws +(18340,24401,35,1,0,1,1), -- Unidentified Plant Parts +(18340,17057,30,1,0,1,1), -- Shiny Fish Scales +(18340,17058,25,1,0,1,1), -- Fish Oil +(18340,24476,15,1,0,1,1), -- Jaggal Clam +(18340,24330,-40,1,0,1,1), -- QItem: Drain Schematics +(18340,27858,4,1,0,1,3), -- Sunspring Carp +(18340,28399,2,1,0,1,1), -- Filtered Draenic Water +(18340,13446,1.5,1,0,1,1), -- Major Healing Potion +(18340,13444,0.75,1,0,1,1), -- Major Mana Potion +(18340,1,2,1,0,-6003,1), -- Scroll of * VI Reference +(18340,2,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Terrorclaw, NPC 20477 +-- --------------------------------------------------- +(20477,17057,34,1,0,1,1), -- Shiny Fish Scales +(20477,24401,34,1,0,1,1), -- Unidentified Plant Parts +(20477,17058,30,1,0,1,1), -- Fish Oil +(20477,24476,20,1,0,1,1), -- Jaggal Clam +(20477,27858,4,1,0,1,3), -- Sunspring Carp +(20477,28399,2,1,0,1,1), -- Filtered Draenic Water +(20477,13446,1.5,1,0,1,1), -- Major Healing Potion +(20477,13444,0.75,1,0,1,1), -- Major Mana Potion +(20477,1,90,1,0,-6001,1), -- Generic HellfirePeninsula Loot1 (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Eel, NPC 18138 +-- --------------------------------------------------- +(18138,25429,80,1,1,1,1), -- Grime-Encrusted Scale +(18138,25431,20,1,1,1,1), -- Ripped Fin +(18138,24374,-40,1,0,1,1), -- QItem: Eel Filet +(18138,1,90,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Oracle, NPC 18077 +-- --------------------------------------------------- +(18077,21877,80,1,0,1,3), -- Netherweave Cloth +(18077,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18077,28399,4,1,0,1,1), -- Filtered Draenic Water +(18077,13446,2,1,0,1,1), -- Major Healing Potion +(18077,13444,1,1,0,1,1), -- Major Mana Potion +(18077,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18077,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Seer, NPC 18079 +-- --------------------------------------------------- +(18079,21877,80,1,0,1,3), -- Netherweave Cloth +(18079,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18079,28399,4,1,0,1,1), -- Filtered Draenic Water +(18079,13446,2,1,0,1,1), -- Major Healing Potion +(18079,13444,1,1,0,1,1), -- Major Mana Potion +(18079,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18079,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbrafen Witchdoctor, NPC 20115 +-- --------------------------------------------------- +(20115,21877,80,1,0,1,3), -- Netherweave Cloth +(20115,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(20115,28399,4,1,0,1,1), -- Filtered Draenic Water +(20115,13446,2,1,0,1,1), -- Major Healing Potion +(20115,13444,1,1,0,1,1), -- Major Mana Potion +(20115,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(20115,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Umbraglow Stinger, NPC 18132 +-- --------------------------------------------------- +(18132,25434,80,1,1,1,1), -- Fractured Carapace +(18132,25436,20,1,1,1,1), -- Twitching Leg +(18132,24372,-40,1,0,1,1), -- QItem: Diaphanous Wing +(18132,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Withered Bog Lord, NPC 19402 +-- --------------------------------------------------- +(19402,25450,80,1,0,1,1), -- Creeping Moss +(19402,25452,20,1,1,1,1), -- Blighted Fungus +(19402,24291,-30,1,0,1,1), -- QItem: Bog Lord Tendril +(19402,24401,25,1,0,1,1), -- Unidentified Plant Parts +(19402,22575,19,1,0,1,1), -- Mote of Life +(19402,29481,-15,1,0,1,1), -- QItem: Withered Bog Lord Sample +(19402,12803,1,1,0,1,1), -- Living Essence +(19402,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Withered Giant, NPC 18124 +-- --------------------------------------------------- +(18124,25450,80,1,0,1,1), -- Creeping Moss +(18124,25452,20,1,1,1,1), -- Blighted Fungus +(18124,24401,25,1,0,1,1), -- Unidentified Plant Parts +(18124,24291,-20,1,0,1,1), -- QItem: Bog Lord Tendril +(18124,22575,19,1,0,1,1), -- Mote of Life +(18124,24373,-5,1,0,1,1), -- QItem: Scout Jyoba's Report +(18124,24483,2,1,0,1,1), -- Withered Basidium Ally +(18124,24484,2,1,0,1,1), -- Withered Basidium Horde +(18124,12803,1,1,0,1,1), -- Living Essence +(18124,1,100,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Wrekt Slave, NPC 18123 +-- --------------------------------------------------- +(18123,21877,75,1,0,1,3), -- Netherweave Cloth +(18123,27854,8,1,0,1,1), -- Smoked Talbuk Venison +(18123,28399,4,1,0,1,1), -- Filtered Draenic Water +(18123,13446,2,1,0,1,1), -- Major Healing Potion +(18123,13444,1,1,0,1,1), -- Major Mana Potion +(18123,2,2,1,0,-6003,1), -- Scroll of * VI Reference +(18123,1,80,1,0,-6000,1), -- Generic HellfirePeninsula Loot (YES FOR ZM) +-- --------------------------------------------------- +-- Young Sporebat, NPC 20387 +-- --------------------------------------------------- +(20387,25456,80,1,1,1,1), -- Glowing Spores +(20387,25454,20,1,1,1,1), -- Luminescent Globe +(20387,27676,50,1,0,1,1), -- Strange Spores +(20387,24401,26,1,0,1,1), -- Unidentified Plant Parts +(20387,1,90,1,0,-6000,1); -- Generic HellfirePeninsula Loot (YES FOR ZM) diff --git a/sql/updates/world/2012_06_02_03_world_reference_loot_template.sql b/sql/updates/world/2012_06_02_03_world_reference_loot_template.sql new file mode 100644 index 00000000000..c712cbe18bd --- /dev/null +++ b/sql/updates/world/2012_06_02_03_world_reference_loot_template.sql @@ -0,0 +1,791 @@ +SET @Grey := 1001; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @Grey AND @Grey+53; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- level 52 Grey Items ilvl 57 +(@Grey+51,3951,0,1,1,1,1), -- Twill Vest +(@Grey+51,3976,0,1,1,1,1), -- Smooth Leather Armor +(@Grey+51,3995,0,1,1,1,1), -- Laminated Scale Cloak +(@Grey+51,8081,0,1,1,1,1), -- Light Plate Belt +(@Grey+51,8753,0,1,1,1,1), -- Smooth Leather Helmet +(@Grey+51,9186,0,1,1,1,1), -- Mind-numbing Poison III +(@Grey+51,13821,0,1,1,1,1), -- Bulky Maul +(@Grey+51,13825,0,1,1,1,1), -- Primed Musket +-- level 53 Grey Items ilvl 58 +(@Grey+52,3948,0,1,1,1,1), -- Twill Gloves +(@Grey+52,3973,0,1,1,1,1), -- Smooth Leather Gloves +(@Grey+52,3994,0,1,1,1,1), -- Laminated Scale Bracers +(@Grey+52,8080,0,1,1,1,1), -- Light Plate Chestpiece +(@Grey+52,13817,0,1,1,1,1); -- Tapered Greatsword +-- -------------------------------------------------------- +-- TBC_Greys_References +-- -------------------------------------------------------- +SET @GreyTBC := 4000; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GreyTBC AND @GreyTBC+2; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- level 61 Greys, ilvl 66 (32 items) +(@GreyTBC,24576,0,1,1,1,1), -- Loosely Threaded Belt +(@GreyTBC,24577,0,1,1,1,1), -- Loosely Threaded Boots +(@GreyTBC,24578,0,1,1,1,1), -- Loosely Threaded Bracers +(@GreyTBC,24580,0,1,1,1,1), -- Loosely Threaded Hat +(@GreyTBC,24782,0,1,1,1,1), -- Loosely Threaded Gloves +(@GreyTBC,25338,0,1,1,1,1), -- Loosely Threaded Pants +(@GreyTBC,25339,0,1,1,1,1), -- Loosely Threaded Shoulderpads +(@GreyTBC,25340,0,1,1,1,1), -- Loosely Threaded Vest +(@GreyTBC,25349,0,1,1,1,1), -- Moldy Leather Armor +(@GreyTBC,25350,0,1,1,1,1), -- Moldy Leather Belt +(@GreyTBC,25351,0,1,1,1,1), -- Moldy Leather Boots +(@GreyTBC,25352,0,1,1,1,1), -- Moldy Leather Bracers +(@GreyTBC,25353,0,1,1,1,1), -- Moldy Leather Gloves +(@GreyTBC,25354,0,1,1,1,1), -- Moldy Leather Helmet +(@GreyTBC,25355,0,1,1,1,1), -- Moldy Leather Pants +(@GreyTBC,25356,0,1,1,1,1), -- Moldy Leather Shoulderpads +(@GreyTBC,25365,0,1,1,1,1), -- Eroded Mail Armor +(@GreyTBC,25366,0,1,1,1,1), -- Eroded Mail Belt +(@GreyTBC,25367,0,1,1,1,1), -- Eroded Mail Boots +(@GreyTBC,25368,0,1,1,1,1), -- Eroded Mail Bracers +(@GreyTBC,25369,0,1,1,1,1), -- Eroded Mail Circlet +(@GreyTBC,25370,0,1,1,1,1), -- Eroded Mail Gloves +(@GreyTBC,25371,0,1,1,1,1), -- Eroded Mail Pants +(@GreyTBC,25372,0,1,1,1,1), -- Eroded Mail Shoulderpads +(@GreyTBC,25381,0,1,1,1,1), -- Tarnished Plate Belt +(@GreyTBC,25382,0,1,1,1,1), -- Tarnished Plate Boots +(@GreyTBC,25383,0,1,1,1,1), -- Tarnished Plate Bracers +(@GreyTBC,25384,0,1,1,1,1), -- Tarnished Plate Chestpiece +(@GreyTBC,25385,0,1,1,1,1), -- Tarnished Plate Gloves +(@GreyTBC,25386,0,1,1,1,1), -- Tarnished Plate Helmet +(@GreyTBC,25387,0,1,1,1,1), -- Tarnished Plate Pants +(@GreyTBC,25388,0,1,1,1,1), -- Tarnished Plate Shoulderpads +-- level 64 Greys, ilvl 69 (10 items) +(@GreyTBC+1,25397,0,1,1,1,1), -- Eroded Axe +(@GreyTBC+1,25398,0,1,1,1,1), -- Stone Reaper +(@GreyTBC+1,25399,0,1,1,1,1), -- Deteriorating Blade +(@GreyTBC+1,25400,0,1,1,1,1), -- Tarnished Claymore +(@GreyTBC+1,25401,0,1,1,1,1), -- Corroded Mace +(@GreyTBC+1,25402,0,1,1,1,1), -- The Stoppable Force +(@GreyTBC+1,25403,0,1,1,1,1), -- Sharpened Stilleto +(@GreyTBC+1,25404,0,1,1,1,1), -- Dense War Staff +(@GreyTBC+1,25405,0,1,1,1,1), -- Rusted Musket +(@GreyTBC+1,25406,0,1,1,1,1), -- Broken Longbow +-- lvl 67 Greys, ilvl 72 (32 items) +(@GreyTBC+2,25341,0,1,1,1,1), -- Dilapidated Cloth Belt +(@GreyTBC+2,25342,0,1,1,1,1), -- Dilapidated Cloth Boots +(@GreyTBC+2,25343,0,1,1,1,1), -- Dilapidated Cloth Bracers +(@GreyTBC+2,25344,0,1,1,1,1), -- Dilapidated Cloth Gloves +(@GreyTBC+2,25345,0,1,1,1,1), -- Dilapidated Cloth Hat +(@GreyTBC+2,25346,0,1,1,1,1), -- Dilapidated Cloth Pants +(@GreyTBC+2,25347,0,1,1,1,1), -- Dilapidated Cloth Shoulderpads +(@GreyTBC+2,25348,0,1,1,1,1), -- Dilapidated Cloth Vest +(@GreyTBC+2,25357,0,1,1,1,1), -- Decaying Leather Armor +(@GreyTBC+2,25358,0,1,1,1,1), -- Decaying Leather Belt +(@GreyTBC+2,25359,0,1,1,1,1), -- Decaying Leather Boots +(@GreyTBC+2,25360,0,1,1,1,1), -- Decaying Leather Bracers +(@GreyTBC+2,25361,0,1,1,1,1), -- Decaying Leather Gloves +(@GreyTBC+2,25362,0,1,1,1,1), -- Decaying Leather Helmet +(@GreyTBC+2,25363,0,1,1,1,1), -- Decaying Leather Pants +(@GreyTBC+2,25364,0,1,1,1,1), -- Decaying Leather Shoulderpads +(@GreyTBC+2,25373,0,1,1,1,1), -- Corroded Mail Armor +(@GreyTBC+2,25374,0,1,1,1,1), -- Corroded Mail Belt +(@GreyTBC+2,25375,0,1,1,1,1), -- Corroded Mail Boots +(@GreyTBC+2,25376,0,1,1,1,1), -- Corroded Mail Bracers +(@GreyTBC+2,25377,0,1,1,1,1), -- Corroded Mail Circlet +(@GreyTBC+2,25378,0,1,1,1,1), -- Corroded Mail Gloves +(@GreyTBC+2,25379,0,1,1,1,1), -- Corroded Mail Pants +(@GreyTBC+2,25380,0,1,1,1,1), -- Corroded Mail Shoulderpads +(@GreyTBC+2,25389,0,1,1,1,1), -- Deteriorating Plate Belt +(@GreyTBC+2,25390,0,1,1,1,1), -- Deteriorating Plate Boots +(@GreyTBC+2,25391,0,1,1,1,1), -- Deteriorating Plate Bracers +(@GreyTBC+2,25392,0,1,1,1,1), -- Deteriorating Plate Chestpiece +(@GreyTBC+2,25393,0,1,1,1,1), -- Deteriorating Plate Gloves +(@GreyTBC+2,25394,0,1,1,1,1), -- Deteriorating Plate Helmet +(@GreyTBC+2,25395,0,1,1,1,1), -- Deteriorating Plate Pants +(@GreyTBC+2,25396,0,1,1,1,1); -- Deteriorating Plate Shoulderpads +-- -------------------------------------------------------- +-- TBC_Greens_References +-- -------------------------------------------------------- +SET @GreenTBC := 4100; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @GreenTBC AND @GreenTBC+13; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- lvl 57 ilvl 81 greens (55 items) TBC +(@GreenTBC,25296,0,1,1,1,1), -- Absorption Dagger +(@GreenTBC,25324,0,1,1,1,1), -- Angerstaff +(@GreenTBC,25058,0,1,1,1,1), -- Anglesite Choker +(@GreenTBC,25240,0,1,1,1,1), -- Azerothian Longbow +(@GreenTBC,28531,0,1,1,1,1), -- Barbed Shrike +(@GreenTBC,24700,0,1,1,1,1), -- Bonechewer Bands +(@GreenTBC,24695,0,1,1,1,1), -- Bonechewer Chestpiece +(@GreenTBC,24693,0,1,1,1,1), -- Bonechewer Pelt-Girdle +(@GreenTBC,24698,0,1,1,1,1), -- Bonechewer Ripleggings +(@GreenTBC,24699,0,1,1,1,1), -- Bonechewer Shoulderguards +(@GreenTBC,24694,0,1,1,1,1), -- Bonechewer Shredboots +(@GreenTBC,24697,0,1,1,1,1), -- Bonechewer Skincloak +(@GreenTBC,24696,0,1,1,1,1), -- Bonechewer Spikegloves +(@GreenTBC,25114,0,1,1,1,1), -- Doomsayer's Mace +(@GreenTBC,25086,0,1,1,1,1), -- Dreamseeker Dandelion +(@GreenTBC,24920,0,1,1,1,1), -- Grimscale Armor +(@GreenTBC,24918,0,1,1,1,1), -- Grimscale Belt +(@GreenTBC,24921,0,1,1,1,1), -- Grimscale Gauntlets +(@GreenTBC,24922,0,1,1,1,1), -- Grimscale Helm +(@GreenTBC,24923,0,1,1,1,1), -- Grimscale Legguards +(@GreenTBC,24924,0,1,1,1,1), -- Grimscale Pauldrons +(@GreenTBC,24919,0,1,1,1,1), -- Grimscale Sabatons +(@GreenTBC,24925,0,1,1,1,1), -- Grimscale Vambraces +(@GreenTBC,25198,0,1,1,1,1), -- Karaborian Battle Axe +(@GreenTBC,25268,0,1,1,1,1), -- Lead-Slug Shotgun +(@GreenTBC,25100,0,1,1,1,1), -- Liege Blade +(@GreenTBC,25212,0,1,1,1,1), -- Lucky Strike Axe +(@GreenTBC,25282,0,1,1,1,1), -- Mahogany Wand +(@GreenTBC,25310,0,1,1,1,1), -- Naaru Lightmace +(@GreenTBC,25072,0,1,1,1,1), -- Northman's Shield +(@GreenTBC,24582,0,1,1,1,1), -- Outlander's Boots +(@GreenTBC,24588,0,1,1,1,1), -- Outlander's Bracers +(@GreenTBC,24585,0,1,1,1,1), -- Outlander's Facewrap +(@GreenTBC,24575,0,1,1,1,1), -- Outlander's Girdle +(@GreenTBC,24584,0,1,1,1,1), -- Outlander's Gloves +(@GreenTBC,24586,0,1,1,1,1), -- Outlander's Leggings +(@GreenTBC,24587,0,1,1,1,1), -- Outlander's Pauldrons +(@GreenTBC,24583,0,1,1,1,1), -- Outlander's Tunic +(@GreenTBC,25170,0,1,1,1,1), -- Rattan Bo Staff +(@GreenTBC,25184,0,1,1,1,1), -- Ravager Claws +(@GreenTBC,25156,0,1,1,1,1), -- Royal Crusader Sword +(@GreenTBC,25044,0,1,1,1,1), -- Rubellite Ring +(@GreenTBC,25128,0,1,1,1,1), -- Shining Mace +(@GreenTBC,25030,0,1,1,1,1), -- Silky Velvet Cloak +(@GreenTBC,25142,0,1,1,1,1), -- Telaari Longblade +(@GreenTBC,25254,0,1,1,1,1), -- Tower Crossbow +(@GreenTBC,24813,0,1,1,1,1), -- Unyielding Bindings +(@GreenTBC,24808,0,1,1,1,1), -- Unyielding Chain Vest +(@GreenTBC,24809,0,1,1,1,1), -- Unyielding Fists +(@GreenTBC,24807,0,1,1,1,1), -- Unyielding Footwraps +(@GreenTBC,24810,0,1,1,1,1), -- Unyielding Helm +(@GreenTBC,24811,0,1,1,1,1), -- Unyielding Leggings +(@GreenTBC,24812,0,1,1,1,1), -- Unyielding Spaulders +(@GreenTBC,24806,0,1,1,1,1), -- Unyielding Waistband +(@GreenTBC,25226,0,1,1,1,1), -- War Scythe +-- lvl 58 ilvl 84 greens (55 items) TBC +(@GreenTBC+1,24926,0,1,1,1,1), -- Ango'rosh Belt +(@GreenTBC+1,24928,0,1,1,1,1), -- Ango'rosh Breastplate +(@GreenTBC+1,24929,0,1,1,1,1), -- Ango'rosh Gauntlets +(@GreenTBC+1,24930,0,1,1,1,1), -- Ango'rosh Helm +(@GreenTBC+1,24931,0,1,1,1,1), -- Ango'rosh Legguards +(@GreenTBC+1,24932,0,1,1,1,1), -- Ango'rosh Pauldrons +(@GreenTBC+1,24927,0,1,1,1,1), -- Ango'rosh Sabatons +(@GreenTBC+1,24933,0,1,1,1,1), -- Ango'rosh Vambraces +(@GreenTBC+1,25241,0,1,1,1,1), -- Ashenvale Longbow +(@GreenTBC+1,25045,0,1,1,1,1), -- Azurite Ring +(@GreenTBC+1,25087,0,1,1,1,1), -- Bleeding Eye +(@GreenTBC+1,25325,0,1,1,1,1), -- Brutal Scar-Limb +(@GreenTBC+1,25101,0,1,1,1,1), -- Cross Pommel Dagger +(@GreenTBC+1,25283,0,1,1,1,1), -- Crystallized Ebony Wand +(@GreenTBC+1,25073,0,1,1,1,1), -- Emperor Shield +(@GreenTBC+1,24821,0,1,1,1,1), -- Felstone Bindings +(@GreenTBC+1,24816,0,1,1,1,1), -- Felstone Chain Vest +(@GreenTBC+1,24817,0,1,1,1,1), -- Felstone Gauntlets +(@GreenTBC+1,24815,0,1,1,1,1), -- Felstone Greaves +(@GreenTBC+1,24818,0,1,1,1,1), -- Felstone Helm +(@GreenTBC+1,24819,0,1,1,1,1), -- Felstone Leggings +(@GreenTBC+1,24820,0,1,1,1,1), -- Felstone Spaulders +(@GreenTBC+1,24814,0,1,1,1,1), -- Felstone Waistband +(@GreenTBC+1,25213,0,1,1,1,1), -- Fel-Touched Axe +(@GreenTBC+1,25059,0,1,1,1,1), -- Fire Opal Collar +(@GreenTBC+1,24590,0,1,1,1,1), -- Fireheart Boots +(@GreenTBC+1,24596,0,1,1,1,1), -- Fireheart Bracers +(@GreenTBC+1,24591,0,1,1,1,1), -- Fireheart Chestpiece +(@GreenTBC+1,24589,0,1,1,1,1), -- Fireheart Girdle +(@GreenTBC+1,24592,0,1,1,1,1), -- Fireheart Gloves +(@GreenTBC+1,24594,0,1,1,1,1), -- Fireheart Leggings +(@GreenTBC+1,24595,0,1,1,1,1), -- Fireheart Shoulderpads +(@GreenTBC+1,24593,0,1,1,1,1), -- Fireheart Skullcap +(@GreenTBC+1,25129,0,1,1,1,1), -- Giant's Leg Bone +(@GreenTBC+1,24708,0,1,1,1,1), -- Haal'eshi Bindings +(@GreenTBC+1,24702,0,1,1,1,1), -- Haal'eshi Boots +(@GreenTBC+1,24701,0,1,1,1,1), -- Haal'eshi Cord +(@GreenTBC+1,24704,0,1,1,1,1), -- Haal'eshi Gloves +(@GreenTBC+1,24705,0,1,1,1,1), -- Haal'eshi Hat +(@GreenTBC+1,24703,0,1,1,1,1), -- Haal'eshi Jerkin +(@GreenTBC+1,24706,0,1,1,1,1), -- Haal'eshi Leggings +(@GreenTBC+1,24707,0,1,1,1,1), -- Haal'eshi Pauldrons +(@GreenTBC+1,25199,0,1,1,1,1), -- Knight's War Axe +(@GreenTBC+1,25269,0,1,1,1,1), -- Longbeard Rifle +(@GreenTBC+1,25255,0,1,1,1,1), -- Ram's Head Crossbow +(@GreenTBC+1,25311,0,1,1,1,1), -- Revitalizing Hammer +(@GreenTBC+1,25115,0,1,1,1,1), -- Riversong Mace +(@GreenTBC+1,25157,0,1,1,1,1), -- Serpentlord Claymore +(@GreenTBC+1,25227,0,1,1,1,1), -- Sha'tari Longspear +(@GreenTBC+1,25143,0,1,1,1,1), -- Silver Hand Blade +(@GreenTBC+1,28532,0,1,1,1,1), -- Silver Throwing Knives +(@GreenTBC+1,25031,0,1,1,1,1), -- Silvermoon Royal Cloak +(@GreenTBC+1,25171,0,1,1,1,1), -- Straight Hardwood Staff +(@GreenTBC+1,25185,0,1,1,1,1), -- Thrasher Blades +(@GreenTBC+1,25297,0,1,1,1,1), -- Tuning Knife +-- lvl 59 ilvl 87 greens (55 items) TBC +(@GreenTBC+2,25298,0,1,1,1,1), -- Combustion Dagger +(@GreenTBC+2,24934,0,1,1,1,1), -- Darkcrest Belt +(@GreenTBC+2,24941,0,1,1,1,1), -- Darkcrest Bracers +(@GreenTBC+2,24936,0,1,1,1,1), -- Darkcrest Breastplate +(@GreenTBC+2,24937,0,1,1,1,1), -- Darkcrest Gauntlets +(@GreenTBC+2,24938,0,1,1,1,1), -- Darkcrest Helm +(@GreenTBC+2,24939,0,1,1,1,1), -- Darkcrest Legguards +(@GreenTBC+2,24940,0,1,1,1,1), -- Darkcrest Pauldrons +(@GreenTBC+2,24935,0,1,1,1,1), -- Darkcrest Sabatons +(@GreenTBC+2,25312,0,1,1,1,1), -- Glorious Scepter +(@GreenTBC+2,25270,0,1,1,1,1), -- Gnomish Assault Rifle +(@GreenTBC+2,25130,0,1,1,1,1), -- Gronn-Bone Club +(@GreenTBC+2,25228,0,1,1,1,1), -- Halberd Polearm +(@GreenTBC+2,25032,0,1,1,1,1), -- Hellfire Cloak +(@GreenTBC+2,25102,0,1,1,1,1), -- Jaedenis Dagger +(@GreenTBC+2,25200,0,1,1,1,1), -- Jagged Broadaxe +(@GreenTBC+2,25172,0,1,1,1,1), -- Jinbali Warp-Staff +(@GreenTBC+2,25088,0,1,1,1,1), -- Laughing Skull Orb +(@GreenTBC+2,25214,0,1,1,1,1), -- Mok'Nathal Battleaxe +(@GreenTBC+2,24824,0,1,1,1,1), -- Netherstalker Armor +(@GreenTBC+2,24822,0,1,1,1,1), -- Netherstalker Belt +(@GreenTBC+2,24829,0,1,1,1,1), -- Netherstalker Bracer +(@GreenTBC+2,24825,0,1,1,1,1), -- Netherstalker Gloves +(@GreenTBC+2,24823,0,1,1,1,1), -- Netherstalker Greaves +(@GreenTBC+2,24826,0,1,1,1,1), -- Netherstalker Helmet +(@GreenTBC+2,24827,0,1,1,1,1), -- Netherstalker Legguards +(@GreenTBC+2,24828,0,1,1,1,1), -- Netherstalker Mantle +(@GreenTBC+2,25116,0,1,1,1,1), -- Pneumatic War Hammer +(@GreenTBC+2,25326,0,1,1,1,1), -- Primal Lore-Staff +(@GreenTBC+2,25284,0,1,1,1,1), -- Purpleheart Wand +(@GreenTBC+2,25158,0,1,1,1,1), -- Skeletal Broadsword +(@GreenTBC+2,25144,0,1,1,1,1), -- Skettis Curved Blade +(@GreenTBC+2,25046,0,1,1,1,1), -- Spined Ring +(@GreenTBC+2,24601,0,1,1,1,1), -- Starfire Circlet +(@GreenTBC+2,24600,0,1,1,1,1), -- Starfire Gloves +(@GreenTBC+2,24603,0,1,1,1,1), -- Starfire Mantle +(@GreenTBC+2,24598,0,1,1,1,1), -- Starfire Sandals +(@GreenTBC+2,24597,0,1,1,1,1), -- Starfire Sash +(@GreenTBC+2,24602,0,1,1,1,1), -- Starfire Trousers +(@GreenTBC+2,24599,0,1,1,1,1), -- Starfire Vest +(@GreenTBC+2,24604,0,1,1,1,1), -- Starfire Wristwraps +(@GreenTBC+2,25256,0,1,1,1,1), -- Stronghold Crossbow +(@GreenTBC+2,25060,0,1,1,1,1), -- Sunstone Necklace +(@GreenTBC+2,25242,0,1,1,1,1), -- Telaari Longbow +(@GreenTBC+2,25074,0,1,1,1,1), -- Telaari Shield +(@GreenTBC+2,25186,0,1,1,1,1), -- Vampiric Handscythes +(@GreenTBC+2,24716,0,1,1,1,1), -- Vengeance Bands +(@GreenTBC+2,24709,0,1,1,1,1), -- Vengeance Belt +(@GreenTBC+2,24710,0,1,1,1,1), -- Vengeance Boots +(@GreenTBC+2,24711,0,1,1,1,1), -- Vengeance Chestpiece +(@GreenTBC+2,24712,0,1,1,1,1), -- Vengeance Gloves +(@GreenTBC+2,24713,0,1,1,1,1), -- Vengeance Helm +(@GreenTBC+2,24714,0,1,1,1,1), -- Vengeance Legguards +(@GreenTBC+2,24715,0,1,1,1,1), -- Vengeance Pauldrons +(@GreenTBC+2,28533,0,1,1,1,1), -- Wooden Boomerang +-- lvl 60 ilvl 90 greens (51 items) TBC +(@GreenTBC+3,24605,0,1,1,1,1), -- Laughing Skull Waistguard +(@GreenTBC+3,24606,0,1,1,1,1), -- Laughing Skull Boot +(@GreenTBC+3,24607,0,1,1,1,1), -- Laughing Skull Tunic +(@GreenTBC+3,24608,0,1,1,1,1), -- Laughing Skull Gloves +(@GreenTBC+3,24609,0,1,1,1,1), -- Laughing Skull Cap +(@GreenTBC+3,24610,0,1,1,1,1), -- Laughing Skull Pants +(@GreenTBC+3,24611,0,1,1,1,1), -- Laughing Skull Shoulderpads +(@GreenTBC+3,24612,0,1,1,1,1), -- Laughing Skull Bracelets +(@GreenTBC+3,24717,0,1,1,1,1), -- Dreghood Belt +(@GreenTBC+3,24718,0,1,1,1,1), -- Dreghood Boots +(@GreenTBC+3,24719,0,1,1,1,1), -- Dreghood Chestpiece +(@GreenTBC+3,24720,0,1,1,1,1), -- Dreghood Gloves +(@GreenTBC+3,24721,0,1,1,1,1), -- Dreghood Cowl +(@GreenTBC+3,24722,0,1,1,1,1), -- Dreghood Trousers +(@GreenTBC+3,24723,0,1,1,1,1), -- Dreghood Pauldrons +(@GreenTBC+3,24724,0,1,1,1,1), -- Dreghood Bands +(@GreenTBC+3,24830,0,1,1,1,1), -- Nexus-Strider Belt +(@GreenTBC+3,24831,0,1,1,1,1), -- Nexus-Strider Greaves +(@GreenTBC+3,24832,0,1,1,1,1), -- Nexus-Strider Breastplate +(@GreenTBC+3,24833,0,1,1,1,1), -- Nexus-Strider Gloves +(@GreenTBC+3,24834,0,1,1,1,1), -- Nexus-Strider Helmet +(@GreenTBC+3,24835,0,1,1,1,1), -- Nexus-Strider Legwraps +(@GreenTBC+3,24836,0,1,1,1,1), -- Nexus-Strider Mantle +(@GreenTBC+3,24837,0,1,1,1,1), -- Nexus-Strider Bracer +(@GreenTBC+3,24942,0,1,1,1,1), -- Bloodscale Belt +(@GreenTBC+3,24943,0,1,1,1,1), -- Bloodscale Sabatons +(@GreenTBC+3,24944,0,1,1,1,1), -- Bloodscale Breastplate +(@GreenTBC+3,24945,0,1,1,1,1), -- Bloodscale Gauntlets +(@GreenTBC+3,24946,0,1,1,1,1), -- Bloodscale Helm +(@GreenTBC+3,24947,0,1,1,1,1), -- Bloodscale Legguards +(@GreenTBC+3,24948,0,1,1,1,1), -- Bloodscale Pauldrons +(@GreenTBC+3,24949,0,1,1,1,1), -- Bloodscale Bracers +(@GreenTBC+3,25033,0,1,1,1,1), -- Scavenger's Cloak +(@GreenTBC+3,25047,0,1,1,1,1), -- Tourmaline Loop +(@GreenTBC+3,25061,0,1,1,1,1), -- Hiddenite Necklace +(@GreenTBC+3,25075,0,1,1,1,1), -- Hardened Steel Shield +(@GreenTBC+3,25089,0,1,1,1,1), -- Supplicant's Rod +(@GreenTBC+3,25103,0,1,1,1,1), -- Nightstalker Dagger +(@GreenTBC+3,25117,0,1,1,1,1), -- Flanged Battle Mace +(@GreenTBC+3,25131,0,1,1,1,1), -- Hateful Bludgeon +(@GreenTBC+3,25187,0,1,1,1,1), -- Shekketh Talons +(@GreenTBC+3,25201,0,1,1,1,1), -- Reaver's Sickle +(@GreenTBC+3,25215,0,1,1,1,1), -- Spiked Battle Axe +(@GreenTBC+3,25229,0,1,1,1,1), -- Partisan Polearm +(@GreenTBC+3,25243,0,1,1,1,1), -- Windtalker Bow +(@GreenTBC+3,25257,0,1,1,1,1), -- Citadel Crossbow +(@GreenTBC+3,25271,0,1,1,1,1), -- Croc-Hunter's Rifle +(@GreenTBC+3,25299,0,1,1,1,1), -- Siphoning Dagger +(@GreenTBC+3,25313,0,1,1,1,1), -- Cold-Iron Scepter +(@GreenTBC+3,25327,0,1,1,1,1), -- Frenzied Staff +(@GreenTBC+3,28534,0,1,1,1,1), -- Fel Tipped Dart +-- lvl 61 ilvl 93 greens (55 items) TBC +(@GreenTBC+4,24613,0,1,1,1,1), -- Vindicator Belt +(@GreenTBC+4,24614,0,1,1,1,1), -- Vindicator Boots +(@GreenTBC+4,24615,0,1,1,1,1), -- Vindicator Tunic +(@GreenTBC+4,24616,0,1,1,1,1), -- Vindicator Gloves +(@GreenTBC+4,24617,0,1,1,1,1), -- Vindicator Cap +(@GreenTBC+4,24618,0,1,1,1,1), -- Vindicator Pants +(@GreenTBC+4,24619,0,1,1,1,1), -- Vindicator Shoulderpads +(@GreenTBC+4,24620,0,1,1,1,1), -- Vindicator Bracers +(@GreenTBC+4,24725,0,1,1,1,1), -- Dementia Cord +(@GreenTBC+4,24726,0,1,1,1,1), -- Dementia Boots +(@GreenTBC+4,24727,0,1,1,1,1), -- Dementia Vest +(@GreenTBC+4,24728,0,1,1,1,1), -- Dementia Gloves +(@GreenTBC+4,24729,0,1,1,1,1), -- Dementia Hood +(@GreenTBC+4,24730,0,1,1,1,1), -- Dementia Trousers +(@GreenTBC+4,24731,0,1,1,1,1), -- Dementia Shoulderguards +(@GreenTBC+4,24732,0,1,1,1,1), -- Dementia Armguards +(@GreenTBC+4,24838,0,1,1,1,1), -- Wrathfin Waistband +(@GreenTBC+4,24839,0,1,1,1,1), -- Wrathfin Greaves +(@GreenTBC+4,24840,0,1,1,1,1), -- Wrathfin Armor +(@GreenTBC+4,24841,0,1,1,1,1), -- Wrathfin Gloves +(@GreenTBC+4,24842,0,1,1,1,1), -- Wrathfin Helmet +(@GreenTBC+4,24843,0,1,1,1,1), -- Wrathfin Legguards +(@GreenTBC+4,24844,0,1,1,1,1), -- Wrathfin Mantle +(@GreenTBC+4,24845,0,1,1,1,1), -- Wrathfin Bindings +(@GreenTBC+4,24950,0,1,1,1,1), -- Bogslayer Belt +(@GreenTBC+4,24951,0,1,1,1,1), -- Bogslayer Sabatons +(@GreenTBC+4,24952,0,1,1,1,1), -- Bogslayer Breastplate +(@GreenTBC+4,24953,0,1,1,1,1), -- Bogslayer Gauntlets +(@GreenTBC+4,24954,0,1,1,1,1), -- Bogslayer Helm +(@GreenTBC+4,24955,0,1,1,1,1), -- Bogslayer Legplates +(@GreenTBC+4,24956,0,1,1,1,1), -- Bogslayer Pauldrons +(@GreenTBC+4,24957,0,1,1,1,1), -- Bogslayer Bracers +(@GreenTBC+4,25034,0,1,1,1,1), -- Elementalist Cloak +(@GreenTBC+4,25048,0,1,1,1,1), -- Smoky Quartz Ring +(@GreenTBC+4,25062,0,1,1,1,1), -- Zircon Amulet +(@GreenTBC+4,25076,0,1,1,1,1), -- Screaming Shield +(@GreenTBC+4,25090,0,1,1,1,1), -- Slavehandler Rod +(@GreenTBC+4,25104,0,1,1,1,1), -- Anzac Dagger +(@GreenTBC+4,25118,0,1,1,1,1), -- Battle Star +(@GreenTBC+4,25132,0,1,1,1,1), -- Thrallmar War Hammer +(@GreenTBC+4,25146,0,1,1,1,1), -- Light-Etched Longsword +(@GreenTBC+4,25160,0,1,1,1,1), -- Vengeance Blade +(@GreenTBC+4,25174,0,1,1,1,1), -- Hanbo Staff +(@GreenTBC+4,25188,0,1,1,1,1), -- Spleenripper Claws +(@GreenTBC+4,25202,0,1,1,1,1), -- Kingly Axe +(@GreenTBC+4,25216,0,1,1,1,1), -- Ogre Splitting Axe +(@GreenTBC+4,25230,0,1,1,1,1), -- Voulge Blade +(@GreenTBC+4,25244,0,1,1,1,1), -- Viper Bow +(@GreenTBC+4,25258,0,1,1,1,1), -- Repeater Crossbow +(@GreenTBC+4,25272,0,1,1,1,1), -- PC-54 Shotgun +(@GreenTBC+4,25286,0,1,1,1,1), -- Yew Wand +(@GreenTBC+4,25300,0,1,1,1,1), -- Lightning Dagger +(@GreenTBC+4,25314,0,1,1,1,1), -- Ceremonial Hammer +(@GreenTBC+4,25328,0,1,1,1,1), -- Faerie-Kind Staff +(@GreenTBC+4,28535,0,1,1,1,1), -- Amani Throwing Axe +-- lvl 62 ilvl 96 greens (55 items) TBC +(@GreenTBC+5,24621,0,1,1,1,1), -- Slavehandler Belt +(@GreenTBC+5,24622,0,1,1,1,1), -- Slavehandler Footpads +(@GreenTBC+5,24623,0,1,1,1,1), -- Slavehandler Jerkin +(@GreenTBC+5,24624,0,1,1,1,1), -- Slavehandler Handwraps +(@GreenTBC+5,24625,0,1,1,1,1), -- Slavehandler Cap +(@GreenTBC+5,24626,0,1,1,1,1), -- Slavehandler Pants +(@GreenTBC+5,24627,0,1,1,1,1), -- Slavehandler Amice +(@GreenTBC+5,24628,0,1,1,1,1), -- Slavehandler Wristguards +(@GreenTBC+5,24733,0,1,1,1,1), -- Sunroc Waistband +(@GreenTBC+5,24734,0,1,1,1,1), -- Sunroc Boots +(@GreenTBC+5,24735,0,1,1,1,1), -- Sunroc Chestpiece +(@GreenTBC+5,24736,0,1,1,1,1), -- Sunroc Gloves +(@GreenTBC+5,24737,0,1,1,1,1), -- Sunroc Mask +(@GreenTBC+5,24738,0,1,1,1,1), -- Sunroc Pants +(@GreenTBC+5,24739,0,1,1,1,1), -- Sunroc Shoulderguards +(@GreenTBC+5,24740,0,1,1,1,1), -- Sunroc Armguards +(@GreenTBC+5,24846,0,1,1,1,1), -- Fenclaw Waistband +(@GreenTBC+5,24847,0,1,1,1,1), -- Fenclaw Footwraps +(@GreenTBC+5,24848,0,1,1,1,1), -- Fenclaw Armor +(@GreenTBC+5,24849,0,1,1,1,1), -- Fenclaw Fists +(@GreenTBC+5,24850,0,1,1,1,1), -- Fenclaw Helm +(@GreenTBC+5,24851,0,1,1,1,1), -- Fenclaw Legguards +(@GreenTBC+5,24852,0,1,1,1,1), -- Fenclaw Mantle +(@GreenTBC+5,24853,0,1,1,1,1), -- Fenclaw Bindings +(@GreenTBC+5,24958,0,1,1,1,1), -- Khan'aish Girdle +(@GreenTBC+5,24959,0,1,1,1,1), -- Khan'aish Greaves +(@GreenTBC+5,24960,0,1,1,1,1), -- Khan'aish Breastplate +(@GreenTBC+5,24961,0,1,1,1,1), -- Khan'aish Gloves +(@GreenTBC+5,24962,0,1,1,1,1), -- Khan'aish Helmet +(@GreenTBC+5,24963,0,1,1,1,1), -- Khan'aish Legplates +(@GreenTBC+5,24964,0,1,1,1,1), -- Khan'aish Epaulets +(@GreenTBC+5,24965,0,1,1,1,1), -- Khan'aish Bracers +(@GreenTBC+5,25035,0,1,1,1,1), -- Silver-Lined Cloak +(@GreenTBC+5,25049,0,1,1,1,1), -- Scheelite Ring +(@GreenTBC+5,25063,0,1,1,1,1), -- Multi-Colored Beads +(@GreenTBC+5,25077,0,1,1,1,1), -- Modani War-Shield +(@GreenTBC+5,25091,0,1,1,1,1), -- Mistyreed Torch +(@GreenTBC+5,25105,0,1,1,1,1), -- Arachnid Dagger +(@GreenTBC+5,25119,0,1,1,1,1), -- Silvermoon War-Mace +(@GreenTBC+5,25133,0,1,1,1,1), -- Stormwind Maul +(@GreenTBC+5,25147,0,1,1,1,1), -- Skystrider Katana +(@GreenTBC+5,25161,0,1,1,1,1), -- Dragon Wing Blade +(@GreenTBC+5,25175,0,1,1,1,1), -- Demoniac Longstaff +(@GreenTBC+5,25189,0,1,1,1,1), -- Ironspine Point +(@GreenTBC+5,25203,0,1,1,1,1), -- Chipped Woodchopper +(@GreenTBC+5,25217,0,1,1,1,1), -- Sundering Axe +(@GreenTBC+5,25231,0,1,1,1,1), -- Fel-Wrought Halberd +(@GreenTBC+5,25245,0,1,1,1,1), -- Razorsong Bow +(@GreenTBC+5,25259,0,1,1,1,1), -- Collapsible Crossbow +(@GreenTBC+5,25273,0,1,1,1,1), -- Sawed-Off Shotgun +(@GreenTBC+5,25287,0,1,1,1,1), -- Magician's Wand +(@GreenTBC+5,25301,0,1,1,1,1), -- Shattering Dagger +(@GreenTBC+5,25315,0,1,1,1,1), -- Restorative Mace +(@GreenTBC+5,25329,0,1,1,1,1), -- Tranquility Staff +(@GreenTBC+5,28536,0,1,1,1,1), -- Jagged Guillotine +-- lvl 63 ilvl 99 greens (55 items) TBC +(@GreenTBC+6,24629,0,1,1,1,1), -- Feralfen Sash +(@GreenTBC+6,24630,0,1,1,1,1), -- Feralfen Sandals +(@GreenTBC+6,24631,0,1,1,1,1), -- Feralfen Jerkin +(@GreenTBC+6,24632,0,1,1,1,1), -- Feralfen Hand +(@GreenTBC+6,24633,0,1,1,1,1), -- Feralfen Hood +(@GreenTBC+6,24634,0,1,1,1,1), -- Feralfen Pants +(@GreenTBC+6,24635,0,1,1,1,1), -- Feralfen Amice +(@GreenTBC+6,24636,0,1,1,1,1), -- Feralfen Cuffs +(@GreenTBC+6,24741,0,1,1,1,1), -- Ranger Belt +(@GreenTBC+6,24742,0,1,1,1,1), -- Ranger Boots +(@GreenTBC+6,24743,0,1,1,1,1), -- Ranger Jerkin +(@GreenTBC+6,24744,0,1,1,1,1), -- Ranger Gloves +(@GreenTBC+6,24745,0,1,1,1,1), -- Ranger Hat +(@GreenTBC+6,24746,0,1,1,1,1), -- Ranger Pants +(@GreenTBC+6,24747,0,1,1,1,1), -- Ranger Pauldrons +(@GreenTBC+6,24748,0,1,1,1,1), -- Ranger Armguards +(@GreenTBC+6,24854,0,1,1,1,1), -- Marshcreeper Belt +(@GreenTBC+6,24855,0,1,1,1,1), -- Marshcreeper Sludgeboots +(@GreenTBC+6,24856,0,1,1,1,1), -- Marshcreeper Fen-Vest +(@GreenTBC+6,24857,0,1,1,1,1), -- Marshcreeper Gloves +(@GreenTBC+6,24858,0,1,1,1,1), -- Marshcreeper Helm +(@GreenTBC+6,24859,0,1,1,1,1), -- Marshcreeper Leggings +(@GreenTBC+6,24860,0,1,1,1,1), -- Marshcreeper Mantle +(@GreenTBC+6,24861,0,1,1,1,1), -- Marshcreeper Bracelets +(@GreenTBC+6,24966,0,1,1,1,1), -- Talonguard Girdle +(@GreenTBC+6,24967,0,1,1,1,1), -- Talonguard Greaves +(@GreenTBC+6,24968,0,1,1,1,1), -- Talonguard Armor +(@GreenTBC+6,24969,0,1,1,1,1), -- Talonguard Gloves +(@GreenTBC+6,24970,0,1,1,1,1), -- Talonguard Helmet +(@GreenTBC+6,24971,0,1,1,1,1), -- Talonguard Legplates +(@GreenTBC+6,24972,0,1,1,1,1), -- Talonguard Epaulets +(@GreenTBC+6,24973,0,1,1,1,1), -- Talonguard Bracers +(@GreenTBC+6,25036,0,1,1,1,1), -- Boulderfist Cloak +(@GreenTBC+6,25050,0,1,1,1,1), -- Moldavite Ring +(@GreenTBC+6,25064,0,1,1,1,1), -- Amethyst Pendant +(@GreenTBC+6,25078,0,1,1,1,1), -- Zangari Shield +(@GreenTBC+6,25092,0,1,1,1,1), -- Consortium Crystal +(@GreenTBC+6,25106,0,1,1,1,1), -- Cobra Shortblade +(@GreenTBC+6,25120,0,1,1,1,1), -- Rockshard Club +(@GreenTBC+6,25134,0,1,1,1,1), -- Highmountain Hammer +(@GreenTBC+6,25148,0,1,1,1,1), -- Bone Collector Sword +(@GreenTBC+6,25162,0,1,1,1,1), -- Darkened Broadsword +(@GreenTBC+6,25176,0,1,1,1,1), -- Taiji Quarterstaff +(@GreenTBC+6,25190,0,1,1,1,1), -- Wight's Claws +(@GreenTBC+6,25204,0,1,1,1,1), -- Colossal War Axe +(@GreenTBC+6,25218,0,1,1,1,1), -- Silver-Edged Axe +(@GreenTBC+6,25232,0,1,1,1,1), -- War Glaive +(@GreenTBC+6,25246,0,1,1,1,1), -- Thalassian Compound Bow +(@GreenTBC+6,25260,0,1,1,1,1), -- Archer's Crossbow +(@GreenTBC+6,25274,0,1,1,1,1), -- Cliffjumper Shotgun +(@GreenTBC+6,25288,0,1,1,1,1), -- Conjurer's Wand +(@GreenTBC+6,25302,0,1,1,1,1), -- Soul-Drain Dagger +(@GreenTBC+6,25316,0,1,1,1,1), -- Spirit-Clad Mace +(@GreenTBC+6,25330,0,1,1,1,1), -- Starshine Staff +(@GreenTBC+6,28537,0,1,1,1,1), -- Wildhammer Throwing Axe +-- lvl 67 ilvl 111 greens (55 items) TBC +(@GreenTBC+10,24661,0,1,1,1,1), -- Shadow Council Chain +(@GreenTBC+10,24662,0,1,1,1,1), -- Shadow Council Boots +(@GreenTBC+10,24663,0,1,1,1,1), -- Shadow Council Tunic +(@GreenTBC+10,24664,0,1,1,1,1), -- Shadow Council Gloves +(@GreenTBC+10,24665,0,1,1,1,1), -- Shadow Council Cowl +(@GreenTBC+10,24666,0,1,1,1,1), -- Shadow Council Pants +(@GreenTBC+10,24667,0,1,1,1,1), -- Shadow Council Mantle +(@GreenTBC+10,24668,0,1,1,1,1), -- Shadow Council Bracer +(@GreenTBC+10,24773,0,1,1,1,1), -- Boneshredder Belt +(@GreenTBC+10,24774,0,1,1,1,1), -- Boneshredder Boots +(@GreenTBC+10,24775,0,1,1,1,1), -- Boneshredder Jerkin +(@GreenTBC+10,24776,0,1,1,1,1), -- Boneshredder Gloves +(@GreenTBC+10,24777,0,1,1,1,1), -- Boneshredder Skullcap +(@GreenTBC+10,24778,0,1,1,1,1), -- Boneshredder Britches +(@GreenTBC+10,24779,0,1,1,1,1), -- Boneshredder Shoulderguards +(@GreenTBC+10,24780,0,1,1,1,1), -- Boneshredder Wristguards +(@GreenTBC+10,24886,0,1,1,1,1), -- Skettis Belt +(@GreenTBC+10,24887,0,1,1,1,1), -- Skettis Footwraps +(@GreenTBC+10,24888,0,1,1,1,1), -- Skettis Chestpiece +(@GreenTBC+10,24889,0,1,1,1,1), -- Skettis Gauntlets +(@GreenTBC+10,24890,0,1,1,1,1), -- Skettis Helmet +(@GreenTBC+10,24891,0,1,1,1,1), -- Skettis Legguards +(@GreenTBC+10,24892,0,1,1,1,1), -- Skettis Spaulders +(@GreenTBC+10,24893,0,1,1,1,1), -- Skettis Bracer +(@GreenTBC+10,24998,0,1,1,1,1), -- Bloodfist Girdle +(@GreenTBC+10,24999,0,1,1,1,1), -- Bloodfist Greaves +(@GreenTBC+10,25000,0,1,1,1,1), -- Bloodfist Breastplate +(@GreenTBC+10,25001,0,1,1,1,1), -- Bloodfist Gloves +(@GreenTBC+10,25002,0,1,1,1,1), -- Bloodfist Helmet +(@GreenTBC+10,25003,0,1,1,1,1), -- Bloodfist Legplates +(@GreenTBC+10,25004,0,1,1,1,1), -- Bloodfist Epaulets +(@GreenTBC+10,25005,0,1,1,1,1), -- Bloodfist Vambraces +(@GreenTBC+10,25040,0,1,1,1,1), -- Murkblood Cape +(@GreenTBC+10,25054,0,1,1,1,1), -- Sodalite Band +(@GreenTBC+10,25068,0,1,1,1,1), -- Kunzite Necklace +(@GreenTBC+10,25082,0,1,1,1,1), -- Fel-Iron Shield +(@GreenTBC+10,25096,0,1,1,1,1), -- Elementalist Star +(@GreenTBC+10,25110,0,1,1,1,1), -- Sharp Bowie Knife +(@GreenTBC+10,25124,0,1,1,1,1), -- Footman Mace +(@GreenTBC+10,25138,0,1,1,1,1), -- Blood Knight Maul +(@GreenTBC+10,25152,0,1,1,1,1), -- Howling Sword +(@GreenTBC+10,25166,0,1,1,1,1), -- Mok'Nathal Warblade +(@GreenTBC+10,25180,0,1,1,1,1), -- Calenda Fighting Stick +(@GreenTBC+10,25194,0,1,1,1,1), -- Serpent's Fangs +(@GreenTBC+10,25208,0,1,1,1,1), -- Bladespire Broadaxe +(@GreenTBC+10,25222,0,1,1,1,1), -- Ceremonial Slayer's Axe +(@GreenTBC+10,25236,0,1,1,1,1), -- Grim Scythe +(@GreenTBC+10,25250,0,1,1,1,1), -- Rocslayer Longbow +(@GreenTBC+10,25264,0,1,1,1,1), -- Pocket Ballista +(@GreenTBC+10,25278,0,1,1,1,1), -- Nesingwary Longrifle +(@GreenTBC+10,25292,0,1,1,1,1), -- Mechano-Wand +(@GreenTBC+10,25306,0,1,1,1,1), -- Permafrost Dagger +(@GreenTBC+10,25320,0,1,1,1,1), -- Queen's Insignia +(@GreenTBC+10,25334,0,1,1,1,1), -- Intimidating Greatstaff +(@GreenTBC+10,28541,0,1,1,1,1), -- Sawshrike +(@GreenTBC+10,30520,0,1,1,1,1), -- Gold-Trimmed Cuffs +(@GreenTBC+10,30986,0,1,1,1,1), -- Bloodforged Guard +-- lvl 68 ilvl 114 greens (55 items) TBC +(@GreenTBC+11,25055,0,1,1,1,1), -- Alexandrite Ring +(@GreenTBC+11,25139,0,1,1,1,1), -- Algaz Battle Hammer +(@GreenTBC+11,25209,0,1,1,1,1), -- Amani Tomahawk +(@GreenTBC+11,25041,0,1,1,1,1), -- Ambusher's Cloak +(@GreenTBC+11,25097,0,1,1,1,1), -- Astralaan Orb +(@GreenTBC+11,25265,0,1,1,1,1), -- Barreled Crossbow +(@GreenTBC+11,25008,0,1,1,1,1), -- Conqueror's Breastplate +(@GreenTBC+11,25012,0,1,1,1,1), -- Conqueror's Epaulets +(@GreenTBC+11,25009,0,1,1,1,1), -- Conqueror's Gauntlets +(@GreenTBC+11,25006,0,1,1,1,1), -- Conqueror's Girdle +(@GreenTBC+11,25007,0,1,1,1,1), -- Conqueror's Greaves +(@GreenTBC+11,25010,0,1,1,1,1), -- Conqueror's Helmet +(@GreenTBC+11,25011,0,1,1,1,1), -- Conqueror's Legplates +(@GreenTBC+11,25013,0,1,1,1,1), -- Conqueror's Vambraces +(@GreenTBC+11,25195,0,1,1,1,1), -- Diamond Tipped Claws +(@GreenTBC+11,25321,0,1,1,1,1), -- Divine Hammer +(@GreenTBC+11,25293,0,1,1,1,1), -- Draenethyst Wand +(@GreenTBC+11,24669,0,1,1,1,1), -- Eldr'naan Belt +(@GreenTBC+11,24670,0,1,1,1,1), -- Eldr'naan Boots +(@GreenTBC+11,24676,0,1,1,1,1), -- Eldr'naan Bracelets +(@GreenTBC+11,24672,0,1,1,1,1), -- Eldr'naan Gloves +(@GreenTBC+11,24673,0,1,1,1,1), -- Eldr'naan Hood +(@GreenTBC+11,24671,0,1,1,1,1), -- Eldr'naan Jerkin +(@GreenTBC+11,24674,0,1,1,1,1), -- Eldr'naan Pants +(@GreenTBC+11,24675,0,1,1,1,1), -- Eldr'naan Shoulderpads +(@GreenTBC+11,25069,0,1,1,1,1), -- Epidote Stone Necklace +(@GreenTBC+11,25335,0,1,1,1,1), -- Feral Warp-Staff +(@GreenTBC+11,25153,0,1,1,1,1), -- Gladiator Greatblade +(@GreenTBC+11,28542,0,1,1,1,1), -- Heartseeker Knives +(@GreenTBC+11,25111,0,1,1,1,1), -- Lionhead Dagger +(@GreenTBC+11,24781,0,1,1,1,1), -- Murkblood Belt +(@GreenTBC+11,24783,0,1,1,1,1), -- Murkblood Boots +(@GreenTBC+11,24789,0,1,1,1,1), -- Murkblood Bracers +(@GreenTBC+11,24784,0,1,1,1,1), -- Murkblood Chestpiece +(@GreenTBC+11,24786,0,1,1,1,1), -- Murkblood Cover +(@GreenTBC+11,24785,0,1,1,1,1), -- Murkblood Gloves +(@GreenTBC+11,24787,0,1,1,1,1), -- Murkblood Pants +(@GreenTBC+11,24788,0,1,1,1,1), -- Murkblood Shoulderguards +(@GreenTBC+11,25237,0,1,1,1,1), -- Nether Trident +(@GreenTBC+11,25167,0,1,1,1,1), -- Nethersteel Claymore +(@GreenTBC+11,25251,0,1,1,1,1), -- Orc Flatbow +(@GreenTBC+11,25125,0,1,1,1,1), -- Retro-Spike Club +(@GreenTBC+11,25279,0,1,1,1,1), -- Sen'jin Longrifle +(@GreenTBC+11,25307,0,1,1,1,1), -- Shadow Dagger +(@GreenTBC+11,25083,0,1,1,1,1), -- Smouldering Shield +(@GreenTBC+11,24896,0,1,1,1,1), -- Sundered Chestpiece +(@GreenTBC+11,24895,0,1,1,1,1), -- Sundered Footwraps +(@GreenTBC+11,24897,0,1,1,1,1), -- Sundered Gauntlets +(@GreenTBC+11,24898,0,1,1,1,1), -- Sundered Helmet +(@GreenTBC+11,24899,0,1,1,1,1), -- Sundered Legguards +(@GreenTBC+11,24900,0,1,1,1,1), -- Sundered Spaulders +(@GreenTBC+11,24894,0,1,1,1,1), -- Sundered Waistband +(@GreenTBC+11,25181,0,1,1,1,1), -- Tapered Staff +(@GreenTBC+11,24901,0,1,1,1,1), -- Tortured Bracer +(@GreenTBC+11,25223,0,1,1,1,1), -- Windcaller Hatchet +-- lvl 69 ilvl 117 greens (55 items) TBC +(@GreenTBC+12,25056,0,1,1,1,1), -- Almandine Ring +(@GreenTBC+12,25126,0,1,1,1,1), -- Anvilmar Hammer +(@GreenTBC+12,24677,0,1,1,1,1), -- Archmage Belt +(@GreenTBC+12,24684,0,1,1,1,1), -- Archmage Bracelets +(@GreenTBC+12,24680,0,1,1,1,1), -- Archmage Gloves +(@GreenTBC+12,24681,0,1,1,1,1), -- Archmage Headpiece +(@GreenTBC+12,24683,0,1,1,1,1), -- Archmage Mantle +(@GreenTBC+12,24682,0,1,1,1,1), -- Archmage Pants +(@GreenTBC+12,24679,0,1,1,1,1), -- Archmage Robe +(@GreenTBC+12,24678,0,1,1,1,1), -- Archmage Slippers +(@GreenTBC+12,25154,0,1,1,1,1), -- Blood Groove Blade +(@GreenTBC+12,25196,0,1,1,1,1), -- Boneshredder Claws +(@GreenTBC+12,25140,0,1,1,1,1), -- Commanding Mallet +(@GreenTBC+12,25070,0,1,1,1,1), -- Coral Beads +(@GreenTBC+12,25182,0,1,1,1,1), -- Crystal-Etched Warstaff +(@GreenTBC+12,25210,0,1,1,1,1), -- Double-Bladed Axe +(@GreenTBC+12,25294,0,1,1,1,1), -- Dragonscale Wand +(@GreenTBC+12,25252,0,1,1,1,1), -- Dream Catcher Bow +(@GreenTBC+12,28543,0,1,1,1,1), -- Dreghood Throwing Axe +(@GreenTBC+12,24791,0,1,1,1,1), -- Expedition Boots +(@GreenTBC+12,24797,0,1,1,1,1), -- Expedition Bracers +(@GreenTBC+12,24790,0,1,1,1,1), -- Expedition Girdle +(@GreenTBC+12,24793,0,1,1,1,1), -- Expedition Gloves +(@GreenTBC+12,24794,0,1,1,1,1), -- Expedition Hood +(@GreenTBC+12,24795,0,1,1,1,1), -- Expedition Pants +(@GreenTBC+12,24796,0,1,1,1,1), -- Expedition Shoulderguards +(@GreenTBC+12,24792,0,1,1,1,1), -- Expedition Tunic +(@GreenTBC+12,25112,0,1,1,1,1), -- Fel Ripper +(@GreenTBC+12,25280,0,1,1,1,1), -- Game Hunter Musket +(@GreenTBC+12,25238,0,1,1,1,1), -- Hellfire War Spear +(@GreenTBC+12,25322,0,1,1,1,1), -- Lordly Scepter +(@GreenTBC+12,25042,0,1,1,1,1), -- Nether Cloak +(@GreenTBC+12,25168,0,1,1,1,1), -- Sha'tari Longsword +(@GreenTBC+12,25014,0,1,1,1,1), -- Shattered Hand Belt +(@GreenTBC+12,25016,0,1,1,1,1), -- Shattered Hand Breastplate +(@GreenTBC+12,25020,0,1,1,1,1), -- Shattered Hand Epaulets +(@GreenTBC+12,25017,0,1,1,1,1), -- Shattered Hand Gauntlets +(@GreenTBC+12,25018,0,1,1,1,1), -- Shattered Hand Helmet +(@GreenTBC+12,25019,0,1,1,1,1), -- Shattered Hand Legplates +(@GreenTBC+12,25015,0,1,1,1,1), -- Shattered Hand Sabatons +(@GreenTBC+12,25021,0,1,1,1,1), -- Shattered Hand Vambraces +(@GreenTBC+12,25224,0,1,1,1,1), -- Slavemaster Axe +(@GreenTBC+12,25336,0,1,1,1,1), -- Splintering Greatstaff +(@GreenTBC+12,24904,0,1,1,1,1), -- Talhide Chestpiece +(@GreenTBC+12,24906,0,1,1,1,1), -- Talhide Helmet +(@GreenTBC+12,24903,0,1,1,1,1), -- Talhide Lined-Boots +(@GreenTBC+12,24909,0,1,1,1,1), -- Talhide Lined-Bracers +(@GreenTBC+12,24905,0,1,1,1,1), -- Talhide Lined-Gloves +(@GreenTBC+12,24907,0,1,1,1,1), -- Talhide Lined-Leggings +(@GreenTBC+12,24908,0,1,1,1,1), -- Talhide Shoulderguards +(@GreenTBC+12,24902,0,1,1,1,1), -- Talhide Stitched-Belt +(@GreenTBC+12,25308,0,1,1,1,1), -- Thunder Spike +(@GreenTBC+12,25098,0,1,1,1,1), -- Tuurik Torch +(@GreenTBC+12,25266,0,1,1,1,1), -- Well-Balanced Crossbow +(@GreenTBC+12,25084,0,1,1,1,1), -- Zeth'Gor Shield +-- lvl 70 ilvl 120 greens (55 items) TBC +(@GreenTBC+13,25057,0,1,1,1,1), -- Amber Band +(@GreenTBC+13,25043,0,1,1,1,1), -- Amber Cape +(@GreenTBC+13,25323,0,1,1,1,1), -- Ascendant's Scepter +(@GreenTBC+13,28544,0,1,1,1,1), -- Assassin's Shuriken +(@GreenTBC+13,25281,0,1,1,1,1), -- Big-Boar Battle Rifle +(@GreenTBC+13,25225,0,1,1,1,1), -- Deepforge Broadaxe +(@GreenTBC+13,25099,0,1,1,1,1), -- Draenei Crystal Rod +(@GreenTBC+13,24805,0,1,1,1,1), -- Dragonhawk Bands +(@GreenTBC+13,24798,0,1,1,1,1), -- Dragonhawk Belt +(@GreenTBC+13,24799,0,1,1,1,1), -- Dragonhawk Boots +(@GreenTBC+13,24801,0,1,1,1,1), -- Dragonhawk Gloves +(@GreenTBC+13,24802,0,1,1,1,1), -- Dragonhawk Hat +(@GreenTBC+13,24803,0,1,1,1,1), -- Dragonhawk Pants +(@GreenTBC+13,24804,0,1,1,1,1), -- Dragonhawk Shoulderguards +(@GreenTBC+13,24800,0,1,1,1,1), -- Dragonhawk Tunic +(@GreenTBC+13,25085,0,1,1,1,1), -- Dragonscale Shield +(@GreenTBC+13,24685,0,1,1,1,1), -- Elementalist Belt +(@GreenTBC+13,24686,0,1,1,1,1), -- Elementalist Boots +(@GreenTBC+13,24692,0,1,1,1,1), -- Elementalist Bracelets +(@GreenTBC+13,24688,0,1,1,1,1), -- Elementalist Gloves +(@GreenTBC+13,24690,0,1,1,1,1), -- Elementalist Leggings +(@GreenTBC+13,24691,0,1,1,1,1), -- Elementalist Mantle +(@GreenTBC+13,24689,0,1,1,1,1), -- Elementalist Skullcap +(@GreenTBC+13,24687,0,1,1,1,1), -- Elementalist Tunic +(@GreenTBC+13,25169,0,1,1,1,1), -- Fel Orc Brute Sword +(@GreenTBC+13,25295,0,1,1,1,1), -- Flawless Wand +(@GreenTBC+13,25141,0,1,1,1,1), -- Halaani Hammer +(@GreenTBC+13,25155,0,1,1,1,1), -- Iron Skull Sword +(@GreenTBC+13,25127,0,1,1,1,1), -- Knight's War Hammer +(@GreenTBC+13,25239,0,1,1,1,1), -- Legend's Glaive +(@GreenTBC+13,24910,0,1,1,1,1), -- Netherstorm Belt +(@GreenTBC+13,24917,0,1,1,1,1), -- Netherstorm Bracer +(@GreenTBC+13,24912,0,1,1,1,1), -- Netherstorm Chestpiece +(@GreenTBC+13,24913,0,1,1,1,1), -- Netherstorm Gauntlets +(@GreenTBC+13,24911,0,1,1,1,1), -- Netherstorm Greaves +(@GreenTBC+13,24914,0,1,1,1,1), -- Netherstorm Helm +(@GreenTBC+13,24915,0,1,1,1,1), -- Netherstorm Legguards +(@GreenTBC+13,24916,0,1,1,1,1), -- Netherstorm Shoulderguards +(@GreenTBC+13,25113,0,1,1,1,1), -- Phantom Dagger +(@GreenTBC+13,25267,0,1,1,1,1), -- Rampant Crossbow +(@GreenTBC+13,25197,0,1,1,1,1), -- Razor Scythes +(@GreenTBC+13,25211,0,1,1,1,1), -- Rockbiter Cutter +(@GreenTBC+13,25337,0,1,1,1,1), -- Swarming Sting-Staff +(@GreenTBC+13,25071,0,1,1,1,1), -- Tanzanite Pendant +(@GreenTBC+13,25183,0,1,1,1,1), -- Voodoo Hex-Staff +(@GreenTBC+13,25024,0,1,1,1,1), -- Warlord's Iron-Breastplate +(@GreenTBC+13,25028,0,1,1,1,1), -- Warlord's Iron-Epaulets +(@GreenTBC+13,25025,0,1,1,1,1), -- Warlord's Iron-Gauntlets +(@GreenTBC+13,25022,0,1,1,1,1), -- Warlord's Iron-Girdle +(@GreenTBC+13,25026,0,1,1,1,1), -- Warlord's Iron-Helm +(@GreenTBC+13,25027,0,1,1,1,1), -- Warlord's Iron-Legplates +(@GreenTBC+13,25029,0,1,1,1,1), -- Warlord's Iron-Vambraces +(@GreenTBC+13,25023,0,1,1,1,1), -- Warlord's Sabatons +(@GreenTBC+13,25309,0,1,1,1,1), -- Warpdagger +(@GreenTBC+13,25253,0,1,1,1,1); -- Windspear Longbow +-- -------------------------------------------------------- +-- TBC_Blues_References +-- -------------------------------------------------------- +SET @BlueTBC := 4200; -- reference starting value TDB Field +DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @BlueTBC AND @BlueTBC+10; +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +-- lvl 60 blues ilvl 85((6 items) +(@BlueTBC,31125,0,1,1,1,1), -- Boots of the Decimator +(@BlueTBC,31126,0,1,1,1,1), -- Gloves of Ferocity +(@BlueTBC,31127,0,1,1,1,1), -- Hauberk of Totemic Rage +(@BlueTBC,31131,0,1,1,1,1), -- Sash of Silent Blades +(@BlueTBC,31133,0,1,1,1,1), -- Leggings of Concentrated Darkness +(@BlueTBC,31134,0,1,1,1,1), -- Blade of Misfortune +-- lvl 61 blues ilvl 88 (6 items) +(@BlueTBC+1,31136,0,1,1,1,1), -- Breastplate of Blade Turning +(@BlueTBC+1,31137,0,1,1,1,1), -- Gauntlets of Purification +(@BlueTBC+1,31138,0,1,1,1,1), -- Storm Lord's Girdle +(@BlueTBC+1,31139,0,1,1,1,1), -- Fist of Reckoning +(@BlueTBC+1,31140,0,1,1,1,1), -- Cloak of Entropy +(@BlueTBC+1,31142,0,1,1,1,1), -- Blade of Trapped Knowledge +-- lvl 62 blues ilvl 91 (6 items) +(@BlueTBC+2,31143,0,1,1,1,1), -- Shroud of Frenzy +(@BlueTBC+2,31145,0,1,1,1,1), -- Headdress of the Sleeper +(@BlueTBC+2,31147,0,1,1,1,1), -- Pendant of Cunning +(@BlueTBC+2,31148,0,1,1,1,1), -- Demon Hide Spaulders +(@BlueTBC+2,31149,0,1,1,1,1), -- Gloves of Pandemonium +(@BlueTBC+2,31150,0,1,1,1,1), -- Gloves of Piety +-- lvl 63 blues ilvl 94 (6 items) +(@BlueTBC+3,31151,0,1,1,1,1), -- Girdle of Siege +(@BlueTBC+3,31152,0,1,1,1,1), -- Girdle of SiegeChestguard of Illumination +(@BlueTBC+3,31153,0,1,1,1,1), -- Girdle of SiegeAxe of the Legion +(@BlueTBC+3,31173,0,1,1,1,1), -- Girdle of SiegeBoots of Savagery +(@BlueTBC+3,31175,0,1,1,1,1), -- Girdle of SiegeBlade Dancer's Wristguards +(@BlueTBC+3,31178,0,1,1,1,1), -- Girdle of SiegeAmulet of Unstable Power +-- lvl 64 blues ilvl 97 (6 items) +(@BlueTBC+4,31180,0,1,1,1,1), -- Gauntlets of the Skullsplitter +(@BlueTBC+4,31186,0,1,1,1,1), -- Braxxis' Staff of Slumber +(@BlueTBC+4,31187,0,1,1,1,1), -- Boots of the Pathfinder +(@BlueTBC+4,31190,0,1,1,1,1), -- The Dreamer's Shoulderpads +(@BlueTBC+4,31193,0,1,1,1,1), -- Blade of Unquenched Thirst +(@BlueTBC+4,31196,0,1,1,1,1), -- Amulet of Sanctification +-- lvl 65 blues ilvl 100 (6 items) +(@BlueTBC+5,31200,0,1,1,1,1), -- Shield of the Wayward Footman +(@BlueTBC+5,31202,0,1,1,1,1), -- Girdle of Divine Blessing +(@BlueTBC+5,31204,0,1,1,1,1), -- The Gunblade +(@BlueTBC+5,31222,0,1,1,1,1), -- Headdress of Inner Rage +(@BlueTBC+5,31226,0,1,1,1,1), -- Leggings of the Sly +(@BlueTBC+5,31230,0,1,1,1,1), -- Abyss Walker's Boots +-- lvl 68 blues ilvl 109 (6 items) +(@BlueTBC+8,31284,0,1,1,1,1), -- Bracers of Recklessness +(@BlueTBC+8,31285,0,1,1,1,1), -- Chestguard of the Talon +(@BlueTBC+8,31286,0,1,1,1,1), -- Breastplate of Rapid Striking +(@BlueTBC+8,31287,0,1,1,1,1), -- Draenei Honor Guard Shield +(@BlueTBC+8,31288,0,1,1,1,1), -- The Master's Treads +(@BlueTBC+8,31289,0,1,1,1,1), -- Staff of Divine Infusion +-- lvl 69 blues ilvl 112 (6 items) +(@BlueTBC+9,31291,0,1,1,1,1), -- Crystalforged War Axe +(@BlueTBC+9,31292,0,1,1,1,1), -- Crystal Pulse Shield +(@BlueTBC+9,31293,0,1,1,1,1), -- Girdle of Gale Force +(@BlueTBC+9,31294,0,1,1,1,1), -- Pauldrons of Surging Mana +(@BlueTBC+9,31295,0,1,1,1,1), -- Chestguard of the Dark Stalker +(@BlueTBC+9,31297,0,1,1,1,1), -- Robe of the Crimson Order +-- lvl 70 blues ilvl 115 (7 items) +(@BlueTBC+10,31298,0,1,1,1,1), -- Legguards of the Shattered Hand +(@BlueTBC+10,31299,0,1,1,1,1), -- The Oathkeeper +(@BlueTBC+10,31303,0,1,1,1,1), -- Valanos' Longbow +(@BlueTBC+10,31304,0,1,1,1,1), -- The Essence Focuser +(@BlueTBC+10,31305,0,1,1,1,1), -- Ced's Carver +(@BlueTBC+10,31306,0,1,1,1,1), -- Leggings of the Sacred Crest +(@BlueTBC+10,31308,0,1,1,1,1); -- The Bringer of Death diff --git a/sql/updates/world/2012_06_02_04_reference_loot_template.sql b/sql/updates/world/2012_06_02_04_reference_loot_template.sql deleted file mode 100644 index 57be9083048..00000000000 --- a/sql/updates/world/2012_06_02_04_reference_loot_template.sql +++ /dev/null @@ -1,11 +0,0 @@ -DELETE FROM `reference_loot_template` WHERE `entry` IN (14011,14012); -INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES -(14011,37759,0,1,1,1,1), -- Rhie-ay's Clutching Gauntlets -(14011,37768,0,1,1,1,1), -- Leggings of Violent Exsanguination -(14011,37790,0,1,1,1,1), -- Belt of Crystalline Tears -(14011,37806,0,1,1,1,1), -- Zabra's Misplaced Staff -(14011,37808,0,1,1,1,1), -- Dragonjaw Mauler -(14011,37809,0,1,1,1,1), -- Roc-Feather Longbow -(14012,3014,-70,1,0,1,1), -- Battleworn Axe -(14012,7906,-8,1,0,1,1); -- Horns of Nez'ra -UPDATE `creature_loot_template` SET `mincountOrRef`=14012 WHERE `mincountOrRef`=14011 AND `entry` IN (4464,436,437,440,485,615,4064,4065,4462,4463,435); diff --git a/sql/updates/world/2012_06_02_04_world_reference_loot_template.sql b/sql/updates/world/2012_06_02_04_world_reference_loot_template.sql new file mode 100644 index 00000000000..57be9083048 --- /dev/null +++ b/sql/updates/world/2012_06_02_04_world_reference_loot_template.sql @@ -0,0 +1,11 @@ +DELETE FROM `reference_loot_template` WHERE `entry` IN (14011,14012); +INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(14011,37759,0,1,1,1,1), -- Rhie-ay's Clutching Gauntlets +(14011,37768,0,1,1,1,1), -- Leggings of Violent Exsanguination +(14011,37790,0,1,1,1,1), -- Belt of Crystalline Tears +(14011,37806,0,1,1,1,1), -- Zabra's Misplaced Staff +(14011,37808,0,1,1,1,1), -- Dragonjaw Mauler +(14011,37809,0,1,1,1,1), -- Roc-Feather Longbow +(14012,3014,-70,1,0,1,1), -- Battleworn Axe +(14012,7906,-8,1,0,1,1); -- Horns of Nez'ra +UPDATE `creature_loot_template` SET `mincountOrRef`=14012 WHERE `mincountOrRef`=14011 AND `entry` IN (4464,436,437,440,485,615,4064,4065,4462,4463,435); diff --git a/sql/updates/world/2012_06_02_05_reference_loot_template.sql b/sql/updates/world/2012_06_02_05_reference_loot_template.sql deleted file mode 100644 index 51dee84ad9b..00000000000 --- a/sql/updates/world/2012_06_02_05_reference_loot_template.sql +++ /dev/null @@ -1,2 +0,0 @@ --- freaking -, im jumping from a cliff now... -UPDATE `creature_loot_template` SET `mincountOrRef`=-14012 WHERE `mincountOrRef`=-14011 AND `entry` IN (4464,436,437,440,485,615,4064,4065,4462,4463,435); diff --git a/sql/updates/world/2012_06_02_05_world_reference_loot_template.sql b/sql/updates/world/2012_06_02_05_world_reference_loot_template.sql new file mode 100644 index 00000000000..51dee84ad9b --- /dev/null +++ b/sql/updates/world/2012_06_02_05_world_reference_loot_template.sql @@ -0,0 +1,2 @@ +-- freaking -, im jumping from a cliff now... +UPDATE `creature_loot_template` SET `mincountOrRef`=-14012 WHERE `mincountOrRef`=-14011 AND `entry` IN (4464,436,437,440,485,615,4064,4065,4462,4463,435); -- cgit v1.2.3 From ed42aa14e79d1ca7782db3386fc12e7694c591aa Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 7 Jun 2012 12:05:25 -0230 Subject: DB/Updates: Fix file name and add missing deletes to a file. --- sql/updates/world/2012_05_30_05_world_gossip.sql | 3 +- .../world/2012_06_02_01_world_waypoimts.sql | 187 --------------------- .../world/2012_06_02_01_world_waypoints.sql | 187 +++++++++++++++++++++ 3 files changed, 189 insertions(+), 188 deletions(-) delete mode 100644 sql/updates/world/2012_06_02_01_world_waypoimts.sql create mode 100644 sql/updates/world/2012_06_02_01_world_waypoints.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_30_05_world_gossip.sql b/sql/updates/world/2012_05_30_05_world_gossip.sql index 37c7586cd60..5e7f1375320 100644 --- a/sql/updates/world/2012_05_30_05_world_gossip.sql +++ b/sql/updates/world/2012_05_30_05_world_gossip.sql @@ -175,7 +175,8 @@ INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8757,11094),(8757,11095); -- Creature Gossip_menu_option insert from sniff -DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8429,8435,8436,8437,8438,8439,8454,8490,8660,8661,8671,8672,8673,8674,8675,8676,8677,8679,8683,8685,8687,8689,8690,8691,8716,8717,8718,8719,8721,8722,8723,8724,8726,8737) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8303,8429,8435,8436,8437,8438,8439,8454,8490,8660,8661,8671,8672,8673,8674,8675,8676,8677,8679,8683,8685,8687,8689,8690,8691,8716,8717,8718,8719,8721,8722,8723,8724,8726,8737) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8672,8677,8718,8719) AND `id` IN (1); DELETE FROM `gossip_menu_option` WHERE `menu_id`=8304 AND `id` IN (0,1,2,3,4,5); DELETE FROM `gossip_menu_option` WHERE `menu_id`=8306 AND `id` IN (0,1); DELETE FROM `gossip_menu_option` WHERE `menu_id`=8455 AND `id` IN (0,1,2,3,4); diff --git a/sql/updates/world/2012_06_02_01_world_waypoimts.sql b/sql/updates/world/2012_06_02_01_world_waypoimts.sql deleted file mode 100644 index c50436bba8d..00000000000 --- a/sql/updates/world/2012_06_02_01_world_waypoimts.sql +++ /dev/null @@ -1,187 +0,0 @@ --- Ebon Blade Gargoyle -SET @NPC := 124428; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=8487.13,`position_y`=2648.587,`position_z`=661.3248,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,8487.13,2648.587,661.3248,0,0,0,100,0), -(@PATH,2,8489.394,2639.188,661.9919,0,0,0,100,0), -(@PATH,3,8498.239,2633.008,661.9919,0,0,0,100,0), -(@PATH,4,8514.016,2626.775,661.9919,0,0,0,100,0), -(@PATH,5,8529.975,2622.438,661.9919,0,0,0,100,0), -(@PATH,6,8556.946,2621.273,661.9919,0,0,0,100,0), -(@PATH,7,8576.765,2620.136,661.9919,0,0,0,100,0), -(@PATH,8,8584.989,2627.947,663.3527,0,0,0,100,0), -(@PATH,9,8590.352,2637.264,664.2969,0,0,0,100,0), -(@PATH,10,8597.313,2651.073,666.0464,0,0,0,100,0), -(@PATH,11,8590.045,2668.078,668.6855,0,0,0,100,0), -(@PATH,12,8577.563,2672.175,668.6855,0,0,0,100,0), -(@PATH,13,8567.869,2653.686,668.6855,0,0,0,100,0), -(@PATH,14,8559.406,2635.763,668.6855,0,0,0,100,0), -(@PATH,15,8550.115,2624.132,664.6028,0,0,0,100,0), -(@PATH,16,8538.325,2625.415,664.6028,0,0,0,100,0), -(@PATH,17,8531.294,2636.344,664.6028,0,0,0,100,0), -(@PATH,18,8536.005,2650.634,664.6028,0,0,0,100,0), -(@PATH,19,8536.659,2661.533,667.5744,0,0,0,100,0), -(@PATH,20,8528.161,2665.466,668.5468,0,0,0,100,0), -(@PATH,21,8521.834,2666.234,668.9914,0,0,0,100,0), -(@PATH,22,8506.145,2657.156,666.1024,0,0,0,100,0); - --- Ebon Blade Gargoyle -SET @NPC := 124429; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=8553.722,`position_y`=2732.757,`position_z`=672.1373,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,8553.722,2732.757,672.1373,0,0,0,100,0), -(@PATH,2,8545.085,2736.81,677.1306,0,0,0,100,0), -(@PATH,3,8538.377,2724.997,676.7698,0,0,0,100,0), -(@PATH,4,8527.725,2701.114,677.464,0,0,0,100,0), -(@PATH,5,8515.729,2672.526,676.4364,0,0,0,100,0), -(@PATH,6,8501.882,2638.781,674.6306,0,0,0,100,0), -(@PATH,7,8492.601,2619.312,672.9641,0,0,0,100,0), -(@PATH,8,8501.216,2604.361,672.7973,0,0,0,100,0), -(@PATH,9,8509.95,2597.643,672.464,0,0,0,100,0), -(@PATH,10,8516.437,2603.336,670.7147,0,0,0,100,0), -(@PATH,11,8526.045,2624.93,675.242,0,0,0,100,0), -(@PATH,12,8538.438,2654.096,677.4644,0,0,0,100,0), -(@PATH,13,8552.567,2688.411,676.0737,0,0,0,100,0), -(@PATH,14,8561.252,2709.44,676.1867,0,0,0,100,0), -(@PATH,15,8564.74,2718.366,676.9643,0,0,0,100,0), -(@PATH,16,8586.875,2713.758,677.4359,0,0,0,100,0), -(@PATH,17,8588.923,2702.79,676.2701,0,0,0,100,0), -(@PATH,18,8580.09,2682.738,673.3813,0,0,0,100,0), -(@PATH,19,8572.153,2664.409,674.4087,0,0,0,100,0), -(@PATH,20,8559.122,2635.23,674.5473,0,0,0,100,0), -(@PATH,21,8547.672,2610.971,677.3528,0,0,0,100,0), -(@PATH,22,8547.112,2593.927,677.77,0,0,0,100,0), -(@PATH,23,8556.546,2591.858,678.7695,0,0,0,100,0), -(@PATH,24,8566.203,2601.376,677.2705,0,0,0,100,0), -(@PATH,25,8576.512,2615.707,675.7764,0,0,0,100,0), -(@PATH,26,8585.419,2632.535,673.7208,0,0,0,100,0), -(@PATH,27,8596.079,2656.51,673.0544,0,0,0,100,0), -(@PATH,28,8594.222,2669.849,673.4442,0,0,0,100,0), -(@PATH,29,8595.935,2690.9,673.4711,0,0,0,100,0), -(@PATH,30,8592.354,2705.919,675.5258,0,0,0,100,0), -(@PATH,31,8571.288,2721.3,668.0258,0,0,0,100,0); - -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=32472; - --- Vargul Plaguetalon -SET @NPC := 97634; -SET @PATH := @NPC*10; -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=29453; -UPDATE `creature` SET `position_x`=5736.421,`position_y`=-1453.626,`position_z`=267.5013,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,5736.421,-1453.626,267.5013,0,0,0,100,0), -(@PATH,2,5700.896,-1467.002,263.9736,0,0,0,100,0), -(@PATH,3,5665.086,-1462.814,266.2513,0,0,0,100,0), -(@PATH,4,5623.596,-1446.303,258.3903,0,0,0,100,0), -(@PATH,5,5612.131,-1390.983,269.9736,0,0,0,100,0), -(@PATH,6,5630.01,-1325.786,252.9459,0,0,0,100,0), -(@PATH,7,5684.276,-1301.843,263.9736,0,0,0,100,0), -(@PATH,8,5717.019,-1325.604,263.9736,0,0,0,100,0), -(@PATH,9,5730.931,-1363.826,254.0014,0,0,0,100,0), -(@PATH,10,5737.854,-1429.533,273.2791,0,0,0,100,0); - --- Scourgebeak Fleshripper -SET @NPC := 121011; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=6805.096,`position_y`=3548.115,`position_z`=785.0337,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,6805.096,3548.115,785.0337,0,0,0,100,0), -(@PATH,2,6797.807,3599.297,776.1726,0,0,0,100,0), -(@PATH,3,6840.798,3607.1,769.2557,0,0,0,100,0), -(@PATH,4,6880.369,3577.403,779.5615,0,0,0,100,0); - --- Scourgebeak Fleshripper -SET @NPC := 121023; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=6490.46,`position_y`=3498.933,`position_z`=621.7417,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,6490.46,3498.933,621.7417,0,0,0,100,0), -(@PATH,2,6645.542,3512.415,678.8528,0,0,0,100,0), -(@PATH,3,6650.367,3555.357,680.6584,0,0,0,100,0), -(@PATH,4,6602.724,3563.045,661.1863,0,0,0,100,0), -(@PATH,5,6549.287,3554.462,642.825,0,0,0,100,0); - --- Scourgebeak Fleshripper -SET @NPC := 121019; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=6653.509,`position_y`=3526.14,`position_z`=693.2337,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,6653.509,3526.14,693.2337,0,0,0,100,0), -(@PATH,2,6696.053,3579.272,700.4001,0,0,0,100,0), -(@PATH,3,6744.93,3562.146,704.2611,0,0,0,100,0), -(@PATH,4,6738.125,3521.812,692.5392,0,0,0,100,0); - --- Scourgebeak Fleshripper -SET @NPC := 121017; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=6653.104,`position_y`=3415.26,`position_z`=672.1595,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,6653.104,3415.26,672.1595,0,0,0,100,0), -(@PATH,2,6717.518,3468.886,684.6567,0,0,0,100,0), -(@PATH,3,6771.674,3492.333,692.0456,0,0,0,100,0), -(@PATH,4,6728.592,3518.536,683.6566,0,0,0,100,0), -(@PATH,5,6627.954,3487.869,642.6566,0,0,0,100,0), -(@PATH,6,6571.027,3439.741,634.3512,0,0,0,100,0); - --- Scourgebeak Fleshripper -SET @NPC := 121014; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=6641.402,`position_y`=3330.479,`position_z`=724.3008,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,6641.402,3330.479,724.3008,0,0,0,100,0), -(@PATH,2,6637.165,3426.095,701.4395,0,0,0,100,0), -(@PATH,3,6701.476,3449.434,708.6896,0,0,0,100,0), -(@PATH,4,6746.966,3410.158,735.9395,0,0,0,100,0), -(@PATH,5,6697.637,3352.607,725.0784,0,0,0,100,0); - --- Scourgebeak Fleshripper -SET @NPC := 121025; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=6590.307,`position_y`=3325.47,`position_z`=699.1288,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,6590.307,3325.47,699.1288,0,0,0,100,0), -(@PATH,2,6543.557,3237.147,706.6288,0,0,0,100,0), -(@PATH,3,6518.691,3250.313,687.6565,0,0,0,100,0), -(@PATH,4,6512.266,3334.911,685.3231,0,0,0,100,0); - --- Scourgebeak Fleshripper -SET @NPC := 121007; -SET @PATH := @NPC*10; -UPDATE `creature` SET `position_x`=6459.715,`position_y`=3049.952,`position_z`=701.608,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; -DELETE FROM `creature_addon` WHERE `guid`=@NPC; -INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); -DELETE FROM `waypoint_data` WHERE `id`=@PATH; -INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE -(@PATH,1,6459.715,3049.952,701.608,0,0,0,100,0), -(@PATH,2,6485.836,3103.517,681.247,0,0,0,100,0), -(@PATH,3,6445.593,3154.588,677.886,0,0,0,100,0), -(@PATH,4,6392.533,3078.925,694.2471,0,0,0,100,0); diff --git a/sql/updates/world/2012_06_02_01_world_waypoints.sql b/sql/updates/world/2012_06_02_01_world_waypoints.sql new file mode 100644 index 00000000000..c50436bba8d --- /dev/null +++ b/sql/updates/world/2012_06_02_01_world_waypoints.sql @@ -0,0 +1,187 @@ +-- Ebon Blade Gargoyle +SET @NPC := 124428; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=8487.13,`position_y`=2648.587,`position_z`=661.3248,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,8487.13,2648.587,661.3248,0,0,0,100,0), +(@PATH,2,8489.394,2639.188,661.9919,0,0,0,100,0), +(@PATH,3,8498.239,2633.008,661.9919,0,0,0,100,0), +(@PATH,4,8514.016,2626.775,661.9919,0,0,0,100,0), +(@PATH,5,8529.975,2622.438,661.9919,0,0,0,100,0), +(@PATH,6,8556.946,2621.273,661.9919,0,0,0,100,0), +(@PATH,7,8576.765,2620.136,661.9919,0,0,0,100,0), +(@PATH,8,8584.989,2627.947,663.3527,0,0,0,100,0), +(@PATH,9,8590.352,2637.264,664.2969,0,0,0,100,0), +(@PATH,10,8597.313,2651.073,666.0464,0,0,0,100,0), +(@PATH,11,8590.045,2668.078,668.6855,0,0,0,100,0), +(@PATH,12,8577.563,2672.175,668.6855,0,0,0,100,0), +(@PATH,13,8567.869,2653.686,668.6855,0,0,0,100,0), +(@PATH,14,8559.406,2635.763,668.6855,0,0,0,100,0), +(@PATH,15,8550.115,2624.132,664.6028,0,0,0,100,0), +(@PATH,16,8538.325,2625.415,664.6028,0,0,0,100,0), +(@PATH,17,8531.294,2636.344,664.6028,0,0,0,100,0), +(@PATH,18,8536.005,2650.634,664.6028,0,0,0,100,0), +(@PATH,19,8536.659,2661.533,667.5744,0,0,0,100,0), +(@PATH,20,8528.161,2665.466,668.5468,0,0,0,100,0), +(@PATH,21,8521.834,2666.234,668.9914,0,0,0,100,0), +(@PATH,22,8506.145,2657.156,666.1024,0,0,0,100,0); + +-- Ebon Blade Gargoyle +SET @NPC := 124429; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=8553.722,`position_y`=2732.757,`position_z`=672.1373,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,8553.722,2732.757,672.1373,0,0,0,100,0), +(@PATH,2,8545.085,2736.81,677.1306,0,0,0,100,0), +(@PATH,3,8538.377,2724.997,676.7698,0,0,0,100,0), +(@PATH,4,8527.725,2701.114,677.464,0,0,0,100,0), +(@PATH,5,8515.729,2672.526,676.4364,0,0,0,100,0), +(@PATH,6,8501.882,2638.781,674.6306,0,0,0,100,0), +(@PATH,7,8492.601,2619.312,672.9641,0,0,0,100,0), +(@PATH,8,8501.216,2604.361,672.7973,0,0,0,100,0), +(@PATH,9,8509.95,2597.643,672.464,0,0,0,100,0), +(@PATH,10,8516.437,2603.336,670.7147,0,0,0,100,0), +(@PATH,11,8526.045,2624.93,675.242,0,0,0,100,0), +(@PATH,12,8538.438,2654.096,677.4644,0,0,0,100,0), +(@PATH,13,8552.567,2688.411,676.0737,0,0,0,100,0), +(@PATH,14,8561.252,2709.44,676.1867,0,0,0,100,0), +(@PATH,15,8564.74,2718.366,676.9643,0,0,0,100,0), +(@PATH,16,8586.875,2713.758,677.4359,0,0,0,100,0), +(@PATH,17,8588.923,2702.79,676.2701,0,0,0,100,0), +(@PATH,18,8580.09,2682.738,673.3813,0,0,0,100,0), +(@PATH,19,8572.153,2664.409,674.4087,0,0,0,100,0), +(@PATH,20,8559.122,2635.23,674.5473,0,0,0,100,0), +(@PATH,21,8547.672,2610.971,677.3528,0,0,0,100,0), +(@PATH,22,8547.112,2593.927,677.77,0,0,0,100,0), +(@PATH,23,8556.546,2591.858,678.7695,0,0,0,100,0), +(@PATH,24,8566.203,2601.376,677.2705,0,0,0,100,0), +(@PATH,25,8576.512,2615.707,675.7764,0,0,0,100,0), +(@PATH,26,8585.419,2632.535,673.7208,0,0,0,100,0), +(@PATH,27,8596.079,2656.51,673.0544,0,0,0,100,0), +(@PATH,28,8594.222,2669.849,673.4442,0,0,0,100,0), +(@PATH,29,8595.935,2690.9,673.4711,0,0,0,100,0), +(@PATH,30,8592.354,2705.919,675.5258,0,0,0,100,0), +(@PATH,31,8571.288,2721.3,668.0258,0,0,0,100,0); + +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=32472; + +-- Vargul Plaguetalon +SET @NPC := 97634; +SET @PATH := @NPC*10; +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=29453; +UPDATE `creature` SET `position_x`=5736.421,`position_y`=-1453.626,`position_z`=267.5013,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,5736.421,-1453.626,267.5013,0,0,0,100,0), +(@PATH,2,5700.896,-1467.002,263.9736,0,0,0,100,0), +(@PATH,3,5665.086,-1462.814,266.2513,0,0,0,100,0), +(@PATH,4,5623.596,-1446.303,258.3903,0,0,0,100,0), +(@PATH,5,5612.131,-1390.983,269.9736,0,0,0,100,0), +(@PATH,6,5630.01,-1325.786,252.9459,0,0,0,100,0), +(@PATH,7,5684.276,-1301.843,263.9736,0,0,0,100,0), +(@PATH,8,5717.019,-1325.604,263.9736,0,0,0,100,0), +(@PATH,9,5730.931,-1363.826,254.0014,0,0,0,100,0), +(@PATH,10,5737.854,-1429.533,273.2791,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121011; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6805.096,`position_y`=3548.115,`position_z`=785.0337,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6805.096,3548.115,785.0337,0,0,0,100,0), +(@PATH,2,6797.807,3599.297,776.1726,0,0,0,100,0), +(@PATH,3,6840.798,3607.1,769.2557,0,0,0,100,0), +(@PATH,4,6880.369,3577.403,779.5615,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121023; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6490.46,`position_y`=3498.933,`position_z`=621.7417,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6490.46,3498.933,621.7417,0,0,0,100,0), +(@PATH,2,6645.542,3512.415,678.8528,0,0,0,100,0), +(@PATH,3,6650.367,3555.357,680.6584,0,0,0,100,0), +(@PATH,4,6602.724,3563.045,661.1863,0,0,0,100,0), +(@PATH,5,6549.287,3554.462,642.825,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121019; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6653.509,`position_y`=3526.14,`position_z`=693.2337,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6653.509,3526.14,693.2337,0,0,0,100,0), +(@PATH,2,6696.053,3579.272,700.4001,0,0,0,100,0), +(@PATH,3,6744.93,3562.146,704.2611,0,0,0,100,0), +(@PATH,4,6738.125,3521.812,692.5392,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121017; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6653.104,`position_y`=3415.26,`position_z`=672.1595,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6653.104,3415.26,672.1595,0,0,0,100,0), +(@PATH,2,6717.518,3468.886,684.6567,0,0,0,100,0), +(@PATH,3,6771.674,3492.333,692.0456,0,0,0,100,0), +(@PATH,4,6728.592,3518.536,683.6566,0,0,0,100,0), +(@PATH,5,6627.954,3487.869,642.6566,0,0,0,100,0), +(@PATH,6,6571.027,3439.741,634.3512,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121014; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6641.402,`position_y`=3330.479,`position_z`=724.3008,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6641.402,3330.479,724.3008,0,0,0,100,0), +(@PATH,2,6637.165,3426.095,701.4395,0,0,0,100,0), +(@PATH,3,6701.476,3449.434,708.6896,0,0,0,100,0), +(@PATH,4,6746.966,3410.158,735.9395,0,0,0,100,0), +(@PATH,5,6697.637,3352.607,725.0784,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121025; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6590.307,`position_y`=3325.47,`position_z`=699.1288,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6590.307,3325.47,699.1288,0,0,0,100,0), +(@PATH,2,6543.557,3237.147,706.6288,0,0,0,100,0), +(@PATH,3,6518.691,3250.313,687.6565,0,0,0,100,0), +(@PATH,4,6512.266,3334.911,685.3231,0,0,0,100,0); + +-- Scourgebeak Fleshripper +SET @NPC := 121007; +SET @PATH := @NPC*10; +UPDATE `creature` SET `position_x`=6459.715,`position_y`=3049.952,`position_z`=701.608,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE +(@PATH,1,6459.715,3049.952,701.608,0,0,0,100,0), +(@PATH,2,6485.836,3103.517,681.247,0,0,0,100,0), +(@PATH,3,6445.593,3154.588,677.886,0,0,0,100,0), +(@PATH,4,6392.533,3078.925,694.2471,0,0,0,100,0); -- cgit v1.2.3 From 37f0e1fcb524e35d082fc1cdb3f11d36a5501c68 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 7 Jun 2012 12:09:01 -0230 Subject: DB/Gossip: Fix gossip for Charles Worth to add tailoring spells closes 6697 --- sql/updates/world/2012_06_07_00_world_gossip.sql | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sql/updates/world/2012_06_07_00_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_00_world_gossip.sql b/sql/updates/world/2012_06_07_00_world_gossip.sql new file mode 100644 index 00000000000..1fe4a23bc5a --- /dev/null +++ b/sql/updates/world/2012_06_07_00_world_gossip.sql @@ -0,0 +1,39 @@ +-- SAI for Charles Worth +SET @NPC := 28699; +SET @GOSSIP := 10118; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@NPC; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@NPC; +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,2,62,0,100,0,@GOSSIP,3,0,0,85,59817,2,0,0,0,0,7,0,0,0,0,0,0,0, 'Charles Worth - On Gossip Select - Cast Spell Teach Wispcloak'), +(@NPC,0,1,2,62,0,100,0,@GOSSIP,5,0,0,85,59841,2,0,0,0,0,7,0,0,0,0,0,0,0, 'Charles Worth - On Gossip Select - Cast Spell Teach Deathchill Cloak'), +(@NPC,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Charles Worth - On Gossip Select - Close Gossip'); +-- Add missing Gossip for Charles Worth +DELETE FROM `gossip_menu` WHERE `entry` IN (10136,10138); +DELETE FROM `gossip_menu` WHERE `entry`=14076 AND `text_id`=14076; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (10136,14072),(10138,14074),(10118,14076); +-- Add Gossip Options +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id` IN (2,3,4,5); +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 +(@GOSSIP,2,0, 'Tell me about the Wispcloak Recipe.',1,1,10136,0,0,0, ''), +(@GOSSIP,3,0, 'I am ready to learn the Wispcloak Recipe.',1,1,0,0,0,0, ''), +(@GOSSIP,4,0, 'Tell me about the Deathchill Cloak Recipe.',1,1,10138,0,0,0, ''), +(@GOSSIP,5,0, 'I am ready to learn the Deathchill Cloak Recipe.',1,1,0,0,0,0, ''); +-- Add conditions for gossip text +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,14076,0,7,197,420,0,0,0,'','Only show gossip text 14076 if player has Tailoring with skill level 420'); +-- Add conditions for gossip options +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,@GOSSIP,2,0,7,197,420,0,0,0,'','Only show gossip option if player has Tailoring with skill level 420'), +(15,@GOSSIP,2,0,25,56016,0,0,1,0,'','Only show gossip option if player has not learned spell 56016'), +(15,@GOSSIP,3,0,7,197,420,0,0,0,'','Only show gossip option if player has Tailoring with skill level 420 Alliance'), +(15,@GOSSIP,3,0,17,41,0,0,0,0,'','Only show gossip option if player has achievement Loremaster of Northrend Alliance'), +(15,@GOSSIP,3,1,7,197,420,0,0,0,'','Only show gossip option if player has Tailoring with skill level 420 Horde'), +(15,@GOSSIP,3,1,17,1360,0,0,0,0,'','Only show gossip option if player has achievement Loremaster of Northrend Horde'), +(15,@GOSSIP,3,0,25,56016,0,0,1,0,'','Only show gossip option if player has not learned spell 56016'), +(15,@GOSSIP,4,0,7,197,420,0,0,0,'','Only show gossip option if player has Tailoring with skill level 420'), +(15,@GOSSIP,4,0,25,56017,0,0,1,0,'','Only show gossip option if player has not learned spell 56017'), +(15,@GOSSIP,5,0,7,197,420,0,0,0,'','Only show gossip option if player has Tailoring with skill level 420'), +(15,@GOSSIP,5,0,17,1288,0,0,0,0,'','Only show gossip option if player has achievement Northrend Dungeonmaster'), +(15,@GOSSIP,5,0,25,56017,0,0,1,0,'','Only show gossip option if player has not learned spell 56017'); -- cgit v1.2.3 From 7bf459c10e4a5d28828acb8c0356bedf9797a6f5 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 7 Jun 2012 12:16:54 -0230 Subject: DB/Gossip: Fix Gossip for Leryssa Closes 6732 --- sql/updates/world/2012_06_07_01_world_gossip.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/2012_06_07_01_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_01_world_gossip.sql b/sql/updates/world/2012_06_07_01_world_gossip.sql new file mode 100644 index 00000000000..d77d41fa523 --- /dev/null +++ b/sql/updates/world/2012_06_07_01_world_gossip.sql @@ -0,0 +1,11 @@ +-- Fix Gossip for Leryssa +SET @ENTRY := 9223; +SET @TEXT1 := 12534; +SET @TEXT2 := 13481; +SET @QUEST := 11599; +DELETE FROM `gossip_menu` WHERE `entry`=@ENTRY AND `text_id`=@TEXT1; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@ENTRY,@TEXT1); +-- Add conditions for gossip text +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@ENTRY AND `SourceEntry`=@TEXT2; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@ENTRY,@TEXT2,0,8,@QUEST,0,0,0,0,'','Only show gossip text if player has completed quest 11599'); -- cgit v1.2.3 From b668bd6ff11676f2fa7aa9b0fe87a7d19c7981c1 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 7 Jun 2012 13:05:22 -0400 Subject: DB/ItemTemplate: make rotface/festergut acidic blood and shadowfrost shards adhere to party loot rules. --- sql/updates/world/2012_06_07_02_world_item_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_06_07_02_world_item_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_02_world_item_template.sql b/sql/updates/world/2012_06_07_02_world_item_template.sql new file mode 100644 index 00000000000..fdf3cce7c24 --- /dev/null +++ b/sql/updates/world/2012_06_07_02_world_item_template.sql @@ -0,0 +1 @@ +UPDATE `item_template` SET `flags` = `flags` | 2048 WHERE `entry` IN (50274,50226,50231); -- cgit v1.2.3 From 4bfb96fbcfb5a64cbaf70ede0a2f682987f1a877 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 7 Jun 2012 14:05:52 -0400 Subject: Core/Loot: fix mistake in previous commit. also fix flags in sql. i did things backwards ^^ --- sql/updates/world/2012_06_07_03_world_item_template.sql | 1 + src/server/game/Loot/LootMgr.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_06_07_03_world_item_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_03_world_item_template.sql b/sql/updates/world/2012_06_07_03_world_item_template.sql new file mode 100644 index 00000000000..a6caa15632e --- /dev/null +++ b/sql/updates/world/2012_06_07_03_world_item_template.sql @@ -0,0 +1 @@ +UPDATE `item_template` SET `flags` = 0 WHERE `entry` IN (50274,50226,50231); diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index e1dcf8e5d27..53b560e0b77 100755 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -360,7 +360,7 @@ bool LootItem::AllowedForPlayer(Player const* player) const if (!(pProto->FlagsCu & ITEM_FLAGS_CU_IGNORE_QUEST_STATUS) && ((needs_quest || (pProto->StartQuest && player->GetQuestStatus(pProto->StartQuest) != QUEST_STATUS_NONE)) && !player->HasQuestForItem(itemid))) if (Group const* group = player->GetGroup()) { - if ((pProto->Flags & ITEM_PROTO_FLAG_PARTY_LOOT) == 0 || (pProto->Flags & ITEM_PROTO_FLAG_PARTY_LOOT && (group->GetLootMethod() != MASTER_LOOT || group->GetLooterGuid() != player->GetGUID()))) + if (pProto->Flags & ITEM_PROTO_FLAG_PARTY_LOOT || ((pProto->Flags & ITEM_PROTO_FLAG_PARTY_LOOT) == 0 && (group->GetLootMethod() != MASTER_LOOT || group->GetLooterGuid() != player->GetGUID()))) return false; } else return false; -- cgit v1.2.3 From 426145373ba93f080c5503054daecd9ec823edcb Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 7 Jun 2012 17:58:20 -0230 Subject: DB/Spell_dbc: Add missing spell to db --- sql/updates/world/2012_06_07_04_world_spell_dbc.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2012_06_07_04_world_spell_dbc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_04_world_spell_dbc.sql b/sql/updates/world/2012_06_07_04_world_spell_dbc.sql new file mode 100644 index 00000000000..3a693d025e7 --- /dev/null +++ b/sql/updates/world/2012_06_07_04_world_spell_dbc.sql @@ -0,0 +1,8 @@ +-- add missing spell to db +DELETE FROM `Spell_dbc` WHERE `Id`=28782; +INSERT INTO `Spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`)VALUES +(28782,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,21,1,0,-1,0,0,6,6,0,0,1,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,12,40,0,0,0,0,0,0,0,0,127,0,0,0,0, 'Stun Self + Immune',0,0,0,0,0,0,0,1,1,0); + +-- Add Stun Self + Immune aura to Snack-O-Matic IV & Vend-O-Tron D-Luxe +DELETE FROM `creature_template_addon` WHERE `entry` IN (24934,24935); +INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES (24934, '28782'),(24935, '28782'); -- cgit v1.2.3 From c7775c8d72fb8618ad96c243910f923b239ea39b Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 7 Jun 2012 23:20:57 +0200 Subject: Core/Maps: Moved object respawn time storage from global to map level. This removes unneccessary locking since all objects run within its map's thread. --- .../2012_06_07_00_characters_respawn.sql | 2 + src/server/game/Entities/Creature/Creature.cpp | 10 +- src/server/game/Entities/GameObject/GameObject.cpp | 12 +- src/server/game/Globals/ObjectMgr.cpp | 178 --------------------- src/server/game/Globals/ObjectMgr.h | 38 ----- src/server/game/Instances/InstanceSaveMgr.cpp | 2 +- src/server/game/Maps/Map.cpp | 127 ++++++++++++++- src/server/game/Maps/Map.h | 34 ++++ src/server/game/Maps/MapInstanced.cpp | 2 + src/server/game/Maps/MapManager.cpp | 1 + src/server/game/Movement/Spline/MoveSplineInit.cpp | 3 +- src/server/game/OutdoorPvP/OutdoorPvP.cpp | 4 +- src/server/game/World/World.cpp | 6 - .../Database/Implementation/CharacterDatabase.cpp | 17 +- .../Database/Implementation/CharacterDatabase.h | 1 - 15 files changed, 189 insertions(+), 248 deletions(-) create mode 100644 sql/updates/characters/2012_06_07_00_characters_respawn.sql (limited to 'sql/updates') diff --git a/sql/updates/characters/2012_06_07_00_characters_respawn.sql b/sql/updates/characters/2012_06_07_00_characters_respawn.sql new file mode 100644 index 00000000000..168aa312713 --- /dev/null +++ b/sql/updates/characters/2012_06_07_00_characters_respawn.sql @@ -0,0 +1,2 @@ +ALTER TABLE `creature_respawn` ADD `mapId` SMALLINT(10) UNSIGNED NOT NULL DEFAULT 0 AFTER `respawnTime`; +ALTER TABLE `gameobject_respawn` ADD `mapId` SMALLINT(10) UNSIGNED NOT NULL DEFAULT 0 AFTER `respawnTime`; diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index e8ec686daf5..07e8e37e82a 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -486,7 +486,7 @@ void Creature::Update(uint32 diff) break; uint64 dbtableHighGuid = MAKE_NEW_GUID(m_DBTableGuid, GetEntry(), HIGHGUID_UNIT); - time_t linkedRespawntime = sObjectMgr->GetLinkedRespawnTime(dbtableHighGuid, GetMap()->GetInstanceId()); + time_t linkedRespawntime = GetMap()->GetLinkedRespawnTime(dbtableHighGuid); if (!linkedRespawntime) // Can respawn Respawn(); else // the master is dead @@ -1303,7 +1303,7 @@ bool Creature::LoadCreatureFromDB(uint32 guid, Map* map, bool addToMap) m_respawnDelay = data->spawntimesecs; m_deathState = ALIVE; - m_respawnTime = sObjectMgr->GetCreatureRespawnTime(m_DBTableGuid, GetInstanceId()); + m_respawnTime = GetMap()->GetCreatureRespawnTime(m_DBTableGuid); if (m_respawnTime) // respawn on Update { m_deathState = DEAD; @@ -1398,7 +1398,7 @@ void Creature::DeleteFromDB() return; } - sObjectMgr->RemoveCreatureRespawnTime(m_DBTableGuid, GetInstanceId()); + GetMap()->RemoveCreatureRespawnTime(m_DBTableGuid); sObjectMgr->DeleteCreatureData(m_DBTableGuid); SQLTransaction trans = WorldDatabase.BeginTransaction(); @@ -1598,7 +1598,7 @@ void Creature::Respawn(bool force) if (getDeathState() == DEAD) { if (m_DBTableGuid) - sObjectMgr->RemoveCreatureRespawnTime(m_DBTableGuid, GetInstanceId()); + GetMap()->RemoveCreatureRespawnTime(m_DBTableGuid); sLog->outStaticDebug("Respawning creature %s (GuidLow: %u, Full GUID: " UI64FMTD " Entry: %u)", GetName(), GetGUIDLow(), GetGUID(), GetEntry()); m_respawnTime = 0; @@ -2013,7 +2013,7 @@ void Creature::SaveRespawnTime() if (isSummon() || !m_DBTableGuid || (m_creatureData && !m_creatureData->dbData)) return; - sObjectMgr->SaveCreatureRespawnTime(m_DBTableGuid, GetInstanceId(), m_respawnTime); + GetMap()->SaveCreatureRespawnTime(m_DBTableGuid, m_respawnTime); } // this should not be called by petAI or diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 5101d01899d..58440095075 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -338,7 +338,7 @@ void GameObject::Update(uint32 diff) if (m_respawnTime <= now) // timer expired { uint64 dbtableHighGuid = MAKE_NEW_GUID(m_DBTableGuid, GetEntry(), HIGHGUID_GAMEOBJECT); - time_t linkedRespawntime = sObjectMgr->GetLinkedRespawnTime(dbtableHighGuid, GetMap()->GetInstanceId()); + time_t linkedRespawntime = GetMap()->GetLinkedRespawnTime(dbtableHighGuid); if (linkedRespawntime) // Can't respawn, the master is dead { uint64 targetGuid = sObjectMgr->GetLinkedRespawnGuid(dbtableHighGuid); @@ -761,13 +761,13 @@ bool GameObject::LoadGameObjectFromDB(uint32 guid, Map* map, bool addToMap) else { m_respawnDelayTime = data->spawntimesecs; - m_respawnTime = sObjectMgr->GetGORespawnTime(m_DBTableGuid, map->GetInstanceId()); + m_respawnTime = GetMap()->GetGORespawnTime(m_DBTableGuid); // ready to respawn if (m_respawnTime && m_respawnTime <= time(NULL)) { m_respawnTime = 0; - sObjectMgr->RemoveGORespawnTime(m_DBTableGuid, GetInstanceId()); + GetMap()->RemoveGORespawnTime(m_DBTableGuid); } } } @@ -788,7 +788,7 @@ bool GameObject::LoadGameObjectFromDB(uint32 guid, Map* map, bool addToMap) void GameObject::DeleteFromDB() { - sObjectMgr->RemoveGORespawnTime(m_DBTableGuid, GetInstanceId()); + GetMap()->RemoveGORespawnTime(m_DBTableGuid); sObjectMgr->DeleteGOData(m_DBTableGuid); PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_GAMEOBJECT); @@ -863,7 +863,7 @@ Unit* GameObject::GetOwner() const void GameObject::SaveRespawnTime() { if (m_goData && m_goData->dbData && m_respawnTime > time(NULL) && m_spawnedByDefault) - sObjectMgr->SaveGORespawnTime(m_DBTableGuid, GetInstanceId(), m_respawnTime); + GetMap()->SaveGORespawnTime(m_DBTableGuid, m_respawnTime); } bool GameObject::IsAlwaysVisibleFor(WorldObject const* seer) const @@ -908,7 +908,7 @@ void GameObject::Respawn() if (m_spawnedByDefault && m_respawnTime > 0) { m_respawnTime = time(NULL); - sObjectMgr->RemoveGORespawnTime(m_DBTableGuid, GetInstanceId()); + GetMap()->RemoveGORespawnTime(m_DBTableGuid); } } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index df6018faf39..65f2ccff476 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1872,71 +1872,6 @@ void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data } } -void ObjectMgr::LoadCreatureRespawnTimes() -{ - uint32 oldMSTime = getMSTime(); - - uint32 count = 0; - - PreparedQueryResult result = CharacterDatabase.Query(CharacterDatabase.GetPreparedStatement(CHAR_SEL_CREATURE_RESPAWNS)); - if (!result) - { - sLog->outString(">> Loaded 0 creature respawn time."); - sLog->outString(); - return; - } - - do - { - Field* fields = result->Fetch(); - - uint32 loguid = fields[0].GetUInt32(); - uint32 respawn_time = fields[1].GetUInt32(); - uint32 instance = fields[2].GetUInt32(); - - _creatureRespawnTimes[MAKE_PAIR64(loguid, instance)] = time_t(respawn_time); - - ++count; - } while (result->NextRow()); - - sLog->outString(">> Loaded %lu creature respawn times in %u ms", (unsigned long)_creatureRespawnTimes.size(), GetMSTimeDiffToNow(oldMSTime)); - sLog->outString(); -} - -void ObjectMgr::LoadGameobjectRespawnTimes() -{ - uint32 oldMSTime = getMSTime(); - - // Remove outdated data - CharacterDatabase.DirectExecute("DELETE FROM gameobject_respawn WHERE respawnTime <= UNIX_TIMESTAMP(NOW())"); - - uint32 count = 0; - - PreparedQueryResult result = CharacterDatabase.Query(CharacterDatabase.GetPreparedStatement(CHAR_SEL_GO_RESPAWNS)); - if (!result) - { - sLog->outString(">> Loaded 0 gameobject respawn times. DB table `gameobject_respawn` is empty!"); - sLog->outString(); - return; - } - - do - { - Field* fields = result->Fetch(); - - uint32 loguid = fields[0].GetUInt32(); - uint32 respawn_time = fields[1].GetUInt32(); - uint32 instance = fields[2].GetUInt32(); - - _goRespawnTimes[MAKE_PAIR64(loguid, instance)] = time_t(respawn_time); - - ++count; - } while (result->NextRow()); - - sLog->outString(); - sLog->outString(">> Loaded %lu gameobject respawn times in %u ms", (unsigned long)_goRespawnTimes.size(), GetMSTimeDiffToNow(oldMSTime)); -} - Player* ObjectMgr::GetPlayerByLowGUID(uint32 lowguid) const { uint64 guid = MAKE_NEW_GUID(lowguid, 0, HIGHGUID_PLAYER); @@ -7172,44 +7107,6 @@ void ObjectMgr::LoadNPCSpellClickSpells() sLog->outString(); } -void ObjectMgr::SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t) -{ - if (!t) - { - // Delete only - RemoveCreatureRespawnTime(loguid, instance); - return; - } - - // This function can be called from various map threads concurrently - { - _creatureRespawnTimesMutex.acquire(); - _creatureRespawnTimes[MAKE_PAIR64(loguid, instance)] = t; - _creatureRespawnTimesMutex.release(); - } - - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_CREATURE_RESPAWN); - stmt->setUInt32(0, loguid); - stmt->setUInt32(1, uint32(t)); - stmt->setUInt32(2, instance); - CharacterDatabase.Execute(stmt); -} - -void ObjectMgr::RemoveCreatureRespawnTime(uint32 loguid, uint32 instance) -{ - // This function can be called from various map threads concurrently - { - _creatureRespawnTimesMutex.acquire(); - _creatureRespawnTimes[MAKE_PAIR64(loguid, instance)] = 0; - _creatureRespawnTimesMutex.release(); - } - - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN); - stmt->setUInt32(0, loguid); - stmt->setUInt32(1, instance); - CharacterDatabase.Execute(stmt); -} - void ObjectMgr::DeleteCreatureData(uint32 guid) { // remove mapid*cellid -> guid_set map @@ -7220,81 +7117,6 @@ void ObjectMgr::DeleteCreatureData(uint32 guid) _creatureDataStore.erase(guid); } -void ObjectMgr::SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t) -{ - if (!t) - { - // Delete only - RemoveGORespawnTime(loguid, instance); - return; - } - - // This function can be called from different map threads concurrently - { - _goRespawnTimesMutex.acquire(); - _goRespawnTimes[MAKE_PAIR64(loguid, instance)] = t; - _goRespawnTimesMutex.release(); - } - - PreparedStatement *stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_GO_RESPAWN); - stmt->setUInt32(0, loguid); - stmt->setUInt64(1, uint64(t)); - stmt->setUInt32(2, instance); - CharacterDatabase.Execute(stmt); -} - -void ObjectMgr::RemoveGORespawnTime(uint32 loguid, uint32 instance) -{ - // This function can be called from different map threads concurrently - { - _goRespawnTimesMutex.acquire(); - _goRespawnTimes[MAKE_PAIR64(loguid, instance)] = 0; - _goRespawnTimesMutex.release(); - } - - PreparedStatement *stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GO_RESPAWN); - stmt->setUInt32(0, loguid); - stmt->setUInt32(1, instance); - CharacterDatabase.Execute(stmt); -} - -void ObjectMgr::DeleteRespawnTimeForInstance(uint32 instance) -{ - // This function can be called from different map threads concurrently - RespawnTimes::iterator next; - - { - _goRespawnTimesMutex.acquire(); - for (RespawnTimes::iterator itr = _goRespawnTimes.begin(); itr != _goRespawnTimes.end(); itr = next) - { - next = itr; - ++next; - - if (GUID_HIPART(itr->first) == instance) - _goRespawnTimes.erase(itr); - } - _goRespawnTimesMutex.release(); - } - { - _creatureRespawnTimesMutex.acquire(); - for (RespawnTimes::iterator itr = _creatureRespawnTimes.begin(); itr != _creatureRespawnTimes.end(); itr = next) - { - next = itr; - ++next; - - if (GUID_HIPART(itr->first) == instance) - _creatureRespawnTimes.erase(itr); - } - _creatureRespawnTimesMutex.release(); - } - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN_BY_INSTANCE); - stmt->setUInt32(0, instance); - CharacterDatabase.Execute(stmt); - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GO_RESPAWN_BY_INSTANCE); - stmt->setUInt32(0, instance); - CharacterDatabase.Execute(stmt); -} - void ObjectMgr::DeleteGOData(uint32 guid) { // remove mapid*cellid -> guid_set map diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index f81e7f1f074..97c2f0234ba 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -367,8 +367,6 @@ struct CellObjectGuids typedef UNORDERED_MAP CellObjectGuidsMap; typedef UNORDERED_MAP MapObjectGuids; -typedef UNORDERED_MAP RespawnTimes; - // Trinity string ranges #define MIN_TRINITY_STRING_ID 1 // 'trinity_string' #define MAX_TRINITY_STRING_ID 2000000000 @@ -854,13 +852,11 @@ class ObjectMgr void LoadCreatures(); void LoadLinkedRespawn(); bool SetCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid); - void LoadCreatureRespawnTimes(); void LoadCreatureAddons(); void LoadCreatureModelInfo(); void LoadEquipmentTemplates(); void LoadGameObjectLocales(); void LoadGameobjects(); - void LoadGameobjectRespawnTimes(); void LoadItemTemplates(); void LoadItemLocales(); void LoadItemSetNames(); @@ -1048,36 +1044,6 @@ class ObjectMgr void AddCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid, uint32 instance); void DeleteCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid); - time_t GetLinkedRespawnTime(uint64 guid, uint32 instance) - { - uint64 linkedGuid = GetLinkedRespawnGuid(guid); - switch (GUID_HIPART(linkedGuid)) - { - case HIGHGUID_UNIT: - return GetCreatureRespawnTime(GUID_LOPART(linkedGuid), instance); - case HIGHGUID_GAMEOBJECT: - return GetGORespawnTime(GUID_LOPART(linkedGuid), instance); - default: - return 0; - } - } - - time_t GetCreatureRespawnTime(uint32 loguid, uint32 instance) - { - TRINITY_GUARD(ACE_Thread_Mutex, _creatureRespawnTimesMutex); - return _creatureRespawnTimes[MAKE_PAIR64(loguid, instance)]; - } - void SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t); - void RemoveCreatureRespawnTime(uint32 loguid, uint32 instance); - time_t GetGORespawnTime(uint32 loguid, uint32 instance) - { - TRINITY_GUARD(ACE_Thread_Mutex, _goRespawnTimesMutex); - return _goRespawnTimes[MAKE_PAIR64(loguid, instance)]; - } - void SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t); - void RemoveGORespawnTime(uint32 loguid, uint32 instance); - void DeleteRespawnTimeForInstance(uint32 instance); - // grid objects void AddCreatureToGrid(uint32 guid, CreatureData const* data); void RemoveCreatureFromGrid(uint32 guid, CreatureData const* data); @@ -1307,10 +1273,6 @@ class ObjectMgr TrinityStringLocaleContainer _trinityStringLocaleStore; GossipMenuItemsLocaleContainer _gossipMenuItemsLocaleStore; PointOfInterestLocaleContainer _pointOfInterestLocaleStore; - RespawnTimes _creatureRespawnTimes; - ACE_Thread_Mutex _creatureRespawnTimesMutex; - RespawnTimes _goRespawnTimes; - ACE_Thread_Mutex _goRespawnTimesMutex; CacheVendorItemContainer _cacheVendorItemStore; CacheTrainerSpellContainer _cacheTrainerSpellStore; diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 8078a91d082..2e0d1e47c92 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -543,7 +543,7 @@ void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId) if (iMap && iMap->IsDungeon()) ((InstanceMap*)iMap)->Reset(INSTANCE_RESET_RESPAWN_DELAY); - sObjectMgr->DeleteRespawnTimeForInstance(instanceId); // even if map is not loaded + iMap->DeleteRespawnTimes(); // Free up the instance id and allow it to be reused sMapMgr->FreeInstanceId(instanceId); diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 162dd12d121..6f19fdcbc0a 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2632,7 +2632,7 @@ void InstanceMap::UnloadAll() ASSERT(!HavePlayers()); if (m_resetAfterUnload == true) - sObjectMgr->DeleteRespawnTimeForInstance(GetInstanceId()); + DeleteRespawnTimes(); Map::UnloadAll(); } @@ -2781,3 +2781,128 @@ void Map::UpdateIteratorBack(Player* player) if (m_mapRefIter == player->GetMapRef()) m_mapRefIter = m_mapRefIter->nocheck_prev(); } + +void Map::SaveCreatureRespawnTime(uint32 dbGuid, time_t respawnTime) +{ + if (!respawnTime) + { + // Delete only + RemoveCreatureRespawnTime(dbGuid); + return; + } + + _creatureRespawnTimes[dbGuid] = respawnTime; + + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_CREATURE_RESPAWN); + stmt->setUInt32(0, dbGuid); + stmt->setUInt32(1, uint32(respawnTime)); + stmt->setUInt16(2, GetId()); + stmt->setUInt32(3, GetInstanceId()); + CharacterDatabase.Execute(stmt); +} + +void Map::RemoveCreatureRespawnTime(uint32 dbGuid) +{ + _creatureRespawnTimes.erase(dbGuid); + + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN); + stmt->setUInt32(0, dbGuid); + stmt->setUInt16(1, GetId()); + stmt->setUInt32(2, GetInstanceId()); + CharacterDatabase.Execute(stmt); +} + +void Map::SaveGORespawnTime(uint32 dbGuid, time_t respawnTime) +{ + if (!respawnTime) + { + // Delete only + RemoveGORespawnTime(dbGuid); + return; + } + + _goRespawnTimes[dbGuid] = respawnTime; + + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_GO_RESPAWN); + stmt->setUInt32(0, dbGuid); + stmt->setUInt32(1, uint32(respawnTime)); + stmt->setUInt16(2, GetId()); + stmt->setUInt32(3, GetInstanceId()); + CharacterDatabase.Execute(stmt); +} + +void Map::RemoveGORespawnTime(uint32 dbGuid) +{ + _goRespawnTimes.erase(dbGuid); + + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GO_RESPAWN); + stmt->setUInt32(0, dbGuid); + stmt->setUInt16(1, GetId()); + stmt->setUInt32(2, GetInstanceId()); + CharacterDatabase.Execute(stmt); +} + +void Map::LoadRespawnTimes() +{ + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CREATURE_RESPAWNS); + stmt->setUInt16(0, GetId()); + stmt->setUInt32(1, GetInstanceId()); + if (PreparedQueryResult result = CharacterDatabase.Query(stmt)) + { + do + { + Field* fields = result->Fetch(); + uint32 loguid = fields[0].GetUInt32(); + uint32 respawnTime = fields[1].GetUInt32(); + + _creatureRespawnTimes[loguid] = time_t(respawnTime); + } while (result->NextRow()); + } + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GO_RESPAWNS); + stmt->setUInt16(0, GetId()); + stmt->setUInt32(1, GetInstanceId()); + if (PreparedQueryResult result = CharacterDatabase.Query(stmt)) + { + do + { + Field* fields = result->Fetch(); + uint32 loguid = fields[0].GetUInt32(); + uint32 respawnTime = fields[1].GetUInt32(); + + _goRespawnTimes[loguid] = time_t(respawnTime); + } while (result->NextRow()); + } +} + +void Map::DeleteRespawnTimes() +{ + _creatureRespawnTimes.clear(); + _goRespawnTimes.clear(); + + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN_BY_INSTANCE); + stmt->setUInt16(0, GetId()); + stmt->setUInt32(1, GetInstanceId()); + CharacterDatabase.Execute(stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GO_RESPAWN_BY_INSTANCE); + stmt->setUInt16(0, GetId()); + stmt->setUInt32(1, GetInstanceId()); + CharacterDatabase.Execute(stmt); +} + +time_t Map::GetLinkedRespawnTime(uint64 guid) const +{ + uint64 linkedGuid = sObjectMgr->GetLinkedRespawnGuid(guid); + switch (GUID_HIPART(linkedGuid)) + { + case HIGHGUID_UNIT: + return GetCreatureRespawnTime(GUID_LOPART(linkedGuid)); + case HIGHGUID_GAMEOBJECT: + return GetGORespawnTime(GUID_LOPART(linkedGuid)); + default: + break; + } + + return time_t(0); +} diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 6ba08646f25..94a64126da1 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -443,6 +443,36 @@ class Map : public GridRefManager void Insert(const GameObjectModel& mdl) { _dynamicTree.insert(mdl); } bool Contains(const GameObjectModel& mdl) const { return _dynamicTree.contains(mdl);} bool getObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float modifyDist); + + /* + RESPAWN TIMES + */ + time_t GetLinkedRespawnTime(uint64 guid) const; + time_t GetCreatureRespawnTime(uint32 dbGuid) const + { + UNORDERED_MAP::const_iterator itr = _creatureRespawnTimes.find(dbGuid); + if (itr != _creatureRespawnTimes.end()) + return itr->second; + + return time_t(0); + } + + time_t GetGORespawnTime(uint32 dbGuid) const + { + UNORDERED_MAP::const_iterator itr = _goRespawnTimes.find(dbGuid); + if (itr != _goRespawnTimes.end()) + return itr->second; + + return time_t(0); + } + + void SaveCreatureRespawnTime(uint32 dbGuid, time_t respawnTime); + void RemoveCreatureRespawnTime(uint32 dbGuid); + void SaveGORespawnTime(uint32 dbGuid, time_t respawnTime); + void RemoveGORespawnTime(uint32 dbGuid); + void LoadRespawnTimes(); + void DeleteRespawnTimes(); + private: void LoadMapAndVMap(int gx, int gy); void LoadVMap(int gx, int gy); @@ -488,6 +518,7 @@ class Map : public GridRefManager void ScriptsProcess(); void UpdateActiveCells(const float &x, const float &y, const uint32 t_diff); + protected: void SetUnloadReferenceLock(const GridCoord &p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadReferenceLock(on); } @@ -570,6 +601,9 @@ class Map : public GridRefManager else m_activeNonPlayers.erase(obj); } + + UNORDERED_MAP _creatureRespawnTimes; + UNORDERED_MAP _goRespawnTimes; }; enum InstanceResetMethod diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index 5543251e115..2c1bdb00834 100755 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -211,6 +211,8 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave* save, InstanceMap* map = new InstanceMap(GetId(), GetGridExpiry(), InstanceId, difficulty, this); ASSERT(map->IsDungeon()); + map->LoadRespawnTimes(); + bool load_data = save != NULL; map->CreateInstanceData(load_data); diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index eb09538721d..e9de3ae001f 100755 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -110,6 +110,7 @@ Map* MapManager::CreateBaseMap(uint32 id) else { map = new Map(id, i_gridCleanUpDelay, 0, REGULAR_DIFFICULTY); + map->LoadRespawnTimes(); } i_maps[id] = map; } diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index ffc09a10e22..c539dd3cc39 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -129,8 +129,7 @@ namespace Movement void MoveSplineInit::SetFacing(const Unit * target) { args.flags.EnableFacingTarget(); - //args.facing.target = target->GetObjectGuid().GetRawValue(); - args.facing.target = target->GetUInt64Value(OBJECT_FIELD_GUID); + args.facing.target = target->GetGUID(); } void MoveSplineInit::SetFacing(float angle) diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 465fca75030..dfdd4fc4ffc 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -166,8 +166,10 @@ bool OPvPCapturePoint::DelCreature(uint32 type) //if (Map* map = sMapMgr->FindMap(cr->GetMapId())) // map->Remove(cr, false); // delete respawn time for this creature - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN_BY_GUID); + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN); stmt->setUInt32(0, guid); + stmt->setUInt16(1, cr->GetMapId()); + stmt->setUInt32(2, 0); // instance id, always 0 for world maps CharacterDatabase.Execute(stmt); cr->AddObjectToRemoveList(); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 6e32d33a7bb..5bd5961a05b 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1410,15 +1410,9 @@ void World::SetInitialWorldSettings() sLog->outString("Loading Creature Addon Data..."); sObjectMgr->LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures() - sLog->outString("Loading Creature Respawn Data..."); // must be after PackInstances() - sObjectMgr->LoadCreatureRespawnTimes(); - sLog->outString("Loading Gameobject Data..."); sObjectMgr->LoadGameobjects(); - sLog->outString("Loading Gameobject Respawn Data..."); // must be after PackInstances() - sObjectMgr->LoadGameobjectRespawnTimes(); - sLog->outString("Loading Creature Linked Respawn..."); sObjectMgr->LoadLinkedRespawn(); // must be after LoadCreatures(), LoadGameObjects() diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index d315c6417ea..89cc6ab25e5 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -314,18 +314,17 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_DEL_OLD_CORPSES, "DELETE FROM corpse WHERE corpseType = 0 OR time < (UNIX_TIMESTAMP(NOW()) - ?)", CONNECTION_ASYNC) // Creature respawn - PREPARE_STATEMENT(CHAR_SEL_CREATURE_RESPAWNS, "SELECT guid, respawnTime, instanceId FROM creature_respawn", CONNECTION_SYNCH) - PREPARE_STATEMENT(CHAR_REP_CREATURE_RESPAWN, "REPLACE INTO creature_respawn (guid, respawnTime, instanceId) VALUES (?, ?, ?)", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_DEL_CREATURE_RESPAWN, "DELETE FROM creature_respawn WHERE guid = ? AND instanceId = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_DEL_CREATURE_RESPAWN_BY_GUID, "DELETE FROM creature_respawn WHERE guid = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_DEL_CREATURE_RESPAWN_BY_INSTANCE, "DELETE FROM creature_respawn WHERE instanceId = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_SEL_CREATURE_RESPAWNS, "SELECT guid, respawnTime FROM creature_respawn WHERE mapId = ? AND instanceId = ?", CONNECTION_SYNCH) + PREPARE_STATEMENT(CHAR_REP_CREATURE_RESPAWN, "REPLACE INTO creature_respawn (guid, respawnTime, mapId, instanceId) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_DEL_CREATURE_RESPAWN, "DELETE FROM creature_respawn WHERE guid = ? AND mapId = ? AND instanceId = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_DEL_CREATURE_RESPAWN_BY_INSTANCE, "DELETE FROM creature_respawn WHERE mapId = ? AND instanceId = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_MAX_CREATURE_RESPAWNS, "SELECT MAX(respawnTime), instanceId FROM creature_respawn WHERE instanceId > 0 GROUP BY instanceId", CONNECTION_SYNCH) // Gameobject respawn - PREPARE_STATEMENT(CHAR_SEL_GO_RESPAWNS, "SELECT guid, respawnTime, instanceId FROM gameobject_respawn", CONNECTION_SYNCH) - PREPARE_STATEMENT(CHAR_REP_GO_RESPAWN, "REPLACE INTO gameobject_respawn (guid, respawnTime, instanceId) VALUES (?, ?, ?)", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_DEL_GO_RESPAWN, "DELETE FROM gameobject_respawn WHERE guid = ? AND instanceId = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_DEL_GO_RESPAWN_BY_INSTANCE, "DELETE FROM gameobject_respawn WHERE instanceId = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_SEL_GO_RESPAWNS, "SELECT guid, respawnTime FROM gameobject_respawn WHERE mapId = ? AND instanceId = ?", CONNECTION_SYNCH) + PREPARE_STATEMENT(CHAR_REP_GO_RESPAWN, "REPLACE INTO gameobject_respawn (guid, respawnTime, mapId, instanceId) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_DEL_GO_RESPAWN, "DELETE FROM gameobject_respawn WHERE guid = ? AND mapId = ? AND instanceId = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_DEL_GO_RESPAWN_BY_INSTANCE, "DELETE FROM gameobject_respawn WHERE mapId = ? AND instanceId = ?", CONNECTION_ASYNC) // GM Tickets PREPARE_STATEMENT(CHAR_SEL_GM_TICKETS, "SELECT ticketId, guid, name, message, createTime, mapId, posX, posY, posZ, lastModifiedTime, closedBy, assignedTo, comment, completed, escalated, viewed FROM gm_tickets", CONNECTION_SYNCH) diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h index cf6bbd7bdfa..e1530f36e44 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.h +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h @@ -296,7 +296,6 @@ enum CharacterDatabaseStatements CHAR_SEL_CREATURE_RESPAWNS, CHAR_REP_CREATURE_RESPAWN, CHAR_DEL_CREATURE_RESPAWN, - CHAR_DEL_CREATURE_RESPAWN_BY_GUID, CHAR_DEL_CREATURE_RESPAWN_BY_INSTANCE, CHAR_SEL_MAX_CREATURE_RESPAWNS, -- cgit v1.2.3 From 1e34d3eaec1f650d088b55fc748fff793b7c69f0 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 7 Jun 2012 19:19:52 -0230 Subject: Db/spell_dbc: typo fix --- sql/updates/world/2012_06_07_04_world_spell_dbc.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_04_world_spell_dbc.sql b/sql/updates/world/2012_06_07_04_world_spell_dbc.sql index 3a693d025e7..de5753fc7a6 100644 --- a/sql/updates/world/2012_06_07_04_world_spell_dbc.sql +++ b/sql/updates/world/2012_06_07_04_world_spell_dbc.sql @@ -1,6 +1,6 @@ -- add missing spell to db -DELETE FROM `Spell_dbc` WHERE `Id`=28782; -INSERT INTO `Spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`)VALUES +DELETE FROM `spell_dbc` WHERE `Id`=28782; +INSERT INTO `spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`)VALUES (28782,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,21,1,0,-1,0,0,6,6,0,0,1,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,12,40,0,0,0,0,0,0,0,0,127,0,0,0,0, 'Stun Self + Immune',0,0,0,0,0,0,0,1,1,0); -- Add Stun Self + Immune aura to Snack-O-Matic IV & Vend-O-Tron D-Luxe -- cgit v1.2.3 From 1c0fc0a1eea8dc5ae1581b67b94473e669375902 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 7 Jun 2012 23:20:47 -0230 Subject: DB/misc: Some misc updates --- sql/updates/world/2012_06_07_05_world_misc.sql | 117 +++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 sql/updates/world/2012_06_07_05_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_05_world_misc.sql b/sql/updates/world/2012_06_07_05_world_misc.sql new file mode 100644 index 00000000000..d45384dd3ef --- /dev/null +++ b/sql/updates/world/2012_06_07_05_world_misc.sql @@ -0,0 +1,117 @@ +-- Remove some bad spawns in world +DELETE FROM `creature` WHERE `guid` IN (45208,45099,45075,45136,12925,12402); +DELETE FROM `creature_addon` WHERE `guid` IN (45208,45099,45075,45136,12925,12402); + +-- Some missing Gossip +UPDATE `creature_template` SET `gossip_menu_id`=9054 WHERE `entry`=25021; +UPDATE `creature_template` SET `gossip_menu_id`=9056 WHERE `entry`=25022; +UPDATE `creature_template` SET `gossip_menu_id`=9057 WHERE `entry`=25023; +UPDATE `creature_template` SET `gossip_menu_id`=9054 WHERE `entry`=25024; +UPDATE `creature_template` SET `gossip_menu_id`=9077 WHERE `entry`=25025; +DELETE FROM `gossip_menu` WHERE `entry`=9054 AND `text_id`=12243; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (9054,12243); +DELETE FROM `gossip_menu` WHERE `entry`=9057 AND `text_id`=12245; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (9057,12245); +DELETE FROM `gossip_menu` WHERE `entry`=9077 AND `text_id`=12275; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (9077,12275); + +-- Zeppelin: "Durotar to Tirisfal Glades" +DELETE FROM `creature_transport` WHERE `transport_entry`=164871; +INSERT INTO `creature_transport` (`guid`,`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES +(1,164871,15214,7.005304,-7.647912,-16.11262,2.897247,0), -- Invisible Stalker +(2,164871,24934,-4.516505,-13.11248,-22.59472,1.53589,0), -- Snack-O-Matic IV +(3,164871,24935,-6.37827,-13.18376,-22.59391,4.712389,0), -- Vend-O-Tron D-Luxe +(4,164871,25070,-9.407872,-8.023982,-17.15783,3.176499,0), -- Chief Officer Coppernut +(5,164871,25071,7.248865,-5.480326,-17.68592,4.817109,432), -- Crewman Rusthammer +(6,164871,25072,8.008065,-10.71344,-17.67366,1.169371,432), -- Crewman Quickfix +(7,164871,25074,5.023749,-7.69781,-17.78876,5.986479,432), -- Crewman Sparkfly +(8,164871,25075,-8.875813,-11.40282,-22.5883,6.248279,0), -- Zeppelin Controls +(9,164871,25075,-3.307774,-9.474165,-23.69589,1.553343,0), -- Zeppelin Controls +(10,164871,25075,4.482075,-13.40077,-23.59003,1.623156,0), -- Zeppelin Controls +(11,164871,25075,-3.314179,-6.128806,-23.69835,4.677482,0), -- Zeppelin Controls +(12,164871,25075,4.362147,-2.254167,-23.59002,4.712389,0), -- Zeppelin Controls +(13,164871,25075,-4.161887,-7.687522,-23.69754,0,0), -- Zeppelin Controls +(14,164871,25075,11.74357,-10.44521,-24.21887,6.161012,0), -- Zeppelin Controls +(15,164871,25075,10.82609,-12.18536,-23.48949,3.176499,0), -- Zeppelin Controls +(16,164871,25075,10.70341,-3.505423,-23.49001,3.246312,0), -- Zeppelin Controls +(17,164871,25076,-2.727229,-7.772857,-23.69677,1.553343,432), -- Navigator Fairweather +(18,164871,25077,-19.68856,-8.170582,-14.37648,3.176499,0), -- Sky-Captain Cloudkicker +(19,164871,25079,-5.1094,-11.14663,-17.60601,4.485496,0), -- Deathguard Fowles +(20,164871,25083,-5.212496,-4.927022,-17.5966,1.43117,0), -- Deathguard Lawson +(21,164871,25171,-8.703286,-11.40788,-22.58871,0.03490658,0); -- Invisible Stalker (Scale x0.5) +-- gameobject 21680 -6.905273,-4.876801,-17.51628,5.911792 Rotation: 0,0,0.9850225,0.1724255 + +-- Zeppelin: "Durotar to Thunder Bluff" +DELETE FROM `creature_transport` WHERE `transport_entry`=190549; +INSERT INTO `creature_transport` (`guid`,`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES +(1,190549,3084,-4.83257,-4.312334,-17.63218,1.623156,0), -- Bluffwatcher +(2,190549,3084,-5.206744,-11.34318,-17.61012,4.712389,0), -- Bluffwatcher +(3,190549,24934,10.32099,-3.573514,-23.49413,3.176499,0), -- Snack-O-Matic IV +(4,190549,24935,10.2871,-12.02722,-23.49424,3.106686,0), -- Vend-O-Tron D-Luxe +(5,190549,25075,-3.396398,-7.905448,-23.69672,6.248279,0), -- Zeppelin Controls +(6,190549,34715,-9.183155,-7.775729,-17.21699,3.281219,0), -- Sky-Captain "Dusty" Blastnut +(7,190549,34717,-13.67017,-12.40177,-15.98756,4.590216,0), -- Crewman Pipewrench +(8,190549,34718,13.74505,-5.128461,-24.04518,0.1396263,207), -- Crewman Deadbolt +(9,190549,34719,7.623085,-5.025319,-17.67015,4.921828,28), -- Crewman Grit +(10,190549,34721,-0.919197,-6.164221,-23.67286,3.577925,0), -- Chief Officer Ograh +(11,190549,34723,-17.47968,-5.606984,-14.92807,3.228859,0), -- Watcher Tolwe +(12,190549,34730,-2.166869,-7.854215,-23.6919,3.385939,0); -- Navigator Zippik + +-- Zeppelin: "Durotar to Stranglethorn Val" +DELETE FROM `creature_transport` WHERE `transport_entry`=175080; +INSERT INTO `creature_transport` (`guid`,`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES +(1,175080,24924,-1.207598,-9.948863,-23.67485,0.1570796,0), -- Sky-Captain Bomblast +(2,175080,24926,-10.3057,-12.10524,-16.96907,5.927236,0), -- Chief Officer Brassbolt +(3,175080,24927,-1.874165,-7.847112,-23.68718,3.385939,0), -- Navigator Sparksizzle +(4,175080,24929,9.083008,-4.964111,-23.59211,1.594056,0), -- Crewman Crosswire +(5,175080,24930,-17.0083,-7.874878,-15.18782,3.141593,0), -- Crewman Gazzlegear +(6,175080,24931,7.884921,-11.15133,-17.76227,4.90483,432), -- Crewman Fastwrench +(7,175080,24934,9.209188,-3.503923,-23.51212,3.124139,0), -- Snack-O-Matic IV +(8,175080,24935,9.554915,-12.02288,-23.50588,3.124139,0), -- Vend-O-Tron D-Luxe +(9,175080,25075,-2.705565,-7.845885,-23.6967,0.03490658,0), -- Zeppelin Controls +(10,175080,25080,-4.910018,-4.742365,-17.61534,1.605703,0), -- Grunt Umgor +(11,175080,25081,-4.939394,-10.80493,-17.61089,4.712389,0); -- Grunt Ounda + +-- Zeppelin: "Durotar to Borean Tundra" +DELETE FROM `creature_transport` WHERE `transport_entry`=186238; +INSERT INTO `creature_transport` (`guid`,`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES +(1,186238,25075,9.44542,-7.849475,-16.60061,0.05235988,0), -- Zeppelin Controls +(2,186238,31720,-16.56853,-5.083331,-15.94212,1.989675,0), -- Crewman Shubbscoop +(3,186238,31723,-10.75516,-12.81286,-16.77452,4.537856,0), -- Crewman Barrowswizzle +(4,186238,31724,5.77627,-2.004689,-17.72185,1.64061,0), -- Crewman Paltertop +(5,186238,31725,10.69841,-7.821921,-16.60061,3.281219,0), -- Sky-Captain LaFontaine +(6,186238,31726,-3.453068,-13.78959,-17.61107,1.43117,0), -- Grunt Gritch +(7,186238,31727,-3.383076,-1.913925,-17.6198,4.729842,0); -- Grunt Grikee + +-- Ship: "Wetlands to Howling Fjord" +DELETE FROM `creature_transport` WHERE `transport_entry`=181688; +INSERT INTO `creature_transport` (`guid`,`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES +(1,181688,31759,-9.170654,-9.222412,9.44523,4.339638,0), -- Sailor Jansen +(2,181688,31760,-24.34204,-1.495605,11.79066,4.531185,0), -- Sailor Berg +(3,181688,31761,17.25,3.982666,9.827404,1.127068,0), -- Sailor Davies +(4,181688,31762,34.08345,-0.002845,19.79711,3.124139,0), -- Navigator Marcus +(5,181688,31763,30.11512,-5.088479,19.32816,3.089233,0), -- Captain John Brookman +(6,181688,31764,26.07068,2.057755,19.32802,3.001966,0); -- First Mate Kacy Dishon + +-- Ship: "Stormwind to Borean Tundra" +DELETE FROM `creature_transport` WHERE `transport_entry`=190536; +INSERT INTO `creature_transport` (`guid`,`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES +(1,190536,31788,27.59511,-2.344238,19.32811,3.228859,0), -- Captain Constance +(2,190536,31789,28.09979,5.993899,19.32799,3.647738,0), -- First Mate Fitzgerald +(3,190536,31790,34.22358,0.067648,19.76266,3.071779,0), -- Navigator Meyer +(4,190536,31791,0.919363,8.75723,9.436611,1.256637,0), -- Sailor Dawning +(5,190536,31792,-4.766113,0.09985352,9.36669,4.834562,0), -- Sailor Picardo +(6,190536,31793,17.146,-3.921387,9.813052,5.497081,0); -- Sailor Phillips + +-- Ship: "Feralas to Feathermoon Stronghold" +DELETE FROM `creature_transport` WHERE `transport_entry`=177233; +INSERT INTO `creature_transport` (`guid`,`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES +(1,177233,3681,-38.64771,-0.071194,6.08577,0.06981317,0), -- Wisp +(2,177233,3681,29.56227,0.119925,24.45391,0.08726646,0), -- Wisp +(3,177233,25019,12.80499,-7.601957,6.105068,2.9147,0), -- Merchant Felagunne +(4,177233,25020,12.95386,7.333937,6.131125,3.281219,0), -- Galley Chief Alunwea +(5,177233,25021,-21.41735,-2.833596,4.391686,6.248279,0), -- Mariner Moonblade +(6,177233,25022,20.86332,-1.285908,11.80898,2.949606,0), -- Mariner Stillwake +(7,177233,25023,-36.76907,0.169367,5.975922,3.176499,0), -- Mariner Everwatch +(8,177233,25024,-21.65951,3.22012,4.402726,0.1396263,0), -- Mariner Softsong +(9,177233,25025,31.13095,-0.454317,16.73282,2.96706,0); -- Captain Idrilae -- cgit v1.2.3 From e9feb0e3e2e3f1b7069dfe156f3063e9df39d357 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 8 Jun 2012 10:57:24 -0400 Subject: DB/Spells: fix bonus coefficient for lava burst. (thx 3kids) --- sql/updates/world/2012_06_08_00_world_spell_bonus_data.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_06_08_00_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_08_00_world_spell_bonus_data.sql b/sql/updates/world/2012_06_08_00_world_spell_bonus_data.sql new file mode 100644 index 00000000000..bf899421605 --- /dev/null +++ b/sql/updates/world/2012_06_08_00_world_spell_bonus_data.sql @@ -0,0 +1 @@ +UPDATE `spell_bonus_data` SET `direct_bonus`=0.571 WHERE `entry`=51505; -- cgit v1.2.3 From 8ab6d578ce207c3e195939960c8e81a1da90554d Mon Sep 17 00:00:00 2001 From: joschiwald Date: Fri, 8 Jun 2012 22:25:33 +0200 Subject: fix typos - i failed so hard :( --- .../2012_05_28_01_world_spell_script_names.sql | 4 ++-- .../2012_05_28_02_world_spelldifficulty_dbc.sql | 2 +- .../world/2012_05_28_03_world_conditions.sql | 2 +- src/server/game/Spells/Spell.cpp | 21 +-------------------- src/server/game/Spells/SpellMgr.cpp | 5 ++++- .../scripts/Northrend/Naxxramas/boss_gothik.cpp | 16 +++++++++------- .../Ulduar/HallsOfLightning/boss_loken.cpp | 8 +++++--- src/server/scripts/Spells/spell_druid.cpp | 11 ++++------- src/server/scripts/Spells/spell_generic.cpp | 17 +++++++++++------ src/server/scripts/Spells/spell_shaman.cpp | 8 ++++---- 10 files changed, 42 insertions(+), 52 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_05_28_01_world_spell_script_names.sql b/sql/updates/world/2012_05_28_01_world_spell_script_names.sql index e1db8fff869..00ceb1df9e9 100644 --- a/sql/updates/world/2012_05_28_01_world_spell_script_names.sql +++ b/sql/updates/world/2012_05_28_01_world_spell_script_names.sql @@ -39,8 +39,8 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (28833, 'spell_four_horsemen_mark'), (28834, 'spell_four_horsemen_mark'), (28835, 'spell_four_horsemen_mark'), -(27831, 'spell_gothic_shadow_bolt_volley'), -(55638, 'spell_gothic_shadow_bolt_volley'), +(27831, 'spell_gothik_shadow_bolt_volley'), +(55638, 'spell_gothik_shadow_bolt_volley'), (31447, 'spell_mark_of_kazrogal'), (32960, 'spell_mark_of_kazzak'), (33654, 'spell_gruul_shatter'), diff --git a/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql b/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql index 8caaf1a6fc7..198a2bf839d 100644 --- a/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql +++ b/sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql @@ -1,6 +1,6 @@ SET @DIFF := xxxx; -- set by TDB team DELETE FROM `spelldifficulty_dbc` WHERE `id` BETWEEN @DIFF+0 AND @DIFF+2; -INSERT INTO `spelldifficulty_dbc` (`id`,`spelld0`,`spellid1`,`spelld2`,`spellid3`) VALUES +INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`,`spellid2`,`spellid3`) VALUES (@DIFF+0,50811,61547,0,0), (@DIFF+1,57762,59990,0,0), (@DIFF+2,57763,61489,0,0); diff --git a/sql/updates/world/2012_05_28_03_world_conditions.sql b/sql/updates/world/2012_05_28_03_world_conditions.sql index 8369352481b..43d422e9239 100644 --- a/sql/updates/world/2012_05_28_03_world_conditions.sql +++ b/sql/updates/world/2012_05_28_03_world_conditions.sql @@ -1,5 +1,5 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (19938,30877); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES (17,0,19938,0,0,1,1,17743,0,0,0,0,'','Awaken Peon'), (17,0,30877,0,0,31,1,3,17326,0,0,0,'','Tag Murloc'); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8165c8172d7..da1841f7400 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5297,29 +5297,10 @@ SpellCastResult Spell::CheckCast(bool strict) } } - for (int i = 0; i < MAX_SPELL_EFFECTS; i++) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { switch (m_spellInfo->Effects[i].ApplyAuraName) { - case SPELL_AURA_DUMMY: - { - //custom check - switch (m_spellInfo->Id) - { - case 44795: // Parachute - { - float x, y, z; - m_caster->GetPosition(x, y, z); - float ground_Z = m_caster->GetMap()->GetHeight(m_caster->GetPhaseMask(), x, y, z); - if (fabs(ground_Z - z) < 0.1f) - return SPELL_FAILED_DONT_REPORT; - break; - } - default: - break; - } - break; - } case SPELL_AURA_MOD_POSSESS_PET: { if (m_caster->GetTypeId() != TYPEID_PLAYER) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 87373321a36..fd71ee294d7 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2975,7 +2975,6 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->EffectImplicitTargetB[0] = 0; break; case 63665: // Charge (Argent Tournament emote on riders) - case 31447: // Mark of Kaz'rogal (needs target selection script) case 31298: // Sleep (needs target selection script) case 51904: // Summon Ghouls On Scarlet Crusade (this should use conditions table, script for this spell needs to be fixed) case 2895: // Wrath of Air Totem rank 1 (Aura) @@ -3257,6 +3256,10 @@ void SpellMgr::LoadDbcDataCorrections() case 53313: // Entangling Roots (Rank 8) -- Nature's Grasp Proc spellInfo->CastingTimeIndex = 1; break; + case 59414: // Pulsing Shockwave Aura (Loken) + // this flag breaks movement, remove it + spellInfo->AttributesEx &= ~SPELL_ATTR1_CHANNELED_1; + break; case 61719: // Easter Lay Noblegarden Egg Aura - Interrupt flags copied from aura which this aura is linked with spellInfo->AuraInterruptFlags = AURA_INTERRUPT_FLAG_HITBYSPELL | AURA_INTERRUPT_FLAG_TAKE_DAMAGE; break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 227dfaada9c..7f4915cb3f1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -18,6 +18,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellScript.h" +#include "GridNotifiers.h" +#include "CombatAI.h" #include "naxxramas.h" enum Yells @@ -591,14 +593,14 @@ class mob_gothik_minion : public CreatureScript } }; -class spell_gothic_shadow_bolt_volley : public SpellScriptLoader +class spell_gothik_shadow_bolt_volley : public SpellScriptLoader { public: - spell_gothic_shadow_bolt_volley() : SpellScriptLoader("spell_gothic_shadow_bolt_volley") { } + spell_gothik_shadow_bolt_volley() : SpellScriptLoader("spell_gothik_shadow_bolt_volley") { } - class spell_gothic_shadow_bolt_volley_SpellScript : public SpellScript + class spell_gothik_shadow_bolt_volley_SpellScript : public SpellScript { - PrepareSpellScript(spell_gothic_shadow_bolt_volley_SpellScript); + PrepareSpellScript(spell_gothik_shadow_bolt_volley_SpellScript); void FilterTargets(std::list& unitList) { @@ -607,13 +609,13 @@ class spell_gothic_shadow_bolt_volley : public SpellScriptLoader void Register() { - OnUnitTargetSelect += SpellUnitTargetFn(spell_gothic_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_gothik_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; SpellScript* GetSpellScript() const { - return new spell_gothic_shadow_bolt_volley_SpellScript(); + return new spell_gothik_shadow_bolt_volley_SpellScript(); } }; @@ -621,5 +623,5 @@ void AddSC_boss_gothik() { new boss_gothik(); new mob_gothik_minion(); - new spell_gothic_shadow_bolt_volley(); + new spell_gothik_shadow_bolt_volley(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 0034747c6c2..bdaaa002b3f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Boss Loken SD%Complete: 60% -SDComment: Missing intro. Aura is not working (59414) +SDComment: Missing intro. SDCategory: Halls of Lightning EndScriptData */ @@ -85,7 +85,7 @@ public: { m_uiArcLightning_Timer = 15000; m_uiLightningNova_Timer = 20000; - m_uiResumePulsingShockwave_Timer = 15000; + m_uiResumePulsingShockwave_Timer = 1000; m_uiHealthAmountModifier = 1; @@ -112,7 +112,10 @@ public: Talk(SAY_DEATH); if (instance) + { instance->SetData(TYPE_LOKEN, DONE); + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_PULSING_SHOCKWAVE_AURA); + } } void KilledUnit(Unit* /*victim*/) @@ -130,7 +133,6 @@ public: { if (m_uiResumePulsingShockwave_Timer <= uiDiff) { - //breaks at movement, can we assume when it's time, this spell is casted and also must stop movement? DoCast(me, SPELL_PULSING_SHOCKWAVE_AURA, true); DoCast(me, SPELL_PULSING_SHOCKWAVE_N, true); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index f759efbee83..9dedeaf5bd7 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -388,7 +388,7 @@ class spell_dru_starfall_dummy : public SpellScriptLoader void Register() { - OnUnitTargetSelect += SpellUnitTargetFn(spell_dru_starfall_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_dru_starfall_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_dru_starfall_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -549,8 +549,7 @@ class spell_dru_savage_roar : public SpellScriptLoader void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - int32 bp0 = aurEff->GetAmount(); // todo: check if needed - target->CastCustomSpell(target, DRUID_SAVAGE_ROAR, &bp0, NULL, NULL, true, NULL, aurEff, GetCasterGUID()); + target->CastSpell(target, DRUID_SAVAGE_ROAR, true, NULL, aurEff, GetCasterGUID()); } void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -560,9 +559,8 @@ class spell_dru_savage_roar : public SpellScriptLoader void Register() { - // todo: check AuraEffectHandleModes - AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -626,7 +624,6 @@ class spell_dru_survival_instincts : public SpellScriptLoader void Register() { - // todo: check AuraEffectHandleModes AfterEffectApply += AuraEffectApplyFn(spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index b619dd9ac6f..85b1a79efd7 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -239,7 +239,7 @@ class spell_gen_parachute : public SpellScriptLoader { PrepareAuraScript(spell_gen_parachute_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spell*/) { if (!sSpellMgr->GetSpellInfo(SPELL_PARACHUTE) || !sSpellMgr->GetSpellInfo(SPELL_PARACHUTE_BUFF)) return false; @@ -252,7 +252,12 @@ class spell_gen_parachute : public SpellScriptLoader if (target->IsFalling()) { target->RemoveAurasDueToSpell(SPELL_PARACHUTE); - target->CastSpell(target, SPELL_PARACHUTE_BUFF, true); + + float x, y, z; + target->GetPosition(x, y, z); + float groundZ = target->GetMap()->GetHeight(target->GetPhaseMask(), x, y, z); + if (fabs(groundZ - z) > 0.1f) + target->CastSpell(target, SPELL_PARACHUTE_BUFF, true); } } @@ -2864,6 +2869,8 @@ class spell_gen_summon_elemental : public SpellScriptLoader enum Mounts { + SPELL_COLD_WEATHER_FLYING = 54197, + // Magic Broom SPELL_MAGIC_BROOM_60 = 42680, SPELL_MAGIC_BROOM_100 = 42683, @@ -2953,7 +2960,7 @@ class spell_gen_mount : public SpellScriptLoader // Triggered spell id dependent on riding skill and zone bool canFly = false; uint32 vmap = GetVirtualMapForMapAndZone(target->GetMapId(), target->GetZoneId()); - if (vmap == 530 || (vmap == 571 && target->HasSpell(54197))) + if (vmap == 530 || (vmap == 571 && target->HasSpell(SPELL_COLD_WEATHER_FLYING))) canFly = true; float x, y, z; @@ -2998,9 +3005,7 @@ class spell_gen_mount : public SpellScriptLoader if (mount) { - // Prevent stacking of mounts and client crashes upon dismounting - //target->RemoveAurasByType(SPELL_AURA_MOUNTED, 0, GetHitAura()); - + PreventHitAura(); target->CastSpell(target, mount, true); } } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index a7c196701ad..da15c5c5046 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -713,7 +713,7 @@ class spell_sha_sentry_totem : public SpellScriptLoader { PrepareAuraScript(spell_sha_sentry_totem_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spell*/) { if (!sSpellMgr->GetSpellInfo(SHAMAN_BIND_SIGHT)) return false; @@ -732,9 +732,9 @@ class spell_sha_sentry_totem : public SpellScriptLoader void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (GetCaster) - if (Player* caster = GetCaster()->ToPlayer()) - caster->StopCastingBindSight(); + if (Unit* caster = GetCaster()) + if (caster->GetTypeId() == TYPEID_PLAYER) + caster->ToPlayer()->StopCastingBindSight(); } void Register() -- cgit v1.2.3 From 563c70e41a902d3009a37df8d44d133eb125ff13 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 9 Jun 2012 12:52:01 +0200 Subject: DB/Spawns: Corrected Nerub'ar Broodkeeper spawns in ICC, they should be hanging from the ceiling. --- sql/updates/world/2012_06_09_00_world_creature.sql | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 sql/updates/world/2012_06_09_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_09_00_world_creature.sql b/sql/updates/world/2012_06_09_00_world_creature.sql new file mode 100644 index 00000000000..b2454b54163 --- /dev/null +++ b/sql/updates/world/2012_06_09_00_world_creature.sql @@ -0,0 +1,21 @@ +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36725; -- Nerub'ar Broodkeeper + +DELETE FROM `creature` WHERE `guid` IN (200939,200949,200956,201106,201127,201170); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES +(200939,36725,631,15,1,-210.3750,2202.675,75.09233,0.13962630,7200,0,0), -- Nerub'ar Broodkeeper +(200949,36725,631,15,1,-220.3819,2177.068,81.70050,0.85521130,7200,0,0), -- Nerub'ar Broodkeeper +(200956,36725,631,15,1,-216.4861,2245.405,81.70050,5.18362800,7200,0,0), -- Nerub'ar Broodkeeper +(201106,36725,631,15,1,-211.2899,2219.420,75.09233,0.15707960,7200,0,0), -- Nerub'ar Broodkeeper +(201127,36725,631,15,1,-249.8542,2219.672,86.27979,5.95157300,7200,0,0), -- Nerub'ar Broodkeeper +(201170,36725,631,15,1,-250.6129,2203.800,86.27979,0.03490658,7200,0,0); -- Nerub'ar Broodkeeper + +DELETE FROM `creature_addon` WHERE `guid` IN (200912,200934,200939,200949,200956,201106,201127,201170); +INSERT INTO `creature_addon` (`guid`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES +(200912,0,0x3000000,0x1,''), -- Nerub'ar Broodkeeper +(200934,0,0x3000000,0x1,''), -- Nerub'ar Broodkeeper +(200939,0,0x3000000,0x1,''), -- Nerub'ar Broodkeeper +(200949,0,0x3000000,0x1,''), -- Nerub'ar Broodkeeper +(200956,0,0x3000000,0x1,''), -- Nerub'ar Broodkeeper +(201106,0,0x3000000,0x1,''), -- Nerub'ar Broodkeeper +(201127,0,0x3000000,0x1,''), -- Nerub'ar Broodkeeper +(201170,0,0x3000000,0x1,''); -- Nerub'ar Broodkeeper -- cgit v1.2.3 From 5180bc46011d4780b6a19e161c7255fa023ef07a Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 12 Jun 2012 21:38:49 -0230 Subject: DB/Transport: First Transport to be properly Spawned and scripted. New transport system required. --- .../world/2012_06_12_00_world_transport.sql | 82 ++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 sql/updates/world/2012_06_12_00_world_transport.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_12_00_world_transport.sql b/sql/updates/world/2012_06_12_00_world_transport.sql new file mode 100644 index 00000000000..3099292f48d --- /dev/null +++ b/sql/updates/world/2012_06_12_00_world_transport.sql @@ -0,0 +1,82 @@ +-- Zeppelin: "Durotar to Thunder Bluff" +SET @GUID := 43468; +DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+11; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,3084,647,1,1,0,0,-4.83257,-4.312334,-17.63218,1.623156,180,0,0,1,0,0), -- Bluffwatcher +(@GUID+1,3084,647,1,1,0,0,-5.206744,-11.34318,-17.61012,4.712389,180,0,0,1,0,0), -- Bluffwatcher +(@GUID+2,24934,647,1,1,0,0,10.32099,-3.573514,-23.49413,3.176499,180,0,0,1,0,0), -- Snack-O-Matic IV +(@GUID+3,24935,647,1,1,0,0,10.2871,-12.02722,-23.49424,3.106686,180,0,0,1,0,0), -- Vend-O-Tron D-Luxe +(@GUID+4,25075,647,1,1,0,0,-3.396398,-7.905448,-23.69672,6.248279,180,0,0,1,0,0), -- Zeppelin Controls +(@GUID+5,34715,647,1,1,0,0,-9.183155,-7.775729,-17.21699,3.281219,180,0,0,1,0,0), -- Sky-Captain "Dusty" Blastnut +(@GUID+6,34717,647,1,1,0,0,-13.67017,-12.40177,-15.98756,4.590216,180,0,0,1,0,2), -- Crewman Pipewrench +(@GUID+7,34718,647,1,1,0,0,13.74505,-5.128461,-24.04518,0.1396263,180,0,0,1,0,0), -- Crewman Deadbolt +(@GUID+8,34719,647,1,1,0,0,7.623085,-5.025319,-17.67015,4.921828,180,0,0,1,0,0), -- Crewman Grit +(@GUID+9,34721,647,1,1,0,0,-0.919197,-6.164221,-23.67286,3.577925,180,0,0,1,0,0), -- Chief Officer Ograh +(@GUID+10,34723,647,1,1,0,0,-17.47968,-5.606984,-14.92807,3.228859,180,0,0,1,0,0), -- Watcher Tolwe +(@GUID+11,34730,647,1,1,0,0,-2.166869,-7.854215,-23.6919,3.385939,180,0,0,1,0,0); -- Navigator Zippik +DELETE FROM `creature_template_addon` WHERE `entry` IN (34718,34719); +INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`bytes2`,`emote`) VALUES +(34718,3,1,0),(34719,0,1,133); +-- Pathing for Crewman Pipewrench Entry: 34717 +SET @NPC := @GUID+6; +SET @PATH := @NPC * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,1,69, ''); +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,-13.66992,-12.40186,-16.09792,4.590216,26000,0,0,100,0), +(@PATH,2,-14.49512,-9.873911,-15.99125,0,0,0,0,100,0), +(@PATH,3,-14.49512,-6.373911,-15.99125,0,0,0,0,100,0), +(@PATH,4,-14.31525,-3.41333,-15.88589,0,24000,0,0,100,0); +-- Zeppelin: SAI +SET @ENTRY := 190549; +UPDATE `gameobject_template` SET `AIName`= 'SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2,@ENTRY*100+3) AND `source_type`=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 +(@ENTRY,1,0,0,71,0,100,0,21868,0,0,0,80,@ENTRY*100 ,0,0,0,0,0,1,0,0,0,0,0,0,0,'Zeppelin: - Event Dock Orgrimmar - Run Script'), +(@ENTRY,1,1,0,71,0,100,0,21869,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Zeppelin: - Event Leave Orgrimmar - Run Script'), +(@ENTRY,1,2,0,71,0,100,0,21870,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Zeppelin: - Event Dock Thunder Bluff - Run Script'), +(@ENTRY,1,3,0,71,0,100,0,21871,0,0,0,80,@ENTRY*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Zeppelin: - Event Leave Thunder Bluff - Run Script'), +-- Script 0 +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut Say 0'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh Say 1'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34765,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Zelli Hotnozzle Say 0'), +(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,5,5,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut emote'), +(@ENTRY*100,9,4,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'), +-- Script 1 +(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut Say 1'), +(@ENTRY*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh Say 0'), +(@ENTRY*100+1,9,2,0,0,0,100,0,4000,4000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'), +-- Script 2 +(@ENTRY*100+2,9,0,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut Say 2'), +(@ENTRY*100+2,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh Say 1'), +(@ENTRY*100+2,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34766,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Krendle Bigpockets Say 0'), +(@ENTRY*100+2,9,3,0,0,0,100,0,3000,3000,0,0,5,5,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut emote'), +(@ENTRY*100+2,9,4,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'), +-- Script 3 +(@ENTRY*100+3,9,0,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut Say 3'), +(@ENTRY*100+3,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh Say 2'), +(@ENTRY*100+3,9,2,0,0,0,100,0,4000,4000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'); +-- Watcher Tolwe SAI +SET @ENTRY := 34723; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,1,0,100,0,60000,120000,60000,120000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Watcher Tolwe - OOC - Say Random'); +-- Text for Watcher Tolwe, Sky-Captain Blastnut, Chief Officer Ograh, Krendle Bigpockets, & Zelli Hotnozzle +DELETE FROM `creature_text` WHERE `entry` IN (34723,34715,34721,34766,34765); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(34723,0,0,'Dat cloud look like da Warchief.',12,1,100,25,0,0,'Watcher Tolwe - Random'), +(34723,0,1,'Dere be a bug.',12,1,100,25,0,0,'Watcher Tolwe - Random'), +(34723,0,2,'Ware da ship! A harpy! ...wait, dat be another bird.',12,1,100,25,0,0,'Watcher Tolwe - Random'), +(34723,0,3,'Dere be a bird!',12,1,100,25,0,0,'Watcher Tolwe - Random'), +(34715,0,0,'And there''s Orgrimmar, huge and menacing like always. Take a quick break, boys, then it''s back to the Bluff!',12,1,100,1,0,0,'Sky-Captain Blastnut - Dock at Orgrimmar'), -- wait 3 sec do emote 5 +(34715,1,0,'Next stop, Thunder Bluff',12,1,100,5,0,0,'Sky-Captain Blastnut - Leave for Thunder Bluff'), +(34715,2,0,'Watch your step! Don''t want you becoming a smudge down there. Welcome to Thunder Bluff!',12,1,100,1,0,0,'Sky-Captain Blastnut - Dock at Thunder Bluff'), -- wait 3 sec do emote 5 +(34715,3,0,'Okay, boys, let''s get this baby over to Orgrimmar!',12,1,100,25,0,0,'Sky-Captain Blastnut - Leave for Orgrimmar'), +(34721,0,0,'Move it, Zippik! We don''t have all day!',12,1,100,5,0,0,'Chief Officer Ograh - Leave for Thunder Bluff'), +(34721,1,0,'Careful. CAREFUL! Did I feel a shudder? You''re going to knock that tower down, oaf!',12,1,100,5,0,0,'Chief Officer Ograh - Dock at Thunder Bluff'), -- wait 4 sec do emote 25 +(34721,2,0,'We''re behind schedule! Turn this tub east! EAST!',12,1,100,5,0,0,'Chief Officer Ograh - Leave for Orgrimmar'), +(34766,0,0,'Step right up! The zeppelin to Orgrimmar has arrived! All aboard to Durotar!',14,0,100,22,0,11804,'Krendle Bigpockets - Dock at Thunder Bluff'), +(34765,0,0,'The zeppelin to Thunder Bluff has arrived! All aboard for a smooth ride across the Barrens!',14,0,100,22,0,11804,'Zelli Hotnozzle - Dock at Orgrimmar'); -- cgit v1.2.3 From 12ff298b59da1586871fbe890f3e87f9956fa1ea Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 13 Jun 2012 11:52:32 -0230 Subject: DB/creature: Spawning and pathing for Violetta by Wishtodie. --- sql/updates/world/2012_06_13_00_world_creature.sql | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 sql/updates/world/2012_06_13_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_13_00_world_creature.sql b/sql/updates/world/2012_06_13_00_world_creature.sql new file mode 100644 index 00000000000..a2415a043f3 --- /dev/null +++ b/sql/updates/world/2012_06_13_00_world_creature.sql @@ -0,0 +1,71 @@ +-- Pathing for Violetta (32720) +SET @NPC := 32720; +SET @GUID := 12402; +DELETE FROM `creature` WHERE `guid`=@GUID; +DELETE FROM `creature` WHERE `id`=@NPC; +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,@NPC,571,1,1,0,0,5693.527,680.9248,645.9013,4.681826,300,0,0,1,0,0,0,0,0); +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,1,0,''); +-- SAI +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@NPC; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@NPC*100+0,@NPC*100+1,@NPC*100+2,@NPC*100+3) AND `source_type`=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,1,25,0,100,0,0,0,0,0,71,1670,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On reset - Equip default"), +(@NPC,0,1,0,61,0,100,0,0,0,0,0,88,@NPC*100+0,@NPC*100+1,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On reset - Run random script"), +(@NPC,0,2,0,40,1,100,0,8,0,0,0,80,@NPC*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On wp8 - Run script"), +(@NPC,0,3,0,40,2,100,0,8,0,0,0,80,@NPC*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On wp8 - Run script"), +(@NPC,0,4,0,58,0,100,0,0,0,0,0,41,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On wp end - Despawn"), +(@NPC*100+0,9,0,0,0,0,100,0,0,0,0,0,53,0,@NPC*10+0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script 1 - Start waypoint 1"), +(@NPC*100+0,9,1,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script 1 - Set phase 1"), +(@NPC*100+1,9,0,0,0,0,100,0,0,0,0,0,53,0,@NPC*10+1,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script 2 - Start waypoint 2"), +(@NPC*100+1,9,1,0,0,0,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script 2 - Set phase 2"), +(@NPC*100+2,9,0,0,0,0,100,0,0,0,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script - Pause WP 10 seconds"), +(@NPC*100+2,9,1,0,0,0,100,0,5000,5000,5000,5000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script - Emote talk"), +(@NPC*100+2,9,2,0,0,0,100,0,3000,3000,3000,3000,71,0,0,44655,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script - Equip item"), +(@NPC*100+3,9,0,0,0,0,100,0,0,0,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script - Pause WP 10 seconds"), +(@NPC*100+3,9,1,0,0,0,100,0,5000,5000,5000,5000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script - Emote talk"), +(@NPC*100+3,9,2,0,0,0,100,0,3000,3000,3000,3000,71,0,0,40020,0,0,0,1,0,0,0,0,0,0,0,"Violetta - On script - Equip item"); +-- Waypoints +DELETE FROM `waypoints` WHERE `entry` IN (@NPC*10+0,@NPC*10+1); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@NPC*10+0,1,5693.35,675.1416,645.6994,'Violetta wp1'), +(@NPC*10+0,2,5690.851,664.07,646.2488,'Violetta wp1'), +(@NPC*10+0,3,5686.851,656.5425,646.5913,'Violetta wp1'), +(@NPC*10+0,4,5679.384,648.7989,646.6834,'Violetta wp1'), +(@NPC*10+0,5,5675.498,647.6321,647.0242,'Violetta wp1'), +(@NPC*10+0,6,5669.809,645.4785,647.9725,'Violetta wp1'), +(@NPC*10+0,7,5664.492,643.8845,647.98,'Violetta wp1'), +(@NPC*10+0,8,5664.87,642.0466,647.98,'Violetta wp1'), +(@NPC*10+0,9,5669.127,645.5728,647.9717,'Violetta wp1'), +(@NPC*10+0,10,5675.875,647.3784,647.0391,'Violetta wp1'), +(@NPC*10+0,11,5681.011,648.9694,646.6834,'Violetta wp1'), +(@NPC*10+0,12,5683.774,658.9824,646.6004,'Violetta wp1'), +(@NPC*10+0,13,5682.824,671.3663,647.0424,'Violetta wp1'), +(@NPC*10+0,14,5677.113,674.4891,649.4763,'Violetta wp1'), +(@NPC*10+0,15,5667.89,677.9095,652.0448,'Violetta wp1'), +(@NPC*10+0,16,5655.117,684.3335,651.9886,'Violetta wp1'), +(@NPC*10+0,17,5649.896,690.4983,651.9928,'Violetta wp1'), +(@NPC*10+0,18,5646.092,697.507,651.9928,'Violetta wp1'), +(@NPC*10+0,19,5646.725,700.2504,651.9928,'Violetta wp1'), +(@NPC*10+1,1,5693.35,675.1416,645.6994,'Violetta wp2'), +(@NPC*10+1,2,5690.851,664.07,646.2488,'Violetta wp2'), +(@NPC*10+1,3,5686.851,656.5425,646.5913,'Violetta wp2'), +(@NPC*10+1,4,5679.384,648.7989,646.6834,'Violetta wp2'), +(@NPC*10+1,5,5675.498,647.6321,647.0242,'Violetta wp2'), +(@NPC*10+1,6,5669.809,645.4785,647.9725,'Violetta wp2'), +(@NPC*10+1,7,5664.369,644.7076,647.9811,'Violetta wp2'), +(@NPC*10+1,8,5661.005,643.9919,647.9821,'Violetta wp2'), +(@NPC*10+1,9,5669.143,645.5861,647.9418,'Violetta wp2'), +(@NPC*10+1,10,5675.875,647.3784,647.0391,'Violetta wp2'), +(@NPC*10+1,11,5681.011,648.9694,646.6834,'Violetta wp2'), +(@NPC*10+1,12,5683.774,658.9824,646.6004,'Violetta wp2'), +(@NPC*10+1,13,5682.824,671.3663,647.0424,'Violetta wp2'), +(@NPC*10+1,14,5677.113,674.4891,649.4763,'Violetta wp2'), +(@NPC*10+1,15,5667.89,677.9095,652.0448,'Violetta wp2'), +(@NPC*10+1,16,5655.117,684.3335,651.9886,'Violetta wp2'), +(@NPC*10+1,17,5649.896,690.4983,651.9928,'Violetta wp2'), +(@NPC*10+1,18,5646.092,697.507,651.9928,'Violetta wp2'), +(@NPC*10+1,19,5646.725,700.2504,651.9928,'Violetta wp2'); \ No newline at end of file -- cgit v1.2.3 From ca85c03afdc6cff71a5991b1a091e4eb0262e9f7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 13 Jun 2012 11:55:27 -0230 Subject: Db/creature: Add newline --- sql/updates/world/2012_06_13_00_world_creature.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_13_00_world_creature.sql b/sql/updates/world/2012_06_13_00_world_creature.sql index a2415a043f3..0d2aa74c9c7 100644 --- a/sql/updates/world/2012_06_13_00_world_creature.sql +++ b/sql/updates/world/2012_06_13_00_world_creature.sql @@ -68,4 +68,4 @@ INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z (@NPC*10+1,16,5655.117,684.3335,651.9886,'Violetta wp2'), (@NPC*10+1,17,5649.896,690.4983,651.9928,'Violetta wp2'), (@NPC*10+1,18,5646.092,697.507,651.9928,'Violetta wp2'), -(@NPC*10+1,19,5646.725,700.2504,651.9928,'Violetta wp2'); \ No newline at end of file +(@NPC*10+1,19,5646.725,700.2504,651.9928,'Violetta wp2'); -- cgit v1.2.3 From 39a46e6ef16ea1f53feea9b0eb18247cf3ec3d6b Mon Sep 17 00:00:00 2001 From: Kandera Date: Wed, 13 Jun 2012 10:34:29 -0400 Subject: DB/Spawns: correct spawn for Lok'lira the Crone. add the quest invisibility 2 aura to her creature_template_addon. give the player the see quest invisibility 2 aura once Change of Scenery has been accepted. Closes #1292 --- sql/updates/world/2012_06_13_01_world_creature.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/2012_06_13_01_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_13_01_world_creature.sql b/sql/updates/world/2012_06_13_01_world_creature.sql new file mode 100644 index 00000000000..5ba3e0d34a2 --- /dev/null +++ b/sql/updates/world/2012_06_13_01_world_creature.sql @@ -0,0 +1,11 @@ +DELETE FROM `creature_template_addon` WHERE `entry` = 29975; +INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES +(29975, 0, 0x10000, 0x1, 54503); -- Lok'lira the Crone - Quest Invisibility 2 + +DELETE FROM `creature` WHERE `id` = 29975 OR `guid` = 2593; +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES +(2593, 29975, 571, 1, 1, 6922.175, -1534.575, 836.1568, 4.276057, 120, 0, 0); -- Lok'lira the Crone (Area: Brunnhildar Village) + +DELETE FROM `spell_area` WHERE `spell` = 54504; +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(54504,4422,12921,1,0,0,0,2,1); -- cast see quest invisibility 2 after accepting the quest from lok'lira. -- cgit v1.2.3 From 1aaea81c10bdb985b703f138ffbcb605fbdade42 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 13 Jun 2012 12:04:44 -0230 Subject: DB/Gossip: Misc fixes from Durotar. Closes 6785 , 6770 , 6768 , 6767 , 6766 --- sql/updates/world/2012_06_13_01_world_gossip.sql | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sql/updates/world/2012_06_13_01_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_13_01_world_gossip.sql b/sql/updates/world/2012_06_13_01_world_gossip.sql new file mode 100644 index 00000000000..2cac9fe2a0a --- /dev/null +++ b/sql/updates/world/2012_06_13_01_world_gossip.sql @@ -0,0 +1,32 @@ +-- Missing gossip for Krendle Bigpockets in Thunder Bluff +UPDATE `creature_template` SET `gossip_menu_id`=10566 WHERE `entry`=34766; +DELETE FROM `gossip_menu` WHERE `entry`=10566 AND `text_id`=14622; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (10566,14622); +-- Missing gossip +DELETE FROM `gossip_menu_option` WHERE `menu_id`=7368 AND `id` IN (3,4); +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 +(7368,3,0,'Acteon, where is the best area to hunt for moongraze stags?',1,1,7423,0,0,0,''), +(7368,4,0,'Acteon, where is the best place to hunt moongraze bucks?',1,1,7424,0,0,0,''); +-- conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7368 AND `SourceEntry` IN (3,4); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,7368,3,0,0,9,9454,0,0,0,0,'','Acteon - Show gossip option if player has quest 9454'), +(15,7368,4,0,0,9,10324,0,0,0,0,'','Acteon - Show gossip option if player has quest 10324'); +-- Gossip Condition for Archmage Celindra +SET @GOSSIP := 9777; +SET @TEXTNO := 13455; +SET @TEXTYES := 13456; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTNO,0,15,1407,0,0,0,'','Show gossip text if player is not a mage'), +(14,@GOSSIP,@TEXTYES,0,15,128,0,0,0,'','Show gossip text if player is a mage'); +-- Update NPC 4217 Mathrengyl Bearwalker +DELETE FROM `gossip_menu_option` WHERE `menu_id`=1403 AND `id`=3; +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 +(1403,3,1,'I''d like to purchase more Tharlendris seeds.',3,128,0,0,0,0,''); +-- conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1403 AND `SourceEntry`=3; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,1403,3,0,0,8,3781,0,0,0,0,'','Mathrengyl Bearwalker - Show gossip option if player has rewarded quest 3781'); -- available only for druids + -- Quest 3792 should only be available after quest 3791 +UPDATE `quest_template` SET `PrevQuestId`=3791 WHERE `id`=3792; -- cgit v1.2.3 From b43fa6f7438b4b1100687ebd220df756cd2bb420 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 13 Jun 2012 12:10:33 -0230 Subject: DB/Gossip: Misc fixes from Durotar. Closes 6785 , 6770 , 6768 , 6767 , 6766 --- sql/updates/world/2012_06_13_01_world_gossip.sql | 32 ------------------------ sql/updates/world/2012_06_13_02_world_gossip.sql | 32 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 sql/updates/world/2012_06_13_01_world_gossip.sql create mode 100644 sql/updates/world/2012_06_13_02_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_13_01_world_gossip.sql b/sql/updates/world/2012_06_13_01_world_gossip.sql deleted file mode 100644 index 2cac9fe2a0a..00000000000 --- a/sql/updates/world/2012_06_13_01_world_gossip.sql +++ /dev/null @@ -1,32 +0,0 @@ --- Missing gossip for Krendle Bigpockets in Thunder Bluff -UPDATE `creature_template` SET `gossip_menu_id`=10566 WHERE `entry`=34766; -DELETE FROM `gossip_menu` WHERE `entry`=10566 AND `text_id`=14622; -INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (10566,14622); --- Missing gossip -DELETE FROM `gossip_menu_option` WHERE `menu_id`=7368 AND `id` IN (3,4); -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 -(7368,3,0,'Acteon, where is the best area to hunt for moongraze stags?',1,1,7423,0,0,0,''), -(7368,4,0,'Acteon, where is the best place to hunt moongraze bucks?',1,1,7424,0,0,0,''); --- conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7368 AND `SourceEntry` IN (3,4); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,7368,3,0,0,9,9454,0,0,0,0,'','Acteon - Show gossip option if player has quest 9454'), -(15,7368,4,0,0,9,10324,0,0,0,0,'','Acteon - Show gossip option if player has quest 10324'); --- Gossip Condition for Archmage Celindra -SET @GOSSIP := 9777; -SET @TEXTNO := 13455; -SET @TEXTYES := 13456; -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@GOSSIP; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(14,@GOSSIP,@TEXTNO,0,15,1407,0,0,0,'','Show gossip text if player is not a mage'), -(14,@GOSSIP,@TEXTYES,0,15,128,0,0,0,'','Show gossip text if player is a mage'); --- Update NPC 4217 Mathrengyl Bearwalker -DELETE FROM `gossip_menu_option` WHERE `menu_id`=1403 AND `id`=3; -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 -(1403,3,1,'I''d like to purchase more Tharlendris seeds.',3,128,0,0,0,0,''); --- conditions -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1403 AND `SourceEntry`=3; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES -(15,1403,3,0,0,8,3781,0,0,0,0,'','Mathrengyl Bearwalker - Show gossip option if player has rewarded quest 3781'); -- available only for druids - -- Quest 3792 should only be available after quest 3791 -UPDATE `quest_template` SET `PrevQuestId`=3791 WHERE `id`=3792; diff --git a/sql/updates/world/2012_06_13_02_world_gossip.sql b/sql/updates/world/2012_06_13_02_world_gossip.sql new file mode 100644 index 00000000000..2cac9fe2a0a --- /dev/null +++ b/sql/updates/world/2012_06_13_02_world_gossip.sql @@ -0,0 +1,32 @@ +-- Missing gossip for Krendle Bigpockets in Thunder Bluff +UPDATE `creature_template` SET `gossip_menu_id`=10566 WHERE `entry`=34766; +DELETE FROM `gossip_menu` WHERE `entry`=10566 AND `text_id`=14622; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (10566,14622); +-- Missing gossip +DELETE FROM `gossip_menu_option` WHERE `menu_id`=7368 AND `id` IN (3,4); +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 +(7368,3,0,'Acteon, where is the best area to hunt for moongraze stags?',1,1,7423,0,0,0,''), +(7368,4,0,'Acteon, where is the best place to hunt moongraze bucks?',1,1,7424,0,0,0,''); +-- conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7368 AND `SourceEntry` IN (3,4); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,7368,3,0,0,9,9454,0,0,0,0,'','Acteon - Show gossip option if player has quest 9454'), +(15,7368,4,0,0,9,10324,0,0,0,0,'','Acteon - Show gossip option if player has quest 10324'); +-- Gossip Condition for Archmage Celindra +SET @GOSSIP := 9777; +SET @TEXTNO := 13455; +SET @TEXTYES := 13456; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,@TEXTNO,0,15,1407,0,0,0,'','Show gossip text if player is not a mage'), +(14,@GOSSIP,@TEXTYES,0,15,128,0,0,0,'','Show gossip text if player is a mage'); +-- Update NPC 4217 Mathrengyl Bearwalker +DELETE FROM `gossip_menu_option` WHERE `menu_id`=1403 AND `id`=3; +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 +(1403,3,1,'I''d like to purchase more Tharlendris seeds.',3,128,0,0,0,0,''); +-- conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1403 AND `SourceEntry`=3; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,1403,3,0,0,8,3781,0,0,0,0,'','Mathrengyl Bearwalker - Show gossip option if player has rewarded quest 3781'); -- available only for druids + -- Quest 3792 should only be available after quest 3791 +UPDATE `quest_template` SET `PrevQuestId`=3791 WHERE `id`=3792; -- cgit v1.2.3 From 2f468319af223332661721e1c1eaf1fc34203973 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 13 Jun 2012 17:04:10 -0230 Subject: Db/Gossip: Fix error in sql --- sql/updates/world/2012_06_07_00_world_gossip.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_07_00_world_gossip.sql b/sql/updates/world/2012_06_07_00_world_gossip.sql index 1fe4a23bc5a..aac3ac53e74 100644 --- a/sql/updates/world/2012_06_07_00_world_gossip.sql +++ b/sql/updates/world/2012_06_07_00_world_gossip.sql @@ -9,7 +9,7 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (@NPC,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Charles Worth - On Gossip Select - Close Gossip'); -- Add missing Gossip for Charles Worth DELETE FROM `gossip_menu` WHERE `entry` IN (10136,10138); -DELETE FROM `gossip_menu` WHERE `entry`=14076 AND `text_id`=14076; +DELETE FROM `gossip_menu` WHERE `entry`=10118 AND `text_id`=14076; INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (10136,14072),(10138,14074),(10118,14076); -- Add Gossip Options DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id` IN (2,3,4,5); -- cgit v1.2.3 From 62c64920f17dc08834098c383a8a8ba7044e4c8d Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 9 Jun 2012 00:14:55 +0200 Subject: Core/Spells: Fix Empowered Renew calculation --- .../world/2012_06_09_00_world_spell_bonus_data.sql | 3 ++ .../2012_06_09_00_world_spell_script_names.sql | 3 ++ src/server/game/Spells/Auras/SpellAuras.cpp | 13 ------- src/server/scripts/Spells/spell_priest.cpp | 45 ++++++++++++++++++++++ 4 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 sql/updates/world/2012_06_09_00_world_spell_bonus_data.sql create mode 100644 sql/updates/world/2012_06_09_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_09_00_world_spell_bonus_data.sql b/sql/updates/world/2012_06_09_00_world_spell_bonus_data.sql new file mode 100644 index 00000000000..aa9c1b732c4 --- /dev/null +++ b/sql/updates/world/2012_06_09_00_world_spell_bonus_data.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_bonus_data` WHERE `entry`=63544; +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(63544,0,0,0,0,'Priest - Empowered Renew'); diff --git a/sql/updates/world/2012_06_09_00_world_spell_script_names.sql b/sql/updates/world/2012_06_09_00_world_spell_script_names.sql new file mode 100644 index 00000000000..a9faa529143 --- /dev/null +++ b/sql/updates/world/2012_06_09_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=-139; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(-139,'spell_priest_renew'); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 4dda1c731a7..9456a219274 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1221,19 +1221,6 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b caster->CastCustomSpell(caster, 75999, &heal, NULL, NULL, true, NULL, GetEffect(0)); } } - // Renew - else if (GetSpellInfo()->SpellFamilyFlags[0] & 0x00000040 && GetEffect(0)) - { - // Empowered Renew - if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 3021, 1)) - { - uint32 damage = caster->SpellHealingBonusDone(target, GetSpellInfo(), GetEffect(0)->GetAmount(), HEAL); - damage = target->SpellHealingBonusTaken(caster, GetSpellInfo(), damage, HEAL); - - int32 basepoints0 = aurEff->GetAmount() * GetEffect(0)->GetTotalTicks() * int32(damage) / 100; - caster->CastCustomSpell(target, 63544, &basepoints0, NULL, NULL, true, NULL, GetEffect(0)); - } - } // Power Word: Shield else if (m_spellInfo->SpellFamilyFlags[0] & 0x1 && m_spellInfo->SpellFamilyFlags[2] & 0x400 && GetEffect(0)) { diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 8088004c9d1..cb9f2ad1753 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -34,6 +34,8 @@ enum PriestSpells PRIEST_SPELL_PENANCE_R1_HEAL = 47757, PRIEST_SPELL_REFLECTIVE_SHIELD_TRIGGERED = 33619, PRIEST_SPELL_REFLECTIVE_SHIELD_R1 = 33201, + PRIEST_SPELL_EMPOWERED_RENEW = 63544, + PRIEST_ICON_ID_EMPOWERED_RENEW_TALENT = 3021, }; // Guardian Spirit @@ -330,6 +332,48 @@ public: } }; +class spell_priest_renew : public SpellScriptLoader +{ + public: + spell_priest_renew() : SpellScriptLoader("spell_priest_renew") { } + + class spell_priest_renew_AuraScript : public AuraScript + { + PrepareAuraScript(spell_priest_renew_AuraScript); + + bool Load() + { + return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; + } + + void HandleApplyEffect(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + { + // Empowered Renew + if (AuraEffect const* empoweredRenewAurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, PRIEST_ICON_ID_EMPOWERED_RENEW_TALENT, EFFECT_1)) + { + uint32 heal = caster->SpellHealingBonusDone(GetTarget(), GetSpellInfo(), GetEffect(EFFECT_0)->GetAmount(), DOT); + heal = GetTarget()->SpellHealingBonusTaken(caster, GetSpellInfo(), heal, DOT); + + int32 basepoints0 = empoweredRenewAurEff->GetAmount() * GetEffect(EFFECT_0)->GetTotalTicks() * int32(heal) / 100; + caster->CastCustomSpell(GetTarget(), PRIEST_SPELL_EMPOWERED_RENEW, &basepoints0, NULL, NULL, true, NULL, aurEff); + } + } + } + + void Register() + { + OnEffectApply += AuraEffectApplyFn(spell_priest_renew_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_priest_renew_AuraScript(); + } +}; + void AddSC_priest_spell_scripts() { new spell_pri_guardian_spirit(); @@ -339,4 +383,5 @@ void AddSC_priest_spell_scripts() new spell_pri_reflective_shield_trigger(); new spell_pri_mind_sear(); new spell_pri_prayer_of_mending_heal(); + new spell_priest_renew(); } -- cgit v1.2.3 From ace68d5f4f87284c40171ac287ca21c1bb5de15f Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 13 Jun 2012 19:35:33 -0230 Subject: DB/SAI: Scripting for Grand Anchorite Almonen --- sql/updates/world/2012_06_13_03_world_sai.sql | 70 +++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 sql/updates/world/2012_06_13_03_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_13_03_world_sai.sql b/sql/updates/world/2012_06_13_03_world_sai.sql new file mode 100644 index 00000000000..ad9642447c0 --- /dev/null +++ b/sql/updates/world/2012_06_13_03_world_sai.sql @@ -0,0 +1,70 @@ +-- Grand Anchorite Almonen SAI +SET @ENTRY := 19216; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100) AND `source_type`=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 +(@ENTRY,0,0,0,1,0,100,0,10000,10000,300000,300000,80,@ENTRY*100 ,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sky-Captain Cloudkicker - OOC - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.654867,'Grand Anchorite Almonen - Script - Turn to'), +(@ENTRY*100,9,1,0,0,0,100,0,9000,9000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - emote'), +(@ENTRY*100,9,2,0,0,0,100,0,23000,23000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1854.72,5423.082,-10.45947,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,3,0,0,0,100,0,800,800,0,0,69,0,0,0,0,0,0,8,0,0,0,-1854.598,5411.999,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.183628,'Grand Anchorite Almonen - Script - Turn to'), +(@ENTRY*100,9,5,0,0,0,100,0,100,100,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 0'), +(@ENTRY*100,9,6,0,0,0,100,0,9000,9000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 1'), +(@ENTRY*100,9,7,0,0,0,100,0,9000,9000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 2'), +(@ENTRY*100,9,8,0,0,0,100,0,25000,25000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 3'), +(@ENTRY*100,9,9,0,0,0,100,0,10000,10000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1851.699,5413.06,-12.42816,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,10,0,0,0,100,0,100,100,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 4'), +(@ENTRY*100,9,11,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1848.775,5412.81,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,12,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.276057,'Grand Anchorite Almonen - Script - Turn to'), +(@ENTRY*100,9,13,0,0,0,100,0,4000,4000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 5'), +(@ENTRY*100,9,14,0,0,0,100,0,7000,7000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1851.574,5412.084,-12.42816,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,15,0,0,0,100,0,1900,1900,0,0,69,0,0,0,0,0,0,8,0,0,0,-1856.307,5410.266,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,16,0,0,0,100,0,1900,1900,0,0,69,0,0,0,0,0,0,8,0,0,0,-1859.002,5406.959,-12.42814,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,17,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.707227,'Grand Anchorite Almonen - Script - Turn to'), +(@ENTRY*100,9,18,0,0,0,100,0,100,100,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 6'), +(@ENTRY*100,9,19,0,0,0,100,0,10000,10000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 7'), +(@ENTRY*100,9,20,0,0,0,100,0,9000,9000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 8'), +(@ENTRY*100,9,21,0,0,0,100,0,5000,5000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1855.089,5410.676,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,22,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1853.62,5409.833,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,23,0,0,0,100,0,3000,3000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 9'), +(@ENTRY*100,9,24,0,0,0,100,0,11000,11000,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 10'), +(@ENTRY*100,9,25,0,0,0,100,0,9000,9000,0,0,1,11,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 11'), +(@ENTRY*100,9,26,0,0,0,100,0,100,100,0,0,69,0,0,0,0,0,0,8,0,0,0,-1852.503,5412.286,-12.42816,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,27,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1849.053,5415.075,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,28,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.340707,'Grand Anchorite Almonen - Script - Turn to'), +(@ENTRY*100,9,29,0,0,0,100,0,5000,5000,0,0,1,12,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 12'), +(@ENTRY*100,9,30,0,0,0,100,0,11000,11000,0,0,1,13,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 13'), +(@ENTRY*100,9,31,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1851.643,5414.012,-12.42816,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,32,0,0,0,100,0,1200,1200,0,0,69,0,0,0,0,0,0,8,0,0,0,-1854.913,5412.682,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,33,0,0,0,100,0,800,800,0,0,69,0,0,0,0,0,0,8,0,0,0,-1854.408,5411.227,-12.42815,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,34,0,0,0,100,0,1000,1000,0,0,1,14,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 14'), +(@ENTRY*100,9,35,0,0,0,100,0,10000,10000,0,0,1,15,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 15'), +(@ENTRY*100,9,36,0,0,0,100,0,7000,7000,0,0,1,16,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 16'), +(@ENTRY*100,9,37,0,0,0,100,0,10000,10000,0,0,1,17,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 17'), +(@ENTRY*100,9,38,0,0,0,100,0,11000,11000,0,0,1,18,0,0,0,0,0,1,0,0,0,0,0,0,0,'Grand Anchorite Almonen - Script - say 18'), +(@ENTRY*100,9,39,0,0,0,100,0,10000,10000,0,0,69,0,0,0,0,0,0,8,0,0,0,-1853.137,5424.863,-10.47787,0,'Grand Anchorite Almonen - Script - move to'), +(@ENTRY*100,9,40,0,0,0,100,0,6500,6500,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.6529,'Grand Anchorite Almonen - Script - Turn to'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=19216; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(19216,0,0, 'Friends, it is my great pleasure to welcome you to the temple today.',12,0,100,1,0,0, 'Grand Anchorite Almonen'), +(19216,1,0, 'A''dal has been most generous in his revelations to me, a humble servant of the Light.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,2,0, 'In accordance with my divine calling, I must share these revealed truths to all who would hear.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,3,0, 'It has been made known to me that inside each of us, the Light resides...',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,4,0, '...that it is a gift, given freely to all naturally born beings.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,5,0, 'It manifests itself as a feeling, small at first and easily ignored, that confirms truths and subtly prods one to do good.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,6,0, 'Simple kindnesses, charitable deeds, service to those in need. These are all fruits of the Light.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,7,0, 'It rewards those who heed its promptings with blessings, both seen and unseen.',12,0,100,1,0,0, 'Grand Anchorite Almonen'), +(19216,8,0, 'Personal reservoirs of hope and faith are strengthened, and one''s capacity for greater light increases.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,9,0, 'Over the course of time, through obedience to the Light''s guidance, one becomes more sensitive to its voice, and its power.',12,0,100,273,0,0, 'Grand Anchorite Almonen'), +(19216,10,0, 'Great is the healing and blessing power of the Light''s most diligent followers.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,11,0, 'Sadly, there are those who wander through mortality in defiance of the Light.',12,0,100,1,0,0, 'Grand Anchorite Almonen'), +(19216,12,0, 'From these the Light withdraws, until only darkness remains.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,13,0, 'Where there is no light, despair, loathing and rage thrive.',12,0,100,5,0,0, 'Grand Anchorite Almonen'), +(19216,14,0, 'We are born into a perilous age, where the forces of darkness are determined to bring about our destruction.',12,0,100,1,0,0, 'Grand Anchorite Almonen'), +(19216,15,0, 'These are the times to find yourselves in unison with the Light.',12,0,100,5,0,0, 'Grand Anchorite Almonen'), +(19216,16,0, 'Hear my words, and let the Light inside of you confirm the truth of them.',12,0,100,0,0,0, 'Grand Anchorite Almonen'), +(19216,17,0, 'Embrace the light that is in you, my friends! Deny yourself all darkness...',12,0,100,5,0,0, 'Grand Anchorite Almonen'), +(19216,18,0, 'We must endure these trying times faithfully, and one day we will find ourselves victorious.',12,0,100,5,0,0, 'Grand Anchorite Almonen'); -- cgit v1.2.3 From 6c8fca7e25c9160d68075a9c5910d30509acdc45 Mon Sep 17 00:00:00 2001 From: QAston Date: Thu, 14 Jun 2012 13:13:04 +0200 Subject: DB/Spells: Fix spell Surge of Adrenaline --- sql/updates/world/2012_06_14_00_world_spell_linked_spell.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_06_14_00_world_spell_linked_spell.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_00_world_spell_linked_spell.sql b/sql/updates/world/2012_06_14_00_world_spell_linked_spell.sql new file mode 100644 index 00000000000..85cae64c21d --- /dev/null +++ b/sql/updates/world/2012_06_14_00_world_spell_linked_spell.sql @@ -0,0 +1,5 @@ +-- Fix Surge of Adrenaline +DELETE FROM `spell_linked_spell` WHERE `spell_effect`=68667; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +(-66683,68667,0, 'Icehowl - Surge of Adrenaline'), +(-67660,68667,0, 'Icehowl - Surge of Adrenaline'); -- cgit v1.2.3 From f5fd27fd07c1dd95d44c678c1e996ac0cd8d1159 Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 14 Jun 2012 11:52:22 -0400 Subject: DB/Spells: fix bonus coeff for spells. -1 does auto calculation and should not be used for no calculation. --- .../world/2012_06_14_03_world_spell_bonus_data.sql | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 sql/updates/world/2012_06_14_03_world_spell_bonus_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_03_world_spell_bonus_data.sql b/sql/updates/world/2012_06_14_03_world_spell_bonus_data.sql new file mode 100644 index 00000000000..dc59f152e33 --- /dev/null +++ b/sql/updates/world/2012_06_14_03_world_spell_bonus_data.sql @@ -0,0 +1,94 @@ +-- Death Knight +DELETE FROM `spell_bonus_data` WHERE `entry` IN (58621, 47632, 47633, 50444, 70890, 50526, 48982, 59754, 49184); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(58621, 0, 0, 0.08, 0, 'Death Knight - Glyph of Chains of Ice'), -- Shouldn't scale with SP. +(47632, 0, 0, 0.15, 0, 'Death Knight - Death Coil'), -- Shouldn't scale with SP. +(47633, 0, 0, 0.15, 0, 'Death Knight - Death Coil (Heal)'), -- Shouldn't scale with SP. +(50444, 0, 0, 0.105, 0, 'Death Knight - Corpse Explosion (Triggered)'), -- Shouldn't scale with SP. +(70890, 0, 0, 0, 0, 'Death Knight - Scourge Strike (Shadow)'), -- Shouldn't scale with SP. +(50526, 0, 0, 0, 0, 'Death Knight - Wandering Plague (Triggered)'), -- Shouldn't scale with SP. +(48982, 0, 0, 0, 0, 'Death Knight - Rune Tap'), -- Shouldn't scale with SP. +(59754, 0, 0, 0, 0, 'Death Knight - Glyph of Rune Tap (Triggered)'), -- Shouldn't scale with SP. +(49184, 0, 0, 0.2, 0, 'Death Knight - Howling Blast'); -- Shouldn't scale with SP. + +-- Druid +DELETE FROM `spell_bonus_data` WHERE `entry` IN (33745, 9007); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(33745, 0, 0, 0.01, 0.01, 'Druid - Lacerate ($AP*0.05/number of ticks)'), -- Direct damage should scale with AP, based on DrDamage addon(3.3.5a). +(9007, 0, 0, 0, 0.03, 'Druid - Pounce Bleed (Triggered)'); -- Shouldn't scale with SP. Increase AP coefficient, based on DrDamage addon(3.3.5a) and Wowwiki.com. + +-- Hunter +DELETE FROM `spell_bonus_data` WHERE `entry` IN (56641, 42243, 3674, 19306, 1495, 63468, 136); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(56641, 0, 0, 0.1, 0, 'Hunter - Steady Shot'), -- Shouldn't scale with SP. +(42243, 0, 0, 0.0837, 0, 'Hunter - Volley (Triggered)'), -- Shouldn't scale with SP. +(3674, 0, 0, 0, 0.023, 'Hunter - Black Arrow ($RAP*0.1 / number of ticks)'), -- Shouldn't scale with SP. Increase AP coefficient, based on DrDamage addon(3.3.5a). +(19306, 0, 0, 0.2, 0, 'Hunter - Counterattack'), -- Shouldn't scale with SP. +(1495, 0, 0, 0.2, 0, 'Hunter - Mongoose Bite'), -- Shouldn't scale with SP. +(63468, 0, 0, 0, 0, 'Hunter - Piercing Shots'), -- Shouldn't scale with SP. +(136, 0, 0, 0, 0, 'Hunter - Mend Pet'); -- Shouldn't scale with SP. + +-- Mage +DELETE FROM `spell_bonus_data` WHERE `entry` IN (133, 44614, 44457, 44461); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(133, 1, 0, 0, 0, 'Mage - Fireball'), -- DoT componenet shouldn't scale. +(44614, 0.8571, 0, 0, 0, 'Mage - Frostfire Bolt'), -- DoT componenet shouldn't scale. +(44457, 0, 0.2, 0, 0, 'Mage - Living Bomb ($SP*0.8 / number of ticks)'), -- Direct damage bonus correction. +(44461, 0.4286, 0, 0, 0, 'Mage - Living Bomb (Triggered)'); -- Direct damage bonus correction. + +-- Paladin +DELETE FROM `spell_bonus_data` WHERE `entry` IN (633, 54158, 20467, 20187, 31803, 53742, 31804, 53733); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(633, 0, 0, 0, 0, 'Paladin - Lay on Hands'), -- Shouldn't scale with SP. +(54158, 0.27, 0, 0.175, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'), -- Increase coefficient, based on Wowwiki.com. +(20467, 0.14, 0, 0.115, 0, 'Paladin - Judgement of Command'), -- Decrease coefficient, based on Wowwiki.com. +(20187, 0.355, 0, 0.225, 0, 'Paladin - Judgement of Righteousness'), -- Increase coefficient, based on Wowwiki.com. +(31803, 0, 0.0132, 0, 0.0252, 'Paladin - Holy Vengeance'), -- Decrease coefficient, based on DrDamage addon(3.3.5a) and Wowwiki.com. +(53742, 0, 0.0132, 0, 0.0252, 'Paladin - Blood Corruption'), -- Decrease coefficient, based on DrDamage addon(3.3.5a) and Wowwiki.com. +(31804, 0.24, 0, 0.15, 0, 'Paladin - Judgement of Vengeance'), -- Increase coefficient, based on Wowwiki.com. +(53733, 0.24, 0, 0.15, 0, 'Paladin - Judgement of Corruption'); -- Increase coefficient, based on Wowwiki.com. + +-- Priest +DELETE FROM `spell_bonus_data` WHERE `entry` = 7001; +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(7001, 0, 0.626, 0, 0, 'Priest - Lightwell Renew ($SP*1.878 / number of ticks)'); -- Increase coefficient, based on DrDamage addon(3.3.5a). + +-- Rogue +DELETE FROM `spell_bonus_data` WHERE `entry` IN (32645, 2098, 703, 1776, 1943, 8680, 26688, 13218); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(32645, 0, 0, 0, 0, 'Rogue - Envenom'), -- Shouldn't scale with SP. +(2098, 0, 0, 0, 0, 'Rogue - Eviscerate'), -- Shouldn't scale with SP. +(703, 0, 0, 0, 0.07, 'Rogue - Garrote'), -- Shouldn't scale with SP. +(1776, 0, 0, 0.21, 0, 'Rogue - Gouge'), -- Shouldn't scale with SP. +(1943, 0, 0, 0, 0, 'Rogue - Rupture'), -- Shouldn't scale with SP. +(8680, 0, 0, 0.1, 0, 'Rogue - Instant Poison'), -- Shouldn't scale with SP. +(26688, 0, 0, 0, 0, 'Rogue - Anesthetic Poison'), -- Shouldn't scale with SP nor AP. +(13218, 0, 0, 0.04, 0, 'Rogue - Wound Poison'); -- Shouldn't scale with SP. + + -- Warlock Healthstones Shouldn't scale with SP. +DELETE FROM `spell_bonus_data` WHERE `entry` IN (6262, 23468, 23469, 6263, 23470, 23471, 5720, 23472, 23473, 5723, 23474, 23475, 11732, 23476, 23477, 27235, 27236, 27237, 47874, 47873, 47872, 47875, 47876, 47877); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(6262, 0, 0, 0, 0, 'Warlock - HS - Minor Healthstone (with 0/2 Improved Healthstone)'), +(23468, 0, 0, 0, 0, 'Warlock - HS - Minor Healthstone (with 1/2 Improved Healthstone)'), +(23469, 0, 0, 0, 0, 'Warlock - HS - Minor Healthstone (with 2/2 Improved Healthstone)'), +(6263, 0, 0, 0, 0, 'Warlock - HS - Lesser Healthstone (with 0/2 Improved Healthstone)'), +(23470, 0, 0, 0, 0, 'Warlock - HS - Lesser Healthstone (with 1/2 Improved Healthstone)'), +(23471, 0, 0, 0, 0, 'Warlock - HS - Lesser Healthstone (with 2/2 Improved Healthstone)'), +(5720, 0, 0, 0, 0, 'Warlock - HS - Healthstone (with 0/2 Improved Healthstone)'), +(23472, 0, 0, 0, 0, 'Warlock - HS - Healthstone (with 1/2 Improved Healthstone)'), +(23473, 0, 0, 0, 0, 'Warlock - HS - Healthstone (with 2/2 Improved Healthstone)'), +(5723, 0, 0, 0, 0, 'Warlock - HS - Greater Healthstone (with 0/2 Improved Healthstone)'), +(23474, 0, 0, 0, 0, 'Warlock - HS - Greater Healthstone (with 1/2 Improved Healthstone)'), +(23475, 0, 0, 0, 0, 'Warlock - HS - Greater Healthstone (with 2/2 Improved Healthstone)'), +(11732, 0, 0, 0, 0, 'Warlock - HS - Major Healthstone (with 0/2 Improved Healthstone)'), +(23476, 0, 0, 0, 0, 'Warlock - HS - Major Healthstone (with 1/2 Improved Healthstone)'), +(23477, 0, 0, 0, 0, 'Warlock - HS - Major Healthstone (with 2/2 Improved Healthstone)'), +(27235, 0, 0, 0, 0, 'Warlock - HS - Master Healthstone (with 0/2 Improved Healthstone)'), +(27236, 0, 0, 0, 0, 'Warlock - HS - Master Healthstone (with 1/2 Improved Healthstone)'), +(27237, 0, 0, 0, 0, 'Warlock - HS - Master Healthstone (with 2/2 Improved Healthstone)'), +(47874, 0, 0, 0, 0, 'Warlock - HS - Demonic Healthstone (with 0/2 Improved Healthstone)'), +(47873, 0, 0, 0, 0, 'Warlock - HS - Demonic Healthstone (with 1/2 Improved Healthstone)'), +(47872, 0, 0, 0, 0, 'Warlock - HS - Demonic Healthstone (with 2/2 Improved Healthstone)'), +(47875, 0, 0, 0, 0, 'Warlock - HS - Fel Healthstone (with 0/2 Improved Healthstone)'), +(47876, 0, 0, 0, 0, 'Warlock - HS - Fel Healthstone (with 1/2 Improved Healthstone)'), +(47877, 0, 0, 0, 0, 'Warlock - HS - Fel Healthstone (with 2/2 Improved Healthstone)'); -- cgit v1.2.3 From cc7f95807a830fc8413f8f8c40925cc8dbbea494 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 14 Jun 2012 18:24:05 -0230 Subject: DB/SAI: Fix up quest 9539 "Totem of Coo" --- sql/updates/world/2012_06_14_09_world_sai.sql | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 sql/updates/world/2012_06_14_09_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_09_world_sai.sql b/sql/updates/world/2012_06_14_09_world_sai.sql new file mode 100644 index 00000000000..c918d35de2e --- /dev/null +++ b/sql/updates/world/2012_06_14_09_world_sai.sql @@ -0,0 +1,45 @@ +-- Fix up quest 9539 "Totem of Coo" +-- Totem of Akida SAI +SET @ENTRY := 17360; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,19,0,100,0,9539,0,0,0,11,30437,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Akida - Quest accepted - Cast Spell on player'); +-- Stillpine Ancestor Akida SAI +SET @ENTRY := 17379; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100) AND `source_type`=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 +(@ENTRY,0,0,0,54,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Just Summoned - Run Script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,3,0,16995,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Script - set model'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Script - turn to player'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Akida - Script - Cast Spell'), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Script - Set run on'), +(@ENTRY*100,9,4,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Script - say 0'), +(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4154.224,-12514.75,45.35527,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,6,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4123.563,-12517.23,44.9127,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,7,0,0,0,100,0,3500,3500,0,0,69,0,0,0,0,0,0,8,0,0,0,-4091.881,-12524,42.37354,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,8,0,0,0,100,0,5500,5500,0,0,69,0,0,0,0,0,0,8,0,0,0,-4058.039,-12538.57,43.96096,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,9,0,0,0,100,0,4500,4500,0,0,69,0,0,0,0,0,0,8,0,0,0,-4026.534,-12568.4,45.82222,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,10,0,0,0,100,0,3000,3000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4000.155,-12598.55,54.19722,0,'Stillpine Ancestor Akida - Script - move to'), -- +(@ENTRY*100,9,11,0,0,0,100,0,7500,7500,0,0,69,0,0,0,0,0,0,8,0,0,0,-3977.5,-12627.22,63.1442,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,12,0,0,0,100,0,3500,3500,0,0,69,0,0,0,0,0,0,8,0,0,0,-3952.254,-12660.37,74.23783,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,13,0,0,0,100,0,6500,6500,0,0,69,0,0,0,0,0,0,8,0,0,0,-3933.183,-12698.27,85.65151,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,14,0,0,0,100,0,4500,4500,0,0,69,0,0,0,0,0,0,8,0,0,0,-3925.843,-12718.81,89.94553,0,'Stillpine Ancestor Akida - Script - move to'), -- +(@ENTRY*100,9,15,0,0,0,100,0,3500,3500,0,0,69,0,0,0,0,0,0,8,0,0,0,-3915.914,-12743.41,98.56779,0,'Stillpine Ancestor Akida - Script - move to'), +(@ENTRY*100,9,16,0,0,0,100,0,4500,4500,0,0,66,0,0,0,0,0,0,19,17361,10,0,0,0,0,0,'Stillpine Ancestor Akida - Script - turn to Totem of Coo'), +(@ENTRY*100,9,17,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Script - say 1'), +(@ENTRY*100,9,18,0,0,0,100,0,3000,3000,0,0,11,30428,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Script - cast spell'), +(@ENTRY*100,9,19,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Akida - Script - despawn'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=17379; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17379,0,0, '%s urges you to follow him.',16,0,100,0,0,0, 'Stillpine Ancestor Akida'), +(17379,1,0, '%s points to the totem of Coo.',16,0,100,25,0,0, 'Stillpine Ancestor Akida'); +-- add missing spells to db +DELETE FROM `Spell_dbc` WHERE `Id` IN (30426,30437); +INSERT INTO `Spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES +(30426,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,40,12,0,-1,0,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,32,1,0,0,0,0,15,0,0,0,4,0,0,0,0,0,0,0,17379,0,0,0,0,0,'Stillpine Ancestor Akida',0,0,0,0,0,0,0,1,1,0,64), +(30437,0,0,0,2304,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,36,3,0,-1,0,0,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,23,0,0,1000,0,0,0,0,0,0,0,0,30426,0,0,'Stillpine Ancestor Akida TRIGGER',0,0,0,0,0,0,0,1,0,0,0); -- cgit v1.2.3 From 3fac8f17d1c916e8201d12318663292b7ec9c5b8 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 14 Jun 2012 18:33:50 -0230 Subject: DB/EAI: Remove Stillpine Ancestor Akida EAI --- sql/updates/world/2012_06_14_10_world_eai.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_06_14_10_world_eai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_10_world_eai.sql b/sql/updates/world/2012_06_14_10_world_eai.sql new file mode 100644 index 00000000000..355646fbd69 --- /dev/null +++ b/sql/updates/world/2012_06_14_10_world_eai.sql @@ -0,0 +1,2 @@ +-- Remove Stillpine Ancestor Akida EAI +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17379; -- cgit v1.2.3 From 8cf01fdb2638b0023800bc5a74c64f4234902047 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 14 Jun 2012 18:58:12 -0230 Subject: DB/Misc: blah blah blah --- sql/updates/world/2012_06_14_09_world_sai.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_09_world_sai.sql b/sql/updates/world/2012_06_14_09_world_sai.sql index c918d35de2e..c09ec6c0516 100644 --- a/sql/updates/world/2012_06_14_09_world_sai.sql +++ b/sql/updates/world/2012_06_14_09_world_sai.sql @@ -39,7 +39,7 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr (17379,0,0, '%s urges you to follow him.',16,0,100,0,0,0, 'Stillpine Ancestor Akida'), (17379,1,0, '%s points to the totem of Coo.',16,0,100,25,0,0, 'Stillpine Ancestor Akida'); -- add missing spells to db -DELETE FROM `Spell_dbc` WHERE `Id` IN (30426,30437); -INSERT INTO `Spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES +DELETE FROM `spell_dbc` WHERE `Id` IN (30426,30437); +INSERT INTO `spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES (30426,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,40,12,0,-1,0,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,32,1,0,0,0,0,15,0,0,0,4,0,0,0,0,0,0,0,17379,0,0,0,0,0,'Stillpine Ancestor Akida',0,0,0,0,0,0,0,1,1,0,64), (30437,0,0,0,2304,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,36,3,0,-1,0,0,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,23,0,0,1000,0,0,0,0,0,0,0,0,30426,0,0,'Stillpine Ancestor Akida TRIGGER',0,0,0,0,0,0,0,1,0,0,0); -- cgit v1.2.3 From 39e4211b19f2c55393201d80f37472549ae376f3 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 14 Jun 2012 20:30:44 -0230 Subject: DB/SAI: Fix up quest 9540 "Totem of Tikti" Also minor fix for Totem of Akida. --- sql/updates/world/2012_06_14_09_world_sai.sql | 2 +- sql/updates/world/2012_06_14_11_world_sai | 48 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_06_14_11_world_sai (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_09_world_sai.sql b/sql/updates/world/2012_06_14_09_world_sai.sql index c09ec6c0516..3beb7c06326 100644 --- a/sql/updates/world/2012_06_14_09_world_sai.sql +++ b/sql/updates/world/2012_06_14_09_world_sai.sql @@ -4,7 +4,7 @@ SET @ENTRY := 17360; UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,19,0,100,0,9539,0,0,0,11,30437,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Akida - Quest accepted - Cast Spell on player'); +(@ENTRY,0,0,0,19,0,100,0,9539,0,0,0,85,30437,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Akida - Quest accepted - Cast Spell on player'); -- Stillpine Ancestor Akida SAI SET @ENTRY := 17379; UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; diff --git a/sql/updates/world/2012_06_14_11_world_sai b/sql/updates/world/2012_06_14_11_world_sai new file mode 100644 index 00000000000..5dbef082a1e --- /dev/null +++ b/sql/updates/world/2012_06_14_11_world_sai @@ -0,0 +1,48 @@ +-- Fix up quest 9540 "Totem of Tikti" +-- Totem of Tikti SAI +SET @ENTRY := 17361; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,19,0,100,0,9540,0,0,0,85,30442,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Tikti - Quest accepted - Cast Spell on player'); +-- Stillpine Ancestor Coo SAI +SET @ENTRY := 17391; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100) AND `source_type`=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 +(@ENTRY,0,0,0,54,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Just Summoned - Run Script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,3,0,16995,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - set model'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - turn to player'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Coo - Script - Cast Spell'), +(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 0'), +(@ENTRY*100,9,4,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.039,-12746.71,96.06779,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.326,-12753.71,98.44279,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,6,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3924.268,-12761.45,101.6928,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,7,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 1'), +(@ENTRY*100,9,8,0,0,0,100,0,4000,4000,0,0,11,30424,0,0,0,0,0,7,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Coo - Script - Cast Spell'), +(@ENTRY*100,9,9,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 2'), +(@ENTRY*100,9,10,0,0,0,100,0,4000,4000,0,0,11,30473,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - cast spell'), +(@ENTRY*100,9,11,0,0,0,100,0,0,0,0,0,3,0,17019,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - set model'), +(@ENTRY*100,9,12,0,0,0,100,0,3000,3000,0,0,60,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - Fly on'), +(@ENTRY*100,9,13,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.068,-12767.33,104.3799,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,14,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3923.497,-12794.98,98.46323,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,15,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3922.687,-12832.4,89.24097,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,16,0,0,0,100,0,8000,8000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - despawn'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=17391; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17391,0,0, '%s motions for you to follow him.',16,0,100,0,0,0, 'Stillpine Ancestor Coo'), +(17391,1,0, '[Furbolg] Ritk kin''chikx azul azure summit...',12,0,100,0,0,0, 'Stillpine Ancestor Coo'), +(17391,2,0, '[Furbolg] Coo xip fly... Jump ilos river. Find Tikti.',12,0,100,0,0,0, 'Stillpine Ancestor Coo'); +-- add missing spells to db +DELETE FROM `spell_dbc` WHERE `Id` IN (30429,30442); +INSERT INTO `spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES +(30429,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,40,12,0,-1,0,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,32,1,0,0,0,0,7,0,0,0,4,0,0,0,0,0,0,0,17391,0,0,0,0,0,'Stillpine Ancestor Coo',0,0,0,0,0,0,0,1,1,0,64), +(30442,0,0,0,2304,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,36,3,0,-1,0,0,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,23,0,0,1000,0,0,0,0,0,0,0,0,30429,0,0,'Stillpine Ancestor Coo TRIGGER',0,0,0,0,0,0,0,1,0,0,0); +-- Delete bad spawn of Stillpine Ancestor Coo +DELETE FROM `creature` WHERE `guid`=86512; +DELETE FROM `creature_addon` WHERE `guid`=86512; +-- Remove Stillpine Ancestor Akida EAI +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17391; -- cgit v1.2.3 From 8962b8842584610a3597e9e691267b5aaa1c436e Mon Sep 17 00:00:00 2001 From: Malcrom Date: Thu, 14 Jun 2012 20:41:28 -0230 Subject: DB/SAI: Comment update to previous commit --- sql/updates/world/2012_06_14_11_world_sai | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_11_world_sai b/sql/updates/world/2012_06_14_11_world_sai index 5dbef082a1e..1d01b02f86b 100644 --- a/sql/updates/world/2012_06_14_11_world_sai +++ b/sql/updates/world/2012_06_14_11_world_sai @@ -1,10 +1,10 @@ -- Fix up quest 9540 "Totem of Tikti" --- Totem of Tikti SAI +-- Totem of Coo SAI SET @ENTRY := 17361; UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,19,0,100,0,9540,0,0,0,85,30442,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Tikti - Quest accepted - Cast Spell on player'); +(@ENTRY,0,0,0,19,0,100,0,9540,0,0,0,85,30442,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Coo - Quest accepted - Cast Spell on player'); -- Stillpine Ancestor Coo SAI SET @ENTRY := 17391; UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -- cgit v1.2.3 From cf1f21a5e7bd83122100563f921f12ffbb1bda22 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 15 Jun 2012 07:23:54 -0230 Subject: Misc: fix filename --- sql/updates/world/2012_06_14_11_world_sai | 48 --------------------------- sql/updates/world/2012_06_14_11_world_sai.sql | 48 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 sql/updates/world/2012_06_14_11_world_sai create mode 100644 sql/updates/world/2012_06_14_11_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_14_11_world_sai b/sql/updates/world/2012_06_14_11_world_sai deleted file mode 100644 index 1d01b02f86b..00000000000 --- a/sql/updates/world/2012_06_14_11_world_sai +++ /dev/null @@ -1,48 +0,0 @@ --- Fix up quest 9540 "Totem of Tikti" --- Totem of Coo SAI -SET @ENTRY := 17361; -UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,19,0,100,0,9540,0,0,0,85,30442,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Coo - Quest accepted - Cast Spell on player'); --- Stillpine Ancestor Coo SAI -SET @ENTRY := 17391; -UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; -DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; -DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100) AND `source_type`=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 -(@ENTRY,0,0,0,54,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Just Summoned - Run Script'), --- Script -(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,3,0,16995,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - set model'), -(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - turn to player'), -(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Coo - Script - Cast Spell'), -(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 0'), -(@ENTRY*100,9,4,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.039,-12746.71,96.06779,0,'Stillpine Ancestor Coo - Script - move to'), -(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.326,-12753.71,98.44279,0,'Stillpine Ancestor Coo - Script - move to'), -(@ENTRY*100,9,6,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3924.268,-12761.45,101.6928,0,'Stillpine Ancestor Coo - Script - move to'), -(@ENTRY*100,9,7,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 1'), -(@ENTRY*100,9,8,0,0,0,100,0,4000,4000,0,0,11,30424,0,0,0,0,0,7,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Coo - Script - Cast Spell'), -(@ENTRY*100,9,9,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 2'), -(@ENTRY*100,9,10,0,0,0,100,0,4000,4000,0,0,11,30473,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - cast spell'), -(@ENTRY*100,9,11,0,0,0,100,0,0,0,0,0,3,0,17019,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - set model'), -(@ENTRY*100,9,12,0,0,0,100,0,3000,3000,0,0,60,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - Fly on'), -(@ENTRY*100,9,13,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.068,-12767.33,104.3799,0,'Stillpine Ancestor Coo - Script - move to'), -(@ENTRY*100,9,14,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3923.497,-12794.98,98.46323,0,'Stillpine Ancestor Coo - Script - move to'), -(@ENTRY*100,9,15,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3922.687,-12832.4,89.24097,0,'Stillpine Ancestor Coo - Script - move to'), -(@ENTRY*100,9,16,0,0,0,100,0,8000,8000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - despawn'); --- NPC talk text insert from sniff -DELETE FROM `creature_text` WHERE `entry`=17391; -INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -(17391,0,0, '%s motions for you to follow him.',16,0,100,0,0,0, 'Stillpine Ancestor Coo'), -(17391,1,0, '[Furbolg] Ritk kin''chikx azul azure summit...',12,0,100,0,0,0, 'Stillpine Ancestor Coo'), -(17391,2,0, '[Furbolg] Coo xip fly... Jump ilos river. Find Tikti.',12,0,100,0,0,0, 'Stillpine Ancestor Coo'); --- add missing spells to db -DELETE FROM `spell_dbc` WHERE `Id` IN (30429,30442); -INSERT INTO `spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES -(30429,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,40,12,0,-1,0,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,32,1,0,0,0,0,7,0,0,0,4,0,0,0,0,0,0,0,17391,0,0,0,0,0,'Stillpine Ancestor Coo',0,0,0,0,0,0,0,1,1,0,64), -(30442,0,0,0,2304,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,36,3,0,-1,0,0,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,23,0,0,1000,0,0,0,0,0,0,0,0,30429,0,0,'Stillpine Ancestor Coo TRIGGER',0,0,0,0,0,0,0,1,0,0,0); --- Delete bad spawn of Stillpine Ancestor Coo -DELETE FROM `creature` WHERE `guid`=86512; -DELETE FROM `creature_addon` WHERE `guid`=86512; --- Remove Stillpine Ancestor Akida EAI -DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17391; diff --git a/sql/updates/world/2012_06_14_11_world_sai.sql b/sql/updates/world/2012_06_14_11_world_sai.sql new file mode 100644 index 00000000000..1d01b02f86b --- /dev/null +++ b/sql/updates/world/2012_06_14_11_world_sai.sql @@ -0,0 +1,48 @@ +-- Fix up quest 9540 "Totem of Tikti" +-- Totem of Coo SAI +SET @ENTRY := 17361; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,19,0,100,0,9540,0,0,0,85,30442,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Coo - Quest accepted - Cast Spell on player'); +-- Stillpine Ancestor Coo SAI +SET @ENTRY := 17391; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100) AND `source_type`=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 +(@ENTRY,0,0,0,54,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Just Summoned - Run Script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,3,0,16995,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - set model'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - turn to player'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Coo - Script - Cast Spell'), +(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 0'), +(@ENTRY*100,9,4,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.039,-12746.71,96.06779,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.326,-12753.71,98.44279,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,6,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3924.268,-12761.45,101.6928,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,7,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 1'), +(@ENTRY*100,9,8,0,0,0,100,0,4000,4000,0,0,11,30424,0,0,0,0,0,7,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Coo - Script - Cast Spell'), +(@ENTRY*100,9,9,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - say 2'), +(@ENTRY*100,9,10,0,0,0,100,0,4000,4000,0,0,11,30473,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - cast spell'), +(@ENTRY*100,9,11,0,0,0,100,0,0,0,0,0,3,0,17019,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - set model'), +(@ENTRY*100,9,12,0,0,0,100,0,3000,3000,0,0,60,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - Fly on'), +(@ENTRY*100,9,13,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-3926.068,-12767.33,104.3799,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,14,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3923.497,-12794.98,98.46323,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,15,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3922.687,-12832.4,89.24097,0,'Stillpine Ancestor Coo - Script - move to'), +(@ENTRY*100,9,16,0,0,0,100,0,8000,8000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Coo - Script - despawn'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=17391; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17391,0,0, '%s motions for you to follow him.',16,0,100,0,0,0, 'Stillpine Ancestor Coo'), +(17391,1,0, '[Furbolg] Ritk kin''chikx azul azure summit...',12,0,100,0,0,0, 'Stillpine Ancestor Coo'), +(17391,2,0, '[Furbolg] Coo xip fly... Jump ilos river. Find Tikti.',12,0,100,0,0,0, 'Stillpine Ancestor Coo'); +-- add missing spells to db +DELETE FROM `spell_dbc` WHERE `Id` IN (30429,30442); +INSERT INTO `spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES +(30429,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,40,12,0,-1,0,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,32,1,0,0,0,0,7,0,0,0,4,0,0,0,0,0,0,0,17391,0,0,0,0,0,'Stillpine Ancestor Coo',0,0,0,0,0,0,0,1,1,0,64), +(30442,0,0,0,2304,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,36,3,0,-1,0,0,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,23,0,0,1000,0,0,0,0,0,0,0,0,30429,0,0,'Stillpine Ancestor Coo TRIGGER',0,0,0,0,0,0,0,1,0,0,0); +-- Delete bad spawn of Stillpine Ancestor Coo +DELETE FROM `creature` WHERE `guid`=86512; +DELETE FROM `creature_addon` WHERE `guid`=86512; +-- Remove Stillpine Ancestor Akida EAI +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17391; -- cgit v1.2.3 From 38ac9b38fce779bbd141f8651e9689e3385b70e7 Mon Sep 17 00:00:00 2001 From: Kandera Date: Fri, 15 Jun 2012 13:07:48 -0400 Subject: DB/Spells: added spell script name that was missed. --- sql/updates/world/2012_06_15_00_world_spell_script_names.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_06_15_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_15_00_world_spell_script_names.sql b/sql/updates/world/2012_06_15_00_world_spell_script_names.sql new file mode 100644 index 00000000000..040ad3c87ba --- /dev/null +++ b/sql/updates/world/2012_06_15_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 27819; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(27819, 'spell_kelthuzad_detonate_mana'); -- cgit v1.2.3 From c430b45dc273bb4af95195377c0de4f612408c2b Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 15 Jun 2012 18:18:02 -0230 Subject: DB/SAI: Fix up quest 9544 "The Prophecy of Akida" --- sql/updates/world/2012_06_15_01_world_sai.sql | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sql/updates/world/2012_06_15_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_15_01_world_sai.sql b/sql/updates/world/2012_06_15_01_world_sai.sql new file mode 100644 index 00000000000..501c3aa1c40 --- /dev/null +++ b/sql/updates/world/2012_06_15_01_world_sai.sql @@ -0,0 +1,32 @@ +-- Fix up quest 9544 "The Prophecy of Akida" +-- Totem of Vark SAI +SET @ENTRY := 17364; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +UPDATE `creature_template_addon` SET `bytes2`=1,`auras`='18950' WHERE `entry`=17364; +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,19,0,100,0,9544,0,0,0,85,30453,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Vark - Quest accepted - Cast Spell on player'); +-- Stillpine Ancestor Vark SAI +SET @ENTRY := 17410; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100) AND `source_type`=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 +(@ENTRY,0,0,0,54,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Vark - Just Summoned - Run Script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,3,0,17109,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Vark - Script - set model'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0.01745319,'Stillpine Ancestor Vark - Script - Cast Spell'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Vark - Script - Set run on'), +(@ENTRY*100,9,3,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stillpine Ancestor Vark - Script - turn to player'), +(@ENTRY*100,9,4,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Vark - Script - say 0'), +(@ENTRY*100,9,5,0,0,0,100,0,8000,8000,0,0,11,30428,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Vark - Script - cast spell'), +(@ENTRY*100,9,6,0,0,0,100,0,3000,3000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Vark - Script - despawn'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=17410; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17410,0,0, '[Furbolg] Bear witness to the savage acts of our adversaries, $N. They steal our young... our weak... Imprisoned here, they are left to the devices of the Bristlelimb. Set them free, Promised One!',12,0,100,0,0,0, 'Stillpine Ancestor Vark'); +-- add missing spells to db +DELETE FROM `spell_dbc` WHERE `Id` IN (30453,30454); +INSERT INTO `spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES +(30454,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,40,12,0,-1,0,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,32,1,0,0,0,0,7,0,0,0,4,0,0,0,0,0,0,0,17410,0,0,0,0,0,'Stillpine Ancestor Vark',0,0,0,0,0,0,0,1,1,0,64), +(30453,0,0,0,2304,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,36,3,0,-1,0,0,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,23,0,0,1000,0,0,0,0,0,0,0,0,30454,0,0,'Stillpine Ancestor Vark TRIGGER',0,0,0,0,0,0,0,1,0,0,0); -- cgit v1.2.3 From 47b2df83103dedefeed5a5c7d127b22b9d497eb0 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Fri, 15 Jun 2012 23:42:50 -0230 Subject: DB/SAI: Fix up quest 9312 "The Emitter" --- sql/updates/world/2012_06_15_02_world_sai.sql | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 sql/updates/world/2012_06_15_02_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_15_02_world_sai.sql b/sql/updates/world/2012_06_15_02_world_sai.sql new file mode 100644 index 00000000000..f813ae2996b --- /dev/null +++ b/sql/updates/world/2012_06_15_02_world_sai.sql @@ -0,0 +1,44 @@ +-- Fix up quest 9312 "The Emitter" +-- Technician Zhanaa SAI +SET @ENTRY := 17071; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,20,0,100,0,9312,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Technician Zhanaa - Quest Completed - Run Script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Technician Zhanaa - Script - Remove npc flags'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,20,181286,0,0,0,0,0,0,'Technician Zhanaa - Script - Activate go'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,12,16550,1,39000,0,0,0,8,0,0,0,-4187.708,-13738.72,75.65491,1.850049,'Technician Zhanaa - Script - Spawn '), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,64,2,0,0,0,0,0,7,0,0,0,0,0,0,0,'Technician Zhanaa - Script - store invoker'), -- Send target +(@ENTRY*100,9,4,0,0,0,100,0,1000,1000,0,0,100,2,0,0,0,0,0,19,16550,10,0,0,0,0,0,'Technician Zhanaa - Script - send target'), -- Send target +(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,0,0,45,0,1,0,0,0,0,19,16550,10,0,0,0,0,0,'Technician Zhanaa - Script - set data'), +(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,16550,10,0,0,0,0,0,'Technician Zhanaa - Script - turn to Image of Technician Dyvuun'), +(@ENTRY*100,9,7,0,0,0,100,0,2000,2000,0,0,5,70,0,0,0,0,0,1,0,0,0,0,0,0,0,'Technician Zhanaa - Script - emote'), +(@ENTRY*100,9,8,0,0,0,100,0,39000,39000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Technician Zhanaa - Script - turn to invoker'), +(@ENTRY*100,9,9,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Technician Zhanaa - Script - Say 0'), +(@ENTRY*100,9,10,0,0,0,100,0,6000,6000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.919862,'Technician Zhanaa - Script - turn to'), +(@ENTRY*100,9,11,0,0,0,100,0,1000,1000,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Technician Zhanaa - Script - add npc flags'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'This is great news! Your efforts have indeed saved us, $N!',12,0,100,0,0,0, 'Technician Zhanaa'); +-- Image of Technician Dyvuun SAI +SET @ENTRY := 16550; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='',`InhabitType`=4 WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,38,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Image of Technician Dyvuun - On data set - Run Script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,19,17071,10,0,0,0,0,0,'Image of Technician Dyvuun - Script - turn to Technician Zhanaa'), +(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Image of Technician Dyvuun - Script - Say 0'), +(@ENTRY*100,9,2,0,0,0,100,0,10000,10000,0,0,66,0,0,0,0,0,0,12,2,0,0,0,0,0,0,'Image of Technician Dyvuun - Script - turn to Stored target'), -- use target +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Image of Technician Dyvuun - Script - Say 1'), +(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Image of Technician Dyvuun - Script - Say 2'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0, 'By the seven Ata''mal crystals! Others have survived the crash! Zhanaa, is that you? It is so good to see you again!',12,0,100,0,0,0, 'Image of Technician Dyvuun'), +(@ENTRY,1,0, 'And who do we have here? No doubt th... crzzzk ...ade this communication possible? I give you greetings fro... psshzzzk... Azure Watch.',12,0,100,0,0,0, 'Image of Technician Dyvuun'), +(@ENTRY,2,0, 'Judging by your signal, we put you... ust southeast of the larger part of the island we crashed onto. Cross the Crystalbrook River to ge... kshhhhk zzzt. Sorry, there''s a lot of stat...',12,0,100,0,0,0, 'Image of Technician Dyvuun'); -- cgit v1.2.3 From 89af15fed50d1de0cea2d20952192812166ca08c Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 16 Jun 2012 10:26:24 -0230 Subject: DB/SAI: Fix up quest 9541 "Totem of Yor" --- sql/updates/world/2012_06_16_00_world_sai.sql | 46 +++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 sql/updates/world/2012_06_16_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_16_00_world_sai.sql b/sql/updates/world/2012_06_16_00_world_sai.sql new file mode 100644 index 00000000000..a714e498bc9 --- /dev/null +++ b/sql/updates/world/2012_06_16_00_world_sai.sql @@ -0,0 +1,46 @@ +-- Fix up quest 9541 "Totem of Yor" +-- Totem of Tikti SAI +SET @ENTRY := 17362; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,19,0,100,0,9541,0,0,0,85,30443,0,0,0,0,0,7,0,0,0,0,0,0,0,'Totem of Tikti - Quest accepted - Cast Spell on player'); +-- Stillpine Ancestor Tikti SAI +SET @ENTRY := 17392; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100) AND `source_type`=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 +(@ENTRY,0,0,0,54,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Just Summoned - Run Script'), +-- Script +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,3,0,16999,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - set model'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - turn to player'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - Cast Spell'), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - Set run on'), +(@ENTRY*100,9,4,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - say 0'), +(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-3885.665,-13096.55,3.563835,0,'Stillpine Ancestor Tikti - Script - move to'), +(@ENTRY*100,9,6,0,0,0,100,0,16000,16000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - say 1'), +(@ENTRY*100,9,7,0,0,0,100,0,6000,6000,0,0,11,30430,2,0,0,0,0,7,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - Cast Spell on player'), +(@ENTRY*100,9,8,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - say 2'), +(@ENTRY*100,9,9,0,0,0,100,0,1000,1000,0,0,11,30431,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - Cast Spell'), +(@ENTRY*100,9,10,0,0,0,100,0,0,0,0,0,3,0,17000,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - set model'), +(@ENTRY*100,9,11,0,0,0,100,0,3000,3000,0,0,69,0,0,0,0,0,0,8,0,0,0,-3939.131,-13024.07,-5.92465,0,'Stillpine Ancestor Tikti - Script - move to'), +(@ENTRY*100,9,12,0,0,0,100,0,25000,25000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Stillpine Ancestor Tikti - Script - despawn'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=17392; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17392,0,0, '%s asks you to follow him.',16,0,100,0,0,0, 'Stillpine Ancestor Tikti'), +(17392,1,0, '[Furbolg] Far you mixik tak come. Gaze upon the kitch''kal river. Follow. Ilog to Yor.',12,0,100,0,0,0, 'Stillpine Ancestor Tikti'), +(17392,2,0, '[Furbolg] Go... Search yitix''kil bottom river. South!',12,0,100,0,0,0, 'Stillpine Ancestor Tikti'); +-- add missing spells to db +DELETE FROM `spell_dbc` WHERE `Id` IN (30432,30443); +INSERT INTO `spell_dbc` (`Id`,`SchoolMask`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`Comment`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`AreaGroupId`,`EffectMiscValueB1`) VALUES +(30432,0,0,0,256,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,40,12,0,-1,0,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,32,1,0,0,0,0,7,0,0,0,4,0,0,0,0,0,0,0,17392,0,0,0,0,0,'Stillpine Ancestor Tikti',0,0,0,0,0,0,0,1,1,0,64), +(30443,0,0,0,2304,268435456,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,36,3,0,-1,0,0,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,23,0,0,1000,0,0,0,0,0,0,0,0,30432,0,0,'Stillpine Ancestor Tikti TRIGGER',0,0,0,0,0,0,0,1,0,0,0); +-- Delete bad spawn of Stillpine Ancestor Tikti +DELETE FROM `creature` WHERE `guid`=86513; +DELETE FROM `creature_addon` WHERE `guid`=86513; +-- Remove Stillpine Ancestor Tikti EAI +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17392; +-- Remove Hack from quest_template +UPDATE `quest_template` SET `SourceSpellId`=0 WHERE `Id`=9541; -- cgit v1.2.3 From 1c8211e85222ca85e46079bfa809192e68c30fda Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 16 Jun 2012 14:41:08 -0230 Subject: Db/creature: Add missing Storm Totem spawn to Borean Tundra --- sql/updates/world/2012_06_16_01_world_creature.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_06_16_01_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_16_01_world_creature.sql b/sql/updates/world/2012_06_16_01_world_creature.sql new file mode 100644 index 00000000000..d44b568f79b --- /dev/null +++ b/sql/updates/world/2012_06_16_01_world_creature.sql @@ -0,0 +1,6 @@ +-- Add missing Storm Totem spawn to Borean Tundra +SET @GUID := 12925; +DELETE FROM `creature` WHERE `guid`=@GUID; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,26048,571,1,1,0,0,3409.903,4128.829,18.13754,5.742133,300,0,0,1,0,0); +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|16777216 WHERE `entry`=26048; -- cgit v1.2.3 From 99888e1a3ee8a0d69fe956e79257466a6ea8e446 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 17 Jun 2012 10:41:21 -0230 Subject: DB/creature: Fix Storm Totem flags --- sql/updates/world/2012_06_17_00_world_creature.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_06_17_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_17_00_world_creature.sql b/sql/updates/world/2012_06_17_00_world_creature.sql new file mode 100644 index 00000000000..53e101c5d60 --- /dev/null +++ b/sql/updates/world/2012_06_17_00_world_creature.sql @@ -0,0 +1,3 @@ +-- Fix Storm Totem flags +UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry`=26048; +UPDATE `creature_template` SET `flags_extra`=`flags_extra`&~16777216 WHERE `entry`=26048; -- cgit v1.2.3 From 3fb93ce659e6c65fddbc5c93e7297012003f503d Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 17 Jun 2012 11:03:07 -0230 Subject: DB/creature: Add aura missing aura to Nerub'ar Scarab --- sql/updates/world/2012_06_17_01_world_creature.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_06_17_01_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_17_01_world_creature.sql b/sql/updates/world/2012_06_17_01_world_creature.sql new file mode 100644 index 00000000000..c5d50fdde1e --- /dev/null +++ b/sql/updates/world/2012_06_17_01_world_creature.sql @@ -0,0 +1,4 @@ +-- Add aura missing aura to Nerub'ar Scarab +DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM creature WHERE id=25652); +DELETE FROM `creature_template_addon` WHERE `entry`=25652; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (25652,1,'45814'); -- cgit v1.2.3 From 5bcfd8303138226af83c6182d830a53b9ce9ba6e Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 17 Jun 2012 11:48:53 -0230 Subject: DB/creature: Add missing Gan'jo spawn to Grizzly Hills --- sql/updates/world/2012_06_17_02_world_creature.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2012_06_17_02_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_17_02_world_creature.sql b/sql/updates/world/2012_06_17_02_world_creature.sql new file mode 100644 index 00000000000..a309ada3498 --- /dev/null +++ b/sql/updates/world/2012_06_17_02_world_creature.sql @@ -0,0 +1,9 @@ +-- Add missing Gan'jo spawn to Grizzly Hills +SET @GUID := 42187; +SET @ENTRY := 26924; +DELETE FROM `creature` WHERE `guid`=@GUID; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,@ENTRY,571,1,2,0,0,4834.98,-4754.5,32.5689,3.97935,180,0,0,1,0,0); +-- Add Aura to Gan'jo +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES (@ENTRY,1,'17327'); -- cgit v1.2.3 From 99381289327a2eb07c0074044e024527f7e56913 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 18 Jun 2012 13:16:01 +0200 Subject: Scripts/Icecrown Citadel * Fixed position of summoned creatures (if supposed to be in air) * Fixed casting Fury of Frostmourne initiating outro roleplay while casting something else at the same time * Fixed outro visuals --- sql/updates/world/2012_06_18_00_world_creature.sql | 26 +++++ .../IcecrownCitadel/boss_the_lich_king.cpp | 129 ++++++++++++--------- .../IcecrownCitadel/instance_icecrown_citadel.cpp | 5 + 3 files changed, 103 insertions(+), 57 deletions(-) create mode 100644 sql/updates/world/2012_06_18_00_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_18_00_world_creature.sql b/sql/updates/world/2012_06_18_00_world_creature.sql new file mode 100644 index 00000000000..23538c33f73 --- /dev/null +++ b/sql/updates/world/2012_06_18_00_world_creature.sql @@ -0,0 +1,26 @@ +SET @CGUID := 88615; +DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+00 AND @CGUID+22; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES +(@CGUID+00,39190,631,12,1,505.1563,-2536.863,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+01,39190,631,12,1,502.6493,-2531.328,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+02,39190,631,12,1,503.8246,-2508.141,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+03,39190,631,12,1,495.3629,-2538.215,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+04,39190,631,12,1,506.8715,-2515.552,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+05,39190,631,12,1,481.3021,-2509.222,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+06,39190,631,12,1,481.5382,-2527.332,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+07,39190,631,12,1,500.0807,-2523.289,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+08,39190,631,12,1,486.6632,-2517.747,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+09,39190,631,12,1,513.8802,-2511.795,1069.596,0,10,10,1), -- Wicked Spirit +(@CGUID+10,39190,631,12,1,499.6406,-2500.783,1069.656,0,10,10,1), -- Wicked Spirit +(@CGUID+11,39190,631,12,1,513.7101,-2530.931,1069.596,0,10,10,1), -- Wicked Spirit +(@CGUID+12,39190,631,12,1,502.6811,-2522.542,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+13,39190,631,12,1,518.7483,-2521.240,1069.596,0,10,10,1), -- Wicked Spirit +(@CGUID+14,39190,631,12,1,478.9774,-2517.446,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+15,39190,631,12,1,489.0104,-2538.535,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+16,39190,631,12,1,511.6320,-2522.373,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+17,39190,631,12,1,500.8976,-2527.198,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+18,39190,631,12,1,484.7934,-2533.592,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+19,39190,631,12,1,490.4132,-2504.323,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+20,39190,631,12,1,485.0298,-2527.724,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+21,39190,631,12,1,494.2899,-2511.384,1069.598,0,10,10,1), -- Wicked Spirit +(@CGUID+22,39190,631,12,1,491.7170,-2532.490,1069.598,0,10,10,1); -- Wicked Spirit 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 4dab215d1da..03d6c0ef919 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -138,7 +138,7 @@ enum Spells SPELL_IN_FROSTMOURNE_ROOM = 74276, SPELL_KILL_FROSTMOURNE_PLAYERS = 75127, SPELL_HARVESTED_SOUL = 72679, - SPELL_TRIGGER_VILE_SPIRIT_HEROIC = 73582, + SPELL_TRIGGER_VILE_SPIRIT_HEROIC = 73582, // TODO: Cast every 3 seconds during Frostmourne phase, targets a Wicked Spirit amd activates it // Frostmourne SPELL_LIGHTS_FAVOR = 69382, @@ -152,6 +152,7 @@ enum Spells SPELL_SUMMON_SPIRIT_BOMB_1 = 73581, // (Heroic) SPELL_SUMMON_SPIRIT_BOMB_2 = 74299, // (Heroic) SPELL_EXPLOSION = 73576, // Spirit Bomb (Heroic) + SPELL_HARVEST_SOUL_DAMAGE_AURA = 73655, // Outro SPELL_FURY_OF_FROSTMOURNE = 72350, @@ -221,7 +222,7 @@ enum Events EVENT_QUAKE_2 = 27, EVENT_VILE_SPIRITS = 28, EVENT_HARVEST_SOULS = 29, // heroic only - EVENT_WICKED_SPIRITS = 30, + EVENT_BERSERK = 30, EVENT_SOUL_RIP = 31, EVENT_DESTROY_SOUL = 32, EVENT_FROSTMOURNE_TALK_1 = 33, @@ -249,19 +250,18 @@ enum Events EVENT_OUTRO_TERENAS_TALK_2 = 55, EVENT_OUTRO_TALK_7 = 56, EVENT_OUTRO_TALK_8 = 57, - EVENT_BERSERK = 58, // Shambling Horror - EVENT_SHOCKWAVE = 59, - EVENT_ENRAGE = 60, + EVENT_SHOCKWAVE = 58, + EVENT_ENRAGE = 59, // Raging Spirit - EVENT_SOUL_SHRIEK = 61, + EVENT_SOUL_SHRIEK = 60, // Strangulate Vehicle (Harvest Soul) - EVENT_TELEPORT = 62, - EVENT_MOVE_TO_LICH_KING = 63, - EVENT_DESPAWN_SELF = 64, + EVENT_TELEPORT = 61, + EVENT_MOVE_TO_LICH_KING = 62, + EVENT_DESPAWN_SELF = 63, }; enum EventGroups @@ -475,6 +475,25 @@ class VileSpiritActivateEvent : public BasicEvent Creature* _owner; }; +class TriggerWickedSpirit : public BasicEvent +{ + public: + explicit TriggerWickedSpirit(Creature* owner) + : _owner(owner), _counter(13) + { + } + + bool Execute(uint64 /*time*/, uint32 /*diff*/) + { + _owner->CastCustomSpell(SPELL_TRIGGER_VILE_SPIRIT_HEROIC, SPELLVALUE_MAX_TARGETS, 1, NULL, true); + return --_counter > 0; + } + + private: + Creature* _owner; + int32 _counter; +}; + class boss_the_lich_king : public CreatureScript { public: @@ -503,6 +522,8 @@ class boss_the_lich_king : public CreatureScript me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->GetMotionMaster()->MoveFall(); + if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f)) + frostmourne->DespawnOrUnsummon(); } void EnterCombat(Unit* target) @@ -601,8 +622,6 @@ class boss_the_lich_king : public CreatureScript summons.DoAction(ACTION_TELEPORT_BACK, pred); if (!IsHeroic()) Talk(SAY_LK_FROSTMOURNE_ESCAPE); - else - DoCastAOE(SPELL_TRIGGER_VILE_SPIRIT_HEROIC); break; } default: @@ -645,6 +664,8 @@ class boss_the_lich_king : public CreatureScript if (events.GetPhaseMask() & PHASE_MASK_ONE && !HealthAbovePct(70)) { events.SetPhase(PHASE_TRANSITION); + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); me->GetMotionMaster()->MovePoint(POINT_CENTER_1, CenterPosition); return; } @@ -652,6 +673,8 @@ class boss_the_lich_king : public CreatureScript if (events.GetPhaseMask() & PHASE_MASK_TWO && !HealthAbovePct(40)) { events.SetPhase(PHASE_TRANSITION); + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); me->GetMotionMaster()->MovePoint(POINT_CENTER_2, CenterPosition); return; } @@ -664,7 +687,8 @@ class boss_the_lich_king : public CreatureScript events.SetPhase(PHASE_OUTRO); summons.DespawnAll(); SendMusicToPlayers(MUSIC_FURY_OF_FROSTMOURNE); - DoCastAOE(SPELL_FURY_OF_FROSTMOURNE); + me->InterruptNonMeleeSpells(true); + me->CastSpell((Unit*)NULL, SPELL_FURY_OF_FROSTMOURNE, TRIGGERED_NONE); me->SetWalk(true); events.ScheduleEvent(EVENT_OUTRO_TALK_1, 2600, 0, PHASE_OUTRO); events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 6600, 0, PHASE_OUTRO); @@ -712,7 +736,6 @@ class boss_the_lich_king : public CreatureScript break; case NPC_FROSTMOURNE_TRIGGER: { - summons.Summon(summon); summon->CastSpell((Unit*)NULL, SPELL_BROKEN_FROSTMOURNE, true); SendLightOverride(LIGHT_SOULSTORM, 10000); @@ -724,16 +747,11 @@ class boss_the_lich_king : public CreatureScript case NPC_VILE_SPIRIT: { summons.Summon(summon); - if (events.GetPhaseMask() & PHASE_MASK_FROSTMOURNE) - { - TeleportSpirit(summon); - return; - } - summon->SetReactState(REACT_PASSIVE); summon->SetSpeed(MOVE_FLIGHT, 0.5f); summon->GetMotionMaster()->MoveRandom(10.0f); - summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(15000)); + if (!(events.GetPhaseMask() & PHASE_MASK_FROSTMOURNE)) + summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(15000)); return; } case NPC_STRANGULATE_VEHICLE: @@ -756,7 +774,6 @@ class boss_the_lich_king : public CreatureScript case NPC_VALKYR_SHADOWGUARD: case NPC_RAGING_SPIRIT: case NPC_VILE_SPIRIT: - case NPC_WICKED_SPIRIT: summon->ToTempSummon()->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); break; default: @@ -802,8 +819,6 @@ class boss_the_lich_king : public CreatureScript me->SetFacingTo(0.0f); Talk(SAY_LK_REMORSELESS_WINTER); SendMusicToPlayers(MUSIC_SPECIAL); - me->SetReactState(REACT_PASSIVE); - me->AttackStop(); DoCast(me, SPELL_REMORSELESS_WINTER_1); events.DelayEvents(62500, EVENT_GROUP_BERSERK); // delay berserk timer, its not ticking during phase transitions events.ScheduleEvent(EVENT_QUAKE, 62500, 0, PHASE_TRANSITION); @@ -819,8 +834,6 @@ class boss_the_lich_king : public CreatureScript me->SetFacingTo(0.0f); Talk(SAY_LK_REMORSELESS_WINTER); SendMusicToPlayers(MUSIC_SPECIAL); - me->SetReactState(REACT_PASSIVE); - me->AttackStop(); DoCast(me, SPELL_REMORSELESS_WINTER_2); summons.DespawnEntry(NPC_VALKYR_SHADOWGUARD); events.DelayEvents(62500, EVENT_GROUP_BERSERK); // delay berserk timer, its not ticking during phase transitions @@ -992,10 +1005,6 @@ class boss_the_lich_king : public CreatureScript DoCastAOE(SPELL_VILE_SPIRITS); events.ScheduleEvent(EVENT_VILE_SPIRITS, urand(35000, 40000), EVENT_GROUP_VILE_SPIRITS, PHASE_THREE); break; - case EVENT_WICKED_SPIRITS: - DoCastAOE(SPELL_VILE_SPIRITS); - events.ScheduleEvent(EVENT_WICKED_SPIRITS, urand(35000, 40000), 0, PHASE_FROSTMOURNE); - break; case EVENT_HARVEST_SOULS: Talk(SAY_LK_HARVEST_SOUL); DoCastAOE(SPELL_HARVEST_SOULS); @@ -1003,7 +1012,6 @@ class boss_the_lich_king : public CreatureScript events.SetPhase(PHASE_FROSTMOURNE); // will stop running UpdateVictim (no evading) me->SetReactState(REACT_PASSIVE); me->AttackStop(); - events.ScheduleEvent(EVENT_WICKED_SPIRITS, events.GetNextEventTime(EVENT_VILE_SPIRITS) - events.GetTimer(), 0, PHASE_FROSTMOURNE); events.DelayEvents(50000, EVENT_GROUP_VILE_SPIRITS); events.RescheduleEvent(EVENT_DEFILE, 50000, 0, PHASE_THREE); events.RescheduleEvent(EVENT_SOUL_REAPER, urand(57000, 62000), 0, PHASE_THREE); @@ -1019,16 +1027,22 @@ class boss_the_lich_king : public CreatureScript if (!triggers.empty()) { triggers.sort(Trinity::ObjectDistanceOrderPred(terenas, true)); - Unit* spawner = triggers.front(); + Creature* spawner = triggers.front(); spawner->CastSpell(spawner, SPELL_SUMMON_SPIRIT_BOMB_1, true); // summons bombs randomly spawner->CastSpell(spawner, SPELL_SUMMON_SPIRIT_BOMB_2, true); // summons bombs on players + spawner->m_Events.AddEvent(new TriggerWickedSpirit(spawner), spawner->m_Events.CalculateTime(3000)); } for (SummonList::iterator i = summons.begin(); i != summons.end(); ++i) { Creature* summon = ObjectAccessor::GetCreature(*me, *i); if (summon && summon->GetEntry() == NPC_VILE_SPIRIT) - TeleportSpirit(summon); + { + summon->m_Events.KillAllEvents(true); + summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(50000)); + summon->GetMotionMaster()->MoveRandom(10.0f); + summon->SetReactState(REACT_PASSIVE); + } } } break; @@ -1099,22 +1113,6 @@ class boss_the_lich_king : public CreatureScript } private: - - void TeleportSpirit(Creature* summon) - { - float dist = me->GetObjectSize() + (15.0f - me->GetObjectSize()) * float(rand_norm()); - float angle = float(rand_norm()) * float(2.0f * M_PI); - Position dest = TerenasSpawnHeroic; - me->MovePosition(dest, dist, angle); - dest.m_positionZ += 15.0f; - summon->UpdateEntry(NPC_WICKED_SPIRIT); - summon->SetReactState(REACT_PASSIVE); - summon->NearTeleportTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), dest.GetOrientation()); - summon->SetSpeed(MOVE_FLIGHT, 0.5f); - summon->m_Events.KillAllEvents(true); - summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(1000)); - } - void SendMusicToPlayers(uint32 musicId) const { WorldPacket data(SMSG_PLAY_MUSIC, 4); @@ -1635,8 +1633,13 @@ class npc_strangulate_vehicle : public CreatureScript return; if (TempSummon* summ = me->ToTempSummon()) + { if (Unit* summoner = summ->GetSummoner()) + { DoCast(summoner, SPELL_HARVEST_SOUL_TELEPORT_BACK); + summoner->RemoveAurasDueToSpell(SPELL_HARVEST_SOUL_DAMAGE_AURA); + } + } if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) lichKing->AI()->SummonedCreatureDespawn(me); @@ -1993,6 +1996,10 @@ class npc_broken_frostmourne : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6000, 0, PHASE_OUTRO); } + void EnterEvadeMode() + { + } + void UpdateAI(uint32 const diff) { UpdateVictim(); @@ -2472,14 +2479,18 @@ class spell_the_lich_king_summon_into_air : public SpellScriptLoader static Position const offset = {0.0f, 0.0f, 15.0f, 0.0f}; WorldLocation* dest = const_cast(GetExplTargetDest()); dest->RelocateOffset(offset); + GetHitDest()->RelocateOffset(offset); // spirit bombs get higher if (GetSpellInfo()->Effects[effIndex].MiscValue == NPC_SPIRIT_BOMB) + { dest->RelocateOffset(offset); + GetHitDest()->RelocateOffset(offset); + } } void Register() { - OnEffectLaunch += SpellEffectFn(spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit += SpellEffectFn(spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; @@ -2954,6 +2965,15 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader lichKing->AI()->DoAction(ACTION_TELEPORT_BACK); if (Creature* spawner = GetCaster()->FindNearestCreature(NPC_WORLD_TRIGGER_INFINITE_AOI, 50.0f)) spawner->RemoveAllAuras(); + + std::list spirits; + GetCaster()->GetCreatureListWithEntryInGrid(spirits, NPC_WICKED_SPIRIT, 200.0f); + for (std::list::iterator itr = spirits.begin(); itr != spirits.end(); ++itr) + { + (*itr)->m_Events.KillAllEvents(true); + (*itr)->SetReactState(REACT_PASSIVE); + (*itr)->AI()->EnterEvadeMode(); + } } void RemoveAura() @@ -3046,23 +3066,18 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit_SpellScript); - void TeleportOutside() + void ActivateSpirit() { Creature* target = GetHitCreature(); if (!target) return; - Position dest; - Position offset; - TerenasSpawnHeroic.GetPositionOffsetTo(*target, offset); - GetCaster()->GetPosition(&dest); - dest.RelocateOffset(offset); - target->NearTeleportTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), dest.GetOrientation()); + VileSpiritActivateEvent(target).Execute(0, 0); } void Register() { - OnHit += SpellHitFn(spell_the_lich_king_trigger_vile_spirit_SpellScript::TeleportOutside); + OnHit += SpellHitFn(spell_the_lich_king_trigger_vile_spirit_SpellScript::ActivateSpirit); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 704c3c2b0c2..270f56674eb 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -290,6 +290,11 @@ class instance_icecrown_citadel : public InstanceMapScript case NPC_TERENAS_MENETHIL_FROSTMOURNE_H: TerenasMenethilGUID = creature->GetGUID(); break; + case NPC_WICKED_SPIRIT: + // Remove corpse as soon as it dies (and respawn 10 seconds later) + creature->SetCorpseDelay(0); + creature->SetReactState(REACT_PASSIVE); + break; default: break; } -- cgit v1.2.3 From 2affb39bc0adcfa5758268222a115e3eb3a3247d Mon Sep 17 00:00:00 2001 From: Kandera Date: Mon, 18 Jun 2012 12:48:34 -0400 Subject: Core/Spells: fix bloodthirst. again. --- .../2012_06_18_01_world_spell_script_names.sql | 3 ++ src/server/scripts/Spells/spell_warrior.cpp | 34 ++++++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/2012_06_18_01_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_18_01_world_spell_script_names.sql b/sql/updates/world/2012_06_18_01_world_spell_script_names.sql new file mode 100644 index 00000000000..5f227a887d7 --- /dev/null +++ b/sql/updates/world/2012_06_18_01_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 23880; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(23880, 'spell_warr_bloodthirst_heal'); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 0ba5c866d63..f1276c24a75 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -184,9 +184,9 @@ class spell_warr_deep_wounds : public SpellScriptLoader damage = caster->SpellDamageBonusDone(target, GetSpellInfo(), damage, SPELL_DIRECT_DAMAGE); ApplyPctN(damage, 16 * sSpellMgr->GetSpellRank(GetSpellInfo()->Id)); - + damage = target->SpellDamageBonusTaken(caster, GetSpellInfo(), damage, SPELL_DIRECT_DAMAGE); - + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_DEEP_WOUNDS_RANK_PERIODIC); uint32 ticks = spellInfo->GetDuration() / spellInfo->Effects[EFFECT_0].Amplitude; @@ -405,7 +405,7 @@ class spell_warr_bloodthirst : public SpellScriptLoader void Register() { - OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHit += SpellEffectFn(spell_warr_bloodthirst_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -415,6 +415,33 @@ class spell_warr_bloodthirst : public SpellScriptLoader } }; +class spell_warr_bloodthirst_heal : public SpellScriptLoader +{ +public: + spell_warr_bloodthirst_heal() : SpellScriptLoader("spell_warr_bloodthirst_heal") { } + + class spell_warr_bloodthirst_heal_SpellScript : public SpellScript + { + PrepareSpellScript(spell_warr_bloodthirst_heal_SpellScript); + + void HandleHeal(SpellEffIndex /* effIndex */) + { + if (GetTriggeringSpell()) + SetHitHeal(CalculatePctN(GetCaster()->GetMaxHealth(),GetTriggeringSpell()->Effects[EFFECT_1].CalcValue())); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_warr_bloodthirst_heal_SpellScript(); + } +}; + enum Overpower { SPELL_UNRELENTING_ASSAULT_RANK_1 = 46859, @@ -472,4 +499,5 @@ void AddSC_warrior_spell_scripts() new spell_warr_concussion_blow(); new spell_warr_bloodthirst(); new spell_warr_overpower(); + new spell_warr_bloodthirst_heal(); } -- cgit v1.2.3 From 0b947c90b0ef486643d25e5153f2fb36b3f93924 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 18 Jun 2012 20:22:56 -0230 Subject: DB/SAI: Fix quest 11895 "Master the Storm" --- sql/updates/world/2012_06_18_02_world_sai.sql | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 sql/updates/world/2012_06_18_02_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_18_02_world_sai.sql b/sql/updates/world/2012_06_18_02_world_sai.sql new file mode 100644 index 00000000000..0c036d3d5f0 --- /dev/null +++ b/sql/updates/world/2012_06_18_02_world_sai.sql @@ -0,0 +1,41 @@ +-- Fix quest 11895 "Master the Storm" +-- Storm Totem SAI +SET @ENTRY := 26048; +UPDATE `creature_template` SET `npcflag`=`npcflag`&~16777216,`AIName`= 'SmartAI',`ScriptName`='' 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,11,0,100,0,0,0,0,0,81,16777216,0,0,0,0,0,1,0,0,0,0,0,0,0,'Storm Totem - On spawn - set npcflag'), +(@ENTRY,0,1,2,73,0,100,0,0,0,0,0,12,26045,2,300000,0,0,0,8,0,0,0,3403.829,4133.074,18.13754,5.759586,'Storm Totem - On Spellclick - Spawn Storm Tempest'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Storm Totem - On spawn - remove npcflag'); +-- Storm Tempest SAI +SET @ENTRY := 26045; +UPDATE `creature_template` SET `unit_flags`=0,`AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=26045; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY*100 AND `source_type`=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 +(@ENTRY,0,0,0,63,0,100,0,0,0,0,0,11,8609,2,0,0,0,0,1,0,0,0,0,0,0,0,'Storm Totem - On spawn - cast aura'), +(@ENTRY,0,1,0,1,0,100,1,1000,1000,1000,1000,12,23837,2,120000,0,0,0,8,0,0,0,3403.871,4133.031,18.13754,5.67232,'Storm Totem - OOC - Spawn ELM General Purpose Bunny'), +(@ENTRY,0,2,0,60,0,100,1,1000,1000,7000,8000,11,40136,2,0,0,0,0,19,23837,5,0,0,0,0,0,'Storm Totem - Update Event - cast aura'), +(@ENTRY,0,3,4,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,'Storm Totem - On Aggro - Say 0'), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Storm Totem - On Aggro - Prevent combat movement'), +(@ENTRY,0,5,0,0,0,100,0,0,30,6000,7500,11,15659,0,0,0,0,0,2,0,0,0,0,0,0,0,'Storm Totem - Combat - Cast Chain Lightning'), +(@ENTRY,0,6,0,0,0,100,0,8000,11000,9000,14000,11,31272,0,0,0,0,0,2,0,0,0,0,0,0,0,'Storm Totem - Combat - Cast Wind Shock'), +(@ENTRY,0,7,8,6,0,100,0,0,0,0,0,51,0,0,0,0,0,0,9,23837,0,10,0,0,0,0,'Storm Totem - On death - despawn trigger'), +(@ENTRY,0,8,9,61,0,100,0,0,0,0,0,81,16777216,0,0,0,0,0,19,26048,10,0,0,0,0,0,'Storm Totem - On death - set npc flags on totem'), +(@ENTRY,0,9,0,61,0,100,0,0,0,0,0,85,46424,2,0,0,0,0,16,0,0,0,0,0,0,0,'Storm Totem - Combat - Cast Power of the Storm'); +-- Sage Earth and Sky SAI +SET @ENTRY := 25982; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,20,0,100,0,11895,0,0,0,28,46424,0,0,0,0,0,7,0,0,0,0,0,0,0,'Sage Earth and Sky - On Quest reward - remove aura from player'); +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=26045; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(26045,0,0, 'You will not master me, puny $r!',12,0,100,0,0,0, 'Storm Tempest'); +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=26048; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22,2,26048,0,0,9,0,11895,0,0,0,0, '', 'Storm Totem - Allow sai action only if quest has been taken'), +(22,2,26048,0,0,28,0,11895,0,0,1,0, '', 'Storm Totem - Allow sai action only if quest has not been completed'); -- cgit v1.2.3 From 225d2644ae43c60897f00ecf85a3aac2898dc56b Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 18 Jun 2012 22:41:47 -0230 Subject: DB:SAI: Fix Quest 13231 The Broken Front and 13232 Finish Me! Closes 3223 Closes 6814 --- sql/updates/world/2012_06_18_03_world_sai.sql | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sql/updates/world/2012_06_18_03_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_18_03_world_sai.sql b/sql/updates/world/2012_06_18_03_world_sai.sql new file mode 100644 index 00000000000..833c64c8d9d --- /dev/null +++ b/sql/updates/world/2012_06_18_03_world_sai.sql @@ -0,0 +1,39 @@ +-- Fix Quest 13231 The Broken Front and 13232 Finish Me! +-- Dying Soldier SAI +SET @ENTRY := 31304; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,62,0,100,0,10040,0,0,0,11,58955,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Cast Alliance Quest Aura on player'), +(@ENTRY,0,1,2,62,0,100,0,10040,3,0,0,11,58955,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Cast Alliance Quest Aura on player'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Close Gossip'), +(@ENTRY,0,3,4,62,0,100,0,10040,1,0,0,85,59226,0,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Player cast Finish It on npc'), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Close Gossip'), +(@ENTRY,0,6,7,8,0,100,0,59226,0,0,0,11,3240,2,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Spellhit - Cast Bloody Explosion on self'), +(@ENTRY,0,7,0,61,0,100,0,0,0,0,0,33,31312,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Give Kill credit to player'); +-- Update Gossip +SET @GOSSIP := 10040; +-- Add conditions for gossip text +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,@GOSSIP,13948,0,28,13231,0,0,0,0,'','Only show gossip text 13948 if player has quest 13231 Complete'), +(14,@GOSSIP,13948,0,14,13232,0,0,0,0,'','Only show gossip text 13948 if player has quest 13232 Not Taken'), +(14,@GOSSIP,14035,0,9,13232,0,0,0,0,'','Only show gossip text 14035 if player has quest 13232 active'); +-- Add conditions for gossip options +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,@GOSSIP,0,0,9,13231,0,0,0,0,'','Only show gossip option 0 if player has if player has quest 13231 active'), +(15,@GOSSIP,1,0,9,13232,0,0,0,0,'','Only show gossip option 1 if player has if player has quest 13232 active'), +(15,@GOSSIP,3,0,28,13231,0,0,0,0,'','Only show gossip option 3 if player has quest 13231 Complete'), +(15,@GOSSIP,3,0,14,13232,0,0,0,0,'','Only show gossip option 3 if player has quest 13232 Not Taken'); +-- Update Gossip options +UPDATE `gossip_menu_option` SET `action_menu_id`=10041 WHERE `menu_id`=10040 AND `id`=0; +-- Fix npcflags for Dying Soldier +UPDATE `creature_template` SET `npcflag`=1 WHERE `entry`=31304; +UPDATE `creature` SET `npcflag`=3 WHERE `guid`=122230; +UPDATE `creature` SET `npcflag`=0 WHERE `guid`=122233; +-- Quest conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry`=13232; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(19,0,13232,0,28,13231,0,0,0,0, '', 'Quest 13232 Finish Me! Requires Quest 13231 The Broken Front to be complete'), +(20,0,13232,0,28,13231,0,0,0,0, '', 'Quest 13232 Finish Me! Requires Quest 13231 The Broken Front to be complete'); -- cgit v1.2.3 From f166fe62fc12a5bc228123c3228efefb9ec410a7 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 19 Jun 2012 19:13:14 -0230 Subject: DB/SAI: Fix up Quest to prevend Startup errors. --- sql/updates/world/2012_06_19_00_world_sai.sql | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 sql/updates/world/2012_06_19_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_19_00_world_sai.sql b/sql/updates/world/2012_06_19_00_world_sai.sql new file mode 100644 index 00000000000..fdfc5aec5f8 --- /dev/null +++ b/sql/updates/world/2012_06_19_00_world_sai.sql @@ -0,0 +1,25 @@ +-- Fix Quest 13231 The Broken Front and 13232 Finish Me! +-- Dying Soldier SAI +SET @ENTRY := 31304; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' 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,62,0,100,0,10040,0,0,0,11,58955,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Cast Alliance Quest Aura on player'), +(@ENTRY,0,1,2,62,0,100,0,10040,3,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Set npcflag'), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Close Gossip'), +(@ENTRY,0,3,4,62,0,100,0,10040,1,0,0,85,59226,0,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Player cast Finish It on npc'), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Close Gossip'), +(@ENTRY,0,6,7,8,0,100,0,59226,0,0,0,11,3240,2,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Spellhit - Cast Bloody Explosion on self'), +(@ENTRY,0,7,0,61,0,100,0,0,0,0,0,33,31312,0,0,0,0,0,7,0,0,0,0,0,0,0,'Dying Soldier - On Gossip Option Select - Give Kill credit to player'), +(@ENTRY,0,8,9,25,0,100,0,0,0,0,0,81,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Spawn - Set npcflag'), +(@ENTRY,0,9,0,61,0,100,0,0,0,0,0,8,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Spawn - Set react state'), +(@ENTRY,0,10,0,19,0,100,0,13232,0,0,0,81,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Dying Soldier - On Quest accept - Set npcflag'); +-- Creature updates +UPDATE `creature_template` SET `npcflag`=3,`RegenHealth`=0 WHERE `entry`=31304; +UPDATE `creature` SET `npcflag`=0 WHERE `guid`=122230; +UPDATE `creature` SET `curhealth`=37 WHERE `id`=31304; + +-- Start Fixing Quest 13228 The Broken Front and 13230 No Mercy! +-- Creature updates +UPDATE `creature_template` SET `npcflag`=3,`RegenHealth`=0 WHERE `entry`=31273; +UPDATE `creature` SET `curhealth`=37 WHERE `id`=31273; -- cgit v1.2.3 From be2d3246da0653701fe5f29151c9ac0abb151b91 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 19 Jun 2012 19:14:29 -0230 Subject: DB?Gossip: Gossip fixes from Pitcrawler Closes 6772 --- sql/updates/world/2012_06_19_01_world_gossip.sql | 161 +++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 sql/updates/world/2012_06_19_01_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_19_01_world_gossip.sql b/sql/updates/world/2012_06_19_01_world_gossip.sql new file mode 100644 index 00000000000..7800d2a9740 --- /dev/null +++ b/sql/updates/world/2012_06_19_01_world_gossip.sql @@ -0,0 +1,161 @@ +-- Creature Gossip_menu_id Update from sniff +UPDATE `creature_template` SET `gossip_menu_id`=8871 WHERE `entry`=4501; -- Draz'Zilb +UPDATE `creature_template` SET `gossip_menu_id`=4004 WHERE `entry`=4885; -- Gregor MacVince +UPDATE `creature_template` SET `gossip_menu_id`=541 WHERE `entry`=4895; -- Smiling Jim +UPDATE `creature_template` SET `gossip_menu_id`=4122 WHERE `entry`=4900; -- Alchemist Narett +UPDATE `creature_template` SET `gossip_menu_id`=8840 WHERE `entry`=4921; -- Guard Byron +UPDATE `creature_template` SET `gossip_menu_id`=1186 WHERE `entry`=4926; -- Krog +UPDATE `creature_template` SET `gossip_menu_id`=1161 WHERE `entry`=4944; -- Captain Garran Vimes +UPDATE `creature_template` SET `gossip_menu_id`=5301 WHERE `entry`=4967; -- Archmage Tervosh +UPDATE `creature_template` SET `gossip_menu_id`=2465 WHERE `entry`=4968; -- Lady Jaina Proudmoore +UPDATE `creature_template` SET `gossip_menu_id`=8793 WHERE `entry`=5086; -- Captain Wymor +UPDATE `creature_template` SET `gossip_menu_id`=2916 WHERE `entry`=6546; -- Tabetha +UPDATE `creature_template` SET `gossip_menu_id`=4091 WHERE `entry`=8141; -- Captain Evencane +UPDATE `creature_template` SET `gossip_menu_id`=4355 WHERE `entry`=11052; -- Timothy Worthington +UPDATE `creature_template` SET `gossip_menu_id`=5382 WHERE `entry`=12939; -- Doctor Gustaf VanHowzen +UPDATE `creature_template` SET `gossip_menu_id`=8761 WHERE `entry`=23567; -- Inspector Tarem +UPDATE `creature_template` SET `gossip_menu_id`=8788 WHERE `entry`=23568; -- Captain Darill +UPDATE `creature_template` SET `gossip_menu_id`=8837 WHERE `entry`=23569; -- Renn McGill +UPDATE `creature_template` SET `gossip_menu_id`=8801 WHERE `entry`=23579; -- Brogg +UPDATE `creature_template` SET `gossip_menu_id`=8811 WHERE `entry`=23600; -- Apprentice Morlann +UPDATE `creature_template` SET `gossip_menu_id`=8812 WHERE `entry`=23601; -- Apprentice Garion +UPDATE `creature_template` SET `gossip_menu_id`=8762 WHERE `entry`=23602; -- Deserter Agitator +UPDATE `creature_template` SET `gossip_menu_id`=8782 WHERE `entry`=23704; -- Cassa Crimsonwing +UPDATE `creature_template` SET `gossip_menu_id`=8787 WHERE `entry`=23723; -- Sergeant Lukas +UPDATE `creature_template` SET `gossip_menu_id`=8830 WHERE `entry`=23797; -- Moxie Steelgrille +UPDATE `creature_template` SET `gossip_menu_id`=8831 WHERE `entry`=23835; -- Sergeant Amelyn +UPDATE `creature_template` SET `gossip_menu_id`=8826 WHERE `entry`=23896; -- "Dirty" Michael Crowe +UPDATE `creature_template` SET `gossip_menu_id`=8835 WHERE `entry`=23949; -- Lieutenant Nath +UPDATE `creature_template` SET `gossip_menu_id`=8836 WHERE `entry`=23950; -- Lieutenant Khand +UPDATE `creature_template` SET `gossip_menu_id`=8912 WHERE `entry`=24208; -- "Little" Logok +UPDATE `creature_template` SET `gossip_menu_id`=9342 WHERE `entry`=26546; -- Ludin Farrow + +-- Gossip Menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=541 AND `text_id`=1058; +DELETE FROM `gossip_menu` WHERE `entry`=1161 AND `text_id`=1793; +DELETE FROM `gossip_menu` WHERE `entry`=1162 AND `text_id`=1794; +DELETE FROM `gossip_menu` WHERE `entry`=1186 AND `text_id`=1818; +DELETE FROM `gossip_menu` WHERE `entry`=1187 AND `text_id`=1819; +DELETE FROM `gossip_menu` WHERE `entry`=1188 AND `text_id`=1820; +DELETE FROM `gossip_menu` WHERE `entry`=2465 AND `text_id`=3157; +DELETE FROM `gossip_menu` WHERE `entry`=2916 AND `text_id`=3590; +DELETE FROM `gossip_menu` WHERE `entry`=4004 AND `text_id`=5855; +DELETE FROM `gossip_menu` WHERE `entry`=4091 AND `text_id`=4991; +DELETE FROM `gossip_menu` WHERE `entry`=4122 AND `text_id`=5049; +DELETE FROM `gossip_menu` WHERE `entry`=4355 AND `text_id`=5571; +DELETE FROM `gossip_menu` WHERE `entry`=5301 AND `text_id`=6333; +DELETE FROM `gossip_menu` WHERE `entry`=5382 AND `text_id`=6414; +DELETE FROM `gossip_menu` WHERE `entry`=8761 AND `text_id`=11126; +DELETE FROM `gossip_menu` WHERE `entry`=8762 AND `text_id`=11136; +DELETE FROM `gossip_menu` WHERE `entry`=8782 AND `text_id`=11224; +DELETE FROM `gossip_menu` WHERE `entry`=8787 AND `text_id`=11243; +DELETE FROM `gossip_menu` WHERE `entry`=8788 AND `text_id`=11245; +DELETE FROM `gossip_menu` WHERE `entry`=8793 AND `text_id`=11264; +DELETE FROM `gossip_menu` WHERE `entry`=8801 AND `text_id`=11281; +DELETE FROM `gossip_menu` WHERE `entry`=8811 AND `text_id`=11309; +DELETE FROM `gossip_menu` WHERE `entry`=8812 AND `text_id`=11311; +DELETE FROM `gossip_menu` WHERE `entry`=8826 AND `text_id`=11376; +DELETE FROM `gossip_menu` WHERE `entry`=8830 AND `text_id`=11403; +DELETE FROM `gossip_menu` WHERE `entry`=8831 AND `text_id`=11406; +DELETE FROM `gossip_menu` WHERE `entry`=8835 AND `text_id`=11426; +DELETE FROM `gossip_menu` WHERE `entry`=8836 AND `text_id`=11428; +DELETE FROM `gossip_menu` WHERE `entry`=8837 AND `text_id`=11432; +DELETE FROM `gossip_menu` WHERE `entry`=8840 AND `text_id`=11457; +DELETE FROM `gossip_menu` WHERE `entry`=8871 AND `text_id`=11567; +DELETE FROM `gossip_menu` WHERE `entry`=8912 AND `text_id`=11797; +DELETE FROM `gossip_menu` WHERE `entry`=9342 AND `text_id`=12642; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(541,1058), +(1161,1793), +(1162,1794), +(1186,1818), +(1187,1819), +(1188,1820), +(2465,3157), +(2916,3590), +(4004,5855), +(4091,4991), +(4122,5049), +(4355,5571), +(5301,6333), +(5382,6414), +(8761,11126), +(8762,11136), +(8782,11224), +(8787,11243), +(8788,11245), +(8793,11264), +(8801,11281), +(8811,11309), +(8812,11311), +(8826,11376), +(8830,11403), +(8831,11406), +(8835,11426), +(8836,11428), +(8837,11432), +(8840,11457), +(8871,11567), +(8912,11797), +(9342,12642); + +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1161,4122,4355,5382,8761,8762) AND `id`=0; +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1186,8826,8912) AND `id` IN (0,1); +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 +(1161,0,0,'What have you heard of the Shady Rest Inn?',1,1,1162,0,0,0,''), +(1186,0,0,'The Burning Inn.',1,1,1187,0,0,0,''), +(1186,1,0,'Paval Reethe.',1,1,1188,0,0,0,''), +(4122,0,3,'Train me.',5,16,0,0,0,0,''), +(4355,0,3,'Train me.',5,16,0,0,0,0,''), +(5382,0,3,'Train me.',5,16,0,0,0,0,''), +(8761,0,0,'Can you spread the reflective dust again?',1,1,0,0,0,0,''), +(8762,0,0,'Your propaganda won''t work on me. Spout your treasonous filth elsewhere, traitor!',1,1,0,0,0,0,''), +(8826,0,3,'Train me.',5,16,0,0,0,0,''), +(8826,1,1,'Show me what you have for sale.',3,128,0,0,0,0,''), +(8912,0,5,'Make this inn your home.',8,65536,0,0,0,0,''), +(8912,1,1,'I want to browse your goods.',3,128,0,0,0,0,''); + +SET @NPC_DESERTER := 23602; +SET @NPC_INSPECTOR := 23567; +SET @SPELL_DISCOVERED_SUB := 42219; + +-- Insert creature_text from sniff +DELETE FROM `creature_text` WHERE `entry`=@NPC_DESERTER; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@NPC_DESERTER,0,0,'It''s good to see you defending Theramore with pride, friend.',12,7,100,25,0,0,'Deserter Agitator'), +(@NPC_DESERTER,0,1,'When you''re off duty, let''s go to the inn. I''ll buy a round and we can reminisce about the good old days.',12,7,100,1,0,0,'Deserter Agitator'), +(@NPC_DESERTER,0,2,'Wouldn''t you like to bring those days back? I have some friends who know just the way to do that...''',12,7,100,1,0,0,'Deserter Agitator'), +(@NPC_DESERTER,1,0,'These people will know Admiral Proudmoore for the true hero he was!',12,7,100,5,0,0,'Deserter Agitator'), +(@NPC_DESERTER,1,1,'You can''t stop us from exposing the truth about Jaina''s cowardice!',12,7,100,5,0,0,'Deserter Agitator'), +(@NPC_DESERTER,1,2,'If you think you can stop us, you''re mistaken, ''friend.''',12,7,100,5,0,0,'Deserter Agitator'), +(@NPC_DESERTER,1,3,'It''s people like you who weaken the Alliance and invite the Horde to take away all we''ve fought for!',12,7,100,5,0,0,'Deserter Agitator'); + +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=@SPELL_DISCOVERED_SUB; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8762 AND `SourceEntry`=0; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,@SPELL_DISCOVERED_SUB,0,0,31,0,3,23602,0,0,0,'','Spell Discovered (Sub) only targets Deserter Agitator'), +(15,8762,0,0,0,9,0,11126,0,0,0,0,'','Show gossip option only if player has taken quest 11126'); + +-- SmartAI +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@NPC_INSPECTOR,@NPC_DESERTER) AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@NPC_DESERTER*100,@NPC_DESERTER*100+1) AND `source_type`=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_INSPECTOR,0,0,1,62,0,100,0,8761,0,0,0,11,42169,0,0,0,0,0,7,0,0,0,0,0,0,0,'Inspector Tarem - On Gossip option select - Cast Reflective Dust'), +(@NPC_INSPECTOR,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Inspector Tarem - On Gossip option select - Close Gossip'), + +(@NPC_DESERTER,0,0,0,25,0,100,0,0,0,0,0,2,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Deserter Agitator - On reset - Set faction default'), +(@NPC_DESERTER,0,1,0,1,0,100,0,0,1,30000,40000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Deserter Agitator - On update OOC - Say line'), +(@NPC_DESERTER,0,2,3,62,0,100,0,8762,0,0,0,11,42203,0,0,0,0,0,7,0,0,0,0,0,0,0,'Deserter Agitator - On Gossip option select - Cast Discovered'), +(@NPC_DESERTER,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Deserter Agitator - On Gossip option select - Close Gossip'), +(@NPC_DESERTER,0,4,5,8,0,100,0,@SPELL_DISCOVERED_SUB,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Deserter Agitator - On spellhit Discovered (Sub) - Turn to invoker'), +(@NPC_DESERTER,0,5,6,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,'Deserter Agitator - On spellhit Discovered (Sub) - Say line'), +(@NPC_DESERTER,0,6,0,61,0,100,0,0,0,0,0,87,@NPC_DESERTER*100,@NPC_DESERTER*100+1,0,0,0,0,1,0,0,0,0,0,0,0,'Deserter Agitator - On spellhit Discovered (Sub) - Run script'), + +(@NPC_DESERTER*100,9,0,0,0,0,100,0,2000,2000,0,0,2,14,0,0,0,0,0,1,0,0,0,0,0,0,0,'Deserter Agitator''s script 0 - Set faction monster'), +(@NPC_DESERTER*100,9,1,0,0,0,100,0,0,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Deserter Agitator''s script 0 - Attack'), + +(@NPC_DESERTER*100+1,9,0,0,0,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Deserter Agitator''s script 1 - Remove npcflag gossip'), +(@NPC_DESERTER*100+1,9,1,0,0,0,100,0,0,0,0,0,33,@NPC_DESERTER,0,0,0,0,0,7,0,0,0,0,0,0,0,'Deserter Agitator''s script 1 - Credit'), +(@NPC_DESERTER*100+1,9,2,0,0,0,100,0,30000,30000,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Deserter Agitator''s script 1 - Add npcflag gossip'); -- cgit v1.2.3 From 793421be7aa1d4efe0be28539441a92f72f3c978 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 19 Jun 2012 21:53:45 -0230 Subject: DB/Misc: Some spawn fixes and a path added to Dragonblight. --- sql/updates/world/2012_06_19_02_world_misc.sql | 98 ++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 sql/updates/world/2012_06_19_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_19_02_world_misc.sql b/sql/updates/world/2012_06_19_02_world_misc.sql new file mode 100644 index 00000000000..32aa493f4f7 --- /dev/null +++ b/sql/updates/world/2012_06_19_02_world_misc.sql @@ -0,0 +1,98 @@ +-- Add missing spawns +SET @GUID := 42875; +SET @ENTRY := 26257; +DELETE FROM `creature` WHERE `guid` IN (@GUID,@GUID+1); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,@ENTRY,571,1,1,0,0,3369.694,2528.735,197.4004,3.490659,180,0,0,1,0,0), +(@GUID+1,@ENTRY,571,1,1,0,0,3346.363,2534.127,197.4004,4.258604,180,0,0,1,0,0); +-- Add SAI +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-42875,-42876,-109574,-109575) 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 +(-42875,0,0,0,1,0,100,1,1000,1000,30000,30000,11,46906,2,0,0,0,0,10,115101,27853,0,0,0,0,0,'Surge Needle Sorcerer - OOC - Cast Surge Needle Beam'), +(-42875,0,1,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Surge Needle Sorcerer - Combat - Cast Arcane Blast on victim'), +(-42876,0,0,0,1,0,100,1,1000,1000,30000,30000,11,46906,2,0,0,0,0,10,115101,27853,0,0,0,0,0,'Surge Needle Sorcerer - OOC - Cast Surge Needle Beam'), +(-42876,0,1,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Surge Needle Sorcerer - Combat - Cast Arcane Blast on victim'), +(-109574,0,0,0,1,0,100,1,1000,1000,30000,30000,11,46906,2,0,0,0,0,10,115101,27853,0,0,0,0,0,'Surge Needle Sorcerer - OOC - Cast Surge Needle Beam'), +(-109574,0,1,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Surge Needle Sorcerer - Combat - Cast Arcane Blast on victim'), +(-109575,0,0,0,1,0,100,1,1000,1000,30000,30000,11,46906,2,0,0,0,0,10,115101,27853,0,0,0,0,0,'Surge Needle Sorcerer - OOC - Cast Surge Needle Beam'), +(-109575,0,1,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Surge Needle Sorcerer - Combat - Cast Arcane Blast on victim'); +-- Add missing go +SET @GUID := 325; +SET @ENTRY := 188448; +DELETE FROM `gameobject` WHERE `guid` IN (@GUID); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,@ENTRY,571,1,1,3346.398,2534.092,197.3171,2.82743,0,0,0.9876881,0.1564362,180,255,1); + +-- Pathing for Nexus Guardian +SET @NPC := 111304; +SET @PATH := @NPC*10; +DELETE FROM `creature` WHERE `guid`=@NPC; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@NPC,26276,571,1,1,0,0,3560.472,1769.351,171.9977,1.91463,120,0,0,1,0,2); +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3560.472,1769.351,171.9977,0,0,0,100,0), +(@PATH,2,3567.688,1720.065,171.9977,0,0,0,100,0), +(@PATH,3,3575.305,1671.264,171.9977,0,0,0,100,0), +(@PATH,4,3614.985,1641.572,171.9977,0,0,0,100,0), +(@PATH,5,3661.11,1627.888,179.4142,0,0,0,100,0), +(@PATH,6,3710.721,1625.472,184.0807,0,0,0,100,0), +(@PATH,7,3758.05,1626.899,186.8029,0,0,0,100,0), +(@PATH,8,3806.817,1636.863,186.8029,0,0,0,100,0), +(@PATH,9,3855.013,1638.274,186.8029,0,0,0,100,0), +(@PATH,10,3893.953,1607.221,186.8029,0,0,0,100,0), +(@PATH,11,3908.07,1563.533,186.8029,0,0,0,100,0), +(@PATH,12,3892.732,1516.304,186.8029,0,0,0,100,0), +(@PATH,13,3853.05,1486.712,186.8029,0,0,0,100,0), +(@PATH,14,3804.016,1484.734,186.8029,0,0,0,100,0), +(@PATH,15,3768.95,1518.886,186.8029,0,0,0,100,0), +(@PATH,16,3741.332,1558.961,193.6083,0,0,0,100,0), +(@PATH,17,3735.918,1607.949,197.9415,0,0,0,100,0), +(@PATH,18,3726.846,1656.945,201.9971,0,0,0,100,0), +(@PATH,19,3706.031,1701.895,208.3303,0,0,0,100,0), +(@PATH,20,3693.807,1748.982,208.3303,0,0,0,100,0), +(@PATH,21,3686.946,1791.952,208.3303,0,0,0,100,0), +(@PATH,22,3684.135,1840.943,208.3303,0,0,0,100,0), +(@PATH,23,3693.31,1889.799,208.3303,0,0,0,100,0), +(@PATH,24,3710.331,1936.957,208.3303,0,0,0,100,0), +(@PATH,25,3708.896,1985.871,203.9415,0,0,0,100,0), +(@PATH,26,3711.546,2034.778,199.0248,0,0,0,100,0), +(@PATH,27,3700.25,2079.795,185.8581,0,0,0,100,0), +(@PATH,28,3671.014,2118.18,175.6918,0,0,0,100,0), +(@PATH,29,3627.495,2141.961,170.8588,0,0,0,100,0), +(@PATH,30,3582.266,2162.844,165.0257,0,0,0,100,0), +(@PATH,31,3536.079,2181.72,161.0814,0,0,0,100,0), +(@PATH,32,3492.185,2203.827,153.3039,0,0,0,100,0), +(@PATH,33,3449.847,2227.899,147.0816,0,0,0,100,0), +(@PATH,34,3411.07,2258.388,138.6929,0,0,0,100,0), +(@PATH,35,3372.244,2288.043,130.0542,0,0,0,100,0), +(@PATH,36,3334.966,2320.363,127.8878,0,0,0,100,0), +(@PATH,37,3302.867,2358.885,123.2211,0,0,0,100,0), +(@PATH,38,3272.494,2397.996,120.9432,0,0,0,100,0), +(@PATH,39,3239.637,2434.888,118.8322,0,0,0,100,0), +(@PATH,40,3212.678,2476.519,116.0821,0,0,0,100,0), +(@PATH,41,3211.545,2525.56,108.0818,0,0,0,100,0), +(@PATH,42,3250.958,2578.278,107.5538,0,0,0,100,0), +(@PATH,43,3293.958,2602.603,107.5538,0,0,0,100,0), +(@PATH,44,3342.687,2610.276,112.9983,0,0,0,100,0), +(@PATH,45,3386.911,2594.68,123.2483,0,0,0,100,0), +(@PATH,46,3415.89,2554.956,128.7483,0,0,0,100,0), +(@PATH,47,3424.978,2506.423,128.7483,0,0,0,100,0), +(@PATH,48,3417.17,2457.855,128.7483,0,0,0,100,0), +(@PATH,49,3403.204,2427.43,128.7483,0,0,0,100,0), +(@PATH,50,3373.681,2392.189,128.7483,0,0,0,100,0), +(@PATH,51,3355.053,2347.842,128.7483,0,0,0,100,0), +(@PATH,52,3358.651,2298.717,128.7483,0,0,0,100,0), +(@PATH,53,3365.574,2249.818,135.9983,0,0,0,100,0), +(@PATH,54,3382.769,2202.925,136.9983,0,0,0,100,0), +(@PATH,55,3406.081,2159.531,144.9981,0,0,0,100,0), +(@PATH,56,3435.854,2119.649,151.8868,0,0,0,100,0), +(@PATH,57,3465.756,2080.089,151.8868,0,0,0,100,0), +(@PATH,58,3482.463,2041.774,142.5257,0,0,0,100,0), +(@PATH,59,3503.596,1996.099,137.0257,0,0,0,100,0), +(@PATH,60,3521.709,1951.099,137.0257,0,0,0,100,0), +(@PATH,61,3531.027,1914.229,150.5535,0,0,0,100,0), +(@PATH,62,3542.625,1866.008,158.9424,0,0,0,100,0), +(@PATH,63,3550.662,1817.174,163.9979,0,0,0,100,0); -- cgit v1.2.3 From ab3430762d965f84717fdf7a18e2cbc2271c436a Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 20 Jun 2012 12:39:34 -0230 Subject: DB/Gossip: Some gossip updates from pitcrawler and remove old cpp script he replaced in last commit. Also a couple little fixes of my own. Closes #6866 Closes #6862 Closes #6842 --- sql/updates/world/2012_06_20_00_world_gossip.sql | 132 +++++++++++++++++++++++ src/server/scripts/Kalimdor/dustwallow_marsh.cpp | 108 ------------------- 2 files changed, 132 insertions(+), 108 deletions(-) create mode 100644 sql/updates/world/2012_06_20_00_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_20_00_world_gossip.sql b/sql/updates/world/2012_06_20_00_world_gossip.sql new file mode 100644 index 00000000000..b4d61887223 --- /dev/null +++ b/sql/updates/world/2012_06_20_00_world_gossip.sql @@ -0,0 +1,132 @@ +-- Insert npc_text from sniff +DELETE FROM `npc_text` WHERE `ID`=11428; +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 +(11428,'Are you here to relieve me? I''m certain it''s almost time. Well, if you want to relieve me anyway, let me know. I could use a drink or three.','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,12340); + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=23567; +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=23602; + +-- Creature Gossip_menu_id Update from sniff +UPDATE `creature_template` SET `gossip_menu_id`=7981 WHERE `entry`=19217; -- Ravandwyr +UPDATE `creature_template` SET `gossip_menu_id`=7996 WHERE `entry`=19488; -- Custodian Dieworth +UPDATE `creature_template` SET `gossip_menu_id`=7995 WHERE `entry`=19489; -- Lieutenant-Sorcerer Morran +UPDATE `creature_template` SET `gossip_menu_id`=7991 WHERE `entry`=19569; -- Netherologist Coppernickels +UPDATE `creature_template` SET `gossip_menu_id`=7994 WHERE `entry`=19578; -- Bot-Specialist Alley +UPDATE `creature_template` SET `gossip_menu_id`=8001 WHERE `entry`=19617; -- Boots +UPDATE `creature_template` SET `gossip_menu_id`=8003 WHERE `entry`=19634; -- Lead Sapper Blastfizzle +UPDATE `creature_template` SET `gossip_menu_id`=8024 WHERE `entry`=19644; -- Image of Archmage Vargoth +UPDATE `creature_template` SET `gossip_menu_id`=8008 WHERE `entry`=19645; -- Papa Wheeler +UPDATE `creature_template` SET `gossip_menu_id`=8030 WHERE `entry`=19709; -- Chief Engineer Trep +UPDATE `creature_template` SET `gossip_menu_id`=8032 WHERE `entry`=19728; -- Mama Wheeler +UPDATE `creature_template` SET `gossip_menu_id`=8048 WHERE `entry`=19880; -- Nether-Stalker Khay'ji +UPDATE `creature_template` SET `gossip_menu_id`=8054 WHERE `entry`=20066; -- Gahruj +UPDATE `creature_template` SET `gossip_menu_id`=8055 WHERE `entry`=20067; -- Zuben Elgenubi +UPDATE `creature_template` SET `gossip_menu_id`=8056 WHERE `entry`=20068; -- Zuben Eschamali +UPDATE `creature_template` SET `gossip_menu_id`=8071 WHERE `entry`=20071; -- Wind Trader Marid +UPDATE `creature_template` SET `gossip_menu_id`=8063 WHERE `entry`=20092; -- Dealer Hazzin +UPDATE `creature_template` SET `gossip_menu_id`=8068 WHERE `entry`=20110; -- Tyri +UPDATE `creature_template` SET `gossip_menu_id`=8070 WHERE `entry`=20112; -- Wind Trader Tuluman +UPDATE `creature_template` SET `gossip_menu_id`=8084 WHERE `entry`=20194; -- Dealer Dunar +UPDATE `creature_template` SET `gossip_menu_id`=8101 WHERE `entry`=20281; -- Drijya +UPDATE `creature_template` SET `gossip_menu_id`=8106 WHERE `entry`=20389; -- Lee Sparks +UPDATE `creature_template` SET `gossip_menu_id`=8107 WHERE `entry`=20393; -- Foreman Sundown +UPDATE `creature_template` SET `gossip_menu_id`=8120 WHERE `entry`=20448; -- Commander Ameer +UPDATE `creature_template` SET `gossip_menu_id`=8180 WHERE `entry`=20449; -- Researcher Navuud +UPDATE `creature_template` SET `gossip_menu_id`=8183 WHERE `entry`=20450; -- Flesh Handler Viridius +UPDATE `creature_template` SET `gossip_menu_id`=8126 WHERE `entry`=20463; -- Apprentice Andrethan +UPDATE `creature_template` SET `gossip_menu_id`=8128 WHERE `entry`=20551; -- Agent Araxes +UPDATE `creature_template` SET `gossip_menu_id`=8231 WHERE `entry`=20810; -- Mehrdad +UPDATE `creature_template` SET `gossip_menu_id`=8229 WHERE `entry`=20903; -- Protectorate Nether Drake +UPDATE `creature_template` SET `gossip_menu_id`=8207 WHERE `entry`=20907; -- Professor Dabiri +UPDATE `creature_template` SET `gossip_menu_id`=8228 WHERE `entry`=20985; -- Captain Saeed +UPDATE `creature_template` SET `gossip_menu_id`=8308 WHERE `entry`=21493; -- Kablamm Farflinger +UPDATE `creature_template` SET `gossip_menu_id`=8542 WHERE `entry`=22427; -- Zarevhi +UPDATE `creature_template` SET `gossip_menu_id`=8710 WHERE `entry`=23396; -- Krixel Pinchwhistle +UPDATE `creature_template` SET `gossip_menu_id`=9781 WHERE `entry`=29145; -- Pulik Swiftsnip + +-- Gossip Menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=7981 AND `text_id` IN (9826,9828); +DELETE FROM `gossip_menu` WHERE `entry`=7991 AND `text_id`=9841; +DELETE FROM `gossip_menu` WHERE `entry`=7994 AND `text_id`=9846; +DELETE FROM `gossip_menu` WHERE `entry`=7995 AND `text_id`=9847; +DELETE FROM `gossip_menu` WHERE `entry`=7996 AND `text_id`=9848; +DELETE FROM `gossip_menu` WHERE `entry`=8001 AND `text_id`=9863; +DELETE FROM `gossip_menu` WHERE `entry`=8003 AND `text_id`=9869; +DELETE FROM `gossip_menu` WHERE `entry`=8008 AND `text_id`=9875; +DELETE FROM `gossip_menu` WHERE `entry`=8024 AND `text_id`=9901; +DELETE FROM `gossip_menu` WHERE `entry`=8030 AND `text_id`=9916; +DELETE FROM `gossip_menu` WHERE `entry`=8032 AND `text_id`=9919; +DELETE FROM `gossip_menu` WHERE `entry`=8048 AND `text_id`=9937; +DELETE FROM `gossip_menu` WHERE `entry`=8054 AND `text_id`=9947; +DELETE FROM `gossip_menu` WHERE `entry`=8055 AND `text_id`=9948; +DELETE FROM `gossip_menu` WHERE `entry`=8056 AND `text_id`=9949; +DELETE FROM `gossip_menu` WHERE `entry`=8063 AND `text_id`=9959; +DELETE FROM `gossip_menu` WHERE `entry`=8068 AND `text_id`=9968; +DELETE FROM `gossip_menu` WHERE `entry`=8070 AND `text_id`=9970; +DELETE FROM `gossip_menu` WHERE `entry`=8071 AND `text_id`=9971; +DELETE FROM `gossip_menu` WHERE `entry`=8084 AND `text_id`=9994; +DELETE FROM `gossip_menu` WHERE `entry`=8101 AND `text_id`=10019; +DELETE FROM `gossip_menu` WHERE `entry`=8106 AND `text_id`=10031; +DELETE FROM `gossip_menu` WHERE `entry`=8107 AND `text_id`=10032; +DELETE FROM `gossip_menu` WHERE `entry`=8120 AND `text_id`=10058; +DELETE FROM `gossip_menu` WHERE `entry`=8121 AND `text_id`=10061; +DELETE FROM `gossip_menu` WHERE `entry`=8122 AND `text_id`=10060; +DELETE FROM `gossip_menu` WHERE `entry`=8123 AND `text_id`=10059; +DELETE FROM `gossip_menu` WHERE `entry`=8126 AND `text_id`=10064; +DELETE FROM `gossip_menu` WHERE `entry`=8128 AND `text_id`=10065; +DELETE FROM `gossip_menu` WHERE `entry`=8180 AND `text_id`=10152; +DELETE FROM `gossip_menu` WHERE `entry`=8183 AND `text_id`=10179; +DELETE FROM `gossip_menu` WHERE `entry`=8207 AND `text_id`=10202; +DELETE FROM `gossip_menu` WHERE `entry`=8228 AND `text_id`=10229; +DELETE FROM `gossip_menu` WHERE `entry`=8229 AND `text_id`=10230; +DELETE FROM `gossip_menu` WHERE `entry`=8231 AND `text_id`=10233; +DELETE FROM `gossip_menu` WHERE `entry`=8308 AND `text_id`=10365; +DELETE FROM `gossip_menu` WHERE `entry`=8542 AND `text_id`=10687; +DELETE FROM `gossip_menu` WHERE `entry`=8710 AND `text_id`=10957; +DELETE FROM `gossip_menu` WHERE `entry`=9781 AND `text_id`=13459; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(7981,9828),(7981, 9826),(7991,9841),(7994,9846),(7995,9847), +(7996,9848),(8001,9863),(8003,9869),(8008,9875),(8024,9901), +(8030,9916),(8032,9919),(8048,9937),(8054,9947),(8055,9948), +(8056,9949),(8063,9959),(8068,9968),(8070,9970),(8071,9971), +(8084,9994),(8101,10019),(8106,10031),(8107,10032),(8120,10058), +(8121,10061),(8122,10060),(8123,10059),(8126,10064),(8128,10065), +(8180,10152),(8183,10179),(8207,10202),(8228,10229),(8229,10230), +(8231,10233),(8308,10365),(8542,10687),(8710,10957),(9781,13459); + +-- Insert npc_text from sniff +DELETE FROM `npc_text` WHERE `ID` IN (10059,10061); +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 +(10059,'The Ethereum were the ruling class of ethereal on my homeworld of K''aresh. Tragically, we were forced to evacuate K''aresh shortly before the void lord, Dimensius, unleashed his void armies upon the world and utterly decimated all that stood in his way. For this act, the Ethereum vowed vengeance. They have been tracking Dimensius ever since...$B$BThe Protectorate, however, were not a reaction to Dimensius. We were a reaction to Ethereum.','',0,1,0,1,0,1,0,1,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,1,0,0,0,0,0,0,'','',0,0,0,0,0,0,0,0,12340), +(10061,'We feel that the Ethereum are as great a threat to our existence as Dimensius. Both must be stopped...','',0,1,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,12340); + +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8001,8063,8070,8084,8103,8120,8121,8122,8123,8126,8710) AND `id`=0; +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 +(8001, 0, 1, 'Boots, what do you have back there that goes down smooth?', 3, 128, 0, 0, 0, 0, ''), +(8063, 0, 1, 'Dealer Hazzin, what do you have to offer?', 3, 128, 0, 0, 0, 0, ''), +(8070, 0, 1, 'What do you have to sell, Tuluman?', 3, 128, 0, 0, 0, 0, ''), +(8084, 0, 1, 'Dealer Dunar, I wish to browse your wares.', 3, 128, 0, 0, 0, 0, ''), +(8103, 0, 5, 'Make this inn your home.', 8, 65536, 0, 0, 0, 0, ''), +(8120, 0, 0, 'What are Ethereum?', 1, 1, 8123, 0, 0, 0, ''), +(8121, 0, 0, 'I think I understand now. Can I help with any of this? The Ethereum and void creatures are a threat to our survival as well.', 1, 1, 8120, 0, 0, 0, ''), +(8122, 0, 0, 'So what is your purpose?', 1, 1, 8121, 0, 0, 0, ''), +(8123, 0, 0, 'I don''t understand. What do you mean, Ameer?', 1, 1, 8122, 0, 0, 0, ''), +(8126, 0, 1, 'I wish to browse your wares.', 3, 128, 0, 0, 0, 0, ''), +(8710, 0, 1, 'Let me browse your goods.', 3, 128, 0, 0, 0, 0, ''); + +-- Conditions +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7981 AND `SourceEntry`=9828; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(14,7981,9828,0,0,9,0,10173,0,0,0,0,'','Ravandwyr - Show different gossip if player has taken quest 10173'); + +-- Remove some old script text +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000649 AND -1000641; + +-- Add missing loot +DELETE FROM `creature_loot_template` WHERE `entry`=30524 AND `item`=35490; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(30524,35490,-100,1,0,1,1); + +-- Add a missing gossip +UPDATE `creature_template` SET `gossip_menu_id`=1100 WHERE `entry`=4963; diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 45e1c1808c1..0aeb3c3ac11 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -25,7 +25,6 @@ EndScriptData */ /* ContentData mobs_risen_husk_spirit -npc_deserter_agitator npc_lady_jaina_proudmoore npc_nat_pagle npc_private_hendel @@ -217,112 +216,6 @@ public: }; }; -/*###### -## npc_deserter_agitator -######*/ - -enum TheramoreGuard -{ - SAY_QUEST1 = -1000641, - SAY_QUEST2 = -1000642, - SAY_QUEST3 = -1000643, - SAY_QUEST4 = -1000644, - SAY_QUEST5 = -1000645, - SAY_QUEST6 = -1000646, - SAY_QUEST7 = -1000647, - SAY_QUEST8 = -1000648, - SAY_QUEST9 = -1000649, - - QUEST_DISCREDITING_THE_DESERTERS = 11133, - - NPC_THERAMORE_GUARD = 4979, - - SPELL_DOCTORED_LEAFLET = 42725, - SPELL_PROPAGANDIZED = 42246, -}; - -#define GOSSIP_ITEM_THERAMORE_GUARD "You look like an intelligent person. Why don't you read one of these leaflets and give it some thought?" - -class npc_theramore_guard : public CreatureScript -{ -public: - npc_theramore_guard() : CreatureScript("npc_theramore_guard") { } - - bool OnGossipHello(Player* player, Creature* creature) - { - if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); - - player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); - - return true; - } - - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) - { - player->PlayerTalkClass->ClearMenus(); - - if (action == GOSSIP_SENDER_INFO) - { - player->CLOSE_GOSSIP_MENU(); - player->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0); - DoScriptText(SAY_QUEST1, creature); - creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false); - creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->YellTimer = 4000; - CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->bYellTimer = true; - } - - return true; - } - - CreatureAI* GetAI(Creature* creature) const - { - return new npc_theramore_guardAI(creature); - } - - struct npc_theramore_guardAI : public ScriptedAI - { - npc_theramore_guardAI(Creature* creature) : ScriptedAI(creature) { } - - uint32 YellTimer; - uint32 Step; - bool bYellTimer; - - void Reset() - { - bYellTimer = false; - Step = 0; - } - - void UpdateAI(const uint32 Diff) - { - if (!me->HasAura(SPELL_PROPAGANDIZED)) - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - - if (bYellTimer && YellTimer <= Diff) - { - switch (Step) - { - case 0: - DoScriptText(RAND(SAY_QUEST2, SAY_QUEST3, SAY_QUEST4, SAY_QUEST5, SAY_QUEST6), me); - YellTimer = 3000; - ++Step; - break; - case 1: - DoScriptText(RAND(SAY_QUEST7, SAY_QUEST8, SAY_QUEST9), me); - me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); - Step = 0; - bYellTimer = false; - break; - } - } - else - YellTimer -= Diff; - } - }; -}; - /*###### ## npc_lady_jaina_proudmoore ######*/ @@ -865,7 +758,6 @@ void AddSC_dustwallow_marsh() new npc_zelfrax(); new npc_stinky(); new npc_theramore_guard(); - new npc_deserter_agitator(); new spell_ooze_zap(); new spell_ooze_zap_channel_end(); new spell_energize_aoe(); -- cgit v1.2.3 From de3f982c913d0fe1006c0b53d959fd26da7ab17f Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 20 Jun 2012 20:08:05 -0230 Subject: DB/SAI: Fix Quest 9689 "Razormaw" Thanks to Kiper for sniff. Closes #1794 --- sql/updates/world/2012_06_20_01_world_sai.sql | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sql/updates/world/2012_06_20_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_20_01_world_sai.sql b/sql/updates/world/2012_06_20_01_world_sai.sql new file mode 100644 index 00000000000..989550de185 --- /dev/null +++ b/sql/updates/world/2012_06_20_01_world_sai.sql @@ -0,0 +1,26 @@ +-- Razormaw SAI fixes quest 9689 +SET @ENTRY := 17592; +UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`bytes2`) VALUES (@ENTRY,50331648,1); +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,0,0,100,0,6000,6000,7000,9000,11,31279,0,0,0,0,0,2,0,0,0,0,0,0,0,'Razormaw - Combat - Cast Swipe'), +(@ENTRY,0,1,0,0,0,100,0,26000,30000,26000,30000,11,8873,0,0,0,0,0,1,0,0,0,0,0,0,0,'Razormaw - Combat - Cast Flame Breath'), +(@ENTRY,0,2,0,0,0,50,0,12000,12000,12000,12000,11,14100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Razormaw - Combat - Cast Terrifying Roar'), +(@ENTRY,0,3,0,11,0,100,0,0,0,0,0,53,1,@ENTRY,0,0,0,0,1,0,0,0,0,0,0,0,'Razormaw - On spawn - Load Path'), +(@ENTRY,0,4,0,40,0,100,0,10,@ENTRY,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,'Razormaw - On Reach waypoint - Remove unitflag'); +-- Waypoints for Razormaw +DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@ENTRY,1,-1045.958,-12583.85,111.7434, 'Razormaw'), +(@ENTRY,2,-1045.115,-12583.31,111.7434, 'Razormaw'), +(@ENTRY,3,-1213.006,-12663.19,200.4278, 'Razormaw'), +(@ENTRY,4,-1204.485,-12626.66,200.4278, 'Razormaw'), +(@ENTRY,5,-1204.906,-12599.65,188.7889, 'Razormaw'), +(@ENTRY,6,-1206.845,-12579.84,173.2892, 'Razormaw'), +(@ENTRY,7,-1203.169,-12555.49,160.956, 'Razormaw'), +(@ENTRY,8,-1201.284,-12529.25,134.3167, 'Razormaw'), +(@ENTRY,9,-1204.178,-12483.84,115.039, 'Razormaw'), +(@ENTRY,10,-1204.349,-12465.61,104.7762, 'Razormaw'), +(@ENTRY,11,-1205.651,-12460.52,97.53908, 'Razormaw'); -- cgit v1.2.3 From 90efff96a82162449788b2b575186111730272e5 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Wed, 20 Jun 2012 20:54:09 -0230 Subject: DB/Gossip: Add a Missing gossip --- sql/updates/world/2012_06_20_02_world_gossip.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2012_06_20_02_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_20_02_world_gossip.sql b/sql/updates/world/2012_06_20_02_world_gossip.sql new file mode 100644 index 00000000000..c20cb99aa4a --- /dev/null +++ b/sql/updates/world/2012_06_20_02_world_gossip.sql @@ -0,0 +1,17 @@ + -- Prince Toreth +UPDATE `creature_template` SET `gossip_menu_id`=7478 WHERE `entry`=17674; +-- Creature Gossip_menu insert from sniff +DELETE FROM `gossip_menu` WHERE `entry`=7474 AND `text_id`=9060; +DELETE FROM `gossip_menu` WHERE `entry`=7475 AND `text_id`=9059; +DELETE FROM `gossip_menu` WHERE `entry`=7476 AND `text_id`=9058; +DELETE FROM `gossip_menu` WHERE `entry`=7477 AND `text_id`=9057; +DELETE FROM `gossip_menu` WHERE `entry`=7478 AND `text_id`=9056; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(7474,9060),(7475, 9059),(7476,9058),(7477,9057),(7478,9056); +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7478,7477,7476,7475) AND `id`=0; +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 +(7478,0,0, 'Why do you suffer?',1,1,7477,0,0,0, ''), +(7477,0,0, 'What is Ysera and how were you blessed?',1,1,7476,0,0,0, ''), +(7476,0,0, 'Until what?',1,1,7475,0,0,0, ''), +(7475,0,0, 'So why are you still here?',1,1,7474,0,0,0, ''); -- cgit v1.2.3 From 830d1cd0bc29acc9e7fd8f0c595697a7bcd0b3f8 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 24 Jun 2012 19:45:58 -0230 Subject: DB/Core/Gossip: Add Gossip for Alliance & Horde bonfires, fix gameobject faction, fix quest racerequirements, fix spell 45437 to be cast upon bonfire. Spawning left to do. --- sql/updates/world/2012_06_24_00_world_gossip.sql | 296 +++++++++++++++++++++++ src/server/scripts/World/go_scripts.cpp | 23 ++ 2 files changed, 319 insertions(+) create mode 100644 sql/updates/world/2012_06_24_00_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_24_00_world_gossip.sql b/sql/updates/world/2012_06_24_00_world_gossip.sql new file mode 100644 index 00000000000..f8aa5213bf4 --- /dev/null +++ b/sql/updates/world/2012_06_24_00_world_gossip.sql @@ -0,0 +1,296 @@ +-- Conditions for Spell "Stamp Out Bonfire" +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (45437); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +-- Alliance Bonfires +(13,1,45437,0,0,31,0,5,187564,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,1,31,0,5,187914,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,2,31,0,5,187916,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,3,31,0,5,187917,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,4,31,0,5,187919,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,5,31,0,5,187920,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,6,31,0,5,187921,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,7,31,0,5,187922,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,8,31,0,5,187923,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,9,31,0,5,187924,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,10,31,0,5,187925,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,11,31,0,5,187926,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,12,31,0,5,187927,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,13,31,0,5,187928,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,14,31,0,5,187929,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,15,31,0,5,187930,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,16,31,0,5,187931,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,17,31,0,5,187932,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,18,31,0,5,187933,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,19,31,0,5,187934,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,20,31,0,5,187935,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,21,31,0,5,187936,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,22,31,0,5,187937,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,23,31,0,5,187938,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,24,31,0,5,187939,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,25,31,0,5,187940,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,26,31,0,5,187941,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,27,31,0,5,187942,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,28,31,0,5,187943,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,29,31,0,5,187944,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,30,31,0,5,187945,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,31,31,0,5,187946,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,32,31,0,5,194032,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,33,31,0,5,194035,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,34,31,0,5,194036,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,35,31,0,5,194038,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,36,31,0,5,194040,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,37,31,0,5,194044,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,38,31,0,5,194045,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,39,31,0,5,194049,0,0,0,'','Spell can hit go target'), +-- Horde Bonfires +(13,1,45437,0,40,31,0,5,187559,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,41,31,0,5,187947,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,42,31,0,5,187948,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,43,31,0,5,187949,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,44,31,0,5,187950,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,45,31,0,5,187951,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,46,31,0,5,187952,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,47,31,0,5,187953,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,48,31,0,5,187954,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,49,31,0,5,187955,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,50,31,0,5,187956,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,51,31,0,5,187957,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,52,31,0,5,187958,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,53,31,0,5,187959,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,54,31,0,5,187960,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,55,31,0,5,187961,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,56,31,0,5,187962,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,57,31,0,5,187963,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,58,31,0,5,187964,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,59,31,0,5,187965,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,60,31,0,5,187966,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,61,31,0,5,187967,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,62,31,0,5,187968,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,63,31,0,5,187969,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,64,31,0,5,187970,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,65,31,0,5,187971,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,66,31,0,5,187972,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,67,31,0,5,187973,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,68,31,0,5,187974,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,69,31,0,5,187975,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,70,31,0,5,194033,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,71,31,0,5,194034,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,72,31,0,5,194037,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,73,31,0,5,194039,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,74,31,0,5,194042,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,75,31,0,5,194043,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,76,31,0,5,194046,0,0,0,'','Spell can hit go target'), +(13,1,45437,0,77,31,0,5,194048,0,0,0,'','Spell can hit go target'); + +-- Add Triggered spell +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=45458; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +(45458,45437,1,'Holiday - Midsummer, Stamp Out Bonfire, Quest Complete triggers Stamp Out Bonfire'); + +-- Add script to bonfires +UPDATE `gameobject_template` SET `ScriptName`= 'go_midsummer_bonfire' WHERE `entry` IN (187559,187564,187914,187916,187917,187919,187920,187921,187922,187923,187924,187925,187926,187927,187928,187929,187930,187931,187932,187933,187934,187935,187936,187937,187938,187939,187940,187941,187942,187943,187944,187945,187946,187947,187948,187949,187950,187951,187952,187953,187954,187955,187956,187957,187958,187959,187960,187961,187962,187963,187964,187965,187966,187967,187968,187969,187970,187971,187972,187973,187974,187975,194032,194033,194034,194035,194036,194037,194038,194039,194040,194042,194043,194044,194045,194046,194048,194049); + +-- Add gossip to Horde Bonfires +DELETE FROM `gossip_menu` WHERE `entry` IN (9370,9353,9355,9379,9380,9381,9382,9383,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9371,9372,9373,9374,9375,9376,9377,9378,10228,10231,10232,10235,10236,10239,10241,10242); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9370,12374),(9353,12374),(9355,12374),(9379,12374),(9380,12374),(9381,12374),(9382,12374), +(9383,12374),(9356,12374),(9357,12374),(9358,12374),(9359,12374),(9360,12374),(9361,12374), +(9362,12374),(9363,12374),(9364,12374),(9365,12374),(9366,12374),(9367,12374),(9368,12374), +(9369,12374),(9371,12374),(9372,12374),(9373,12374),(9374,12374),(9375,12374),(9376,12374), +(9377,12374),(9378,12374),(10228,12374),(10231,12374),(10232,12374),(10235,12374),(10236,12374), +(10239,12374),(10241,12374),(10242,12374); + +-- Creature Gossip_menu_option inserts for Horde bonfires +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9370,9353,9355,9379,9380,9381,9382,9383,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9371,9372,9373,9374,9375,9376,9377,9378,10228,10231,10232,10235,10236,10239,10241,10242) AND `id`=0; +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 +(9370,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9353,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9355,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9379,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9380,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9381,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9382,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9383,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9356,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9357,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9358,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9359,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9360,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9361,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9362,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9363,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9364,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9365,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9366,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9367,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9368,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9369,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9371,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9372,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9373,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9374,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9375,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9376,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9377,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(9378,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10228,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10231,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10232,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10235,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10236,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10239,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10241,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''), +(10242,0,0, 'Stamp out the Horde bonfire!',1,1,0,0,0,0, ''); + +-- Add conditons for Horde Bonfires +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceEntry`=0 AND `SourceGroup` IN (9370,9353,9355,9379,9380,9381,9382,9383,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9371,9372,9373,9374,9375,9376,9377,9378,10228,10231,10232,10235,10236,10239,10241,10242); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,9370,0,0,0,8,0,11581,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9353,0,0,0,8,0,11764,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9355,0,0,0,8,0,11765,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9379,0,0,0,8,0,11766,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9380,0,0,0,8,0,11767,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9381,0,0,0,8,0,11768,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9382,0,0,0,8,0,11769,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9383,0,0,0,8,0,11770,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9356,0,0,0,8,0,11771,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9357,0,0,0,8,0,11772,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9358,0,0,0,8,0,11773,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9359,0,0,0,8,0,11774,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9360,0,0,0,8,0,11775,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9361,0,0,0,8,0,11776,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9362,0,0,0,8,0,11777,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9363,0,0,0,8,0,11778,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9364,0,0,0,8,0,11779,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9365,0,0,0,8,0,11780,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9366,0,0,0,8,0,11781,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9367,0,0,0,8,0,11782,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9368,0,0,0,8,0,11783,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9369,0,0,0,8,0,11784,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9371,0,0,0,8,0,11785,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9372,0,0,0,8,0,11786,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9373,0,0,0,8,0,11787,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9374,0,0,0,8,0,11799,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9375,0,0,0,8,0,11800,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9376,0,0,0,8,0,11801,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9377,0,0,0,8,0,11802,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9378,0,0,0,8,0,11803,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10228,0,0,0,8,0,13441,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10231,0,0,0,8,0,13450,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10232,0,0,0,8,0,13451,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10235,0,0,0,8,0,13453,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10236,0,0,0,8,0,13454,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10239,0,0,0,8,0,13455,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10241,0,0,0,8,0,13457,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10242,0,0,0,8,0,13458,0,0,0,0,'','Show gossip option only if player has quest'); + +-- Fix required side for Alliance quest +UPDATE `quest_template` SET `RequiredRaces`=1101 WHERE `Id` IN (11581,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776,11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11799,11800,11801,11802,11803,13441,13450,13451,13453,13454,13455,13457,13458); + +-- Fix Faction for Horde bonfires +UPDATE `gameobject_template` SET `faction`=1732 WHERE `entry` IN (187949,187955,187958,187960,187962,187965,187967,187974,194037,194039,194042,194043,194046,194048); + +-- Add gossip to Alliance Bonfires +DELETE FROM `gossip_menu` WHERE `entry` IN (9406,9352,9354,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405,9407,9408,9409,9410,9411,9412,9413,10227,10230,10233,10234,10237,10238,10240,10243); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9406,12377),(9352,12377),(9354,12377),(9384,12377),(9385,12377),(9386,12377),(9387,12377),(9388,12377), +(9389,12377),(9390,12377),(9391,12377),(9392,12377),(9393,12377),(9394,12377),(9395,12377),(9396,12377), +(9397,12377),(9398,12377),(9399,12377),(9400,12377),(9401,12377),(9402,12377),(9403,12377),(9404,12377), +(9405,12377),(9407,12377),(9408,12377),(9409,12377),(9410,12377),(9411,12377),(9412,12377),(9413,12377), +(10227,12377),(10230,12377),(10233,12377),(10234,12377),(10237,12377),(10238,12377),(10240,12377),(10243,12377); + +-- Creature Gossip_menu_option insert from sniff +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9406,9352,9354,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405,9407,9408,9409,9410,9411,9412,9413,10227,10230,10233,10234,10237,10238,10240,10243) AND `id`=0; +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 +(9406,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9352,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9354,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9384,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9385,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9386,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9387,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9388,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9389,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9390,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9391,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9392,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9393,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9394,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9395,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9396,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9397,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9398,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9399,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9400,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9401,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9402,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9403,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9404,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9405,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9407,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9408,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9409,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9410,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9411,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9412,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(9413,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10227,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10230,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10233,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10234,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10237,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10238,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10240,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''), +(10243,0,0, 'Stamp out the Alliance bonfire!',1,1,0,0,0,0, ''); + +-- Add conditons for Alliance Bonfires +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceEntry`=0 AND `SourceGroup` IN (9406,9352,9354,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405,9407,9408,9409,9410,9411,9412,9413,10227,10230,10233,10234,10237,10238,10240,10243); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,9406,0,0,0,8,0,11580,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9352,0,0,0,8,0,11732,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9354,0,0,0,8,0,11734,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9384,0,0,0,8,0,11735,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9385,0,0,0,8,0,11736,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9386,0,0,0,8,0,11737,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9387,0,0,0,8,0,11738,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9388,0,0,0,8,0,11739,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9389,0,0,0,8,0,11740,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9390,0,0,0,8,0,11741,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9391,0,0,0,8,0,11742,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9392,0,0,0,8,0,11743,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9393,0,0,0,8,0,11744,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9394,0,0,0,8,0,11745,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9395,0,0,0,8,0,11746,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9396,0,0,0,8,0,11747,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9397,0,0,0,8,0,11748,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9398,0,0,0,8,0,11749,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9399,0,0,0,8,0,11750,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9400,0,0,0,8,0,11751,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9401,0,0,0,8,0,11752,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9402,0,0,0,8,0,11753,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9403,0,0,0,8,0,11754,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9404,0,0,0,8,0,11755,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9405,0,0,0,8,0,11756,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9407,0,0,0,8,0,11757,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9408,0,0,0,8,0,11758,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9409,0,0,0,8,0,11759,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9410,0,0,0,8,0,11760,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9411,0,0,0,8,0,11761,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9412,0,0,0,8,0,11762,0,0,0,0,'','Show gossip option only if player has quest'), +(15,9413,0,0,0,8,0,11763,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10227,0,0,0,8,0,13440,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10230,0,0,0,8,0,13442,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10233,0,0,0,8,0,13443,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10234,0,0,0,8,0,13444,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10237,0,0,0,8,0,13445,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10238,0,0,0,8,0,13446,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10240,0,0,0,8,0,13447,0,0,0,0,'','Show gossip option only if player has quest'), +(15,10243,0,0,0,8,0,13449,0,0,0,0,'','Show gossip option only if player has quest'); + +-- Fix required side for Horde quest +UPDATE `quest_template` SET `RequiredRaces`=690 WHERE `Id` IN (11580,11732,11734,11735,11736,11737,11738,11739,11740,11741,11742,11743,11744,11745,11746,11747,11748,11749,11750,11751,11752,11753,11754,11755,11756,11757,11758,11759,11760,11761,11762,11763,13440,13442,13443,13444,13445,13446,13447,13449); + +-- Fix Faction for Alliance bonfires +UPDATE `gameobject_template` SET `faction`=1735 WHERE `entry` IN (187564,187914,187916,187917); +UPDATE `gameobject_template` SET `faction`=1735 WHERE `entry` BETWEEN 187919 AND 187946; +UPDATE `gameobject_template` SET `faction`=1735 WHERE `entry` IN (194032,194035,194036,194038,194040,194044,194045,194049); diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 308c7f9afa3..21a852ae9ed 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1275,6 +1275,28 @@ public: } }; +/*###### +## go_midsummer_bonfire +######*/ + +enum eMidsummerBonfire +{ + STAMP_OUT_BONFIRE_QUEST_COMPLETE = 45458, +}; + +class go_midsummer_bonfire : public GameObjectScript +{ +public: + go_midsummer_bonfire() : GameObjectScript("go_midsummer_bonfire") { } + + bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) + { + player->CastSpell(player, STAMP_OUT_BONFIRE_QUEST_COMPLETE, true); + player->CLOSE_GOSSIP_MENU(); + return false; + } +}; + void AddSC_go_scripts() { new go_cat_figurine; @@ -1316,4 +1338,5 @@ void AddSC_go_scripts() new go_large_gjalerbron_cage; new go_veil_skith_cage; new go_frostblade_shrine; + new go_midsummer_bonfire; } -- cgit v1.2.3 From 1071384010cf3c19d5ebb83d7dab0180f70dba95 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 24 Jun 2012 20:46:25 -0230 Subject: Db/quest: Add quest relations for Alliance & horde bonfires. --- sql/updates/world/2012_06_24_00_world_quest.sql | 167 ++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 sql/updates/world/2012_06_24_00_world_quest.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_24_00_world_quest.sql b/sql/updates/world/2012_06_24_00_world_quest.sql new file mode 100644 index 00000000000..ec0d39b0c62 --- /dev/null +++ b/sql/updates/world/2012_06_24_00_world_quest.sql @@ -0,0 +1,167 @@ +DELETE FROM `gameobject_questrelation` WHERE `id` IN (187564,187914,187916,187917,187919,187920,187921,187922,187923,187924,187925,187926,187927,187928,187929,187930,187931,187931,187932,187933,187934,187935,187936,187937,187938,187939,187940,187941,187942,187943,187944,187945,187946,194032,194035,194036,194038,194040,194044,194045,194049); +INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES +(187564,11580), +(187914,11732), +(187916,11734), +(187917,11735), +(187919,11736), +(187920,11737), +(187921,11738), +(187922,11739), +(187923,11740), +(187924,11741), +(187925,11742), +(187926,11743), +(187927,11744), +(187928,11745), +(187929,11746), +(187930,11747), +(187931,11748), +(187932,11749), +(187933,11750), +(187934,11751), +(187935,11752), +(187936,11753), +(187937,11754), +(187938,11755), +(187939,11756), +(187940,11757), +(187941,11758), +(187942,11759), +(187943,11760), +(187944,11761), +(187945,11762), +(187946,11763), +(194032,13440), +(194035,13442), +(194036,13443), +(194038,13444), +(194040,13445), +(194044,13446), +(194045,13447), +(194049,13449); + +DELETE FROM `gameobject_involvedrelation` WHERE `id` IN (187564,187914,187916,187917,187919,187920,187921,187922,187923,187924,187925,187926,187927,187928,187929,187930,187931,187931,187932,187933,187934,187935,187936,187937,187938,187939,187940,187941,187942,187943,187944,187945,187946,194032,194035,194036,194038,194040,194044,194045,194049); +INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES +(187564,11580), +(187914,11732), +(187916,11734), +(187917,11735), +(187919,11736), +(187920,11737), +(187921,11738), +(187922,11739), +(187923,11740), +(187924,11741), +(187925,11742), +(187926,11743), +(187927,11744), +(187928,11745), +(187929,11746), +(187930,11747), +(187931,11748), +(187932,11749), +(187933,11750), +(187934,11751), +(187935,11752), +(187936,11753), +(187937,11754), +(187938,11755), +(187939,11756), +(187940,11757), +(187941,11758), +(187942,11759), +(187943,11760), +(187944,11761), +(187945,11762), +(187946,11763), +(194032,13440), +(194035,13442), +(194036,13443), +(194038,13444), +(194040,13445), +(194044,13446), +(194045,13447), +(194049,13449); + +DELETE FROM `gameobject_questrelation` WHERE `id` IN (187559,187947,187948,187949,187950,187951,187952,187953,187954,187955,187956,187957,187958,187959,187960,187961,187962,187963,187964,187965,187966,187967,187968,187969,187970,187971,187972,187973,187974,187975,194033,194034,194037,194039,194042,194043,194046,194048); +INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES +(187559,11581), +(187947,11764), +(187948,11765), +(187949,11766), +(187950,11767), +(187951,11768), +(187952,11769), +(187953,11770), +(187954,11771), +(187955,11772), +(187956,11773), +(187957,11774), +(187958,11775), +(187959,11776), +(187960,11777), +(187961,11778), +(187962,11779), +(187963,11780), +(187964,11781), +(187965,11782), +(187966,11783), +(187967,11784), +(187968,11785), +(187969,11786), +(187970,11787), +(187971,11799), +(187972,11800), +(187973,11801), +(187974,11802), +(187975,11803), +(194033,13441), +(194034,13450), +(194037,13451), +(194039,13453), +(194042,13454), +(194043,13455), +(194046,13457), +(194048,13458); + +DELETE FROM `gameobject_involvedrelation` WHERE `id` IN (187559,187947,187948,187949,187950,187951,187952,187953,187954,187955,187956,187957,187958,187959,187960,187961,187962,187963,187964,187965,187966,187967,187968,187969,187970,187971,187972,187973,187974,187975,194033,194034,194037,194039,194042,194043,194046,194048); +INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES +(187559,11581), +(187947,11764), +(187948,11765), +(187949,11766), +(187950,11767), +(187951,11768), +(187952,11769), +(187953,11770), +(187954,11771), +(187955,11772), +(187956,11773), +(187957,11774), +(187958,11775), +(187959,11776), +(187960,11777), +(187961,11778), +(187962,11779), +(187963,11780), +(187964,11781), +(187965,11782), +(187966,11783), +(187967,11784), +(187968,11785), +(187969,11786), +(187970,11787), +(187971,11799), +(187972,11800), +(187973,11801), +(187974,11802), +(187975,11803), +(194033,13441), +(194034,13450), +(194037,13451), +(194039,13453), +(194042,13454), +(194043,13455), +(194046,13457), +(194048,13458); -- cgit v1.2.3 From 9da9de733e76a4e2eebf6e8c28a4ccca20bda5f6 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 24 Jun 2012 22:48:33 -0230 Subject: DB/Gameobject: Add Mid Summer Festival Go Spawns to Burning Steppes --- .../world/2012_06_24_02_world_gameobject.sql | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 sql/updates/world/2012_06_24_02_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_24_02_world_gameobject.sql b/sql/updates/world/2012_06_24_02_world_gameobject.sql new file mode 100644 index 00000000000..55d2b73444c --- /dev/null +++ b/sql/updates/world/2012_06_24_02_world_gameobject.sql @@ -0,0 +1,30 @@ +-- Burning Steppes Mid Summer Festival Go Spawns +SET @OGUID := 17820; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+19; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@OGUID+0,181302,0,1,1,-8265.07,-2627.144,135.0536,1.989672,0,0,0,1,120,255,1), +(@OGUID+1,181302,0,1,1,-8263.305,-2627.122,134.5683,2.949595,0,0,0,1,120,255,1), +(@OGUID+2,181305,0,1,1,-8258.544,-2624.803,133.4996,5.98648,0,0,0,1,120,255,1), +(@OGUID+3,181306,0,1,1,-8262.327,-2628.302,134.2665,2.007128,0,0,0,1,120,255,1), +(@OGUID+4,181307,0,1,1,-8257.901,-2625.303,134.469,1.658062,0,0,0,1,120,255,1), +(@OGUID+5,181355,0,1,1,-8260.892,-2601.407,133.1487,0.8552105,0,0,0,1,120,255,1), +(@OGUID+6,181355,0,1,1,-8262.448,-2606.505,133.4136,0.2443456,0,0,0,1,120,255,1), +(@OGUID+7,181355,0,1,1,-8245.146,-2606.867,133.1535,0.8552105,0,0,0,1,120,255,1), +(@OGUID+8,181355,0,1,1,-8264.143,-2611.291,133.4626,5.201083,0,0,0,1,120,255,1), +(@OGUID+9,181355,0,1,1,-8246.274,-2611.94,133.1546,4.66003,0,0,0,1,120,255,1), +(@OGUID+10,181355,0,1,1,-8247.434,-2616.645,133.1546,5.846854,0,0,0,1,120,255,1), +(@OGUID+11,181355,0,1,1,-8267.189,-2635.668,134.4242,0.1745321,0,0,0,1,120,255,1), +(@OGUID+12,181355,0,1,1,-8252.989,-2636.582,133.1547,3.211419,0,0,0,1,120,255,1), +(@OGUID+13,181605,0,1,1,-8261.666,-2638.048,133.3969,5.777041,0,0,0,1,120,255,1), +(@OGUID+14,187922,0,1,1,-8249.528,-2625.985,133.1546,1.727875,0,0,0,1,120,255,1), +(@OGUID+15,188020,0,1,1,-8267.534,-2642.816,133.9444,4.555311,0,0,0,1,120,255,1), +(@OGUID+16,188020,0,1,1,-8256.433,-2643.724,133.1869,4.468043,0,0,0,1,120,255,1), +(@OGUID+17,188020,0,1,1,-8258.073,-2601.522,133.1487,1.274088,0,0,0,1,120,255,1), +(@OGUID+18,188020,0,1,1,-8247.378,-2604.626,133.15,1.326448,0,0,0,1,120,255,1), +(@OGUID+19,188021,0,1,1,-8261.987,-2623.612,133.4952,1.361356,0,0,0,1,120,255,1); +DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+19; +INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES +(1,@OGUID+0),(1,@OGUID+1),(1,@OGUID+2),(1,@OGUID+3),(1,@OGUID+4), +(1,@OGUID+5),(1,@OGUID+6),(1,@OGUID+7),(1,@OGUID+8),(1,@OGUID+9), +(1,@OGUID+10),(1,@OGUID+11),(1,@OGUID+12),(1,@OGUID+13),(1,@OGUID+14), +(1,@OGUID+15),(1,@OGUID+16),(1,@OGUID+17),(1,@OGUID+18),(1,@OGUID+19); -- cgit v1.2.3 From e25072567ad07446a0eb13b0691ee0bfc4377d64 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 24 Jun 2012 23:05:49 -0230 Subject: DB/Gameobject: Chillwind Camp Mid Summer Festival Go Spawns --- .../world/2012_06_24_03_world_gameobject.sql | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 sql/updates/world/2012_06_24_03_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_24_03_world_gameobject.sql b/sql/updates/world/2012_06_24_03_world_gameobject.sql new file mode 100644 index 00000000000..16d0330d1d0 --- /dev/null +++ b/sql/updates/world/2012_06_24_03_world_gameobject.sql @@ -0,0 +1,28 @@ +-- Chillwind Camp Mid Summer Festival Go Spawns +SET @OGUID := 17845; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+17; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@OGUID+0,181300,0,1,1,945.1077,-1435.984,62.91423,5.288348,0,0,0,1,120,255,1), +(@OGUID+1,181302,0,1,1,1004.427,-1443.667,62.28303,2.949595,0,0,0,1,120,255,1), +(@OGUID+2,181302,0,1,1,1004.097,-1446.269,61.98349,1.989672,0,0,0,1,120,255,1), +(@OGUID+3,181305,0,1,1,1009.866,-1446.948,62.31522,3.490667,0,0,0,1,120,255,1), +(@OGUID+4,181306,0,1,1,1002.772,-1445.215,62.09951,2.007128,0,0,0,1,120,255,1), +(@OGUID+5,181307,0,1,1,1009.089,-1446.896,63.24824,1.658062,0,0,0,1,120,255,1), +(@OGUID+6,181355,0,1,1,995.8973,-1439.065,63.6682,0.8552105,0,0,0,1,120,255,1), +(@OGUID+7,181355,0,1,1,1010.988,-1450.932,62.06363,4.66003,0,0,0,1,120,255,1), +(@OGUID+8,181355,0,1,1,988.3309,-1455.517,60.69862,5.846854,0,0,0,1,120,255,1), +(@OGUID+9,181355,0,1,1,934.7761,-1439.972,63.46706,2.251473,0,0,0,1,120,255,1), +(@OGUID+10,181605,0,1,1,1002.282,-1432.47,64.05733,5.777041,0,0,0,1,120,255,1), +(@OGUID+11,187576,0,1,1,973.3299,-1430.872,67.15336,3.141593,0,0,0,1,120,255,1), +(@OGUID+12,187939,0,1,1,999.0452,-1453.844,60.73637,3.68265,0,0,0,1,120,255,1), +(@OGUID+13,188020,0,1,1,1011.989,-1434.024,63.98868,6.230826,0,0,0,1,120,255,1), +(@OGUID+14,188020,0,1,1,1017.408,-1450.234,62.41806,5.166176,0,0,0,1,120,255,1), +(@OGUID+15,188020,0,1,1,987.117,-1451.32,61.76295,3.717554,0,0,0,1,120,255,1), +(@OGUID+16,188020,0,1,1,990.5877,-1460.205,60.6304,3.595379,0,0,0,1,120,255,1), +(@OGUID+17,188021,0,1,1,1006.964,-1448.083,62.19069,5.148723,0,0,0,1,120,255,1); +DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+19; +INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES +(1,@OGUID+0),(1,@OGUID+1),(1,@OGUID+2),(1,@OGUID+3),(1,@OGUID+4), +(1,@OGUID+5),(1,@OGUID+6),(1,@OGUID+7),(1,@OGUID+8),(1,@OGUID+9), +(1,@OGUID+10),(1,@OGUID+11),(1,@OGUID+12),(1,@OGUID+13),(1,@OGUID+14), +(1,@OGUID+15),(1,@OGUID+16),(1,@OGUID+17); -- cgit v1.2.3 From da6904a324d9c3aba3d4b620052d8fd1ce43bc90 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 25 Jun 2012 00:03:41 -0230 Subject: DB/Gameobject: The Forgotten Coast Alliance Mid Summer Festival Go Spawns --- .../world/2012_06_24_02_world_gameobject.sql | 2 +- .../world/2012_06_24_03_world_gameobject.sql | 2 +- .../world/2012_06_24_04_world_gameobject.sql | 30 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 sql/updates/world/2012_06_24_04_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_24_02_world_gameobject.sql b/sql/updates/world/2012_06_24_02_world_gameobject.sql index 55d2b73444c..4894365462e 100644 --- a/sql/updates/world/2012_06_24_02_world_gameobject.sql +++ b/sql/updates/world/2012_06_24_02_world_gameobject.sql @@ -1,7 +1,7 @@ -- Burning Steppes Mid Summer Festival Go Spawns SET @OGUID := 17820; DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+19; -INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES (@OGUID+0,181302,0,1,1,-8265.07,-2627.144,135.0536,1.989672,0,0,0,1,120,255,1), (@OGUID+1,181302,0,1,1,-8263.305,-2627.122,134.5683,2.949595,0,0,0,1,120,255,1), (@OGUID+2,181305,0,1,1,-8258.544,-2624.803,133.4996,5.98648,0,0,0,1,120,255,1), diff --git a/sql/updates/world/2012_06_24_03_world_gameobject.sql b/sql/updates/world/2012_06_24_03_world_gameobject.sql index 16d0330d1d0..b98ef4b6dbe 100644 --- a/sql/updates/world/2012_06_24_03_world_gameobject.sql +++ b/sql/updates/world/2012_06_24_03_world_gameobject.sql @@ -1,7 +1,7 @@ -- Chillwind Camp Mid Summer Festival Go Spawns SET @OGUID := 17845; DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+17; -INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES (@OGUID+0,181300,0,1,1,945.1077,-1435.984,62.91423,5.288348,0,0,0,1,120,255,1), (@OGUID+1,181302,0,1,1,1004.427,-1443.667,62.28303,2.949595,0,0,0,1,120,255,1), (@OGUID+2,181302,0,1,1,1004.097,-1446.269,61.98349,1.989672,0,0,0,1,120,255,1), diff --git a/sql/updates/world/2012_06_24_04_world_gameobject.sql b/sql/updates/world/2012_06_24_04_world_gameobject.sql new file mode 100644 index 00000000000..2fa34ee18c3 --- /dev/null +++ b/sql/updates/world/2012_06_24_04_world_gameobject.sql @@ -0,0 +1,30 @@ +-- The Forgotten Coast Alliance Mid Summer Festival Go Spawns +SET @OGUID := 21003; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+19; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@OGUID+0,188021,1,1,1,-4398.083,2187.373,12.25118,6.03884,0,0,0,1,120,255,1), +(@OGUID+1,181302,1,1,1,-4396.901,2188.478,12.71206,2.949595,0,0,0,1,120,255,1), +(@OGUID+2,181302,1,1,1,-4392.186,2182.861,12.36883,4.694937,0,0,0,1,120,255,1), +(@OGUID+3,181305,1,1,1,-4396.205,2185.561,12.88021,2.268925,0,0,0,1,120,255,1), +(@OGUID+4,181306,1,1,1,-4396.394,2190.134,12.45671,2.007128,0,0,0,1,120,255,1), +(@OGUID+5,181307,1,1,1,-4397.196,2185.575,13.85373,1.658062,0,0,0,1,120,255,1), +(@OGUID+6,181388,1,1,1,-4273.38,2246.32,10.7598,5.637414,0,0,0,1,120,255,1), +(@OGUID+7,181355,1,1,1,-4399.59,2167.158,11.20139,5.201083,0,0,0,1,120,255,1), +(@OGUID+8,181355,1,1,1,-4405.212,2185.207,12.17883,0.8552105,0,0,0,1,120,255,1), +(@OGUID+9,181355,1,1,1,-4402.662,2193.127,11.89757,5.846854,0,0,0,1,120,255,1), +(@OGUID+10,181355,1,1,1,-4387.453,2180.198,11.91319,4.66003,0,0,0,1,120,255,1), +(@OGUID+11,181355,1,1,1,-4385.776,2188.759,11.18229,0.8552105,0,0,0,1,120,255,1), +(@OGUID+12,181355,1,1,1,-4388.712,2208.042,10.41075,1.186823,0,0,0,1,120,255,1), +(@OGUID+13,181355,1,1,1,-4289.17,2237.73,9.40999,1.675514,0,0,0,1,120,255,1), +(@OGUID+14,181605,1,1,1,-4399.495,2171.792,11.82118,5.777041,0,0,0,1,120,255,1), +(@OGUID+15,187929,1,1,1,-4392.564,2198.469,10.85703,2.460913,0,0,0,1,120,255,1), +(@OGUID+16,188020,1,1,1,-4408.799,2171.87,12.71528,2.82743,0,0,0,1,120,255,1), +(@OGUID+17,188020,1,1,1,-4392.096,2168.01,13.40625,6.0912,0,0,0,1,120,255,1), +(@OGUID+18,188020,1,1,1,-4396.503,2207.885,9.430555,2.775069,0,0,0,1,120,255,1), +(@OGUID+19,188020,1,1,1,-4382.582,2200.814,9.956597,5.829401,0,0,0,1,120,255,1); +DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+19; +INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES +(1,@OGUID+0),(1,@OGUID+1),(1,@OGUID+2),(1,@OGUID+3),(1,@OGUID+4), +(1,@OGUID+5),(1,@OGUID+6),(1,@OGUID+7),(1,@OGUID+8),(1,@OGUID+9), +(1,@OGUID+10),(1,@OGUID+11),(1,@OGUID+12),(1,@OGUID+13),(1,@OGUID+14), +(1,@OGUID+15),(1,@OGUID+16),(1,@OGUID+17),(1,@OGUID+18),(1,@OGUID+19); -- cgit v1.2.3 From 1f0ecf2c3e7e153d53c65974327425a7a26eb25f Mon Sep 17 00:00:00 2001 From: Kandera Date: Mon, 25 Jun 2012 12:15:42 -0400 Subject: DB/Spells: fix death strike double procing the heal effect. according to sniffs this should only be done for the main hand. --- sql/updates/world/2012_06_25_00_world_spell_script_names.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_06_25_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_25_00_world_spell_script_names.sql b/sql/updates/world/2012_06_25_00_world_spell_script_names.sql new file mode 100644 index 00000000000..51f3e19f5bc --- /dev/null +++ b/sql/updates/world/2012_06_25_00_world_spell_script_names.sql @@ -0,0 +1 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = -66188; -- cgit v1.2.3 From 4a85def47ebd938eb5f71680692852af49c72cb5 Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Tue, 26 Jun 2012 00:45:07 +0300 Subject: DB/SAI: Fix Quest 12828 (Ample Inspiration). --- sql/updates/world/2012_06_26_00_world_sai.sql | 50 ++++++++++++++++++++++++ src/server/scripts/Spells/spell_item.cpp | 55 --------------------------- 2 files changed, 50 insertions(+), 55 deletions(-) create mode 100644 sql/updates/world/2012_06_26_00_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_26_00_world_sai.sql b/sql/updates/world/2012_06_26_00_world_sai.sql new file mode 100644 index 00000000000..c6fe75be1e5 --- /dev/null +++ b/sql/updates/world/2012_06_26_00_world_sai.sql @@ -0,0 +1,50 @@ +-- Ample Inspiration (12828) + +SET @GOB_UDED := 191553; -- U.D.E.D. Dispenser +SET @GOSSIP_MENU := 10211; +SET @NPC_MAMMOTH := 29402; -- Ironwool Mammoth +SET @NPC_MEAT_BUNNY := 29524; -- Mammoth Meat Bunny +SET @SPELL_THROW_UDED := 54577; -- Throw U.D.E.D. +SET @SPELL_GIVE_UDED := 54576; -- Forceitem U.D.E.D. +SET @SPELL_SPAWNER := 54581; -- Mammoth Explosion Spell Spawner +SET @SPELL_MAIN_MEAT := 57444; -- Summon Main Mammoth Meat +SET @SPELL_MEAT := 54625; -- Summon Mammoth Meat +SET @SPELL_MEAT_BUNNY1 := 54627; -- Quest - Mammoth Explosion Summon Object +SET @SPELL_MEAT_BUNNY2 := 54628; -- Quest - Mammoth Explosion Summon Object +SET @SPELL_MEAT_BUNNY3 := 54623; -- Quest - Mammoth Explosion Summon Object + +DELETE FROM `spell_script_names` WHERE `spell_id`=@SPELL_THROW_UDED; + +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP_MENU; +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 +(@GOSSIP_MENU,0,0,'',1,0,0,0,0,0,NULL); + +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@GOB_UDED; +DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid`=@GOB_UDED; +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 +(@GOB_UDED,1,0,1,62,0,100,0,@GOSSIP_MENU,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'On gossip - Close gossip'), +(@GOB_UDED,1,1,0,61,0,100,0,0,0,0,0,85,@SPELL_GIVE_UDED,0,0,0,0,0,7,0,0,0,0,0,0,0,'On link - Cast Forceitem U.D.E.D.'); + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@NPC_MAMMOTH; +UPDATE `creature_template` SET `flags_extra`=128,`AIName`='SmartAI' WHERE `entry`=@NPC_MEAT_BUNNY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@NPC_MAMMOTH; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@NPC_MAMMOTH,@NPC_MEAT_BUNNY); +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 +-- Ironwool Mammoth +(@NPC_MAMMOTH,0,0,0,0,0,100,0,1000,3000,7000,10000,11,56356,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Ironwool Coat'), +(@NPC_MAMMOTH,0,1,2,8,0,100,0,@SPELL_THROW_UDED,0,0,0,11,@SPELL_SPAWNER,0,0,0,0,0,1,0,0,0,0,0,0,0,'On spellhit - Cast Mammoth Explosion Spell Spawner'), +(@NPC_MAMMOTH,0,2,0,61,0,100,0,0,0,0,0,41,500,0,0,0,0,0,1,0,0,0,0,0,0,0,'On link - Despawn'), +-- Mammoth Meat Bunny +(@NPC_MEAT_BUNNY,0,0,0,54,0,100,1,0,0,0,0,11,@SPELL_MEAT,0,0,0,0,0,1,0,0,0,0,0,0,0,'On spawn - Cast'); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=@SPELL_SPAWNER; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +(@SPELL_SPAWNER,@SPELL_MAIN_MEAT,0,'Mammoth Explosion Spell Spawner link to Summon Main Mammoth Meat'), +(@SPELL_SPAWNER,@SPELL_MEAT_BUNNY1,0,'Mammoth Explosion Spell Spawner link to Quest - Mammoth Explosion Summon Object'), +(@SPELL_SPAWNER,@SPELL_MEAT_BUNNY2,0,'Mammoth Explosion Spell Spawner link to Quest - Mammoth Explosion Summon Object'), +(@SPELL_SPAWNER,@SPELL_MEAT_BUNNY3,0,'Mammoth Explosion Spell Spawner link to Quest - Mammoth Explosion Summon Object'); + +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=17 AND `SourceEntry`=@SPELL_THROW_UDED) OR (`SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP_MENU); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,@SPELL_THROW_UDED,0,0,31,1,3,@NPC_MAMMOTH,0,0,0,'','Require Ironwool Mammoth as target'), +(15,@GOSSIP_MENU,0,0,0,9,0,12828,0,0,0,0,'','Show gossip if quest taken'); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 4e2eb633662..3c89cb7005a 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1848,60 +1848,6 @@ class spell_item_unusual_compass : public SpellScriptLoader } }; -enum UDED -{ - NPC_IRONWOOL_MAMMOTH = 53806, - SPELL_MAMMOTH_CARCASS = 57444, - SPELL_MAMMOTH_MEAT = 54625, -}; - -class spell_item_uded : public SpellScriptLoader -{ - public: - spell_item_uded() : SpellScriptLoader("spell_item_uded") { } - - class spell_item_uded_SpellScript : public SpellScript - { - PrepareSpellScript(spell_item_uded_SpellScript); - - bool Load() - { - if (GetHitCreature() && GetHitCreature()->GetEntry() == NPC_IRONWOOL_MAMMOTH) - return true; - return false; - } - - bool Validate(SpellInfo const* /*spell*/) - { - if (!sSpellMgr->GetSpellInfo(SPELL_MAMMOTH_CARCASS) || !sSpellMgr->GetSpellInfo(SPELL_MAMMOTH_MEAT)) - return false; - return true; - } - - void HandleDummy(SpellEffIndex /* effIndex */) - { - Unit* caster = GetCaster(); - Creature* creature = GetHitCreature(); - caster->CastSpell(caster,SPELL_MAMMOTH_CARCASS,true); - - for (uint8 i = 0; i < 4; ++i) - caster->CastSpell(caster,SPELL_MAMMOTH_MEAT,true); - - creature->Kill(creature); - } - - void Register() - { - OnEffectHitTarget += SpellEffectFn(spell_item_uded_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - } - }; - - SpellScript* GetSpellScript() const - { - return new spell_item_uded_SpellScript(); - } -}; - enum ChickenCover { SPELL_CHICKEN_NET = 51959, @@ -2109,7 +2055,6 @@ void AddSC_item_spell_scripts() new spell_item_rocket_boots(); new spell_item_pygmy_oil(); new spell_item_unusual_compass(); - new spell_item_uded(); new spell_item_chicken_cover(); new spell_item_muisek_vessel(); new spell_item_greatmothers_soulcatcher(); -- cgit v1.2.3 From d6db97f4f1cf2e127fa9994a00b4b05dde339509 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 25 Jun 2012 20:08:07 -0230 Subject: DB/SQL: Filename fix and some comments updated. --- .../world/2012_06_12_00_world_transport.sql | 24 +-- sql/updates/world/2012_06_24_00_world_quest.sql | 167 --------------------- sql/updates/world/2012_06_24_01_world_quest.sql | 167 +++++++++++++++++++++ 3 files changed, 179 insertions(+), 179 deletions(-) delete mode 100644 sql/updates/world/2012_06_24_00_world_quest.sql create mode 100644 sql/updates/world/2012_06_24_01_world_quest.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_12_00_world_transport.sql b/sql/updates/world/2012_06_12_00_world_transport.sql index 3099292f48d..d3a35c254d9 100644 --- a/sql/updates/world/2012_06_12_00_world_transport.sql +++ b/sql/updates/world/2012_06_12_00_world_transport.sql @@ -45,19 +45,19 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type (@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,5,5,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut emote'), (@ENTRY*100,9,4,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'), -- Script 1 -(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut Say 1'), -(@ENTRY*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh Say 0'), -(@ENTRY*100+1,9,2,0,0,0,100,0,4000,4000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'), +(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Leave Orgrimmar - Sky-Captain Blastnut Say 1'), +(@ENTRY*100+1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Leave Orgrimmar - Chief Officer Ograh Say 0'), +(@ENTRY*100+1,9,2,0,0,0,100,0,4000,4000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Leave Orgrimmar - Chief Officer Ograh emote'), -- Script 2 -(@ENTRY*100+2,9,0,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut Say 2'), -(@ENTRY*100+2,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh Say 1'), -(@ENTRY*100+2,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34766,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Krendle Bigpockets Say 0'), -(@ENTRY*100+2,9,3,0,0,0,100,0,3000,3000,0,0,5,5,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut emote'), -(@ENTRY*100+2,9,4,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'), +(@ENTRY*100+2,9,0,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Thunder Bluff - Sky-Captain Blastnut Say 2'), +(@ENTRY*100+2,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Thunder Bluff - Chief Officer Ograh Say 1'), +(@ENTRY*100+2,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,19,34766,100,0,0,0,0,0,'Zeppelin: - Script Dock Thunder Bluff - Krendle Bigpockets Say 0'), +(@ENTRY*100+2,9,3,0,0,0,100,0,3000,3000,0,0,5,5,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Thunder Bluff - Sky-Captain Blastnut emote'), +(@ENTRY*100+2,9,4,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Thunder Bluff - Chief Officer Ograh emote'), -- Script 3 -(@ENTRY*100+3,9,0,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Sky-Captain Blastnut Say 3'), -(@ENTRY*100+3,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh Say 2'), -(@ENTRY*100+3,9,2,0,0,0,100,0,4000,4000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Dock Orgrimmar - Chief Officer Ograh emote'); +(@ENTRY*100+3,9,0,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,19,34715,100,0,0,0,0,0,'Zeppelin: - Script Leave Thunder Bluff - Sky-Captain Blastnut Say 3'), +(@ENTRY*100+3,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Leave Thunder Bluff - Chief Officer Ograh Say 2'), +(@ENTRY*100+3,9,2,0,0,0,100,0,4000,4000,0,0,5,25,0,0,0,0,0,19,34721,100,0,0,0,0,0,'Zeppelin: - Script Leave Thunder Bluff - Chief Officer Ograh emote'); -- Watcher Tolwe SAI SET @ENTRY := 34723; UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY; @@ -76,7 +76,7 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr (34715,2,0,'Watch your step! Don''t want you becoming a smudge down there. Welcome to Thunder Bluff!',12,1,100,1,0,0,'Sky-Captain Blastnut - Dock at Thunder Bluff'), -- wait 3 sec do emote 5 (34715,3,0,'Okay, boys, let''s get this baby over to Orgrimmar!',12,1,100,25,0,0,'Sky-Captain Blastnut - Leave for Orgrimmar'), (34721,0,0,'Move it, Zippik! We don''t have all day!',12,1,100,5,0,0,'Chief Officer Ograh - Leave for Thunder Bluff'), -(34721,1,0,'Careful. CAREFUL! Did I feel a shudder? You''re going to knock that tower down, oaf!',12,1,100,5,0,0,'Chief Officer Ograh - Dock at Thunder Bluff'), -- wait 4 sec do emote 25 +(34721,1,0,'Careful. CAREFUL! Did I feel a shudder? You''re going to knock that tower down, oaf!',12,1,100,5,0,0,'Chief Officer Ograh - Dock at Orgrimmar & Thunder Bluff'), (34721,2,0,'We''re behind schedule! Turn this tub east! EAST!',12,1,100,5,0,0,'Chief Officer Ograh - Leave for Orgrimmar'), (34766,0,0,'Step right up! The zeppelin to Orgrimmar has arrived! All aboard to Durotar!',14,0,100,22,0,11804,'Krendle Bigpockets - Dock at Thunder Bluff'), (34765,0,0,'The zeppelin to Thunder Bluff has arrived! All aboard for a smooth ride across the Barrens!',14,0,100,22,0,11804,'Zelli Hotnozzle - Dock at Orgrimmar'); diff --git a/sql/updates/world/2012_06_24_00_world_quest.sql b/sql/updates/world/2012_06_24_00_world_quest.sql deleted file mode 100644 index ec0d39b0c62..00000000000 --- a/sql/updates/world/2012_06_24_00_world_quest.sql +++ /dev/null @@ -1,167 +0,0 @@ -DELETE FROM `gameobject_questrelation` WHERE `id` IN (187564,187914,187916,187917,187919,187920,187921,187922,187923,187924,187925,187926,187927,187928,187929,187930,187931,187931,187932,187933,187934,187935,187936,187937,187938,187939,187940,187941,187942,187943,187944,187945,187946,194032,194035,194036,194038,194040,194044,194045,194049); -INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES -(187564,11580), -(187914,11732), -(187916,11734), -(187917,11735), -(187919,11736), -(187920,11737), -(187921,11738), -(187922,11739), -(187923,11740), -(187924,11741), -(187925,11742), -(187926,11743), -(187927,11744), -(187928,11745), -(187929,11746), -(187930,11747), -(187931,11748), -(187932,11749), -(187933,11750), -(187934,11751), -(187935,11752), -(187936,11753), -(187937,11754), -(187938,11755), -(187939,11756), -(187940,11757), -(187941,11758), -(187942,11759), -(187943,11760), -(187944,11761), -(187945,11762), -(187946,11763), -(194032,13440), -(194035,13442), -(194036,13443), -(194038,13444), -(194040,13445), -(194044,13446), -(194045,13447), -(194049,13449); - -DELETE FROM `gameobject_involvedrelation` WHERE `id` IN (187564,187914,187916,187917,187919,187920,187921,187922,187923,187924,187925,187926,187927,187928,187929,187930,187931,187931,187932,187933,187934,187935,187936,187937,187938,187939,187940,187941,187942,187943,187944,187945,187946,194032,194035,194036,194038,194040,194044,194045,194049); -INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES -(187564,11580), -(187914,11732), -(187916,11734), -(187917,11735), -(187919,11736), -(187920,11737), -(187921,11738), -(187922,11739), -(187923,11740), -(187924,11741), -(187925,11742), -(187926,11743), -(187927,11744), -(187928,11745), -(187929,11746), -(187930,11747), -(187931,11748), -(187932,11749), -(187933,11750), -(187934,11751), -(187935,11752), -(187936,11753), -(187937,11754), -(187938,11755), -(187939,11756), -(187940,11757), -(187941,11758), -(187942,11759), -(187943,11760), -(187944,11761), -(187945,11762), -(187946,11763), -(194032,13440), -(194035,13442), -(194036,13443), -(194038,13444), -(194040,13445), -(194044,13446), -(194045,13447), -(194049,13449); - -DELETE FROM `gameobject_questrelation` WHERE `id` IN (187559,187947,187948,187949,187950,187951,187952,187953,187954,187955,187956,187957,187958,187959,187960,187961,187962,187963,187964,187965,187966,187967,187968,187969,187970,187971,187972,187973,187974,187975,194033,194034,194037,194039,194042,194043,194046,194048); -INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES -(187559,11581), -(187947,11764), -(187948,11765), -(187949,11766), -(187950,11767), -(187951,11768), -(187952,11769), -(187953,11770), -(187954,11771), -(187955,11772), -(187956,11773), -(187957,11774), -(187958,11775), -(187959,11776), -(187960,11777), -(187961,11778), -(187962,11779), -(187963,11780), -(187964,11781), -(187965,11782), -(187966,11783), -(187967,11784), -(187968,11785), -(187969,11786), -(187970,11787), -(187971,11799), -(187972,11800), -(187973,11801), -(187974,11802), -(187975,11803), -(194033,13441), -(194034,13450), -(194037,13451), -(194039,13453), -(194042,13454), -(194043,13455), -(194046,13457), -(194048,13458); - -DELETE FROM `gameobject_involvedrelation` WHERE `id` IN (187559,187947,187948,187949,187950,187951,187952,187953,187954,187955,187956,187957,187958,187959,187960,187961,187962,187963,187964,187965,187966,187967,187968,187969,187970,187971,187972,187973,187974,187975,194033,194034,194037,194039,194042,194043,194046,194048); -INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES -(187559,11581), -(187947,11764), -(187948,11765), -(187949,11766), -(187950,11767), -(187951,11768), -(187952,11769), -(187953,11770), -(187954,11771), -(187955,11772), -(187956,11773), -(187957,11774), -(187958,11775), -(187959,11776), -(187960,11777), -(187961,11778), -(187962,11779), -(187963,11780), -(187964,11781), -(187965,11782), -(187966,11783), -(187967,11784), -(187968,11785), -(187969,11786), -(187970,11787), -(187971,11799), -(187972,11800), -(187973,11801), -(187974,11802), -(187975,11803), -(194033,13441), -(194034,13450), -(194037,13451), -(194039,13453), -(194042,13454), -(194043,13455), -(194046,13457), -(194048,13458); diff --git a/sql/updates/world/2012_06_24_01_world_quest.sql b/sql/updates/world/2012_06_24_01_world_quest.sql new file mode 100644 index 00000000000..ec0d39b0c62 --- /dev/null +++ b/sql/updates/world/2012_06_24_01_world_quest.sql @@ -0,0 +1,167 @@ +DELETE FROM `gameobject_questrelation` WHERE `id` IN (187564,187914,187916,187917,187919,187920,187921,187922,187923,187924,187925,187926,187927,187928,187929,187930,187931,187931,187932,187933,187934,187935,187936,187937,187938,187939,187940,187941,187942,187943,187944,187945,187946,194032,194035,194036,194038,194040,194044,194045,194049); +INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES +(187564,11580), +(187914,11732), +(187916,11734), +(187917,11735), +(187919,11736), +(187920,11737), +(187921,11738), +(187922,11739), +(187923,11740), +(187924,11741), +(187925,11742), +(187926,11743), +(187927,11744), +(187928,11745), +(187929,11746), +(187930,11747), +(187931,11748), +(187932,11749), +(187933,11750), +(187934,11751), +(187935,11752), +(187936,11753), +(187937,11754), +(187938,11755), +(187939,11756), +(187940,11757), +(187941,11758), +(187942,11759), +(187943,11760), +(187944,11761), +(187945,11762), +(187946,11763), +(194032,13440), +(194035,13442), +(194036,13443), +(194038,13444), +(194040,13445), +(194044,13446), +(194045,13447), +(194049,13449); + +DELETE FROM `gameobject_involvedrelation` WHERE `id` IN (187564,187914,187916,187917,187919,187920,187921,187922,187923,187924,187925,187926,187927,187928,187929,187930,187931,187931,187932,187933,187934,187935,187936,187937,187938,187939,187940,187941,187942,187943,187944,187945,187946,194032,194035,194036,194038,194040,194044,194045,194049); +INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES +(187564,11580), +(187914,11732), +(187916,11734), +(187917,11735), +(187919,11736), +(187920,11737), +(187921,11738), +(187922,11739), +(187923,11740), +(187924,11741), +(187925,11742), +(187926,11743), +(187927,11744), +(187928,11745), +(187929,11746), +(187930,11747), +(187931,11748), +(187932,11749), +(187933,11750), +(187934,11751), +(187935,11752), +(187936,11753), +(187937,11754), +(187938,11755), +(187939,11756), +(187940,11757), +(187941,11758), +(187942,11759), +(187943,11760), +(187944,11761), +(187945,11762), +(187946,11763), +(194032,13440), +(194035,13442), +(194036,13443), +(194038,13444), +(194040,13445), +(194044,13446), +(194045,13447), +(194049,13449); + +DELETE FROM `gameobject_questrelation` WHERE `id` IN (187559,187947,187948,187949,187950,187951,187952,187953,187954,187955,187956,187957,187958,187959,187960,187961,187962,187963,187964,187965,187966,187967,187968,187969,187970,187971,187972,187973,187974,187975,194033,194034,194037,194039,194042,194043,194046,194048); +INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES +(187559,11581), +(187947,11764), +(187948,11765), +(187949,11766), +(187950,11767), +(187951,11768), +(187952,11769), +(187953,11770), +(187954,11771), +(187955,11772), +(187956,11773), +(187957,11774), +(187958,11775), +(187959,11776), +(187960,11777), +(187961,11778), +(187962,11779), +(187963,11780), +(187964,11781), +(187965,11782), +(187966,11783), +(187967,11784), +(187968,11785), +(187969,11786), +(187970,11787), +(187971,11799), +(187972,11800), +(187973,11801), +(187974,11802), +(187975,11803), +(194033,13441), +(194034,13450), +(194037,13451), +(194039,13453), +(194042,13454), +(194043,13455), +(194046,13457), +(194048,13458); + +DELETE FROM `gameobject_involvedrelation` WHERE `id` IN (187559,187947,187948,187949,187950,187951,187952,187953,187954,187955,187956,187957,187958,187959,187960,187961,187962,187963,187964,187965,187966,187967,187968,187969,187970,187971,187972,187973,187974,187975,194033,194034,194037,194039,194042,194043,194046,194048); +INSERT INTO `gameobject_involvedrelation` (`id`,`quest`) VALUES +(187559,11581), +(187947,11764), +(187948,11765), +(187949,11766), +(187950,11767), +(187951,11768), +(187952,11769), +(187953,11770), +(187954,11771), +(187955,11772), +(187956,11773), +(187957,11774), +(187958,11775), +(187959,11776), +(187960,11777), +(187961,11778), +(187962,11779), +(187963,11780), +(187964,11781), +(187965,11782), +(187966,11783), +(187967,11784), +(187968,11785), +(187969,11786), +(187970,11787), +(187971,11799), +(187972,11800), +(187973,11801), +(187974,11802), +(187975,11803), +(194033,13441), +(194034,13450), +(194037,13451), +(194039,13453), +(194042,13454), +(194043,13455), +(194046,13457), +(194048,13458); -- cgit v1.2.3 From 12b46945dbf2866a9f6df600348ba3247c9bd0d9 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 26 Jun 2012 01:19:23 +0200 Subject: Scripts/Icecrown Citadel: Added floating souls visual in The Spire after teleport to The Lich King becomes available (killing 11/12 bosses) --- sql/updates/world/2012_06_26_01_world_creature.sql | 61 ++++++++++++++++ .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 85 ++++++++++++++++++++++ .../Northrend/IcecrownCitadel/icecrown_citadel.h | 5 ++ .../IcecrownCitadel/instance_icecrown_citadel.cpp | 40 ++++++++++ 4 files changed, 191 insertions(+) create mode 100644 sql/updates/world/2012_06_26_01_world_creature.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_26_01_world_creature.sql b/sql/updates/world/2012_06_26_01_world_creature.sql new file mode 100644 index 00000000000..1f0dfff0b04 --- /dev/null +++ b/sql/updates/world/2012_06_26_01_world_creature.sql @@ -0,0 +1,61 @@ +UPDATE `creature_template` SET `InhabitType`=4,`flags_extra`=128,`unit_flags`=0x2000000,`ScriptName`='npc_arthas_teleport_visual' WHERE `entry`=30298; -- Invisible Stalker (Float, Uninteractible, LargeAOI) + +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_icc_soul_missile'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(72585,'spell_icc_soul_missile'); + +DELETE FROM `creature_template_addon` WHERE `entry`=30298; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES +(30298,0,0x0,0x1,''); -- Invisible Stalker (Float, Uninteractible, LargeAOI) + +SET @CGUID:=88653; +DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+47; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES +(@CGUID+00,30298,631,15,1,4357.052,2769.421,356.1364,3.141593,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+01,30298,631,15,1,4308.511,2788.476,312.6750,3.263766,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+02,30298,631,15,1,4292.898,2793.981,310.8101,1.640610,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+03,30298,631,15,1,4306.854,2752.771,299.1382,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+04,30298,631,15,1,4317.904,2743.047,299.1328,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+05,30298,631,15,1,4319.273,2799.125,299.1442,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+06,30298,631,15,1,4312.229,2735.825,299.1255,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+07,30298,631,15,1,4295.093,2743.372,299.1294,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+08,30298,631,15,1,4342.194,2719.366,312.6750,4.799655,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+09,30298,631,15,1,4284.044,2753.073,299.1465,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+10,30298,631,15,1,4331.980,2730.547,299.1442,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+11,30298,631,15,1,4331.183,2813.701,299.1328,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+12,30298,631,15,1,4292.952,2807.547,299.1372,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+13,30298,631,15,1,4284.188,2735.236,299.1377,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+14,30298,631,15,1,4323.733,2819.085,299.1255,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+15,30298,631,15,1,4308.430,2717.113,299.1333,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+16,30298,631,15,1,4304.886,2822.116,299.1333,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+17,30298,631,15,1,4336.049,2703.986,310.8101,3.176499,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+18,30298,631,15,1,4430.367,2800.603,299.1377,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+19,30298,631,15,1,4432.948,2749.438,307.1431,4.799655,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+20,30298,631,15,1,4340.452,2825.148,299.1382,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+21,30298,631,15,1,4322.498,2704.592,299.1372,0.820304,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+22,30298,631,15,1,4380.124,2816.074,312.6750,6.265732,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+23,30298,631,15,1,4330.582,2836.512,299.1294,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+24,30298,631,15,1,4418.384,2734.435,299.1372,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+25,30298,631,15,1,4429.439,2782.781,299.1465,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+26,30298,631,15,1,4380.205,2727.930,299.1328,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+27,30298,631,15,1,4371.056,2716.414,299.1382,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+28,30298,631,15,1,4399.571,2746.277,312.6750,4.799655,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+29,30298,631,15,1,4382.944,2808.139,299.1442,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+30,30298,631,15,1,4389.698,2694.647,299.1377,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+31,30298,631,15,1,4336.760,2689.307,307.1431,3.176499,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+32,30298,631,15,1,4391.995,2742.610,299.1442,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+33,30298,631,15,1,4322.008,2847.075,299.1377,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+34,30298,631,15,1,4396.241,2794.807,299.1328,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+35,30298,631,15,1,4380.467,2834.892,310.8101,6.265732,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+36,30298,631,15,1,4337.707,2850.425,299.1465,5.567600,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+37,30298,631,15,1,4392.823,2719.806,299.1255,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+38,30298,631,15,1,4406.686,2784.457,299.1382,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+39,30298,631,15,1,4381.028,2705.133,299.1294,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+40,30298,631,15,1,4371.884,2693.614,299.1465,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+41,30298,631,15,1,4405.702,2806.464,299.1255,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+42,30298,631,15,1,4418.314,2747.997,310.8101,4.799655,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+43,30298,631,15,1,4380.639,2849.595,307.1431,6.265732,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+44,30298,631,15,1,4393.958,2833.470,299.1372,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+45,30298,631,15,1,4406.588,2719.758,299.1333,2.443461,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+46,30298,631,15,1,4407.252,2820.139,299.1333,3.909538,7200,0,0), -- Invisible Stalker (Float, Uninteractible, LargeAOI) +(@CGUID+47,30298,631,15,1,4418.995,2793.132,299.1294,3.909538,7200,0,0); -- Invisible Stalker (Float, Uninteractible, LargeAOI) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 6fd3cd2a294..9cfacebf224 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -158,6 +158,9 @@ enum Spells SPELL_FEL_IRON_BOMB_UNDEAD = 71787, SPELL_MACHINE_GUN_UNDEAD = 71788, SPELL_ROCKET_LAUNCH_UNDEAD = 71786, + + // Invisible Stalker (Float, Uninteractible, LargeAOI) + SPELL_SOUL_MISSILE = 72585, }; // Helper defines @@ -248,6 +251,9 @@ enum EventTypes EVENT_RUPERT_FEL_IRON_BOMB = 52, EVENT_RUPERT_MACHINE_GUN = 53, EVENT_RUPERT_ROCKET_LAUNCH = 54, + + // Invisible Stalker (Float, Uninteractible, LargeAOI) + EVENT_SOUL_MISSILE = 55, }; enum DataTypesICC @@ -1668,6 +1674,56 @@ class npc_impaling_spear : public CreatureScript } }; +class npc_arthas_teleport_visual : public CreatureScript +{ + public: + npc_arthas_teleport_visual() : CreatureScript("npc_arthas_teleport_visual") { } + + struct npc_arthas_teleport_visualAI : public NullCreatureAI + { + npc_arthas_teleport_visualAI(Creature* creature) : NullCreatureAI(creature), _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + if (_instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && + _instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE && + _instance->GetBossState(DATA_SINDRAGOSA) == DONE) + _events.ScheduleEvent(EVENT_SOUL_MISSILE, urand(1000, 6000)); + } + + void UpdateAI(uint32 const diff) + { + if (_events.Empty()) + return; + + _events.Update(diff); + + if (_events.ExecuteEvent() == EVENT_SOUL_MISSILE) + { + DoCastAOE(SPELL_SOUL_MISSILE); + _events.ScheduleEvent(EVENT_SOUL_MISSILE, urand(5000, 7000)); + } + } + + private: + InstanceScript* _instance; + EventMap _events; + }; + + CreatureAI* GetAI(Creature* creature) const + { + // Distance from the center of the spire + if (creature->GetExactDist2d(4357.052f, 2769.421f) < 100.0f && creature->GetHomePosition().GetPositionZ() < 315.0f) + return GetIcecrownCitadelAI(creature); + + // Default to no script + return NULL; + } +}; + class spell_icc_stoneform : public SpellScriptLoader { public: @@ -1974,6 +2030,33 @@ class spell_svalna_remove_spear : public SpellScriptLoader } }; +class spell_icc_soul_missile : public SpellScriptLoader +{ + public: + spell_icc_soul_missile() : SpellScriptLoader("spell_icc_soul_missile") { } + + class spell_icc_soul_missile_SpellScript : public SpellScript + { + PrepareSpellScript(spell_icc_soul_missile_SpellScript); + + void RelocateDest() + { + static Position const offset = {0.0f, 0.0f, 200.0f, 0.0f}; + const_cast(GetExplTargetDest())->RelocateOffset(offset); + } + + void Register() + { + OnCast += SpellCastFn(spell_icc_soul_missile_SpellScript::RelocateDest); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_icc_soul_missile_SpellScript(); + } +}; + class at_icc_saurfang_portal : public AreaTriggerScript { public: @@ -2063,6 +2146,7 @@ void AddSC_icecrown_citadel() new npc_captain_rupert(); new npc_frostwing_vrykul(); new npc_impaling_spear(); + new npc_arthas_teleport_visual(); new spell_icc_stoneform(); new spell_icc_sprit_alarm(); new spell_frost_giant_death_plague(); @@ -2070,6 +2154,7 @@ void AddSC_icecrown_citadel() new spell_trigger_spell_from_caster("spell_svalna_caress_of_death", SPELL_IMPALING_SPEAR_KILL); new spell_svalna_revive_champion(); new spell_svalna_remove_spear(); + new spell_icc_soul_missile(); new at_icc_saurfang_portal(); new at_icc_shutdown_traps(); new at_icc_start_blood_quickening(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 224777c3db7..31639a698ef 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -51,6 +51,7 @@ enum SharedSpells SPELL_GREEN_BLIGHT_RESIDUE = 72145, // The Lich King + SPELL_ARTHAS_TELEPORTER_CEREMONY = 72915, SPELL_FROSTMOURNE_TELEPORT_VISUAL = 73078, }; @@ -275,6 +276,9 @@ enum CreaturesIds NPC_WORLD_TRIGGER_INFINITE_AOI = 36171, NPC_SPIRIT_BOMB = 39189, NPC_FROSTMOURNE_TRIGGER = 38584, + + // Generic + NPC_INVISIBLE_STALKER = 30298, }; enum GameObjectsIds @@ -345,6 +349,7 @@ enum GameObjectsIds GO_SIGIL_OF_THE_FROSTWING = 202181, // The Lich King + GO_SCOURGE_TRANSPORTER_LK = 202223, GO_ARTHAS_PLATFORM = 202161, GO_ARTHAS_PRECIPICE = 202078, GO_DOODAD_ICECROWN_THRONEFROSTYWIND01 = 202188, diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 270f56674eb..650f426d29c 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -130,6 +130,7 @@ class instance_icecrown_citadel : public InstanceMapScript SindragosaGUID = 0; SpinestalkerGUID = 0; RimefangGUID = 0; + TheLichKingTeleportGUID = 0; TheLichKingGUID = 0; HighlordTirionFordringGUID = 0; TerenasMenethilGUID = 0; @@ -280,6 +281,11 @@ class instance_icecrown_citadel : public InstanceMapScript case NPC_RIMEFANG: RimefangGUID = creature->GetGUID(); break; + case NPC_INVISIBLE_STALKER: + // Teleporter visual at center + if (creature->GetExactDist2d(4357.052f, 2769.421f) < 10.0f) + creature->CastSpell(creature, SPELL_ARTHAS_TELEPORTER_CEREMONY, false); + break; case NPC_THE_LICH_KING: TheLichKingGUID = creature->GetGUID(); break; @@ -505,6 +511,11 @@ class instance_icecrown_citadel : public InstanceMapScript go->SetLootRecipient(valithria->GetLootRecipient()); go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN); break; + case GO_SCOURGE_TRANSPORTER_LK: + TheLichKingTeleportGUID = go->GetGUID(); + if (GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE && GetBossState(DATA_SINDRAGOSA) == DONE) + go->SetGoState(GO_STATE_ACTIVE); + break; case GO_ARTHAS_PLATFORM: // this enables movement at The Frozen Throne, when printed this value is 0.000000f // however, when represented as integer client will accept only this value @@ -743,6 +754,8 @@ class instance_icecrown_citadel : public InstanceMapScript break; case DATA_PROFESSOR_PUTRICIDE: HandleGameObject(PlagueSigilGUID, state != DONE); + if (state == DONE) + CheckLichKingAvailability(); if (instance->IsHeroic()) { if (state == FAIL && HeroicAttempts) @@ -757,6 +770,8 @@ class instance_icecrown_citadel : public InstanceMapScript break; case DATA_BLOOD_QUEEN_LANA_THEL: HandleGameObject(BloodwingSigilGUID, state != DONE); + if (state == DONE) + CheckLichKingAvailability(); if (instance->IsHeroic()) { if (state == FAIL && HeroicAttempts) @@ -775,6 +790,8 @@ class instance_icecrown_citadel : public InstanceMapScript break; case DATA_SINDRAGOSA: HandleGameObject(FrostwingSigilGUID, state != DONE); + if (state == DONE) + CheckLichKingAvailability(); if (instance->IsHeroic()) { if (state == FAIL && HeroicAttempts) @@ -1065,6 +1082,28 @@ class instance_icecrown_citadel : public InstanceMapScript return true; } + void CheckLichKingAvailability() + { + if (GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE && GetBossState(DATA_SINDRAGOSA) == DONE) + { + if (GameObject* teleporter = instance->GetGameObject(TheLichKingTeleportGUID)) + { + teleporter->SetGoState(GO_STATE_ACTIVE); + + std::list stalkers; + GetCreatureListWithEntryInGrid(stalkers, teleporter, NPC_INVISIBLE_STALKER, 100.0f); + if (stalkers.empty()) + return; + + stalkers.sort(Trinity::ObjectDistanceOrderPred(teleporter)); + stalkers.front()->CastSpell((Unit*)NULL, SPELL_ARTHAS_TELEPORTER_CEREMONY, false); + stalkers.pop_front(); + for (std::list::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr) + (*itr)->AI()->Reset(); + } + } + } + std::string GetSaveData() { OUT_SAVE_INST_DATA; @@ -1246,6 +1285,7 @@ class instance_icecrown_citadel : public InstanceMapScript uint64 SindragosaGUID; uint64 SpinestalkerGUID; uint64 RimefangGUID; + uint64 TheLichKingTeleportGUID; uint64 TheLichKingGUID; uint64 HighlordTirionFordringGUID; uint64 TerenasMenethilGUID; -- cgit v1.2.3 From 76df7f8281b199f87c181e0d6b0db58cfe58de54 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 25 Jun 2012 21:35:31 -0230 Subject: DB/Gameobject: Add Azuremyst Isle Alliance Mid Summer Festival Go Spawns --- .../world/2012_06_25_01_world_gameobject.sql | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 sql/updates/world/2012_06_25_01_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_25_01_world_gameobject.sql b/sql/updates/world/2012_06_25_01_world_gameobject.sql new file mode 100644 index 00000000000..5cadd915990 --- /dev/null +++ b/sql/updates/world/2012_06_25_01_world_gameobject.sql @@ -0,0 +1,64 @@ +-- Azuremyst Isle Alliance Mid Summer Festival Go Spawns +SET @OGUID := 70509; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+47; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@OGUID+0,181355,530,1,1,-4196.215,-11595.27,-125.4084,1.239183,0,0,0,1,120,255,1), +(@OGUID+1,181355,530,1,1,-4155.241,-11635.47,-98.17558,5.375615,0,0,0,1,120,255,1), +(@OGUID+2,181355,530,1,1,-4200.809,-11604.3,-125.62,0.4712385,0,0,0,1,120,255,1), +(@OGUID+3,181355,530,1,1,-4167.556,-11641.12,-98.394,1.134463,0,0,0,1,120,255,1), +(@OGUID+4,181355,530,1,1,-4229.965,-11608.42,-126.2826,0.8377575,0,0,0,1,120,255,1), +(@OGUID+5,181355,530,1,1,-4207.486,-11645.04,-143.677,0.1047193,0,0,0,1,120,255,1), +(@OGUID+6,181355,530,1,1,-4185.567,-11653.06,-143.4488,5.044002,0,0,0,1,120,255,1), +(@OGUID+7,181355,530,1,1,-4225.973,-11648.08,-143.8641,5.881761,0,0,0,1,120,255,1), +(@OGUID+8,181355,530,1,1,-4244.824,-11657.96,-143.6249,1.727875,0,0,0,1,120,255,1), +(@OGUID+9,181355,530,1,1,-4209.638,-11675.42,-143.2441,5.899214,0,0,0,1,120,255,1), +(@OGUID+10,181355,530,1,1,-4204.821,-11678.49,-143.1916,0.4014249,0,0,0,1,120,255,1), +(@OGUID+11,181355,530,1,1,-4163.965,-11666.74,-143.2581,4.677484,0,0,0,1,120,255,1), +(@OGUID+12,181355,530,1,1,-4253.186,-11675.28,-143.7647,4.677484,0,0,0,1,120,255,1), +(@OGUID+13,181355,530,1,1,-4178.041,-11713.54,-143.6017,0.7853968,0,0,0,1,120,255,1), +(@OGUID+14,181355,530,1,1,-4154.533,-11704.79,-143.3194,5.98648,0,0,0,1,120,255,1), +(@OGUID+15,181355,530,1,1,-4194.735,-11728.54,-143.4515,3.246347,0,0,0,1,120,255,1), +(@OGUID+16,181355,530,1,1,-4186.29,-11803.01,-133.1742,0.6108634,0,0,0,1,120,255,1), +(@OGUID+17,181355,530,1,1,-4228.949,-11818.94,-115.9345,0.802851,0,0,0,1,120,255,1), +(@OGUID+18,181355,530,1,1,-4210.176,-11796.16,-133.2452,1.570796,0,0,0,1,120,255,1), +(@OGUID+19,181355,530,1,1,-4185.515,-11746.04,-132.2725,3.036838,0,0,0,1,120,255,1), +(@OGUID+20,181355,530,1,1,-4221.807,-11830.92,-115.8959,5.305802,0,0,0,1,120,255,1), +(@OGUID+21,181355,530,1,1,-4161.4,-11800.58,-132.1952,4.555311,0,0,0,1,120,255,1), +(@OGUID+22,181355,530,1,1,-4217.298,-12296.37,2.797,4.66003,0,0,0,1,120,255,1), +(@OGUID+23,181355,530,1,1,-4208.977,-12291.46,1.564008,0.8552105,0,0,0,1,120,255,1), +(@OGUID+24,181355,530,1,1,-4231.342,-12311.88,4.430907,4.694937,0,0,0,1,120,255,1), +(@OGUID+25,181355,530,1,1,-4236.268,-12321.97,3.524465,0.5410506,0,0,0,1,120,255,1), +(@OGUID+26,181355,530,1,1,-4191.353,-12302.24,0.068963,3.211419,0,0,0,1,120,255,1), +(@OGUID+27,181355,530,1,1,-4196.024,-12313.57,0.370297,0.1745321,0,0,0,1,120,255,1), +(@OGUID+28,181355,530,1,1,-4215.688,-12343.17,5.164443,1.186823,0,0,0,1,120,255,1), +(@OGUID+29,181355,530,1,1,-4234.849,-12332.25,4.627616,5.846854,0,0,0,1,120,255,1), +(@OGUID+30,181355,530,1,1,-4207.028,-12336.08,2.900289,5.201083,0,0,0,1,120,255,1), +(@OGUID+31,181355,530,1,1,-4214.633,-12476,45.07409,5.497789,0,0,0,1,120,255,1), +(@OGUID+32,181302,530,1,1,-4224.03,-12301.6,4.06688,6.248279,0,0,0,1,120,255,1), +(@OGUID+33,181302,530,1,1,-4225.604,-12301.49,4.273456,1.937312,0,0,0,1,120,255,1), +(@OGUID+34,181305,530,1,1,-4219.088,-12304.94,2.68953,0.1396245,0,0,0,1,120,255,1), +(@OGUID+35,181306,530,1,1,-4224.28,-12299.62,4.223075,2.478367,0,0,0,1,120,255,1), +(@OGUID+36,181307,530,1,1,-4219.073,-12304.1,3.637502,0.01745246,0,0,0,1,120,255,1), +(@OGUID+37,181605,530,1,1,-4204.668,-12321.07,2.198824,5.777041,0,0,0,1,120,255,1), +(@OGUID+38,187917,530,1,1,-4223.843,-12318.37,2.47695,2.932139,0,0,0,1,120,255,1), +(@OGUID+39,188020,530,1,1,-4205.284,-12290.93,1.317262,0.7330382,0,0,0,1,120,255,1), +(@OGUID+40,188020,530,1,1,-4193.06,-12298.27,0.561426,0.9075702,0,0,0,1,120,255,1), +(@OGUID+41,188020,530,1,1,-4218.465,-12342.38,5.182833,1.361356,0,0,0,1,120,255,1), +(@OGUID+42,188020,530,1,1,-4231.875,-12334.86,4.329966,1.378809,0,0,0,1,120,255,1), +(@OGUID+43,188021,530,1,1,-4221.665,-12306.13,2.295757,5.654869,0,0,0,1,120,255,1), +(@OGUID+44,187667,530,1,1,-4216.924,-12483.89,48.3932,6.230826,0,0,0,1,120,255,1), +(@OGUID+45,187667,530,1,1,-4216.502,-12480.64,48.98628,6.213374,0,0,0,1,120,255,1), +(@OGUID+46,181392,530,1,1,-4213.729,-11685.4,-130.8234,0.9424766,0,0,0,1,120,255,1), +(@OGUID+47,181392,530,1,1,-4145.799,-11745.62,-124.1529,2.024579,0,0,0,1,120,255,1); +DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+47; +INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES +(1,@OGUID+0),(1,@OGUID+1),(1,@OGUID+2),(1,@OGUID+3),(1,@OGUID+4), +(1,@OGUID+5),(1,@OGUID+6),(1,@OGUID+7),(1,@OGUID+8),(1,@OGUID+9), +(1,@OGUID+10),(1,@OGUID+11),(1,@OGUID+12),(1,@OGUID+13),(1,@OGUID+14), +(1,@OGUID+15),(1,@OGUID+16),(1,@OGUID+17),(1,@OGUID+18),(1,@OGUID+19), +(1,@OGUID+20),(1,@OGUID+21),(1,@OGUID+22),(1,@OGUID+23),(1,@OGUID+24), +(1,@OGUID+25),(1,@OGUID+26),(1,@OGUID+27),(1,@OGUID+28),(1,@OGUID+29), +(1,@OGUID+30),(1,@OGUID+31),(1,@OGUID+32),(1,@OGUID+33),(1,@OGUID+34), +(1,@OGUID+35),(1,@OGUID+36),(1,@OGUID+37),(1,@OGUID+38),(1,@OGUID+39), +(1,@OGUID+40),(1,@OGUID+41),(1,@OGUID+42),(1,@OGUID+43),(1,@OGUID+44), +(1,@OGUID+45),(1,@OGUID+46),(1,@OGUID+47); -- cgit v1.2.3 From da8c039f0a4be24079367343fbc116cfd3ac4432 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 25 Jun 2012 22:38:28 -0230 Subject: DB/Gameobject: Blades Edge Alliance & Horde Mid Summer Festival Go Spawns --- .../world/2012_06_25_02_world_gameobject.sql | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 sql/updates/world/2012_06_25_02_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_25_02_world_gameobject.sql b/sql/updates/world/2012_06_25_02_world_gameobject.sql new file mode 100644 index 00000000000..f526f071bac --- /dev/null +++ b/sql/updates/world/2012_06_25_02_world_gameobject.sql @@ -0,0 +1,85 @@ +-- Blades Edge Alliance Mid Summer Festival Go Spawns +SET @OGUID := 70557; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+37; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@OGUID+0,187576,530,1,1,1989.314,6784.465,167.9164,4.537859,0,0,0,1,120,255,1), +(@OGUID+1,181391,530,1,1,1989.554,6785.711,165.7517,4.607672,0,0,0,1,120,255,1), +(@OGUID+2,181392,530,1,1,1955.625,6885.821,167.1296,4.468043,0,0,0,1,120,255,1), +(@OGUID+3,181392,530,1,1,2032.214,6819.37,181.5125,3.874631,0,0,0,1,120,255,1), +(@OGUID+4,181392,530,1,1,2031.963,6825.553,181.5333,2.426008,0,0,0,1,120,255,1), +(@OGUID+5,181392,530,1,1,2038.565,6819.838,181.4885,5.550147,0,0,0,1,120,255,1), +(@OGUID+6,181392,530,1,1,2038.027,6826.094,181.4816,0.8377575,0,0,0,1,120,255,1), +(@OGUID+7,181392,530,1,1,2063.305,6759.898,173.2681,4.694937,0,0,0,1,120,255,1), +(@OGUID+8,181392,530,1,1,2062.016,6825.854,184.7832,4.729844,0,0,0,1,120,255,1), +(@OGUID+9,181393,530,1,1,2051.89,6831.638,177.0355,1.588249,0,0,0,1,120,255,1), +(@OGUID+10,181393,530,1,1,2072.185,6832.028,176.9799,1.588249,0,0,0,1,120,255,1), +(@OGUID+11,181401,530,1,1,2055.827,6759.792,173.2742,4.729844,0,0,0,1,120,255,1), +(@OGUID+12,181401,530,1,1,2066.258,6730.639,181.5167,1.518436,0,0,0,1,120,255,1), +(@OGUID+13,181401,530,1,1,2070.803,6759.671,173.2742,4.694937,0,0,0,1,120,255,1), +(@OGUID+14,181401,530,1,1,2066.148,6726.275,181.5531,4.747296,0,0,0,1,120,255,1), +(@OGUID+15,181401,530,1,1,1937.434,6838.64,177.4422,3.194002,0,0,0,1,120,255,1), +(@OGUID+16,181401,530,1,1,1941.395,6838.657,177.4772,0.01745246,0,0,0,1,120,255,1), +(@OGUID+17,181302,530,1,1,2023.801,6594.566,135.5013,2.949595,0,0,0,1,120,255,1), +(@OGUID+18,181302,530,1,1,2021.781,6590.525,135.2787,1.989672,0,0,0,1,120,255,1), +(@OGUID+19,181305,530,1,1,2018.895,6592.329,135.5139,6.126106,0,0,0,1,120,255,1), +(@OGUID+20,181306,530,1,1,2022.451,6595.768,135.6441,2.007128,0,0,0,1,120,255,1), +(@OGUID+21,181307,530,1,1,2018.828,6591.42,136.4855,1.658062,0,0,0,1,120,255,1), +(@OGUID+22,181355,530,1,1,2021.774,6603.31,136.6191,0.1745321,0,0,0,1,120,255,1), +(@OGUID+23,181355,530,1,1,2030.021,6607.951,137.7898,3.211419,0,0,0,1,120,255,1), +(@OGUID+24,181355,530,1,1,2049.479,6600.245,137.5444,1.186823,0,0,0,1,120,255,1), +(@OGUID+25,181355,530,1,1,2017.946,6573.733,135.3068,4.66003,0,0,0,1,120,255,1), +(@OGUID+26,181355,530,1,1,2051.807,6590.619,136.7025,5.201083,0,0,0,1,120,255,1), +(@OGUID+27,181355,530,1,1,2022.703,6566.989,133.5423,0.8552105,0,0,0,1,120,255,1), +(@OGUID+28,181355,530,1,1,2049.964,6570.623,135.499,0.5410506,0,0,0,1,120,255,1), +(@OGUID+29,181355,530,1,1,2046.616,6564.632,134.1706,5.846854,0,0,0,1,120,255,1), +(@OGUID+30,181355,530,1,1,2046.616,6564.632,134.1706,5.846854,0,0,0,1,120,255,1), +(@OGUID+31,188020,530,1,1,2035.179,6608.052,137.9502,0.7330382,0,0,0,1,120,255,1), +(@OGUID+32,188020,530,1,1,2045.668,6604.812,137.8742,1.518436,0,0,0,1,120,255,1), +(@OGUID+33,188020,530,1,1,2024.833,6565.631,133.425,1.378809,0,0,0,1,120,255,1), +(@OGUID+34,188020,530,1,1,2042.706,6563.491,133.4392,1.361356,0,0,0,1,120,255,1), +(@OGUID+35,188021,530,1,1,2021.064,6593.522,135.1495,6.03884,0,0,0,1,120,255,1), +(@OGUID+36,181605,530,1,1,2046.226,6579.709,135.2484,5.777041,0,0,0,1,120,255,1), +(@OGUID+37,187919,530,1,1,2019.803,6580.186,134.3619,1.937312,0,0,0,1,120,255,1); +DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+37; +INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES +(1,@OGUID+0),(1,@OGUID+1),(1,@OGUID+2),(1,@OGUID+3),(1,@OGUID+4), +(1,@OGUID+5),(1,@OGUID+6),(1,@OGUID+7),(1,@OGUID+8),(1,@OGUID+9), +(1,@OGUID+10),(1,@OGUID+11),(1,@OGUID+12),(1,@OGUID+13),(1,@OGUID+14), +(1,@OGUID+15),(1,@OGUID+16),(1,@OGUID+17),(1,@OGUID+18),(1,@OGUID+19), +(1,@OGUID+20),(1,@OGUID+21),(1,@OGUID+22),(1,@OGUID+23),(1,@OGUID+24), +(1,@OGUID+25),(1,@OGUID+26),(1,@OGUID+27),(1,@OGUID+28),(1,@OGUID+29), +(1,@OGUID+30),(1,@OGUID+31),(1,@OGUID+32),(1,@OGUID+33),(1,@OGUID+34), +(1,@OGUID+35),(1,@OGUID+36),(1,@OGUID+37); + +-- Blades Edge Horde Mid Summer Festival Go Spawns +SET @OGUID := 21478; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+20; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@OGUID+0,181302,530,1,1,2286.953,6131.723,135.8838,0.1047193,0,0,0,1,120,255,1), +(@OGUID+1,181302,530,1,1,2286.061,6134.23,136.0696,4.782203,0,0,0,1,120,255,1), +(@OGUID+2,181305,530,1,1,2290.526,6135.19,135.9771,4.590216,0,0,0,1,120,255,1), +(@OGUID+3,181306,530,1,1,2289.731,6131.177,135.6796,4.956738,0,0,0,1,120,255,1), +(@OGUID+4,181307,530,1,1,2286.542,6131.368,135.8867,0.5934101,0,0,0,1,120,255,1), +(@OGUID+5,181355,530,1,1,2258.801,6129.346,137.7461,0.8552105,0,0,0,1,120,255,1), +(@OGUID+6,181355,530,1,1,2268.304,6125.965,137.2221,4.66003,0,0,0,1,120,255,1), +(@OGUID+7,181355,530,1,1,2255.936,6152.005,139.28,5.846854,0,0,0,1,120,255,1), +(@OGUID+8,181355,530,1,1,2266.464,6158.563,138.4691,0.5410506,0,0,0,1,120,255,1), +(@OGUID+9,181355,530,1,1,2277.704,6161.832,137.9124,0.5934101,0,0,0,1,120,255,1), +(@OGUID+10,181355,530,1,1,2298.375,6131.026,135.5555,5.201083,0,0,0,1,120,255,1), +(@OGUID+11,181355,530,1,1,2303.753,6135.784,135.0607,1.186823,0,0,0,1,120,255,1), +(@OGUID+12,181355,530,1,1,2293.306,6163.847,136.1624,0.1745321,0,0,0,1,120,255,1), +(@OGUID+13,181355,530,1,1,2302.233,6162.095,135.2117,3.211419,0,0,0,1,120,255,1), +(@OGUID+14,188020,530,1,1,2258.107,6132.874,137.3437,3.298687,0,0,0,1,120,255,1), +(@OGUID+15,188020,530,1,1,2255.474,6148.87,138.3934,3.717554,0,0,0,1,120,255,1), +(@OGUID+16,188020,530,1,1,2304.146,6139.788,134.4674,0.05235888,0,0,0,1,120,255,1), +(@OGUID+17,188020,530,1,1,2303.354,6158.675,134.4655,6.126106,0,0,0,1,120,255,1), +(@OGUID+18,188021,530,1,1,2289.121,6132.534,135.8388,1.640607,0,0,0,1,120,255,1), +(@OGUID+19,181605,530,1,1,2285.147,6157.909,136.2808,5.777041,0,0,0,1,120,255,1), +(@OGUID+20,187955,530,1,1,2274.421,6133.031,136.9586,3.036838,0,0,0,1,120,255,1); +DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+20; +INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES +(1,@OGUID+0),(1,@OGUID+1),(1,@OGUID+2),(1,@OGUID+3),(1,@OGUID+4), +(1,@OGUID+5),(1,@OGUID+6),(1,@OGUID+7),(1,@OGUID+8),(1,@OGUID+9), +(1,@OGUID+10),(1,@OGUID+11),(1,@OGUID+12),(1,@OGUID+13),(1,@OGUID+14), +(1,@OGUID+15),(1,@OGUID+16),(1,@OGUID+17),(1,@OGUID+18),(1,@OGUID+19), +(1,@OGUID+20); -- cgit v1.2.3 From d014f7fcedce79165d63f2796c6ea64285d74ac6 Mon Sep 17 00:00:00 2001 From: Exodius Date: Tue, 26 Jun 2012 21:07:07 +0200 Subject: DB/Loot: Add missing recipe and replace a furious weapon with the correct item Closes #6925,#6924 --- sql/updates/world/2012_06_26_02_world_creature_loot_template.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_06_26_02_world_creature_loot_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_26_02_world_creature_loot_template.sql b/sql/updates/world/2012_06_26_02_world_creature_loot_template.sql new file mode 100644 index 00000000000..3a704e61bcf --- /dev/null +++ b/sql/updates/world/2012_06_26_02_world_creature_loot_template.sql @@ -0,0 +1,6 @@ +-- Replace Furious Weapon drop with drop that should be in the Cache of Living Stone +UPDATE `reference_loot_template` SET `item` =45695 WHERE (`entry` =34361 AND `item` =45965); +-- add missing Recipe: Mighty Shadow Protection Potion on Cultist Shard Watcher +DELETE FROM `creature_loot_template` WHERE `entry`=32349 AND `item`=44568; +INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES +(32349,44568,0.5,1,0,1,1); -- cgit v1.2.3 From 551878ad96c1f4b2882f8e94c248f79576927173 Mon Sep 17 00:00:00 2001 From: Kandera Date: Wed, 27 Jun 2012 15:04:07 -0400 Subject: Core/Spells: correctly award kill credit for quest the focus on the beach. --- .../2012_06_27_00_world_spell_script_names.sql | 3 ++ src/server/scripts/Spells/spell_quest.cpp | 34 +++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_06_27_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_27_00_world_spell_script_names.sql b/sql/updates/world/2012_06_27_00_world_spell_script_names.sql new file mode 100644 index 00000000000..8210225de6e --- /dev/null +++ b/sql/updates/world/2012_06_27_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (50546); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(50546,'spell_q12066_bunny_kill_credit'); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 810cc20e04b..2f6989b57c9 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -639,7 +639,7 @@ class spell_q12851_going_bearback : public SpellScriptLoader // Already in fire if (target->HasAura(SPELL_ABLAZE)) return; - + if (Player* player = caster->GetCharmerOrOwnerPlayerOrPlayerItself()) { switch (target->GetEntry()) @@ -1162,6 +1162,38 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader } }; +enum FocusOnTheBeach +{ + SPELL_BUNNY_CREDIT_BEAM = 47390, +}; + +class spell_q12066_bunny_kill_credit : public SpellScriptLoader +{ +public: + spell_q12066_bunny_kill_credit() : SpellScriptLoader("spell_q12066_bunny_kill_credit") { } + + class spell_q12066_bunny_kill_credit_SpellScript : public SpellScript + { + PrepareSpellScript(spell_q12066_bunny_kill_credit_SpellScript); + + void HandleDummy(SpellEffIndex /*effIndex*/) + { + if (Creature* target = GetHitCreature()) + target()->CastSpell(GetCaster(), SPELL_BUNNY_CREDIT_BEAM, false); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_q12066_bunny_kill_credit_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_q12066_bunny_kill_credit_SpellScript(); + } +}; + void AddSC_quest_spell_scripts() { new spell_q55_sacred_cleansing(); -- cgit v1.2.3 From 5b24fbf2f4b72ecbaf5a8f0b4049d06581f9513b Mon Sep 17 00:00:00 2001 From: mweinelt Date: Wed, 27 Jun 2012 23:32:03 +0100 Subject: DB/Graveyards: Fix Graveyard Link for Shattered Halls Closes #6947 Signed-off-by: Nay --- sql/updates/world/2012_06_27_01_world_game_graveyard_zone.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_06_27_01_world_game_graveyard_zone.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_06_27_01_world_game_graveyard_zone.sql b/sql/updates/world/2012_06_27_01_world_game_graveyard_zone.sql new file mode 100644 index 00000000000..973a1dc5296 --- /dev/null +++ b/sql/updates/world/2012_06_27_01_world_game_graveyard_zone.sql @@ -0,0 +1,3 @@ +-- fix graveyard for shattered halls, alliance to honor hold, horde to thrallmar, not the other way around +UPDATE `game_graveyard_zone` SET `faction`=67 WHERE `id`=919 AND `ghost_zone`=3714; +UPDATE `game_graveyard_zone` SET `faction`=469 WHERE `id`=920 AND `ghost_zone`=3714; -- cgit v1.2.3 From 86353cdde14237a2e9908b49c5785530f91dbd3a Mon Sep 17 00:00:00 2001 From: 4m1g0 Date: Sun, 1 Jul 2012 15:25:33 +0200 Subject: Core/Scripts: Use proper headers, code style, creature_texts and cleanup (Battle for Mount Hyjal) --- .../world/2012_07_01_00_world_creature_text.sql | 64 +++++++++++ .../BattleForMountHyjal/boss_anetheron.cpp | 113 +++++-------------- .../BattleForMountHyjal/boss_archimonde.cpp | 123 ++++++++++----------- .../BattleForMountHyjal/boss_azgalor.cpp | 69 ++++-------- .../BattleForMountHyjal/boss_kazrogal.cpp | 56 +++------- .../BattleForMountHyjal/boss_rage_winterchill.cpp | 85 ++++---------- .../CavernsOfTime/BattleForMountHyjal/hyjal.cpp | 4 +- .../CavernsOfTime/BattleForMountHyjal/hyjal.h | 2 +- .../CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp | 22 ++-- .../CavernsOfTime/BattleForMountHyjal/hyjalAI.h | 80 +++++++------- .../BattleForMountHyjal/hyjal_trash.cpp | 55 +++++---- .../BattleForMountHyjal/instance_hyjal.cpp | 9 +- 12 files changed, 297 insertions(+), 385 deletions(-) create mode 100644 sql/updates/world/2012_07_01_00_world_creature_text.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_01_00_world_creature_text.sql b/sql/updates/world/2012_07_01_00_world_creature_text.sql new file mode 100644 index 00000000000..6f2bed8e7d6 --- /dev/null +++ b/sql/updates/world/2012_07_01_00_world_creature_text.sql @@ -0,0 +1,64 @@ +-- Anetheron +DELETE FROM `creature_text` WHERE `entry`=17808; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17808,0,0, 'The clock... is still... ticking.',14,0,100,0,0,10982, 'Anetheron - SAY_ONDEATH'), +(17808,1,0, 'Your hopes are lost!',14,0,100,0,0,10981, 'Anetheron - SAY_ONSLAY1'), +(17808,1,1, 'Scream for me!',14,0,100,0,0,11038, 'Anetheron - SAY_ONSLAY2'), +(17808,1,2, 'Pity, no time for a slow death!',14,0,100,0,0,11039, 'Anetheron - SAY_ONSLAY3'), +(17808,2,0, 'The swarm is eager to feed!',14,0,100,0,0,10979, 'Anetheron - SAY_SWARM1'), +(17808,2,1, 'Pestilence upon you!',14,0,100,0,0,11037, 'Anetheron - SAY_SWARM2'), +(17808,3,0, 'You look tired...',14,0,100,0,0,10978, 'Anetheron - SAY_SLEEP1'), +(17808,3,1, 'Sweet dreams...',14,0,100,0,0,11545, 'Anetheron - SAY_SLEEP2'), +(17808,4,0, 'Let fire rain from above!',14,0,100,0,0,10980, 'Anetheron - SAY_INFERNO1'), +(17808,4,1, 'Earth and sky shall burn!',14,0,100,0,0,11036, 'Anetheron - SAY_INFERNO2'), +(17808,5,0, 'You are defenders of a doomed world! Flee here, and perhaps you will prolong your pathetic lives!',14,0,100,0,0,10977, 'Anetheron - SAY_ONAGGRO'); + +-- Azgalor +DELETE FROM `creature_text` WHERE `entry`=17842; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17842,0,0, 'Your time is almost... up',14,0,100,0,0,11002, 'Azgalor - SAY_ONDEATH'), +(17842,1,0, 'Reesh, hokta!',14,0,100,0,0,11001, 'Azgalor - SAY_ONSLAY1'), +(17842,1,1, 'Don''t fight it',14,0,100,0,0,11048, 'Azgalor - SAY_ONSLAY2'), +(17842,1,2, 'No one is going to save you',14,0,100,0,0,11047, 'Azgalor - SAY_ONSLAY3'), +(17842,2,0, 'Just a taste... of what awaits you',14,0,100,0,0,11046, 'Azgalor - SAY_DOOM1'), +(17842,2,1, 'Suffer you despicable insect!',14,0,100,0,0,11000, 'Azgalor - SAY_DOOM2'), +(17842,3,0, 'Abandon all hope! The legion has returned to finish what was begun so many years ago. This time there will be no escape!',14,0,100,0,0,10999, 'Azgalor - SAY_ONAGGRO'); + +-- Kazrogal +DELETE FROM `creature_text` WHERE `entry`=17888; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17888,0,0, 'Shaza-Kiel!',14,0,100,0,0,11017, 'Kazrogal - SAY_ONSLAY1'), +(17888,0,1, 'You... are nothing!',14,0,100,0,0,11053, 'Kazrogal - SAY_ONSLAY2'), +(17888,0,2, 'Miserable nuisance!',14,0,100,0,0,11054, 'Kazrogal - SAY_ONSLAY3'), +(17888,1,0, 'Your death will be a painful one.',14,0,100,0,0,11016, 'Kazrogal - SAY_MARK1'), +(17888,1,1, 'You... are marked.',14,0,100,0,0,11052, 'Kazrogal - SAY_MARK2'), +(17888,2,0, 'Cry for mercy! Your meaningless lives will soon be forfeit.',14,0,100,0,0,11015, 'Kazrogal - SAY_ONAGGRO'); + +-- Rage Winterchill +DELETE FROM `creature_text` WHERE `entry`=17767; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17767,0,0, 'You have won this battle, but not... the... war',14,0,100,0,0,11026, 'Rage Winterchill - SAY_ONDEATH'), +(17767,1,0, 'All life must perish!',14,0,100,0,0,11025, 'Rage Winterchill - SAY_ONSLAY1'), +(17767,1,1, 'Victory to the Legion!',14,0,100,0,0,11057, 'Rage Winterchill - SAY_ONSLAY2'), +(17767,2,0, 'Crumble and rot!',14,0,100,0,0,11023, 'Rage Winterchill - SAY_DECAY1'), +(17767,2,1, 'Ashes to ashes, dust to dust',14,0,100,0,0,11055, 'Rage Winterchill - SAY_DECAY2'), +(17767,3,0, 'Succumb to the icy chill... of death!',14,0,100,0,0,11024, 'Rage Winterchill - SAY_NOVA1'), +(17767,3,1, 'It will be much colder in your grave',14,0,100,0,0,11058, 'Rage Winterchill - SAY_NOVA2'), +(17767,4,0, 'The Legion''s final conquest has begun! Once again the subjugation of this world is within our grasp. Let none survive!',14,0,100,0,0,11022, 'Rage Winterchill - SAY_ONAGGRO'); + +-- Archimonde +DELETE FROM `creature_text` WHERE `entry`=17968; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17968,1,0, 'Your resistance is insignificant.',14,0,100,0,0,10987, 'Archimonde - SAY_AGGRO'), +(17968,2,0, 'This world will burn!',14,0,100,0,0,10990, 'Archimonde - SAY_DOOMFIRE1'), +(17968,2,1, 'Manach sheek-thrish!',14,0,100,0,0,11041, 'Archimonde - SAY_DOOMFIRE2'), +(17968,3,0, 'A-kreesh!',14,0,100,0,0,11041, 'Archimonde - SAY_AIR_BURST1'), +(17968,3,1, 'Away vermin!',14,0,100,0,0,10989, 'Archimonde - SAY_AIR_BURST2'), +(17968,4,0, 'All creation will be devoured!',14,0,100,0,0,11044, 'Archimonde - SAY_SLAY1'), +(17968,4,1, 'Your soul will languish for eternity.',14,0,100,0,0,10991, 'Archimonde - SAY_SLAY12'), +(17968,4,2, 'I am the coming of the end!',14,0,100,0,0,11045, 'Archimonde - SAY_SLAY3'), +(17968,5,0, 'At last it is here. Mourn and lament the passing of all you have ever known and all that would have been! Akmin-kurai!',14,0,100,0,0,10993, 'Archimonde - SAY_ENRAGE'), +(17968,6,0, 'No, it cannot be! Nooo!',14,0,100,0,0,10992, 'Archimonde - SAY_DEATH'), +(17968,7,0, 'You are mine now.',14,0,100,0,0,10988, 'Archimonde - SAY_SOUL_CHARGE1'), +(17968,7,1, 'Bow to my will.',14,0,100,0,0,11042, 'Archimonde - SAY_SOUL_CHARGE2'); + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 85f82c62079..222626240ea 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -15,42 +15,30 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "hyjal.h" #include "hyjal_trash.h" -#define SPELL_CARRION_SWARM 31306 -#define SPELL_SLEEP 31298 -#define SPELL_VAMPIRIC_AURA 38196 -#define SPELL_INFERNO 31299 - -#define SAY_ONDEATH "The clock... is still... ticking." -#define SOUND_ONDEATH 10982 - -#define SAY_ONSLAY1 "Your hopes are lost!" -#define SAY_ONSLAY2 "Scream for me!" -#define SAY_ONSLAY3 "Pity, no time for a slow death!" -#define SOUND_ONSLAY1 10981 -#define SOUND_ONSLAY2 11038 -#define SOUND_ONSLAY3 11039 - -#define SAY_SWARM1 "The swarm is eager to feed!" -#define SAY_SWARM2 "Pestilence upon you!" -#define SOUND_SWARM1 10979 -#define SOUND_SWARM2 11037 - -#define SAY_SLEEP1 "You look tired..." -#define SAY_SLEEP2 "Sweet dreams..." -#define SOUND_SLEEP1 10978 -#define SOUND_SLEEP2 11545 - -#define SAY_INFERNO1 "Let fire rain from above!" -#define SAY_INFERNO2 "Earth and sky shall burn!" -#define SOUND_INFERNO1 10980 -#define SOUND_INFERNO2 11036 +enum Spells +{ + SPELL_CARRION_SWARM = 31306, + SPELL_SLEEP = 31298, + SPELL_VAMPIRIC_AURA = 38196, + SPELL_INFERNO = 31299, + SPELL_IMMOLATION = 31303, + SPELL_INFERNO_EFFECT = 31302, +}; -#define SAY_ONAGGRO "You are defenders of a doomed world! Flee here, and perhaps you will prolong your pathetic lives!" -#define SOUND_ONAGGRO 10977 +enum Texts +{ + SAY_ONDEATH = 0, + SAY_ONSLAY = 1, + SAY_SWARM = 2, + SAY_SLEEP = 3, + SAY_INFERNO = 4, + SAY_ONAGGRO = 5, +}; class boss_anetheron : public CreatureScript { @@ -92,27 +80,12 @@ public: { if (instance && IsEvent) instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); + Talk(SAY_ONAGGRO); } void KilledUnit(Unit* /*victim*/) { - switch (urand(0, 2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); - break; - case 2: - DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_ONSLAY); } void WaypointReached(uint32 waypointId) @@ -130,8 +103,7 @@ public: hyjal_trashAI::JustDied(killer); if (instance && IsEvent) instance->SetData(DATA_ANETHERONEVENT, DONE); - DoPlaySoundToSet(me, SOUND_ONDEATH); - me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); + Talk(SAY_ONDEATH); } void UpdateAI(const uint32 diff) @@ -169,17 +141,7 @@ public: DoCast(target, SPELL_CARRION_SWARM); SwarmTimer = urand(45000, 60000); - switch (urand(0, 1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_SWARM1); - me->MonsterYell(SAY_SWARM1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_SWARM2); - me->MonsterYell(SAY_SWARM2, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_SWARM); } else SwarmTimer -= diff; if (SleepTimer <= diff) @@ -190,17 +152,7 @@ public: target->CastSpell(target, SPELL_SLEEP, true); } SleepTimer = 60000; - switch (urand(0, 1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_SLEEP1); - me->MonsterYell(SAY_SLEEP1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_SLEEP2); - me->MonsterYell(SAY_SLEEP2, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_SLEEP); } else SleepTimer -= diff; if (AuraTimer <= diff) { @@ -211,17 +163,7 @@ public: { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); InfernoTimer = 45000; - switch (urand(0, 1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_INFERNO1); - me->MonsterYell(SAY_INFERNO1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_INFERNO2); - me->MonsterYell(SAY_INFERNO2, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_INFERNO); } else InfernoTimer -= diff; DoMeleeAttackIfReady(); @@ -230,9 +172,6 @@ public: }; -#define SPELL_IMMOLATION 31303 -#define SPELL_INFERNO_EFFECT 31302 - class mob_towering_infernal : public CreatureScript { public: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index f07aaaa1f2a..ee988accbac 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -23,56 +23,57 @@ SDComment: Doomfires not completely offlike due to core limitations for random m SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "hyjal.h" #include "SpellAuras.h" #include "hyjal_trash.h" -//text id -1534018 are the text used when previous events complete. Not part of this script. -#define SAY_AGGRO -1534019 -#define SAY_DOOMFIRE1 -1534020 -#define SAY_DOOMFIRE2 -1534021 -#define SAY_AIR_BURST1 -1534022 -#define SAY_AIR_BURST2 -1534023 -#define SAY_SLAY1 -1534024 -#define SAY_SLAY2 -1534025 -#define SAY_SLAY3 -1534026 -#define SAY_ENRAGE -1534027 -#define SAY_DEATH -1534028 -#define SAY_SOUL_CHARGE1 -1534029 -#define SAY_SOUL_CHARGE2 -1534030 - -#define SPELL_DENOUEMENT_WISP 32124 -#define SPELL_ANCIENT_SPARK 39349 -#define SPELL_PROTECTION_OF_ELUNE 38528 - -#define SPELL_DRAIN_WORLD_TREE 39140 -#define SPELL_DRAIN_WORLD_TREE_2 39141 - -#define SPELL_FINGER_OF_DEATH 31984 -#define SPELL_HAND_OF_DEATH 35354 -#define SPELL_AIR_BURST 32014 -#define SPELL_GRIP_OF_THE_LEGION 31972 -#define SPELL_DOOMFIRE_STRIKE 31903 //summons two creatures -#define SPELL_DOOMFIRE_SPAWN 32074 -#define SPELL_DOOMFIRE 31945 -#define SPELL_SOUL_CHARGE_YELLOW 32045 -#define SPELL_SOUL_CHARGE_GREEN 32051 -#define SPELL_SOUL_CHARGE_RED 32052 -#define SPELL_UNLEASH_SOUL_YELLOW 32054 -#define SPELL_UNLEASH_SOUL_GREEN 32057 -#define SPELL_UNLEASH_SOUL_RED 32053 -#define SPELL_FEAR 31970 - -#define CREATURE_ARCHIMONDE 17968 -#define CREATURE_DOOMFIRE 18095 -#define CREATURE_DOOMFIRE_SPIRIT 18104 -#define CREATURE_ANCIENT_WISP 17946 -#define CREATURE_CHANNEL_TARGET 22418 - -#define NORDRASSIL_X 5503.713f -#define NORDRASSIL_Y -3523.436f -#define NORDRASSIL_Z 1608.781f +enum Texts +{ + SAY_AGGRO = 1, + SAY_DOOMFIRE = 2, + SAY_AIR_BURST = 3, + SAY_SLAY = 4, + SAY_ENRAGE = 5, + SAY_DEATH = 6, + SAY_SOUL_CHARGE = 7, +}; + +enum Spells +{ + SPELL_DENOUEMENT_WISP = 32124, + SPELL_ANCIENT_SPARK = 39349, + SPELL_PROTECTION_OF_ELUNE = 38528, + + SPELL_DRAIN_WORLD_TREE = 39140, + SPELL_DRAIN_WORLD_TREE_2 = 39141, + + SPELL_FINGER_OF_DEATH = 31984, + SPELL_HAND_OF_DEATH = 35354, + SPELL_AIR_BURST = 32014, + SPELL_GRIP_OF_THE_LEGION = 31972, + SPELL_DOOMFIRE_STRIKE = 31903, //summons two creatures + SPELL_DOOMFIRE_SPAWN = 32074, + SPELL_DOOMFIRE = 31945, + SPELL_SOUL_CHARGE_YELLOW = 32045, + SPELL_SOUL_CHARGE_GREEN = 32051, + SPELL_SOUL_CHARGE_RED = 32052, + SPELL_UNLEASH_SOUL_YELLOW = 32054, + SPELL_UNLEASH_SOUL_GREEN = 32057, + SPELL_UNLEASH_SOUL_RED = 32053, + SPELL_FEAR = 31970, +}; + +enum Summons +{ + CREATURE_DOOMFIRE = 18095, + CREATURE_DOOMFIRE_SPIRIT = 18104, + CREATURE_ANCIENT_WISP = 17946, + CREATURE_CHANNEL_TARGET = 22418, +}; + +Position const NordrassilLoc = {5503.713f, -3523.436f, 1608.781f, 0.0f}; class mob_ancient_wisp : public CreatureScript { @@ -258,11 +259,11 @@ public: uint32 GripOfTheLegionTimer; uint32 DoomfireTimer; uint32 SoulChargeTimer; - uint32 SoulChargeCount; + uint8 SoulChargeCount; uint32 MeleeRangeCheckTimer; uint32 HandOfDeathTimer; uint32 SummonWispTimer; - uint32 WispCount; + uint8 WispCount; uint32 EnrageTimer; uint32 CheckDistanceTimer; @@ -303,7 +304,7 @@ public: void EnterCombat(Unit* /*who*/) { me->InterruptSpell(CURRENT_CHANNELED_SPELL); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoZoneInCombat(); if (instance) @@ -312,7 +313,7 @@ public: void KilledUnit(Unit* victim) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); if (victim && (victim->GetTypeId() == TYPEID_PLAYER)) GainSoulCharge(CAST_PLR(victim)); @@ -346,7 +347,7 @@ public: void JustDied(Unit* killer) { hyjal_trashAI::JustDied(killer); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_ARCHIMONDEEVENT, DONE); @@ -488,7 +489,7 @@ public: { if (!IsChanneling) { - Creature* temp = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 1200000); + Creature* temp = me->SummonCreature(CREATURE_CHANNEL_TARGET, NordrassilLoc, TEMPSUMMON_TIMED_DESPAWN, 1200000); if (temp) WorldTreeGUID = temp->GetGUID(); @@ -525,14 +526,14 @@ public: me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveIdle(); Enraged = true; - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); } } else EnrageTimer -= diff; if (CheckDistanceTimer <= diff) { // To simplify the check, we simply summon a Creature in the location and then check how far we are from the creature - Creature* Check = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 2000); + Creature* Check = me->SummonCreature(CREATURE_CHANNEL_TARGET, NordrassilLoc, TEMPSUMMON_TIMED_DESPAWN, 2000); if (Check) { Check->SetVisible(false); @@ -542,7 +543,7 @@ public: me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveIdle(); Enraged = true; - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); } } CheckDistanceTimer = 5000; @@ -598,11 +599,7 @@ public: if (AirBurstTimer <= diff) { - if (urand(0, 1)) - DoScriptText(SAY_AIR_BURST1, me); - else - DoScriptText(SAY_AIR_BURST2, me); - + Talk(SAY_AIR_BURST); DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank AirBurstTimer = urand(25000, 40000); } else AirBurstTimer -= diff; @@ -615,11 +612,7 @@ public: if (DoomfireTimer <= diff) { - if (urand(0, 1)) - DoScriptText(SAY_DOOMFIRE1, me); - else - DoScriptText(SAY_DOOMFIRE2, me); - + Talk(SAY_DOOMFIRE); Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!temp) temp = me->getVictim(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index a9e0c866ab9..bfdaed35dd4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -15,33 +15,31 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "hyjal.h" #include "hyjal_trash.h" -#define SPELL_RAIN_OF_FIRE 31340 -#define SPELL_DOOM 31347 -#define SPELL_HOWL_OF_AZGALOR 31344 -#define SPELL_CLEAVE 31345 -#define SPELL_BERSERK 26662 - -#define SAY_ONDEATH "Your time is almost... up" -#define SOUND_ONDEATH 11002 - -#define SAY_ONSLAY1 "Reesh, hokta!" -#define SAY_ONSLAY2 "Don't fight it" -#define SAY_ONSLAY3 "No one is going to save you" -#define SOUND_ONSLAY1 11001 -#define SOUND_ONSLAY2 11048 -#define SOUND_ONSLAY3 11047 - -#define SAY_DOOM1 "Just a taste... of what awaits you" -#define SAY_DOOM2 "Suffer you despicable insect!" -#define SOUND_DOOM1 11046 -#define SOUND_DOOM2 11000 +enum Spells +{ + SPELL_RAIN_OF_FIRE = 31340, + SPELL_DOOM = 31347, + SPELL_HOWL_OF_AZGALOR = 31344, + SPELL_CLEAVE = 31345, + SPELL_BERSERK = 26662, + + SPELL_THRASH = 12787, + SPELL_CRIPPLE = 31406, + SPELL_WARSTOMP = 31408, +}; -#define SAY_ONAGGRO "Abandon all hope! The legion has returned to finish what was begun so many years ago. This time there will be no escape!" -#define SOUND_ONAGGRO 10999 +enum Texts +{ + SAY_ONDEATH = 0, + SAY_ONSLAY = 1, + SAY_DOOM = 2, // Not used? + SAY_ONAGGRO = 3, +}; class boss_azgalor : public CreatureScript { @@ -88,27 +86,12 @@ public: { if (instance && IsEvent) instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); + Talk(SAY_ONAGGRO); } void KilledUnit(Unit* /*victim*/) { - switch (urand(0, 2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); - break; - case 2: - DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_ONSLAY); } void WaypointReached(uint32 waypointId) @@ -126,7 +109,7 @@ public: hyjal_trashAI::JustDied(killer); if (instance && IsEvent) instance->SetData(DATA_AZGALOREVENT, DONE); - DoPlaySoundToSet(me, SOUND_ONDEATH); + Talk(SAY_ONDEATH); } void UpdateAI(const uint32 diff) @@ -196,10 +179,6 @@ public: }; -#define SPELL_THRASH 12787 -#define SPELL_CRIPPLE 31406 -#define SPELL_WARSTOMP 31408 - class mob_lesser_doomguard : public CreatureScript { public: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 9160983b0df..29eff68dfbd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -30,22 +30,17 @@ enum Spells SPELL_MARK_DAMAGE = 31463 }; -#define SOUND_ONDEATH 11018 - -#define SAY_ONSLAY1 "Shaza-Kiel!" -#define SAY_ONSLAY2 "You... are nothing!" -#define SAY_ONSLAY3 "Miserable nuisance!" -#define SOUND_ONSLAY1 11017 -#define SOUND_ONSLAY2 11053 -#define SOUND_ONSLAY3 11054 - -#define SAY_MARK1 "Your death will be a painful one." -#define SAY_MARK2 "You... are marked." -#define SOUND_MARK1 11016 -#define SOUND_MARK2 11052 +enum Texts +{ + SAY_ONSLAY = 0, + SAY_MARK = 1, + SAY_ONAGGRO = 2, +}; -#define SAY_ONAGGRO "Cry for mercy! Your meaningless lives will soon be forfeit." -#define SOUND_ONAGGRO 11015 +enum Sounds +{ + SOUND_ONDEATH = 11018, +}; class boss_kazrogal : public CreatureScript { @@ -87,27 +82,12 @@ public: { if (instance && IsEvent) instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); + Talk(SAY_ONAGGRO); } void KilledUnit(Unit* /*victim*/) { - switch (urand(0, 2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); - break; - case 2: - DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_ONSLAY); } void WaypointReached(uint32 waypointId) @@ -177,17 +157,7 @@ public: if (MarkTimerBase < 5500) MarkTimerBase = 5500; MarkTimer = MarkTimerBase; - switch (urand(0, 2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_MARK1); - me->MonsterYell(SAY_MARK1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_MARK2); - me->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_MARK); } else MarkTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 5d7ee1fe194..09c8c1605b3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -15,36 +15,27 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "hyjal.h" #include "hyjal_trash.h" -#define SPELL_FROST_ARMOR 31256 -#define SPELL_DEATH_AND_DECAY 31258 - -#define SPELL_FROST_NOVA 31250 -#define SPELL_ICEBOLT 31249 - -#define SAY_ONDEATH "You have won this battle, but not... the... war" -#define SOUND_ONDEATH 11026 - -#define SAY_ONSLAY1 "All life must perish!" -#define SAY_ONSLAY2 "Victory to the Legion!" -#define SOUND_ONSLAY1 11025 -#define SOUND_ONSLAY2 11057 - -#define SAY_DECAY1 "Crumble and rot!" -#define SAY_DECAY2 "Ashes to ashes, dust to dust" -#define SOUND_DECAY1 11023 -#define SOUND_DECAY2 11055 - -#define SAY_NOVA1 "Succumb to the icy chill... of death!" -#define SAY_NOVA2 "It will be much colder in your grave" -#define SOUND_NOVA1 11024 -#define SOUND_NOVA2 11058 +enum Spells +{ + SPELL_FROST_ARMOR = 31256, + SPELL_DEATH_AND_DECAY = 31258, + SPELL_FROST_NOVA = 31250, + SPELL_ICEBOLT = 31249, +}; -#define SAY_ONAGGRO "The Legion's final conquest has begun! Once again the subjugation of this world is within our grasp. Let none survive!" -#define SOUND_ONAGGRO 11022 +enum Texts +{ + SAY_ONDEATH = 0, + SAY_ONSLAY = 1, + SAY_DECAY = 2, + SAY_NOVA = 3, + SAY_ONAGGRO = 4, +}; class boss_rage_winterchill : public CreatureScript { @@ -86,23 +77,12 @@ public: { if (instance && IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); + Talk(SAY_ONAGGRO); } void KilledUnit(Unit* /*victim*/) { - switch (urand(0, 1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_ONSLAY); } void WaypointReached(uint32 waypointId) @@ -120,8 +100,7 @@ public: hyjal_trashAI::JustDied(killer); if (instance && IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE); - DoPlaySoundToSet(me, SOUND_ONDEATH); - me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); + Talk(SAY_ONDEATH); } void UpdateAI(const uint32 diff) @@ -162,33 +141,13 @@ public: { DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY); DecayTimer = 60000+rand()%20000; - switch (urand(0, 1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_DECAY1); - me->MonsterYell(SAY_DECAY1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_DECAY2); - me->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_DECAY); } else DecayTimer -= diff; if (NovaTimer <= diff) { DoCast(me->getVictim(), SPELL_FROST_NOVA); NovaTimer = 30000+rand()%15000; - switch (urand(0, 1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_NOVA1); - me->MonsterYell(SAY_NOVA1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_NOVA2); - me->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, 0); - break; - } + Talk(SAY_NOVA); } else NovaTimer -= diff; if (IceboltTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 22307468f14..1be8f8e058f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -29,7 +29,9 @@ npc_thrall npc_tyrande_whisperwind EndContentData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" #include "hyjalAI.h" #define GOSSIP_ITEM_BEGIN_ALLY "My companions and I are with you, Lady Proudmoore." diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h index e045d3cbf05..6d62072608d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h @@ -21,7 +21,7 @@ #define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy." -enum eTypes +enum Types { WORLD_STATE_WAVES = 2842, WORLD_STATE_ENEMY = 2453, diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 2f6bbb7edb5..cdac1b18649 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -23,17 +23,21 @@ SDComment: SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "GridNotifiers.h" +#include "Cell.h" +#include "CellImpl.h" #include "hyjalAI.h" #include "hyjal_trash.h" -#include "MapManager.h" -#include "Language.h" -#include "Chat.h" -#include "Object.h" - -#define SPAWN_GARG_GATE 0 -#define SPAWN_WYRM_GATE 1 -#define SPAWN_NEAR_TOWER 2 + +enum Spawns +{ + SPAWN_GARG_GATE = 0, + SPAWN_WYRM_GATE = 1, + SPAWN_NEAR_TOWER = 2, +}; #define YELL_HURRY "Hurry, we don't have much time" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index b32288ca43a..68efa94d98b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -24,43 +24,49 @@ #define HYJAL_AI_MAX_SPELLS 3 -// Trash Mobs summoned in waves -#define NECROMANCER 17899//done -#define ABOMINATION 17898//done -#define GHOUL 17895//done -#define BANSHEE 17905//done -#define CRYPT_FIEND 17897//done -#define GARGOYLE 17906//done -#define FROST_WYRM 17907//done -#define GIANT_INFERNAL 17908//done -#define FEL_STALKER 17916//done - -#define JAINA 17772 -#define THRALL 17852 -#define TYRANDE 17948 - -#define ANCIENT_VEIN 185557 -#define FLAMEOBJECT 182592 - -// Bosses summoned after every 8 waves -#define RAGE_WINTERCHILL 17767 -#define ANETHERON 17808 -#define KAZROGAL 17888 -#define AZGALOR 17842 -#define ARCHIMONDE 17968 - -#define SPELL_TELEPORT_VISUAL 41232 -#define SPELL_MASS_TELEPORT 16807 - -//Spells for Jaina -#define SPELL_BRILLIANCE_AURA 31260 // The database must handle this spell via creature_addon(it should, but is removed in evade..) -#define SPELL_BLIZZARD 31266 -#define SPELL_PYROBLAST 31263 -#define SPELL_SUMMON_ELEMENTALS 31264 - -//Thrall spells -#define SPELL_CHAIN_LIGHTNING 31330 -#define SPELL_SUMMON_DIRE_WOLF 31331 +enum CreaturesIds +{ + // Trash Mobs summoned in waves + NECROMANCER = 17899, + ABOMINATION = 17898, + GHOUL = 17895, + BANSHEE = 17905, + CRYPT_FIEND = 17897, + GARGOYLE = 17906, + FROST_WYRM = 17907, + GIANT_INFERNAL = 17908, + FEL_STALKER = 17916, + + JAINA = 17772, + THRALL = 17852, + TYRANDE = 17948, + + ANCIENT_VEIN = 185557, + FLAMEOBJECT = 182592, + + // Bosses summoned after every 8 waves + RAGE_WINTERCHILL = 17767, + ANETHERON = 17808, + KAZROGAL = 17888, + AZGALOR = 17842, + ARCHIMONDE = 17968, +}; + +enum SpellIds +{ + SPELL_TELEPORT_VISUAL = 41232, + SPELL_MASS_TELEPORT = 16807, + + //Spells for Jaina + SPELL_BRILLIANCE_AURA = 31260, // The database must handle this spell via creature_addon(it should, but is removed in evade..) + SPELL_BLIZZARD = 31266, + SPELL_PYROBLAST = 31263, + SPELL_SUMMON_ELEMENTALS = 31264, + + //Thrall spells + SPELL_CHAIN_LIGHTNING = 31330, + SPELL_SUMMON_DIRE_WOLF = 31331, +}; struct Wave { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 840aa5de081..d3218e1729e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -15,16 +15,35 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "hyjal.h" #include "hyjal_trash.h" #include "hyjalAI.h" -#define SPELL_METEOR 33814 //infernal visual -#define SPELL_IMMOLATION 37059 -#define SPELL_FLAME_BUFFET 31724 -#define NPC_TRIGGER 21987 //World Trigger (Tiny) -#define MODEL_INVIS 11686 //invisible model +enum Spells +{ + SPELL_METEOR = 33814, //infernal visual + SPELL_IMMOLATION = 37059, + SPELL_FLAME_BUFFET = 31724, + NPC_TRIGGER = 21987, //World Trigger (Tiny) + MODEL_INVIS = 11686, //invisible model + SPELL_DISEASE_CLOUD = 31607, + SPELL_KNOCKDOWN = 31610, + SPELL_FRENZY = 31540, + SPELL_RAISE_DEAD_1 = 31617, + SPELL_RAISE_DEAD_2 = 31624, + SPELL_RAISE_DEAD_3 = 31625, + SPELL_SHADOW_BOLT = 31627, + SPELL_BANSHEE_CURSE = 31651, + SPELL_BANSHEE_WAIL = 38183, + SPELL_ANTI_MAGIC_SHELL = 31662, + SPELL_WEB = 28991, + SPELL_MANA_BURN = 31729, + SPELL_FROST_BREATH = 31688, + SPELL_GARGOYLE_STRIKE = 31664, + SPELL_EXPLODING_SHOT = 7896, +}; float HordeWPs[8][3]=//basic waypoints from spawn to leader { @@ -522,9 +541,6 @@ public: } }; -#define SPELL_DISEASE_CLOUD 31607 -#define SPELL_KNOCKDOWN 31610 - class mob_abomination : public CreatureScript { public: @@ -623,8 +639,6 @@ public: }; -#define SPELL_FRENZY 31540 - class mob_ghoul : public CreatureScript { public: @@ -727,11 +741,6 @@ public: }; -#define SPELL_RAISE_DEAD_1 31617 -#define SPELL_RAISE_DEAD_2 31624 -#define SPELL_RAISE_DEAD_3 31625 -#define SPELL_SHADOW_BOLT 31627 - class mob_necromancer : public CreatureScript { public: @@ -859,10 +868,6 @@ public: }; -#define SPELL_BANSHEE_CURSE 31651 -#define SPELL_BANSHEE_WAIL 38183 -#define SPELL_ANTI_MAGIC_SHELL 31662 - class mob_banshee : public CreatureScript { public: @@ -966,8 +971,6 @@ public: }; -#define SPELL_WEB 28991 - class mob_crypt_fiend : public CreatureScript { public: @@ -1058,8 +1061,6 @@ public: }; -#define SPELL_MANA_BURN 31729 - class mob_fel_stalker : public CreatureScript { public: @@ -1150,8 +1151,6 @@ public: }; -#define SPELL_FROST_BREATH 31688 - class mob_frost_wyrm : public CreatureScript { public: @@ -1264,8 +1263,6 @@ public: }; -#define SPELL_GARGOYLE_STRIKE 31664 - class mob_gargoyle : public CreatureScript { public: @@ -1402,8 +1399,6 @@ public: }; -#define SPELL_EXPLODING_SHOT 7896 - class alliance_rifleman : public CreatureScript { public: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index ad8ebdb370a..69bb8285404 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -23,15 +23,16 @@ SDComment: Instance Data Scripts and functions to acquire mobs and set encounter SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "ScriptPCH.h" -#include "hyjal.h" +#include "ScriptMgr.h" +#include "InstanceScript.h" +#include "ScriptedCreature.h" #include "hyjal_trash.h" -enum eEnums +enum Misc { MAX_ENCOUNTER = 5, - GO_ANCIENT_GEM = 185557 + GO_ANCIENT_GEM = 185557, }; /* Battle of Mount Hyjal encounters: 0 - Rage Winterchill event -- cgit v1.2.3 From a986a621324d7157b5804865d460a1ff7e44a93f Mon Sep 17 00:00:00 2001 From: 4m1g0 Date: Sun, 1 Jul 2012 19:45:26 +0200 Subject: DB: Removed old script_texts no longer used --- sql/updates/world/2012_07_01_00_world_creature_text.sql | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_01_00_world_creature_text.sql b/sql/updates/world/2012_07_01_00_world_creature_text.sql index 6f2bed8e7d6..f59663ceab5 100644 --- a/sql/updates/world/2012_07_01_00_world_creature_text.sql +++ b/sql/updates/world/2012_07_01_00_world_creature_text.sql @@ -1,3 +1,5 @@ +DELETE FROM `script_texts` WHERE entry IN (-1534019, -1534020, -1534021, -1534022, -1534023, -1534024, -1534025, -1534026, -1534027, -1534028, -1534029 , -1534030); + -- Anetheron DELETE FROM `creature_text` WHERE `entry`=17808; INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES -- cgit v1.2.3 From 69f1cf37afc0480e61f3dfdeb321cff650793d91 Mon Sep 17 00:00:00 2001 From: trista Date: Mon, 2 Jul 2012 15:02:04 +0100 Subject: DB/Rep: Add onkill reputation for Monstrous Kaliri Closes #6961 Signed-off-by: Nay --- sql/updates/world/2012_07_02_00_world_creature_onkill_reputation.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_07_02_00_world_creature_onkill_reputation.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_02_00_world_creature_onkill_reputation.sql b/sql/updates/world/2012_07_02_00_world_creature_onkill_reputation.sql new file mode 100644 index 00000000000..a9565d36934 --- /dev/null +++ b/sql/updates/world/2012_07_02_00_world_creature_onkill_reputation.sql @@ -0,0 +1,4 @@ +-- Add 10 reputation gaining from killing NPC Monstrous Kaliri towards Sha'tari Skyguard +DELETE FROM `creature_onkill_reputation` WHERE `creature_id`=23051; +INSERT INTO `creature_onkill_reputation` (`creature_id`,`RewOnKillRepFaction1`,`MaxStanding1`,`RewOnKillRepValue1`) VALUES +(23051,1031,7,10); -- cgit v1.2.3 From cf65c38dd5f8e006765d1f239fa33732f3abc8b2 Mon Sep 17 00:00:00 2001 From: trista Date: Mon, 2 Jul 2012 15:06:38 +0100 Subject: DB/SAI: Add combat AI for Dark Ritualist Closes #6992 --- sql/updates/world/2012_07_02_01_world_sai.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_07_02_01_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_02_01_world_sai.sql b/sql/updates/world/2012_07_02_01_world_sai.sql new file mode 100644 index 00000000000..78557f675b6 --- /dev/null +++ b/sql/updates/world/2012_07_02_01_world_sai.sql @@ -0,0 +1,6 @@ +SET @Ritualist := 34734; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@Ritualist; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@Ritualist; +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 +(@Ritualist,0,0,0,0,0,100,0,3000,3000,8000,14000,11,32000,0,0,0,0,0,2,0,0,0,0,0,0,0,'Dark Ritualist - IC - Cast Mind Seer'), +(@Ritualist,0,1,0,0,0,100,0,8000,17300,17300,17300,11,32026,0,0,0,0,0,2,0,0,0,0,0,0,0,'Dark Ritualist - IC - Cast Pain Strike'); -- cgit v1.2.3 From 81514542fa442ff40a86cf6a812db7782ba40786 Mon Sep 17 00:00:00 2001 From: trista Date: Mon, 2 Jul 2012 15:24:49 +0100 Subject: DB/SAI: Fix quest The Air Stands Still Add SAI scripts for related npcs Closes #4880 Signed-off-by: Nay --- sql/updates/world/2012_07_02_01_world_sai.sql | 1 + sql/updates/world/2012_07_02_02_world_sai.sql | 189 ++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) create mode 100644 sql/updates/world/2012_07_02_02_world_sai.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_02_01_world_sai.sql b/sql/updates/world/2012_07_02_01_world_sai.sql index 78557f675b6..323d9bddcb2 100644 --- a/sql/updates/world/2012_07_02_01_world_sai.sql +++ b/sql/updates/world/2012_07_02_01_world_sai.sql @@ -1,3 +1,4 @@ +-- Add SAI for Dark Ritualist ID: 34734 // timings are taken from other script finds SET @Ritualist := 34734; UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@Ritualist; DELETE FROM `smart_scripts` WHERE `entryorguid`=@Ritualist; diff --git a/sql/updates/world/2012_07_02_02_world_sai.sql b/sql/updates/world/2012_07_02_02_world_sai.sql new file mode 100644 index 00000000000..6b6b0eb587c --- /dev/null +++ b/sql/updates/world/2012_07_02_02_world_sai.sql @@ -0,0 +1,189 @@ +-- Fix quest the Air Stands Still ID: 13125 + some lurking around mobs SAIs +-- Set guids: +SET @NPC := 43480; -- Underking Talonox in phase 2, in phase 128->@NPC+1 +SET @PATH := @NPC * 10; +-- @NPC+2 Salranax phase 2, +3 in phase 128 +-- @NPC+4 High Priest in phase 2 and +5 in 128 +-- Add (Salranax the Flesh Render, High Priest Yath'amon and Underking Talonox -- One for each phase they are in /used @qaywsx phase data/ ) +DELETE FROM `creature` WHERE `id` IN (30829, 30830, 30831); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `MovementType`) VALUES +(@NPC+2,30829,571,1,2,6839.024902,594.444946,427.229523,4.5,300,0,0,0), +(@NPC+4,30831,571,1,2,6869.477539,423.287720,471.783722,1.066242,300,0,0,0), +(@NPC,30830,571,1,2,7169.797363,664.115479,492.375793,1.129528,300,0,0,0), +(@NPC+3,30829,571,1,128,6839.024902,594.444946,427.229523,4.5,300,0,0,0), +(@NPC+5,30831,571,1,128,6869.477539,423.287720,471.783722,1.066242,300,0,0,0), +(@NPC+1,30830,571,1,128,7169.797363,664.115479,492.375793,1.129528,300,0,0,0); +-- Salranax the Flesh Render SAI +UPDATE `creature_template` SET `faction_A`=2068, `faction_H`=2068, `mindmg`=240, `maxdmg`=270, `mechanic_immune_mask`=10685, `scale`=1.2 WHERE `entry`=30829; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30829; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30829; +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 +(30829,0,1,0,8,0,100,1,57906,0,0,0,12,30840,4,5000,0,0,0,1,0,0,0,0,0,0,0,'Salranax the Flesh Render - Summons Munch on hit by horn'), +(30829,0,2,0,8,0,100,1,57906,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'On spellhit set aggro'), +(30829,0,3,0,4,0,100,1,0,0,0,0,11,18100,1,0,0,0,0,1,0,0,0,0,0,0,0,'On aggro - Frost Armor'), +(30829,0,4,0,0,0,100,0,2000,6000,4000,8000,11,15242,1,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Cast Fireball'), +(30829,0,5,0,0,0,100,0,15000,20000,15000,20000,11,15244,0,0,0,0,0,0,0,0,0,0,0,0,0,'Combat - Cast Cone of Cold'), +(30829,0,6,0,0,0,100,0,25000,26000,25000,26000,11,15122,1,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Cast Counterspell'), +(30829,0,7,0,6,0,100,0,0,0,0,0,78,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Reset script on death'), +(30829,0,8,0,25,0,100,0,0,0,0,0,28,18100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Remove buff on respawn'); +-- Add SAI for Munch + weapon +UPDATE `creature_template` SET `faction_A`=290,`faction_H`=290, `equipment_id`=30840 WHERE`entry`=30840; +DELETE FROM `creature_equip_template` WHERE `entry`=30840; +INSERT INTO `creature_equip_template` VALUES +(30840,44948,0,0); +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30840; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30840; +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 +(30840,0,1,0,4,0,100,1,0,0,0,0,12,30850,3,2000,0,0,0,1,0,0,0,0,0,0,0,'Summons portal'), +(30840,0,2,0,4,0,100,1,0,0,0,0,1,1,1000,0,0,0,0,1,0,0,0,0,0,0,0,'Welcome text'), +(30840,0,3,0,4,0,100,1,0,0,0,0,1,2,1000,0,0,0,0,1,0,0,0,0,0,0,0,'Welcome text 2'), +(30840,0,4,0,4,0,100,1,0,0,0,0,12,30851,4,1000,0,0,0,1,0,0,0,0,0,0,0,'Summons Melt'), +(30840,0,5,0,0,0,100,0,4000,6000,19000,20000,11,52372,2,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Icy Touch'), +(30840,0,6,0,0,0,100,0,4000,8000,10000,11000,11,52373,2,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Plague Strike'), +(30840,0,7,0,0,0,100,0,4000,7000,2000,3000,11,52374,0,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Blood Strike'), +(30840,0,8,0,5,0,100,1,0,0,0,0,1,3,1000,0,0,0,0,1,0,0,0,0,0,0,0,'Text 3'), +(30840,0,9,0,5,0,100,1,0,0,0,0,12,30850,2,40000,0,0,0,8,0,0,0,6831.7270020,585.404990,427.168011,0.8,'On out of combat opens portal'); +-- Munch's Texts +DELETE FROM `creature_text` WHERE `entry`=30840; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(30840,1,1,'Say hello to my little friend!',12,0,100,0,0,0,'Munch arrival'), +(30840,2,2,'Arise Melt!',12,0,100,0,0,0,'Summon Melts'), +(30840,3,3,'We are done here. I am out.',12,0,100,0,0,0,'Munch oppening portal'); +-- Switch Melts into helping faction +UPDATE `creature_template` SET `faction_A`=290, `faction_H`=290 WHERE `entry`=30851; +-- 2/3 +-- High Priest Yath'amon SAI +UPDATE `creature_template` SET `faction_A`=2068, `faction_H`=2068, `mindmg`=240, `maxdmg`=300,`mechanic_immune_mask`=10685, `scale`=1.2 WHERE `entry`=30831; -- Mana_mod /WDB/ should be exactly 40, if want insert it +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30831; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30831; +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 +(30831,0,1,0,8,0,100,1,57906,0,0,0,12,30839,4,5000,0,0,0,1,0,0,0,0,0,0,0,'Summons Jayde on hit by horn'), +(30831,0,2,0,8,0,100,1,57906,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'On spellhit set aggro'), +(30831,0,3,0,0,0,100,0,2000,3000,6000,8000,11,61705,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Venomous Bite'), -- the spell only targets players as it should +(30831,0,4,0,0,0,100,0,2000,7000,10000,20000,11,4962,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Encasing Webs'), +(30831,0,5,0,0,0,100,0,2000,7000,8000,20000,11,38243,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Mind flay Webs'), +(30831,0,6,0,0,0,100,0,10000,15000,30000,35000,11,34322,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Psychic Scream'), +(30831,0,7,0,6,0,100,0,0,0,0,0,78,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Reset script on death'); +-- Add SAI for Jayde + weapon +UPDATE `creature_template` SET `faction_A`=290,`faction_H`=290, `mechanic_immune_mask`=20, `equipment_id`=30839,`scale`=1 WHERE `entry`=30839; +DELETE FROM `creature_equip_template` WHERE `entry`=30839; +INSERT INTO `creature_equip_template` VALUES +(30839,44926,0,0); +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30839; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30839; +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 +(30839,0,1,0,4,0,100,1,0,0,0,0,12,30852,3,2000,0,0,0,1,0,0,0,0,0,0,0,'Summons portal'), +(30839,0,2,0,4,0,100,1,0,0,0,0,1,1,1000,0,0,0,0,1,0,0,0,0,0,0,0,'Welcome text'), +(30839,0,3,0,0,0,100,0,4000,6000,19000,20000,11,52372,2,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Icy Touch'), +(30839,0,4,0,0,0,100,0,4000,8000,10500,11000,11,52373,2,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Plague Strike'), +(30839,0,5,0,0,0,100,0,4000,7000,2000,2500,11,52374,0,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Blood Strike'), +(30839,0,6,0,5,0,100,1,0,0,0,0,1,2,1000,0,0,0,0,1,0,0,0,0,0,0,0,'Text 2'), +(30839,0,7,0,5,0,100,1,0,0,0,0,12,30852,2,40000,0,0,0,8,0,0,0,6865.674316,414.657349,472.700226,1.185621,'On out of combat opens portal'); +-- Jayde Texts +DELETE FROM `creature_text` WHERE `entry`=30839; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(30839,1,1,'Too weak to finish your own battles? Very well then...',12,0,100,0,0,0,'Jayde arrival'), +(30839,2,2,'Anything else you need help with before I go? Right, I thought not...',12,0,100,0,0,0,'Oppens portal and dissapears'); +-- 3/3 +-- Underking Talonox SAI +UPDATE `creature_template` SET `exp`=2,`faction_A`=2068,`faction_H`=2068,`InhabitType`=1,`mindmg`=320, `maxdmg`=330, `minlevel`=79, `maxlevel`=79, `mechanic_immune_mask`=10685 WHERE `entry`=30830; +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30830; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30830; +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 +(30830,0,1,0,8,0,100,1,57906,0,0,0,12,30838,4,5000,0,0,0,1,0,0,0,0,0,0,0,'Summons Mograine on hit by horn'), +(30830,0,2,0,8,0,100,1,57906,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'On spellhit set aggro'), +(30830,0,3,0,0,0,100,0,1000,2000,2000,7000,11,60802,1,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Mandible Crush'), +(30830,0,4,0,0,0,100,0,1500,2000,10000,15000,11,50283,0,0,0,0,0,0,0,2,0,0,0,0,0,'Combat - Blinding Swarm'), +(30830,0,5,0,6,0,100,0,0,0,0,0,78,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Reset script on death'); +-- Add SAI for Mograine + weapon +UPDATE `creature_template` SET `health_mod`=2401.3,`mana_mod`=1599.9,`unit_class`=2,`flags_extra`=131072, `faction_A`=290,`faction_H`=290, `minlevel`=83, `maxlevel`=83, `mindmg`=340, `maxdmg`=420, `equipment_id`=30838 WHERE`entry`=30838; +DELETE FROM `creature_equip_template` WHERE `entry`=30838; +INSERT INTO `creature_equip_template` VALUES +(30838,39344,39344,0); +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30838; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30838; +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 +(30838,0,1,0,4,0,100,1,0,0,0,0,12,30850,3,2000,0,0,0,1,0,0,0,0,0,0,0,'Summons portal'), +(30838,0,2,0,4,0,100,1,0,0,0,0,1,1,1000,0,0,0,0,1,0,0,0,0,0,0,0,'Welcome text'), +(30838,0,3,0,0,0,100,0,4000,6000,19000,20000,11,52372,2,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Icy Touch'), +(30838,0,4,0,0,0,100,0,4000,8000,10000,11000,11,52373,2,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Plague Strike'), +(30838,0,5,0,0,0,100,0,4000,7000,5000,5000,11,49020,0,0,0,0,0,0,0,0,0,0,0,0,0,'Combat Use - Obliterete'), +(30838,0,6,0,5,0,100,1,0,0,0,0,1,2,1000,0,0,0,0,1,0,0,0,0,0,0,0,'Text 2'), +(30838,0,7,0,5,0,100,1,0,0,0,0,12,30841,2,40000,0,0,0,8,0,0,0,7190.895508,633.476440,488.506317,1.014229,'On out of combat opens portal'); +-- Mograine Texts +DELETE FROM `creature_text` WHERE `entry`=30838; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(30838,1,1,'You challenge death itself! Come then, "King." Face the might of Mograine!',12,0,100,0,0,0,'Mograine"s arrival'), +(30838,2,1,'I will see you back at the Valley of Echoes. Suffer well, ally.',12,0,100,0,0,0,'Opens portal'); +-- Underking pathing for phase 2 +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=7169.797363,`position_y`=664.115479,`position_z`=492.375793, `orientation`=1.129528 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`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7169.797363,664.115479,490.875793,0,0,0,100,0), +(@PATH,2,7196.977051,627.252869,488.591461,0,0,0,100,0), +(@PATH,3,7231.509277,640.110535,484.103490,0,0,0,100,0), +(@PATH,4,7207.646484,677.654114,491.592255,0,0,0,100,0); +-- Underking pathing for phase 128 +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=7169.797363,`position_y`=664.115479,`position_z`=492.375793, `orientation`=1.129528 WHERE `guid`=@NPC+1; +DELETE FROM `creature_addon` WHERE `guid`=@NPC+1; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC+1,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,7169.797363,664.115479,490.875793,0,0,0,100,0), +(@PATH,2,7196.977051,627.252869,488.591461,0,0,0,100,0), +(@PATH,3,7231.509277,640.110535,484.103490,0,0,0,100,0), +(@PATH,4,7207.646484,677.654114,491.592255,0,0,0,100,0); +-- 0/0 Thanks to Nay for helping with Gate's data. +-- Add missing data for the teleport spell +DELETE FROM `spell_target_position` WHERE `id`=57897; -- there was none, but just in case +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(57897,571,6383.445801,229.091522,397.031127,1.660376); +-- Add info for Munch's Death Gate spell click +UPDATE `creature_template` SET `unit_flags`=567296,`exp`=2,`speed_run`=1,`minlevel`=80, `maxlevel`=80,`AIName`="SmartAI",`npcflag`=16777216 WHERE `entry`=30850; +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=30850; +INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES +(30850,57897,2,1); +-- Addon data for creature 30850 (Death Gate (Munch)) +DELETE FROM `creature_template_addon` WHERE `entry`=30850; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(30850,0,0,1,0, NULL); -- Death Gate (Munch) +-- Add info for Jayde's Death Gate spell click +UPDATE `creature_template` SET `exp`=2,`speed_run`=1,`unit_flags`=567296,`minlevel`=80, `maxlevel`=80,`unit_flags`=567296, `speed_run`=1,`AIName`="SmartAI",`npcflag`=16777216 WHERE `entry`=30852; +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=30852; +INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES +(30852,57897,2,1); +-- Model data 27346 (creature 30852 (Death Gate (Jayde))) +UPDATE `creature_model_info` SET `bounding_radius`=1.35,`combat_reach`=1.35,`gender`=2 WHERE `modelid`=27346; -- Death Gate (Jayde) +-- Addon data for creature 30852 (Death Gate (Jayde)) +DELETE FROM `creature_template_addon` WHERE `entry`=30852; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(30852,0,0,1,0, NULL); -- Death Gate (Jayde) +-- Add info for Mograine's Death Gate spell click +UPDATE `creature_template` SET `unit_flags`=567296,`exp`=2,`speed_run`=1,`minlevel`=80, `maxlevel`=80,`AIName`="SmartAI",`npcflag`=16777216 WHERE `entry`=30841; +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=30841; +INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES +(30841,57897,2,1); +-- Addon data for creature 30841 (Death Gate (Mograine)) +DELETE FROM `creature_template_addon` WHERE `entry`=30841; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(30841,0,0,1,0, NULL); -- Death Gate (Mograine) +-- Set SAI for Forgotten Depths Priest - ID: 30203 +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 30203; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30203; +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 +(30203,0,1,0,0,0,100,0,2000,7000,10000,15000,11,4962,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Encasing Webs'), +(30203,0,2,0,0,0,100,0,2000,7000,6000,12000,11,32000,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Mind flay Webs'); +-- Set SAI for Forgotten Depths Priest - ID: 30543 +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 30543; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=30543; +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 +(30543,0,1,0,0,0,100,0,2000,7000,10000,15000,11,4962,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Encasing Webs'), +(30543,0,2,0,0,0,100,0,2000,7000,6000,12000,11,32000,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Mind flay Webs'); +-- Set SAI for Forgotten Depths Priest - ID: 31037 +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= 31037; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=31037; +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 +(31037,0,1,0,0,0,100,0,2000,7000,10000,15000,11,4962,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Encasing Webs'), +(31037,0,2,0,0,0,100,0,2000,7000,6000,12000,11,32000,0,0,0,0,0,2,0,0,0,0,0,0,0,'Combat - Mind flay Webs'); -- cgit v1.2.3 From 798fc2df4016c29441af6666a1b446c57cf81a68 Mon Sep 17 00:00:00 2001 From: Kinzcool Date: Mon, 2 Jul 2012 15:38:02 +0100 Subject: DB/NPC: Add various missing gossips Closes #7001 Signed-off-by: Nay --- sql/updates/world/2012_07_02_03_world_gossip.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2012_07_02_03_world_gossip.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_02_03_world_gossip.sql b/sql/updates/world/2012_07_02_03_world_gossip.sql new file mode 100644 index 00000000000..0c158aa7511 --- /dev/null +++ b/sql/updates/world/2012_07_02_03_world_gossip.sql @@ -0,0 +1,17 @@ +UPDATE `creature_template` SET `gossip_menu_id`=8074 WHERE `entry`=19466; -- Exarch Orelis +UPDATE `creature_template` SET `gossip_menu_id`=8216 WHERE `entry`=20920; -- Magister Theledorn +UPDATE `creature_template` SET `gossip_menu_id`=8661 WHERE `entry`=21112; -- Bossi Pentapiston + +DELETE FROM `gossip_menu` WHERE (`entry`=8074 AND `text_id`=9980) OR +(`entry`=8216 AND `text_id`=10211) OR +(`entry`=8304 AND `text_id`=10360) OR +(`entry`=8370 AND `text_id`=10444) OR +(`entry`=8385 AND `text_id`=10466) OR +(`entry`=8661 AND `text_id`=10889); +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES +(8074, 9980), -- 19466 +(8216, 10211), -- 20920 +(8304, 10360), -- 21461 +(8370, 10444), -- 21755 +(8385, 10466), -- 21824 +(8661, 10889); -- 21112 -- cgit v1.2.3 From 1292b732f7dba2d189cf4b447d219c9bedf9448c Mon Sep 17 00:00:00 2001 From: Subv Date: Mon, 2 Jul 2012 16:41:25 -0500 Subject: Core/Spells: Fixed Evasive Maneuvers and Stop Time, spells from the Oculus drakes. Closes #6670 Closes #6675 --- .../2012_07_02_04_world_spell_script_names.sql | 3 ++ src/server/game/Entities/Unit/Unit.cpp | 8 +++++ src/server/game/Spells/SpellInfo.cpp | 1 + .../scripts/Northrend/Nexus/Oculus/oculus.cpp | 36 +++++++++++++++++++++- 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_07_02_04_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_02_04_world_spell_script_names.sql b/sql/updates/world/2012_07_02_04_world_spell_script_names.sql new file mode 100644 index 00000000000..9054ea7ba82 --- /dev/null +++ b/sql/updates/world/2012_07_02_04_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=49838; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(49838, "spell_gen_stop_time"); \ No newline at end of file diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index fc1e4398e17..2ab730d7f66 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8205,6 +8205,14 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg CastSpell(victim, 27526, true, castItem, triggeredByAura); return true; } + // Evasive Maneuvers + case 50240: + { + // Remove a Evasive Charge + Aura* charge = GetAura(50241); + if (charge->ModStackAmount(-1, AURA_REMOVE_BY_ENEMY_SPELL)) + RemoveAurasDueToSpell(50240); + } } break; case SPELLFAMILY_MAGE: diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 7995087f2c1..16584086245 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1736,6 +1736,7 @@ AuraStateType SpellInfo::GetAuraState() const switch (Id) { case 71465: // Divine Surge + case 50241: // Evasive Charges return AURA_STATE_UNKNOWN22; default: break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 23f55a3033b..d15b3b566bc 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -47,7 +47,9 @@ enum Drakes NPC_VERDISA = 27657, NPC_BELGARISTRASZ = 27658, - NPC_ETERNOS = 27659 + NPC_ETERNOS = 27659, + + SPELL_SHOCK_CHARGE = 49836, }; enum Says @@ -210,8 +212,40 @@ public: } }; +class spell_gen_stop_time : public SpellScriptLoader +{ +public: + spell_gen_stop_time() : SpellScriptLoader("spell_gen_stop_time") { } + + class spell_gen_stop_time_AuraScript : public AuraScript + { + PrepareAuraScript(spell_gen_stop_time_AuraScript); + + void Apply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + Unit* caster = GetCaster(); + if (!caster) + return; + Unit* target = GetTarget(); + for (uint32 i = 0; i < 5; ++i) + caster->CastSpell(target, SPELL_SHOCK_CHARGE, false); + } + + void Register() + { + AfterEffectApply += AuraEffectApplyFn(spell_gen_stop_time_AuraScript::Apply, EFFECT_0); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_gen_stop_time_AuraScript(); + } +}; + void AddSC_oculus() { new npc_oculus_drake(); new npc_image_belgaristrasz(); + new spell_gen_stop_time(); } -- cgit v1.2.3 From 07e47b89eea849d0d583097c97c88c25e668a0cd Mon Sep 17 00:00:00 2001 From: AliveShiro Date: Wed, 4 Jul 2012 01:48:14 +0200 Subject: Fix Quest A Cleansing Song --- .../world/2012_07_04_world_spell_script_names.sql | 2 + src/server/scripts/Spells/spell_quest.cpp | 47 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 sql/updates/world/2012_07_04_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_07_04_world_spell_script_names.sql b/sql/updates/world/2012_07_04_world_spell_script_names.sql new file mode 100644 index 00000000000..9e157261409 --- /dev/null +++ b/sql/updates/world/2012_07_04_world_spell_script_names.sql @@ -0,0 +1,2 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (52941, -52941); +INSERT INTO `spell_script_names` VALUES (52941, 'spell_q12735_song_of_cleansing'); \ No newline at end of file diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 66ff06decc3..e3714a22304 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -1194,6 +1194,52 @@ public: } }; +enum ACleansingSong +{ + SPELL_SUMMON_SPIRIT_ATAH = 52954, + SPELL_SUMMON_SPIRIT_HAKHALAN = 52958, + SPELL_SUMMON_SPIRIT_KOOSU = 52959, + + AREA_BITTERTIDELAKE = 4385, + AREA_RIVERSHEART = 4290, + AREA_WINTERGRASPRIVER = 4388, +}; + +class spell_q12735_song_of_cleansing : public SpellScriptLoader +{ + public: + spell_q12735_song_of_cleansing() : SpellScriptLoader("spell_q12735_song_of_cleansing") { } + + class spell_q12735_song_of_cleansing_SpellScript : public SpellScript + { + PrepareSpellScript(spell_q12735_song_of_cleansing_SpellScript); + + void HandleScript(SpellEffIndex /*effIndex*/) + { + Unit* caster = GetCaster(); + + if (caster && caster->GetAreaId() == AREA_BITTERTIDELAKE) + caster->CastSpell(caster, SPELL_SUMMON_SPIRIT_ATAH); + + else if (caster && caster->GetAreaId() == AREA_RIVERSHEART) + caster->CastSpell(caster, SPELL_SUMMON_SPIRIT_HAKHALAN); + + else if (caster && caster->GetAreaId() == AREA_WINTERGRASPRIVER) + caster->CastSpell(caster, SPELL_SUMMON_SPIRIT_KOOSU); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_q12735_song_of_cleansing_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_q12735_song_of_cleansing_SpellScript(); + } +}; + void AddSC_quest_spell_scripts() { new spell_q55_sacred_cleansing(); @@ -1222,4 +1268,5 @@ void AddSC_quest_spell_scripts() new spell_q12987_read_pronouncement(); new spell_q12277_wintergarde_mine_explosion(); new spell_q12066_bunny_kill_credit(); + new spell_q12735_song_of_cleansing(); } -- cgit v1.2.3