Merge branch '4.x' of git://github.com/TrinityCore/TrinityCore into 4.x

42 files changed, 891 insertions, 6 deletions

diff --git a/sql/updates/world/2011_12_13_00_world_misc.sql b/sql/updates/world/2011_12_13_00_world_misc.sql
index 48848c368f1..13958e75761 100644
--- a/sql/updates/world/2011_12_13_00_world_misc.sql
+++ b/sql/updates/world/2011_12_13_00_world_misc.sql
@@ -3,4 +3,4 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 (28012,0,0,'The trickster Mage-Lord Urom protects the third ring. He will appear alone and defenseless, but do not be fooled by appearences! Urom is a powerful conjurer who commands a menagerie of Phantasmal creatures. Seek him out above.',12,0,0,0,0,0,''),
 (28012,1,1,'Your greatest challenge lies ahead. Ley-Guardian Eregos is a Blue dragon of immense power. You will find him flying above the uppermost ring.',12,0,0,0,0,0,'');
 
-UPDATE `creature_template` SET `ScriptName`='npc_image_belgaristrasz' WHERE `entry`=28012;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_image_belgaristrasz' WHERE `entry`=28012;
diff --git a/sql/updates/world/2011_12_13_01_world_achievement_criteria_data.sql b/sql/updates/world/2011_12_13_01_world_achievement_criteria_data.sql
index 9f3f22d7792..89bbfc7126d 100644
--- a/sql/updates/world/2011_12_13_01_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2011_12_13_01_world_achievement_criteria_data.sql
@@ -9,4 +9,4 @@ INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,
 (7178,5,49346,1,''),  -- Emerald Drake
 (7178,12,1,0, ''),    -- hc mode only
 (7179,5,49464,1,''),  -- Ruby Drake
-(7179,12,1,0, '');    -- hc mode only
\ No newline at end of file
+(7179,12,1,0, '');    -- hc mode only
diff --git a/sql/updates/world/2011_12_13_02_creature_template_addon.sql b/sql/updates/world/2011_12_13_02_creature_template_addon.sql
index 2e7280927bf..f1dc473bdd7 100644
--- a/sql/updates/world/2011_12_13_02_creature_template_addon.sql
+++ b/sql/updates/world/2011_12_13_02_creature_template_addon.sql
@@ -1,2 +1,2 @@
 -- Fix speed of oculus drakes
-UPDATE `creature_template_addon` SET `auras`='50325' WHERE `entry` IN (27755,27692,27756);
\ No newline at end of file
+UPDATE `creature_template_addon` SET `auras`='50325' WHERE `entry` IN (27755,27692,27756);
diff --git a/sql/updates/world/2011_12_14_01_gameobject_template.sql b/sql/updates/world/2011_12_14_01_world_gameobject_template.sql
index 12729afd6b8..52c04703acc 100644
--- a/sql/updates/world/2011_12_14_01_gameobject_template.sql
+++ b/sql/updates/world/2011_12_14_01_world_gameobject_template.sql
@@ -1 +1 @@
-UPDATE `gameobject_template` SET `scriptName` = 'go_ethereal_teleport_pad' WHERE `entry` = 184073; -- Update Ethereal Teleport Pad scriptname
\ No newline at end of file
+UPDATE `gameobject_template` SET `scriptName` = 'go_ethereal_teleport_pad' WHERE `entry` = 184073; -- Update Ethereal Teleport Pad scriptname
diff --git a/sql/updates/world/2011_12_16_00_world_creature_template.sql b/sql/updates/world/2011_12_16_00_world_creature_template.sql
index 156fd431359..3ff9d630c54 100644
--- a/sql/updates/world/2011_12_16_00_world_creature_template.sql
+++ b/sql/updates/world/2011_12_16_00_world_creature_template.sql
@@ -1,4 +1,4 @@
 -- Greater Fire Elemental script
 UPDATE `creature_template` SET `ScriptName`='npc_fire_elemental' WHERE `entry`=15438;
 -- Greater Earth Elemental script
-UPDATE `creature_template` SET `ScriptName`='npc_earth_elemental' WHERE `entry`=15352;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_earth_elemental' WHERE `entry`=15352;
diff --git a/sql/updates/world/2011_12_16_00_world_spell_bonus_data.sql b/sql/updates/world/2011_12_16_00_world_spell_bonus_data.sql
index 3250bda4fdb..5864b9ac042 100644
--- a/sql/updates/world/2011_12_16_00_world_spell_bonus_data.sql
+++ b/sql/updates/world/2011_12_16_00_world_spell_bonus_data.sql
@@ -2,4 +2,4 @@
 DELETE FROM `spell_bonus_data` WHERE `entry` IN (13376,57984);
 INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`,`ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
 (13376,0.032,-1,-1,-1,'Greater Fire Elemental - Fire Shield'),
