Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp

22 files changed, 844 insertions, 0 deletions

diff --git a/sql/updates/characters/2013_03_23_00_characters_game_event.sql b/sql/updates/characters/2013_06_23_00_characters_game_event.sql
index d8a58832ce1..d8a58832ce1 100644
--- a/sql/updates/characters/2013_03_23_00_characters_game_event.sql
+++ b/sql/updates/characters/2013_06_23_00_characters_game_event.sql
diff --git a/sql/updates/world/2013_06_23_01_world_misc.sql b/sql/updates/world/2013_06_23_01_world_misc.sql
new file mode 100644
index 00000000000..f98b1f2f7ab
--- /dev/null
+++ b/sql/updates/world/2013_06_23_01_world_misc.sql
@@ -0,0 +1,3 @@
+-- Move Blackhand Incarcerator to core scripting
+UPDATE `creature_template` SET `AIName`= '',`ScriptName`= 'npc_blackhand_incarcerator' WHERE `entry`=10316;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10316;
diff --git a/sql/updates/world/2013_06_24_00_world_creature_text.sql b/sql/updates/world/2013_06_24_00_world_creature_text.sql
new file mode 100644
index 00000000000..6419e43ad14
--- /dev/null
+++ b/sql/updates/world/2013_06_24_00_world_creature_text.sql
@@ -0,0 +1,22 @@
+-- Text for Lord Victor Nefarius from sniff
+SET @VICTOR := 10162;
+SET @REND   := 10429;
+DELETE FROM `creature_text` WHERE `entry` IN (@VICTOR,@REND);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+-- Lord Victor Nefarius texts UBRS
+(@VICTOR,0,0,"Excellent... it would appear as if the meddlesome insects have arrived just in time to feed my legion. Welcome, mortals!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,1,0,"Let not even a drop of their blood remain upon the arena floor, my children. Feast on their souls!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,2,0,"Foolsss... Kill the one in the dress!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,3,0,"Inconceivable!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,4,0,"Your efforts will prove fruitless. None shall stand in our way!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,5,0,"Do not force my hand, children! I shall use your hides to line my boots.",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,6,0,"Use the freezing breath, imbecile!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,7,0,"THIS CANNOT BE!!! Rend, deal with these insects.",14,0,100,0,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,8,0,"The Warchief shall make quick work of you, mortals. Prepare yourselves!",14,0,100,25,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,9,0,"Your victory shall be short lived. The days of both the Alliance and Horde are coming to an end! The next time we meet shall be the last.",14,0,100,5,0,0,'Lord Victor Nefarius (UBRS)'),
+-- Lord Victor Nefarius texts BWL
+(@VICTOR,10,0,"In this world where time is your enemy, it is my greatest ally. This grand game of life that you think you play in fact plays you. To that I say...",12,0,100,22,0,0,'Lord Victor Nefarius SAY_GAMESBEGIN_1 (BWL)'),
+(@VICTOR,11,0,"Let the games begin!",14,0,100,22,0,8280,'Lord Victor Nefarius SAY_GAMESBEGIN_2 (BWL)'),
+(@VICTOR,12,0,"Ah, the heroes. You are persistent, aren't you. Your allied attempted to match his power against mine, and had to pay the price. Now he shall serve me, by slaughtering you. Get up little red wyrm and destroy them!",14,0,100,22,0,8279,'Lord Victor Nefarius SAY_VAEL_INTRO (BWL)'),
+-- Warchief Rend Blackhand text
+(@REND,0,0,"With pleasure...",14,0,100,0,0,0,'Warchief Rend Blackhand');
diff --git a/sql/updates/world/2013_06_24_01_world_misc.sql b/sql/updates/world/2013_06_24_01_world_misc.sql
new file mode 100644
index 00000000000..54487e129de
--- /dev/null
+++ b/sql/updates/world/2013_06_24_01_world_misc.sql
@@ -0,0 +1,195 @@
+-- Add Missing Gossip Menu for Lord Victor Nefarius
+UPDATE `creature_template` SET `gossip_menu_id`=21330 WHERE `entry`=10162;
+
+-- Add Missing Gossip Menu items for Lord Victor Nefarius
+DELETE FROM `gossip_menu` WHERE `entry`=21330 AND `text_id`=7134;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (21330,7134);
+DELETE FROM `gossip_menu` WHERE `entry`=21331 AND `text_id`=7198;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (21331,7198);
+DELETE FROM `gossip_menu` WHERE `entry`=21332 AND `text_id`=7199;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (21332,7199);
+
+-- Add Missing Gossip Menu options for Lord Victor Nefarius
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (21330,21331,21332);
+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
+(21330,0,0, 'I''ve made no mistakes.',1,1,21331,0,0,0, ''),
+(21331,0,0, 'You have lost your mind, Nefarius. You speak in riddles.',1,1,21332,0,0,0, ''),
+(21332,0,0, 'Please do.',1,1,0,0,0,0, '');
+
+-- Add Missing Gossip Menu for Vaelastrasz the Corrupt
+UPDATE `creature_template` SET `gossip_menu_id`=21333 WHERE `entry`=13020;
+
+-- Add Missing Gossip Menu items for Vaelastrasz the Corrupt
+DELETE FROM `gossip_menu` WHERE `entry`=21333 AND `text_id`=7156;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (21333,7156);
+DELETE FROM `gossip_menu` WHERE `entry`=21334 AND `text_id`=7256;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (21334,7256);
+
+-- Add Missing Gossip Menu options for Vaelastrasz the Corrupt
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (21333,21334);
+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
+(21333,0,0, 'I cannot Vaelastraz! Surely something can be done to heal you!',1,1,21334,0,0,0, ''),
+(21334,0,0, 'Vaelastraz, no!!',1,1,21332,0,0,0, '');
+
+-- Add missing text for Nefarian
+SET @NEFARIAN := 11583;
+DELETE FROM `creature_text` WHERE `entry`=@NEFARIAN AND `groupid`=13;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@NEFARIAN,13,0,"'Death Knights, get over here!'",14,0,100,0,0,0,'nefarian SAY_DEATH_KNIGHT');
+
+-- wrong creature spawn
+DELETE FROM creature WHERE guid IN (84511, 84510, 84509, 84505, 84444, 84404, 84393);
+DELETE FROM creature WHERE guid IN (84496, 84489, 84487, 84439, 84437, 84405, 84403);
+DELETE FROM creature WHERE guid IN (84503, 84494, 84493, 84392);
+DELETE FROM creature WHERE guid IN (84486, 84484, 84436);
+DELETE FROM creature WHERE guid IN (84495, 84432, 84406);
+
+UPDATE creature_template SET spell2=19873, spell3=19872, spell4=0 WHERE entry=12435;
+UPDATE gameobject_template SET ScriptName='go_orb_of_domination' WHERE entry=177808;
+
+DELETE FROM spell_script_names WHERE spell_id=19873;
+INSERT INTO spell_script_names (spell_id, ScriptName) VALUES
+(19873, 'spell_egg_event');
+
+DELETE FROM spell_linked_spell WHERE spell_trigger=42013 AND spell_effect=45537;
+INSERT INTO spell_linked_spell (spell_trigger, spell_effect, comment) VALUES
+(42013, 45537, 'Visual Channel');
+
+-- nefarian
+REPLACE INTO spell_target_position (id, target_map, target_position_x, target_position_y, target_position_z, target_orientation) VALUES
+(22981, 469, -7536.73, -1280.18, 476.799, 2.11467),
+(22982, 469, -7503.34, -1163.17, 476.797, 2.57019),
+(22983, 469, -7482.73, -1196.49, 476.799, 2.31887),
+(22984, 469, -7462.38, -1224.99, 476.786, 2.37385),
+(22978, 469, -7534.08, -1198.57, 476.799, 2.23641),
+(22979, 469, -7514.02, -1224.35, 476.8, 2.21677),
+(22980, 469, -7496.05, -1248.45, 476.799, 2.09111),
+(22972, 469, -7516.38, -1263.78, 476.773, 2.18536),
+(22975, 469, -7582.36, -1213.9, 476.799, 2.17357),
+(22976, 469, -7564.18, -1240.31, 476.799, 2.17357),
+(22977, 469, -7550.29, -1260.5, 476.799, 2.17357);
+
+UPDATE creature_template SET InhabitType=7 WHERE entry=11583;
+
+-- Add missing go spawns
+
+-- doors
+SET @OGUID = 7226; -- 7230
+DELETE FROM gameobject WHERE guid BETWEEN @OGUID AND @OGUID+4;
+INSERT INTO gameobject (guid, id, map, position_x, position_y, position_z, orientation, rotation2, rotation3, spawntimesecs, state) VALUES
+(@OGUID , 181125, 469, -7488.35, -1150.67, 476.534, 0.674574, 0.330928, 0.943656, 300, 1),
+(@OGUID+1, 185483, 469, -7455.08, -1051.84, 476.556, 2.17155, 0.884665, 0.466227, 300, 1),
+(@OGUID+2, 180424, 469, -7565.34, -1029.19, 449.142, 3.75568, 0.953231, -0.302244, 300, 1),
+(@OGUID+3, 175185, 469, -7520.27, -972.05, 423.429, 5.32599, 0.460536, -0.887641, 300, 1),
+(@OGUID+4, 175946, 469, -7552.26, -1022.92, 408.491, 3.75109, 0.953922, -0.300053, 300, 1);
+-- SELECT * FROM gameobject where id IN(181125,185483,180424,175185,175946);
+
+SET @OGUID := 56158;
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+19;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(@OGUID+0, 179121, 469, 1, 1, -7683.71, -1052.777, 440.6431, 3.752462, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+1, 179122, 469, 1, 1, -7691.453, -1040.233, 440.6851, 3.752462, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+2, 153723, 469, 1, 1, -7752.402, -1155.65, 396.6956, 3.33359, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1), 
+(@OGUID+3, 179148, 469, 1, 1, -7510.984, -1094.69, 476.5545, 5.340709, 0, 0, 0, 1, 7200, 255, 1),
+(@OGUID+4, 149045, 469, 1, 1, -6904.809, -1206.778, 178.5116, 2.984498, 0, 0, 1, -4.371139E-08, 7200, 255, 1),
+(@OGUID+5, 149046, 469, 1, 1, -6900.417, -1339.326, 239.6519, 3.394674, 0, 0, 1, -4.371139E-08, 7200, 255, 1),
+(@OGUID+6, 161536, 469, 1, 1, -6756.733, -1166.698, 187.0418, 1.317723, 0, 0, 0.9969173, -0.07845917, 7200, 255, 1),
+(@OGUID+7, 179113, 469, 1, 1, -7629.542, -1017.326, 413.3823, 6.06502, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+8, 179112, 469, 1, 1, -7628.558, -1012.672, 413.3823, 5.750863, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+9, 179114, 469, 1, 1, -7627.558, -1009.027, 413.3823, 5.366888, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+10, 179111, 469, 1, 1, -7623.486, -1009.636, 413.3823, 4.89565, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+11, 179110, 469, 1, 1, -7618.736, -1009.88, 413.3823, 4.651303, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+12, 180632, 469, 1, 1, -7554.886, -1039.864, 449.2131, 2.967041, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+13, 180631, 469, 1, 1, -7545.932, -978.4827, 449.2131, 2.967041, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+14, 179106, 469, 1, 1, -7468.113, -1047.162, 411.971, 0.6108655, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+15, 179105, 469, 1, 1, -7466.616, -1042.562, 411.9711, 2.18166, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+16, 179104, 469, 1, 1, -7464.983, -1041.419, 411.9711, 2.18166, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+17, 179108, 469, 1, 1, -7464.785, -1048.651, 411.971, 2.18166, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+18, 179107, 469, 1, 1, -7459.672, -1041.251, 411.971, 3.752462, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1),
+(@OGUID+19, 179109, 469, 1, 1, -7459.427, -1044.899, 411.971, 2.18166, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1);
+
+-- eggs for razorgore
+SET @OGUID := 74165; -- 74181
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+29;
+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, 177807, 469, 1, 1, -7549.479, -1069.964, 408.4904, 5.759587, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+1, 177807, 469, 1, 1, -7554.418, -1061.5, 408.4904, 3.996807, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+2, 177807, 469, 1, 1, -7563.152, -1088.705, 413.3812, 5.829401, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+3, 177807, 469, 1, 1, -7564.887, -1058.87, 408.4904, 2.286379, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+4, 177807, 469, 1, 1, -7566.002, -1045.929, 408.4904, 3.054327, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+5, 177807, 469, 1, 1, -7568.273, -1097.68, 413.3809, 2.792518, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+6, 177807, 469, 1, 1, -7568.621, -1086.578, 413.3812, 0.8552105, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+7, 177807, 469, 1, 1, -7569.38, -1079.727, 413.3812, 3.595379, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+8, 177807, 469, 1, 1, -7572.491, -1095.034, 413.3812, 3.42085, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+9, 177807, 469, 1, 1, -7576.924, -1083.691, 413.3812, 3.38594, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+10, 177807, 469, 1, 1, -7577.844, -1035.97, 408.4904, 5.166176, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+11, 177807, 469, 1, 1, -7578.64, -1089.948, 413.3812, 2.216565, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+12, 177807, 469, 1, 1, -7579.486, -1051.485, 408.1571, 0.523598, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+13, 177807, 469, 1, 1, -7580.799, -1067.292, 408.4904, 3.298687, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+14, 177807, 469, 1, 1, -7584.68, -1075.842, 408.4904, 3.019413, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+15, 177807, 469, 1, 1, -7586.365, -1024.429, 408.4904, 3.351047, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+16, 177807, 469, 1, 1, -7588.843, -1053.786, 408.1571, 4.555311, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+17, 177807, 469, 1, 1, -7592.354, -1010.842, 408.4904, 3.735006, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+18, 177807, 469, 1, 1, -7592.379, -1035.677, 408.1571, 1.623156, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+19, 177807, 469, 1, 1, -7594.374, -1102.896, 408.4904, 5.375615, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+20, 177807, 469, 1, 1, -7597.528, -1094.538, 408.4904, 2.373644, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+21, 177807, 469, 1, 1, -7598.997, -1044.769, 408.1571, 5.253442, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+22, 177807, 469, 1, 1, -7601.142, -1077.111, 408.2178, 5.009095, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+23, 177807, 469, 1, 1, -7604.356, -1060.245, 408.1571, 3.508117, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+24, 177807, 469, 1, 1, -7609.944, -1035.106, 408.4904, 4.34587, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+25, 177807, 469, 1, 1, -7611.604, -1020.322, 413.3812, 3.089183, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+26, 177807, 469, 1, 1, -7618.098, -1069.328, 408.4904, 4.956738, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+27, 177807, 469, 1, 1, -7619.756, -1058.941, 408.4904, 1.815142, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+28, 177807, 469, 1, 1, -7626.688, -1011.714, 413.3809, 0.2268925, 0, 0, 0, 1, 7200, 255, 1), -- Black Dragon Egg (Area: 0)
+(@OGUID+29, 177807, 469, 1, 1, -7628.317, -1044.573, 408.4904, 6.108654, 0, 0, 0, 1, 7200, 255, 1); -- Black Dragon Egg (Area: 0)
+-- SELECT * FROM gameobject where id IN(177807);
+
+SET @OGUID := 75120; -- 75157
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+45;
+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, 179784, 469, 1, 1, -7572.59, -1062.572, 449.1642, 0.5410506, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+1, 179784, 469, 1, 1, -7593.775, -1063.449, 449.1642, 0.4712385, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+2, 179784, 469, 1, 1, -7595.269, -1030.421, 449.1642, 0.3141584, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+3, 179784, 469, 1, 1, -7595.774, -1080.002, 449.1642, 0.5585039, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+4, 179784, 469, 1, 1, -7605.952, -1045.063, 449.1642, 0.6457717, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+5, 179784, 469, 1, 1, -7609.894, -1061.456, 449.1642, 0.4188786, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+6, 179784, 469, 1, 1, -7616.209, -997.0844, 440.2823, 0.2094394, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+7, 179784, 469, 1, 1, -7619.151, -1047.152, 449.1642, 0.5061446, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+8, 179784, 469, 1, 1, -7620.089, -1075.735, 449.1642, 0.4712385, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+9, 179784, 469, 1, 1, -7626.954, -981.3593, 440.0226, 0.157079, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+10, 179784, 469, 1, 1, -7627.983, -1095.305, 449.1642, 0.5410506, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+11, 179784, 469, 1, 1, -7629.779, -1061.484, 449.1642, 0.6283169, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+12, 179784, 469, 1, 1, -7630.286, -1005.49, 440.2624, 0.4014249, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+13, 179784, 469, 1, 1, -7637.638, -965.0227, 440.2754, 0.01745246, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+14, 179784, 469, 1, 1, -7637.933, -1081.127, 449.1642, 0.453785, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+15, 179784, 469, 1, 1, -7640.291, -991.3019, 440.2628, 0.453785, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+16, 179784, 469, 1, 1, -7642.733, -1015.651, 440.2449, 0.4712385, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+17, 179784, 469, 1, 1, -7647.777, -1066.966, 449.1642, 0.5585039, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+18, 179784, 469, 1, 1, -7650.901, -975.7917, 440.2633, 0.2268925, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+19, 179784, 469, 1, 1, -7651.322, -1103.534, 449.1642, 0.523598, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+20, 179784, 469, 1, 1, -7653.694, -999.9188, 439.9861, 0.5061446, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+21, 179784, 469, 1, 1, -7656.672, -1024.323, 440.2567, 0.5061446, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+22, 179784, 469, 1, 1, -7663.989, -1084.885, 449.1642, 0.6283169, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+23, 179784, 469, 1, 1, -7664.824, -984.0574, 440.2471, 0.3141584, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+24, 179784, 469, 1, 1, -7665.261, -1113.61, 449.1642, 0.523598, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+25, 179784, 469, 1, 1, -7667.542, -1008.341, 440.2592, 0.523598, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+26, 179784, 469, 1, 1, -7669.463, -1034.205, 440.244, 0.5410506, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+27, 179784, 469, 1, 1, -7677.631, -994.4258, 440.2595, 0.383971, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+28, 179784, 469, 1, 1, -7677.684, -1095.238, 449.1351, 0.6283169, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+29, 179784, 469, 1, 1, -7680.108, -1123.294, 449.1051, 0.523598, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+30, 179784, 469, 1, 1, -7680.508, -1018.701, 439.9826, 0.5585039, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+31, 179784, 469, 1, 1, -7686.851, -1047.039, 440.3709, 0.5585039, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+32, 179784, 469, 1, 1, -7691.257, -1002.378, 440.2438, 0.4188786, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+33, 179784, 469, 1, 1, -7691.966, -1105.405, 449.13, 0.6283169, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+34, 179784, 469, 1, 1, -7699.204, -1030.978, 440.5882, 0.5585039, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+35, 179784, 469, 1, 1, -7709.169, -1017.005, 440.4458, 0.4712385, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+36, 179784, 469, 1, 1, -7713.143, -1060.038, 445.1762, 5.096362, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+37, 179784, 469, 1, 1, -7716.096, -1077.452, 445.1762, 0.8726639, 0, 0, 0, 1, 7200, 255, 1), -- Suppression Device (Area: 0)
+(@OGUID+38, 176964, 469, 1, 1, -7639.43, -1083.943, 408.5284, 3.752462, 0, 0, 0.9537169, -0.3007059, 7200, 255, 0), -- Portcullis (Area: 0)
+(@OGUID+39, 179365, 469, 1, 1, -7568.426, -1031.59, 449.1086, 3.752462, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1), -- Portcullis (Area: 0)
+(@OGUID+40, 176965, 469, 1, 1, -7552.37, -1022.984, 408.5284, 3.752462, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1), -- Portcullis (Area: 0)
+(@OGUID+41, 179116, 469, 1, 1, -7506.288, -1043.155, 480.03, 0.6108655, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1), -- Portcullis (Area: 0)
+(@OGUID+42, 176966, 469, 1, 1, -7488.173, -1150.542, 476.712, 0.6108655, 0, 0, 0.9537169, -0.3007059, 7200, 255, 0), -- Portcullis (Area: 0)
+(@OGUID+43, 179364, 469, 1, 1, -7531.224, -956.4108, 428.2516, 5.323256, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1), -- Portcullis (Area: 0)
+(@OGUID+44, 179117, 469, 1, 1, -7464, -1103.549, 480.03, 0.6108655, 0, 0, 0.9537169, -0.3007059, 7200, 255, 1), -- Portcullis (Area: 0)
+(@OGUID+45, 179115, 469, 1, 1, -7455.243, -1051.711, 480.03, 2.18166, 0, 0, 0.9537169, -0.3007059, 7200, 255, 0); -- Portcullis (Area: 0)
diff --git a/sql/updates/world/2013_06_24_02_world_misc.sql b/sql/updates/world/2013_06_24_02_world_misc.sql
new file mode 100644
index 00000000000..9468fd00b8b
--- /dev/null
+++ b/sql/updates/world/2013_06_24_02_world_misc.sql
@@ -0,0 +1,2 @@
+UPDATE `gameobject` SET `state`=1 WHERE `guid` IN (56162,56163); -- correct?
+DELETE FROM `linked_respawn` WHERE `guid` NOT IN (SELECT `guid` FROM `creature`);
diff --git a/sql/updates/world/2013_06_25_00_world_player_factionchange_spells.sql b/sql/updates/world/2013_06_25_00_world_player_factionchange_spells.sql
new file mode 100644
index 00000000000..ee50f3ea952
--- /dev/null
+++ b/sql/updates/world/2013_06_25_00_world_player_factionchange_spells.sql
@@ -0,0 +1,5 @@
+DELETE FROM `player_factionchange_spells` WHERE `alliance_id`=60118 AND `horde_id`=60119; -- Black War Bear
+DELETE FROM `player_factionchange_spells` WHERE `alliance_id`=59785 AND `horde_id`=59788; -- Black War Mammoth
+INSERT INTO `player_factionchange_spells` (`alliance_id`, `horde_id`) VALUES
+(60118, 60119), -- Black War Bear
+(59785, 59788); -- Black War Mammoth
diff --git a/sql/updates/world/2013_06_25_00_world_sai.sql b/sql/updates/world/2013_06_25_00_world_sai.sql
new file mode 100644
index 00000000000..cd316bf4732
--- /dev/null
+++ b/sql/updates/world/2013_06_25_00_world_sai.sql
@@ -0,0 +1,106 @@
+-- The Sum is Greater than the Parts (13043)
+-- http://www.youtube.com/watch?v=dg84C1d-sxw
+
+SET @QUEST                := 13043; -- The quest...Duh!
+SET @NPC_NERGELD          := 30403; -- Nergeld
+SET @NPC_DR_TERRIBLE      := 30404; -- Dr. Terrible
+SET @NPC_HOUND            := 30432; -- Grimmr Hound
+SET @NPC_ASSAILANT        := 30471; -- Vargul Assailant
+SET @AURA_ROOT            := 59037; -- The Sum is Greater than the Parts: Nergeld's Freeze Anim
+SET @SPELL_DEATH_SIGNAL   := 32067; -- The Sum is Greater than the Parts: Dr. Terrible's Death Signal
+SET @SPELL_MOUNT          := 56699; -- Controlling Nergeld
+
+-- Remove random movement from Nergeld
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid`=124127;
+DELETE FROM `creature_addon` WHERE `guid`=124127;
+
+UPDATE `creature_model_info` SET `combat_reach`=4.05 WHERE `modelid`=27102;
+
+UPDATE `creature_template` SET `AIName`='SmartAI',`spell1`=56746,`spell2`=56748,`spell3`=56747,`spell4`=60540,`speed_run`=0.992062866687775,`VehicleId`=236,`unit_flags`=256|32768/*256|512|32768*/,`npcflag`=0x1000000 WHERE `entry`=@NPC_NERGELD;
+UPDATE `creature_template` SET `faction_A`=974,`faction_H`=974,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_HOUND;
+UPDATE `creature_template` SET `faction_A`=2116,`faction_H`=2116,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_ASSAILANT;
+UPDATE `creature_template` SET `faction_A`=974,`faction_H`=974,`unit_flags`=32832,`AIName`='SmartAI' WHERE `entry`=@NPC_DR_TERRIBLE;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_NERGELD;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_NERGELD,0,0x0,0x1,''); -- 59037 The Sum is Greater than the Parts: Nergeld's Freeze Anim
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=16 AND `SourceEntry`=@NPC_NERGELD) OR (`SourceTypeOrReferenceId`=13 AND `SourceEntry`=56747) OR (`SourceTypeOrReferenceId`=13 AND `SourceEntry`=56746) OR (`SourceTypeOrReferenceId`=18 AND `SourceEntry`=@SPELL_MOUNT) OR(`SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_DEATH_SIGNAL);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(16,0,@NPC_NERGELD,0,0,23,0,4595,0,0,0,0,0,'','Dismount player when not in intended zone'),
+(13,1,56747,0,0,31,0,3,@NPC_ASSAILANT,0,0,0,0,'','Stomp can target Vargul Assailant'),
+(13,1,56747,0,1,31,0,3,@NPC_HOUND,0,0,0,0,'','Stomp can target Grimmr Hound'),
+(13,1,56747,0,2,31,0,3,@NPC_DR_TERRIBLE,0,0,0,0,'','Stomp can target Dr. Terrible'),
+(13,1,56746,0,0,31,0,3,@NPC_ASSAILANT,0,0,0,0,'','Punch can target Vargul Assailant'),
+(13,1,56746,0,1,31,0,3,@NPC_HOUND,0,0,0,0,'','Punch can target Grimmr Hound'),
+(13,1,56746,0,2,31,0,3,@NPC_DR_TERRIBLE,0,0,0,0,'','Punch can target Dr. Terrible'),
+(18,@NPC_NERGELD,@SPELL_MOUNT,0,0,28,0,@QUEST,0,0,1,0,0,'','Spellclick when quest not complete'),
+(18,@NPC_NERGELD,@SPELL_MOUNT,0,0,9,0,@QUEST,0,0,0,0,0,'','Spellclick when quest taken'),
+(13,2,@SPELL_DEATH_SIGNAL,0,1,31,0,3,@NPC_DR_TERRIBLE,0,0,0,0,'','Dr. Terrible''s Death Signal effect1 targets Dr. Terrible'),
+(13,1,@SPELL_DEATH_SIGNAL,0,1,31,0,3,@NPC_NERGELD,0,0,0,0,'','Dr. Terrible''s Death Signal effect0 targets Nergeld');
+
+
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@NPC_NERGELD,@NPC_DR_TERRIBLE,@NPC_HOUND,@NPC_ASSAILANT) OR (`source_type`=9 AND `entryorguid`=@NPC_NERGELD*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
+-- Nergeld
+(@NPC_NERGELD,0,0,0,11,0,100,0,0,0,0,0,75,@AURA_ROOT,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Respawn add root aura'),
+(@NPC_NERGELD,0,1,0,28,0,100,0,0,0,0,0,75,@AURA_ROOT,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Passenger Removed add root aura'),
+(@NPC_NERGELD,0,2,3,27,0,100,0,0,0,0,0,28,@AURA_ROOT,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Passenger Boarded remove root aura'),
+(@NPC_NERGELD,0,3,4,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Passenger Boarded Talk'),
+(@NPC_NERGELD,0,4,5,61,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Passenger Boarded Set State Passive'),
+(@NPC_NERGELD,0,5,0,61,0,100,0,0,0,0,0,80,@NPC_NERGELD*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'On Passenger Boarded Run SCript'),
+(@NPC_NERGELD,0,6,7,8,0,100,0,@SPELL_DEATH_SIGNAL,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Spellhit Say'),
+(@NPC_NERGELD,0,7,0,61,0,100,0,0,0,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Spellhit Die'),
+-- Wave 1 05:22:46.000
+(@NPC_NERGELD*100,9,0,0,0,0,100,0,5000,5000,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,7993.895,3336.905,632.3955,0.1457695,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,1,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8003.723,3323.562,632.3955,0.6487832,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,2,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8026.945,3307.581,632.3955,1.482069,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,3,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8001.774,3306.377,632.3955,0.8634474,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,4,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,7987.904,3308.895,632.3955,0.6805801,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,5,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8016.516,3318.92,632.3956,0.940311,'On Script - Spawn Vargul'),
+-- Wave 2 05:23:06.000
+(@NPC_NERGELD*100,9,6,0,0,0,100,0,30000,30000,0,0,12,@NPC_HOUND,2,300000,0,0,0,8,0,0,0,7996.656,3308.777,632.3955,0.7732307,'On Script - Spawn Grimmr Hound'),
+(@NPC_NERGELD*100,9,7,0,0,0,100,0,0,0,0,0,12,@NPC_HOUND,2,300000,0,0,0,8,0,0,0,8011.714,3315.362,632.3955,0.9011694,'On Script - Spawn Grimmr Hound'),
+(@NPC_NERGELD*100,9,8,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8000.665,3317.225,632.3955,0.7105912,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,9,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8025.243,3313.552,632.3955,1.286934,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,10,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8007.712,3337.127,632.3955,0.4072851,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,11,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8009.925,3319.814,632.3955,0.8048422,'On Script - Spawn Vargul'),
+-- Wave 3 05:23:26.000
+(@NPC_NERGELD*100,9,12,0,0,0,100,0,30000,30000,0,0,12,@NPC_HOUND,2,300000,0,0,0,8,0,0,0,8021.793,3312.446,632.3955,1.130859,'On Script - Spawn Grimmr Hound'),
+(@NPC_NERGELD*100,9,13,0,0,0,100,0,0,0,0,0,12,@NPC_HOUND,2,300000,0,0,0,8,0,0,0,8001.362,3332.711,632.3955,0.4433513,'On Script - Spawn Grimmr Hound'),
+(@NPC_NERGELD*100,9,14,0,0,0,100,0,0,0,0,0,12,@NPC_HOUND,2,300000,0,0,0,8,0,0,0,7999.219,3302.518,632.3955,0.8723419,'On Script - Spawn Grimmr Hound'),
+(@NPC_NERGELD*100,9,15,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8000.495,3345.769,632.3955,5.823889,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,16,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8001.774,3311.945,632.3955,0.797157,'On Script - Spawn Vargul'),
+(@NPC_NERGELD*100,9,17,0,0,0,100,0,0,0,0,0,12,@NPC_ASSAILANT,2,300000,0,0,0,8,0,0,0,8012.214,3325.824,632.3955,0.7376673,'On Script - Spawn Vargul'),
+-- Wave 4 05:23:47.000
+(@NPC_NERGELD*100,9,18,0,0,0,100,0,31000,31000,0,0,12,@NPC_DR_TERRIBLE,2,300000,0,1,0,8,0,0,0,7985.901,3296.679,632.4788,0.8377581,'On Script - Spawn Dr. Terrible'),
+(@NPC_NERGELD*100,9,19,0,0,0,100,0,0,0,0,0,12,@NPC_HOUND,2,300000,0,0,0,8,0,0,0,7982.587,3301.807,632.4788,0.6981317,'On Script - Spawn Grimmr Hound'),
+(@NPC_NERGELD*100,9,20,0,0,0,100,0,0,0,0,0,12,@NPC_HOUND,2,300000,0,0,0,8,0,0,0,7991.366,3293.512,632.4788,0.9075712,'On Script - Spawn Grimmr Hound'),
+-- Dr. Terrible
+(@NPC_DR_TERRIBLE,0,0,0,25,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,@NPC_NERGELD,0,0,0,0,0,0,'On spawn attack npc'),
+(@NPC_DR_TERRIBLE,0,1,0,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say on Aggro'),
+(@NPC_DR_TERRIBLE,0,2,0,0,0,100,0,8000,8000,15000,19000,11,61143,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Crazed Chop'),
+(@NPC_DR_TERRIBLE,0,3,0,0,0,100,0,10000,12000,28000,33000,11,61146,0,0,0,0,0,5,0,0,0,0,0,0,0,'Cast Slime Stream'),
+(@NPC_DR_TERRIBLE,0,4,5,2,0,100,1,0,45,0,0,11,31730,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Heal at 45% HP'),
+(@NPC_DR_TERRIBLE,0,5,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say Text'),
+(@NPC_DR_TERRIBLE,0,6,7,6,0,100,1,0,0,0,0,11,@SPELL_DEATH_SIGNAL,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast on Death'),
+(@NPC_DR_TERRIBLE,0,7,0,61,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say on Death'),
+-- Grimmr Hound
+(@NPC_HOUND,0,0,0,25,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,@NPC_NERGELD,0,0,0,0,0,0,'On spawn attack npc'),
+(@NPC_HOUND,0,1,0,8,0,100,0,@SPELL_DEATH_SIGNAL,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Spellhit Despawn'),
+-- Vargul Assailant
+(@NPC_ASSAILANT,0,0,0,25,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,@NPC_NERGELD,0,0,0,0,0,0,'On spawn attack npc'),
+(@NPC_ASSAILANT,0,1,0,8,0,100,0,@SPELL_DEATH_SIGNAL,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Spellhit Despawn'),
+(@NPC_ASSAILANT,0,2,0,0,0,100,0,4500,5599,13400,15600,11,43410,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Chop'),
+(@NPC_ASSAILANT,0,3,0,0,0,100,0,8000,9000,35000,37000,11,23262,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Demoralize');
+
+
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry` IN (@NPC_DR_TERRIBLE,@NPC_NERGELD);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@NPC_DR_TERRIBLE,0,0,'WHO DARES?! I AM GOING TO FLAY THE FLESH FROM YOUR BONES EVEN IF I HAVE TO DESTROY NERGELD TO GET TO YOU!',14,0,100,0,0,0,'Dr. Terrible'),
+(@NPC_DR_TERRIBLE,1,0,'Now the nightmare''s real.Now Dr. Terrible is here.To make you quake with fear.To make the whole world kneel.And I won''t feel ...a thing',12,0,100,0,0,0,'Dr. Terrible'),
+(@NPC_DR_TERRIBLE,2,0,'I''LL RISE AGAIN AND WHEN I DO I WILL HAVE MY REVENGE!.',14,0,100,0,0,0,'Dr. Terrible to Nergeld'),
+(@NPC_NERGELD,0,0,'As you jump into Nergeld, the rotting flesh of the construct comes to life.',16,0,100,0,0,0,'Nergeld'),
+(@NPC_NERGELD,1,0,'%s falls to pieces.',16,0,100,0,0,0,'Nergeld to Dr. Terrible');
diff --git a/sql/updates/world/2013_06_25_01_world_sai.sql b/sql/updates/world/2013_06_25_01_world_sai.sql
new file mode 100644
index 00000000000..c2c54eebcc3
--- /dev/null
+++ b/sql/updates/world/2013_06_25_01_world_sai.sql
@@ -0,0 +1,118 @@
+SET @CGUID          := 15;
+SET @GOGUID         := 5196; -- Set by TDB, these are free guids.
+SET @KC_TARGET      := 31773;
+SET @KC_TARGET2     := 32442;
+SET @PC_BUNNY       := 32445;
+SET @SUMM_PC_BUNNY  := 61026;
+SET @GREEN_SPLASH   := 60059;
+SET @SPELL          := 59655;
+SET @SPELL_DOSE     := 59659;
+SET @GHOUL          := 32178;
+SET @LIVING_PLAGUE  := 32181;
+SET @SUMMON_LPLAGUE := 60058;
+SET @SUMMON_GHOUL   := 60056;
+SET @RADIATION_AURA := 45797;
+SET @KILL_CREDIT    := 31767;
+
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `faction_A`=21, `faction_H`=21, `speed_walk`=1.142857, `speed_run`=1, `mindmg`=286, `maxdmg`=322, `rangeattacktime`=2000, `unit_flags`=32768, `dynamicflags`=0, `Health_mod`=3 WHERE `entry`=32181; -- Living Plague
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `faction_A`=21, `faction_H`=21, `speed_walk`=1.428571, `speed_run`=4, `mindmg`=98, `maxdmg`=134, `rangeattacktime`=2000, `unit_flags`=32768, `dynamicflags`=0, `Health_mod`=4 WHERE `entry`=32178; -- Rampaging Ghoul
+UPDATE `creature_template` SET `speed_walk`=1.142857, `speed_run`=1, `rangeattacktime`=2000, `dynamicflags`=0 WHERE `entry`=32442; -- Plague Cauldron Target 02
+UPDATE `creature_template` SET `speed_walk`=1.142857, `speed_run`=1, `rangeattacktime`=2000, `dynamicflags`=0 WHERE `entry`=31773; -- Plague Cauldron Target
+UPDATE `creature_template` SET `modelid1`=21342, `modelid2`=0, `flags_extra`= 128 WHERE  `entry`=@PC_BUNNY;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@KC_TARGET,@KC_TARGET2,@PC_BUNNY,@LIVING_PLAGUE,@GHOUL);
+UPDATE `gameobject_template` SET `data1`=30 WHERE `entry`=300239;
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@LIVING_PLAGUE,@GHOUL);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(@GHOUL, 0, 0, 0, 0, 0, 100,0, 5000, 17000, 29000, 42000, 11, 54475, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Rampaging Ghoul - In Combat - Cast Rampage'),
+(@GHOUL, 0, 1, 0, 0, 0, 100,0, 2000, 14000, 25000, 34000, 11, 6016, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Rampaging Ghoul - In Combat - Cast Pierce Armor'),
+(@GHOUL, 0, 2, 3, 54, 0, 100, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rampaging Ghoul - Just Summoned - Set React State Aggresive'),
+(@GHOUL, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 46, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rampaging Ghoul - On Link - Move Forward'),
+(@GHOUL, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Rampaging Ghoul - On Link - Attack Hostile Random'),
+-- Living Plague AI
+(@LIVING_PLAGUE, 0, 1, 2, 54, 0, 100, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Plague - Just Summoned - Set React State Aggresive'),
+(@LIVING_PLAGUE, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 46, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Plague - On Link - Move Forward'),
+(@LIVING_PLAGUE, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Living Plague - On Link - Attack Hostile Random');
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@KC_TARGET;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@KC_TARGET*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 
+(@KC_TARGET, 0, 0, 1, 8, 0, 100, 0, @SPELL_DOSE, 0, 0, 0, 80, @KC_TARGET*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Bunny - On spell hit - Trigger script'),
+(@KC_TARGET, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Target - On Link - Say Text 0'),
+(@KC_TARGET, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, @RADIATION_AURA, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Target - On Link - Aura Radiation'),
+(@KC_TARGET, 0, 3, 0, 38, 0, 100, 0, 1, 2, 0, 0, 28, @RADIATION_AURA, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Target - On Data Set - Remove Aura'),
+(@KC_TARGET*100, 9, 0, 0, 0, 0, 100, 0, 4000, 4000, 4000, 4000, 11, @SUMM_PC_BUNNY, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'KC Target  - Script - Summon Bunny');
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@KC_TARGET2;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@KC_TARGET2*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 
+(@KC_TARGET2, 0, 0, 1, 8, 0, 100, 0, @SPELL_DOSE, 0, 0, 0, 80, @KC_TARGET*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Bunny - On spell hit - Trigger script'),
+(@KC_TARGET2, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Target - On Link - Say Text 0'),
+(@KC_TARGET2, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, @RADIATION_AURA, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Target - On Link - Aura Radiation'),
+(@KC_TARGET2, 0, 3, 0, 38, 0, 100, 0, 1, 1, 0, 0, 28, @RADIATION_AURA, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'KC Target - On Data Set - Remove Aura'),
+(@KC_TARGET2*100, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 2000, 2000, 11, @SUMM_PC_BUNNY, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'KC Target - Script - Summon Bunny');
+
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@PC_BUNNY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@PC_BUNNY*100,@PC_BUNNY*100+1,@PC_BUNNY*100+2);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(@PC_BUNNY, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 87, @PC_BUNNY*100, @PC_BUNNY*100+1, @PC_BUNNY*100+2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PC Bunny - Just Summoned - Trigger script'),
+(@PC_BUNNY, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PC Bunny - On Link - Say Text 0'),
+(@PC_BUNNY, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, @GREEN_SPLASH, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PC Bunny - On Link - Cast cosmetic Green Splash'),
+-- First Action Event
+(@PC_BUNNY*100, 9, 1, 0, 0, 0, 100, 0, 2000, 2000, 2000, 2000, 11, @SUMMON_GHOUL, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Ghoul'),
+(@PC_BUNNY*100, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, @KC_TARGET2, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Set Data 1 1'),
+(@PC_BUNNY*100, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, @KC_TARGET, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Set Data 1 2'),
+(@PC_BUNNY*100, 9, 6, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 41, 1000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Despawn'),
+-- Third Action Event
+(@PC_BUNNY*100+2, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100+2, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100+2, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100+2, 9, 4, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100+2, 9, 5, 0, 0, 0, 100, 1, 10500, 10500, 10500, 10500, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny - On Script - Say 1'),
+(@PC_BUNNY*100+2, 9, 6, 0, 0, 0, 100, 0, 2000, 2000, 2000, 2000, 11, @SUMMON_GHOUL, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Ghoul'),
+(@PC_BUNNY*100+2, 9, 7, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100+2, 9, 8, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 11, @SUMMON_LPLAGUE, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Summon Living Plague'),
+(@PC_BUNNY*100+2, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, @KC_TARGET2, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Set Data 1 1'),
+(@PC_BUNNY*100+2, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, @KC_TARGET, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Set Data 1 2'),
+(@PC_BUNNY*100+2, 9, 11, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 41, 1000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Despawn'),
+-- Second Action Event
+(@PC_BUNNY*100+1, 9, 0, 0, 0, 0, 100, 0, 7000, 7000, 7000, 7000, 33, @KILL_CREDIT, 0, 0, 0, 0, 0, 21, 50, 0, 0, 0, 0, 0, 0, 'KC Target - On spellhit - Give quest credit'),
+(@PC_BUNNY*100+1, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 1500, 1500, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Say 1'),
+(@PC_BUNNY*100+1, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, @KC_TARGET2, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Set Data 1 1'),
+(@PC_BUNNY*100+1, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, @KC_TARGET, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Set Data 1 2'),
+(@PC_BUNNY*100+1, 9, 4, 0, 0, 0, 100, 0, 1000, 1000, 1000, 1000, 41, 1000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'PC Bunny  - On Script - Despawn');
+
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=59655;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 59655, 0, 1, 31, 0, 3, 31773, 0, 0, 0, 0, '', 'Neutralize Plague hits Plague Cauldron Target Bunny'),
+(13, 1, 59655, 0, 0, 31, 0, 3, 32442, 0, 0, 0, 0, '', 'Neutralize Plague hits Plague Cauldron Target Bunny');
+
+DELETE FROM `creature` WHERE `id` IN (31773,32442);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID, 31773, 571, 1, 1, 6776.598, 1628.575, 392.1221, 4.729842, 120, 0, 0),   -- Plague Cauldron Target (Area: Mord'rethar: The Death Gate)
+(@CGUID+1, 32442, 571, 1, 1, 6777.509, 1539.352, 392.1735, 1.623156, 120, 0, 0); -- Plague Cauldron Target 02 (Area: Mord'rethar: The Death Gate)
+
+DELETE FROM `gameobject` WHERE `id` IN (300239);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES 
+(@GOGUID, 300239, 571, 1, 1, 6776.6, 1628.57, 390.922, 5.39315, 0, 0, 0.430474, -0.902603, 300, 0, 1),
+(@GOGUID+1, 300239, 571, 1, 1, 6777.51, 1539.35, 390.874, 1.62316, 0, 0, 0.725376, 0.688353, 300, 0, 1);
+
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (31150,32442,@LIVING_PLAGUE,@GHOUL);
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(31150, 0, 0x0, 0x1, '50106'), -- 
+(32442, 0, 0x0, 0x1, ''),
+(32181, 0, 0x0, 0x1, '61587'), -- Living Plague - Living Plague
+(32178, 0, 0x0, 0x1, '58812'); -- Rampaging Ghoul - Ghoul Aura
+
+DELETE FROM `creature_text` WHERE `entry` IN (@KC_TARGET,@KC_TARGET2,@PC_BUNNY);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+(@PC_BUNNY, 0, 0, 'Something emerges from the cauldron!', 41, 0, 100, 0, 0, 0, 'Player Bunny'),
+(@PC_BUNNY, 1, 0, 'The cauldron continues to boil...', 41, 0, 100, 0, 0, 0, 'Player Bunny'),
+(@PC_BUNNY, 2, 0, 'Plague batch neutralized!', 41, 0, 100, 0, 0, 0, 'Player Bunny'),
+(@KC_TARGET, 0, 0, 'The plague cauldron begins to boil vigorously!', 41, 0, 100, 0, 0, 0, 'Plague Cauldron Target'),
+(@KC_TARGET2, 0, 0, 'The plague cauldron begins to boil vigorously!', 41, 0, 100, 0, 0, 0, 'Plague Cauldron Target 02');
diff --git a/sql/updates/world/2013_06_25_02_world_sai.sql b/sql/updates/world/2013_06_25_02_world_sai.sql
new file mode 100644
index 00000000000..c394f74b51f
--- /dev/null
+++ b/sql/updates/world/2013_06_25_02_world_sai.sql
@@ -0,0 +1,32 @@
+SET @ENTRY  := 29732;
+SET @GOSSIP := 9891;
+SET @EAGLE  := 29736;
+SET @DRAKE  := 29753;
+
+UPDATE `creature_template` SET `VehicleId`=243,`InhabitType`=3,`AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,1,0,0,11,56411,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fjorlin Frostbrow - On gossip option 1 select - Cast 56411 on player'),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fjorlin Frostbrow - On gossip option 1 select - Close gossip');
+
+UPDATE `creature_template` SET `npcflag` = `npcflag`|16777217, `IconName`='vehichleCursor', `VehicleId`=216, `spell1`=55958, `spell2`=55936 WHERE `entry`=@EAGLE;
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@EAGLE;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES 
+(@EAGLE,43671,1,0);
+
+DELETE FROM `creature_template_addon` WHERE entry = @EAGLE;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(@EAGLE,0,0,33554432,0,0,'55971');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP AND `SourceEntry`=1;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,@GOSSIP,1,0,9,12869,0,0,0,'','Show gossip option 1 if player has quest 12869');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`IN (55958,55936);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17,0,55958,0,0,31,1,3,@DRAKE,0,0,0,0,'','Stormbolt only hits Stormpeak Wyrm'),
+(17,0,55936,0,0,31,1,3,@DRAKE,0,0,0,0,'','Swoop only hits Stormpeak Wyrm');
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id`=1;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(@GOSSIP,1,0, 'I am ready to join the battle against the wyrms. Do you have an eagle ready for me, Fjorlin?',1,1,0,0,0,0, '');
diff --git a/sql/updates/world/2013_06_25_03_world_misc.sql b/sql/updates/world/2013_06_25_03_world_misc.sql
new file mode 100644
index 00000000000..7b3b208dd15
--- /dev/null
+++ b/sql/updates/world/2013_06_25_03_world_misc.sql
@@ -0,0 +1,241 @@
+-- Add Missing Gossip from sniff
+DELETE FROM `gossip_menu` WHERE `entry`=6001 AND `text_id`=7154;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6001,7154);
+
+-- Add some missing spawns to BRS
+SET @GUID := 20;  -- 4 Guids required
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+3;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES
+(@GUID,10447,229,1,1,0,0,202.5113,-421.307,110.9865,3.124139,7200,0,0,1,0,0),
+(@GUID+1,10442,229,1,1,0,0,204.0151,-418.4425,110.9892,3.193953,7200,0,0,1,0,0),
+(@GUID+2,10442,229,1,1,0,0,203.1424,-423.9987,110.9864,3.071779,7200,0,0,1,0,0),
+(@GUID+3,10442,229,1,1,0,0,201.0076,-416.648,110.9738,3.228859,7200,0,0,1,0,0);
+
+-- Add some missing spawns to BWL
+SET @GUID := 61997;  -- 3 Guids required
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+3;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES
+(@GUID,12458,469,1,1,0,0,-7663.987,-1021.786,440.242,3.124139,7200,0,0,1,0,2),
+(@GUID+1,12458,469,1,1,0,0,-7632.956,-996.5212,440.263,3.193953,7200,0,0,1,0,2),
+(@GUID+2,12458,469,1,1,0,0,-7639.315,-1088.736,449.1642,3.071779,7200,0,0,1,0,2);
+
+-- Fix walk speed for BWL npcs
+
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=11981;
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=11983;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12017;
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=12435;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12457;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12458;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12459;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12460;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12461;
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=12463;
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=12464;
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=12465;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12467;
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=12468;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12557;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13020;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13996;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14020;
+UPDATE `creature_template` SET `speed_walk`=1.11111 WHERE `entry`=14022;
+UPDATE `creature_template` SET `speed_walk`=1.11111 WHERE `entry`=14023;
+UPDATE `creature_template` SET `speed_walk`=1.11111 WHERE `entry`=14024;
+UPDATE `creature_template` SET `speed_walk`=1.11111 WHERE `entry`=14025;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14262;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14263;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14264;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14401;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14456;
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=14601;
+
+-- Delete bad spawn in BWL
+
+DELETE FROM `creature` WHERE `guid`=85787;
+
+-- some pathing for BWL
+
+-- Pathing for Blackwing Taskmaster Entry: 12458
+SET @NPC := @GUID;
+SET @PATH := @NPC * 10;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-7663.987,-1021.786,440.242,0,0,0,0,100,0),
+(@PATH,2,-7660.584,-1033.68,440.1774,0,0,0,0,100,0),
+(@PATH,3,-7672.197,-1040.59,440.1905,0,0,0,0,100,0),
+(@PATH,4,-7677.878,-1033.48,439.9819,0,0,0,0,100,0),
+(@PATH,5,-7682.595,-1022.212,439.9823,0,0,0,0,100,0),
+(@PATH,6,-7692.392,-1018.374,440.2688,0,0,0,0,100,0),
+(@PATH,7,-7700.767,-1021.952,440.5112,0,0,0,0,100,0),
+(@PATH,8,-7705.208,-1015.368,440.3909,0,0,0,0,100,0),
+(@PATH,9,-7705.208,-1015.368,440.3909,0,0,0,0,100,0),
+(@PATH,10,-7700.767,-1021.952,440.5112,0,0,0,0,100,0),
+(@PATH,11,-7692.392,-1018.374,440.2688,0,0,0,0,100,0),
+(@PATH,12,-7682.595,-1022.212,439.9823,0,0,0,0,100,0),
+(@PATH,13,-7677.878,-1033.48,439.9819,0,0,0,0,100,0),
+(@PATH,14,-7672.197,-1040.59,440.1905,0,0,0,0,100,0),
+(@PATH,15,-7660.584,-1033.68,440.1774,0,0,0,0,100,0),
+(@PATH,16,-7663.987,-1021.786,440.242,0,0,0,0,100,0),
+(@PATH,17,-7667.698,-1013.725,440.2188,0,0,0,0,100,0),
+(@PATH,18,-7674.316,-1009.231,440.1985,0,0,0,0,100,0),
+(@PATH,19,-7674.749,-1001.641,440.1816,0,0,0,0,100,0),
+(@PATH,20,-7682.151,-1002.882,439.9836,0,0,0,0,100,0),
+(@PATH,21,-7691.953,-996.8887,440.1367,0,0,0,0,100,0),
+(@PATH,22,-7698.791,-993.4288,440.0823,0,0,0,0,100,0),
+(@PATH,23,-7700.935,-1000.517,440.1191,0,0,0,0,100,0),
+(@PATH,24,-7704.313,-1004.795,440.1128,0,0,0,0,100,0),
+(@PATH,25,-7699.01,-1015.984,440.3897,0,0,0,0,100,0),
+(@PATH,26,-7696.855,-1024.059,440.4334,0,0,0,0,100,0),
+(@PATH,27,-7690.041,-1030.21,440.3844,0,0,0,0,100,0),
+(@PATH,28,-7683.866,-1038.302,440.3743,0,0,0,0,100,0),
+(@PATH,29,-7679.78,-1047.461,440.1281,0,0,0,0,100,0),
+(@PATH,30,-7695.097,-1052.926,440.6745,0,0,0,0,100,0),
+(@PATH,31,-7711.689,-1063.992,445.1763,0,0,0,0,100,0),
+(@PATH,32,-7711.689,-1063.992,445.1763,0,0,0,0,100,0),
+(@PATH,33,-7695.097,-1052.926,440.6745,0,0,0,0,100,0),
+(@PATH,34,-7679.78,-1047.461,440.1281,0,0,0,0,100,0),
+(@PATH,35,-7683.866,-1038.302,440.3743,0,0,0,0,100,0),
+(@PATH,36,-7690.041,-1030.21,440.3844,0,0,0,0,100,0),
+(@PATH,37,-7696.855,-1024.059,440.4334,0,0,0,0,100,0),
+(@PATH,38,-7699.01,-1015.984,440.3897,0,0,0,0,100,0),
+(@PATH,39,-7704.313,-1004.795,440.1128,0,0,0,0,100,0),
+(@PATH,40,-7700.935,-1000.517,440.1191,0,0,0,0,100,0),
+(@PATH,41,-7698.791,-993.4288,440.0823,0,0,0,0,100,0),
+(@PATH,42,-7691.953,-996.8887,440.1367,0,0,0,0,100,0),
+(@PATH,43,-7682.151,-1002.882,439.9836,0,0,0,0,100,0),
+(@PATH,44,-7674.749,-1001.641,440.1816,0,0,0,0,100,0),
+(@PATH,45,-7674.316,-1009.231,440.1985,0,0,0,0,100,0),
+(@PATH,46,-7667.698,-1013.725,440.2188,0,0,0,0,100,0);
+-- 0xF13030AA0000B535 .go -7663.987 -1021.786 440.242
+
+-- Pathing for Blackwing Taskmaster Entry: 12458
+SET @NPC := @GUID+1;
+SET @PATH := @NPC * 10;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-7632.956,-996.5212,440.263,0,0,0,0,100,0),
+(@PATH,2,-7626.135,-996.6401,440.2635,0,0,0,0,100,0),
+(@PATH,3,-7619.718,-993.6684,440.0176,0,0,0,0,100,0),
+(@PATH,4,-7614.898,-986.8362,440.0524,0,0,0,0,100,0),
+(@PATH,5,-7619.713,-975.4172,440.2763,0,0,0,0,100,0),
+(@PATH,6,-7626.255,-967.6956,440.3156,0,0,0,0,100,0),
+(@PATH,7,-7634.491,-969.407,440.0258,0,0,0,0,100,0),
+(@PATH,8,-7637.204,-978.4598,439.993,0,0,0,0,100,0),
+(@PATH,9,-7649.554,-984.3552,440.2628,0,0,0,0,100,0),
+(@PATH,10,-7661.772,-988.5689,439.9864,0,0,0,0,100,0),
+(@PATH,11,-7658.341,-1002.132,439.9857,0,0,0,0,100,0),
+(@PATH,12,-7647.332,-1011.346,439.9858,0,0,0,0,100,0),
+(@PATH,13,-7637.399,-1010.427,439.9867,0,0,0,0,100,0),
+(@PATH,14,-7636.273,-1000.11,440.2625,0,0,0,0,100,0),
+(@PATH,15,-7622.676,-987.7399,440.0219,0,0,0,0,100,0),
+(@PATH,16,-7625.999,-977.4044,440.0362,0,0,0,0,100,0),
+(@PATH,17,-7649.094,-972.2944,440.2316,0,0,0,0,100,0),
+(@PATH,18,-7644.41,-979.6061,440.2635,0,0,0,0,100,0),
+(@PATH,19,-7634.969,-989.9937,440.2634,0,0,0,0,100,0),
+(@PATH,20,-7624.835,-986.701,440.0168,0,0,0,0,100,0),
+(@PATH,21,-7620.448,-985.0109,440.037,0,0,0,0,100,0),
+(@PATH,22,-7610.641,-984.5477,440.2049,0,0,0,0,100,0),
+(@PATH,23,-7595.672,-988.9937,440.0914,0,0,0,0,100,0),
+(@PATH,24,-7595.672,-988.9937,440.0914,0,0,0,0,100,0),
+(@PATH,25,-7610.641,-984.5477,440.2049,0,0,0,0,100,0),
+(@PATH,26,-7620.448,-985.0109,440.037,0,0,0,0,100,0),
+(@PATH,27,-7624.835,-986.701,440.0168,0,0,0,0,100,0),
+(@PATH,28,-7634.969,-989.9937,440.2634,0,0,0,0,100,0),
+(@PATH,29,-7644.41,-979.6061,440.2635,0,0,0,0,100,0),
+(@PATH,30,-7649.094,-972.2944,440.2316,0,0,0,0,100,0),
+(@PATH,31,-7625.999,-977.4044,440.0362,0,0,0,0,100,0),
+(@PATH,32,-7622.676,-987.7399,440.0219,0,0,0,0,100,0),
+(@PATH,33,-7636.273,-1000.11,440.2625,0,0,0,0,100,0),
+(@PATH,34,-7637.399,-1010.427,439.9867,0,0,0,0,100,0),
+(@PATH,35,-7647.332,-1011.346,439.9858,0,0,0,0,100,0),
+(@PATH,36,-7658.341,-1002.132,439.9857,0,0,0,0,100,0),
+(@PATH,37,-7661.772,-988.5689,439.9864,0,0,0,0,100,0),
+(@PATH,38,-7649.554,-984.3552,440.2628,0,0,0,0,100,0),
+(@PATH,39,-7637.204,-978.4598,439.993,0,0,0,0,100,0),
+(@PATH,40,-7634.491,-969.407,440.0258,0,0,0,0,100,0),
+(@PATH,41,-7626.357,-967.7826,440.0594,0,0,0,0,100,0),
+(@PATH,42,-7619.713,-975.4172,440.2763,0,0,0,0,100,0),
+(@PATH,43,-7614.898,-986.8362,440.0524,0,0,0,0,100,0),
+(@PATH,44,-7619.718,-993.6684,440.0176,0,0,0,0,100,0),
+(@PATH,45,-7626.135,-996.6401,440.2635,0,0,0,0,100,0),
+(@PATH,46,-7632.956,-996.5212,440.263,0,0,0,0,100,0),
+(@PATH,47,-7653.352,-993.4436,439.9867,0,0,0,0,100,0),
+(@PATH,48,-7653.352,-993.4436,439.9867,0,0,0,0,100,0);
+-- 0xF13030AA0000B53D .go -7632.956 -996.5212 440.263
+
+-- Pathing for Blackwing Taskmaster Entry: 12458
+SET @NPC := @GUID+2;
+SET @PATH := @NPC * 10;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-7639.315,-1088.736,449.1642,0,0,0,0,100,0),
+(@PATH,2,-7644.75,-1097.218,449.1642,0,0,0,0,100,0),
+(@PATH,3,-7651.393,-1110.778,449.193,0,0,0,0,100,0),
+(@PATH,4,-7661.635,-1091.063,449.1826,0,0,0,0,100,0),
+(@PATH,5,-7672.317,-1084.581,449.166,0,0,0,0,100,0),
+(@PATH,6,-7678.168,-1087.581,449.1542,0,0,0,0,100,0),
+(@PATH,7,-7671.085,-1100.425,449.1617,0,0,0,0,100,0),
+(@PATH,8,-7665.083,-1108.27,449.1694,0,0,0,0,100,0),
+(@PATH,9,-7658.763,-1114.884,449.1781,0,0,0,0,100,0),
+(@PATH,10,-7670.01,-1119.684,449.1523,0,0,0,0,100,0),
+(@PATH,11,-7680.338,-1118.28,449.134,0,0,0,0,100,0),
+(@PATH,12,-7687.568,-1104.841,449.1463,0,0,0,0,100,0),
+(@PATH,13,-7693.229,-1096.283,449.1507,0,0,0,0,100,0),
+(@PATH,14,-7701.18,-1089.753,449.1177,0,0,0,0,100,0),
+(@PATH,15,-7712.01,-1073.58,445.1763,0,0,0,0,100,0),
+(@PATH,16,-7701.18,-1089.753,449.1177,0,0,0,0,100,0),
+(@PATH,17,-7693.229,-1096.283,449.1507,0,0,0,0,100,0),
+(@PATH,18,-7687.568,-1104.841,449.1463,0,0,0,0,100,0),
+(@PATH,19,-7680.338,-1118.28,449.134,0,0,0,0,100,0),
+(@PATH,20,-7670.01,-1119.684,449.1523,0,0,0,0,100,0),
+(@PATH,21,-7658.763,-1114.884,449.1781,0,0,0,0,100,0),
+(@PATH,22,-7665.083,-1108.27,449.1694,0,0,0,0,100,0),
+(@PATH,23,-7671.085,-1100.425,449.1617,0,0,0,0,100,0),
+(@PATH,24,-7678.168,-1087.581,449.1542,0,0,0,0,100,0),
+(@PATH,25,-7672.317,-1084.581,449.166,0,0,0,0,100,0),
+(@PATH,26,-7661.635,-1091.063,449.1826,0,0,0,0,100,0),
+(@PATH,27,-7651.393,-1110.778,449.193,0,0,0,0,100,0),
+(@PATH,28,-7644.75,-1097.218,449.1642,0,0,0,0,100,0);
+-- 0xF13030AA0000B540 .go -7639.315 -1088.736 449.1642
+
+-- Pathing for Blackwing Spellbinder Entry: 12457
+SET @NPC := 85758;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-7446.97,`position_y`=-945.069,`position_z`=464.9834 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-7446.97,-945.069,464.9834,0,0,0,0,100,0),
+(@PATH,2,-7449.199,-935.9932,464.9834,0,0,0,0,100,0),
+(@PATH,3,-7453.252,-931.2498,464.9834,0,0,0,0,100,0),
+(@PATH,4,-7463.244,-933.8245,464.9834,0,7000,0,0,100,0),
+(@PATH,5,-7456.518,-929.4488,464.9834,0,0,0,0,100,0),
+(@PATH,6,-7451.187,-934.4731,464.9834,0,0,0,0,100,0),
+(@PATH,7,-7440.787,-950.2525,464.9834,0,19000,0,0,100,0),
+(@PATH,8,-7437.717,-955.0467,464.9747,0,0,0,0,100,0),
+(@PATH,9,-7443.361,-947.8978,464.9834,0,12000,0,0,100,0);
+-- 0xF13030A90000B57B .go -7446.97 -945.069 464.9834
+
+-- Pathing for Death Talon Overseer Entry: 12461
+SET @NPC := 84557;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-7513.689,`position_y`=-1048.273,`position_z`=449.242 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-7513.689,-1048.273,449.242,0,0,0,0,100,0),
+(@PATH,2,-7502.118,-1040.439,449.242,0,0,0,0,100,0),
+(@PATH,3,-7492.288,-1033.455,449.242,0,0,0,0,100,0),
+(@PATH,4,-7502.118,-1040.439,449.242,0,0,0,0,100,0),
+(@PATH,5,-7513.689,-1048.273,449.242,0,0,0,0,100,0),
+(@PATH,6,-7525.79,-1057.795,449.242,0,0,0,0,100,0);
+-- 0xF13030AD0000B58D .go -7513.689 -1048.273 449.242
diff --git a/sql/updates/world/2013_06_25_04_world_item_template.sql b/sql/updates/world/2013_06_25_04_world_item_template.sql
new file mode 100644
index 00000000000..215d0583d53
--- /dev/null
+++ b/sql/updates/world/2013_06_25_04_world_item_template.sql
@@ -0,0 +1 @@
+UPDATE `item_template` SET `PageText`=3092 WHERE `entry`=37540;
diff --git a/sql/updates/world/2013_06_25_05_world_misc.sql b/sql/updates/world/2013_06_25_05_world_misc.sql
new file mode 100644
index 00000000000..378b362aa83
--- /dev/null
+++ b/sql/updates/world/2013_06_25_05_world_misc.sql
@@ -0,0 +1,12 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (2046,2026);
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(2046, 'at_dragonspire_hall'),
+(2026, 'at_blackrock_stadium');
+
+-- Warchief Rend Blackhand text
+SET @REND   := 10429;
+DELETE FROM `creature_text` WHERE `entry` IN (@REND);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@REND,0,0,"Impossible!",14,0,100,22,0,0,'Warchief Rend Blackhand'),
+(@REND,1,0,"With pleasure...",14,0,100,0,0,0,'Warchief Rend Blackhand'),
+(@REND,2,0,"%s is knocked off his drake!",16,0,100,0,0,0,'Warchief Rend Blackhand');
diff --git a/sql/updates/world/2013_06_25_06_world_creature_template.sql b/sql/updates/world/2013_06_25_06_world_creature_template.sql
new file mode 100644
index 00000000000..709776de6c4
--- /dev/null
+++ b/sql/updates/world/2013_06_25_06_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `minlevel`=61, `maxlevel`=61, `faction_A`=103, `faction_H`=103, `unit_flags`=`unit_flags`|33555200 WHERE `entry`=14081;
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|256|512 WHERE `entry`=10429;
diff --git a/sql/updates/world/2013_06_25_07_world_creature_text.sql b/sql/updates/world/2013_06_25_07_world_creature_text.sql
new file mode 100644
index 00000000000..ad52bbac254
--- /dev/null
+++ b/sql/updates/world/2013_06_25_07_world_creature_text.sql
@@ -0,0 +1,20 @@
+-- Text for Lord Victor Nefarius from sniff
+SET @VICTOR := 10162;
+DELETE FROM `creature_text` WHERE `entry` IN (@VICTOR,@REND);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+-- Lord Victor Nefarius texts UBRS
+(@VICTOR,0,0,"Excellent... it would appear as if the meddlesome insects have arrived just in time to feed my legion. Welcome, mortals!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,1,0,"Let not even a drop of their blood remain upon the arena floor, my children. Feast on their souls!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,2,0,"Foolsss... Kill the one in the dress!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,3,0,"Inconceivable!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,4,0,"Your efforts will prove fruitless. None shall stand in our way!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,5,0,"Do not force my hand, children! I shall use your hides to line my boots.",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,6,0,"Use the freezing breath, imbecile!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,7,0,"THIS CANNOT BE!!! Rend, deal with these insects.",14,0,100,0,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,8,0,"The Warchief shall make quick work of you, mortals. Prepare yourselves!",14,0,100,25,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,9,0,"Your victory shall be short lived. The days of both the Alliance and Horde are coming to an end! The next time we meet shall be the last.",14,0,100,5,0,0,'Lord Victor Nefarius (UBRS)'),
+(@VICTOR,10,0,"The mortals have fallen! The new age of the Blackrock legion is at hand!",14,0,100,22,0,0,'Lord Victor Nefarius (UBRS)'),
+-- Lord Victor Nefarius texts BWL
+(@VICTOR,11,0,"In this world where time is your enemy, it is my greatest ally. This grand game of life that you think you play in fact plays you. To that I say...",14,0,100,1,0,0,'Lord Victor Nefarius SAY_GAMESBEGIN_1 (BWL)'),
+(@VICTOR,12,0,"Let the games begin!",14,0,100,22,0,8280,'Lord Victor Nefarius SAY_GAMESBEGIN_2 (BWL)'),
+(@VICTOR,13,0,"Ah, the heroes. You are persistent, aren't you. Your allied attempted to match his power against mine, and had to pay the price. Now he shall serve me, by slaughtering you. Get up, little red wyrm...and destroy them!",14,0,100,23,0,8279,'Lord Victor Nefarius SAY_VAEL_INTRO (BWL)');
diff --git a/sql/updates/world/2013_06_26_00_world_conditions.sql b/sql/updates/world/2013_06_26_00_world_conditions.sql
new file mode 100644
index 00000000000..bb1467d7bfe
--- /dev/null
+++ b/sql/updates/world/2013_06_26_00_world_conditions.sql
@@ -0,0 +1,4 @@
+-- Add Gossip Menu conditions for Agnetta Tyrsdottar
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (9874);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9874,0,0,28,12969,0,0,1,0,'','Agnetta Tyrsdottar - Show gossip option only if quest is not complete');
diff --git a/sql/updates/world/2013_06_26_01_world_misc.sql b/sql/updates/world/2013_06_26_01_world_misc.sql
new file mode 100644
index 00000000000..2e54cb9497e
--- /dev/null
+++ b/sql/updates/world/2013_06_26_01_world_misc.sql
@@ -0,0 +1,39 @@
+-- Add gossip id to Frostborn Scout
+UPDATE `creature_template` SET `gossip_menu_id`=9841 WHERE `entry`=29811;
+-- Add Missing Gossip for Frostborn Scout
+DELETE FROM `gossip_menu` WHERE `entry`=9841 AND `text_id`=13611;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (9841,13611);
+DELETE FROM `gossip_menu` WHERE `entry`=9842 AND `text_id`=13612;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (9842,13612);
+DELETE FROM `gossip_menu` WHERE `entry`=9843 AND `text_id`=13613;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (9843,13613);
+DELETE FROM `gossip_menu` WHERE `entry`=9844 AND `text_id`=13614;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (9844,13614);
+-- Add Any Missing Gossip Option for Frostborn Scout
+DELETE FROM `gossip_menu_option` WHERE menu_id IN (9841,9842,9843);
+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
+(9841,0,0,"Are you okay? I''ve come TO take you back TO Frosthold IF you can stand.",1,1,9842,0,0,0,''),
+(9842,0,0,"I''m sorry that I didn''t get here sooner. What happened?",1,1,9843,0,0,0,''),
+(9843,0,0,"I''ll go get SOME help. Hang IN there.",1,1,9844,0,0,0,'');
+-- Add Gossip option condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (9841);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9841,0,0,28,12864,0,0,1,0,'','Agnetta Tyrsdottar - Show gossip option only if quest "Missing scouts" is not complete');
+
+-- Frostborn Scout SAI for Quest: Missing scouts
+SET @ENTRY := 29647;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`= '' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,9843,0,0,0,15,12864,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Frostborn Scout - On Gossip Option Select - Give quest credit for Quest: Missing scouts');
+
+-- Agnetta_Tyrsdottar SAI Quest: Is That Your Goblin?
+SET @ENTRY := 30154;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`= '' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,9874,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Agnetta_Tyrsdottar - On Gossip Option Select - Close Gossip Window'),
+(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,2,45,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Agnetta_Tyrsdottar - On Gossip Option Select - Set Faction'),
+(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Agnetta_Tyrsdottar - On Gossip Option Select - Say 0'),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Agnetta_Tyrsdottar - On Gossip Option Select - Attack Envoker'),
+(@ENTRY,0,4,0,25,0,100,0,0,0,0,0,2,2109,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Agnetta_Tyrsdottar - On Reset - Set faction');
diff --git a/sql/updates/world/2013_06_26_02_world_gossip.sql b/sql/updates/world/2013_06_26_02_world_gossip.sql
new file mode 100644
index 00000000000..56c41e18b38
--- /dev/null
+++ b/sql/updates/world/2013_06_26_02_world_gossip.sql
@@ -0,0 +1,9 @@
+-- Add Any Missing Gossip Option for Injured Goblin Miner
+DELETE FROM `gossip_menu_option` WHERE menu_id IN (9859);
+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
+(9859,0,0,"I am ready, lets get you out of here.",1,1,0,0,0,0,'');
+
+-- Add Gossip option condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (9859);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9859,0,0,28,12832,0,0,1,0,'','Injured Goblin Miner - Show gossip option only if quest "Bitter Departure" is not complete');
diff --git a/sql/updates/world/2013_06_26_03_world_creature_template.sql b/sql/updates/world/2013_06_26_03_world_creature_template.sql
new file mode 100644
index 00000000000..dae5f5869c3
--- /dev/null
+++ b/sql/updates/world/2013_06_26_03_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Missing data for Embeerseer
+UPDATE `creature_template` SET `faction_A`=40, `faction_H`=40, `unit_flags`=`unit_flags`|256|33554432 WHERE `entry`=9816;
diff --git a/sql/updates/world/2013_06_29_00_world_misc.sql b/sql/updates/world/2013_06_29_00_world_misc.sql
new file mode 100644
index 00000000000..175f37041e2
--- /dev/null
+++ b/sql/updates/world/2013_06_29_00_world_misc.sql
@@ -0,0 +1,14 @@
+SET @ENTRY = 24918;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`id`,`event_type`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`target_type`,`comment`) VALUES
+(@ENTRY,0,0,4000,6000,7000,9000,11,14873,0,2,'Felblood Initiate - Cast Sinister Strike'),
+(@ENTRY,1,0,17000,22000,20000,26000,11,29098,1,2,'Felblood Initiate - Cast Bitter Withdrawal'),
+(@ENTRY,2,0,8000,12000,18000,22000,11,35871,1,2,'Felblood Initiate - Cast Spellbreaker'),
+(@ENTRY,3,8,44937,0,0,0,36,24955,1,1,'Felblood Initiate - Changes Template to Emaciated Felblood After Using Fel Siphon (Quest: 11515)');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=4 AND `SourceEntry`=@ENTRY AND `SourceId`=0;
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ConditionTarget`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`) VALUE
+(22,4,@ENTRY,0,1,31,3,24955,1,'Felblood Initiate may not already be transformed to template entry 24955 when trying to update template to 24955');
diff --git a/sql/updates/world/2013_06_29_01_world_creature_addon.sql b/sql/updates/world/2013_06_29_01_world_creature_addon.sql
new file mode 100644
index 00000000000..e7ec3a48752
--- /dev/null
+++ b/sql/updates/world/2013_06_29_01_world_creature_addon.sql
@@ -0,0 +1,10 @@
+DELETE FROM `creature_template_addon` WHERE `entry`=17975;
+DELETE FROM `creature_addon` WHERE `guid`=82987;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(82987,829870,0,0,1,0,''); -- Converted from c_t_a, works on both normal and heroic entry
+
+-- allow mounting inside Black Temple (outdoor areas)
+UPDATE `instance_template` SET `allowMount`=1 WHERE `map`=564;
+
+-- fix for issue #9997 by Exodius
+UPDATE `spell_script_names` SET `spell_id`=28441 WHERE `spell_id`=28414 AND `ScriptName`='spell_item_ashbringer';
diff --git a/sql/updates/world/2013_06_29_02_world_creature_addon.sql b/sql/updates/world/2013_06_29_02_world_creature_addon.sql
new file mode 100644
index 00000000000..c8ee431909b
--- /dev/null
+++ b/sql/updates/world/2013_06_29_02_world_creature_addon.sql
@@ -0,0 +1,4 @@
+DELETE FROM `creature_template_addon` WHERE `entry`=17976;
+DELETE FROM `creature_addon` WHERE `guid`=82986;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(82986,829860,0,0,1,0,'19818'); -- Converted from c_t_a, works on both normal and heroic entry
diff --git a/sql/updates/world/2013_06_29_03_world_misc.sql b/sql/updates/world/2013_06_29_03_world_misc.sql
new file mode 100644
index 00000000000..db9a7525517
--- /dev/null
+++ b/sql/updates/world/2013_06_29_03_world_misc.sql
@@ -0,0 +1,3 @@
+UPDATE `smart_scripts` SET `event_type`=37 WHERE `entryorguid` IN (9818,9817) AND `id`=0 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE ((`entryorguid`=10817 AND `id`=9) OR (`entryorguid`= 1399 AND `id`=3)) AND `source_type`=0;
+UPDATE `smart_scripts` SET `link`=11 WHERE `entryorguid`=314 AND `id`=10 AND `source_type`=0;