From 7f241e5b64f9f27b885f15965c810d32a97cb408 Mon Sep 17 00:00:00 2001
From: ZxBiohazardZx <zxbiohazardzx@gmail.com>
Date: Fri, 6 Jan 2012 13:54:34 +0100
Subject: DB/Commits: fix the filenaming on the files used in pull request from
 nelgano and fix some errors, please do not create pull requests for database
 fixes, the issuetracker will do...

Closes #2732, #4461, #1860, #2026, #4187, #4569
---
 sql/updates/world/2011_12_30_02_world_misc.sql     |  4 ----
 sql/updates/world/2011_12_30_04_world_misc.sql     |  2 --
 sql/updates/world/2011_12_30_05_world_misc.sql     | 11 ----------
 sql/updates/world/2011_12_30_06_world_misc.sql     |  3 ---
 sql/updates/world/2011_12_30_08_world_misc.sql     | 25 ----------------------
 sql/updates/world/2012_01_01_00_world_misc.sql     |  7 ------
 sql/updates/world/2012_01_01_01_world_misc.sql     |  2 --
 .../2012_01_06_04_world_creature_questrelation.sql |  5 +++++
 .../2012_01_06_05_world_creature_template.sql      |  2 ++
 .../world/2012_01_06_06_world_quest_template.sql   |  2 ++
 sql/updates/world/2012_01_06_07_world_sai.sql      | 23 ++++++++++++++++++++
 .../2012_01_06_08_world_creature_template.sql      |  2 ++
 .../2012_01_06_09_world_creature_questrelation.sql |  9 ++++++++
 .../2012_01_06_10_world_creature_template.sql      |  2 ++
 14 files changed, 45 insertions(+), 54 deletions(-)
 delete mode 100644 sql/updates/world/2011_12_30_02_world_misc.sql
 delete mode 100644 sql/updates/world/2011_12_30_04_world_misc.sql
 delete mode 100644 sql/updates/world/2011_12_30_05_world_misc.sql
 delete mode 100644 sql/updates/world/2011_12_30_06_world_misc.sql
 delete mode 100644 sql/updates/world/2011_12_30_08_world_misc.sql
 delete mode 100644 sql/updates/world/2012_01_01_00_world_misc.sql
 delete mode 100644 sql/updates/world/2012_01_01_01_world_misc.sql
 create mode 100644 sql/updates/world/2012_01_06_04_world_creature_questrelation.sql
 create mode 100644 sql/updates/world/2012_01_06_05_world_creature_template.sql
 create mode 100644 sql/updates/world/2012_01_06_06_world_quest_template.sql
 create mode 100644 sql/updates/world/2012_01_06_07_world_sai.sql
 create mode 100644 sql/updates/world/2012_01_06_08_world_creature_template.sql
 create mode 100644 sql/updates/world/2012_01_06_09_world_creature_questrelation.sql
 create mode 100644 sql/updates/world/2012_01_06_10_world_creature_template.sql

(limited to 'sql')