-(57984,0.4289,-1,-1,-1,'Greater Fire Elemental - Fire Blast');
\ No newline at end of file
+(57984,0.4289,-1,-1,-1,'Greater Fire Elemental - Fire Blast');
diff --git a/sql/updates/world/2011_12_18_01_world_gossip.sql b/sql/updates/world/2011_12_18_01_world_gossip.sql
new file mode 100644
index 00000000000..eb76ffe4009
--- /dev/null
+++ b/sql/updates/world/2011_12_18_01_world_gossip.sql
@@ -0,0 +1,42 @@
+-- Gossip Menu insert from sniff
+DELETE FROM `gossip_menu` WHERE `entry`=7610 AND `text_id`=9261;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7610,9261);
+DELETE FROM `gossip_menu` WHERE `entry`=8249 AND `text_id`=10266;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8249,10266);
+DELETE FROM `gossip_menu` WHERE `entry`=7612 AND `text_id`=9263;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7612,9263);
+DELETE FROM `gossip_menu` WHERE `entry`=7611 AND `text_id`=9262;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7611,9262);
+DELETE FROM `gossip_menu` WHERE `entry`=7588 AND `text_id`=9236;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7588,9236);
+DELETE FROM `gossip_menu` WHERE `entry`=7590 AND `text_id`=9238;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7590,9238);
+DELETE FROM `gossip_menu` WHERE `entry`=7591 AND `text_id`=9239;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7591,9239);
+DELETE FROM `gossip_menu` WHERE `entry`=7589 AND `text_id`=9237;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7589,9237);
+DELETE FROM `gossip_menu` WHERE `entry`=7526 AND `text_id`=9128;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7526,9128);
+DELETE FROM `gossip_menu` WHERE `entry`=7614 AND `text_id`=9265;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7614,9265);
+-- Creature Gossip_menu_id Update from sniff
+UPDATE `creature_template` SET `gossip_menu_id`=7610 WHERE `entry`=18004;
+UPDATE `creature_template` SET `gossip_menu_id`=8249 WHERE `entry`=21172;
+UPDATE `creature_template` SET `gossip_menu_id`=7612 WHERE `entry`=18005;
+UPDATE `creature_template` SET `gossip_menu_id`=7611 WHERE `entry`=18006;
+UPDATE `creature_template` SET `gossip_menu_id`=7588 WHERE `entry`=18010;
+UPDATE `creature_template` SET `gossip_menu_id`=7590 WHERE `entry`=18019;
+UPDATE `creature_template` SET `gossip_menu_id`=7589 WHERE `entry`=18009;
+UPDATE `creature_template` SET `gossip_menu_id`=7614 WHERE `entry`=18003;
+-- Creature Gossip_menu_option Update from sniff
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8249,7612,7611,7588,7590,7589,7495) AND `id`=0;
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=7590 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
+(8249,0,1, 'I want to browse your goods.',3,128,0,0,0,0, ''),
+(7612,0,1, 'I wish to buy from you.',3,128,0,0,0,0, ''),
+(7611,0,1, 'I would like to buy from you.',3,128,0,0,0,0, ''),
+(7588,0,1, 'Show me your wares, Maktu.',3,128,0,0,0,0, ''),
+(7590,0,1, 'Let me browse your reagents and poison supplies.',3,128,0,0,0,0, ''),
+(7590,1,0, 'Specialist, eh? Just what kind of specialist are you, anyway?',1,1,7591,0,0,0, ''),
+(7589,0,1, 'I wish to browse your wares.',3,128,0,0,0,0, ''),
+(7495,0,0, 'Watcher Leesa''oh, why are you out here?',1,1,7526,0,0,0, '');
diff --git a/sql/updates/world/2011_12_18_02_world_spell_script_names.sql b/sql/updates/world/2011_12_18_02_world_spell_script_names.sql
new file mode 100644
index 00000000000..c5f9a4376df
--- /dev/null
+++ b/sql/updates/world/2011_12_18_02_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_luck_of_the_draw';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(72221,'spell_gen_luck_of_the_draw');
diff --git a/sql/updates/world/2011_12_18_03_world_trinity_string.sql b/sql/updates/world/2011_12_18_03_world_trinity_string.sql
new file mode 100644
index 00000000000..d26cc356cff
--- /dev/null
+++ b/sql/updates/world/2011_12_18_03_world_trinity_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=5031;
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
+(5031, 'AIName: %s ScriptName: %s');
diff --git a/sql/updates/world/2011_12_18_04_world_misc.sql b/sql/updates/world/2011_12_18_04_world_misc.sql
new file mode 100644
index 00000000000..3404e4f285f
--- /dev/null
+++ b/sql/updates/world/2011_12_18_04_world_misc.sql
@@ -0,0 +1,87 @@
+-- Remove empty EAI Script call from the following entries
+UPDATE `creature_template` SET `AIName` = '' WHERE `entry` IN (30243,30632);
+
+-- Crimson Hammersmith summon from Blacksmithing Plans fix
+-- Black Guard Swordsmith summon from Blacksmithing Plans fix
+UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` IN (176325, 176327);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (176325, 176327) AND `source_type`=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
+(176325, 1, 0, 0, 64, 0, 100, 1, 0, 0, 0, 0, 12, 11120, 6, 60000, 0, 0, 0, 8, 0, 0, 0, 3585.5, -3000.15, 125, 2.19912, 'Blacksmithing Plans - summon Crimson Hammersmith'),
+(176327, 1, 0, 0, 64, 0, 100, 1, 0, 0, 0, 0, 12, 11121, 6, 60000, 0, 0, 0, 8, 0, 0, 0, 3818.4, -3693.32, 144.242, 0.261799, 'Blacksmithing Plans - summon Black Guard Swordsmith');
+
+-- Sleeping Giants fix
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 24669;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=24669 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
+(24669, 0, 0, 1, 8, 0, 100, 0, 44261, 1, 0, 0, 33, 24669, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Dormant Vrykul - Sleeping Giants quest credit'),
+(24669, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dormant Vrykul - Sleeping Giants despawn');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=34083;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(18, 0, 34083, 0, 24, 1, 24669, 0, 63, '', 'Awakening Rod target limit to Dormant Vrykul'); -- changed to item script by Nay, not tested.
+
+-- Culling of Stratholme Hemotoxin SAI spell fix version
+SET @ENTRY := 28199;
+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` VALUES
+(@ENTRY, 0, 0, 0, 9, 0, 25, 2, 0, 20, 5000, 8000, 11, 52522, 32, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Tomb Stalker - Cast Hemotoxin Normal'),
+(@ENTRY, 0, 1, 0, 9, 0, 40, 4, 0, 20, 5000, 8000, 11, 58782, 32, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Tomb Stalker - Cast Hemotoxin Heroic');
+
+DELETE FROM `creature` WHERE `id` IN (28318, 29346);
+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
+(40153, 28318, 530, 1, 1, 0, 0, -1775.148438, 5548.291992, -12.428190, 4.146070, 300, 0, 0, 1, 0, 0, 0, 0, 0), -- Grand Apothecary Putress
+(40251, 29346, 530, 1, 1, 0, 0, 1925, -4123.1899,  43.1780,  4.79965, 300, 0, 0, 1, 0, 0, 0, 0, 0); -- Apothecary Karlov
+
+-- Fix NPCs falling underground when killed by nelegalno
+UPDATE `creature_template` SET `InhabitType` = 3 WHERE `entry` IN (5936, 24899); -- Orca and Scoodles
+
+-- Removes wrong restriction from G.N.E.R.D. rage
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=3882 AND `type`=16;
+
+-- Kalu'ak Fishing Derby start time fix
+UPDATE `game_event` SET `start_time` = '2011-01-01 13:00:00' WHERE `eventEntry`=63;
+UPDATE `game_event` SET `start_time` = '2011-01-01 14:00:00' WHERE `eventEntry`=64;
+
+-- Stranglethorn Fishing Extravaganza start time fix ( http://old.wowhead.com/event=301 )
+UPDATE `game_event` SET `start_time` = '2011-01-01 14:00:00' WHERE `eventEntry` IN (14, 15, 62);
+UPDATE `game_event` SET `description` = 'Stranglethorn Fishing Extravaganza Announce' WHERE `eventEntry`=14;
+UPDATE `game_event` SET `description` = 'Stranglethorn Fishing Extravaganza Fishing Pools' WHERE `eventEntry`=15;
+UPDATE `game_event` SET `description` = 'Stranglethorn Fishing Extravaganza Turn-ins' WHERE `eventEntry`=62;
+
+-- Eitrigg's Wisdom fix
+SET @GOSSIP = 21312;
+SET @NPC = 3144;
+SET @QUEST = 4941;
+-- Add gossip options for each menu id
+DELETE FROM `gossip_menu_option` WHERE `menu_id` BETWEEN @GOSSIP AND @GOSSIP+7;
+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, 0, 'Hello, Eitrigg. I bring news from Blackrock Spire.', 1, 1, @GOSSIP+1, 0, 0, 0, ''),
+(@GOSSIP+1, 0, 0, 'There is only one Warchief, Eitrigg!', 1, 1, @GOSSIP+2, 0, 0, 0, ''),
+(@GOSSIP+2, 0, 0, 'What do you mean?', 1, 1, @GOSSIP+3, 0, 0, 0, ''),
+(@GOSSIP+3, 0, 0, 'Hearthglen? But...', 1, 1, @GOSSIP+4, 0, 0, 0, ''),
+(@GOSSIP+4, 0, 0, 'I will take you up on that offer, Eitrigg.', 1, 1, @GOSSIP+5, 0, 0, 0, ''),
+(@GOSSIP+5, 0, 0, 'Ah, so that is how they pushed the Dark Iron to the lower parts of the Spire.', 1, 1, @GOSSIP+6, 0, 0, 0, ''),
+(@GOSSIP+6, 0, 0, 'Perhaps there exists a way?', 1, 1, @GOSSIP+7, 0, 0, 0, ''),
+(@GOSSIP+7, 0, 0, 'As you wish, Eitrigg.', 1, 1, 0, 0, 0, 0, '');
+-- Add gossip menus (text values already in db)
+DELETE FROM `gossip_menu` WHERE `entry`BETWEEN @GOSSIP+1 AND @GOSSIP+7;
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES 
+(@GOSSIP+1, 3574),
+(@GOSSIP+2, 3575),
+(@GOSSIP+3, 3576),
+(@GOSSIP+4, 3577),
+(@GOSSIP+5, 3578),
+(@GOSSIP+6, 3579),
+(@GOSSIP+7, 3580);
+-- Add Condtion so gossip only shows when on quest
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(15, @GOSSIP, 0, 0, 9, 4941, 0, 0, 0, '', NULL);
+-- Add SAI for quest complete and close of gossip when last option selected
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@NPC;
+DELETE FROM `smart_scripts` WHERE `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,1,62,0,100,0,@GOSSIP+7,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0.0,0.0,0.0,0.0,'Eitrigg - Select As you wish, Eitrigg. - Close gossip'),
+(@NPC,0,1,0,61,0,100,0,0,0,0,0,15,@QUEST,0,0,0,0,0,7,0,0,0,0.0,0.0,0.0,0.0,'Eitrigg - On link - Give credit quest (4941)');
diff --git a/sql/updates/world/2011_12_18_05_world_misc.sql b/sql/updates/world/2011_12_18_05_world_misc.sql
new file mode 100644
index 00000000000..b8435c4211e
--- /dev/null
+++ b/sql/updates/world/2011_12_18_05_world_misc.sql
@@ -0,0 +1,94 @@
+-- Quest: The Black Knight's Orders (13663) SQL fix
+-- Black Knights Camp Spawns
+SET @OGUID=100489; -- Need 10
+SET @CGUID=152277; -- Need 3
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+9;
+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,194357,571,1,1,9070.324,2050.733,67.21755,0,0,0,0,1,0,0,0), -- Poison Vial
+(@OGUID+1,194357,571,1,1,9073.764,2050.120,68.15718,0,0,0,0,1,0,0,0), -- Poison Vial
+(@OGUID+2,194357,571,1,1,9074.699,2050.709,68.17049,0,0,0,0,1,0,0,0), -- Poison Vial
+(@OGUID+3,194357,571,1,1,9069.595,2050.349,67.21755,0,0,0,0,1,0,0,0), -- Poison Vial
+(@OGUID+4,194357,571,1,1,9069.961,2050.538,67.21755,0,0,0,0,1,0,0,0), -- Poison Vial
+(@OGUID+5,194357,571,1,1,9072.077,2049.292,67.78963,0,0,0,0,1,0,0,0), -- Poison Vial
+(@OGUID+6,194357,571,1,1,9065.680,2052.618,67.28638,0,0,0,0,1,0,0,0), -- Poison Vial
+(@OGUID+7,194394,571,1,1,9083.578,2041.696,67.81812,0,0,0,0,1,0,0,0), -- Cult Rune Circle
+(@OGUID+8,195011,571,1,1,9078.471,2057.547,67.21606,0,0,0,0.9981346,0.06105176,0,0,0), -- Bonfire
+(@OGUID+9,300007,571,1,1,8523.51,566.994,552.841,2.1518,0,0,0.880019,0.474938,300,0,1); -- Spell Focus GO?
+
+DELETE FROM `creature` WHERE `id`=33537;
+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,33537,571,1,1,0,0,9071.043,2075.388,67.21542,4.935980,120,0,0,1,0,0,0,0,0),
+(@CGUID+1,33537,571,1,1,0,0,9074.414,2049.259,67.34636,2.181662,120,0,0,1,0,0,0,0,0),
+(@CGUID+2,33537,571,1,1,0,0,9081.280,2058.925,67.38979,3.612832,120,0,0,1,0,0,0,0,0);
+
+-- Template updates
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|8,`speed_run`=4, `InhabitType`=5 WHERE `entry`=33519; -- Black Knight''s Gryphon
+UPDATE `creature_template` SET `faction_A`=2080,`faction_H`=2080,`unit_flags`=`unit_flags`|32768,`equipment_id`=823 WHERE `entry`=33537; -- Cult Conspirator
+
+-- See black knight's invisibility while on quest The Black Knight's Orders
+DELETE FROM `spell_area` WHERE `spell`=67471 AND `area` IN (4658);
+INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES
+(67471,4658,13663,1,13663,0,0,2,1); -- See Black Knight Invis
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (33519,33537);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33519,0,0,2049,0,NULL),-- Black Knight''s Gryphon
+(33537,0,1,1,0,NULL); -- Cult Conspirator
+
+-- SAI for Black Knight''s Gryphon
+SET @entry :=33519;
+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,27,0,100,0,0,0,0,0,53,0,@entry,0,13663,0,0,1,0,0,0,0,0,0,0,'Black Knight''s Gryphon - On passenger - Start WP movement'),
+(@entry,0,1,0,40,0,100,0,40,@entry,0,0,33,33519,0,0,0,0,0,7,0,0,0,0,0,0,0,'Black Knight''s Gryphon - On WP 40 - Quest Credit'),
+(@entry,0,2,0,40,0,100,0,43,@entry,0,0,11,50630,0,0,0,0,0,7,0,0,0,0,0,0,0,'Black Knight''s Gryphon - On WP 43 - Dismount Spell'),
+(@entry,0,3,0,40,0,100,0,44,@entry,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Black Knight''s Gryphon - On WP 44 - Despawn');
+
+DELETE FROM `waypoints` WHERE `entry`=33519;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(33519, 1,8521.271,569.5960,552.8375,'Black Knight''s Gryphon'),
+(33519, 2,8517.864,579.1095,553.2125,'Black Knight''s Gryphon'),
+(33519, 3,8513.146,594.6724,551.2125,'Black Knight''s Gryphon'),
+(33519, 4,8505.263,606.5569,550.4177,'Black Knight''s Gryphon'),
+(33519, 5,8503.017,628.4188,547.4177,'Black Knight''s Gryphon'),
+(33519, 6,8480.271,652.7083,547.4177,'Black Knight''s Gryphon'),
+(33519, 7,8459.121,686.1427,547.4177,'Black Knight''s Gryphon'),
+(33519, 8,8436.802,713.8687,547.3428,'Black Knight''s Gryphon'),
+(33519, 9,8405.380,740.0045,547.4177,'Black Knight''s Gryphon'),
+(33519,10,8386.139,770.6009,547.5881,'Black Knight''s Gryphon'),
+(33519,11,8374.297,802.2525,547.9304,'Black Knight''s Gryphon'),
+(33519,12,8374.271,847.0363,548.0427,'Black Knight''s Gryphon'),
+(33519,13,8385.988,868.9881,548.0491,'Black Knight''s Gryphon'),
+(33519,14,8413.027,867.8573,547.2991,'Black Knight''s Gryphon'),
+(33519,15,8452.552,869.0339,547.2991,'Black Knight''s Gryphon'),
+(33519,16,8473.058,875.2012,547.2955,'Black Knight''s Gryphon'),
+(33519,17,8472.278,912.3134,547.4169,'Black Knight''s Gryphon'),
+(33519,18,8479.666,954.1650,547.3298,'Black Knight''s Gryphon'),
+(33519,19,8477.349,1001.368,547.3372,'Black Knight''s Gryphon'),
+(33519,20,8484.538,1025.797,547.4622,'Black Knight''s Gryphon'),
+(33519,21,8525.363,1029.284,547.4177,'Black Knight''s Gryphon'),
+(33519,22,8532.808,1052.904,548.1677,'Black Knight''s Gryphon'),
+(33519,23,8537.356,1077.927,554.5791,'Black Knight''s Gryphon'),
+(33519,24,8540.528,1083.379,569.6827,'Black Knight''s Gryphon'),
+(33519,25,8563.641,1140.965,569.6827,'Black Knight''s Gryphon'),
+(33519,26,8594.897,1205.458,569.6827,'Black Knight''s Gryphon'),
+(33519,27,8617.104,1257.399,566.1833,'Black Knight''s Gryphon'),
+(33519,28,8648.496,1329.349,558.0187,'Black Knight''s Gryphon'),
+(33519,29,8667.723,1388.411,546.1880,'Black Knight''s Gryphon'),
+(33519,30,8699.145,1474.898,528.2197,'Black Knight''s Gryphon'),
+(33519,31,8726.869,1546.006,501.7741,'Black Knight''s Gryphon'),
+(33519,32,8739.058,1592.157,478.5511,'Black Knight''s Gryphon'),
+(33519,33,8750.799,1636.771,455.0797,'Black Knight''s Gryphon'),
+(33519,34,8760.006,1669.482,423.2208,'Black Knight''s Gryphon'),
+(33519,35,8783.310,1701.852,375.8872,'Black Knight''s Gryphon'),
+(33519,36,8817.336,1735.731,343.3323,'Black Knight''s Gryphon'),
+(33519,37,8882.320,1789.754,301.5807,'Black Knight''s Gryphon'),
+(33519,38,8958.597,1841.807,259.9141,'Black Knight''s Gryphon'),
+(33519,39,9045.891,1908.076,233.4143,'Black Knight''s Gryphon'),
+(33519,40,9107.177,1964.594,215.9704,'Black Knight''s Gryphon'),
+(33519,41,9134.763,2036.925,175.1925,'Black Knight''s Gryphon'),
+(33519,42,9128.608,2089.091,141.3593,'Black Knight''s Gryphon'),
+(33519,43,9093.364,2128.384,99.38685,'Black Knight''s Gryphon'),
+(33519,44,9050.709,2123.656,60.24802,'Black Knight''s Gryphon');
diff --git a/sql/updates/world/2011_12_18_06_world_sai.sql b/sql/updates/world/2011_12_18_06_world_sai.sql
new file mode 100644
index 00000000000..2fce176cd0f
--- /dev/null
+++ b/sql/updates/world/2011_12_18_06_world_sai.sql
@@ -0,0 +1,14 @@
+SET @JEEVES := 35642;
+SET @SPELL_GOODBYE := 68052;
+DELETE FROM `spell_linked_spell` WHERE `spell_effect`=@SPELL_GOODBYE AND  `spell_trigger`=-68054 AND `type`=0;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(-68054,@SPELL_GOODBYE,0, 'Jeeves - Say Goodbye');
+
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@JEEVES;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@JEEVES 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 
+(@JEEVES,0,0,0,8,0,100,0,@SPELL_GOODBYE,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jeeves - On Spellhit - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `entry`=@JEEVES;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@JEEVES,0,0,"If you'll excuse me, I'm afraid I have other business I must attend to. Please call on me again in the future.",12,0,100,3,0,0, 'Jeeves');
diff --git a/sql/updates/world/2011_12_18_07_world_conditions.sql b/sql/updates/world/2011_12_18_07_world_conditions.sql
new file mode 100644
index 00000000000..ef669dd2dbb
--- /dev/null
+++ b/sql/updates/world/2011_12_18_07_world_conditions.sql
@@ -0,0 +1,17 @@
+-- Fix condition for Bom'bay's npc_text, gossip_menu and gossip_menu_option
+-- Player must to complete quest 826 'Zalazane' to see gossip_menu_option
+DELETE FROM `gossip_menu` WHERE `entry`=3062 AND `text_id` IN (3794,3795);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(3062,3794), -- text before to complete quest 826
+(3062,3795); -- text after to complete quest 826
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=3062;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,3062,3794,0,14,826,0,0,0,'', "Bom'bay - show text 3794 if player does not have quest Zalazane"),
+(14,3062,3795,0,8,826,0,0,0,'', "Bom'bay - show text 3795 if player has quest Zalazane rewarded"),
+(15,3062,0,0,8,826,0,0,0,'', "Bom'bay - show gossip option 0 if player has quest Zalazane rewarded"),
+(15,3062,1,0,8,826,0,0,0,'', "Bom'bay - show gossip option 1 if player has quest Zalazane rewarded"),
+(15,3062,2,0,8,826,0,0,0,'', "Bom'bay - show gossip option 2 if player has quest Zalazane rewarded"),
+(15,3062,3,0,8,826,0,0,0,'', "Bom'bay - show gossip option 3 if player has quest Zalazane rewarded"),
+(15,3062,4,0,8,826,0,0,0,'', "Bom'bay - show gossip option 4 if player has quest Zalazane rewarded"),
+(15,3062,5,0,8,826,0,0,0,'', "Bom'bay - show gossip option 5 if player has quest Zalazane rewarded"),
+(15,3062,6,0,8,826,0,0,0,'', "Bom'bay - show gossip option 6 if player has quest Zalazane rewarded");
diff --git a/sql/updates/world/2011_12_19_00_world_conditions.sql b/sql/updates/world/2011_12_19_00_world_conditions.sql
new file mode 100644
index 00000000000..a56151a9f8f
--- /dev/null
+++ b/sql/updates/world/2011_12_19_00_world_conditions.sql
@@ -0,0 +1,7 @@
+UPDATE spell_dbc SET EffectImplicitTargetA1 = 22, EffectImplicitTargetB1 = 7 WHERE Id = 58630;
+
+DELETE FROM conditions WHERE SourceTypeOrReferenceId = 13 AND SourceEntry IN (61863, 68663);
+INSERT INTO conditions (SourceTypeOrReferenceId, SourceEntry, ConditionTypeOrReference, ConditionValue1, Comment) VALUES
+(13, 61863, 18, 1, 'The Prophet Tharon''ja - Achievement Check'),
+(13, 68663, 18, 1, 'The Black Knight - Kill Credit'),
+(13, 58630, 18, 1, 'Mal''Ganis - Kill Credit');
diff --git a/sql/updates/world/2011_12_19_01_world_quest_template.sql b/sql/updates/world/2011_12_19_01_world_quest_template.sql
new file mode 100644
index 00000000000..c04fdddfe97
--- /dev/null
+++ b/sql/updates/world/2011_12_19_01_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Quest: Arcane Refreshment only available for mages
+UPDATE `quest_template` SET `RequiredClasses`=`RequiredClasses`|128 WHERE `Id`=7463;
diff --git a/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql b/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..af7b0a9361b
--- /dev/null
+++ b/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql
@@ -0,0 +1,11 @@
+-- Achievement Fa-la-la-la-Ogri'la 
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3936,3937,3938);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+-- requires aura
+(3936, 5, 44827, 0, ''),
+(3937, 5, 44825, 0, ''),
+(3938, 5, 44824, 0, ''),
+-- requires Holiday Winter Veil
+(3936, 16, 141, 0, ''),
+(3937, 16, 141, 0, ''),
+(3938, 16, 141, 0, '');
diff --git a/sql/updates/world/2011_12_24_00_world_misc.sql b/sql/updates/world/2011_12_24_00_world_misc.sql
new file mode 100644
index 00000000000..5e070d0771e
--- /dev/null
+++ b/sql/updates/world/2011_12_24_00_world_misc.sql
@@ -0,0 +1,10 @@
+-- Scriptname for the cages
+UPDATE `gameobject_template` SET `ScriptName`='go_veil_skith_cage' WHERE `entry` IN (185202,185203,185204,185205);
+
+-- Texts for Captive Child
+DELETE FROM `creature_text` WHERE `entry`=22314;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(22314,0,0,"Woot!",12,0,100,0,0,0,"Captive Child"),
+(22314,0,1,"I think those weird bird guys were going to eat us. Gross!",12,0,100,0,0,0,"Captive Child"),
+(22314,0,2,"Yay! We're free!",12,0,100,0,0,0,"Captive Child"),
+(22314,0,3,"Gross!",12,0,100,0,0,0,"Captive Child");
diff --git a/sql/updates/world/2011_12_24_00_world_spell_proc_event.sql b/sql/updates/world/2011_12_24_00_world_spell_proc_event.sql
new file mode 100644
index 00000000000..f25fa4c4856
--- /dev/null
+++ b/sql/updates/world/2011_12_24_00_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc_event` SET `SpellFamilyMask0` = 0 WHERE `entry` IN (5952,51679);
diff --git a/sql/updates/world/2011_12_24_01_world_mail_loot_template.sql b/sql/updates/world/2011_12_24_01_world_mail_loot_template.sql
new file mode 100644
index 00000000000..2fc05e9cf17
--- /dev/null
+++ b/sql/updates/world/2011_12_24_01_world_mail_loot_template.sql
@@ -0,0 +1,41 @@
+-- Reward from Treats for Greatfather Winter (horde)
+SET @mail:=102; -- Set in DBC
+UPDATE quest_template SET RewardMailTemplateId=@mail, RewardMailDelay=86400 WHERE Id IN (6962); -- Set mail delivery
+DELETE FROM mail_loot_template WHERE entry=@mail;
+INSERT INTO mail_loot_template (entry,item,ChanceOrQuestChance,lootmode,groupid,mincountOrRef,maxcount) VALUES
+(@mail,17685,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Treats for Greatfather Winter (alliance)
+SET @mail:=118; -- Set in DBC
+UPDATE quest_template SET RewardMailTemplateId=@mail, RewardMailDelay=86400 WHERE Id IN (7025); -- Set mail delivery
+DELETE FROM mail_loot_template WHERE entry=@mail;
+INSERT INTO mail_loot_template (entry,item,ChanceOrQuestChance,lootmode,groupid,mincountOrRef,maxcount) VALUES
+(@mail,17685,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Stolen Winter Veil Treats (horde)
+SET @mail:=108; -- Set in DBC
+UPDATE quest_template SET RewardMailTemplateId=@mail, RewardMailDelay=86400 WHERE Id IN (6963); -- Set mail delivery
+DELETE FROM mail_loot_template WHERE entry=@mail;
+INSERT INTO mail_loot_template (entry,item,ChanceOrQuestChance,lootmode,groupid,mincountOrRef,maxcount) VALUES
+(@mail,17712,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Stolen Winter Veil Treats (alliance)
+SET @mail:=117; -- Set in DBC
+UPDATE quest_template SET RewardMailTemplateId=@mail, RewardMailDelay=86400 WHERE Id IN (7042); -- Set mail delivery
+DELETE FROM mail_loot_template WHERE entry=@mail;
+INSERT INTO mail_loot_template (entry,item,ChanceOrQuestChance,lootmode,groupid,mincountOrRef,maxcount) VALUES
+(@mail,17712,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Metzen the Reindeer (horde)
+SET @mail:=122; -- Set in DBC
+UPDATE quest_template SET RewardMailTemplateId=@mail, RewardMailDelay=86400 WHERE Id IN (8746); -- Set mail delivery
+DELETE FROM mail_loot_template WHERE entry=@mail;
+INSERT INTO mail_loot_template (entry,item,ChanceOrQuestChance,lootmode,groupid,mincountOrRef,maxcount) VALUES
+(@mail,21216,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Metzen the Reindeer (alliance)
+SET @mail:=161; -- Set in DBC
+UPDATE quest_template SET RewardMailTemplateId=@mail, RewardMailDelay=86400 WHERE Id IN (8762); -- Set mail delivery
+DELETE FROM mail_loot_template WHERE entry=@mail;
+INSERT INTO mail_loot_template (entry,item,ChanceOrQuestChance,lootmode,groupid,mincountOrRef,maxcount) VALUES
+(@mail,21216,100,1,0,1,1); -- Attach item to mail
diff --git a/sql/updates/world/2011_12_25_00_world_areatrigger_scriptnames.sql b/sql/updates/world/2011_12_25_00_world_areatrigger_scriptnames.sql
new file mode 100644
index 00000000000..2a16394c7fe
--- /dev/null
+++ b/sql/updates/world/2011_12_25_00_world_areatrigger_scriptnames.sql
@@ -0,0 +1,3 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry`=4752;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4752,'at_nats_landing');
diff --git a/sql/updates/world/2011_12_25_00_world_gameobject_scriptnames.sql b/sql/updates/world/2011_12_25_00_world_gameobject_scriptnames.sql
new file mode 100644
index 00000000000..c545550e129
--- /dev/null
+++ b/sql/updates/world/2011_12_25_00_world_gameobject_scriptnames.sql
@@ -0,0 +1 @@
+UPDATE `gameobject_template` SET `ScriptName`='go_demon_portal' WHERE `entry` IN (177243,177365,177369,177397,177398,177399,177400,177366,177367,177368);
diff --git a/sql/updates/world/2011_12_25_00_world_misc.sql b/sql/updates/world/2011_12_25_00_world_misc.sql
new file mode 100644
index 00000000000..8f1d3c44ceb
--- /dev/null
+++ b/sql/updates/world/2011_12_25_00_world_misc.sql
@@ -0,0 +1,9 @@
+UPDATE `gameobject_template` SET `ScriptName`='go_captain_tyralius_prison' WHERE `entry`=184588;
+UPDATE `quest_template` SET `RequiredSpellCast1`=0 WHERE `id`=10422;
+DELETE FROM `creature_text` WHERE `entry`=20787;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(20787,0,0,"You've saved me, fleshling! Ameer will hear of this noble act.",12,0,100,0,0,0,"Captain Tyralius");
+
+-- Heroes of Old
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=2702;
+DELETE FROM `quest_start_scripts` WHERE `id`=2702;
diff --git a/sql/updates/world/2011_12_25_00_world_sai.sql b/sql/updates/world/2011_12_25_00_world_sai.sql
new file mode 100644
index 00000000000..d0f1572d708
--- /dev/null
+++ b/sql/updates/world/2011_12_25_00_world_sai.sql
@@ -0,0 +1,23 @@
+-- Bloodfen Raptor SAI
+SET @ENTRY := 4351;
+SET @SPELL_ROPE := 42325;
+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,0,8,0,100,0,@SPELL_ROPE,0,0,0,33,23727,0,0,0,0,0,7,0,0,0,0,0,0,0,"Bloodfen Raptor - On Spellhit - Quest Credit"),
+(@ENTRY,0,1,0,2,0,100,1,0,20,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodfen Raptor - At 20% HP - Say Line 0");
+
+-- Bloodfen Screecher SAI
+SET @ENTRY := 4352;
+SET @SPELL_ROPE := 42325;
+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,0,8,0,100,0,@SPELL_ROPE,0,0,0,33,23727,0,0,0,0,0,7,0,0,0,0,0,0,0,"Bloodfen Screecher - On Spellhit - Quest Credit"),
+(@ENTRY,0,1,0,2,0,100,1,0,20,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodfen Screecher - At 20% HP - Say Line 0");
+
+-- Texts
+DELETE FROM `creature_text` WHERE `entry` IN (4351,4352);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(4351,0,0,"%s looks weak enough to capture.",16,0,100,0,0,0,"Bloodfen Raptor"),
+(4352,0,0,"%s looks weak enough to capture.",16,0,100,0,0,0,"Bloodfen Screecher");
diff --git a/sql/updates/world/2011_12_25_00_world_spell_script_names.sql b/sql/updates/world/2011_12_25_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..dc42056f84c
--- /dev/null
+++ b/sql/updates/world/2011_12_25_00_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+UPDATE `item_template` SET `ScriptName`='' WHERE `entry`=23654;
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_q9452_cast_net';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(29866,'spell_q9452_cast_net');
diff --git a/sql/updates/world/2011_12_25_01_world_areatrigger_scriptnames.sql b/sql/updates/world/2011_12_25_01_world_areatrigger_scriptnames.sql
new file mode 100644
index 00000000000..ebed9976f44
--- /dev/null
+++ b/sql/updates/world/2011_12_25_01_world_areatrigger_scriptnames.sql
@@ -0,0 +1,9 @@
+DELETE FROM `areatrigger_scripts` WHERE `ScriptName`='at_bring_your_orphan_to';
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(3551,'at_bring_your_orphan_to'),
+(3549,'at_bring_your_orphan_to'),
+(3547,'at_bring_your_orphan_to'),
+(3546,'at_bring_your_orphan_to'),
+(3552,'at_bring_your_orphan_to'),
+(3548,'at_bring_your_orphan_to'),
+(4356,'at_bring_your_orphan_to');
diff --git a/sql/updates/world/2011_12_25_01_world_misc.sql b/sql/updates/world/2011_12_25_01_world_misc.sql
new file mode 100644
index 00000000000..9e4d7e6c058
--- /dev/null
+++ b/sql/updates/world/2011_12_25_01_world_misc.sql
@@ -0,0 +1,3 @@
+-- Zuhuled the Wacked
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=10866;
+DELETE FROM `quest_start_scripts` WHERE `id`=10866;
diff --git a/sql/updates/world/2011_12_25_01_world_sai.sql b/sql/updates/world/2011_12_25_01_world_sai.sql
new file mode 100644
index 00000000000..8ae439ffe67
--- /dev/null
+++ b/sql/updates/world/2011_12_25_01_world_sai.sql
@@ -0,0 +1,19 @@
+-- Acidic Swamp Ooze SAI
+SET @ENTRY := 4393;
+SET @SPELL_END_CHANNEL := 42485;
+SET @SPELL_BUBBLING_OOZE := 43135;
+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,0,8,0,100,0,@SPELL_END_CHANNEL,0,0,0,33,23797,0,0,0,0,0,7,0,0,0,0,0,0,0,"Acidic Swamp Ooze - On Spellhit - Quest Credit"),
+(@ENTRY,0,1,0,2,0,100,1,0,15,0,0,11,@SPELL_BUBBLING_OOZE,0,0,0,0,0,2,0,0,0,0,0,0,0,"Acidic Swamp Ooze - At 15% HP - Cast Bubbling Ooze");
+
+-- Bubbling Swamp Ooze SAI
+SET @ENTRY := 4394;
+SET @SPELL_END_CHANNEL := 42485;
+SET @SPELL_BUBBLING_OOZE := 43135;
+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,0,8,0,100,0,@SPELL_END_CHANNEL,0,0,0,33,23797,0,0,0,0,0,7,0,0,0,0,0,0,0,"Bubbling Swamp Ooze - On Spellhit - Quest Credit"),
+(@ENTRY,0,1,0,2,0,100,1,0,15,0,0,11,@SPELL_BUBBLING_OOZE,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bubbling Swamp Ooze - At 15% HP - Cast Bubbling Ooze");
diff --git a/sql/updates/world/2011_12_25_02_world_areatrigger_scriptnames.sql b/sql/updates/world/2011_12_25_02_world_areatrigger_scriptnames.sql
new file mode 100644
index 00000000000..78a1fbc98c9
--- /dev/null
+++ b/sql/updates/world/2011_12_25_02_world_areatrigger_scriptnames.sql
@@ -0,0 +1,5 @@
+-- Areatrigger scriptname for Brewfest
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (4829,4820);
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4829,'at_brewfest'), -- Durotar
+(4820,'at_brewfest'); -- Dun Morogh
diff --git a/sql/updates/world/2011_12_25_02_world_misc.sql b/sql/updates/world/2011_12_25_02_world_misc.sql
new file mode 100644
index 00000000000..ee2fd9c1964
--- /dev/null
+++ b/sql/updates/world/2011_12_25_02_world_misc.sql
@@ -0,0 +1,89 @@
+-- Make the human versions in Pyrewood Village despawn during night and the worgens spawn during night
+SET @GUID := 152280;
+DELETE FROM `game_event_creature` WHERE `eventEntry`=25;
+INSERT INTO `game_event_creature` (`eventEntry`,`guid`) VALUES
+-- Humans
+(-25,17908),(-25,18404),(-25,18408),
+(-25,19002),(-25,19005),(-25,19084),
+(-25,19219),(-25,19222),(-25,19223),
+(-25,19224),(-25,19227),(-25,19229),
+(-25,19316),(-25,19343),(-25,18307),
+(-25,17911),(-25,17910),(-25,18236),
+(-25,18237),(-25,18239),(-25,18291),
+(-25,18306),(-25,18350),(-25,18400),
+(-25,18411),(-25,18413),(-25,18996),
+(-25,19008),(-25,19012),(-25,19015),
+(-25,19019),(-25,19220),(-25,19228),
+(-25,17663),(-25,17905),(-25,18220),
+(-25,18221),(-25,18238),(-25,18310),
+(-25,18354),(-25,18355),(-25,18405),
+(-25,18407),(-25,18409),(-25,19007),
+(-25,18235),(-25,18309),
+-- Worgens
+(25,@GUID+1),(25,@GUID+2),(25,@GUID+3),
+(25,@GUID+4),(25,@GUID+5),(25,@GUID+6),
+(25,@GUID+7),(25,@GUID+8),(25,@GUID+9),
+(25,@GUID+10),(25,@GUID+11),(25,@GUID+12),
+(25,@GUID+13),(25,@GUID+14),(25,@GUID+15),
+(25,@GUID+16),(25,@GUID+17),(25,@GUID+18),
+(25,@GUID+19),(25,@GUID+20),(25,@GUID+21),
+(25,@GUID+22),(25,@GUID+23),(25,@GUID+24),
+(25,@GUID+25),(25,@GUID+26),(25,@GUID+27),
+(25,@GUID+28),(25,@GUID+29),(25,@GUID+30),
+(25,@GUID+31),(25,@GUID+32),(25,@GUID+33),
+(25,@GUID+34),(25,@GUID+35),(25,@GUID+36),
+(25,@GUID+37),(25,@GUID+38),(25,@GUID+39),
+(25,@GUID+40),(25,@GUID+41),(25,@GUID+42),
+(25,@GUID+43),(25,@GUID+44),(25,@GUID+45),
+(25,@GUID+46),(25,@GUID+0);
+
+-- Spawn all Moonrage versions of the humans
+DELETE FROM `creature` WHERE `id` IN (3533,3531,3529,1896,1893,1892);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+0,3533,0,1,1,0,-408.091,1604.03,18.2868,5.5676,600,0,0,300,0,0,0,0,0),
+(@GUID+1,3531,0,1,1,0,-360.278,1495.03,17.196,0.830526,600,0,0,328,0,0,0,0,0),
+(@GUID+2,3529,0,1,1,0,-345.967,1501.4,18.9875,0.942478,600,0,0,328,0,0,0,0,0),
+(@GUID+3,1896,0,1,1,0,-327.462,1555.21,25.2491,1.61376,600,0,0,276,295,0,0,0,0),
+(@GUID+4,1896,0,1,1,0,-407.955,1451.33,27.0859,0.767945,600,0,0,276,295,0,0,0,0),
+(@GUID+5,1896,0,1,1,0,-391.907,1432.23,27.0313,6.07375,600,0,0,276,295,0,0,0,0),
+(@GUID+6,1896,0,1,1,0,-344.082,1504.01,18.7918,4.18879,600,0,0,276,295,0,0,0,0),
+(@GUID+7,1896,0,1,1,0,-329.456,1545.74,30.1367,2.26893,600,0,0,276,295,0,0,0,0),
+(@GUID+8,1896,0,1,1,0,-414.124,1581.03,19.7275,6.10865,600,0,0,276,295,0,0,0,0),
+(@GUID+9,1896,0,1,1,0,-413.706,1579.64,24.2994,2.9861,600,0,0,276,295,0,0,0,0),
+(@GUID+10,1896,0,1,1,0,-423.094,1578.33,24.3098,2.98749,600,0,0,276,295,0,0,0,0),
+(@GUID+11,1896,0,1,1,0,-411.947,1517.76,19.7711,4.86947,600,0,0,276,295,0,0,0,0),
+(@GUID+12,1896,0,1,1,0,-424.202,1543.84,18.5687,6.17846,600,0,0,276,295,0,0,0,0),
+(@GUID+13,1896,0,1,1,0,-397.475,1543.61,17.1712,3.0459,600,5,0,276,295,1,0,0,0),
+(@GUID+14,1896,0,1,1,0,-378.435,1625.51,16.8077,0.694863,600,3,0,276,295,1,0,0,0),
+(@GUID+15,1893,0,1,1,0,-404.028,1460.9,31.7653,5.84685,600,0,0,300,0,0,0,0,0),
+(@GUID+16,1893,0,1,1,0,-410.983,1453.18,31.679,5.59007,600,5,0,300,0,1,0,0,0),
+(@GUID+17,1893,0,1,1,0,-333.219,1548.41,25.2864,4.7729,600,0,0,300,0,0,0,0,0),
+(@GUID+18,1893,0,1,1,0,-339.031,1547.76,30.0369,3.83411,600,3,0,300,0,1,0,0,0),
+(@GUID+19,1893,0,1,1,0,-341.711,1553.34,24.5273,3.26377,600,0,0,300,0,0,0,0,0),
+(@GUID+20,1893,0,1,1,0,-380.605,1435.24,25.7369,5.98648,600,0,0,300,0,0,0,0,0),
+(@GUID+21,1893,0,1,1,0,-378.287,1655.98,10.346,2.89725,600,3,0,300,0,1,0,0,0),
+(@GUID+22,1893,0,1,1,0,-411.642,1509.01,19.8575,1.55334,600,0,0,300,0,0,0,0,0),
+(@GUID+23,1893,0,1,1,0,-390.535,1466.63,25.9869,5.34071,600,0,0,300,0,0,0,0,0),
+(@GUID+24,1893,0,1,1,0,-391.615,1601.72,17.1706,4.86947,600,0,0,300,0,0,0,0,0),
+(@GUID+25,1893,0,1,1,0,-355.263,1580.06,18.0622,0.078739,600,0,0,300,0,0,0,0,0),
+(@GUID+26,1893,0,1,1,0,-442.388,1539.5,19.6376,4.53468,600,5,0,300,0,1,0,0,0),
+(@GUID+27,1893,0,1,1,0,-389.73,1634.41,17.4309,6.20095,600,0,0,300,0,0,0,0,0),
+(@GUID+28,1893,0,1,1,0,-385.558,1618.24,24.2887,4.07713,600,3,0,300,0,1,0,0,0),
+(@GUID+29,1893,0,1,1,0,-385.776,1632.95,24.2887,3.83402,600,0,0,300,0,0,0,0,0),
+(@GUID+30,1893,0,1,1,0,-384.391,1560.98,17.1156,2.65866,600,5,0,300,0,1,0,0,0),
+(@GUID+31,1893,0,1,1,0,-420.551,1544.65,18.3187,2.70724,600,0,0,300,0,2,0,0,0),
+(@GUID+32,1893,0,1,1,0,-372.427,1611.08,24.3721,1.32645,600,0,0,300,0,0,0,0,0),
+(@GUID+33,1892,0,1,1,0,-405.033,1458.8,27.0968,0.15708,600,0,0,300,0,0,0,0,0),
+(@GUID+34,1892,0,1,1,0,-350.427,1448.5,24.3665,4.72984,600,0,0,300,0,0,0,0,0),
+(@GUID+35,1892,0,1,1,0,-370.983,1576.35,16.981,1.98656,600,0,0,300,0,2,0,0,0),
+(@GUID+36,1892,0,1,1,0,-377.63,1491.95,18.4887,5.32325,600,0,0,300,0,0,0,0,0),
+(@GUID+37,1892,0,1,1,0,-381.301,1653.14,17.7911,4.4855,600,0,0,300,0,0,0,0,0),
+(@GUID+38,1892,0,1,1,0,-354.378,1421.62,28.2597,5.14872,600,0,0,300,0,0,0,0,0),
+(@GUID+39,1892,0,1,1,0,-432.435,1531.27,18.7313,4.20121,600,5,0,300,0,1,0,0,0),
+(@GUID+40,1892,0,1,1,0,-350.822,1606.93,18.0028,3.78911,600,0,0,300,0,0,0,0,0),
+(@GUID+41,1892,0,1,1,0,-416.268,1576.92,19.5441,3.61468,600,0,0,300,0,0,0,0,0),
+(@GUID+42,1892,0,1,1,0,-439.617,1517.84,19.5619,3.33314,600,5,0,300,0,1,0,0,0),
+(@GUID+43,1892,0,1,1,0,-358.11,1528.2,24.9468,1.18862,600,0,0,300,0,0,0,0,0),
+(@GUID+44,1892,0,1,1,0,-433.404,1564.13,19.7291,1.48262,600,5,0,300,0,1,0,0,0),
+(@GUID+45,1892,0,1,1,0,-363.818,1545.45,24.4813,3.24746,600,0,0,300,0,0,0,0,0),
+(@GUID+46,1892,0,1,1,0,-345.242,1601.84,17.0845,2.23485,600,0,0,300,0,0,0,0,0);
diff --git a/sql/updates/world/2011_12_25_02_world_sai.sql b/sql/updates/world/2011_12_25_02_world_sai.sql
new file mode 100644
index 00000000000..f0d69b04964
--- /dev/null
+++ b/sql/updates/world/2011_12_25_02_world_sai.sql
@@ -0,0 +1,47 @@
+-- Terenthis SAI
+SET @ENTRY := 3693;
+SET @QUEST := 986;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+DELETE FROM `quest_end_scripts` WHERE `id`=993; -- For some reason this entry was different..
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100,@ENTRY*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
+-- Start quest
+(@ENTRY,0,0,0,19,0,100,0,@QUEST,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,12,6086,1,25000,0,0,0,8,0,0,0,6435.25,368.004,13.9412,1.09956,"Terenthis - On Script - Summon Auberdine Sentinel"),
+(@ENTRY*100,9,1,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 0"),
+(@ENTRY*100,9,2,0,0,0,100,0,7000,7000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 1"),
+(@ENTRY*100,9,3,0,0,0,100,0,9000,9000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 2"),
+-- End quest
+(@ENTRY,0,1,0,20,0,100,0,@QUEST,0,0,0,80,@ENTRY*100+1,0,2,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Quest Finish - Run Script"),
+(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,12,3695,1,50000,0,0,0,8,0,0,0,6435.25,368.004,13.9412,1.09956,"Terenthis - On Script - Summon Grimclaw"),
+(@ENTRY*100+1,9,1,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 3"),
+(@ENTRY*100+1,9,2,0,0,0,100,0,7000,7000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 4"),
+(@ENTRY*100+1,9,3,0,0,0,100,0,9000,9000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 5"),
+(@ENTRY*100+1,9,4,0,0,0,100,0,11000,11000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 6"),
+(@ENTRY*100+1,9,5,0,0,0,100,0,14000,14000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Terenthis - On Script - Say Line 7");
+-- Texts
+DELETE FROM `db_script_string` WHERE `entry` IN (2000000009,2000000010,2000000011,2000000050,2000000051,2000000052,2000000053,2000000054);
+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,"What is happening?",12,0,0,0,0,0,"Terenthis"),
+(@ENTRY,1,0,"Volcor needs help?",12,0,0,0,0,0,"Terenthis"),
+(@ENTRY,2,0,"All right, I shall find people to help him.",12,0,0,0,0,0,"Terenthis"),
+
+(@ENTRY,3,0,"Hello Grimclaw.",12,0,0,0,0,0,"Terenthis"),
+(@ENTRY,4,0,"What is happening?",12,0,0,0,0,0,"Terenthis"),
+(@ENTRY,5,0,"Volcor needs help?",12,0,0,0,0,0,"Terenthis"),
+(@ENTRY,6,0,"You know where he is?",12,0,0,0,0,0,"Terenthis"),
+(@ENTRY,7,0,"Well, ok. I am sending people. We will need to find and help him!",12,0,0,0,0,0,"Terenthis");
+
+-- Grimclaw SAI
+SET @ENTRY := 3695;
+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,0,22,0,100,0,101,5000,5000,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimclaw - Emote Receive 'Wave' - Emote Line 0");
+-- 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,"Grimclaw growls in your direction before taking time to sniff you.",16,0,0,0,0,0,"Grimclaw");
diff --git a/sql/updates/world/2011_12_25_03_world_misc.sql b/sql/updates/world/2011_12_25_03_world_misc.sql
new file mode 100644
index 00000000000..a8967354a3d
--- /dev/null
+++ b/sql/updates/world/2011_12_25_03_world_misc.sql
@@ -0,0 +1,3 @@
+-- The Thunderspike
+UPDATE `gameobject_template` SET `AIName`='',`ScriptName`='go_thunderspike' WHERE `entry`=184729;
+DELETE FROM `event_scripts` WHERE `id`=13685;
diff --git a/sql/updates/world/2011_12_25_03_world_sai.sql b/sql/updates/world/2011_12_25_03_world_sai.sql
new file mode 100644
index 00000000000..e53c9f72e38
--- /dev/null
+++ b/sql/updates/world/2011_12_25_03_world_sai.sql
@@ -0,0 +1,52 @@
+-- [Q] [A] Escape Through Force
+-- [Q] [A] Escape Through Stealth
+-- Volcor SAI
+SET @ENTRY := 3692;
+SET @QUEST_FORCE := 994;
+SET @QUEST_STEALTH := 995;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id` IN (@QUEST_FORCE,@QUEST_STEALTH);
+DELETE FROM `quest_start_scripts` WHERE `id` IN (@QUEST_FORCE,@QUEST_STEALTH);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100,@ENTRY*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,0,0,0,19,0,100,0,@QUEST_FORCE,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Volcor - On Quest Accept - 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,"Volcor - On Script - Say Line 0"),
+(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,53,0,@ENTRY,0,0,0,2,1,0,0,0,0,0,0,0,"Volcor - On Script - Start WP"),
+(@ENTRY*100,9,2,0,0,0,100,0,135000,135000,0,0,1,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Volcor - On Script - Say Line 2"),
+(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,15,@QUEST_FORCE,0,0,0,0,7,0,0,0,0,0,0,0,0,"Volcor - On Script - Quest Credit"),
+
+(@ENTRY,0,1,0,19,0,100,0,@QUEST_STEALTH,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Volcor - On Quest Accept - Run Script"),
+(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,3,0,0,0,0,0,0,"Volcor - On Script - Say Line 0"),
+(@ENTRY*100+1,9,1,0,0,0,100,0,0,0,0,0,53,0,@ENTRY,0,0,0,2,1,0,0,0,0,0,0,0,"Volcor - On Script  - Start WP"),
+(@ENTRY*100+1,9,2,0,0,0,100,0,135000,135000,0,0,1,3,0,0,0,0,0,7,0,0,0,0,0,0,0,"Volcor - On Script - Say Line 3"),
+(@ENTRY*100+1,9,3,0,0,0,100,0,0,0,0,0,15,@QUEST_STEALTH,0,0,0,0,7,0,0,0,0,0,0,0,0,"Volcor - On Script - Quest Credit"),
+
+(@ENTRY,0,2,0,40,0,100,0,15,@ENTRY*100,0,0,41,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Volcor - On WP 15 - Forced Despawn"),
+(@ENTRY,0,3,0,4,0,100,0,0,0,0,0,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Volcor - On Aggro - Say Line 1");
+-- Texts
+DELETE FROM `db_script_string` WHERE `entry` BETWEEN 2000000012 AND 2000000016;
+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,"All right, let's go.",12,0,100,0,0,0,"Volcor"),
+(@ENTRY,1,0,"Oh no! They are here!",12,0,100,0,0,0,"Volcor"),
+(@ENTRY,2,0,"OK, $N. Now I can get to the Auberdine alone. Go to Terenthis, he's waiting for you. Thanks for the help!",12,0,100,0,0,0,"Volcor"),
+(@ENTRY,3,0,"OK, good luck friend. Thanks for the help.",12,0,100,0,0,0,"Volcor");
+
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,4606.61,2.96905,69.909,"Volcor"),
+(@ENTRY,2,4615.56,19.7957,70.7951,"Volcor"),
+(@ENTRY,3,4626.26,38.1105,69.0281,"Volcor"),
+(@ENTRY,4,4633.11,48.379,67.5631,"Volcor"),
+(@ENTRY,5,4637.2,71.7156,63.3412,"Volcor"),
+(@ENTRY,6,4645.39,88.5048,60.3851,"Volcor"),
+(@ENTRY,7,4660.2,104.218,58.4603,"Volcor"),
+(@ENTRY,8,4675.33,115.93,56.8969,"Volcor"),
+(@ENTRY,9,4688.21,131.397,55.5033,"Volcor"),
+(@ENTRY,10,4701.45,145.562,53.2203,"Volcor"),
+(@ENTRY,11,4709.21,155.279,52.0846,"Volcor"),
+(@ENTRY,12,4716.9,169.528,53.5005,"Volcor"),
+(@ENTRY,13,4725.44,180.07,54.7346,"Volcor"),
+(@ENTRY,14,4734.01,194.431,55.3888,"Volcor"),
+(@ENTRY,15,4747.92,209.436,53.1076,"Volcor");
diff --git a/sql/updates/world/2011_12_26_00_world_sai.sql b/sql/updates/world/2011_12_26_00_world_sai.sql
new file mode 100644
index 00000000000..616ced60147
--- /dev/null
+++ b/sql/updates/world/2011_12_26_00_world_sai.sql
@@ -0,0 +1,44 @@
+-- [Q] [A/H] Therylune's Escape
+-- Therylune SAI
+SET @ENTRY := 3584;
+SET @QUEST := 945;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+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,19,0,100,0,@QUEST,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Therylune - On Quest Accept - Say Line 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,53,0,@ENTRY,0,0,0,2,1,0,0,0,0,0,0,0,"Therylune - On Quest Accept - Start WP"),
+(@ENTRY,0,2,3,40,0,100,0,20,@ENTRY,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Therylune - On WP 20 - Say Line 1"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,15,@QUEST,0,0,0,0,7,0,0,0,0,0,0,0,0,"Therylune - On WP 20 - Quest Credit"),
+(@ENTRY,0,4,0,40,0,100,0,21,@ENTRY,0,0,41,5000,0,0,0,0,1,0,0,0,0,0,0,0,0,"Therylune - On WP 21 - Forced Despawn");
+-- Texts
+DELETE FROM `db_script_string` WHERE `entry` IN (2000000017,2000000018);
+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,"Ok, let's go!",12,0,100,0,0,0,"Therylune"),
+(@ENTRY,1,0,"I can make it the rest of the way, $N. Thanks!",12,0,100,0,0,0,"Therylune");
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,4520.4,420.235,33.5284,"Therylune"),
+(@ENTRY,2,4512.26,408.881,32.9308,"Therylune"),
+(@ENTRY,3,4507.94,396.47,32.9476,"Therylune"),
+(@ENTRY,4,4507.53,383.781,32.995,"Therylune"),
+(@ENTRY,5,4512.1,374.02,33.166,"Therylune"),
+(@ENTRY,6,4519.75,373.241,33.1574,"Therylune"),
+(@ENTRY,7,4592.41,369.127,31.4893,"Therylune"),
+(@ENTRY,8,4598.55,364.801,31.4947,"Therylune"),
+(@ENTRY,9,4602.76,357.649,32.9265,"Therylune"),
+(@ENTRY,10,4597.88,352.629,34.0317,"Therylune"),
+(@ENTRY,11,4590.23,350.9,36.2977,"Therylune"),
+(@ENTRY,12,4581.5,348.254,38.3878,"Therylune"),
+(@ENTRY,13,4572.05,348.059,42.3539,"Therylune"),
+(@ENTRY,14,4564.75,344.041,44.2463,"Therylune"),
+(@ENTRY,15,4556.63,341.003,47.6755,"Therylune"),
+(@ENTRY,16,4554.38,334.968,48.8003,"Therylune"),
+(@ENTRY,17,4557.63,329.783,49.9532,"Therylune"),
+(@ENTRY,18,4563.32,316.829,53.2409,"Therylune"),
+(@ENTRY,19,4566.09,303.127,55.0396,"Therylune"),
+(@ENTRY,20,4561.65,295.456,57.0984,"Therylune"),
+(@ENTRY,21,4551.03,293.333,57.1534,"Therylune");
diff --git a/sql/updates/world/2011_12_26_01_world_sai.sql b/sql/updates/world/2011_12_26_01_world_sai.sql
new file mode 100644
index 00000000000..50283820dc8
--- /dev/null
+++ b/sql/updates/world/2011_12_26_01_world_sai.sql
@@ -0,0 +1,39 @@
+-- [Q] [A/H] Enchanted Azsharite Fel Weaponry
+-- [Q] [A/H] Expert Blacksmith!
+-- Galvan the Ancient SAI
+SET @ENTRY := 7802;
+SET @QUEST_ENCHANTED := 3625;
+SET @QUEST_EXPERT_BS := 2765;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id` IN (@QUEST_ENCHANTED,@QUEST_EXPERT_BS);
+UPDATE `creature` SET `position_x`=-12033.400391,`position_y`=-1003.859985,`position_z`=49.779499,`orientation`=3.910880 WHERE `guid`=384 AND `id`=@ENTRY; -- Galvan the Ancient should be at a different position..
+DELETE FROM `creature` WHERE `guid`=1864 AND `id`=684; -- Flying panther in the middle of our event spot..
+DELETE FROM `creature_addon` WHERE `guid`=1864;
+DELETE FROM `quest_start_scripts` WHERE `id` IN (@QUEST_ENCHANTED,@QUEST_EXPERT_BS);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100,@ENTRY*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,0,0,0,19,0,100,0,@QUEST_ENCHANTED,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-12040.5,-1008.7,49.4,3.66,"Galvan the Ancient - On Script - Move To Anvil"),
+(@ENTRY*100,9,1,0,0,0,100,0,4000,4000,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,2,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,3,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,4,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,5,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-12040.988281,-1007.649170,49.481323,2.364430,"Galvan the Ancient - On Script - Move To Forge"),
+(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,7,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,8,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,9,0,0,0,100,0,2000,2000,0,0,15,@QUEST_ENCHANTED,0,0,0,0,0,7,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Quest Credit"),
+(@ENTRY*100,9,10,0,0,0,100,0,5000,5000,0,0,69,0,0,0,0,0,0,8,0,0,0,-12033.400391,-1003.859985,49.779499,3.910880,"Galvan the Ancient - On Script - Move To Homeposition"),
+
+(@ENTRY,0,1,0,19,0,100,0,@QUEST_EXPERT_BS,0,0,0,80,@ENTRY*100+1,0,2,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Quest Accept - Run Script"),
+(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-12040.5,-1008.7,49.4,3.66,"Galvan the Ancient - On Script - Move To Anvil"),
+(@ENTRY*100+1,9,1,0,0,0,100,0,4000,4000,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100+1,9,2,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100+1,9,3,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100+1,9,4,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100+1,9,5,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-12040.988281,-1007.649170,49.481323,2.364430,"Galvan the Ancient - On Script - Move To Forge"),
+(@ENTRY*100+1,9,6,0,0,0,100,0,1000,1000,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100+1,9,7,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100+1,9,8,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100+1,9,9,0,0,0,100,0,2000,2000,0,0,15,@QUEST_EXPERT_BS,0,0,0,0,0,7,0,0,0,0,0,0,0,"Galvan the Ancient - On Script - Quest Credit"),
+(@ENTRY*100+1,9,10,0,0,0,100,0,5000,5000,0,0,69,0,0,0,0,0,0,8,0,0,0,-12033.400391,-1003.859985,49.779499,3.910880,"Galvan the Ancient - On Script - Move To Homeposition");
diff --git a/sql/updates/world/2011_12_26_02_world_sai.sql b/sql/updates/world/2011_12_26_02_world_sai.sql
new file mode 100644
index 00000000000..6da23e21875
--- /dev/null
+++ b/sql/updates/world/2011_12_26_02_world_sai.sql
@@ -0,0 +1,58 @@
+-- [Q] [A/H] The Summoning
+-- Bath'rah the Windwatcher SAI
+SET @ENTRY := 6176;
+SET @QUEST := 1713;
+SET @SPELL_SUMMON := 8606;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100,@ENTRY*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,0,0,0,19,0,100,0,@QUEST,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Bath'rah the Windwatcher - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,53,0,@ENTRY,0,0,0,2,1,0,0,0,0,0,0,0,"Bath'rah the Windwatcher - On Script - Start WP"),
+(@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,"Bath'rah the Windwatcher - On Script - Say Line 0"),
+(@ENTRY,0,1,0,0,0,100,0,7,@ENTRY,0,0,80,@ENTRY*100+1,0,2,0,0,0,1,0,0,0,0,0,0,0,"Bath'rah the Windwatcher - On WP 7 - Run Script"),
+(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,11,@SPELL_SUMMON,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bath'rah the Windwatcher - On Script - Cast Summon Cyclonian"),
+(@ENTRY*100+1,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bath'rah the Windwatcher - On Script - Say Line 1"),
+(@ENTRY*100+1,9,2,0,0,0,100,0,15000,15000,0,0,53,0,@ENTRY*10,0,0,0,2,1,0,0,0,0,0,0,0,"Bath'rah the Windwatcher - On Script - Start WP");
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY,@ENTRY*10);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,253.05,-1459.09,52.09,"Bath'rah the Windwatcher"),
+(@ENTRY,2,256.87,-1440.35,50.09,"Bath'rah the Windwatcher"),
+(@ENTRY,3,273.74,-1433.18,50.29,"Bath'rah the Windwatcher"),
+(@ENTRY,4,297.77,-1436.7,46.96,"Bath'rah the Windwatcher"),
+(@ENTRY,5,329.59,-1442.08,40.31,"Bath'rah the Windwatcher"),
+(@ENTRY,6,332.73,-1455.6,42.24,"Bath'rah the Windwatcher"),
+(@ENTRY,7,323.83,-1468.92,42.24,"Bath'rah the Windwatcher"),
+
+(@ENTRY*10,1,332.73,-1455.6,42.24,"Bath'rah the Windwatcher"),
+(@ENTRY*10,2,329.59,-1442.08,40.31,"Bath'rah the Windwatcher"),
+(@ENTRY*10,3,297.77,-1436.7,46.96,"Bath'rah the Windwatcher"),
+(@ENTRY*10,4,273.74,-1433.18,50.29,"Bath'rah the Windwatcher"),
+(@ENTRY*10,5,256.87,-1440.35,50.09,"Bath'rah the Windwatcher"),
+(@ENTRY*10,6,253.05,-1459.09,52.09,"Bath'rah the Windwatcher"),
+(@ENTRY*10,7,250.84,-1470.58,55.4491,"Bath'rah the Windwatcher");
+-- Texts
+DELETE FROM `db_script_string` WHERE `entry` IN (2000000029,2000000043);
+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,"Follow me, $N. I will soon begin the summoning.",12,0,100,0,0,0,"Bath'rah the Windwatcher"),
+(@ENTRY,1,0,"%s begins a spell of summoning...",41,0,100,0,0,0,"Bath'rah the Windwatcher");
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,253.05,-1459.09,52.09,"Bath'rah the Windwatcher"),
+(@ENTRY,2,256.87,-1440.35,50.09,"Bath'rah the Windwatcher"),
+(@ENTRY,3,273.74,-1433.18,50.29,"Bath'rah the Windwatcher"),
+(@ENTRY,4,297.77,-1436.7,46.96,"Bath'rah the Windwatcher"),
+(@ENTRY,5,329.59,-1442.08,40.31,"Bath'rah the Windwatcher"),
+(@ENTRY,6,332.73,-1455.6,42.24,"Bath'rah the Windwatcher"),
+(@ENTRY,7,323.83,-1468.92,42.24,"Bath'rah the Windwatcher"),
+(@ENTRY,8,332.73,-1455.6,42.24,"Bath'rah the Windwatcher"),
+(@ENTRY,9,329.59,-1442.08,40.31,"Bath'rah the Windwatcher"),
+(@ENTRY,10,297.77,-1436.7,46.96,"Bath'rah the Windwatcher"),
+(@ENTRY,11,273.74,-1433.18,50.29,"Bath'rah the Windwatcher"),
+(@ENTRY,12,256.87,-1440.35,50.09,"Bath'rah the Windwatcher"),
+(@ENTRY,13,253.05,-1459.09,52.09,"Bath'rah the Windwatcher"),
+(@ENTRY,14,250.84,-1470.58,55.4491,"Bath'rah the Windwatcher");
diff --git a/sql/updates/world/2011_12_26_03_world_sai.sql b/sql/updates/world/2011_12_26_03_world_sai.sql
new file mode 100644
index 00000000000..07333e50a91
--- /dev/null
+++ b/sql/updates/world/2011_12_26_03_world_sai.sql
@@ -0,0 +1,25 @@
+-- [Q] [A/H] Freed from the Hive
+-- Zukk'ash Pod SAI
+SET @ENTRY := 164954;
+SET @QUEST := 4265;
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=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,1,0,0,19,0,100,0,@QUEST,0,0,0,12,9546,1,25000,0,0,0,8,0,0,0,-5314.81,430.89,11.79,3.46,"Zukk'ash Pod - On Quest Accept - Summon Raschal the Courier");
+-- Raschal the Courier SAI
+SET @ENTRY := 9546;
+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,54,0,100,0,0,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Raschal the Courier - Just Summoned - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raschal the Courier - On Script - Say Line 0"),
+(@ENTRY*100,9,1,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raschal the Courier - On Script - Say Line 1"),
+(@ENTRY*100,9,2,0,0,0,100,0,8000,8000,0,0,15,@QUEST,0,0,0,0,7,0,0,0,0,0,0,0,0,"Raschal the Courier - On Script - Quest Credit"),
+(@ENTRY*100,9,3,0,0,0,100,0,2000,2000,0,0,41,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Raschal the Courier - On Script - Forced Despawn");
+-- 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,"Oh man, I thought I was dead for sure. Ugh... still dizzy...",12,0,100,0,0,0,"Raschal the Courier"),
+(@ENTRY,1,0,"I can get back to the Stronghold on my own, I think. Now that you bought me some time, I should be able to stealth out of here. Who ever you are... thank you. May Elune bless you always!",12,0,100,0,0,0,"Raschal the Courier");
diff --git a/sql/updates/world/2011_12_26_04_world_sai.sql b/sql/updates/world/2011_12_26_04_world_sai.sql
new file mode 100644
index 00000000000..c508773c51a
--- /dev/null
+++ b/sql/updates/world/2011_12_26_04_world_sai.sql
@@ -0,0 +1,28 @@
+-- [Q] [A] The Touch of Zanzil
+-- Doc Mixilpixil SAI
+SET @ENTRY := 7207;
+SET @QUEST := 2608;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+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,19,0,100,0,@QUEST,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,5,353,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Emote STATE_SPELLKNEELSTART"),
+(@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,"Doc Mixilpixil - On Script - Say Line 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,"Doc Mixilpixil - On Script - Say Line 1"),
+(@ENTRY*100,9,3,0,0,0,100,0,3000,3000,0,0,53,0,@ENTRY,0,0,0,2,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Start WP"),
+(@ENTRY,0,1,2,40,0,100,0,3,@ENTRY,0,0,41,5000,0,0,0,0,1,0,0,0,0,0,0,0,0,"Doc Mixilpixil - On WP 3 - Make Ready To Despawn"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,15,@QUEST,0,0,0,0,7,0,0,0,0,0,0,0,0,"Doc Mixilpixil - On WP 3 - Quest Credit");
+-- Text
+DELETE FROM `db_script_string` WHERE `entry` IN (2000000020,2000000021);
+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,"That's interesting...",12,0,100,0,0,0,"Doc Mixilpixil"),
+(@ENTRY,1,0,"I need to consult Noram and Horatio.",12,0,100,0,0,0,"Doc Mixilpixil");
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,-8805.29,338.5,95.09,"Doc Mixilpixil"),
+(@ENTRY,2,-8804.15,325.58,95.09,"Doc Mixilpixil"),
+(@ENTRY,3,-8805.56,331.96,95.09,"Doc Mixilpixil");
diff --git a/sql/updates/world/2011_12_26_05_world_sai.sql b/sql/updates/world/2011_12_26_05_world_sai.sql
new file mode 100644
index 00000000000..0155c3ad39b
--- /dev/null
+++ b/sql/updates/world/2011_12_26_05_world_sai.sql
@@ -0,0 +1,25 @@
+-- [Q] [A/H] The Torch of Retribution
+-- Kalaran Windblade SAI
+SET @ENTRY := 8479;
+SET @QUEST := 3453;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+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,19,0,100,0,@QUEST,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Kalaran Windblade - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,10000,10000,0,0,11,12511,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kalaran Windblade - On Script - Cast Torch Combine"),
+(@ENTRY*100,9,1,0,0,0,100,0,8000,8000,0,0,11,12511,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kalaran Windblade - On Script - Cast Torch Combine"),
+(@ENTRY*100,9,2,0,0,0,100,0,7000,7000,0,0,11,12511,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kalaran Windblade - On Script - Cast Torch Combine"),
+(@ENTRY*100,9,3,0,0,0,100,0,10000,10000,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kalaran Windblade - On Script - Say Line 0"),
+(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,11,12511,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kalaran Windblade - On Script - Cast Torch Combine"),
+(@ENTRY*100,9,5,0,0,0,100,0,1000,1000,0,0,70,0,0,0,0,0,0,14,24166,149410,0,0,0,0,0,"Kalaran Windblade - On Script - Respawn Light of Retribution (GO)"),
+(@ENTRY*100,9,6,0,0,0,100,0,2000,2000,0,0,70,0,0,0,0,0,0,14,16762,149047,0,0,0,0,0,"Kalaran Windblade - On Script - Respawn Torch of Retribution (GO)"),
+(@ENTRY*100,9,7,0,0,0,100,0,7000,7000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kalaran Windblade - On Script - Say Line 1"),
+(@ENTRY*100,9,8,0,0,0,100,0,1000,1000,0,0,15,@QUEST,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kalaran Windblade - On Script - Quest Credit");
+-- Text
+DELETE FROM `db_script_string` WHERE `entry` IN (2000000019,2000000044);
+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,"Be patient, $N. The torch is almost done.",12,0,100,0,0,0,"Kalaran Windblade"),
+(@ENTRY,1,0,"It is done...",12,0,100,0,0,0,"Kalaran Windblade");
diff --git a/sql/updates/world/2011_12_26_06_world_sai.sql b/sql/updates/world/2011_12_26_06_world_sai.sql
new file mode 100644
index 00000000000..6335bd9f475
--- /dev/null
+++ b/sql/updates/world/2011_12_26_06_world_sai.sql
@@ -0,0 +1,27 @@
+-- [Q] [A/H] Did You Lose This?
+-- Trenton Lighthammer SAI
+SET @ENTRY := 7804;
+SET @QUEST := 3321;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+DELETE FROM `quest_end_scripts` WHERE `id`=@QUEST;
+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,20,0,100,0,@QUEST,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Trenton Lighthammer - On Quest Complete - Say Line 0"),
+(@ENTRY,0,1,0,19,0,100,0,@QUEST,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,1,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,2,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,3,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,4,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,5,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.842743,"Trenton Lighthammer - On Script - Face Forge"),
+(@ENTRY*100,9,6,0,0,0,100,0,1000,1000,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,7,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,8,0,0,0,100,0,1500,1500,0,0,5,28,0,0,0,0,0,1,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Emote STATE_WORK_SHEATHED"),
+(@ENTRY*100,9,9,0,0,0,100,0,2000,2000,0,0,15,@QUEST,0,0,0,0,0,7,0,0,0,0,0,0,0,"Trenton Lighthammer - On Script - Quest Credit");
+-- Texts
+DELETE FROM `db_script_string` WHERE `entry`=2000000076;
+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,"Hear ye, denizens of Tanaris! Let it be known $N is an exalted member of the Mithril Order. A blacksmith of honor, dedication, and infinite patience. Three cheers for $N!",14,0,100,0,0,0,"Trenton Lighthammer");
diff --git a/sql/updates/world/2011_12_26_07_world_sai.sql b/sql/updates/world/2011_12_26_07_world_sai.sql
new file mode 100644
index 00000000000..ffe55b0e5f9
--- /dev/null
+++ b/sql/updates/world/2011_12_26_07_world_sai.sql
@@ -0,0 +1,18 @@
+-- [Q] [A/H] Scarlet Armies Approach...
+-- Orbaz Bloodbane SAI
+SET @ENTRY := 28914;
+SET @QUEST := 12757;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+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,19,0,100,0,@QUEST,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Orbaz Bloodbane - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Orbaz Bloodbane - On Script - Say Line 0"),
+(@ENTRY*100,9,1,0,0,0,100,0,3000,3000,0,0,11,53097,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orbaz Bloodbane - On Script - Cast Portal: Acherus");
+-- Text
+DELETE FROM `waypoint_scripts` WHERE `id`=491;
+DELETE FROM `db_script_string` WHERE `entry`=2000000008;
+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,"Make haste, $N. Use the portal!",12,0,100,25,0,0,"Orbaz Bloodlane");
diff --git a/sql/updates/world/2011_12_26_08_world_sai.sql b/sql/updates/world/2011_12_26_08_world_sai.sql
new file mode 100644
index 00000000000..6633e97f2b4
--- /dev/null
+++ b/sql/updates/world/2011_12_26_08_world_sai.sql
@@ -0,0 +1,19 @@
+-- [Q] [H] Hinott's Assistance
+-- Serge Hinott SAI
+SET @ENTRY := 2391;
+SET @QUEST := 2480;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=@QUEST;
+DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST;
+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,19,0,100,0,@QUEST,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Serge Hinott - On Quest Accept - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4.33,-900.68,57.54,1.54,"Serge Hinott - On Script - Move To Pos"),
+(@ENTRY*100,9,1,0,0,0,100,0,18000,18000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Serge Hinott - On Script - Say Line 0"),
+(@ENTRY*100,9,2,0,0,0,100,0,10000,10000,0,0,15,@QUEST,0,0,0,0,0,7,0,0,0,0,0,0,0,"Serge Hinott - On Script - Quest Credit"),
+(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4.66,-903.92,57.54,3.48,"Serge Hinott - On Script - Move To Pos");
+-- Text
+DELETE FROM `db_script_string` WHERE `entry`=2000000026;
+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,"Whoops!",12,0,100,113,0,0,"Serge Hinott");
diff --git a/sql/updates/world/4.x/2011_12_26_00_world_achievement_criteria_data.sql b/sql/updates/world/4.x/2011_12_26_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..0f2936634fb
--- /dev/null
+++ b/sql/updates/world/4.x/2011_12_26_00_world_achievement_criteria_data.sql
@@ -0,0 +1,3 @@
+-- Remove unneeded achievement criteria datas for implemented DBC conditions:
+-- TYPE_T_PLAYER_DEAD 4, TYPE_S_AREA 6, TYPE_MAP_DIFFICULTY 12, TYPE_MAP_ID 20
+DELETE FROM achievement_criteria_data WHERE `type` IN (4, 6, 12, 20);