Merge branch 'master' of git://github.com/TrinityCore/TrinityCore

17 files changed, 234 insertions, 1 deletions

diff --git a/sql/updates/world/2012_01_22_02_world_creature_addon.sql b/sql/updates/world/2012_01_22_02_world_creature_addon.sql
index 874f229c3a2..808d728610e 100644
--- a/sql/updates/world/2012_01_22_02_world_creature_addon.sql
+++ b/sql/updates/world/2012_01_22_02_world_creature_addon.sql
@@ -1,2 +1,2 @@
 -- cleanups
-DELETE FROM`creature_addon` WHERE `guid` in (133434,1 33435);
+DELETE FROM `creature_addon` WHERE `guid` in (133434,133435);
diff --git a/sql/updates/world/2012_01_23_00_world_sai.sql b/sql/updates/world/2012_01_23_00_world_sai.sql
new file mode 100644
index 00000000000..d73561b6cd6
--- /dev/null
+++ b/sql/updates/world/2012_01_23_00_world_sai.sql
@@ -0,0 +1,110 @@
+-- Windle Sparkshine SAI
+SET @ENTRY := 29261;
+SET @SPELL_LIGHT_LAMP := 60535;
+UPDATE `gameobject` SET `state`=1 WHERE `id` IN (191444,192086,192085,192084,192087,192089,192088,192067,191445,192850,192853,192854,192852,192083,191440,192070,192069,192117,192116,192119,191665);
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@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,68,0,100,0,25,0,0,0,53,0,@ENTRY,0,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - Game Event 25 Start - Start WP"),
+(@ENTRY,0,1,0,40,0,100,0,1,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 1 - Run Script"),
+(@ENTRY,0,2,0,40,0,100,0,5,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 5 - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,8,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 8 - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,12,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 12 - Run Script"),
+(@ENTRY,0,5,0,40,0,100,0,16,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 16 - Run Script"),
+(@ENTRY,0,6,0,40,0,100,0,20,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 20 - Run Script"),
+(@ENTRY,0,7,0,40,0,100,0,24,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 24 - Run Script"),
+(@ENTRY,0,8,0,40,0,100,0,29,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 29 - Run Script"),
+(@ENTRY,0,9,0,40,0,100,0,33,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 33 - Run Script"),
+(@ENTRY,0,10,0,40,0,100,0,36,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 36 - Run Script"),
+(@ENTRY,0,11,0,40,0,100,0,38,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 38 - Run Script"),
+(@ENTRY,0,12,0,40,0,100,0,45,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 45 - Run Script"),
+(@ENTRY,0,13,0,40,0,100,0,48,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 48 - Run Script"),
+(@ENTRY,0,14,0,40,0,100,0,53,@ENTRY,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - At WP 53 - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,54,3500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - On Script - Pause WP"),
+(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,0,0,11,@SPELL_LIGHT_LAMP,0,0,0,0,0,1,0,0,0,0,0,0,0,"Windle Sparkshine - On Script - Cast Light Lamp"),
+(@ENTRY,0,15,0,40,0,100,0,1,@ENTRY,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.654867,"Windle Sparkshine - At WP 56 - Set Orientation");
+
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,5747.069,685.3748,643.8239,'Windle Sparkshine'), -- Lamp 1
+(@ENTRY,2,5749.971,682.7211,643.4057,'Windle Sparkshine'),
+(@ENTRY,3,5760.647,698.313,642.3947,'Windle Sparkshine'),
+(@ENTRY,4,5770.979,712.3667,641.5851,'Windle Sparkshine'),
+(@ENTRY,5,5771.641,718.9518,641.9728,'Windle Sparkshine'), -- Lamp 2
+(@ENTRY,6,5793.795,719.567,640.5906,'Windle Sparkshine'),
+(@ENTRY,7,5806.629,718.5358,640.7841,'Windle Sparkshine'),
+(@ENTRY,8,5807.11,723.0623,641.0547,'Windle Sparkshine'), -- Lamp 3
+(@ENTRY,9,5812.014,718.6132,640.9974,'Windle Sparkshine'),
+(@ENTRY,10,5825.027,714.0911,640.9233,'Windle Sparkshine'),
+(@ENTRY,11,5836.411,706.2252,641.2604,'Windle Sparkshine'),
+(@ENTRY,12,5838.926,710.4177,641.3674,'Windle Sparkshine'), -- Lamp 4
+(@ENTRY,13,5836.411,706.2252,641.2604,'Windle Sparkshine'),
+(@ENTRY,14,5850.628,692.9323,642.3394,'Windle Sparkshine'),
+(@ENTRY,15,5871.261,679.3507,643.1625,'Windle Sparkshine'),
+(@ENTRY,16,5889.708,676.6304,643.6068,'Windle Sparkshine'), -- Lamp 5
+(@ENTRY,17,5885.975,668.9486,643.8263,'Windle Sparkshine'),
+(@ENTRY,18,5894.604,656.5289,644.8455,'Windle Sparkshine'),
+(@ENTRY,19,5893.215,644.1390,645.6358,'Windle Sparkshine'),
+(@ENTRY,20,5891.531,635.5212,647.5772,'Windle Sparkshine'), -- Lamp 6
+(@ENTRY,21,5885.393,639.2025,646.5132,'Windle Sparkshine'),
+(@ENTRY,22,5878.637,630.1852,647.6648,'Windle Sparkshine'),
+(@ENTRY,23,5865.146,615.7023,650.0197,'Windle Sparkshine'),
+(@ENTRY,24,5867.964,613.0705,650.4550,'Windle Sparkshine'), -- Lamp 7
+(@ENTRY,25,5865.146,615.7023,650.0197,'Windle Sparkshine'),
+(@ENTRY,26,5854.076,607.8509,650.7210,'Windle Sparkshine'),
+(@ENTRY,27,5840.764,590.5446,650.6240,'Windle Sparkshine'),
+(@ENTRY,28,5837.371,583.0912,650.7756,'Windle Sparkshine'),
+(@ENTRY,29,5840.763,580.3890,651.8137,'Windle Sparkshine'), -- Lamp 8
+(@ENTRY,30,5837.371,583.0912,650.7756,'Windle Sparkshine'),
+(@ENTRY,31,5822.904,570.0418,650.1446,'Windle Sparkshine'),
+(@ENTRY,32,5805.871,564.1931,650.1898,'Windle Sparkshine'),
+(@ENTRY,33,5796.087,561.1876,650.6658,'Windle Sparkshine'), -- Lamp 9
+(@ENTRY,34,5796.753,566.2323,650.1285,'Windle Sparkshine'),
+(@ENTRY,35,5772.444,583.8340,649.8836,'Windle Sparkshine'),
+(@ENTRY,36,5767.615,579.1342,650.2487,'Windle Sparkshine'), -- Lamp 10
+(@ENTRY,37,5761.446,588.7081,649.6515,'Windle Sparkshine'),
+(@ENTRY,38,5750.556,591.0724,649.8145,'Windle Sparkshine'), -- Lamp 11
+(@ENTRY,39,5749.783,599.296,649.0384,'Windle Sparkshine'),
+(@ENTRY,40,5737.969,611.5457,647.9193,'Windle Sparkshine'),
+(@ENTRY,41,5726.467,621.8894,646.9294,'Windle Sparkshine'),
+(@ENTRY,42,5714.581,625.4625,646.4603,'Windle Sparkshine'),
+(@ENTRY,43,5702.122,627.8116,646.3648,'Windle Sparkshine'),
+(@ENTRY,44,5693.323,629.3795,646.5901,'Windle Sparkshine'),
+(@ENTRY,45,5687.516,629.6511,647.1143,'Windle Sparkshine'), -- Lamp 12
+(@ENTRY,46,5692.803,651.879,646.5027,'Windle Sparkshine'),
+(@ENTRY,47,5696.018,667.5477,645.7817,'Windle Sparkshine'),
+(@ENTRY,48,5695.917,678.2612,646.0887,'Windle Sparkshine'), -- Lamp 13
+(@ENTRY,49,5700.438,674.0465,645.4587,'Windle Sparkshine'),
+(@ENTRY,50,5714.589,662.3508,645.9952,'Windle Sparkshine'),
+(@ENTRY,51,5723.479,658.3279,646.0461,'Windle Sparkshine'),
+(@ENTRY,52,5728.87,666.1133,645.8447,'Windle Sparkshine'),
+(@ENTRY,53,5726.601,666.7487,645.8505,'Windle Sparkshine'), -- Lamp 14
+(@ENTRY,54,5736.254,665.7919,644.9579,'Windle Sparkshine'),
+(@ENTRY,55,5744.996,676.1825,644.0975,'Windle Sparkshine'),
+(@ENTRY,56,5744.94,681.546,644.136,'Windle Sparkshine'); -- Homeposition
+
+-- Conditions for spell 'Light Lamp'
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_LIGHT_LAMP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,191444,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192086,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192085,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192084,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192087,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192089,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192088,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192067,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,191445,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192850,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192853,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192854,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192852,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192083,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,191440,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192070,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192069,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192117,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192116,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,192119,0,0,'',NULL),
+(13,0,@SPELL_LIGHT_LAMP,0,18,0,191665,0,0,'',NULL);
diff --git a/sql/updates/world/2012_01_23_01_world_creature_script_names.sql b/sql/updates/world/2012_01_23_01_world_creature_script_names.sql
new file mode 100644
index 00000000000..d7c2b22725e
--- /dev/null
+++ b/sql/updates/world/2012_01_23_01_world_creature_script_names.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='npc_frost_tomb' WHERE `entry`=23965;
+UPDATE `creature_template` SET `ScriptName`='npc_vrykul_skeleton' WHERE `entry`=23970;
diff --git a/sql/updates/world/2012_01_23_02_world_disables.sql b/sql/updates/world/2012_01_23_02_world_disables.sql
new file mode 100644
index 00000000000..0a1be704dac
--- /dev/null
+++ b/sql/updates/world/2012_01_23_02_world_disables.sql
@@ -0,0 +1 @@
+DELETE FROM `disables` WHERE `entry`=7231 AND `sourceType`=4;
diff --git a/sql/updates/world/2012_01_23_03_world_achievement_criteria_data.sql b/sql/updates/world/2012_01_23_03_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..4d1f4536455
--- /dev/null
+++ b/sql/updates/world/2012_01_23_03_world_achievement_criteria_data.sql
@@ -0,0 +1,3 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=7231;
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `ScriptName`) VALUES 
+(7231,11,'achievement_on_the_rocks');
diff --git a/sql/updates/world/2012_01_23_04_world_creature_text.sql b/sql/updates/world/2012_01_23_04_world_creature_text.sql
new file mode 100644
index 00000000000..f505a86b16c
--- /dev/null
+++ b/sql/updates/world/2012_01_23_04_world_creature_text.sql
@@ -0,0 +1,9 @@
+DELETE FROM `script_texts` WHERE `entry` IN (-1574000,-1574001,-1574002,-1574003,-1574004);
+
+DELETE FROM `creature_text` WHERE `entry`=23953;
+INSERT INTO `creature_text` (`entry`, `groupid`, `text`, `sound`, `emote`, `type`) VALUES 
+(23953,1,'Your blood is mine!',13221,7,14),
+(23953,2,'Aranal, ledel! Their fate shall be yours!',13224,0,14),
+(23953,3,'Not so fast.',13222,0,14),
+(23953,4,'%s casts Frost Tomb on $n.',0,0,41),
+(23953,5,'I join... the night.',13225,0,14);
diff --git a/sql/updates/world/2012_01_23_05_world_spell_script_names.sql b/sql/updates/world/2012_01_23_05_world_spell_script_names.sql
new file mode 100644
index 00000000000..6f3b4907e5b
--- /dev/null
+++ b/sql/updates/world/2012_01_23_05_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=48400;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(48400,'spell_frost_tomb');
diff --git a/sql/updates/world/2012_01_23_06_world_achievement_criteria_data.sql b/sql/updates/world/2012_01_23_06_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..33899c3f512
--- /dev/null
+++ b/sql/updates/world/2012_01_23_06_world_achievement_criteria_data.sql
@@ -0,0 +1,3 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=7231 AND `type`=12;
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+(7231,12,1,0,'');
diff --git a/sql/updates/world/2012_01_23_07_world_creature_text.sql b/sql/updates/world/2012_01_23_07_world_creature_text.sql
new file mode 100644
index 00000000000..90ac11e363c
--- /dev/null
+++ b/sql/updates/world/2012_01_23_07_world_creature_text.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_text` SET `comment`='Prince Keleseth - SAY_DEATH' WHERE `groupid`=5 AND `entry`=23953;
+UPDATE `creature_text` SET `comment`='Prince Keleseth - SAY_FROST_TOMB_EMOTE' WHERE `groupid`=4 AND `entry`=23953;
+UPDATE `creature_text` SET `comment`='Prince Keleseth - SAY_FROST_TOMB' WHERE `groupid`=3 AND `entry`=23953;
+UPDATE `creature_text` SET `comment`='Prince Keleseth - SAY_SUMMON_SKELETONS' WHERE `groupid`=2 AND `entry`=23953;
+UPDATE `creature_text` SET `comment`='Prince Keleseth - SAY_START_COMBAT' WHERE `groupid`=1 AND `entry`=23953;
diff --git a/sql/updates/world/2012_01_24_00_world_misc.sql b/sql/updates/world/2012_01_24_00_world_misc.sql
new file mode 100644
index 00000000000..8703cd7aa42
--- /dev/null
+++ b/sql/updates/world/2012_01_24_00_world_misc.sql
@@ -0,0 +1,18 @@
+-- Make Dame Evniki Kapsalis show vendor gossip option only to players with Crusader title
+UPDATE `creature_template` SET `AIName` = 'SmartAI',`ScriptName` = '' WHERE `entry` = 34885;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10598;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`COMMENT`) VALUES
+(15,10598,0,0,17,2816,0,0,0,'',"Evniki Kapsalis should only sell to Crusaders"),
+(15,10598,0,1,17,2817,0,0,0,'',"Evniki Kapsalis should only sell to Crusaders");
+
+SET @SPELL_CHAIN          = 68341;
+SET @NPC_FJOLA_LIGHTBANE  = 36065;
+SET @NPC_EYDIS_DARKBANE   = 36066;
+SET @NPC_PRIESTESS_ALORAH = 36101;
+SET @NPC_PRIEST_GRIMMIN   = 36102;
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` IN(@NPC_PRIESTESS_ALORAH,@NPC_PRIEST_GRIMMIN);
+DELETE FROM `smart_scripts` WHERE (`entryorguid` IN(@NPC_PRIESTESS_ALORAH,@NPC_PRIEST_GRIMMIN) 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_PRIESTESS_ALORAH,0,0,0,1,0,100,1,100,100,0,0,11,@SPELL_CHAIN,0,0,0,0,0,19,@NPC_EYDIS_DARKBANE,0,0,0,0,0,0,'Priestess Alorah - Cast chain on Eydis Darkbane'),
+(@NPC_PRIEST_GRIMMIN,0,0,0,1,0,100,1,100,100,0,0,11,@SPELL_CHAIN,0,0,0,0,0,19,@NPC_FJOLA_LIGHTBANE,0,0,0,0,0,0,'Priestess Grimmin - Cast chain on Fjola Lightbane');
diff --git a/sql/updates/world/2012_01_24_00_world_spell_script_names.sql b/sql/updates/world/2012_01_24_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..0e772c3c200
--- /dev/null
+++ b/sql/updates/world/2012_01_24_00_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+-- Scriptname for Refocus spell
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_refocus';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(24531,'spell_item_refocus');
diff --git a/sql/updates/world/2012_01_26_00_world_sai.sql b/sql/updates/world/2012_01_26_00_world_sai.sql
new file mode 100644
index 00000000000..ee69e263e2e
--- /dev/null
+++ b/sql/updates/world/2012_01_26_00_world_sai.sql
@@ -0,0 +1,45 @@
+-- Quest Elven Legends (7481, 7482)
+-- Skeletal Remains of Kariel Winthalus SAI
+SET @ENTRY  := 179544; -- GO entry
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=1 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,1,0,0,62,0,100,0,5743,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Skeletal Remains of Kariel Winthalus - On Gossip option select - run script'),
+(@ENTRY,1,1,0,62,0,100,0,5743,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Skeletal Remains of Kariel Winthalus - On Gossip option select - run 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, 'Skeletal Remains of Kariel Winthalus - Script - Close Gossip'),
+(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Skeletal Remains of Kariel Winthalus - Script - Store target'),
+(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,100,1,0,0,0,0,0,11,14368,30,0,0,0,0,0, 'Skeletal Remains of Kariel Winthalus - Script - Send target'),
+(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,45,0,1,0,0,0,0,11,14368,30,0,0,0,0,0,'Skeletal Remains of Kariel Winthalus - Script - Set data 0 1 for entry 14368'),
+(@ENTRY*100,9,4,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Skeletal Remains of Kariel Winthalus - Script - Deactivate self'),
+(@ENTRY*100,9,5,0,0,0,100,0,28000,28000,28000,28000,32,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Skeletal Remains of Kariel Winthalus - Script - Activate self');
+-- Lorekeeper Lydros SAI
+SET @ENTRY := 14368; -- NPC entry
+UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@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,38,0,100,0,0,1,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Lorekeeper Lydros - 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,'Lorekeeper Lydros - Script - set data 0 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,1000,1000,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,'Lorekeeper Lydros - Script - turn to player'),
+(@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,'Lorekeeper Lydros - Script - Say 0'),
+(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,4000,4000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lorekeeper Lydros - Script - Say 1'),
+(@ENTRY*100,9,4,0,0,0,100,0,8000,8000,8000,8000,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lorekeeper Lydros - Script - Say 2'),
+(@ENTRY*100,9,5,0,0,0,100,0,11000,11000,11000,11000,15,7481,0,0,0,0,0,12,1,0,0,0,0,0,0,'Lorekeeper Lydros - Script - quest credit'),
+(@ENTRY*100,9,6,0,0,0,100,0,0,0,0,0,15,7482,0,0,0,0,0,12,1,0,0,0,0,0,0,'Lorekeeper Lydros - Script - quest credit'),
+(@ENTRY*100,9,7,0,0,0,100,0,2000,2000,2000,2000,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lorekeeper Lydros - Script - reset orientation');
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry`=14368;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(14368,0,0, 'I very much doubt that he will have anything to say, stranger...',12,0,100,1,0,0, 'Lorekeeper Lydros'),
+(14368,1,0, 'I personally did not mind him. It was the Prince who took exception to a high elf in his domain. Alas, I am not one to question the Prince. In his defense, he did not incinerate Master Winthalus immediately.',12,0,100,1,0,0, 'Lorekeeper Lydros'),
+(14368,2,0, 'We most definitely do not need anymore attention drawn to us, stranger. Return to those that sent you in search of the lost master and tell them that nothing could be found. When this is done - and I will know when it is so - return and I shall reveal the secrets of the deceased.',12,0,100,1,0,0, 'Lorekeeper Lydros');
+-- Gossip Fix from nelegalno
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=5743;
+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
+(5743,0,0,"Mourn the great loss.",1,1,0,0,0,0,NULL), -- A gossip
+(5743,1,0,"Mourn the great loss.",1,1,0,0,0,0,NULL); -- H gossip
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=15 AND `SourceGroup`=5743);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,5743,0,0,9,7482,0,0,0,'',"Display gossip option when on Elven Legends A quest"),
+(15,5743,1,0,9,7481,0,0,0,'',"Display gossip option when on Elven Legends H quest");
diff --git a/sql/updates/world/2012_01_27_00_player_factionchange_items.sql b/sql/updates/world/2012_01_27_00_player_factionchange_items.sql
new file mode 100644
index 00000000000..1dc2749807e
--- /dev/null
+++ b/sql/updates/world/2012_01_27_00_player_factionchange_items.sql
@@ -0,0 +1,4 @@
+-- DB/Faction change: Add some missing items
+DELETE FROM `player_factionchange_items` WHERE `alliance_id` IN (47711) AND horde_id IN (47870);
+INSERT INTO `player_factionchange_items` (`race_A`,`alliance_id`,`commentA`,`race_H`,`horde_id`,`commentH`) VALUES 
+(0,47711, 'Girdle of the Nether Champion',0,47870, 'Belt of the Nether Championt');
diff --git a/sql/updates/world/2012_01_28_world_conditions.sql b/sql/updates/world/2012_01_28_world_conditions.sql
new file mode 100644
index 00000000000..8d087af7e88
--- /dev/null
+++ b/sql/updates/world/2012_01_28_world_conditions.sql
@@ -0,0 +1,16 @@
+-- Class Condition update to use flags
+UPDATE `conditions` SET `ConditionValue1`=8 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=21194 AND `ConditionTypeOrReference`=15;
+UPDATE `conditions` SET `ConditionValue1`=128 WHERE `SourceTypeOrReferenceId` IN (14,15) AND`SourceGroup`=4486 AND `ConditionTypeOrReference`=15;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=20 AND `SourceEntry` IN (13104,13105) AND `ConditionTypeOrReference`=15;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(20,0,13104,1,15,1503,0,0,0,'','Show quest 13104 if player is not a Death Knight'),
+(20,0,13105,1,15,32,0,0,0,'','Show quest 13105 if player is a Death Knight');
+-- Race Condition update to use flags
+UPDATE `conditions` SET `ConditionValue1`=128 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24101 AND `ConditionTypeOrReference`=16;
+UPDATE `conditions` SET `ConditionValue1`=32 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24102 AND `ConditionTypeOrReference`=16;
+UPDATE `conditions` SET `ConditionValue1`=16 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24103 AND `ConditionTypeOrReference`=16;
+UPDATE `conditions` SET `ConditionValue1`=64 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24106 AND `ConditionTypeOrReference`=16;
+UPDATE `conditions` SET `ConditionValue1`=4 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24107 AND `ConditionTypeOrReference`=16;
+UPDATE `conditions` SET `ConditionValue1`=8 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24108 AND `ConditionTypeOrReference`=16;
+UPDATE `conditions` SET `ConditionValue1`=512 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=69530 AND `ConditionTypeOrReference`=16;
+UPDATE `conditions` SET `ConditionValue1`=1024 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=69533 AND `ConditionTypeOrReference`=16;
\ No newline at end of file
diff --git a/sql/updates/world/2012_01_29_00_world_spell_dbc.sql b/sql/updates/world/2012_01_29_00_world_spell_dbc.sql
new file mode 100644
index 00000000000..bbde43e3313
--- /dev/null
+++ b/sql/updates/world/2012_01_29_00_world_spell_dbc.sql
@@ -0,0 +1,4 @@
+-- Gushing Wound Removal spell
+DELETE FROM `spell_dbc` WHERE `id`=30023;
+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
+(30023,0,0,256,0,0,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,26,1,0,-1,0,0,164,164,164,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35321,38363,39215,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,"Gushing Wound Removal");
diff --git a/sql/updates/world/2012_01_29_01_world_spell_bonus_data.sql b/sql/updates/world/2012_01_29_01_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..d31489b8fce
--- /dev/null
+++ b/sql/updates/world/2012_01_29_01_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, -1, -1, 0, 0, 'Priest - Empowered Renew');
diff --git a/sql/updates/world/2012_01_29_02_world_spell_trigger_spell.sql b/sql/updates/world/2012_01_29_02_world_spell_trigger_spell.sql
new file mode 100644
index 00000000000..13f9380c950
--- /dev/null
+++ b/sql/updates/world/2012_01_29_02_world_spell_trigger_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 57908 AND `spell_effect` = 57915;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(57908,57915,0,'q13129 - Give quest item');