diff --git a/sql/updates/world/2011_12_30_02_world_misc.sql b/sql/updates/world/2011_12_30_02_world_misc.sql
deleted file mode 100644
index 5e52a80ab35..00000000000
--- a/sql/updates/world/2011_12_30_02_world_misc.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Ogre Heaven fix PrevQuestID by shlomi1515
--- Closes #2732
-
-UPDATE quest_template SET PrevQuestID='11000' WHERE ID='11009';
diff --git a/sql/updates/world/2011_12_30_04_world_misc.sql b/sql/updates/world/2011_12_30_04_world_misc.sql
deleted file mode 100644
index d59a5551f14..00000000000
--- a/sql/updates/world/2011_12_30_04_world_misc.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Tiger Matriarch Credit have no SAI script
-UPDATE `creature_template` SET `AIName`='' WHERE `entry`=40301;
diff --git a/sql/updates/world/2011_12_30_05_world_misc.sql b/sql/updates/world/2011_12_30_05_world_misc.sql
deleted file mode 100644
index 1ee9c8799ca..00000000000
--- a/sql/updates/world/2011_12_30_05_world_misc.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Fix Report to Gryan Stoutmantle creature_questrelation values by nelegalno
--- Closes #4461
-
-DELETE FROM `creature_questrelation` WHERE `quest` = 109;
-INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES
-(233, 109), -- Farmer Saldean
-(237, 109), -- Farmer Furlbrow
-(240, 109), -- Marshal Dughan
-(261, 109), -- Guard Thomas
-(294, 109), -- Marshal Haggard
-(963, 109); -- Deputy Rainer
diff --git a/sql/updates/world/2011_12_30_06_world_misc.sql b/sql/updates/world/2011_12_30_06_world_misc.sql
deleted file mode 100644
index ecd6360b911..00000000000
--- a/sql/updates/world/2011_12_30_06_world_misc.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Drowned Guardian & Phylactery Guardian summoned NPC should not give XP fix by tobmaps
--- Closes #1860
-UPDATE `creature_template` SET `flags_extra` = 64 WHERE `entry` IN (26225, 26224);
diff --git a/sql/updates/world/2011_12_30_08_world_misc.sql b/sql/updates/world/2011_12_30_08_world_misc.sql
deleted file mode 100644
index df9a75bacd3..00000000000
--- a/sql/updates/world/2011_12_30_08_world_misc.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- Fix Quest 11795, 11887 'Emergency Protocol: Section 8.2, Paragraph C', 'Emergency Supplies' by Pitcrawler
--- Closes #2026 & #4187
-
-SET @NPC    :=25841; -- Fizzcrank Recon Pilot
-SET @Gossip :=21248;
-
-DELETE FROM `gossip_menu_option` WHERE (`menu_id`=@Gossip AND `id`=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
-(@Gossip,1,0,"Search the body for the pilot's insignia.",1,1,0,0,0,0,'');
-
-DELETE FROM `conditions` WHERE `SourceGroup`=21248;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,@Gossip,0,0,9,11887,0,0,0,'',''),
-(15,@Gossip,1,0,9,11795,0,0,0,'','');
-
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC 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
-(@NPC,0,0,0,11,0,100,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - On spawn - set gossip flag'),
-(@NPC,0,1,2,62,0,100,0,@Gossip,0,0,0,11,46362,2,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - On gossip option 0 select - cast spell'),
-(@NPC,0,2,3,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - close gossip'),
-(@NPC,0,3,7,61,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - remove gossip flag'),
-(@NPC,0,4,5,62,0,100,0,@Gossip,1,0,0,11,46166,2,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - On gossip option 1 select - cast spell'),
-(@NPC,0,5,6,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - close gossip'),
-(@NPC,0,6,7,61,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - remove gossip flag'),
-(@NPC,0,7,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - Despawn');
diff --git a/sql/updates/world/2012_01_01_00_world_misc.sql b/sql/updates/world/2012_01_01_00_world_misc.sql
deleted file mode 100644
index 4bbd2d371c8..00000000000
--- a/sql/updates/world/2012_01_01_00_world_misc.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Fix Captain Vimes questrelation
--- Closes #4569
-
-DELETE FROM `creature_questrelation` WHERE `quest`=1220;
-INSERT INTO `creature_questrelation` (`id`,`quest`) VALUES
-(4947,1220),
-(23951,1220);
diff --git a/sql/updates/world/2012_01_01_01_world_misc.sql b/sql/updates/world/2012_01_01_01_world_misc.sql
deleted file mode 100644
index 412fab4dab2..00000000000
--- a/sql/updates/world/2012_01_01_01_world_misc.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Creatures with EAI flag set but no EAI script
-UPDATE `creature_template` SET `AIName` = '' WHERE `entry` IN (29329,29330,29333,29338);
diff --git a/sql/updates/world/2012_01_06_04_world_creature_questrelation.sql b/sql/updates/world/2012_01_06_04_world_creature_questrelation.sql
new file mode 100644
index 00000000000..e1dce65f3bc
--- /dev/null
+++ b/sql/updates/world/2012_01_06_04_world_creature_questrelation.sql
@@ -0,0 +1,5 @@
+-- Fix Captain Vimes questrelation
+DELETE FROM `creature_questrelation` WHERE `quest`=1220;
+INSERT INTO `creature_questrelation` (`id`,`quest`) VALUES
+(4947,1220),
+(23951,1220);
diff --git a/sql/updates/world/2012_01_06_05_world_creature_template.sql b/sql/updates/world/2012_01_06_05_world_creature_template.sql
new file mode 100644
index 00000000000..412fab4dab2
--- /dev/null
+++ b/sql/updates/world/2012_01_06_05_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Creatures with EAI flag set but no EAI script
+UPDATE `creature_template` SET `AIName` = '' WHERE `entry` IN (29329,29330,29333,29338);
diff --git a/sql/updates/world/2012_01_06_06_world_quest_template.sql b/sql/updates/world/2012_01_06_06_world_quest_template.sql
new file mode 100644
index 00000000000..4f58452d980
--- /dev/null
+++ b/sql/updates/world/2012_01_06_06_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Ogre Heaven fix PrevQuestID
+UPDATE `quest_template` SET `PrevQuestID`=11000 WHERE `ID`=11009;
diff --git a/sql/updates/world/2012_01_06_07_world_sai.sql b/sql/updates/world/2012_01_06_07_world_sai.sql
new file mode 100644
index 00000000000..5d322367250
--- /dev/null
+++ b/sql/updates/world/2012_01_06_07_world_sai.sql
@@ -0,0 +1,23 @@
+-- Fix Quest 11795, 11887 'Emergency Protocol: Section 8.2, Paragraph C', 'Emergency Supplies' 
+SET @NPC    :=25841; -- Fizzcrank Recon Pilot
+SET @Gossip :=21248;
+
+DELETE FROM `gossip_menu_option` WHERE (`menu_id`=@Gossip AND `id`=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
+(@Gossip,1,0,"Search the body for the pilot's insignia.",1,1,0,0,0,0,'');
+
+DELETE FROM `conditions` WHERE `SourceGroup`=21248;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,@Gossip,0,0,9,11887,0,0,0,'',''),
+(15,@Gossip,1,0,9,11795,0,0,0,'','');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC 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
+(@NPC,0,0,0,11,0,100,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - On spawn - set gossip flag'),
+(@NPC,0,1,2,62,0,100,0,@Gossip,0,0,0,11,46362,2,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - On gossip option 0 select - cast spell'),
+(@NPC,0,2,3,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - close gossip'),
+(@NPC,0,3,7,61,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - remove gossip flag'),
+(@NPC,0,4,5,62,0,100,0,@Gossip,1,0,0,11,46166,2,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - On gossip option 1 select - cast spell'),
+(@NPC,0,5,6,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - close gossip'),
+(@NPC,0,6,7,61,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - remove gossip flag'),
+(@NPC,0,7,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Recon Pilot - Despawn');
diff --git a/sql/updates/world/2012_01_06_08_world_creature_template.sql b/sql/updates/world/2012_01_06_08_world_creature_template.sql
new file mode 100644
index 00000000000..d59a5551f14
--- /dev/null
+++ b/sql/updates/world/2012_01_06_08_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Tiger Matriarch Credit have no SAI script
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=40301;
diff --git a/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql b/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql
new file mode 100644
index 00000000000..c2af677f047
--- /dev/null
+++ b/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql
@@ -0,0 +1,9 @@
+-- Fix Report to Gryan Stoutmantle creature_questrelation values
+DELETE FROM `creature_questrelation` WHERE `quest` = 109;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES
+(233,109), -- Farmer Saldean
+(237,109), -- Farmer Furlbrow
+(240,109), -- Marshal Dughan
+(261,109), -- Guard Thomas
+(294,109), -- Marshal Haggard
+(963,109); -- Deputy Rainer
diff --git a/sql/updates/world/2012_01_06_10_world_creature_template.sql b/sql/updates/world/2012_01_06_10_world_creature_template.sql
new file mode 100644
index 00000000000..c121fd7424b
--- /dev/null
+++ b/sql/updates/world/2012_01_06_10_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Drowned Guardian & Phylactery Guardian summoned NPC should not give XP
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64 WHERE `entry` IN (26225,26224);
-- 
cgit v1.2.3