SQL: Fix remaining errors... *sighs*

5 files changed, 32 insertions, 29 deletions

diff --git a/sql/updates/world/2012_01_13_03_gossip_menu.sql b/sql/updates/world/2012_01_13_03_gossip_menu.sql
index 26788eeb123..98dda69bf1a 100644
--- a/sql/updates/world/2012_01_13_03_gossip_menu.sql
+++ b/sql/updates/world/2012_01_13_03_gossip_menu.sql
@@ -17,7 +17,7 @@ INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8696,10946);
 -- Creature Gossip_menu_id Update from sniff
 UPDATE `creature_template` SET `gossip_menu_id`=8701 WHERE `entry`=23309;
 -- Creature Gossip_menu_option Update from sniff
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8701,8695,8700,8699,8698,8697) AND `id` IN (0);
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8701,8695,8700,8699,8698,8697) 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
 (8701,0,0, 'I am here for you, overseer.',1,1,8695,0,0,0, ''),
 (8695,0,0, 'How dare you question an overseer of the Dragonmaw!',1,1,8700,0,0,0, ''),
@@ -52,7 +52,7 @@ INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `l
 (23286,32726,15,1,0,1,1),
 (23324,32726,15,1,0,1,1);
 -- Loot Conditions by mweinelt
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup` IN (23286,23324);  AND `SourceEntry`=32726;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup` IN (23286,23324)  AND `SourceEntry`=32726;
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
 (1,23286,32726,0,5,1015,4,0,0, '', 'Murkblood Escape Plans - when Netherwing friendly'),
 (1,23324,32726,0,5,1015,4,0,0, '', 'Murkblood Escape Plans - when Netherwing friendly'),
diff --git a/sql/updates/world/2012_01_13_04_world_creature_texts.sql b/sql/updates/world/2012_01_13_04_world_creature_texts.sql
index eb6e849fc6a..ffab5673873 100644
--- a/sql/updates/world/2012_01_13_04_world_creature_texts.sql
+++ b/sql/updates/world/2012_01_13_04_world_creature_texts.sql
@@ -2,17 +2,18 @@
 DELETE FROM `script_texts` WHERE `entry` IN (-1552010, -1552022);
 
 -- Add new creature_text for Millhouse ManaStorm
+DELETE FROM `creature_text` WHERE `entry`=20977;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(20977, 0, 0, 'Where in Bonzo\'\'s brass buttons am I? And who are-- yaaghh, that\'s one mother of a headache!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 1, 0, '"Lowly"? I don\'t care who you are friend, no one refers to the mighty Millhouse Manastorm as "Lowly"! I have no idea what goes on here, but I will gladly join your fight against this impudent imbecile! Prepare to defend yourself, cretin!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 2, 0, 'I just need to get some things ready first. You guys go ahead and get started. I need to summon up some water...', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 3, 0, 'Fantastic! Next, some protective spells. Yes! Now we\'re cookin\'', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 4, 0, 'And of course i\'ll need some mana. You guys are gonna love this, just wait.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 5, 0, 'Aaalllriiiight!! Who ordered up an extra large can of whoop-ass?', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 6, 0, 'I didn\'t even break a sweat on that one.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 6, 1, 'You guys, feel free to jump in anytime.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 7, 0, 'I\'m gonna light you up, sweet cheeks!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 8, 0, 'Ice, ice, baby!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 9, 0, 'Heal me! Oh, for the love of all that is holy, HEAL me! I\'m dying!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 10, 0, 'You\'ll be hearing from my lawyer...', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
-(20977, 11, 0, 'Who\'s bad? Who\'s bad? That\'s right: we bad!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm');
+(20977, 0, 0, 'Where in Bonzo''s brass buttons am I? And who are-- yaaghh, that''s one mother of a headache!', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 1, 0, '"Lowly"? I don''t care who you are friend, no one refers to the mighty Millhouse Manastorm as "Lowly"! I have no idea what goes on here, but I will gladly join your fight against this impudent imbecile! Prepare to defend yourself, cretin!', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 2, 0, 'I just need to get some things ready first. You guys go ahead and get started. I need to summon up some water...', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 3, 0, 'Fantastic! Next, some protective spells. Yes! Now we''re cookin''', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 4, 0, 'And of course I''ll need some mana. You guys are gonna love this, just wait.', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 5, 0, 'Aaalllriiiight!! Who ordered up an extra large can of whoop-ass?', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 6, 0, 'I didn''t even break a sweat on that one.', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 6, 1, 'You guys, feel free to jump in anytime.', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 7, 0, 'I''m gonna light you up, sweet cheeks!', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 8, 0, 'Ice, ice, baby!', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 9, 0, 'Heal me! Oh, for the love of all that is holy, HEAL me! I''m dying!', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 10, 0, 'You''ll be hearing from my lawyer...', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
+(20977, 11, 0, 'Who''s bad? Who''s bad? That''s right: we bad!', 12, 0, 100, 0, 0, 0, 'Millhouse Manastorm');
diff --git a/sql/updates/world/2012_01_13_05_world_creature_texts.sql b/sql/updates/world/2012_01_13_05_world_creature_texts.sql
index a606f9a84e5..87aee698a11 100644
--- a/sql/updates/world/2012_01_13_05_world_creature_texts.sql
+++ b/sql/updates/world/2012_01_13_05_world_creature_texts.sql
@@ -2,13 +2,14 @@
 DELETE FROM `script_texts` WHERE `entry` IN (-1552023, -1552030);
 
 -- Add new creature_text for Warden Mellichar
+DELETE FROM `creature_text` WHERE `entry`=20904;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(20904, 0, 0, 'I knew the prince would be angry but, I... I have not been myself. I had to let them out! The great one speaks to me, you see. Wait--outsiders. Kael\'thas did not send you! Good... I\'ll just tell the prince you released the prisoners!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
-(20904, 1, 0, 'The naaru kept some of the most dangerous beings in existence here in these cells. Let me introduce you to another...', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
-(20904, 2, 0, 'Yes, yes... another! Your will is mine!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
-(20904, 3, 0, 'Behold another terrifying creature of incomprehensible power!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
-(20904, 4, 0, 'What is this? A lowly gnome? I will do better, O\'great one.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
-(20904, 5, 0, 'Anarchy! Bedlam! Oh, you are so wise! Yes, I see it now, of course!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
-(20904, 6, 0, 'One final cell remains. Yes, O\'great one, right away!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
-(20904, 7, 0, 'Welcome, O\'great one. I am your humble servant.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar');
+(20904, 0, 0, 'I knew the prince would be angry but, I... I have not been myself. I had to let them out! The great one speaks to me, you see. Wait--outsiders. Kael''thas did not send you! Good... I''ll just tell the prince you released the prisoners!', 14, 0, 100, 0, 0, 0, 'Warden Mellichar'),
+(20904, 1, 0, 'The naaru kept some of the most dangerous beings in existence here in these cells. Let me introduce you to another...', 14, 0, 100, 0, 0, 0, 'Warden Mellichar'),
+(20904, 2, 0, 'Yes, yes... another! Your will is mine!', 14, 0, 100, 0, 0, 0, 'Warden Mellichar'),
+(20904, 3, 0, 'Behold another terrifying creature of incomprehensible power!', 14, 0, 100, 0, 0, 0, 'Warden Mellichar'),
+(20904, 4, 0, 'What is this? A lowly gnome? I will do better, O great one.', 14, 0, 100, 0, 0, 0, 'Warden Mellichar'),
+(20904, 5, 0, 'Anarchy! Bedlam! Oh, you are so wise! Yes, I see it now, of course!', 14, 0, 100, 0, 0, 0, 'Warden Mellichar'),
+(20904, 6, 0, 'One final cell remains. Yes, O great one, right away!', 14, 0, 100, 0, 0, 0, 'Warden Mellichar'),
+(20904, 7, 0, 'Welcome, O great one. I am your humble servant.', 14, 0, 100, 0, 0, 0, 'Warden Mellichar');
 
diff --git a/sql/updates/world/2012_01_13_06_world_creature_text.sql b/sql/updates/world/2012_01_13_06_world_creature_text.sql
index 8ad3ab63443..99429cfad5f 100644
--- a/sql/updates/world/2012_01_13_06_world_creature_text.sql
+++ b/sql/updates/world/2012_01_13_06_world_creature_text.sql
@@ -2,9 +2,10 @@
 DELETE FROM `script_texts` WHERE `entry` IN (-1000106, -1000110);
 
 -- Add creature texts for Torek
+DELETE FROM `creature_text` WHERE `entry`=12858;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(12858, 0, 0, 'Everyone ready?', 0, 0, 100, 0, 0, 0, 'Torek'),
-(12858, 1, 0, 'Ok, Lets move out!', 0, 0, 100, 0, 0, 0, 'Torek'),
-(12858, 2, 0, 'Prepare yourselves. Silverwing is just around the bend.', 0, 0, 100, 0, 0, 0, 'Torek'),
-(12858, 3, 0, 'Silverwing is ours!', 0, 0, 100, 0, 0, 0, 'Torek'),
-(12858, 4, 0, 'Go report that the outpost is taken. We will remain here.', 0, 0, 100, 0, 0, 0, 'Torek');
+(12858, 0, 0, 'Everyone ready?', 12, 0, 100, 0, 0, 0, 'Torek'),
+(12858, 1, 0, 'Ok, Lets move out!', 12, 0, 100, 0, 0, 0, 'Torek'),
+(12858, 2, 0, 'Prepare yourselves. Silverwing is just around the bend.', 12, 0, 100, 0, 0, 0, 'Torek'),
+(12858, 3, 0, 'Silverwing is ours!', 12, 0, 100, 0, 0, 0, 'Torek'),
+(12858, 4, 0, 'Go report that the outpost is taken. We will remain here.', 12, 0, 100, 0, 0, 0, 'Torek');
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index 0fba8b2f1ab..5d26653a1a8 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -50,7 +50,7 @@ enum TorekSpells
     SPELL_THUNDERCLAP           = 8078,
 };
 
-enum
+enum TorekMisc
 {
     QUEST_TOREK_ASSULT          = 6544,