SQL: move all SQL that is now included in the latest full DB to the "old" dir.

92 files changed, 2934 insertions, 0 deletions

diff --git a/sql/old/3.3.5a/2011_02_03_0_characters_instance.sql b/sql/old/3.3.5a/2011_02_03_0_characters_instance.sql
new file mode 100644
index 00000000000..5072fa69f0a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_03_0_characters_instance.sql
@@ -0,0 +1 @@
+ALTER TABLE `instance` ADD COLUMN `completedEncounters` int(10) unsigned NOT NULL DEFAULT '0' AFTER `difficulty`;
diff --git a/sql/old/3.3.5a/2011_02_11_4_world_game_event_npc_gossip.sql b/sql/old/3.3.5a/2011_02_11_4_world_game_event_npc_gossip.sql
new file mode 100644
index 00000000000..83f7613d6c9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_11_4_world_game_event_npc_gossip.sql
@@ -0,0 +1 @@
+DROP TABLE `game_event_npc_gossip`;
diff --git a/sql/old/3.3.5a/2011_02_12_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_12_0_world_spell_script_names.sql
new file mode 100644
index 00000000000..39098e1c3de
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_12_0_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=26678;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(26678,'spell_item_create_heart_candy');
diff --git a/sql/old/3.3.5a/2011_02_15_0_world_sai.sql b/sql/old/3.3.5a/2011_02_15_0_world_sai.sql
new file mode 100644
index 00000000000..e23f3d31f61
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_0_world_sai.sql
@@ -0,0 +1,139 @@
+-- Conditions for Writhing Choker and Unliving Choker
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry` IN (38673,38660);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES 
+(1,28519,38660,0,14,12238,0,0,0,'',NULL),
+(1,28519,38673,0,8,12238,0,0,0,'',NULL);
+
+-- Mission: Plague This (11332)
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=9546 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`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(9546,1,0, 'I need to Borrow a Gryphon',1,1,0,0,954601,0,0, ''); -- Text Unsure
+
+DELETE FROM `gossip_scripts` WHERE `id`=954601;
+INSERT INTO `gossip_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(954601,0,17,33634,10,0,0,0,0,0); -- Give Player Bombs
+
+-- SmartAI
+SET @ENTRY := 23859;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0, 'Greer Orehammer - Script on Aggro'),
+(@ENTRY,0,1,0,62,0,100,0,9546,1,0,0,52,745,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Plague This Taxi Start'),
+(@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,'Say text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,12,9526,4,30000,0,0,0,7,0,0,0,0,0,0,0,'Summon Enraged Gryphon'),
+(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,12,9526,4,30000,0,0,0,7,0,0,0,0,0,0,0,'Summon Enraged Gryphon');
+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,'Guards!',0,0,100,0,0,0,'Greer Orehammer');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9546 AND `SourceEntry`=1;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9546,1,0,9,11332,0,0,0,'', 'Mission Plague This is Active');
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; -- Text Entry Not Touched as its Shared by All Flight Masters
+
+-- Quest: Scourge Tactics (13008)
+-- Webed Crusader (Crusader Verion)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30273;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30273;
+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
+(30273,0,0,0,6,0,100,0,0,0,0,0,85,56515,0x02,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Summon Freed Crusader on Death'),
+(30273,0,1,0,6,0,100,0,0,0,0,0,33,30274,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Summon Freed Crusader Quest Credit');
+DELETE FROM `spell_scripts` WHERE `id`=56515;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(56515,0,0,15,56516,2,0,0,0,0,0);
+-- Webed Crusader (Ambusher Version)
+UPDATE `creature_template` SET `AIName`= 'SmartAI', `minlevel`=1, `maxlevel`=1 WHERE `entry`=30268;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30268;
+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
+(30268,0,0,0,6,0,100,0,0,0,0,0,12,30204,1,30000,0,0,0,1,0,0,0,0,0,0,0, 'Summon Forgotten Depths Ambusher');
+-- Freeed Crusader
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30274;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30274;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=3027400;
+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
+(30274,0,0,0,54,0,100,0,0,0,0,0,80,3027400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Start Script on Spawn'),
+(3027400,9,0,0,0,0,100,0,0,0,0,0,11,58054,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Freed Crusader Blessing of Kings'),
+(3027400,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, 'Freed Crusader Speach'),
+(3027400,9,2,0,0,0,100,0,0,0,0,0,11,58053,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Freed Crusader Holy Light'),
+(3027400,9,3,0,0,0,100,0,4000,4000,0,0,53,1,30274,0,13008,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader paths to Argeant Vanguard'),
+(3027400,9,4,0,0,0,100,0,0,0,0,0,41,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Despawn');
+-- create path point location to send Freed Crusaders to
+DELETE FROM `waypoints` WHERE `entry`=30274;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES 
+(30274,1,6296.25,92.9397,390.701, 'send Freed Crusader here');
+DELETE FROM `creature_text` WHERE `entry`=30274;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(30274,0,0, 'Thank you and farewell, friend. I must return to the Argent Vanguard.',0,0,100,0,0,0, 'Freed Crusader Speach');
+-- Forgotten Depths Ambusher
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30204;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30204;
+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
+(30204,0,0,0,54,0,100,0,0,0,0,0,11,56418,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Forgotten Depths Ambusher - Emerge From Snow');
+-- Spawns for Ambusher Verion
+SET @GUID :=151826;
+DELETE FROM `creature` WHERE `id`=30268;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES 
+(@GUID+0,30268,571,1,2,0,0,6244.78,190.194,383.08,1.50098,0,0,0,0,0,0,0,0,0,0),
+(@GUID+1,30268,571,1,2,0,0,6249.75,126.806,382.534,2.47837,0,0,0,0,0,0,0,0,0,0),
+(@GUID+2,30268,571,1,2,0,0,6277.33,155.167,383.491,0.43643,0,0,0,0,0,0,0,0,0,0),
+(@GUID+3,30268,571,1,2,0,0,6303.7,193.736,387.669,-1.17247,0,0,0,0,0,0,0,0,0,0),
+(@GUID+4,30268,571,1,2,0,0,6321.27,152.463,387.239,4.10152,0,0,0,0,0,0,0,0,0,0),
+(@GUID+5,30268,571,1,2,0,0,6333.02,57.5423,389.173,4.62512,0,0,0,0,0,0,0,0,0,0),
+(@GUID+6,30268,571,1,2,0,0,6335.22,110.147,391.309,6.05629,0,0,0,0,0,0,0,0,0,0),
+(@GUID+7,30268,571,1,2,0,0,6339.98,186.907,389.644,-2.29057,0,0,0,0,0,0,0,0,0,0),
+(@GUID+8,30268,571,1,2,0,0,6347.77,225.483,393.712,-1.99599,0,0,0,0,0,0,0,0,0,0),
+(@GUID+9,30268,571,1,2,0,0,6363.71,126.463,391.424,3.89208,0,0,0,0,0,0,0,0,0,0),
+(@GUID+10,30268,571,1,2,0,0,6389.44,226.344,395.383,6.16101,0,0,0,0,0,0,0,0,0,0),
+(@GUID+11,30268,571,1,2,0,0,6405.67,158.456,394.692,0.85521,0,0,0,0,0,0,0,0,0,0),
+(@GUID+12,30268,571,1,2,0,0,6421.84,258.293,397.279,-2.2004,0,0,0,0,0,0,0,0,0,0),
+(@GUID+13,30268,571,1,2,0,0,6434.63,198.273,396.762,5.93412,0,0,0,0,0,0,0,0,0,0);
+-- Pool creature
+SET @Pool=7001;
+DELETE FROM `pool_creature` WHERE `pool_entry` BETWEEN @Pool+0 AND @Pool+13;
+INSERT INTO `pool_creature` (`guid`,`pool_entry`,`chance`,`description`) VALUES
+(207266,@Pool+0,0, 'Webbed Crusader Spawn 1'),
+(@GUID+0,@Pool+0,0, 'Webbed Crusader Spawn 1'),
+(207267,@Pool+1,0, 'Webbed Crusader Spawn 2'),
+(@GUID+1,@Pool+1,0, 'Webbed Crusader Spawn 2'),
+(207268,@Pool+2,0, 'Webbed Crusader Spawn 3'),
+(@GUID+2,@Pool+2,0, 'Webbed Crusader Spawn 3'),
+(207269,@Pool+3,0, 'Webbed Crusader Spawn 4'),
+(@GUID+3,@Pool+3,0, 'Webbed Crusader Spawn 4'),
+(207270,@Pool+4,0, 'Webbed Crusader Spawn 5'),
+(@GUID+4,@Pool+4,0, 'Webbed Crusader Spawn 5'),
+(207271,@Pool+5,0, 'Webbed Crusader Spawn 6'),
+(@GUID+5,@Pool+5,0, 'Webbed Crusader Spawn 6'),
+(207272,@Pool+6,0, 'Webbed Crusader Spawn 7'),
+(@GUID+6,@Pool+6,0, 'Webbed Crusader Spawn 7'),
+(207273,@Pool+7,0, 'Webbed Crusader Spawn 8'),
+(@GUID+7,@Pool+7,0, 'Webbed Crusader Spawn 8'),
+(207274,@Pool+8,0, 'Webbed Crusader Spawn 9'),
+(@GUID+8,@Pool+8,0, 'Webbed Crusader Spawn 9'),
+(207275,@Pool+9,0, 'Webbed Crusader Spawn 10'),
+(@GUID+9,@Pool+9,0, 'Webbed Crusader Spawn 10'),
+(207276,@Pool+10,0, 'Webbed Crusader Spawn 11'),
+(@GUID+10,@Pool+10,0, 'Webbed Crusader Spawn 11'),
+(207277,@Pool+11,0, 'Webbed Crusader Spawn 12'),
+(@GUID+11,@Pool+11,0, 'Webbed Crusader Spawn 12'),
+(207278,@Pool+12,0, 'Webbed Crusader Spawn 13'),
+(@GUID+12,@Pool+12,0, 'Webbed Crusader Spawn 13'),
+(207279,@Pool+13,0, 'Webbed Crusader Spawn 14'),
+(@GUID+13,@Pool+13,0, 'Webbed Crusader Spawn 14');
+-- Pools
+DELETE FROM `pool_template` WHERE `entry` BETWEEN @Pool+0 AND @Pool+13;
+INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
+(@Pool+0,1, 'Webbed Crusader Spawn 1'),
+(@Pool+1,1, 'Webbed Crusader Spawn 2'),
+(@Pool+2,1, 'Webbed Crusader Spawn 3'),
+(@Pool+3,1, 'Webbed Crusader Spawn 4'),
+(@Pool+4,1, 'Webbed Crusader Spawn 5'),
+(@Pool+5,1, 'Webbed Crusader Spawn 6'),
+(@Pool+6,1, 'Webbed Crusader Spawn 7'),
+(@Pool+7,1, 'Webbed Crusader Spawn 8'),
+(@Pool+8,1, 'Webbed Crusader Spawn 9'),
+(@Pool+9,1, 'Webbed Crusader Spawn 10'),
+(@Pool+10,1, 'Webbed Crusader Spawn 11'),
+(@Pool+11,1, 'Webbed Crusader Spawn 12'),
+(@Pool+12,1, 'Webbed Crusader Spawn 13'),
+(@Pool+13,1, 'Webbed Crusader Spawn 14');
diff --git a/sql/old/3.3.5a/2011_02_15_1_world_sai.sql b/sql/old/3.3.5a/2011_02_15_1_world_sai.sql
new file mode 100644
index 00000000000..64473eaf30d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_1_world_sai.sql
@@ -0,0 +1,74 @@
+-- Cult Plaguebringer <Cult of the Damned> SAI (tested) 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=24957;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=24957;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=24957;
+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
+(24957,0,0,0,1,0,100,0,1000,900000,500000,700000,11,45850,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Ghoul Summons OOC'),
+(24957,0,2,0,0,0,30,0,1100,6300,8800,13800,11,50356,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Inject Plague on victim');
+
+-- Cultist Necrolyte SAI (tested) 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25651;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25651);
+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
+(25651,0,0,0,11,0,100,0,0,0,0,0,11,45104,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shadow Channelling on self when spawned'),
+(25651,0,1,0,21,0,100,0,0,0,0,0,11,45104,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shadow Channelling on self when reach home home'),
+(25651,0,2,0,0,0,30,0,1000,2000,6000,8000,11,18266,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Curse of Agony on victim'),
+(25651,0,3,0,0,0,70,0,3000,4000,3000,4000,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Shadow Bolt on victim');
+
+-- Azure Front Channel Stalker SAI (tested working)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=31400;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-203457,-111746,-111726,-111742);
+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
+(-203457,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111746,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
+(-111746,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111726,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
+(-111726,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111742,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
+(-111742,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,203520,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned');
+
+-- Wildhammer Scout SAI (tested)
+-- Removes waypoint script error spamming at Wildhammer Stronghold
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=19384;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-69122,-69123,-69124,-69125,-69126,-69127);
+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
+(-69122,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
+(-69123,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
+(-69124,0,0,0,1,0,100,0,3000,5000,3000,5000,11,33805,2,0,0,0,0,9,19388,0,25,0,0,0,0,'Cast Throw Hammer every 3-5 sec'),
+(-69125,0,0,0,1,0,100,0,3000,5000,3000,5000,11,33806,2,0,0,0,0,9,19388,0,25,0,0,0,0,'Cast Throw Hammer every 3-5 sec'),
+(-69126,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
+(-69127,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec');
+DELETE FROM `waypoint_data` WHERE `id` IN (691220,691230,691240,691250,691260,691270);
+DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 190 AND 214;
+-- Wildhammer Stronghold Target Dummy Left & Wildhammer Stronghold Target Dummy Right are Triggers
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128,`InhabitType`=7 WHERE `entry` IN (19387,19388);
+
+-- Speech by Marrod Silvertongue, Fort Wildervar (Tested working)
+SET @ENTRY := 24534;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,0,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 6 min ooc'),
+(@ENTRY*100,9,0,0,0,0,100,0,8000,8000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,2,0,0,0,100,0,8000,8000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 1'),
+(@ENTRY*100,9,3,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,4,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 2'),
+(@ENTRY*100,9,5,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,6,0,0,0,100,0,8000,8000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 3'),
+(@ENTRY*100,9,7,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,8,0,0,0,100,0,8000,8000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 4'),
+(@ENTRY*100,9,9,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,10,0,0,0,100,0,8000,8000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 5'),
+(@ENTRY*100,9,11,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,12,0,0,0,100,0,8000,8000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 6'),
+(@ENTRY*100,9,13,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,14,0,0,0,100,0,3000,3000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (24534);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24534,0,0, 'Welcome to Fort Wildervar, brave homesteaders! There''s a whole continent out there just waiting to be claimed!',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,1,0, 'True, Northrend is a hard land, but our people are strong, hardy, and equal to the task!',0,7,100,0,0,0, 'Marrod Silvertongue'),
+(24534,2,0, 'We will win this land with the sword, and break it with the plow! You are the men and women who will be remembered for taming the wild continent!',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,3,0, 'But, you will not be alone out there. My men and I have prepared pack mules carrying the supplies you''ll need most.',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,4,0, 'Axes, picks, seed, nails, food, blankets, water... it''s all there, waiting for you. I think you''ll find my prices quite reasonable, too.',0,7,100,25,0,0, 'Marrod Silvertongue'),
+(24534,5,0, 'There are more than enough to go around. Should you need other goods, don''t hesitate to ask!',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,6,0, 'Now, my loyal custo... err, friends, go forth and conquer this land for our people!',0,7,100,274,0,0, 'Marrod Silvertongue');
diff --git a/sql/old/3.3.5a/2011_02_15_2_world_game_event_liita.sql b/sql/old/3.3.5a/2011_02_15_2_world_game_event_liita.sql
new file mode 100644
index 00000000000..4ca381b59d7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_2_world_game_event_liita.sql
@@ -0,0 +1,270 @@
+SET @GUID := 208789; -- creature.guid
+DELETE FROM `creature` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954);
+DELETE FROM `creature_addon` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954);
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+111 AND `id` IN (36272,36296,36565,36885,37172,37674,37675,37715,38035,38042,38043,38044,38045,38208,38295,38328,38340,38341,38342,38065,37917,37984,38006,38016,38023,38030,38032,37214);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`) VALUES
+-- (@GUID,36272,33,1,1,0,0,-205.449,2219.56,79.7633,3.85724,86400,0,0,269000,0,0,0), -- Apothecary Frye
+-- (@GUID+1,36296,33,1,1,0,0,-208.723,2218.5,79.7633,5.16886,86400,0,0,269000,0,0,0), -- Apothecary Hummel
+-- (@GUID+2,36565,33,1,1,0,0,-209.602,2215.42,79.7633,0.723503,86400,0,0,269000,0,0,0), -- Apothecary Baxter -- commented out because they shouldn't be able to be killed more than once (also missing scripts)
+(@GUID+3,36885,33,1,1,0,0,-207.869,2174.97,79.7664,0.661457,300,0,0,1,0,0,0), -- Crown Apothecary
+(@GUID+4,36885,33,1,1,0,0,-200.286,2201.67,79.765,0.537364,300,0,0,1,0,0,0), -- Crown Apothecary
+(@GUID+5,36885,33,1,1,0,0,-220.323,2207.68,79.7636,3.0687,300,0,0,1,0,0,0), -- Crown Apothecary
+(@GUID+6,37172,1,1,1,0,0,1658.82,-4392.51,23.3589,4.6346,300,0,0,955,0,0,0), -- Detective Snap Snagglebolt
+(@GUID+7,37674,530,1,1,0,0,-4005.55,-11844.8,1.43003,4.79643,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+8,37674,0,1,1,0,0,-4918.13,-982.624,502.699,2.499,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+9,37674,0,1,1,0,0,-8868.67,636.356,97.0308,0.908268,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+10,37674,1,1,1,0,0,9868.93,2492.6,1317.12,6.214,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+11,37674,530,1,1,0,0,9613.2,-7184.04,15.5297,1.871,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+12,37674,0,1,1,0,0,1629.43,239.687,65.095,0.0213735,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+13,37674,1,1,1,0,0,-1224.64,68.9846,130.974,3.13043,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+14,37674,1,1,1,0,0,1654.56,-4435.7,19.1524,1.54799,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+15,37675,1,1,1,0,0,-1224.81,67.5514,130.815,3.13043,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+16,37675,1,1,1,0,0,1651.95,-4436.06,19.1667,1.5205,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+17,37675,0,1,1,0,0,-8869.92,637.543,97.0305,0.751188,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+18,37675,1,1,1,0,0,9869.15,2493.99,1317.12,6.2572,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+19,37675,530,1,1,0,0,9611.19,-7184.62,15.5277,1.84743,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+20,37675,0,1,1,0,0,1629.41,241.08,65.0948,6.18282,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+21,37675,0,1,1,0,0,-4919.62,-983.631,502.699,2.24375,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+22,37675,530,1,1,0,0,-4003.71,-11844.7,1.44597,4.73753,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+23,37715,1,1,1,0,0,1349.47,-4641.45,53.5287,3.1282,300,0,0,1003,0,0,0), -- Snivel Rustrocket
+(@GUID+24,37715,0,1,1,0,0,-8401.37,1246.34,5.2303,5.97131,300,0,0,1003,0,0,0), -- Snivel Rustrocket
+(@GUID+25,38035,571,1,1,0,0,5525.21,35.5649,148.918,0.00558376,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+26,38035,571,1,1,0,0,5586.44,36.157,148.304,2.49451,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+27,38035,571,1,1,0,0,5610.19,67.2452,149.648,1.10907,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+28,38035,0,1,1,0,0,-51.7072,1147.06,66.2442,6.0002,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+29,38035,0,1,1,0,0,-9462.46,525.975,55.3952,4.44641,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+30,38035,1,1,1,0,0,1269.73,-4095.83,27.2461,0.383236,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+31,38035,530,1,1,0,0,-1800.57,4849.58,3.67941,0.732729,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+32,38035,1,1,1,0,0,6767.76,-4880.77,776.832,0.473977,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+33,38035,1,1,1,0,0,4851.07,137.164,52.3573,3.32611,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+34,38035,0,1,1,0,0,121.643,-2401.57,123.532,1.69738,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+35,38035,1,1,1,0,0,-3418.81,-4212.7,10.3292,0.932394,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+36,38035,0,1,1,0,0,-402.274,163.143,75.6627,3.65071,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+37,38042,1,1,1,0,0,1648.48,-4434.6,17.6364,1.10031,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+38,38043,530,1,1,0,0,9617.42,-7181.72,14.2958,2.39329,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+39,38044,1,1,1,0,0,-1223.83,62.5435,129.123,3.29929,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+40,38045,0,1,1,0,0,1630.48,236.085,63.2574,0.382657,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+41,38208,33,1,1,0,0,-234.669,2154.3,90.6247,4.46749,300,0,0,1,0,0,0), -- Investigator Fezzen Brasstacks
+(@GUID+42,38295,1,1,1,0,0,-1239.7,55.8489,127.02,0.969017,300,0,0,1,0,0,0), -- Junior Detective
+(@GUID+43,38295,0,1,1,0,0,1637.74,256.223,62.5927,4.55312,300,0,0,1,0,0,0), -- Junior Detective
+(@GUID+44,38295,530,1,1,0,0,9585.78,-7182.34,14.2411,0.268784,300,0,0,1,0,0,0), -- Junior Detective
+(@GUID+45,38328,1,1,1,0,0,1776.14,-4507.72,27.7458,0.701323,300,0,0,1,0,0,0), -- Roka
+(@GUID+46,38340,1,1,1,0,0,1619.91,-4376.93,12.2511,0.575657,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Bank Bunny
+(@GUID+47,38340,0,1,1,0,0,-8911.16,625.834,99.5227,3.65088,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Bank Bunny
+(@GUID+48,38341,0,1,1,0,0,-8806.15,664.605,96.2,1.56172,300,0,0,1,0,0,0), -- [DND] Holiday - Love - AH Bunny
+(@GUID+49,38341,1,1,1,0,0,1674.65,-4440.01,19.1696,5.34538,300,0,0,1,0,0,0), -- [DND] Holiday - Love - AH Bunny
+(@GUID+50,38342,0,1,1,0,0,-8754.09,657.778,105.091,0.199051,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Barber Bunny
+(@GUID+51,38342,1,1,1,0,0,1762.65,-4345.06,-7.83994,3.73924,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Barber Bunny
+(@GUID+52,38065,0,1,1,0,0,-9028.75,351.111,93.004,4.99164,180,0,0,12600,0,0,0), -- Crown Supply Sentry
+(@GUID+53,38065,0,1,1,0,0,-9033.74,358.078,93.4561,3.12414,180,0,0,12600,0,0,0), -- Crown Supply Sentry
+(@GUID+54,38065,0,1,1,0,0,-9033.66,352.778,93.0811,4.03171,180,0,0,12600,0,0,0), -- Crown Supply Sentry
+(@GUID+55,37917,0,1,1,0,0,-78.1933,1155.44,64.1348,3.65579,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+56,37917,0,1,1,0,0,-99.1899,1143.58,61.9249,3.65579,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+57,37917,0,1,1,0,0,-70.0067,1126.23,65.5446,5.87061,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+58,37917,0,1,1,0,0,-40.5129,1132.35,66.9879,0.2236,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+59,37917,1,1,1,0,0,4861.5,143.397,53.5891,1.77494,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+60,37917,1,1,1,0,0,4867.09,123.556,54.625,1.10736,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+61,37917,1,1,1,0,0,4860,109.204,53.8496,0.467256,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+62,37917,1,1,1,0,0,4844.9,102.68,50.0936,3.43999,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+63,37917,1,1,1,0,0,4845.3,115.292,51.258,3.43999,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+64,37984,0,1,1,0,0,-396.98,152.02,72.7445,0.0802893,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+65,37984,0,1,1,0,0,-414.333,151.165,72.7544,5.28748,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+66,37984,0,1,1,0,0,-421.118,161.632,73.0552,3.81093,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+67,37984,0,1,1,0,0,-407.15,172.323,76.8851,3.50463,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+68,37984,0,1,1,0,0,-382.121,161.213,77.0395,0.982712,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+69,38006,1,1,1,0,0,-3408.24,-4205.45,11.7024,5.33848,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+70,38006,1,1,1,0,0,-3415.67,-4199.13,10.9447,0.380259,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+71,38006,1,1,1,0,0,-3425.3,-4205.48,11.087,0.747825,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+72,38006,1,1,1,0,0,-3407.75,-4217.59,11.4111,4.59863,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+73,38006,1,1,1,0,0,-3423.44,-4223.1,10.3878,3.34749,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+74,38016,0,1,1,0,0,107.836,-2394.64,123.766,1.71859,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+75,38016,0,1,1,0,0,112.257,-2406.06,125.159,2.12857,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+76,38016,0,1,1,0,0,117.312,-2415.86,124.574,1.81912,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+77,38016,0,1,1,0,0,112.321,-2385.37,121.337,0.933974,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+78,38016,0,1,1,0,0,122.685,-2379.58,120.969,0.401474,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+79,38023,1,1,1,0,0,6777.68,-4889.84,776.667,0.746511,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+80,38023,1,1,1,0,0,6767.71,-4899.06,775.43,5.72986,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+81,38023,1,1,1,0,0,6754.64,-4890.56,774.717,4.87221,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+82,38023,1,1,1,0,0,6754.5,-4875.5,773.386,6.14062,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+83,38023,1,1,1,0,0,6763.25,-4871.99,775.183,0.473977,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+84,38030,530,1,1,0,0,-1792,4835.44,5.75526,4.05103,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+85,38030,530,1,1,0,0,-1786.21,4846.14,3.9133,4.90948,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+86,38030,530,1,1,0,0,-1789.11,4860.69,1.08418,5.7255,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+87,38030,530,1,1,0,0,-1800.26,4865.74,1.76724,0.246567,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+88,38030,530,1,1,0,0,-1809.55,4858.05,1.6643,0.850539,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+89,38032,571,1,1,0,0,5562.6,52.7611,148.023,2.35235,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+90,38032,571,1,1,0,0,5577.75,75.6327,148.413,1.00147,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+91,38032,571,1,1,0,0,5578.91,93.6562,151.453,0.907219,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+92,38032,571,1,1,0,0,5604.51,73.2304,149.666,5.6039,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+93,38032,571,1,1,0,0,5576.47,21.2221,147.859,3.57051,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+94,38032,571,1,1,0,0,5545.75,7.1756,146.18,3.57051,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+95,38032,571,1,1,0,0,5517.56,0.325575,148.243,3.29483,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+96,38032,571,1,1,0,0,5493.37,1.40435,148.043,2.9414,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+97,38032,571,1,1,0,0,5483.65,-24.6906,148.632,4.41402,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+98,38032,571,1,1,0,0,5480.42,-46.4207,150.948,4.71797,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+99,38032,571,1,1,0,0,5490.42,25.9105,148.037,1.53711,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+100,38032,571,1,1,0,0,5517.81,39.9906,150.179,0.35901,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+101,38032,571,1,1,0,0,5560.51,26.0842,147.293,0.621334,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+102,37214,0,1,1,0,0,-9447.59,521.985,56.1219,4.45034,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+103,37214,0,1,1,0,0,-9461.04,512.112,55.8756,3.59818,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+104,37214,0,1,1,0,0,-9479.33,525.887,55.2184,2.14127,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+105,37214,0,1,1,0,0,-9471.57,536.639,54.108,0.793523,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+106,37214,0,1,1,0,0,-9459.73,534.487,54.9696,5.97165,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+107,37214,1,1,1,0,0,1278.46,-4095.97,28.5179,6.00276,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+108,37214,1,1,1,0,0,1273.4,-4103.99,27.8146,4.13351,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+109,37214,1,1,1,0,0,1263.1,-4104.66,26.5895,3.20674,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+110,37214,1,1,1,0,0,1252.12,-4093.07,24.2136,1.55034,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+111,37214,1,1,1,0,0,1261.55,-4082.01,24.5336,0.679332,30,0,0,356,0,0,0); -- Crown Lackey
+
+-- Game_event_linking
+DELETE FROM `game_event_creature` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954) AND `event`=8;
+DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+111 AND `event`=8;
+INSERT INTO `game_event_creature` (`guid`,`event`) VALUES
+/*(@GUID+0,8),(@GUID+1,8),(@GUID+2,8),*/(@GUID+3,8),(@GUID+4,8),
+(@GUID+5,8),(@GUID+6,8),(@GUID+7,8),(@GUID+8,8),(@GUID+9,8),
+(@GUID+10,8),(@GUID+11,8),(@GUID+12,8),(@GUID+13,8),(@GUID+14,8),
+(@GUID+15,8),(@GUID+16,8),(@GUID+17,8),(@GUID+18,8),(@GUID+19,8),
+(@GUID+20,8),(@GUID+21,8),(@GUID+22,8),(@GUID+23,8),(@GUID+24,8),
+(@GUID+25,8),(@GUID+26,8),(@GUID+27,8),(@GUID+28,8),(@GUID+29,8),
+(@GUID+30,8),(@GUID+31,8),(@GUID+32,8),(@GUID+33,8),(@GUID+34,8),
+(@GUID+35,8),(@GUID+36,8),(@GUID+37,8),(@GUID+38,8),(@GUID+39,8),
+(@GUID+40,8),(@GUID+41,8),(@GUID+42,8),(@GUID+43,8),(@GUID+44,8),
+(@GUID+45,8),(@GUID+46,8),(@GUID+47,8),(@GUID+48,8),(@GUID+49,8),
+(@GUID+50,8),(@GUID+51,8),(@GUID+52,8),(@GUID+53,8),(@GUID+54,8),
+(@GUID+55,8),(@GUID+56,8),(@GUID+57,8),(@GUID+58,8),(@GUID+59,8),
+(@GUID+60,8),(@GUID+61,8),(@GUID+62,8),(@GUID+63,8),(@GUID+64,8),
+(@GUID+65,8),(@GUID+66,8),(@GUID+67,8),(@GUID+68,8),(@GUID+69,8),
+(@GUID+70,8),(@GUID+71,8),(@GUID+72,8),(@GUID+73,8),(@GUID+74,8),
+(@GUID+75,8),(@GUID+76,8),(@GUID+77,8),(@GUID+78,8),(@GUID+79,8),
+(@GUID+80,8),(@GUID+81,8),(@GUID+82,8),(@GUID+83,8),(@GUID+84,8),
+(@GUID+85,8),(@GUID+86,8),(@GUID+87,8),(@GUID+88,8),(@GUID+89,8),
+(@GUID+90,8),(@GUID+91,8),(@GUID+92,8),(@GUID+93,8),(@GUID+94,8),
+(@GUID+95,8),(@GUID+96,8),(@GUID+97,8),(@GUID+98,8),(@GUID+99,8),
+(@GUID+100,8),(@GUID+101,8),(@GUID+102,8),(@GUID+103,8),
+(@GUID+104,8),(@GUID+105,8),(@GUID+106,8),(@GUID+107,8),
+(@GUID+108,8),(@GUID+109,8),(@GUID+110,8),(@GUID+111,8);
+
+DELETE FROM `creature_addon` WHERE `guid` IN (@GUID+56,@GUID+57);
+INSERT INTO `creature_addon`(`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(@GUID+56,0,0,0,0,0, '68946 0'),
+(@GUID+57,0,0,0,0,0, '68589 0');
+
+SET @GUID:= 151771; -- gameobject.guid
+DELETE FROM `gameobject` WHERE `id`=201716;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`animprogress`,`state`) VALUES
+(@GUID+00,201716,571,1,1,5525.21,35.5649,148.918,0.00558376,180,0,0,0,1,100,1),
+(@GUID+01,201716,571,1,1,5586.44,36.157,148.304,2.49451,180,0,0,0,1,100,1),
+(@GUID+02,201716,571,1,1,5610.19,67.2452,149.648,1.10907,180,0,0,0,1,100,1),
+(@GUID+03,201716,0,1,1,-51.7072,1147.06,66.2442,6.0002,180,0,0,0,1,100,1),
+(@GUID+04,201716,0,1,1,-9462.46,525.975,55.3952,4.44641,180,0,0,0,1,100,1),
+(@GUID+05,201716,1,1,1,1269.73,-4095.83,27.2461,0.383236,180,0,0,0,1,100,1),
+(@GUID+06,201716,530,1,1,-1800.57,4849.58,3.67941,0.732729,180,0,0,0,1,100,1),
+(@GUID+07,201716,1,1,1,4851.07,137.164,52.3573,3.32611,180,0,0,0,1,100,1),
+(@GUID+08,201716,0,1,1,121.643,-2401.57,123.532,1.69738,180,0,0,0,1,100,1),
+(@GUID+09,201716,1,1,1,-3418.81,-4212.7,10.3292,0.932394,180,0,0,0,1,100,1),
+(@GUID+10,201716,0,1,1,-402.274,163.143,75.6627,3.65071,180,0,0,0,1,100,1),
+(@GUID+11,201716,1,1,1,6767.76,-4880.77,776.832,0.473977,180,0,0,0,1,100,1);
+
+-- Game_event_linking
+DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+11 AND `event`=8;
+INSERT INTO `game_event_gameobject` (`guid`,`event`) VALUES
+(@GUID+0,8),(@GUID+1,8),(@GUID+2,8),(@GUID+3,8),(@GUID+4,8),
+(@GUID+5,8),(@GUID+6,8),(@GUID+7,8),(@GUID+8,8),(@GUID+9,8),
+(@GUID+10,8),(@GUID+11,8);
+
+-- remove Love Tokens from innkeepers
+DELETE FROM `npc_vendor` WHERE `item`=21815;
+
+-- Update Quests
+UPDATE `quest_template` SET `MaxLevel`=13 WHERE `entry` IN (24638,24658);
+UPDATE `quest_template` SET `MaxLevel`=22 WHERE `entry` IN (24659,24645);
+UPDATE `quest_template` SET `MaxLevel`=31 WHERE `entry` IN (24660,24647);
+UPDATE `quest_template` SET `MaxLevel`=40 WHERE `entry` IN (24662,24648);
+UPDATE `quest_template` SET `MaxLevel`=50 WHERE `entry` IN (24663,24649);
+UPDATE `quest_template` SET `MaxLevel`=60 WHERE `entry` IN (24664,24650);
+UPDATE `quest_template` SET `MaxLevel`=70 WHERE `entry` IN (24665,24651);
+UPDATE `quest_template` SET `MaxLevel`=80 WHERE `entry` IN (24666,24652);
+
+-- Other Data
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14 WHERE `entry` IN (38032,37214,37917,37984,38006,38016,38023,38030);
+UPDATE `creature_template` SET `faction_A`=16,`faction_H`=16 WHERE `entry` IN (36296,36272,36568);
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|1 WHERE `entry` IN (36272,36296,36565); -- Shadowfang Keep bosses
+-- Missing questrelations
+DELETE FROM `creature_questrelation` WHERE `id` IN (38066,37887,38041,38043,38066,38208) AND `quest` IN (24666,24597,24609,24615,24792,14488);
+INSERT INTO `creature_questrelation`(`id`,`quest`) VALUES
+(38066,24666),
+(37887,24597),
+(38041,24609),
+(38043,24615),
+(38066,24792),
+(38208,14488);
+DELETE FROM `creature_involvedrelation` WHERE `id` IN (38066,29611,2784,38208,36296) AND `quest` IN (24666,24597,24609,24792,14488);
+INSERT INTO `creature_involvedrelation`(`id`,`quest`) VALUES
+(38066,24666),
+(29611,24597),
+(2784,24609),
+(38208,24792),
+(36296,14488);
+
+UPDATE `creature_template` SET `npcflag`=npcflag|2 WHERE `name`='Kwee Q. Peddlefeet'; -- 9 entries that should be questgivers
+-- Set correct thrall id for quest A Gift for the Warchief
+UPDATE `creature_involvedrelation` SET `id`=4949 WHERE `quest`=24612;
+
+-- Loots
+UPDATE `creature_template` SET `lootid`=36296 WHERE `entry`=36296;
+DELETE FROM `creature_loot_template` WHERE `entry`=36296;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) values
+-- Apothecary Hummel
+(36296,1,100,1,0,-50010,1),  -- 1 from reference_epics
+(36296,2,15,1,0,-50011,1), -- 1 from reference_blues
+(36296,50320,10,1,0,1,1), -- Faded Lovely Greeting Card Ally
+(36296,49641,10,1,0,1,1), -- Faded Lovely Greeting Card Horde
+(36296,50250,0.1,1,0,1,1); -- Big Love Rocket 
+DELETE FROM `reference_loot_template` WHERE `entry` IN (50010,50011,50012);
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(50010,51806,0,1,1,1,1), -- Shard of Pirouetting Happiness
+(50010,51808,0,1,1,1,1), -- Choker of the Pure Heart
+(50010,51805,0,1,1,1,1), -- Heartbreak Charm
+(50010,51807,0,1,1,1,1), -- Sweet Perfume Broach
+(50010,51804,0,1,1,1,1), -- Winking Eye of Love
+(50011,50471,0,1,1,1,1), -- The Heartbreaker 
+(50011,50741,0,1,1,1,1), -- Vile Fumigator's Mask
+(50011,50446,0,1,1,1,1), -- Toxic Wasteling
+(50011,49715,0,1,1,1,1), -- Forever-Lovely Rose
+-- Box of Chocolates_Reference
+(50012,22237,0,1,1,1,1), -- Dark Desire
+(50012,22239,0,1,1,1,1), -- Sweet Surprise
+(50012,22238,0,1,1,1,1), -- Very Berry Cream
+(50012,22236,0,1,1,1,1); -- Buttermilk Delight
+
+DELETE FROM `item_loot_template` WHERE `entry` IN (49631,49909,50160,50161); 
+INSERT INTO `item_loot_template`(`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+-- Standard Apothecary Serving Kit
+(49631,49352,100,1,0,1,1), 
+(49631,49351,100,1,0,1,1),
+(49631,49635,100,1,0,1,1),
+-- Box of Chocolates
+(49909,1,100,1,0,-50012,6), -- always 6 chocolates inside the box (out of 4 kinds)
+-- Lovely Dress Box
+(50160,22276,0,1,1,1,1), -- Lovely Red Dress
+(50160,22278,0,1,1,1,1), -- Lovely Blue Dress
+(50160,22279,0,1,1,1,1), -- Lovely Black Dress
+(50160,22280,0,1,1,1,1), -- Lovely Purple Dress
+-- Loot for Dinner Suit Box
+(50161,22281,0,1,1,1,1), -- Blue Dinner Suit
+(50161,22282,0,1,1,1,1), -- Purple Dinner Suit
+(50161,22277,0,1,1,1,1); -- Red Dinner Suit
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup`=36296 AND `SourceEntry` IN (49641,50320);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
+(1,36296,49641,0,6,67,0,0,0, 'Faded Lovely Greeting Card Horde'),
+(1,36296,50320,0,6,469,0,0,0, 'Faded Lovely Greeting Card Ally');
+
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12846 AND `type` in (16,18);
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12859 AND `type` in (5,15,18);
+INSERT INTO `achievement_criteria_data`(`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES 
+-- Set correct data for achievement Charming
+(12846,16,335,0, ''),
+-- Set correct data for achievement Flirt With Disaster (alliance)
+(12859,5,26682,0, ''),
+(12859,15,3,0, '');
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_creature_template.sql b/sql/old/3.3.5a/2011_02_15_3_world_creature_template.sql
new file mode 100644
index 00000000000..cc892b30bf9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_3_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`exp`=2,`unit_class`=1,`faction_A`=16,`faction_H`=16,`baseattacktime`=2000,`unit_flags`=33280,`speed_run`=0.9920629 WHERE `entry`=38494; -- Rotting Frost Giant
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_creature_text.sql b/sql/old/3.3.5a/2011_02_15_3_world_creature_text.sql
new file mode 100644
index 00000000000..6642afba9b7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_3_world_creature_text.sql
@@ -0,0 +1,4 @@
+DELETE FROM `creature_text` WHERE `entry` IN (38490,38494);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(38490,0,0, '$n is infected with the Death Plague!',3,0,100,25,0,0, 'Rotting Frost Giant - Death Plague'),
+(38494,0,0, '$n is infected with the Death Plague!',3,0,100,25,0,0, 'Rotting Frost Giant - Death Plague');
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql b/sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql
new file mode 100644
index 00000000000..ec7c4f3d483
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_rotting_frost_giant' WHERE `entry` IN (38490,38494);
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_15_3_world_spell_script_names.sql
new file mode 100644
index 00000000000..85c9a11fd50
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_3_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_frost_giant_death_plague';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(72864,'spell_frost_giant_death_plague');
diff --git a/sql/old/3.3.5a/2011_02_15_4_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_15_4_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..41cfff3fab9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_4_world_spell_linked_spell.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=70117;
diff --git a/sql/old/3.3.5a/2011_02_15_4_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_15_4_world_spell_script_names.sql
new file mode 100644
index 00000000000..c066aad3b8b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_4_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_icy_grip';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70117,'spell_sindragosa_icy_grip');
diff --git a/sql/old/3.3.5a/2011_02_16_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_16_0_world_spell_script_names.sql
new file mode 100644
index 00000000000..e41542c3316
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_16_0_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=70117 AND `ScriptName`='spell_sindragosa_collision_filter';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70117,'spell_sindragosa_collision_filter');
diff --git a/sql/old/3.3.5a/2011_02_16_1_world_conditions.sql b/sql/old/3.3.5a/2011_02_16_1_world_conditions.sql
new file mode 100644
index 00000000000..e42fd4006e4
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_16_1_world_conditions.sql
@@ -0,0 +1,4 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (70360,72527);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,70360,0,18,1,37690,0,0, '', 'Mutated Abomination - Eat Ooze target'),
+(13,0,72527,0,18,1,37690,0,0, '', 'Mutated Abomination - Eat Ooze target');
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_creature.sql b/sql/old/3.3.5a/2011_02_18_0_world_creature.sql
new file mode 100644
index 00000000000..4f07781a267
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_0_world_creature.sql
@@ -0,0 +1,6 @@
+SET @GUID := 137743;
+DELETE FROM `creature` WHERE `id` IN (38471,38501,38551);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+0,38471,631,15,1,0,0,-504.949,2184.24,62.3048,0.450047,86400,0,0,0,0,0,0,0,0,0),
+(@GUID+1,38501,631,15,1,0,0,4247.040,2753.25,348.996,0.227759,86400,0,0,0,0,0,0,0,0,0),
+(@GUID+2,38551,631,15,1,0,0,4466.260,2787.99,348.954,3.349720,86400,0,0,0,0,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_creature_text.sql b/sql/old/3.3.5a/2011_02_18_0_world_creature_text.sql
new file mode 100644
index 00000000000..39d46f15fef
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_0_world_creature_text.sql
@@ -0,0 +1,6 @@
+DELETE FROM `creature_text` WHERE `entry` IN (38472,38485);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(38472,0,0, 'Die, intruders! None shall interfere with the Cult''s plans!',1,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_AGGRO'),
+(38472,1,0, 'Wh- where am I...? What a nightmare I have had... But this is no time to reflect, I have much information to report!',0,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_RESCUED'),
+(38485,0,0, 'Die, intruders! None shall interfere with the Cult''s plans!',1,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_AGGRO'),
+(38485,1,0, 'Wh- where am I...? What a nightmare I have had... But this is no time to reflect, I have much information to report!',0,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_RESCUED');
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql b/sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql
new file mode 100644
index 00000000000..6c386e8b77b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql
@@ -0,0 +1,28 @@
+-- ICC Quest pools (also deletes old pool data)
+SET @pool := 5662;
+DELETE FROM `pool_quest` WHERE `pool_entry` BETWEEN @pool+17 AND @pool+22;
+INSERT INTO `pool_quest` (`entry`,`pool_entry`,`description`) VALUES
+(24874,@pool+17, 'Blood Quickening (10)'),
+(24869,@pool+17, 'Deprogramming (10)'),
+(24873,@pool+17, 'Residue Rendezvous (10)'),
+(24872,@pool+17, 'Respite for a Tormented Soul (10)'),
+(24870,@pool+19, 'Securing the Ramparts HORDE (10)'),
+(24871,@pool+19, 'Securing the Ramparts ALLY (10)'),
+(24879,@pool+18, 'Blood Quickening (25)'),
+(24875,@pool+18, 'Deprogramming (25)'),
+(24878,@pool+18, 'Residue Rendezvous (25)'),
+(24880,@pool+18, 'Respite for a Tormented Soul (25)'),
+(24876,@pool+20, 'Securing the Ramparts ALLY (25)'),
+(24877,@pool+20, 'Securing the Ramparts HORDE (25)');
+
+DELETE FROM `pool_template` WHERE `entry` BETWEEN @pool+17 AND @pool+22;
+INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
+(@pool+17,1, 'ICC weeklies (10)'),
+(@pool+18,1, 'ICC weeklies (25)'),
+(@pool+19,2, 'Securing the Ramparts (10)'),
+(@pool+20,2, 'Securing the Ramparts (25)');
+
+DELETE FROM `pool_pool` WHERE `mother_pool` IN (@pool+17,@pool+18);
+INSERT INTO `pool_pool` (`pool_id`,`mother_pool`,`chance`,`description`) VALUES
+(@pool+19,@pool+17,0, 'Securing the Ramparts (10)'),
+(@pool+20,@pool+18,0, 'Securing the Ramparts (25)');
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql
new file mode 100644
index 00000000000..3588fe7ae3b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_darnavan' WHERE `entry` IN (38472,38485);
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_18_0_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..66ceb1b593c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_0_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=65940;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(65940,65941,0, 'Trial of the Crusader: Shattering Throw');
diff --git a/sql/old/3.3.5a/2011_02_18_1_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_18_1_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..5f5fbadfd21
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_1_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-11129;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(-11129,-28682,0, 'Combustion');
diff --git a/sql/old/3.3.5a/2011_02_18_2_world_misc.sql b/sql/old/3.3.5a/2011_02_18_2_world_misc.sql
new file mode 100644
index 00000000000..8e2bc235861
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_2_world_misc.sql
@@ -0,0 +1,36 @@
+-- Jeeves should be a vendor and a banker (to Engineers).
+SET @Jeeves = 35642;
+UPDATE `creature_template` SET `faction_A`=35,`faction_H`=35,`npcflag`=`npcflag`|4225|131072,`unit_flags`=`unit_flags`|768,`gossip_menu_id`=10667,`AIName`='' WHERE `entry`=@Jeeves; -- template updates
+-- Jeeves gets the (player) faction of its summoner, 35 by default
+UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=0,`gender`=2 WHERE `modelid`=30076; -- addon data
+DELETE FROM `creature_template_addon` WHERE `entry`=@Jeeves;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@Jeeves,0,33554432,1,0, '68054 0'); -- Aura: Pressing Engagement, bytes1: hover mode
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10667 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,10667,0,0,7,202,350,0,0, '', 'Jeeves: Bank requires Engineering 350');
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=10667 AND `id` IN (0,1);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`) VALUES
+(10667,0,6,'I would like to check my deposit box.',9,131072), -- banker
+(10667,1,1,'Let me browse your goods.',3,128); -- vendor
+
+DELETE FROM `npc_vendor` WHERE `entry`=@Jeeves;
+INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES
+(@Jeeves,1,41584,0,0,0), -- Frostbite Bullets
+(@Jeeves,2,41586,0,0,0), -- Terrorshaft Arrow
+(@Jeeves,3,44605,0,0,0), -- Wild Spineleaf
+(@Jeeves,4,44614,0,0,0), -- Starleaf Seed
+(@Jeeves,5,44615,0,0,0), -- Devout Candle
+(@Jeeves,6,16583,0,0,0), -- Demonic Figurine
+(@Jeeves,7,21177,0,0,0), -- Symbol of Kings
+(@Jeeves,8,17020,0,0,0), -- Arcane Powder
+(@Jeeves,9,37201,0,0,0), -- Corpse Dust
+(@Jeeves,10,5565,0,0,0), -- Infernal Stone
+(@Jeeves,11,17032,0,0,0), -- Rune of Portals
+(@Jeeves,12,17030,0,0,0), -- Ankh
+(@Jeeves,13,17033,0,0,0), -- Symbol of Divinity
+(@Jeeves,14,17031,0,0,0); -- Rune of Teleportation
+
+DELETE FROM `creature_ai_scripts` WHERE `id`=3564201; -- remove unneed EventAI script
diff --git a/sql/old/3.3.5a/2011_02_18_3_world_loot_template.sql b/sql/old/3.3.5a/2011_02_18_3_world_loot_template.sql
new file mode 100644
index 00000000000..4e9523fa758
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_3_world_loot_template.sql
@@ -0,0 +1,2 @@
+-- Fix wrong loot being dropped by ICC trash
+UPDATE `reference_loot_template` SET `item`=50450 WHERE `item`=50775 AND `entry`=35071;
diff --git a/sql/old/3.3.5a/2011_02_18_4_world_eai.sql b/sql/old/3.3.5a/2011_02_18_4_world_eai.sql
new file mode 100644
index 00000000000..3dd091465ed
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_4_world_eai.sql
@@ -0,0 +1,2 @@
+-- Correction for Obsidian Eradicator EAI
+UPDATE `creature_ai_scripts` SET `action1_param1`=23 WHERE `id`=1526201 AND `creature_id`=15262;
diff --git a/sql/old/3.3.5a/2011_02_18_5_world_sai.sql b/sql/old/3.3.5a/2011_02_18_5_world_sai.sql
new file mode 100644
index 00000000000..e06f5a067c0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_5_world_sai.sql
@@ -0,0 +1,80 @@
+-- Bonesunder SAI (Converted from EAI)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=27006;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=27006;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27006; 
+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
+(27006,0,0,0,0,0,100,0,5000,11000,16000,25000,11,52080,1,0,0,0,0,2,0,0,0,0,0,0,0,'Bonesunder - Cast Bonecrack');
+
+-- Surge Needle Sorcerer SAI
+SET @ELMGUID := 113473;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26257;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26257,-109558,-109559,-109560,-109561,-109563,-109564,-109565,-109569,-109570,-109571,-109572,-109578);
+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
+(26257,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109558,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109558,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109558,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109559,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109559,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109559,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109560,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109560,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109560,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109561,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109561,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109561,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109563,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109563,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109563,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109564,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109564,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109564,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109565,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109565,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109565,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109569,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109569,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109569,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109570,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109570,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109570,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109571,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109571,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109571,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109572,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109572,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109572,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109578,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109578,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109578,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim');
+
+-- Goramosh SAI
+SET @ELMGUID := 113473;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26349;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26349);
+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
+(26349,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(26349,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(26349,0,2,0,2,0,100,1,0,50,0,0,11,20828,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Cone of Cold on victim at 50% health'),
+(26349,0,3,0,0,0,100,0,3500,3500,3500,3500,11,9672,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Frost Bolt on victim');
+
+-- Arcanimus SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26370;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26370);
+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
+(26370,0,0,0,1,0,100,1,2000,2000,2000,2000,45,0,1,0,0,0,0,10,113473,26298,0,0,0,0,0, 'Set data 0 = 1 on bunny 2 sec after reset'),
+(26370,0,1,0,1,0,100,1,0,0,0,0,11,46934,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Add Cosmetic - Arcane Force Shield (Blue x2) Aura on spawn & reset'),
+(26370,0,2,3,4,0,100,0,0,0,0,0,28,46934,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Remove Cosmetic - Arcane Force Shield (Blue x2) Aura on aggro'),
+(26370,0,3,0,61,0,100,0,0,0,0,0,28,46906,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Remove Cosmetic - Surge Needle Beam on aggro'),
+(26370,0,4,0,2,0,100,1,71,80,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 80% health cast Arcane Explosion on self'),
+(26370,0,5,0,2,0,100,1,41,60,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 60% health cast Arcane Explosion on self'),
+(26370,0,6,0,2,0,100,1,21,40,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 40% health cast Arcane Explosion on self'),
+(26370,0,7,0,2,0,100,1,1,20,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 20% health cast Arcane Explosion on self');
+
+-- ELM General Purpose Bunny (scale x0.01) Large SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26298;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-113473);
+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
+(-113473,0,0,0,11,0,100,0,0,0,0,0,11,32566,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Purple Banish State aura on self when spawned'),
+(-113473,0,1,2,38,0,100,0,0,1,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'reset data 0 = 0'),
+(-113473,0,2,0,61,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,96298,26370,0,0,0,0,0, 'cast Surge Needle Beam on Arcanimus');
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_conditions.sql b/sql/old/3.3.5a/2011_02_19_0_world_conditions.sql
new file mode 100644
index 00000000000..23ca7bb5766
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_0_world_conditions.sql
@@ -0,0 +1,4 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (72155,72162);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,72155,0,18,1,0,0,0, '', 'Harvest Blight Specimen - player target'),
+(13,0,72162,0,18,1,0,0,0, '', 'Harvest Blight Specimen - player target');
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_creature_template.sql b/sql/old/3.3.5a/2011_02_19_0_world_creature_template.sql
new file mode 100644
index 00000000000..edfa570115a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_0_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `difficulty_entry_1`=38717 WHERE `entry`=38501;
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`exp`=2,`unit_class`=1,`faction_A`=2070,`faction_H`=2070,`npcflag`=2,`dynamicflags`=8,`unit_flags`=33280,`unit_class`=8 WHERE `entry`=38717; -- Alchemist Adrianna (1)
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql
new file mode 100644
index 00000000000..4901cb763ae
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_alchemist_adrianna' WHERE `entry`=38501;
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_19_0_world_spell_script_names.sql
new file mode 100644
index 00000000000..709344ae76d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_0_world_spell_script_names.sql
@@ -0,0 +1,22 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_icc_harvest_blight_specimen';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_festergut_gaseous_blight';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rotface_slime_spray';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(72155,'spell_icc_harvest_blight_specimen'),
+(72162,'spell_icc_harvest_blight_specimen'),
+(69159,'spell_festergut_gaseous_blight'),
+(70135,'spell_festergut_gaseous_blight'),
+(70136,'spell_festergut_gaseous_blight'),
+(70137,'spell_festergut_gaseous_blight'),
+(69161,'spell_festergut_gaseous_blight'),
+(70138,'spell_festergut_gaseous_blight'),
+(70139,'spell_festergut_gaseous_blight'),
+(70140,'spell_festergut_gaseous_blight'),
+(69163,'spell_festergut_gaseous_blight'),
+(70468,'spell_festergut_gaseous_blight'),
+(70469,'spell_festergut_gaseous_blight'),
+(70470,'spell_festergut_gaseous_blight'),
+(69507,'spell_rotface_slime_spray'),
+(71213,'spell_rotface_slime_spray'),
+(73189,'spell_rotface_slime_spray'),
+(73190,'spell_rotface_slime_spray');
diff --git a/sql/old/3.3.5a/2011_02_19_1_world_instance_icecrown_citadel.sql b/sql/old/3.3.5a/2011_02_19_1_world_instance_icecrown_citadel.sql
new file mode 100644
index 00000000000..1c42bfdb544
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_1_world_instance_icecrown_citadel.sql
@@ -0,0 +1,109 @@
+-- delete custom templates
+DELETE FROM `creature_template` WHERE `entry` IN (3678902,3678903,3712602,3712603,3712702,3712703,3713202,3713203,3713302,3713303,3713402,3713403,3812501,3812502,3812503);
+DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (3678902,3678903,3712602,3712603);
+DELETE FROM `creature_loot_template` WHERE `entry` IN (3712602,3712603);
+
+-- Spire Frostwyrm
+UPDATE `creature` SET `spawnMask`=15 WHERE `id`=37528;
+
+-- equip templates
+SET @EQUIP := 2422;
+DELETE FROM `creature_equip_template` WHERE `entry`=@EQUIP;
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EQUIP,39381,0,45872);
+
+-- creature template updates
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36789; -- Valithria Dreamwalker
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37126; -- Sister Svalna
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37127; -- Ymirjar Frostbinder
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37132; -- Ymirjar Battle-Maiden
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37133; -- Ymirjar Warlord
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37134; -- Ymirjar Huntress
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38125; -- Ymirjar Deathbringer
+UPDATE `creature_template` SET `minlevel`=83,`maxlevel`=83,`unit_class`=1,`faction_A`=1665,`faction_H`=1665,`unit_flags`=0x20000000,`baseattacktime`=2000,`scale`=1,`RegenHealth`=0 WHERE `entry` IN (36789,38174); -- Valithria Dreamwalker
+UPDATE `creature_template` SET `minlevel`=81,`maxlevel`=81,`unit_class`=2,`faction_A`=16,`faction_H`=16,`unit_flags`=0,`baseattacktime`=2000,`scale`=1 WHERE `entry` IN (37868,38167,38725,38735); -- Risen Archmage
+UPDATE `creature_template` SET `minlevel`=60,`maxlevel`=60,`unit_class`=1,`faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`baseattacktime`=2000,`scale`=1 WHERE `entry`=38752; -- Green Dragon Combat Trigger
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x0040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=10084,`scale`=1,`speed_run`=2.285714,`speed_walk`=1.6,`InhabitType`=7 WHERE `entry` IN (37126,38258); -- Sister Svalna
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=8,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=93,`scale`=1 WHERE `entry` IN (37127,38126); -- Ymirjar Frostbinder
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=10128,`scale`=1,`speed_walk`=1.2 WHERE `entry` IN (37132,38132); -- Ymirjar Battle-Maiden
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=358,`scale`=1,`speed_run`=1.428571 WHERE `entry` IN (37133,38133); -- Ymirjar Warlord
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=@EQUIP,`scale`=1,`speed_run`=1.285714 WHERE `entry` IN (37134,38131); -- Ymirjar Huntress
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8000,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=93,`scale`=1 WHERE `entry` IN (38125,38130); -- Ymirjar Deathbringer
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`baseattacktime`=2000,`scale`=1 WHERE `entry`=38154; -- Warhawk
+
+-- model updates
+UPDATE `creature_model_info` SET `bounding_radius`=2,`combat_reach`=20,`gender`=2 WHERE `modelid`=30318; -- Valithria Dreamwalker
+UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=7919; -- Risen Archmage
+UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=12,`gender`=1 WHERE `modelid`=30521; -- Sister Svalna
+UPDATE `creature_model_info` SET `bounding_radius`=0.403,`combat_reach`=1.3,`gender`=1 WHERE `modelid`=27548; -- Ymirjar Frostbinder
+UPDATE `creature_model_info` SET `bounding_radius`=0.403,`gender`=1 WHERE `modelid`=27549; -- Ymirjar Battle-Maiden
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1.5, `gender`=0 WHERE `modelid`=26623; -- Ymirjar Warlord
+UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=1,`gender`=1 WHERE `modelid`=25771; -- Ymirjar Warlord
+UPDATE `creature_model_info` SET `bounding_radius`=0.403,`combat_reach`=1.3, `gender`=1 WHERE `modelid`=27548; -- Ymirjar Deathbringer
+
+-- Gunship Armory (delete wrong spawn)
+DELETE FROM `gameobject` WHERE `id`=202178;
+
+-- Mode specific objects (instance portal) reused deleted guids
+DELETE FROM `gameobject` WHERE `id` IN (202315,202316,202317,202318);
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES 
+(150308,202318,631,5,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
+(150310,202316,631,10,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
+(150321,202317,631,5,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
+(150326,202315,631,10,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1);
+
+UPDATE `gameobject_template` SET `faction`=114,`flags`=0x00000020 WHERE entry IN (202181,202182,202183,201919,201920);
+UPDATE `gameobject` SET `state`=0,animprogress=255 WHERE `id` IN (202181,202182,202183,201919,201920);
+UPDATE `gameobject` SET `spawnMask`=15 WHERE `id` IN (201825,201583,201374,201911,201880,202211,201777,201772,201774,201771,201814,201816,202220,201811,201812,202079,202223,202235,202242,202243,202244,202245,202246);
+
+SET @GUID := 137746;
+DELETE FROM `creature` WHERE (`position_x` BETWEEN 4330 AND 4380) AND (`position_y` BETWEEN 2470 AND 2650) AND `position_z` > 350;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+37;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+00,36789,631,05,1,0,0,4203.65,2483.89,364.961,5.5152400,604800,0,0,06000003,0,0,0,0,0,0), -- Valithria Dreamwalker
+(@GUID+01,36789,631,10,1,0,0,4203.65,2483.89,364.961,5.5152400,604800,0,0,17999997,0,0,0,0,0,0), -- Valithria Dreamwalker
+(@GUID+02,37868,631,15,1,0,0,4222.86,2504.58,364.960,3.9095400,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+03,37868,631,15,1,0,0,4223.40,2465.11,364.952,2.3911000,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+04,37868,631,15,1,0,0,4230.44,2478.56,364.953,2.9321500,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+05,37868,631,15,1,0,0,4230.53,2490.22,364.957,3.3684900,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+06,38752,631,15,1,0,0,4203.89,2484.23,364.956,0.0000000,604800,0,0,0,0,0,0,0,0,0), -- Green Dragon Combat Trigger
+(@GUID+07,37126,631,15,1,0,0,4356.71,2484.33,371.531,1.5708000,604800,0,0,0,0,0,0,0,0,0), -- Sister Svalna
+(@GUID+08,37127,631,15,1,0,0,4346.72,2607.90,351.101,3.2342600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Frostbinder
+(@GUID+09,37127,631,15,1,0,0,4371.41,2570.52,351.101,0.0808906,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Frostbinder
+(@GUID+10,37132,631,15,1,0,0,4349.24,2624.60,351.101,1.5592400,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+11,37132,631,15,1,0,0,4365.26,2624.06,351.101,1.6023200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+12,37132,631,15,1,0,0,4347.20,2637.91,351.100,1.3406800,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+13,37132,631,15,1,0,0,4367.90,2638.14,351.100,1.7765700,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+14,37132,631,15,1,0,0,4345.88,2577.64,351.101,1.5299500,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+15,37132,631,15,1,0,0,4368.03,2578.97,351.101,1.6909600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+16,37132,631,15,1,0,0,4369.26,2525.06,358.433,1.7891300,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+17,37132,631,15,1,0,0,4343.78,2525.43,358.433,1.2629100,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+18,37133,631,15,1,0,0,4366.83,2510.30,358.518,1.6231600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+19,37133,631,15,1,0,0,4356.85,2636.39,351.101,1.5692200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+20,37133,631,15,1,0,0,4346.98,2512.75,358.441,1.3571600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+21,37133,631,15,1,0,0,4356.77,2524.27,358.433,1.5024600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+22,37134,631,15,1,0,0,4351.66,2642.95,351.100,1.4035100,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+23,37134,631,15,1,0,0,4362.18,2642.97,351.100,1.5331000,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+24,37134,631,15,1,0,0,4363.48,2585.09,351.101,1.5849300,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+25,37134,631,15,1,0,0,4349.36,2584.54,351.101,1.6084900,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+26,37134,631,15,1,0,0,4350.65,2528.31,358.433,1.5299500,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+27,37134,631,15,1,0,0,4362.76,2527.67,358.433,1.4828200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+28,38125,631,15,1,0,0,4369.75,2606.94,351.101,6.2462700,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Deathbringer
+(@GUID+29,38125,631,15,1,0,0,4340.83,2572.01,351.101,3.1439400,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Deathbringer
+(@GUID+30,38154,631,15,1,0,0,4360.11,2644.49,351.100,1.5880800,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+31,38154,631,15,1,0,0,4355.22,2644.43,351.100,1.5841500,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+32,38154,631,15,1,0,0,4359.36,2587.74,351.101,1.6477600,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+33,38154,631,15,1,0,0,4354.53,2587.01,351.101,1.6438300,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+34,38229,631,15,1,0,0,4358.06,2608.39,351.184,2.8626600,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
+(@GUID+35,38229,631,15,1,0,0,4351.09,2488.49,358.441,1.9373600,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
+(@GUID+36,38229,631,15,1,0,0,4356.68,2525.39,358.432,1.6956800,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
+(@GUID+37,38229,631,15,1,0,0,4352.72,2610.13,351.101,2.8266300,3600,5,0,0,0,0,1,0,0,0); -- Frozen Insect
+
+-- creature addon
+DELETE FROM `creature_addon` WHERE `guid` IN (131604,@GUID+7,@GUID+18,@GUID+19,@GUID+20,@GUID+21);
+INSERT INTO `creature_addon` (`guid`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@GUID+07,0x3000000,0x0000001,0, '70203 0'), -- Sister Svalna
+(@GUID+18,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
+(@GUID+19,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
+(@GUID+20,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
+(@GUID+21,0x0000000,0x0000001,0, '71244 0'); -- Ymirjar Warlord
diff --git a/sql/old/3.3.5a/2011_02_20_0_world_smart_scripts.sql b/sql/old/3.3.5a/2011_02_20_0_world_smart_scripts.sql
new file mode 100644
index 00000000000..48388632202
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_20_0_world_smart_scripts.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `smart_scripts` CHANGE `entryorguid` `entryorguid` INT(32) NOT NULL;
+ALTER TABLE `smart_scripts` MODIFY `action_param1` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param2` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param3` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param4` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param5` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param6` INT(32) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/old/3.3.5a/2011_02_20_1_world_smart_scripts.sql b/sql/old/3.3.5a/2011_02_20_1_world_smart_scripts.sql
new file mode 100644
index 00000000000..236c66cdb1e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_20_1_world_smart_scripts.sql
@@ -0,0 +1,24 @@
+ALTER TABLE `smart_scripts` CHANGE `entryorguid` `entryorguid` INT(11) NOT NULL;
+ALTER TABLE `smart_scripts` MODIFY `source_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `id` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `link` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_phase_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_chance` TINYINT(3) UNSIGNED NOT NULL DEFAULT 100;
+ALTER TABLE `smart_scripts` MODIFY `event_flags` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param4` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param4` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param5` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param6` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `comment` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'Event Comment';
diff --git a/sql/old/3.3.5a/2011_02_20_2_world_instance_icecrown_citadel.sql b/sql/old/3.3.5a/2011_02_20_2_world_instance_icecrown_citadel.sql
new file mode 100644
index 00000000000..b41ab10d6f5
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_20_2_world_instance_icecrown_citadel.sql
@@ -0,0 +1,61 @@
+SET @GUID := 137746;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+30 AND @GUID+33;
+DELETE FROM `linked_respawn` WHERE `linkedGuid` IN (@GUID+06,@GUID+07) AND `linkType`=0;
+INSERT INTO `linked_respawn` (`guid`,`linkedGuid`,`linkType`) VALUES
+(@GUID+00,@GUID+06,0), -- Valithria Dreamwalker
+(@GUID+01,@GUID+06,0), -- Valithria Dreamwalker
+(@GUID+02,@GUID+06,0), -- Risen Archmage
+(@GUID+03,@GUID+06,0), -- Risen Archmage
+(@GUID+04,@GUID+06,0), -- Risen Archmage
+(@GUID+05,@GUID+06,0), -- Risen Archmage
+(@GUID+06,@GUID+06,0), -- Green Dragon Combat Trigger
+(@GUID+07,@GUID+07,0), -- Sister Svalna
+(@GUID+08,@GUID+07,0), -- Ymirjar Frostbinder
+(@GUID+09,@GUID+07,0), -- Ymirjar Frostbinder
+(@GUID+10,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+11,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+12,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+13,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+14,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+15,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+16,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+17,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+18,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+19,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+20,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+21,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+22,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+23,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+24,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+25,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+26,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+27,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+28,@GUID+07,0), -- Ymirjar Deathbringer
+(@GUID+29,@GUID+07,0), -- Ymirjar Deathbringer
+(151761,@GUID+07,0), -- Captain Arnath
+(151762,@GUID+07,0), -- Captain Brandon
+(151763,@GUID+07,0), -- Captain Grondel
+(151764,@GUID+07,0), -- Captain Rupert
+(151767,@GUID+07,0); -- Crok Scourgebane
+
+SET @EQUIP := 2423;
+DELETE FROM `creature_equip_template` WHERE `entry` BETWEEN @EQUIP AND @EQUIP+3;
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EQUIP+0,45128,0,0),
+(@EQUIP+1,47519,0,0),
+(@EQUIP+2,45075,0,0),
+(@EQUIP+3,48025,0,47521);
+
+DELETE FROM `creature_template` WHERE `entry` IN (3712202,3712203,3712302,3712303,3712402,3712403,3712502,3712503,3712902,3712903);
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37122; -- Captain Arnath
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37123; -- Captain Brandon
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37124; -- Captain Grondel
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37125; -- Captain Rupert
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37129; -- Crok Scourgebane
+
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+0 WHERE `entry` IN (37122,38298); -- Captain Arnath
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+1 WHERE `entry` IN (37123,38299); -- Captain Brandon
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+2 WHERE `entry` IN (37124,38303); -- Captain Grondel
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+3 WHERE `entry` IN (37125,38304); -- Captain Rupert
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=2050 WHERE `entry` IN (37129,38000); -- Crok Scourgebane
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=38752; -- Green Dragon Combat Trigger
diff --git a/sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql
new file mode 100644
index 00000000000..0199d796ece
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN(32933,32934);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_22_1_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_22_1_world_spell_script_names.sql
new file mode 100644
index 00000000000..d0b20794f96
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_1_world_spell_script_names.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN(63633,65594,62056,63985,64224,64225);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES 
+(63633,'spell_ulduar_rubble_summon'),
+(65594,'spell_ulduar_cancel_stone_grip'),
+(62056,'spell_ulduar_stone_grip'),
+(63985,'spell_ulduar_stone_grip'),
+(64224,'spell_ulduar_stone_grip_absorb'),
+(64225,'spell_ulduar_stone_grip_absorb');
diff --git a/sql/old/3.3.5a/2011_02_22_2_world_conditions.sql b/sql/old/3.3.5a/2011_02_22_2_world_conditions.sql
new file mode 100644
index 00000000000..93328d671cc
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_2_world_conditions.sql
@@ -0,0 +1,3 @@
+DELETE FROM `conditions` WHERE `SourceEntry`=65594 AND `ConditionTypeOrReference`=18;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
+(13,0,65594,18,1,0,'Cancel Stone Grip Target');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_22_3_world_creature_template.sql b/sql/old/3.3.5a/2011_02_22_3_world_creature_template.sql
new file mode 100644
index 00000000000..38064813aa1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_3_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `flags_extra`= `flags_extra`&~1 WHERE `entry` IN(32933,32934); 
diff --git a/sql/old/3.3.5a/2011_02_22_4_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_02_22_4_world_vehicle_accessory.sql
new file mode 100644
index 00000000000..3d23f85c76a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_4_world_vehicle_accessory.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vehicle_accessory`
+ADD `summontype` TINYINT(3) UNSIGNED NOT NULL DEFAULT 6 COMMENT "see enum TempSummonType",
+ADD `summontimer` INT(10) UNSIGNED NOT NULL DEFAULT 30000 COMMENT "timer, only relevant for certain summontypes";
diff --git a/sql/old/3.3.5a/2011_02_23_1_world_creature_template.sql b/sql/old/3.3.5a/2011_02_23_1_world_creature_template.sql
new file mode 100644
index 00000000000..95e366cc962
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_1_world_creature_template.sql
@@ -0,0 +1,5 @@
+-- Correct run speed, models, and trigger flag
+UPDATE `creature_template` SET `speed_run`=5.5/7, `modelid1`=1126, `modelid2`=11686, `flags_extra`= `flags_extra`|128 WHERE `entry` IN(33632,33802);
+
+-- NullAI for semi-triggers (flags_extra|128 would make them unattackable by certain spells needed for the encounter)
+UPDATE `creature_template` SET `AIName`='NullAI' WHERE `entry` IN(33742,33809,33942);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_23_2_world_conditions.sql b/sql/old/3.3.5a/2011_02_23_2_world_conditions.sql
new file mode 100644
index 00000000000..1819855eced
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_2_world_conditions.sql
@@ -0,0 +1,8 @@
+DELETE FROM `conditions` WHERE `SourceEntry` IN(63676,63702,63629,63979,63766,63983) AND `ConditionTypeOrReference`=18;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
+(13,0,63676,18,1,32930,'Focused Eyebeam Visual (Left) Target'),
+(13,0,63702,18,1,32930,'Focused Eyebeam Visual (Right) Target'),
+(13,0,63629,18,1,32930,'Arm Dead Damage Kologarn (10m) Target'),
+(13,0,63979,18,1,32930,'Arm Dead Damage Kologarn (25m) Target'),
+(13,0,63766,18,1,33661,'Arm Sweep (10m) Target'),
+(13,0,63983,18,1,33661,'Arm Sweep (25m) Target');
diff --git a/sql/old/3.3.5a/2011_02_23_3_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_02_23_3_world_vehicle_accessory.sql
new file mode 100644
index 00000000000..5d56e0c4fab
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_3_world_vehicle_accessory.sql
@@ -0,0 +1 @@
+UPDATE `vehicle_accessory` SET `summontype`=8, `summontimer`=0 WHERE `entry`=32930;
diff --git a/sql/old/3.3.5a/2011_02_23_4_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_23_4_world_spell_script_names.sql
new file mode 100644
index 00000000000..2812c89024d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_4_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN(62166,63981);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(62166, 'spell_ulduar_stone_grip_cast_target'),
+(63981, 'spell_ulduar_stone_grip_cast_target');
diff --git a/sql/old/3.3.5a/2011_02_23_5_world_creature_template.sql b/sql/old/3.3.5a/2011_02_23_5_world_creature_template.sql
new file mode 100644
index 00000000000..8066d1da438
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_5_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `AIName`='', `flags_extra`=`flags_extra`|2 WHERE `entry` IN(33742,33809,33942);
diff --git a/sql/old/3.3.5a/2011_02_23_6_world_creatures.sql b/sql/old/3.3.5a/2011_02_23_6_world_creatures.sql
new file mode 100644
index 00000000000..16a9947afe6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_6_world_creatures.sql
@@ -0,0 +1,40 @@
+-- Fixup Enslaved Netherwing drake in Shadowmoon Valley
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=21722;
+UPDATE `creature_template` SET `InhabitType`=1 WHERE `entry`=21722;
+
+-- Fixup Dragonmaw Drake-Riders in Shadowmoon Valley
+UPDATE `creature` SET `position_x`=-4155.54932,`position_y`=386.6152,`position_z`=141.4012,`orientation`=1.20427716 WHERE `guid`=75786;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=21719;
+UPDATE `creature_template` SET `InhabitType`=1 WHERE `entry`=21719;
+
+-- fix walk speed for several npc's
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry` IN 
+(19449, -- Thunderlord Grunt
+17855); -- Expedition Warden
+
+-- Inquisitor Salrand shouldn't have random movement & fix inhabit type
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=25584;
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=25584;
+-- Beryl Point InvisMan shouldn't have random movement, set as a trigger & fix inhabit type
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=25594;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128,`InhabitType`=7 WHERE `entry`=25594;
+
+-- Surristrasz proper state
+DELETE FROM `creature_template_addon` WHERE `entry`=24795;
+INSERT INTO `creature_template_addon` (`entry`,`bytes1`) VALUES (24795,3);
+
+-- Grand Magus Telestra shouldn't have random movement
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=26832;
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=26832;
+
+-- Remove spawned Savannah Cubs
+-- Savannah Cubs are spawned in EAI
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=5766);
+DELETE FROM `creature` WHERE `id`=5766;
+
+-- Set ELM General Purpose Bunny (scale x0.01) as a trigger
+UPDATE `creature` SET `modelid`=0 WHERE `id`=24021;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=24021;
+-- Set ELM General Purpose Bunny (scale x0.01) Large as a trigger
+UPDATE `creature` SET `modelid`=0 WHERE `id`=26298;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=26298;
diff --git a/sql/old/3.3.5a/2011_02_23_7_world_misc.sql b/sql/old/3.3.5a/2011_02_23_7_world_misc.sql
new file mode 100644
index 00000000000..a2ca5207b33
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_7_world_misc.sql
@@ -0,0 +1,76 @@
+-- SAI for Neltharaku
+SET @ENTRY := 21657;
+UPDATE `creature_template` SET `speed_run`=2.5,`ScriptName`='',`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,1,62,0,100,0,8396,0,0,0,26,10814,0,1,0,0,0,7,0,0,0,0,0,0,0,'Neltharaku - On Gossip option - Quest credit'),
+(@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,'Neltharaku - On Gossip option - Close gossip');
+-- Waypoints for Neltharaku from sniff
+SET @NPC := 75654;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4147.188,`position_y`=852.9213,`position_z`=112.449 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`bytes2`) VALUES (@ENTRY,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4149.083,816.8467,102.0771,0,0,0,100,0),
+(@PATH,2,-4148.741,817.7864,102.0771,0,0,0,100,0),
+(@PATH,3,-4150.894,819.7193,112.4489,0,0,0,100,0),
+(@PATH,4,-4147.188,852.9213,112.449,0,0,0,100,0),
+(@PATH,5,-4126.215,897.6987,112.449,0,0,0,100,0),
+(@PATH,6,-4113.534,926.0124,112.449,0,0,0,100,0),
+(@PATH,7,-4098.13,963.6712,112.449,0,0,0,100,0),
+(@PATH,8,-4063.067,1046.515,112.449,0,0,0,100,0),
+(@PATH,9,-4008.534,1081.363,112.449,0,0,0,100,0),
+(@PATH,10,-3926.171,1057.316,112.449,0,0,0,100,0),
+(@PATH,11,-3914.31,958.3683,114.7823,0,0,0,100,0),
+(@PATH,12,-3930.769,894.2169,114.2545,0,0,0,100,0),
+(@PATH,13,-3991.642,763.9112,112.449,0,0,0,100,0),
+(@PATH,14,-4060.605,579.9987,112.449,0,0,0,100,0),
+(@PATH,15,-4085.638,468.8222,173.4489,0,0,0,100,0),
+(@PATH,16,-4097.893,416.0321,177.8378,0,0,0,100,0),
+(@PATH,17,-4110.39,374.4871,174.2545,0,0,0,100,0),
+(@PATH,18,-4135.225,331.1968,174.7545,0,0,0,100,0),
+(@PATH,19,-4203.078,269.2113,172.4767,0,0,0,100,0),
+(@PATH,20,-4239.532,280.7727,169.0878,0,0,0,100,0),
+(@PATH,21,-4278.137,304.6405,169.1989,0,0,0,100,0),
+(@PATH,22,-4295.682,340.7838,173.9212,0,0,0,100,0),
+(@PATH,23,-4297.044,383.0331,169.0878,0,0,0,100,0),
+(@PATH,24,-4267.532,404.9037,169.0878,0,0,0,100,0),
+(@PATH,25,-4225.749,416.8825,169.0878,0,0,0,100,0),
+(@PATH,26,-4193.994,418.2155,169.0878,0,0,0,100,0),
+(@PATH,27,-4176.15,444.5788,158.2545,0,0,0,100,0),
+(@PATH,28,-4163.389,480.9925,149.6712,0,0,0,100,0),
+(@PATH,29,-4157.379,548.4786,145.2823,0,0,0,100,0),
+(@PATH,30,-4178.163,628.6951,101.0601,0,0,0,100,0),
+(@PATH,31,-4182.795,656.5566,97.31005,0,0,0,100,0),
+(@PATH,32,-4184.389,678.5916,98.50452,0,0,0,100,0),
+(@PATH,33,-4182.358,726.181,102.5323,0,0,0,100,0),
+(@PATH,34,-4175.015,753.1885,103.2545,0,0,0,100,0),
+(@PATH,35,-4160.292,781.7564,107.8656,0,0,0,100,0),
+(@PATH,36,-4150.894,819.7193,112.4489,0,0,0,100,0),
+(@PATH,37,-4147.188,852.9213,112.449,0,0,0,100,0);
+
+-- Gossip Menu insert from sniff
+DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10614;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8394,10614);
+DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10615;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8395,10615);
+DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10616;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8396,10616);
+-- Creature Gossip_menu_id Update from sniff
+UPDATE `creature_template` SET `gossip_menu_id`=6944 WHERE `entry`=19352;
+UPDATE `creature_template` SET `gossip_menu_id`=9563 WHERE `entry`=27575;
+-- Creature Gossip_menu_option Update from sniff
+DELETE FROM `gossip_menu_option` WHERE `id`=0 AND `menu_id` IN (8013,8397,8394,8395,8396);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(8013,0,0, 'I see.',1,1,8014,0,0,0,0, ''),
+(8397,0,0, 'I am listening, dragon.',1,1,8394,0,0,0,0, ''),
+(8394,0,0, 'But you are dragons! How could orcs do this to you?',1,1,8395,0,0,0,0, ''),
+(8395,0,0, 'Your mate?',1,1,8396,0,0,0,0, ''),
+(8396,0,0, 'I have battled many beasts, dragon. I will help you.',1,1,0,0,0,0,0, '');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8397;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,8397,0,0,9,10814,0,0,0,'','Show gossip option 0 if player has quest 10814');
diff --git a/sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql b/sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql
new file mode 100644
index 00000000000..87b90aaf5dd
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=21657; -- Neltharaku
diff --git a/sql/old/3.3.5a/2011_02_23_8_world_sai.sql b/sql/old/3.3.5a/2011_02_23_8_world_sai.sql
new file mode 100644
index 00000000000..3633d2b334c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_8_world_sai.sql
@@ -0,0 +1,106 @@
+ /* Quest/Barrens Horde - Counterattack! */
+SET @Counterattack = 4021;
+
+-- Vars
+SET @Gossip = 21253;
+-- NPCs
+SET @Deathgate = 3389; -- Regthar Deathgate (quest giver)
+SET @Kromzar = 9456; -- Warlord Krom'zar (abilities: 11976 Strike)
+SET @Stormseer = 9523; -- Kolkar Stormseer (abilities: 9532 Lighting Bolt; 6535 Lightning Cloud)
+SET @Invader = 9524; -- Kolkar Invader (abilities: 8014 Tetatuns, 11976 Strike, 6268 Rushing Charge)
+SET @Thrower = 9458; -- Horde Axe Thrower
+SET @Defender = 9457; -- Horde Defender (abilities: 10277 Throw)
+-- Spells
+SET @CreateBanner = 13965; -- Create Krom'zar's Banner
+
+DELETE FROM `gossip_menu` WHERE `entry` IN (@Gossip,@Gossip+1);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(@Gossip+0,2533),
+(@Gossip+1,2534);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=@Gossip AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(@Gossip,0,0, 'Where is Warlord Krom''zar?',1,1,@Gossip+1,0,0,0,0,NULL);
+
+DELETE FROM `creature_text` WHERE `entry` IN (@Deathgate,@Invader,@Thrower,@Kromzar);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@Deathgate,0,0,'Beware, $N! Look to the west!',0,0,100,1,0,0,'Regthar Deathgate: quest start'),
+(@Deathgate,1,0,'A defender has fallen!',0,0,100,1,0,0,'Regthar Deathgate: Horde Defender death'),
+(@Invader,0,0,'Kolkar Invader charges!',2,0,100,0,0,0,'Kolkar Invader: aggro'),
+(@Thrower,0,0,'Defend the bunkers!',0,0,100,0,0,0,'Kolkar Axe Thrower'),
+(@Thrower,0,1,'Our foes will fail!',0,0,100,0,0,0,'Kolkar Axe Thrower'),
+(@Thrower,0,2,'For the Horde',0,0,100,0,0,0,'Kolkar Axe Thrower'),
+(@Kromzar,0,0,'The Kolkar are the strongest!',1,0,100,0,0,0,'Warlord Krom''zar: spawn');
+
+UPDATE `creature_template` SET `AIName`='SmartAI', `MovementType`=1 WHERE `entry` IN (@Kromzar,@Invader,@Stormseer,@Thrower,@Defender);
+UPDATE `creature_template` SET `AIName`='SmartAI', `gossip_menu_id`=@Gossip WHERE `entry`=@Deathgate;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@Gossip;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
+(15,@Gossip,0,0,9,@Counterattack,0,0,0, 'Regthar Deathgate: Counterattack!: gossip: has quest'),
+(15,@Gossip,0,0,26,11227,0,0,0, 'Regthar Deathgate: Counterattack!: gossip: does not have item Piece Banner');
+
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Kromzar AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Deathgate AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Invader AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Stormseer AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Thrower AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Deathgate*100 AND `source_type`=9);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Defender 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
+(@Kromzar,0,0,0,0,0,100,0,0,1000,4000,6000,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,'Warlord Krom''Zar: In combat cast Strike every 4 to 6 seconds'),
+(@Kromzar,0,1,0,6,0,100,1,0,1000,5000,8000,11,@CreateBanner,2,0,0,0,0,0,0,0,0,0,0,0,0,'Warlord Krom''Zar: On death cast Create Krom''zar''s Banner'),
+(@Kromzar,0,4,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Warlord Krom''Zar: On spawn set random movement'),
+(@Kromzar,0,5,0,11,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Warlord Krom''Zar: On spawn say text 0'),
+(@Invader,0,0,0,4,0,100,0,0,0,0,0,11,6268,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: On aggro cast Rushing Charge'),
+(@Invader,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Invader: On aggro say text 0'),
+(@Invader,0,2,0,0,0,100,0,0,1000,4000,6000,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: In combat cast Strike every 4 to 6 seconds'),
+(@Invader,0,3,0,0,0,100,0,1000,2000,20000,20000,11,8014,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: In combat cast Tetanus every 20 seconds'),
+(@Invader,0,4,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Invader: On spawn set random movement'),
+(@Stormseer,0,0,0,11,0,100,0,0,0,0,0,58,1,9532,3500,6000,30,15,1,0,0,0,0,0,0,0,'Kolkar Stormseer: On respawn install AI template caster for Lighting Bolt'),
+(@Stormseer,0,1,0,0,0,100,0,3000,4000,10000,10000,11,6535,1,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Stormseer: In combat cast Lightning Cloud every 10 seconds'),
+(@Stormseer,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Stormseer: On spawn set random movement'),
+(@Thrower,0,0,0,11,0,100,0,0,0,0,0,58,2,10277,35,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thrower: On respawn install AI template turret for Throw'),
+(@Thrower,0,1,0,6,0,100,0,0,0,0,0,12,@Thrower,1,450000,0,0,0,8,0,0,0,-293.212,-1912.51,91.6673,1.42794,'Horde Axe Thrower: On death summon Horde Axe Thrower'),
+(@Thrower,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thower: On spawn set random movement'),
+(@Thrower,0,3,0,60,0,100,0,20000,25000,30000,40000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thower: Say text 0 every 30 to 40 seconds'),
+(@Defender,0,0,0,6,0,100,0,0,0,0,0,1,1,0,0,0,0,0,9,@Deathgate,0,300,0,0,0,0,'Horde Axe Thrower: On death Regthar Deathgate say text 1'),
+(@Defender,0,1,0,6,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-280.703,-1908.01,91.6668,1.77351,'Horde Defender: On death summon Horde Defender'),
+(@Defender,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Defender: On spawn set random movement'),
+(@Deathgate,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On respawn set phase 1 (p0)'),
+(@Deathgate,0,1,0,19,1,100,0,@Counterattack,0,0,0,1,0,0,0,0,0,0,18,15,0,0,0,0,0,0,'Regthar Deathgate: On quest accept say text 0 (p1)'),
+(@Deathgate,0,2,0,19,1,100,0,@Counterattack,0,0,0,22,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Regthar Deathgate: On quest accept set event phase 2 (p1)'),
+(@Deathgate,0,3,0,19,2,100,0,@Counterattack,0,0,0,80,@Deathgate*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On quest accept call main script (p2)'),
+(@Deathgate,0,4,0,62,1,100,0,@Gossip,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Regthar Deathgate: On gossip select say text 0 (p1)'),
+(@Deathgate,0,5,0,62,4,100,0,@Gossip,0,0,0,80,@Deathgate*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On gossip select call main script (p4)'),
+(@Deathgate*100,9,0,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-280.703,-1908.01,91.6668,1.77351,'Counterattack!: Summon Horde Axe Thrower 1'),
+(@Deathgate*100,9,1,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-286.384,-1910.99,91.6668,1.59444,'Counterattack!: Summon Horde Defender 2'),
+(@Deathgate*100,9,2,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-297.373,-1917.11,91.6746,1.81435,'Counterattack!: Summon Horde Defender 3'),
+(@Deathgate*100,9,3,0,0,0,100,0,0,0,0,0,12,@Thrower,1,450000,0,0,0,8,0,0,0,-293.212,-1912.51,91.6673,1.42794,'Counterattack!: Summon Horde Axe Thrower 1'),
+(@Deathgate*100,9,4,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-280.037,-1888.35,92.2549,2.28087,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,5,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-292.107,-1899.54,91.667,4.78158,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,6,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-305.57,-1869.88,92.7754,2.45131,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,7,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-289.972,-1882.76,92.5714,3.43148,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,8,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-277.454,-1873.39,92.7773,4.75724,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,9,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-271.581,-1847.51,93.4329,4.39124,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,10,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-269.982,-1828.6,92.4754,4.68655,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,11,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-279.267,-1827.92,92.3128,1.35332,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,12,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-297.42,-1847.41,93.2295,5.80967,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,13,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-310.607,-1831.89,95.9363,0.371571,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,14,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-329.177,-1842.43,95.3891,0.516085,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,15,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-324.448,-1860.63,94.3221,4.97793,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,16,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-290.588,-1858,92.5026,4.14698,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,17,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-286.103,-1846.18,92.544,6.11047,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,18,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-304.978,-1844.7,94.4432,1.61721,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,19,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-308.105,-1859.08,93.8039,2.80709,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,20,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-297.089,-1867.68,92.5601,2.21804,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,21,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-286.988,-1876.47,92.7447,1.39494,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,22,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-291.86,-1893.04,92.0213,1.96121,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,23,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-298.297,-1846.85,93.3672,4.97792,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,24,0,0,0,100,0,0,0,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-294.942,-1845.88,93.0999,4.86797,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,25,0,0,0,100,0,0,0,0,0,12,@Kromzar,1,250000,0,0,0,8,0,0,0,-296.718,-1846.38,93.2334,5.02897,'Counterattack!: Summon Warlord Kromzar'),
+(@Deathgate*100,9,26,0,0,0,100,0,20000,20000,0,0,22,4,1,450000,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: set phase 4'), -- if player does not finish this quest this time s/he can come back later'
+(@Deathgate*100,9,27,0,0,0,100,0,2*3600*1000,2*3600*1000,0,0,22,1,1,450000,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: set phase 1'), -- after 2 hours reset everything (event start on quest accept)'
+(@Deathgate,0,7,0,20,10,100,0,@Counterattack,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On quest reward set phase 1');
+
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (@Deathgate,@Kromzar,@Stormseer,@Invader,@Thrower,@Defender ); -- 16 EAI scripts
diff --git a/sql/old/3.3.5a/2011_02_23_9_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_23_9_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..8a636b3b589
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_9_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 55814 AND `spell_effect` = 55817 ;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(55814, 55817, 1, 'Eck Residue');
diff --git a/sql/old/3.3.5a/2011_02_24_0_characters_account_data.sql b/sql/old/3.3.5a/2011_02_24_0_characters_account_data.sql
new file mode 100644
index 00000000000..b4a8ed25e8d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_24_0_characters_account_data.sql
@@ -0,0 +1 @@
+ALTER TABLE `account_data` CHANGE COLUMN `account` `accountId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier';
diff --git a/sql/old/3.3.5a/2011_02_24_1_characters_character_tutorial.sql b/sql/old/3.3.5a/2011_02_24_1_characters_character_tutorial.sql
new file mode 100644
index 00000000000..b5e3594f5b0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_24_1_characters_character_tutorial.sql
@@ -0,0 +1,2 @@
+RENAME TABLE `character_tutorial` TO `account_tutorial`;
+ALTER TABLE `account_tutorial` CHANGE COLUMN `account` `accountId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier';
diff --git a/sql/old/3.3.5a/2011_02_25_0_world_creatures.sql b/sql/old/3.3.5a/2011_02_25_0_world_creatures.sql
new file mode 100644
index 00000000000..d2e49048865
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_25_0_world_creatures.sql
@@ -0,0 +1,8 @@
+-- Correct bounding radius and combat reach for Right Arm and Left Arm
+UPDATE `creature_model_info` SET `bounding_radius`=0.31, `combat_reach`=25 WHERE `modelid` IN(28821,28822);
+
+-- Remove static spawns that are spawned by the encounter script and vehicle_accessory table
+DELETE FROM `creature` WHERE `id` IN(32933,32934);
+
+-- Update spawn data
+UPDATE `creature` SET `unit_flags`=33554432, `deathstate`= 1, `MovementType`=0 WHERE `id`=34297;
diff --git a/sql/old/3.3.5a/2011_02_25_1_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_25_1_world_spell_script_names.sql
new file mode 100644
index 00000000000..ae57aad0e93
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_25_1_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=64702;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(64702, 'spell_ulduar_squeezed_lifeless');
diff --git a/sql/old/3.3.5a/2011_02_25_2_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_02_25_2_world_spell_proc_event.sql
new file mode 100644
index 00000000000..aad58f50e30
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_25_2_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE entry = 54646;
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(54646, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0);
diff --git a/sql/old/3.3.5a/2011_02_26_0_world_sai.sql b/sql/old/3.3.5a/2011_02_26_0_world_sai.sql
new file mode 100644
index 00000000000..5aa62b4d2c6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_0_world_sai.sql
@@ -0,0 +1,35 @@
+-- SAI for Gor'drek
+-- This will remove 2 waypoint scripts that were spamming errors
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=21117;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=21117;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2111700,2111701);
+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
+-- AI
+(21117,0,0,0,23,0,100,0,12550,0,2000,2000,11,12550,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Add Lightning Shield Aura'),
+(21117,0,1,0,11,0,100,0,0,0,0,0,53,0,21117,1,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Start WP movement'),
+(21117,0,2,0,40,0,100,0,2,21117,0,0,80,2111700,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Load script at WP 2'),
+(21117,0,3,0,40,0,100,0,4,21117,0,0,80,2111701,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Load script at WP 4'),
+-- Script 1
+(2111700,9,0,0,0,0,100,0,0,0,0,0,54,128000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Pause at WP 2'),
+(2111700,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.654867, 'Gor''drek - Turn to 5.654867'),
+(2111700,9,2,0,0,0,100,0,2000,2000,0,0,11,28892,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Cast 42837'),
+(2111700,9,3,0,0,0,100,0,120000,120000,0,0,92,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Stop Casting 42837'),
+-- Script 2
+(2111701,9,0,0,0,0,100,0,0,0,0,0,54,128000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Pause at WP 2'),
+(2111701,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.677482, 'Gor''drek - Turn to 4.677482'),
+(2111701,9,2,0,0,0,100,0,2000,2000,0,0,11,28892,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Cast 42837'),
+(2111701,9,3,0,0,0,100,0,120000,120000,0,0,92,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Stop Casting 42837');
+-- Update position and remove path for Gor'drek
+UPDATE `creature` SET `position_x`=2313.006,`position_y`=6004.879,`position_z`=142.8264,`orientation`=4.677482,`MovementType`=0 WHERE `guid`=74168;
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=74168;
+DELETE FROM `waypoint_data` WHERE `id`=741680;
+DELETE FROM `waypoint_scripts` WHERE `id` IN (224,225);
+-- Remove EAI
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=21117;
+-- Proper waypoints for Gor'drek from sniff
+DELETE FROM `waypoints` WHERE `entry`=21117;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(21117,1,2319.757,6007.015,142.7014,'Gor''drek WP 1'),
+(21117,2,2325.909,6010.899,142.5764,'Gor''drek WP 2'),
+(21117,3,2319.757,6007.015,142.7014,'Gor''drek WP 3'),
+(21117,4,2313.006,6004.879,142.8264,'Gor''drek WP 4');
diff --git a/sql/old/3.3.5a/2011_02_26_1_world_sai.sql b/sql/old/3.3.5a/2011_02_26_1_world_sai.sql
new file mode 100644
index 00000000000..6735f217dd1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_1_world_sai.sql
@@ -0,0 +1,9 @@
+SET @Fairmount = 3393; -- Captain Fairmount
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Fairmount; -- three scripts
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Fairmount 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 
+(@Fairmount,0,0,0,4,0,100,0,0,0,0,0,11,9128,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captain Fairmount: On aggro cast Battle Shout self'),
+(@Fairmount,0,1,0,2,0,100,1,0,30,0,0,11,19134,0,0,0,0,0,2,0,0,0,0,0,0,0,'Captain Fairmount: At 30% hp cast Frightening Shout'),
+(@Fairmount,0,2,0,13,0,100,0,5000,5000,0,0,11,12555,0,0,0,0,0,2,0,0,0,0,0,0,0,'Captain Fairmount: On enemy casting cast Pummel');
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@Fairmount;
+UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid`=1855; -- correct wrong model data, thanks Kaelima
diff --git a/sql/old/3.3.5a/2011_02_26_2_world_sai.sql b/sql/old/3.3.5a/2011_02_26_2_world_sai.sql
new file mode 100644
index 00000000000..89ac05757c4
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_2_world_sai.sql
@@ -0,0 +1,117 @@
+-- Quest 11344 "Anguish of Nifflevar"
+-- Spawn King Ymiron & Ancient Citizens of Nifflevar (24322,24323)
+SET @GUID := 151840; -- 53 required
+DELETE FROM `creature` WHERE `id` IN (24321,24322,24323);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID,24321,571,1,2,0,0,913.322571,-5580.623535,201.560135,1.169371,300,0,0,1,0,0,0,0,0,0),
+(@GUID+1,24322,571,1,2,0,0,911.649536,-5561.338867,193.473511,4.799655,300,0,0,1,0,0,0,0,0,0),
+(@GUID+2,24322,571,1,2,0,0,907.117493,-5537.400879,192.382034,4.869469,300,0,0,1,0,0,0,0,0,0),
+(@GUID+3,24322,571,1,2,0,0,918.257690,-5544.248535,189.321060,4.572762,300,0,0,1,0,0,0,0,0,0),
+(@GUID+4,24322,571,1,2,0,0,914.562317,-5522.900391,194.128143,4.677482,300,0,0,1,0,0,0,0,0,0),
+(@GUID+5,24322,571,1,2,0,0,918.760193,-5563.743652,190.615295,4.398230,300,0,0,1,0,0,0,0,0,0),
+(@GUID+6,24322,571,1,2,0,0,907.657227,-5558.532715,194.031952,4.974188,300,0,0,1,0,0,0,0,0,0),
+(@GUID+7,24322,571,1,2,0,0,919.950439,-5557.877441,190.155640,4.433136,300,0,0,1,0,0,0,0,0,0),
+(@GUID+8,24322,571,1,2,0,0,901.456604,-5555.405762,194.423370,5.148721,300,0,0,1,0,0,0,0,0,0),
+(@GUID+9,24322,571,1,2,0,0,917.626770,-5553.712402,190.210724,4.555309,300,0,0,1,0,0,0,0,0,0),
+(@GUID+10,24322,571,1,2,0,0,917.515747,-5529.253418,192.039810,4.625123,300,0,0,1,0,0,0,0,0,0),
+(@GUID+11,24322,571,1,2,0,0,929.798828,-5579.141113,184.931671,3.263766,300,0,0,1,0,0,0,0,0,0),
+(@GUID+12,24322,571,1,2,0,0,925.442383,-5571.049316,187.266571,3.839724,300,0,0,1,0,0,0,0,0,0),
+(@GUID+13,24322,571,1,2,0,0,922.322693,-5531.354492,189.792633,4.520403,300,0,0,1,0,0,0,0,0,0),
+(@GUID+14,24322,571,1,2,0,0,914.473938,-5533.336426,192.314362,4.677482,300,0,0,1,0,0,0,0,0,0),
+(@GUID+15,24322,571,1,2,0,0,898.829895,-5539.486816,193.249542,5.061455,300,0,0,1,0,0,0,0,0,0),
+(@GUID+16,24322,571,1,2,0,0,934.146912,-5528.458496,187.373657,4.328416,300,0,0,1,0,0,0,0,0,0),
+(@GUID+17,24322,571,1,2,0,0,951.450745,-5546.908691,185.516861,3.857178,300,0,0,1,0,0,0,0,0,0),
+(@GUID+18,24322,571,1,2,0,0,937.627197,-5573.079590,186.163086,3.455752,300,0,0,1,0,0,0,0,0,0),
+(@GUID+19,24322,571,1,2,0,0,951.077820,-5562.566895,184.759872,3.595378,300,0,0,1,0,0,0,0,0,0),
+(@GUID+20,24322,571,1,2,0,0,933.675659,-5544.941895,186.067123,4.188790,300,0,0,1,0,0,0,0,0,0),
+(@GUID+21,24322,571,1,2,0,0,937.109619,-5553.085938,185.877472,3.996804,300,0,0,1,0,0,0,0,0,0),
+(@GUID+22,24322,571,1,2,0,0,949.577271,-5571.852539,185.366730,3.385939,300,0,0,1,0,0,0,0,0,0),
+(@GUID+23,24322,571,1,2,0,0,936.470398,-5562.455566,186.809601,3.822271,300,0,0,1,0,0,0,0,0,0),
+(@GUID+24,24322,571,1,2,0,0,938.413879,-5547.399902,185.824203,4.066617,300,0,0,1,0,0,0,0,0,0),
+(@GUID+25,24322,571,1,2,0,0,955.932312,-5541.443848,185.481186,3.892084,300,0,0,1,0,0,0,0,0,0),
+(@GUID+26,24322,571,1,2,0,0,943.289490,-5552.288086,185.451431,3.909538,300,0,0,1,0,0,0,0,0,0),
+(@GUID+27,24322,571,1,2,0,0,945.767151,-5536.810547,187.226501,4.066617,300,0,0,1,0,0,0,0,0,0),
+(@GUID+28,24322,571,1,2,0,0,936.005432,-5533.506348,187.474640,4.258604,300,0,0,1,0,0,0,0,0,0),
+(@GUID+29,24322,571,1,2,0,0,940.907532,-5562.951660,186.208282,3.717551,300,0,0,1,0,0,0,0,0,0),
+(@GUID+30,24323,571,1,2,0,0,913.934875,-5540.195801,190.576599,4.694936,300,0,0,1,0,0,0,0,0,0),
+(@GUID+31,24323,571,1,2,0,0,911.285278,-5528.675293,193.913025,4.764749,300,0,0,1,0,0,0,0,0,0),
+(@GUID+32,24323,571,1,2,0,0,908.860596,-5550.749512,192.935822,4.869469,300,0,0,1,0,0,0,0,0,0),
+(@GUID+33,24323,571,1,2,0,0,926.252625,-5554.952637,188.244858,4.241150,300,0,0,1,0,0,0,0,0,0),
+(@GUID+34,24323,571,1,2,0,0,927.767273,-5549.813477,187.309235,4.276057,300,0,0,1,0,0,0,0,0,0),
+(@GUID+35,24323,571,1,2,0,0,924.092590,-5543.457520,187.883835,4.433136,300,0,0,1,0,0,0,0,0,0),
+(@GUID+36,24323,571,1,2,0,0,926.421143,-5563.162598,188.220581,4.084070,300,0,0,1,0,0,0,0,0,0),
+(@GUID+37,24323,571,1,2,0,0,931.465698,-5537.858887,187.133362,4.310963,300,0,0,1,0,0,0,0,0,0),
+(@GUID+38,24323,571,1,2,0,0,903.491638,-5545.229004,192.859741,4.991642,300,0,0,1,0,0,0,0,0,0),
+(@GUID+39,24323,571,1,2,0,0,914.416138,-5547.484375,190.819977,4.677482,300,0,0,1,0,0,0,0,0,0),
+(@GUID+40,24323,571,1,2,0,0,932.521729,-5568.607910,187.107620,3.717551,300,0,0,1,0,0,0,0,0,0),
+(@GUID+41,24323,571,1,2,0,0,932.666260,-5559.350098,187.348434,3.979351,300,0,0,1,0,0,0,0,0,0),
+(@GUID+42,24323,571,1,2,0,0,913.796448,-5555.000488,192.018814,4.694936,300,0,0,1,0,0,0,0,0,0),
+(@GUID+43,24323,571,1,2,0,0,932.566406,-5549.750977,186.291962,4.153883,300,0,0,1,0,0,0,0,0,0),
+(@GUID+44,24323,571,1,2,0,0,921.767151,-5549.706543,188.552811,4.450590,300,0,0,1,0,0,0,0,0,0),
+(@GUID+45,24323,571,1,2,0,0,910.815247,-5543.295410,191.321259,4.782202,300,0,0,1,0,0,0,0,0,0),
+(@GUID+46,24323,571,1,2,0,0,927.373047,-5532.523926,188.151520,4.415683,300,0,0,1,0,0,0,0,0,0),
+(@GUID+47,24323,571,1,2,0,0,945.812073,-5543.786621,186.478867,3.996804,300,0,0,1,0,0,0,0,0,0),
+(@GUID+48,24323,571,1,2,0,0,941.300110,-5580.629395,186.328186,3.159046,300,0,0,1,0,0,0,0,0,0),
+(@GUID+49,24323,571,1,2,0,0,944.829895,-5566.057617,185.812531,3.577925,300,0,0,1,0,0,0,0,0,0),
+(@GUID+50,24323,571,1,2,0,0,950.293091,-5554.961914,184.850952,3.752458,300,0,0,1,0,0,0,0,0,0),
+(@GUID+51,24323,571,1,2,0,0,940.116882,-5538.732910,187.230682,4.136430,300,0,0,1,0,0,0,0,0,0),
+(@GUID+52,24323,571,1,2,0,0,944.395813,-5558.648438,185.427444,3.752458,300,0,0,1,0,0,0,0,0,0);
+
+-- SAI for King Ymiron & Ancient Citizen of Nifflevar (24322,24323)
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768,`AIName`= 'SmartAI' WHERE `entry` IN (24321,24322,24323);
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (24321,24322,24323);
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2432100);
+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
+(24321,0,0,0,1,0,100,0,15000,15000,120000,120000,80,2432100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'King Ymiron - Run script every 2 min'),
+(24321,0,1,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'King Ymiron - Set React State civilian'),
+(2432100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,10,@GUID+34,24323,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 0'),
+(2432100,9,1,0,0,0,100,0,8000,8000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(2432100,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,10,@GUID+8,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 0'),
+(2432100,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 1'),
+(2432100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 2'),
+(2432100,9,5,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 3'),
+(2432100,9,6,0,0,0,100,0,5000,5000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 4'),
+(2432100,9,7,0,0,0,100,0,4000,4000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote say'),
+(2432100,9,8,0,0,0,100,0,4000,4000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 5'),
+(2432100,9,9,0,0,0,100,0,4000,4000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote say'),
+(2432100,9,10,0,0,0,100,0,4000,4000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 6'),
+(2432100,9,11,0,0,0,100,0,4000,4000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote question'),
+(2432100,9,12,0,0,0,100,0,4000,4000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 7'),
+(2432100,9,13,0,0,0,100,0,3000,3000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 8'),
+(2432100,9,14,0,0,0,100,0,2000,2000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 9'),
+(2432100,9,15,0,0,0,100,0,3000,3000,0,0,5,53,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote battleroar'),
+(2432100,9,16,0,0,0,100,0,9000,9000,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 10'),
+(2432100,9,17,0,0,0,100,0,3000,3000,0,0,5,53,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote battleroar'),
+(2432100,9,18,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,10,@GUID+26,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 1'),
+(2432100,9,19,0,0,0,100,0,0,0,0,0,11,43468,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Secrets of Nifflevar'),
+(2432100,9,20,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,10,@GUID+5,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 2'),
+(2432100,9,21,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,10,@GUID+41,24323,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 1'),
+(24322,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24322) - Set React State civilian'),
+(24322,0,1,0,1,0,100,0,1000,10000,8000,10000,10,4,53,113,397,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24322) - Play random emote'),
+(24323,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24323) - Set React State civilian'),
+(24323,0,1,0,1,0,100,0,1000,10000,8000,10000,10,4,53,113,397,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24323) - Play random emote');
+
+-- Spell Condition for 43468
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (43468);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,43468,0,18,1,0,0,0, '', 'Spell 43468 target player');
+
+-- NPC talk text insert from sniff for King Ymiron & Ancient Citizens of Nifflevar
+DELETE FROM `creature_text` WHERE `entry` IN (24321,24322,24323);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24321,0,0,'%s motions for silence.',2,0,100,397,0,0, 'King Ymiron emote'),
+(24321,1,0,'Vrykul, your king implores you to listen!',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,2,0,'The crowd gasps in horror.',2,0,100,53,0,0, 'King Ymiron emote'),
+(24321,3,0,'Even now, in our darkest hour, they mock us!',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,4,0,'Where are the titans in our time of greatest need? Our women birth abberations - disfigured runts unable to even stand on their own! Weak and ugly... Useless...',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,5,0,'Ymiron has toiled. Long have I sat upon my throne and thought hard of our plight. There is only one answer... one reason...',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,6,0,'For who but the titans themselves could bestow such a curse? What could have such power?',1,0,100,1,0,0, 'King Ymiron yell'),
+(24321,7,0,'And the answer is nothing... For it is the titans that have cursed us!',1,0,100,53,0,0, 'King Ymiron yell'),
+(24321,8,0,'The crowd cheers.',2,0,100,0,0,0, 'King Ymiron'),
+(24321,9,0,'On this day all Vrykul will shed their old beliefs! We denounce our old gods! All Vrykul will pledge their allegiance to Ymiron! Ymiron will protect our noble race!',1,0,100,53,0,0, 'King Ymiron yell'),
+(24321,10,0,'And now my first decree upon the Vrykul! All malformed infants born of Vrykul mother and father are to be destroyed upon birth! Our blood must remain pure always! Those found in violation of Ymiron''s decree will be taken to Gjalerbron for execution!',1,0,100,1,0,0, 'King Ymiron yell'),
+(24322,0,0,'Silence!',1,0,100,1,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24322,1,0,'Show them mercy, my king! They are of our flesh and blood!',1,0,100,53,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24322,2,0,'All hail our glorious king, Ymiron!',1,0,100,53,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24323,0,0,'Show the abberations no mercy, Ymiron!',1,0,100,1,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24323,1,0,'They weaken us! Our strength is dilluted by their very existence! Destroy them all!',1,0,100,113,0,0, 'Ancient Citizen of Nifflevar yell');
diff --git a/sql/old/3.3.5a/2011_02_26_3_world_creatures.sql b/sql/old/3.3.5a/2011_02_26_3_world_creatures.sql
new file mode 100644
index 00000000000..b8dc70fea7d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_3_world_creatures.sql
@@ -0,0 +1,2 @@
+UPDATE `creature` SET `spawndist`=0 WHERE `guid`=137582;
+DELETE FROM `creature_addon` WHERE `guid` IN (136768,136769);
diff --git a/sql/old/3.3.5a/2011_02_26_4_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_26_4_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..fe15af01a64
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_4_world_spell_linked_spell.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_effect`=55475;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(55428,55475,0, 'Lifeblood (Rank 1)'),
+(55480,55475,0, 'Lifeblood (Rank 2)'),
+(55500,55475,0, 'Lifeblood (Rank 3)'),
+(55501,55475,0, 'Lifeblood (Rank 4)'),
+(55502,55475,0, 'Lifeblood (Rank 5)'),
+(55503,55475,0, 'Lifeblood (Rank 6)');
diff --git a/sql/old/3.3.5a/2011_02_26_5_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_26_5_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..f19aca71b24
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_5_world_npc_spellclick_spells.sql
@@ -0,0 +1,68 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (SELECT `npc_entry` FROM `npc_spellclick_spells`); 
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (32640,32633,31861,31862,25743,27661,27258,27755,27756,27692,40725,32286,29929,29602,29709,27626,28851,
+34120,30403,26813,26523,27496,27714,27996,28605,28606,28607,28833,30066,32930,28312,32627,33060,33067,33062,33109,34994,30234,27629,27924,28061,28192,28669,
+28670,28817,28864,2914,29460,29679,29918,30468,30470,35064,30585,30645,33217,33319,33321,33519,33844,33845,39714);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(32640,61424,0,0,0,1,0,0,0),  -- Traveler's Tundra Mammoth
+(32633,61424,0,0,0,1,0,0,0),  -- Traveler's Tundra Mammoth
+(31861,61466,0,0,0,1,0,0,0),  -- Grand Black War Mammoth
+(31862,61466,0,0,0,1,0,0,0),  -- Grand Black War Mammoth
+(25743,46260,0,0,0,1,0,0,0),  -- Wooly Mammoth Bull
+(27661,48365,0,0,0,1,0,0,0),  -- Wintergarde Gryphon
+(27258,48365,0,0,0,1,0,0,0),  -- Wintergarde Gryphoworldn
+(27755,49460,0,0,0,1,0,0,0),  -- Amber Drake
+(27756,49464,0,0,0,1,0,0,0),  -- Ruby Drake
+(27692,49346,0,0,0,1,0,0,0),  -- Emerald Drake
+(40725,75953,0,0,0,1,0,0,0),  -- X-53 Touring Rocket
+(32286,61666,0,0,0,1,0,0,0),  -- Mekgineer's Chopper
+(29929,58961,0,0,0,1,0,0,0),  -- Mechano-hog
+(29602,54908,0,0,0,1,0,0,0),  -- Icefang
+(29709,55029,0,0,0,1,0,0,0),  -- Freed Proto-Drake
+(27626,49138,0,0,0,1,0,0,0),  -- Tatjana's Horse
+(28851,52600,0,0,0,1,0,0,0),  -- Enraged Mammoth
+(34120,55089,0,0,0,1,0,0,0),  -- Brann's Flying Machine
+(30403,56699,0,0,0,1,0,0,0),  -- Nergeld
+(26813,47424,0,0,0,1,0,0,0),  -- Kor'kron War Rider
+(26523,48296,0,0,0,1,0,0,0),  -- Forsaken Blight Spreader
+(27496,48881,0,0,0,1,0,0,0),  -- Refurbished Shredder
+(27714,49584,0,0,0,1,0,0,0),  -- 7th Legion Chain Gun
+(27996,50343,0,0,0,1,0,0,0),  -- Wyrmrest Vanquisher
+(28605,52263,0,0,0,1,0,0,0),  -- Havenshire Stallion
+(28606,52263,0,0,0,1,0,0,0),  -- Havenshire Mare
+(28607,52263,0,0,0,1,0,0,0),  -- Havenshire Colt
+(28833,52447,0,0,0,1,0,0,0),  -- Scarlet Cannon
+(30066,56678,0,0,0,1,0,0,0),  -- Argent Skytalon
+(28312,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(32627,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(33060,65031,0,0,0,1,0,0,0),  -- Salvaged Siege Engine
+(33067,65031,0,0,0,1,0,0,0),  -- Salvaged Siege Turret
+(33062,65030,0,0,0,1,0,0,0),  -- Salvaged Chopper
+(33109,62309,0,0,0,1,0,0,0),  -- Salvaged Demolisher
+(34944,68458,0,0,0,1,0,0,0),  -- Keep Cannon
+-- These use a 'proxy' cast. They summon a similar creature with SummonProperties.category = 4
+(30234,56378,0,0,0,1,0,0,0),  -- Hover Disk
+(27629,49207,0,0,0,1,0,0,0),  -- Wyrmrest Defender
+(27924,50007,0,0,0,1,0,0,0),  -- Dragonflayer Harpoon
+(28061,50557,0,0,0,1,0,0,0),  -- Wintergarde Gryphon
+(28192,50860,0,0,0,1,0,0,0),  -- Archmage Pentarus' Flying Machine
+(28669,52190,0,0,0,1,0,0,0),  -- Flying Fiend
+(28670,53173,0,0,0,1,0,0,0),  -- Frostblood Vanquisher
+(28817,52462,0,0,0,1,0,0,0),  -- Mine Car
+(28864,52589,0,0,0,1,0,0,0),  -- Scourge Gryphon
+(29414,18277,0,0,0,1,0,0,0),  -- Bone Gryphon
+(29460,54513,0,0,0,1,0,0,0),  -- Frigit Proto-Drake
+(29679,54952,0,0,0,1,0,0,0),  -- Hyldsmeet Proto-Drake
+(29918,54301,0,0,0,1,0,0,0),  -- Warbear Matriarch
+(30468,56795,0,0,0,1,0,0,0),  -- Harnessed Icemaw Matriarch
+(30470,56839,0,0,0,1,0,0,0),  -- Skybreaker Cloudbuster
+(30564,57401,0,0,0,1,0,0,0),  -- Njorndar Proto-Drake
+(30585,57418,0,0,0,1,0,0,0),  -- Hammerhead
+(30645,57612,0,0,0,1,0,0,0),  -- Water Terror
+(33217,62774,0,0,0,1,0,0,0),  -- Stormwind Steed
+(33319,62782,0,0,0,1,0,0,0),  -- Darnassian Nightsaber
+(33321,62784,0,0,0,1,0,0,0),  -- Darkspear Raptor
+(33519,63163,0,0,0,1,0,0,0),  -- Black Knight's Gryphon
+(33844,63791,0,0,0,1,0,0,0),  -- Sunreaver Hawkstrider
+(33845,63792,0,0,0,1,0,0,0),  -- Quel'dorei Steed
+(39714,74205,0,0,0,1,0,0,0);  -- Shooting Mechano-Tank
diff --git a/sql/old/3.3.5a/2011_02_27_0_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_0_world_creature_template.sql
new file mode 100644
index 00000000000..76871b9d534
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_0_world_creature_template.sql
@@ -0,0 +1,29 @@
+-- Some vehicle updates
+UPDATE `creature_template` SET `vehicleid`=25 WHERE `entry`=29144; -- Refurbished Steam Tank
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|264,`vehicleid`=51 WHERE `entry`=27409; -- Ducal's Horse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=`unit_flags`|33600,`vehicleid`=212 WHERE `entry`=30021; -- Enormos
+UPDATE `creature_template` SET `npcflag`=`npcflag`|55957,`unit_flags`=`unit_flags`|8,`speed_walk`=2.8,`vehicleid`=217 WHERE `entry`=30124; -- Snorri
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1,`vehicleid`=354 WHERE `entry`=33357; -- "Spectral Tiger"
+UPDATE `creature_template` SET `vehicleid`=291 WHERE `entry`=32227; -- Skybreaker Suppression Turret
+UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33570816,`speed_walk`=1.6,`speed_run`=2.4285714285714,`vehicleid`=471 WHERE `entry`=35336; -- Horde Boat
+UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33570816,`speed_walk`=1.6,`speed_run`=2.4285714285714,`vehicleid`=472 WHERE `entry`=35335; -- Alliance Boat
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (29144,27409,30021,30124,32227,33357,35336,35335);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(29144,0,0,1,0, NULL), -- Refurbished Steam Tank
+(27409,0,0,1,0, NULL), -- Ducal's Horse
+(30021,0,0,1,0, NULL), -- Enormos
+(30124,0,0,257,0, NULL), -- Snorri
+(32227,0,0,1,0, NULL), -- Skybreaker Suppression Turret
+(33357,0,0,1,0, NULL), -- "Spectral Tiger"
+(35336,0,50331648,257,0, NULL), -- Horde Boat
+(35335,0,50331648,257,0, NULL); -- Alliance Boat
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.248,`combat_reach`=4.8,`gender`=0 WHERE `modelid`=26772; -- Snorri
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=0,`gender`=2 WHERE `modelid`=28811; -- "Spectral Tiger"
+UPDATE `creature_model_info` SET `bounding_radius`=4,`combat_reach`=0,`gender`=2 WHERE `modelid`=29771; -- Horde Boat
+UPDATE `creature_model_info` SET `bounding_radius`=5,`combat_reach`=0,`gender`=2 WHERE `modelid`=29766; -- Alliance Boat
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=33357 AND `spell_id`=75648;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(33357,75648,0,0,0,1,0,0,0); -- "Spectral Tiger"
diff --git a/sql/old/3.3.5a/2011_02_27_1_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_1_world_creature_template.sql
new file mode 100644
index 00000000000..6813dd8d014
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_1_world_creature_template.sql
@@ -0,0 +1,66 @@
+-- Template updates 
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|32 WHERE `entry`=33063; -- Wrecked Siege Engine
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|32 WHERE `entry`=33059; -- Wrecked Demolisher
+UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33662; -- Kirin Tor Battle-Mage
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=33377; -- Mortar Targetting Device
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33686; -- Lore Keeper of Norgannon
+UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33626; -- Hired Engineer
+UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33627; -- Hired Demolitionist
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33624; -- Archmage Pentarus
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=33571; -- Ulduar Gauntlet Generator
+
+-- Model data 
+UPDATE `creature_model_info` SET `bounding_radius`=3,`combat_reach`=2.25,`gender`=2 WHERE `modelid`=27658; -- Wrecked Demolisher
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
+UPDATE `creature_model_info` SET `bounding_radius`=1.4288,`combat_reach`=2.4,`gender`=0 WHERE `modelid`=28781; -- Demolisher Engineer Blastwrench
+UPDATE `creature_model_info` SET `bounding_radius`=0.2625,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=6589; -- Lore Keeper of Norgannon
+UPDATE `creature_model_info` SET `bounding_radius`=0.434,`combat_reach`=1.4,`gender`=0 WHERE `modelid`=28739; -- Goran Steelbreaker
+UPDATE `creature_model_info` SET `bounding_radius`=0.434,`combat_reach`=1.4,`gender`=0 WHERE `modelid`=28739; -- Goran Steelbreaker
+UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1.2,`gender`=0 WHERE `modelid`=26662; -- Earthen Stoneshaper
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=1,`gender`=0 WHERE `modelid`=28581; -- Steelforged Defender
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=1,`gender`=0 WHERE `modelid`=28580; -- Steelforged Defender
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=5233; -- Spirit Healer
+ 
+-- Addon data 
+DELETE FROM `creature_template_addon` WHERE `entry` IN 
+(33059,33063,33662,33672,33167,33626,33060,33377,33062,33067,33579,33669,33214,33109,33666,33701,33686,33696,33622,33627,33779,33620
+,32780,33624,33218,33629,33721,34234,33236,33571);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33059,0,0,257,0, '29266 0 29266 1'), -- Wrecked Demolisher; Auras: Permanent Feign Death
+(33063,0,0,257,0, '29266 0 29266 1'), -- Wrecked Siege Engine; Aura: Permanent Feign Death
+(33060,0,0,257,0, NULL), -- Salvaged Siege Engine
+(33662,0,0,1,0, NULL), -- Kirin Tor Battle-Mage
+(33672,0,0,1,0, NULL), -- Kirin Tor Mage
+(33167,0,0,257,0, NULL), -- Salvaged Demolisher Mechanic Seat
+(33626,0,0,1,0, NULL), -- Hired Engineer
+(33627,0,0,1,0, NULL), -- Hired Demolitionist
+(33377,0,0,1,0, NULL), -- Mortar Targetting Device
+(33062,0,0,257,0, NULL), -- Salvaged Chopper
+(33067,0,0,257,0, NULL), -- Salvaged Siege Turret
+(33579,0,0,1,0, NULL), -- Brann Bronzebeard
+(33669,0,0,257,0, NULL), -- Demolisher Engineer Blastwrench
+(33214,0,50331648,1,0, NULL), -- Mechanolift 304-A
+(33109,0,0,257,0, NULL), -- Salvaged Demolisher
+(33666,0,0,257,0, NULL), -- Demolisher Engineer Blastwrench
+(33701,0,0,1,0, NULL), -- High Explorer Dellorah
+(33686,0,0,1,0, NULL), -- Lore Keeper of Norgannon
+(33696,0,0,1,0, NULL), -- Archmage Rhydian
+(33622,0,0,1,0, NULL), -- Goran Steelbreaker
+(33779,0,0,1,0, NULL), -- Ulduar Shield Bunny
+(33620,0,0,1,0, NULL), -- Earthen Stoneshaper
+(32780,0,0,1,0, NULL), -- Invisible Stalker (All Phases)
+(33624,0,0,1,0, NULL), -- Archmage Pentarus
+(33218,0,0,1,0, NULL), -- Pyrite Safety Container
+(33629,14374,0,257,0, NULL), -- Weslex Quickwrench
+(33721,0,50331648,1,0, NULL), -- Lore Keeper Projection Unit
+(34234,0,0,1,0, NULL), -- Runeforged Sentry
+(33236,0,0,1,27, NULL), -- Steelforged Defender
+(33571,0,0,1,0, NULL); -- Ulduar Gauntlet Generator
+
+-- Addon data for creature 6491 (Spirit Healer)
+UPDATE `creature_template_addon` SET `bytes1`=65536,`bytes2`=1,`mount`=0,`emote`=0,`auras`='10848  0' WHERE `entry`=6491; -- Spirit Healer
+
+DELETE FROM `creature_addon` WHERE `guid` IN (136245,136246,136247,136248,136249); -- Wrecked Siege Engine
+DELETE FROM `creature_addon` WHERE `guid` IN (136073,136074,136087,136088,136089,136090); -- Wrecked Siege Engine
diff --git a/sql/old/3.3.5a/2011_02_27_2_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_27_2_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..dd08b5c1821
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_2_world_npc_spellclick_spells.sql
@@ -0,0 +1,11 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN(28781,27894,32627,32629,28366,28312,28319,28094,27881);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(28781,60683,0,0,0,1,0,0,0),  -- Battleground Demolisher
+(27894,60682,0,0,0,1,0,0,0),  -- Antipersonnel Cannon
+(32627,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(32629,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Turret
+(28366,60962,0,0,0,1,0,0,0),  -- Wintergrasp Tower Cannon
+(28312,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(28319,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Turret
+(28094,60968,0,0,0,1,0,0,0),  -- Wintergrasp Demolisher
+(27881,60968,0,0,0,1,0,0,0);  -- Wintergrasp Catapult
diff --git a/sql/old/3.3.5a/2011_02_27_3_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_27_3_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..e4f2c51ea01
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_3_world_npc_spellclick_spells.sql
@@ -0,0 +1,3 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=28366 AND `spell_id`=60962;  -- Wintergrasp Tower Cannon, duplicate from previous rev
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(28366,60962,0,0,0,1,0,0,0);  -- Wintergrasp Tower Cannon'
diff --git a/sql/old/3.3.5a/2011_02_27_4_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_4_world_creature_template.sql
new file mode 100644
index 00000000000..61f568a156e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_4_world_creature_template.sql
@@ -0,0 +1,75 @@
+SET @EQUIP := 2427;
+
+UPDATE `creature_template` SET `baseattacktime`=2000,`speed_run`=1.7142857142857 WHERE `entry`=36808; -- Deathspeaker Zealot
+UPDATE `creature_template` SET `baseattacktime`=2000,`speed_run`=1.1428571428571 WHERE `entry`=37012; -- Ancient Skeletal Soldier
+UPDATE `creature_template` SET `baseattacktime`=1000,`unit_flags`=`unit_flags`|33587520,`speed_walk`=2,`speed_run`=1.4285714285714 WHERE `entry`=37007; -- Deathbound Ward
+UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`baseattacktime`=2000,`unit_class`=2,`speed_walk`=2,`speed_run`=1.5873 WHERE `entry`=37528; -- Spire Frostwyrm (Ambient)
+UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`baseattacktime`=2000,`speed_run`=0.99206285714286 WHERE `entry`=37947; -- Deathwhisper Spawn Stalker
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=@EQUIP,`speed_run`=1.1428571428571 WHERE `entry`=37149; -- Kor'kron Necrolyte
+UPDATE `creature_template` SET `faction_A`=83,`faction_H`=83,`baseattacktime`=2000,`unit_flags`=`unit_flags`|32832,`equipment_id`=@EQUIP+1,`speed_run`=1.1428571428571 WHERE `entry`=37034; -- Kor'kron Templar
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10065,`speed_run`=1.1428571428571 WHERE `entry`=37031; -- Kor'kron Oracle
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10064,`speed_run`=1.1428571428571 WHERE `entry`=37033; -- Kor'kron Invoker
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10057,`speed_run`=1.1428571428571 WHERE `entry`=37030; -- Kor'kron Primalist
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10058,`speed_run`=1.1428571428571 WHERE `entry`=37016; -- Skybreaker Luminary
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10069,`speed_run`=1.1428571428571 WHERE `entry`=37148; -- Skybreaker Summoner
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10057,`speed_run`=1.1428571428571 WHERE `entry`=37027; -- Skybreaker Hierophant
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10060,`speed_run`=1.1428571428571 WHERE `entry`=37026; -- Skybreaker Sorcerer
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10062,`speed_run`=1.1428571428571 WHERE `entry`=37003; -- Skybreaker Vindicator
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10068,`speed_run`=1.1428571428571 WHERE `entry`=37035; -- Kor'kron Vanquisher
+UPDATE `creature_template` SET `baseattacktime`=1000,`equipment_id`=@EQUIP+2,`speed_run`=1.1428571428571 WHERE `entry`=37146; -- Kor'kron Sniper
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10063,`speed_run`=1.1428571428571 WHERE `entry`=37032; -- Kor'kron Defender
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10067,`unit_class`=4,`speed_run`=1.1428571428571 WHERE `entry`=37028; -- Kor'kron Stalker
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=@EQUIP+3,`speed_run`=1.1428571428571 WHERE `entry`=37029; -- Kor'kron Reaver
+UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|559168,`speed_walk`=0.8,`speed_run`=0.99205714285714 WHERE `entry`=37545; -- Spire Minion
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (37012,36808,37528,37007,37947,37030,37146,37032,37029,37027,37149,37031,37034,37016,37148,37026,37028,37003,37033,37035,37545);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(37012,0,0,1,333, NULL), -- Ancient Skeletal Soldier
+(36808,0,8,1,0, NULL), -- Deathspeaker Zealot
+(37528,0,50331648,1,0, NULL), -- Spire Frostwyrm (Ambient)
+(37007,0,0,0,417, NULL), -- Deathbound Ward
+(37947,0,0,1,0, NULL), -- Deathwhisper Spawn Stalker
+(37030,0,0,1,0, NULL), -- Kor'kron Primalist
+(37146,0,0,1,0, NULL), -- Kor'kron Sniper
+(37032,0,0,1,0, NULL), -- Kor'kron Defender
+(37029,0,0,1,0, NULL), -- Kor'kron Reaver
+(37027,0,0,1,0, NULL), -- Skybreaker Hierophant
+(37149,0,0,1,0, NULL), -- Kor'kron Necrolyte
+(37031,0,0,1,0, NULL), -- Kor'kron Oracle
+(37034,0,0,1,0, NULL), -- Kor'kron Templar
+(37016,0,0,1,0, NULL), -- Skybreaker Luminary
+(37148,0,0,1,0, NULL), -- Skybreaker Summoner
+(37026,0,0,1,0, NULL), -- Skybreaker Sorcerer
+(37028,0,0,1,0, NULL), -- Kor'kron Stalker
+(37003,0,0,1,0, NULL), -- Skybreaker Vindicator
+(37033,0,0,1,0, NULL), -- Kor'kron Invoker
+(37035,0,0,1,0, NULL), -- Kor'kron Vanquisher
+(37545,0,0,1,0, NULL); -- Spire Minion
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.45,`combat_reach`=0.45,`gender`=0 WHERE `modelid`=31124; -- Bone Spike
+UPDATE `creature_model_info` SET `bounding_radius`=0.347222,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30616; -- Ancient Skeletal Soldier
+UPDATE `creature_model_info` SET `bounding_radius`=1.388888,`combat_reach`=6,`gender`=0 WHERE `modelid`=30459; -- Deathbound Ward
+UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30463; -- Skybreaker Luminary
+UPDATE `creature_model_info` SET `bounding_radius`=1.46205,`combat_reach`=6.075,`gender`=0 WHERE `modelid`=30481; -- Kor'kron Primalist
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30531; -- Kor'kron Sniper
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30482; -- Kor'kron Reaver
+UPDATE `creature_model_info` SET `bounding_radius`=0.558,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30475; -- Kor'kron Defender
+UPDATE `creature_model_info` SET `bounding_radius`=0.354,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30486; -- Kor'kron Stalker
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30453; -- Skybreaker Vindicator
+UPDATE `creature_model_info` SET `bounding_radius`=0.5835,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30472; -- Skybreaker Hierophant
+UPDATE `creature_model_info` SET `bounding_radius`=0.52785,`combat_reach`=2.5875,`gender`=1 WHERE `modelid`=30470; -- Skybreaker Sorcerer
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30476; -- Kor'kron Invoker
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30534; -- Kor'kron Necrolyte
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30478; -- Kor'kron Oracle
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30487; -- Kor'kron Templar
+UPDATE `creature_model_info` SET `bounding_radius`=0.312,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30536; -- Skybreaker Summoner
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30489; -- Kor'kron Vanquisher
+UPDATE `creature_model_info` SET `bounding_radius`=0.62,`combat_reach`=2,`gender`=2 WHERE `modelid`=30656; -- Spire Minion
+
+
+DELETE FROM `creature_equip_template` WHERE `entry` IN (@EQUIP,@EQUIP+1,@EQUIP+2,@EQUIP+3);
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EQUIP,49764,0,0),
+(@EQUIP+1,49736,0,0),
+(@EQUIP+2,0,0,49762),
+(@EQUIP+3,49733,0,0);
diff --git a/sql/old/3.3.5a/2011_02_28_0_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_28_0_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..753ebf6cd5d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_0_world_npc_spellclick_spells.sql
@@ -0,0 +1,13 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (29625,29433,29555,25460,33778,28614,33687,30330,32189,30895,30337);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(29625,46598,0,0,0,1,0,0,0), -- Hyldsmeet Proto-Drake
+(29433,47020,0,0,0,1,0,0,0), -- Goblin Sapper
+(29555,47020,0,0,0,1,0,0,0), -- Goblin Sapper
+(25460,46598,0,0,0,1,0,0,0), -- Amazing Flying Carpet
+(33778,43671,0,0,0,1,0,0,0), -- Tournament Hippogryph
+(28614,46598,0,0,0,1,0,0,0), -- Scarlet Gryphon
+(33687,46598,0,0,0,1,0,0,0), -- Chillmaw
+(30330,46598,0,0,0,1,0,0,0), -- Jotunheim Proto-Drake
+(32189,46598,0,0,0,1,0,0,0), -- Skybreaker Recon Fighter
+(30895,46598,0,0,0,1,0,0,0), -- Lithe Stalker
+(30337,43671,13069,1,13069,1,0,0,0); -- Jotunheim Rapid-Fire Harpoon
diff --git a/sql/old/3.3.5a/2011_02_28_1_world_quest_start_scripts.sql b/sql/old/3.3.5a/2011_02_28_1_world_quest_start_scripts.sql
new file mode 100644
index 00000000000..760312edd6f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_1_world_quest_start_scripts.sql
@@ -0,0 +1,2 @@
+-- Fix spawn position for Zuluhed The Whacked
+UPDATE `quest_start_scripts` SET `x`=-4204.937,`y`=316.3974,`z`=122.5078,`o`=1.308997 WHERE id=10866;
diff --git a/sql/old/3.3.5a/2011_02_28_2_world_sai.sql b/sql/old/3.3.5a/2011_02_28_2_world_sai.sql
new file mode 100644
index 00000000000..7da507367d0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_2_world_sai.sql
@@ -0,0 +1,31 @@
+-- Quest 11314 "The Fallen Sisters"
+-- Chill Nymph SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=23678;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23678,2367800);
+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
+(23678,0,0,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Do text emote on health 30%'),
+(23678,0,1,0,0,0,75,0,2000,3000,2000,2000,11,9739,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Wrath on victim'),
+(23678,0,2,3,8,0,100,0,43340,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'On Spell hit 43340 face player'),
+(23678,0,3,4,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'stop combat movement'),
+(23678,0,4,5,61,0,100,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'evade'),
+(23678,0,5,6,61,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'set faction 35'),
+(23678,0,6,7,61,0,100,0,0,0,0,0,33,24117,0,0,0,0,0,7,0,0,0,0,0,0,0,'quest credit'),
+(23678,0,7,0,61,0,100,0,0,0,0,0,80,2367800,0,0,0,0,0,1,0,0,0,0,0,0,0,'load script'),
+(23678,0,8,0,40,0,100,0,1,23678,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 1 despawn'),
+(2367800,9,0,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 1'),
+(2367800,9,1,0,0,0,100,0,1000,1000,0,0,53,1,23678,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry`=23678;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23678,0,0, 'Chill Nymph appears weak!',2,0,100,0,0,0, 'Chill Nymph'),
+(23678,1,0, 'I knew Lurielle would send help! Thank you friend, and give Lurielle my thanks as well!',0,7,100,1,0,0, 'Chill Nymph'),
+(23678,1,1, 'Where am I? What happened to me? You... you freed me?',0,7,100,1,0,0, 'Chill Nymph'),
+(23678,1,2, 'Thank you. I thought I would die without seeing my sisters again!',0,7,100,1,0,0, 'Chill Nymph');
+-- Chill Nymph Path
+DELETE FROM `waypoints` WHERE `entry`=23678;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(23678,1,2063,-4666,217,'Chill Nymph point 1');
+-- Add condition for Item 33606 "Lurielle''s Pendant" to only target Chill Nymph 23678
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=33606;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(18,0,33606,0,24,1,23678,0,63,'','Item 33606 Lurielle''s Pendant targets Chill Nymph 23678');
diff --git a/sql/old/3.3.5a/2011_02_28_3_world_sai.sql b/sql/old/3.3.5a/2011_02_28_3_world_sai.sql
new file mode 100644
index 00000000000..5ecf98abfda
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_3_world_sai.sql
@@ -0,0 +1,65 @@
+-- SAI for Thoralius the Wise
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=23975;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=23975;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2397500,2397501,2397502,2397503);
+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
+-- AI Section
+(23975,0,0,1,1,0,100,0,60000,120000,300000,300000,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - every 5 min Stand'),
+(23975,0,1,0,61,0,100,0,0,0,0,0,53,0,23975,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Start WP'),
+(23975,0,2,0,40,0,100,0,2,23975,0,0,80,2397500,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 1 at WP 2'),
+(23975,0,3,0,40,0,100,0,4,23975,0,0,80,2397501,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 2 at WP 4'),
+(23975,0,4,0,40,0,100,0,7,23975,0,0,80,2397502,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 3 at WP 7'),
+(23975,0,5,0,40,0,100,0,8,23975,0,0,80,2397503,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 4 at WP 8'),
+-- Script 1
+(2397500,9,0,0,0,0,100,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 2'),
+(2397500,9,1,0,0,0,100,0,0,0,0,0,11,42837,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Cast 42837'),
+(2397500,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,24046,0,0,0,0,0,0, 'Thoralius the Wise - Turn to face spirit Totem (Fire)'),
+(2397500,9,3,0,0,0,100,0,500,500,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - say text 0'),
+-- Script 2
+(2397501,9,0,0,0,0,100,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 4'),
+(2397501,9,1,0,0,0,100,0,0,0,0,0,11,42838,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Cast 42838'),
+(2397501,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,24045,0,0,0,0,0,0, 'Thoralius the Wise - Turn to face spirit Totem (Water)'),
+(2397501,9,3,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Say text 1'),
+-- Script 3
+(2397502,9,0,0,0,0,100,0,0,0,0,0,54,53000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 7'),
+(2397502,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Do text 2'),
+(2397502,9,2,0,0,0,100,0,1000,1000,0,0,17,64,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - do emote state STATE_STUN'),
+(2397502,9,3,0,0,0,100,0,45000,45000,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - do emote state STATE_STAND'),
+(2397502,9,4,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Do text 3'),
+-- Script 4
+(2397503,9,0,0,0,0,100,0,8,23975,0,0,55,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Stop at WP 8'),
+(2397503,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Reset heading at WP 8'),
+(2397503,9,2,0,0,0,100,0,500,500,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - sit at WP 8');
+
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry`=23975;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23975,0,0, 'Fire grant me vision...',0,7,100,20,0,0, 'Thoralius the Wise'),
+(23975,1,0, 'Water grant me serenity...',0,7,100,20,0,0, 'Thoralius the Wise'),
+(23975,2,0, '%s inhales the wispy smoke tendrils emanating from the burner.',2,7,100,0,0,0, 'Thoralius the Wise'),
+(23975,3,0, 'Thank you, spirits.',0,7,100,2,0,0, 'Thoralius the Wise');
+
+-- Waypoints for Thoralius the Wise from sniff
+DELETE FROM `waypoints` WHERE `entry`=23975;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(23975,1,637.177,-5011.109,4.653919,'Thoralius the Wise WP 1'),
+(23975,2,634.8372,-5010.296,4.528919,'Thoralius the Wise WP 2'),
+(23975,3,637.9232,-5015.031,4.528919,'Thoralius the Wise WP 3'),
+(23975,4,636.0419,-5016.675,4.153919,'Thoralius the Wise WP 4'),
+(23975,5,638.2552,-5013.186,4.653919,'Thoralius the Wise WP 5'),
+(23975,6,637.7585,-5013.268,4.653919,'Thoralius the Wise WP 6'),
+(23975,7,636.8245,-5013.386,4.528919,'Thoralius the Wise WP 7'),
+(23975,8,638.2552,-5013.186,4.653919,'Thoralius the Wise WP 8');
+
+-- Add spell target positions
+DELETE FROM `spell_target_position` WHERE `id` IN (42837,42838);
+INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
+(42837,571,634.094,-5010.67,4.419494,2.807002),
+(42838,571,635.081,-5016.87,4.138474,3.859472);
+
+-- Ascented Mage Hunter SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25724;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25724);
+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
+(25724,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ascented Mage Hunter - On reset - Set react state passive'),
+(25724,0,1,0,1,0,100,1,1000,1000,1000,1000,11,45940,0,0,0,0,0,9,25594,0,10,0,0,0,0,'Ascented Mage Hunter - On reset - Cast Evanor''s Prison Chains');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_28_4_world_sai.sql b/sql/old/3.3.5a/2011_02_28_4_world_sai.sql
new file mode 100644
index 00000000000..fda69483394
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_4_world_sai.sql
@@ -0,0 +1,55 @@
+-- c27842 Fenrick Barlowe
+-- ================================
+SET @ENTRY := 27842;
+SET @SCRIPT1 := 2784201;
+SET @SCRIPT2 := 2784202;
+-- ================================
+-- take random movement off of npc (smartAI will control pathing)
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid`=114186;
+-- * create text into the DB
+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, 'Bat gizzards again for the gnomes tonight...',0,0,100,1,0,0, 'Fenrick Barlowe text'),
+(@ENTRY,0,1, 'What do they expect, making the bats come in at that angle? Broken necks and gamey bat stew, that''s what they get.',0,0,100,1,0,0, 'Fenrick Barlowe text'),
+(@ENTRY,0,2, '''We like trees, Fenrick. They provide cover.'' They won''t let me chop them down, either.',0,0,100,1,0,0, 'Fenrick Barlowe text'),
+(@ENTRY,0,3, 'I wonder how many reinforcements need to suffer injury before they allows us to chop down these idiotic trees. They''re costing us a fortune in bats. Maybe I''ll rig a harness or two...',0,0,100,1,0,0, 'Fenrick Barlowe text');
+-- create path
+-- point 8 reposition to face bat, do text - kneel for 10 seconds
+-- point 5 do text - kneel for 10 seconds
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,3246.2,-642.609,165.239, 'Fenrick Barlowe path'),
+(@ENTRY,2,3240.42,-645.154,165.399, 'Fenrick Barlowe path'),
+(@ENTRY,3,3245.75,-664.935,166.789, 'Fenrick Barlowe path'),
+(@ENTRY,4,3250.1,-663.819,166.789, 'Fenrick Barlowe path'),
+(@ENTRY,5,3254.69,-661.435,167.188, 'Fenrick Barlowe path - kneel here - do text'),
+(@ENTRY,6,3252.36,-659.146,167.118, 'Fenrick Barlowe path'),
+(@ENTRY,7,3252.63,-648.746,165.904, 'Fenrick Barlowe path'),
+(@ENTRY,8,3249.21,-647.163,165.7, 'Fenrick Barlowe path - kneel here - do text');
+-- set SAI to npc
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+-- create scripts for random text, emotes, and pathing
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@SCRIPT1,@SCRIPT2);
+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 
+-- AI
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'on spawn start path'),
+(@ENTRY,0,1,0,40,0,100,0,5,@ENTRY,0,0,80,@SCRIPT1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'at wp 5 run script1'),
+(@ENTRY,0,2,0,40,0,100,0,8,@ENTRY,0,0,80,@SCRIPT2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'at wp 8 run script2'),
+-- script 1
+(@SCRIPT1,9,0,0,0,0,100,0,0,0,0,0,54,13000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'pause pathing'),
+(@SCRIPT1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'say random text'),
+(@SCRIPT1,9,2,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=8 kneel'),
+(@SCRIPT1,9,3,0,0,0,100,0,11000,11000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=0 stand up'),
+-- script 2
+(@SCRIPT2,9,0,0,0,0,100,0,0,0,0,0,54,14000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'pause pathing'),
+(@SCRIPT2,9,1,0,40,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'say random text'),
+(@SCRIPT2,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,10,108509,27787,0,0,0,0,0, 'face bat'),
+(@SCRIPT2,9,3,0,0,0,100,0,1000,1000,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=8 kneel'),
+(@SCRIPT2,9,4,0,0,0,100,0,11000,11000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=0 stand up');
+-- need the following fix also
+-- c27787 Venomspite Riding Bat
+UPDATE `creature` SET `unit_flags`=`unit_flags`|570688256,`dynamicflags`=`dynamicflags`|32 WHERE `guid` IN (108508,108509);
+DELETE FROM `creature_addon` WHERE `guid` IN (108508,108509);
+INSERT INTO `creature_addon` (`guid`,`bytes2`,`auras`) VALUES
+(108508,1, '29266 0 29266 1'),(108509,1, '29266 0 29266 1');
diff --git a/sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql b/sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql
new file mode 100644
index 00000000000..9ef6e21cb3b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql
@@ -0,0 +1,129 @@
+-- Argent Tournament mounts implementation
+SET @GUID = 151783;
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33870; -- Stabled Argent Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33790; -- Stabled Exodar Elekk
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33791; -- Stabled Silvermoon Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33792; -- Stabled Thunder Bluff Kodo
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33793; -- Stabled Gnomeregan Mechanostrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33794; -- Stabled Darnassian Nightsaber
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33795; -- Stabled Ironforge Ram
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33796; -- Stabled Darkspear Raptor
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33798; -- Stabled Forsaken Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33799; -- Stabled Orgrimmar Wolf
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33800; -- Stabled Stormwind Steed
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33842; -- Stabled Sunreaver Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33843; -- Stabled Quel'dorei Steed
+
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Stabled Exodar Elekk
+UPDATE `creature_model_info` SET `bounding_radius`=1.185,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=29256; -- Stabled Darnassian Nightsaber
+UPDATE `creature_model_info` SET `bounding_radius`=0.818,`combat_reach`=2,`gender`=0 WHERE `modelid`=29258; -- Stabled Ironforge Ram
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29261; -- Stabled Darkspear Raptor
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=28918; -- Stabled Argent Warhorse
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33870,0,0,1,0, NULL), -- Stabled Argent Warhorse
+(33790,0,0,1,0, NULL), -- Stabled Exodar Elekk
+(33791,0,0,1,0, NULL), -- Stabled Silvermoon Hawkstrider
+(33792,0,0,1,0, NULL), -- Stabled Thunder Bluff Kodo
+(33793,0,0,1,0, NULL), -- Stabled Gnomeregan Mechanostrider
+(33794,0,0,1,0, NULL), -- Stabled Darnassian Nightsaber
+(33795,0,0,1,0, NULL), -- Stabled Ironforge Ram
+(33796,0,0,1,0, NULL), -- Stabled Darkspear Raptor
+(33798,0,0,1,0, NULL), -- Stabled Forsaken Warhorse
+(33799,0,0,1,0, NULL), -- Stabled Orgrimmar Wolf
+(33800,0,0,1,0, NULL), -- Stabled Stormwind Steed
+(33842,0,0,1,0, NULL), -- Stabled Sunreaver Hawkstrider
+(33843,0,0,1,0, NULL); -- Stabled Quel'dorei Steed
+
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33782; -- Argent Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33318; -- Exodar Elekk
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33323; -- Silvermoon Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33322; -- Thunder Bluff Kodo
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33317; -- Gnomeregan Mechanostrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33319; -- Darnassian Nightsaber
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33316; -- Ironforge Ram
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33321; -- Darkspear Raptor
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33324; -- Forsaken Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33320; -- Orgrimmar Wolf
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33845; -- Quel'dorei Steed
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33844; -- Sunreaver Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33217; -- Stormwind Steed
+
+UPDATE `creature_template` SET
+`spell1`=62544, -- Thurst
+`spell2`=62575, -- Shield-Breaker
+`spell3`=62960, -- Charge
+`spell4`=62552, -- Defend
+`spell5`=64077, -- Refresh Mount
+`spell6`=62863, -- Duel
+`spell7`=63034  -- Player On Tournament Mount (aura)
+WHERE `vehicleid`=349;
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(33870,63663,13664,1,1,1,62853,0,0), -- Stabled Argent Warhorse           - Summon Tournament Argent Charger         - requires quest The Black Knight's Fall (shall not be completed nor rewarded)
+(33790,62781,13690,0,0,1,62853,0,0), -- Stabled Exodar Elekk              - Summon Tournament Elekk                  - requires quest A Valiant Of The Exodar
+(33791,62786,13696,0,0,1,62853,0,0), -- Stabled Silvermoon Hawkstrider    - Summon Tournament Hawkstrider            - requires quest A Valiant Of Silvermoon
+(33792,62785,13694,0,0,1,62853,0,0), -- Stabled Thunder Bluff Kodo        - Summon Tournament Kodo                   - requires quest A Valiant Of Thunder Bluff
+(33793,62780,13688,0,0,1,62853,0,0), -- Stabled Gnomeregan Mechanostrider - Summon Tournament Mechanostrider         - requires quest A Valiant Of Gnomeregan
+(33794,62782,13689,0,0,1,62853,0,0), -- Stabled Darnassian Nightsaber     - Summon Tournament Nightsaber             - requires quest A Valiant Of Darnassus
+(33795,62779,13685,0,0,1,62853,0,0), -- Stabled Ironforge Ram             - Summon Tournament Ram                    - requires quest A Valiant Of Ironforge
+(33796,62784,13693,0,0,1,62853,0,0), -- Stabled Darkspear Raptor          - Summon Tournament Raptor                 - requires quest A Valiant Of Sen'jin
+(33798,62787,13695,0,0,1,62853,0,0), -- Stabled Forsaken Warhorse         - Summon Tournament Warhorse               - requires quest A Valiant Of Undercity
+(33799,62783,13691,0,0,1,62853,0,0), -- Stabled Orgrimmar Wolf            - Summon Tournament Wolf                   - requires quest A Valiant Of Orgrimmar
+(33800,62774,13684,0,0,1,62853,0,0), -- Stabled Stormwind Steed           - Summon Tournament Charger                - requires quest A Valiant Of Stormwind
+(33842,63791,13668,0,0,1,62853,0,0), -- Stabled Sunreaver Hawkstrider     - Summon Tournament Hawkstrider (Aspirant) - requires quest The Argent Tournament (H/Argent Aspiration)
+(33843,63792,13667,0,0,1,62853,0,0); -- Stabled Quel'dorei Steed          - Summon Tournament Steed (Aspirant)       - requires quest The Argent Tournament (A/Argent Aspiration)
+-- Note: spell 62853 (Lance Equipped) is required for all vehicles.
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=16 AND `ConditionTypeOrReference`=1 AND `ConditionValue1`=64373;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- dismount in wrong zones condition
+(16,0,33782,0,1,64373,0,0,0,'', 'Vehicle Argent Warhorse requires aura Armistice'),
+(16,0,33318,0,1,64373,0,0,0,'', 'Vehicle Exodar Elekk requires aura Armistice'),
+(16,0,33323,0,1,64373,0,0,0,'', 'Vehicle Silvermoon Hawkstrider requires aura Armistice'),
+(16,0,33322,0,1,64373,0,0,0,'', 'Vehicle Thunder Bluff Kodo requires aura Armistice'),
+(16,0,33317,0,1,64373,0,0,0,'', 'Vehicle Gnomeregan Mechanostrider requires aura Armistice'),
+(16,0,33319,0,1,64373,0,0,0,'', 'Vehicle Darnassian Nightsaber requires aura Armistice'),
+(16,0,33316,0,1,64373,0,0,0,'', 'Vehicle Ironforge Ram requires aura Armistice'),
+(16,0,33321,0,1,64373,0,0,0,'', 'Vehicle Darkspear Raptor requires aura Armistice'),
+(16,0,33324,0,1,64373,0,0,0,'', 'Vehicle Forsaken Warhorse requires aura Armistice'),
+(16,0,33320,0,1,64373,0,0,0,'', 'Vehicle Orgrimmar Wolf requires aura Armistice'),
+(16,0,33845,0,1,64373,0,0,0,'', 'Vehicle Quel''dorei Steed requires aura Armistice'),
+(16,0,33844,0,1,64373,0,0,0,'', 'Vehicle Sunreaver Hawkstrider requires aura Armistice'),
+(16,0,33217,0,1,64373,0,0,0,'', 'Vehicle Stormwind Steed requires aura Armistice');
+-- race conditions 
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (33782,33318,33323,33322,33317,33319,33316,33321,33324,33320,33845,33844,33217);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33782,0,0,2305,0, NULL), -- Argent Warhorse
+(33318,0,0,2305,0, NULL), -- Exodar Elekk
+(33323,0,0,2305,0, NULL), -- Silvermoon Hawkstrider
+(33322,0,0,2305,0, NULL), -- Thunder Bluff Kodo
+(33317,0,0,2305,0, NULL), -- Gnomeregan Mechanostrider
+(33319,0,0,2305,0, NULL), -- Darnassian Nightsaber
+(33316,0,0,2305,0, NULL), -- Ironforge Ram
+(33321,0,0,2305,0, NULL), -- Darkspear Raptor
+(33324,0,0,2305,0, NULL), -- Forsaken Warhorse
+(33320,0,0,2305,0, NULL), -- Orgrimmar Wolf
+(33845,0,0,2305,0, NULL), -- Quel''dorei Steed
+(33844,0,0,2305,0, NULL), -- Sunreaver Hawkstrider
+(33217,0,0,2305,0, NULL); -- Stormwind Steed
+
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Exodar Elekk
+UPDATE `creature_model_info` SET `bounding_radius`=1.185,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=29256; -- Darnassian Nightsaber
+UPDATE `creature_model_info` SET `bounding_radius`=2,`combat_reach`=0,`gender`=0 WHERE `modelid`=29258; -- Ironforge Ram
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29261; -- Darkspear Raptor
+
+-- Add more Tournament Stables to enable the use of all spawned vehicles
+UPDATE `gameobject` SET `rotation0`=0,`rotation1`=0,`rotation2`=0,`rotation3`=0,`spawntimesecs`=300,`animprogress`=0 WHERE `id`=300008; -- equal field values for all the entries
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+6 AND `id`=300008; -- TEMP Tournament Stables
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@GUID+0,300008,571,1,1,8569.54,670.423,547.397,5.96851,0,0,0.156691,-0.987648,300,0,1),
+(@GUID+1,300008,571,1,1,8569.74,658.995,547.453,6.07846,0,0,0.102183,-0.994766,300,0,1),
+(@GUID+2,300008,571,1,1,8409.89,707.879,547.314,3.5212,0,0,0.982041,-0.188668,300,0,1),
+(@GUID+3,300008,571,1,1,8421.63,707.685,547.37,4.31917,0,0,0.831614,-0.555354,300,0,1),
+(@GUID+4,300008,571,1,1,8488.82,920.117,547.293,5.78943,0,0,0.244376,-0.969681,300,0,1),
+(@GUID+5,300008,571,1,1,8486.61,935.808,547.293,5.73289,0,0,0.271691,-0.962385,300,0,1),
+(@GUID+6,300008,571,1,1,8490.55,953.448,547.293,4.61212,0,0,0.741653,-0.670784,300,0,1);
diff --git a/sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql b/sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql
new file mode 100644
index 00000000000..37fddc83ce6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql
@@ -0,0 +1 @@
+DELETE FROM `gameobject` WHERE `guid` BETWEEN 200000 AND 200000+6 AND `id`=300008; -- Wrong GUIDs for Tournament Stables
diff --git a/sql/old/3.3.5a/2011_02_28_7_world_creature_template.sql b/sql/old/3.3.5a/2011_02_28_7_world_creature_template.sql
new file mode 100644
index 00000000000..03d89220052
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_7_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (31748,32795,32796,34045); -- Dificully entries
diff --git a/sql/old/3.3.5a/2011_03_01_1_world_conditions.sql b/sql/old/3.3.5a/2011_03_01_1_world_conditions.sql
new file mode 100644
index 00000000000..c1137400040
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_1_world_conditions.sql
@@ -0,0 +1,6 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=36325;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,36325,0,18,1,21182,0,0,'','Spell 36325 target creature 21182'),
+(13,0,36325,0,18,1,22401,0,0,'','Spell 36325 target creature 22401'),
+(13,0,36325,0,18,1,22402,0,0,'','Spell 36325 target creature 22402'),
+(13,0,36325,0,18,1,22403,0,0,'','Spell 36325 target creature 22403');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_03_01_2_world_creature_template.sql b/sql/old/3.3.5a/2011_03_01_2_world_creature_template.sql
new file mode 100644
index 00000000000..b799e54617e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_2_world_creature_template.sql
@@ -0,0 +1,3 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (27894,28781,30234,33062); -- match npcflag with diffentries (that got updated on 2011_02_28_7)
+UPDATE `creature_template` SET `VehicleId`=335 WHERE `entry`=34045; -- Salvaged Chopper (1)
+UPDATE `creature_template` SET `VehicleId`=335 WHERE `entry`=31748; -- Hover Disk (1)
diff --git a/sql/old/3.3.5a/2011_03_01_3_world_sai.sql b/sql/old/3.3.5a/2011_03_01_3_world_sai.sql
new file mode 100644
index 00000000000..37a4afdf06c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_3_world_sai.sql
@@ -0,0 +1,31 @@
+-- Quest 9303 "Inoculation"
+SET @OWL := 16518; -- Nestlewood Owlkin
+SET @IOWL := 16534; -- Inoculated Nestlewood Owlkin
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@OWL;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OWL;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND`entryorguid`=@OWL;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND`entryorguid`=@OWL*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
+(@OWL,0,0,0,8,0,100,0,29528,0,3000,3000,80,@OWL*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'on spellhit run script'),
+(@OWL*100,9,0,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'face player'),
+(@OWL*100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'say random text from groupid 0'),
+(@OWL*100,9,2,0,0,0,100,0,0,0,0,0,36,@IOWL,0,0,0,0,0,1,0,0,0,0,0,0,0,'morph to entry'),
+(@OWL*100,9,3,0,0,0,100,0,0,0,0,0,18,33024,0,0,0,0,0,1,0,0,0,0,0,0,0,'change unitflags'),
+(@OWL*100,9,4,0,0,0,100,0,300,300,0,0,33,@IOWL,0,0,0,0,0,7,0,0,0,0,0,0,0,'give quest credit'),
+(@OWL*100,9,5,0,0,0,100,0,500,500,0,0,89,15,0,0,0,0,0,1,0,0,0,0,0,0,0,'random movement'),
+(@OWL*100,9,6,0,0,0,100,0,9000,9000,0,0,36,@OWL,0,0,0,0,0,1,0,0,0,0,0,0,0,'change entry back'),
+(@OWL*100,9,7,0,0,0,100,0,0,0,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,'change unitflags back'),
+(@OWL*100,9,8,0,0,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'despawn');
+
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16518;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16518,0,0, 'The %s seems overjoyed.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,1, 'The %s seems disoriented.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,2, 'The %s doesn''t look like it minds the crystal''s effects.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,3, 'The %s didn''t like what just happened.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,4, 'The %s looks confused.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,5, 'The %s nods appreciatively.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin');
+
+-- spell does not target the innoculated owlkin and it is not spawned, so take spell requirement out of equation
+UPDATE `quest_template` SET `ReqSpellCast1`=0 WHERE `entry`=9303;
diff --git a/sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql b/sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql
new file mode 100644
index 00000000000..3bd54857744
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16518;
diff --git a/sql/old/3.3.5a/2011_03_01_4_world_sai.sql b/sql/old/3.3.5a/2011_03_01_4_world_sai.sql
new file mode 100644
index 00000000000..05772307157
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_4_world_sai.sql
@@ -0,0 +1,159 @@
+-- Apothecary Enith Fixup for quest 9164 "Captives at Deatholme"
+-- add gossip_id to npc and fix stand state
+UPDATE `creature_template` SET `gossip_menu_id`=7182,`unit_flags`=33024 WHERE `entry`=16208;
+DELETE FROM `creature_template_addon` WHERE `entry`=16208;
+INSERT INTO `creature_template_addon` (`entry`,`bytes1`) VALUES (16208,7);
+-- add gossip menu items
+DELETE FROM `gossip_menu` WHERE `entry` IN (7182,7179);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7182,8459),
+(7179,8460);
+-- add gossip menu options
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7182,7179);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7182,0,0,'<Administer the restorative draught.>',1,1,7179,0,0,0,0,''),
+(7179,0,0,'A bit ungrateful, aren''t we? The way out is clear, flee quickly!',1,1,0,0,0,0,0,'');
+-- add condition for gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7182;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7182,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
+-- Apothecary Enith SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16208;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16208,1620800);
+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
+(16208,0,0,0,62,0,100,0,7179,0,0,0,80,1620800,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+(16208,0,1,0,40,0,100,0,5,16208,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 5 despawn'),
+(1620800,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
+(1620800,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
+(1620800,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
+(1620800,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(1620800,9,4,0,0,0,100,0,2000,2000,0,0,33,16208,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
+(1620800,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16208,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16208;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16208,0,0, 'Thanks, I should''ve never left Silverpine Forest.',0,0,100,6,0,0, 'Apothecary Enith');
+-- Apothecary Enith Path
+DELETE FROM `waypoints` WHERE `entry`=16208;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(16208,1,6647.83,-6344.92,9.13345,'Apothecary Enith point 1'),
+(16208,2,6657.92,-6345.96,15.3468,'Apothecary Enith point 2'),
+(16208,3,6661.58,-6342.65,15.4309,'Apothecary Enith point 3'),
+(16208,4,6662.35,-6334.64,20.8803,'Apothecary Enith point 4'),
+(16208,5,6662.63,-6331.85,20.8924,'Apothecary Enith point 5');
+
+-- Ranger Vedoran <Farstriders> Fixup for quest 9164 "Captives at Deatholme"
+-- add gossip_id to npc and fix stand state
+UPDATE `creature_template` SET `gossip_menu_id`=7177 WHERE `entry`=16209;
+-- add gossip menu items
+DELETE FROM `gossip_menu` WHERE `entry` IN (7177,7176);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7177,8457),
+(7176,8456);
+-- add gossip menu options
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7177,7176);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7177,0,0,'<Administer the restorative draught.>',1,1,7176,0,0,0,0,''),
+(7176,0,0,'You''re free to go now. The way out is safe.',1,1,0,0,0,0,0,'');
+-- add condition for gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7177;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7177,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
+-- Ranger Vedoran SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16209;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16209,1620900);
+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
+(16209,0,0,0,62,0,100,0,7176,0,0,0,80,1620900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+(16209,0,1,0,40,0,100,0,7,16209,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 7 despawn'),
+(1620900,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
+(1620900,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
+(1620900,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
+(1620900,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(1620900,9,4,0,0,0,100,0,2000,2000,0,0,33,16209,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
+(1620900,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16209,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16209;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16209,0,0, 'You have my thanks!',0,0,100,0,0,0, 'Ranger Vedoran');
+-- Ranger Vedoran Path
+DELETE FROM `waypoints` WHERE `entry`=16209;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(16209,1,6290.21,-6366.1,78.0195,'Ranger Vedoran point 1'),
+(16209,2,6301.65,-6364.06,78.0238,'Ranger Vedoran point 2'),
+(16209,3,6305.82,-6360.2,78.0782,'Ranger Vedoran point 3'),
+(16209,4,6310.5,-6356.76,80.6154,'Ranger Vedoran point 4'),
+(16209,5,6314.06,-6360.67,82.6096,'Ranger Vedoran point 5'),
+(16209,6,6317.35,-6365.34,82.7124,'Ranger Vedoran point 6'),
+(16209,7,6326.85,-6366.82,82.7090,'Ranger Vedoran point 7');
+
+-- Apprentice Varnis Fixup for quest 9164 "Captives at Deatholme"
+-- add gossip_id to npc and fix stand state
+UPDATE `creature_template` SET `gossip_menu_id`=7185 WHERE `entry`=16206;
+-- add gossip menu items
+DELETE FROM `gossip_menu` WHERE `entry` IN (7185,7186);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7185,8461),
+(7186,8463);
+-- add gossip menu options
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7185,7186);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7185,0,0,'<Administer the restorative draught.>',1,1,7186,0,0,0,0,''),
+(7186,0,0,'You''re free to go now. The way out is safe.',1,1,0,0,0,0,0,'');
+-- add condition for gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7185;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7185,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
+-- Apprentice Varnis SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16206;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16206,1620600);
+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
+(16206,0,0,0,62,0,100,0,7186,0,0,0,80,1620600,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+(16206,0,1,0,40,0,100,0,7,16206,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 7 despawn'),
+(1620600,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
+(1620600,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
+(1620600,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
+(1620600,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(1620600,9,4,0,0,0,100,0,2000,2000,0,0,33,16206,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
+(1620600,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16206,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16206;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16206,0,0, 'Thank you. I thought I was going to die.',0,0,100,0,0,0, 'Apprentice Varnis');
+-- Apprentice Varnis Path
+DELETE FROM `waypoints` WHERE `entry`=16206;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(16206,1,6436.87,-6633.02,107.432,'Apprentice Varnis point 1'),
+(16206,2,6435.63,-6620.86,107.436,'Apprentice Varnis point 2'),
+(16206,3,6429.88,-6618.29,108.128,'Apprentice Varnis point 3'),
+(16206,4,6426.7,-6614.82,110.159,'Apprentice Varnis point 4'),
+(16206,5,6428.75,-6611.21,111.905,'Apprentice Varnis point 5'),
+(16206,6,6432.83,-6606.89,112.126,'Apprentice Varnis point 6'),
+(16206,7,6431.51,-6597.97,112.113,'Apprentice Varnis point 7');
+
+-- Gossip update Ghostlands
+UPDATE `creature_template` SET `gossip_menu_id`=7242, `npcflag`=`npcflag`|1 WHERE `entry`=16204; -- Magister Idonis
+UPDATE `creature_template` SET `gossip_menu_id`=7397, `npcflag`=`npcflag`|1 WHERE `entry`=16239; -- Magister Kaendris
+UPDATE `creature_template` SET `gossip_menu_id`=7194, `npcflag`=`npcflag`|1 WHERE `entry`=16291; -- Magister Quallestis
+UPDATE `creature_template` SET `gossip_menu_id`=7190, `npcflag`=`npcflag`|1 WHERE `entry`=16240; -- Arcanist Janeda
+UPDATE `creature_template` SET `gossip_menu_id`=7187 WHERE `entry`=16198; -- Apothecary Renzithen
+DELETE FROM `gossip_menu` WHERE `entry`=7242 AND `text_id`=8548;
+DELETE FROM `gossip_menu` WHERE `entry`=7397 AND `text_id`=8860;
+DELETE FROM `gossip_menu` WHERE `entry`=7194 AND `text_id`=8474;
+DELETE FROM `gossip_menu` WHERE `entry`=7190 AND `text_id`=8470;
+DELETE FROM `gossip_menu` WHERE `entry`=7187 AND `text_id`=8464;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7242,8548),(7397,8860),(7194,8474),(7190,8470),(7187,8464);
+-- Gossip menu option
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=7187;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7187,0,0,'I seek a sample of your restorative draught, apothecary.',1,1,0,0,0,0,0,'');
+-- Gossip menu option condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7187;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7187,0,0,9,9164,0,0,0,'','Show gossip option 0 if player has quest 9164');
+-- Smart AI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16198;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=16198;
+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
+(16198,0,0,1,62,0,100,0,7187,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip option select close gossip'),
+(16198,0,1,0,61,0,100,0,0,0,0,0,11,28149,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Create Restorative Draught on player ');
diff --git a/sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql b/sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql
new file mode 100644
index 00000000000..ae9a533b620
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql
@@ -0,0 +1,2 @@
+-- Set new tailoring requirement to learn crafting of Flying Carpet (based on 3.3.0 patch)
+UPDATE `npc_trainer` SET `spellcost`=105000,`reqskillvalue`=300 WHERE `spell`=60969;
diff --git a/sql/old/3.3.5a/2011_03_02_0_world_creature_template.sql b/sql/old/3.3.5a/2011_03_02_0_world_creature_template.sql
new file mode 100644
index 00000000000..b7ae2e1da4e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_0_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `VehicleId`=283 WHERE `entry`=31748; -- Hover Disk (1)
+UPDATE `creature_template` SET `VehicleId`=223 WHERE `entry`=31749; -- Hover Disk (1)
diff --git a/sql/old/3.3.5a/2011_03_02_1_world_achievement_reward.sql b/sql/old/3.3.5a/2011_03_02_1_world_achievement_reward.sql
new file mode 100644
index 00000000000..2afcce64f7b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_1_world_achievement_reward.sql
@@ -0,0 +1,5 @@
+-- Send in-game mail when player completes achievements Emblematic
+DELETE FROM `achievement_reward` WHERE `entry` IN (4784,4785);
+INSERT INTO `achievement_reward` (`entry`,`title_A`,`title_H`,`item`,`sender`,`subject`,`text`) VALUES
+(4784,0,0,0,37942, 'Emblem Quartermasters in Dalaran''s Silver Enclave', 'Your achievements in Northrend have not gone unnoticed, friend.$B$BThe Emblems you have earned may be used to purchase equipment from the various Emblem Quartermasters in Dalaran.$B$BYou may find us there, in the Silver Enclave, where each variety of Emblem has its own quartermaster.$B$BWe look forward to your arrival!'),
+(4785,0,0,0,37941, 'Emblem Quartermasters in Dalaran''s Sunreaver Sanctuary', 'Your achievements in Northrend have not gone unnoticed, friend.$B$BThe Emblems you have earned may be used to purchase equipment from the various Emblem Quartermasters in Dalaran.$B$BYou may find us there, in the Sunreaver Sanctuary, where each variety of Emblem has its own quartermaster.$B$BWe look forward to your arrival!');
diff --git a/sql/old/3.3.5a/2011_03_02_2_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_02_2_world_waypoint_data.sql
new file mode 100644
index 00000000000..baccd34f0ee
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_2_world_waypoint_data.sql
@@ -0,0 +1,312 @@
+-- Remove some waypoint errors
+UPDATE `creature` SET `MovementType`=0 WHERE `guid` IN (57763,57764,57765,57766);
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (57763,57764,57765,57766);
+DELETE FROM `waypoint_data` WHERE `id` IN (577630,577640,577650,577660);
+DELETE FROM `waypoint_scripts` WHERE `id` IN (48,49,50,51);
+
+-- Mature Netherwing Drake Pathing From sniff 1 added.
+SET @NPC := 75541;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4134.369,`position_y`=850.2852,`position_z`=61.26378 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4120.351,883.5854,61.26378,0,0,0,100,0),
+(@PATH,2,-4085.13,900.4695,61.26378,0,0,0,100,0),
+(@PATH,3,-4048.586,884.7811,61.26378,0,0,0,100,0),
+(@PATH,4,-4033.683,852.1551,61.26378,0,0,0,100,0),
+(@PATH,5,-4050.652,818.6749,61.26378,0,0,0,100,0),
+(@PATH,6,-4085.118,799.5022,61.26378,0,0,0,100,0),
+(@PATH,7,-4117.451,815.256,61.26378,0,0,0,100,0),
+(@PATH,8,-4134.369,850.2852,61.26378,0,0,0,100,0);
+
+SET @NPC := 75542;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4066.473,`position_y`=752.3994,`position_z`=43.04424 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4083.436,721.6484,43.04424,0,0,0,100,0),
+(@PATH,2,-4109.103,700.2794,43.04424,0,0,0,100,0),
+(@PATH,3,-4114.49,699.9313,43.04424,0,0,0,100,0),
+(@PATH,4,-4149.18,716.9812,43.04424,0,0,0,100,0),
+(@PATH,5,-4164.394,749.7984,44.87757,0,0,0,100,0),
+(@PATH,6,-4147.782,783.0017,46.62758,0,0,0,100,0),
+(@PATH,7,-4117.128,799.6888,51.93314,0,0,0,100,0),
+(@PATH,8,-4082.698,785.6704,50.3498,0,0,0,100,0),
+(@PATH,9,-4066.473,752.3994,43.04424,0,0,0,100,0);
+
+SET @NPC := 75543;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4148.391,`position_y`=766.8653,`position_z`=66.01289 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4183.416,753.0403,72.09624,0,0,0,100,0),
+(@PATH,2,-4199.977,716.2882,82.67956,0,0,0,100,0),
+(@PATH,3,-4183.724,684.1388,70.56844,0,0,0,100,0),
+(@PATH,4,-4148.917,666.9986,63.51288,0,0,0,100,0),
+(@PATH,5,-4116.004,684.5375,61.51288,0,0,0,100,0),
+(@PATH,6,-4099.94,716.4078,62.09623,0,0,0,100,0),
+(@PATH,7,-4116.647,749.6686,61.59621,0,0,0,100,0),
+(@PATH,8,-4148.391,766.8653,66.01289,0,0,0,100,0);
+
+SET @NPC := 75544;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4084.089,`position_y`=683.0483,`position_z`=59.55887 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4067.996,652.302,59.55887,0,0,0,100,0),
+(@PATH,2,-4084.038,618.9259,59.55887,0,0,0,100,0),
+(@PATH,3,-4117.386,599.9404,59.55887,0,0,0,100,0),
+(@PATH,4,-4149.88,616.7292,59.55887,0,0,0,100,0),
+(@PATH,5,-4165.804,652.2473,59.55887,0,0,0,100,0),
+(@PATH,6,-4150.054,685.6966,59.55887,0,0,0,100,0),
+(@PATH,7,-4118.107,699.7501,59.55887,0,0,0,100,0),
+(@PATH,8,-4084.089,683.0483,59.55887,0,0,0,100,0);
+
+SET @NPC := 75545;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4083.681,`position_y`=848.0616,`position_z`=58.43416 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4117.843,866.6574,58.43417,0,0,0,100,0),
+(@PATH,2,-4149.746,851.1995,68.6286,0,0,0,100,0),
+(@PATH,3,-4167.114,815.8797,74.48971,0,0,0,100,0),
+(@PATH,4,-4150.918,786.3128,65.07306,0,0,0,100,0),
+(@PATH,5,-4116.956,766.7995,70.51749,0,0,0,100,0),
+(@PATH,6,-4085.521,784.5572,76.90639,0,0,0,100,0),
+(@PATH,7,-4067.243,818.4576,64.35083,0,0,0,100,0),
+(@PATH,8,-4083.681,848.0616,58.43416,0,0,0,100,0);
+
+SET @NPC := 75546;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4133.319,`position_y`=918.6325,`position_z`=70.3725 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4117.341,884.8878,62.09472,0,0,0,100,0),
+(@PATH,2,-4084.125,867.1631,52.70584,0,0,0,100,0),
+(@PATH,3,-4050.462,883.2648,46.84472,0,0,0,100,0),
+(@PATH,4,-4033.427,917.2786,54.8725,0,0,0,100,0),
+(@PATH,5,-4049.515,951.7986,62.20583,0,0,0,100,0),
+(@PATH,6,-4082.625,966.6864,69.48361,0,0,0,100,0),
+(@PATH,7,-4116.243,949.7843,72.2614,0,0,0,100,0),
+(@PATH,8,-4133.319,918.6325,70.3725,0,0,0,100,0);
+
+SET @NPC := 75547;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4000.944,`position_y`=650.089,`position_z`=84.74791 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4015.128,680.8443,72.16458,0,0,0,100,0),
+(@PATH,2,-4047.654,700.2465,60.27572,0,0,0,100,0),
+(@PATH,3,-4082.378,686.9391,58.8868,0,0,0,100,0),
+(@PATH,4,-4099.23,649.127,67.30346,0,0,0,100,0),
+(@PATH,5,-4083.47,615.1847,74.74792,0,0,0,100,0),
+(@PATH,6,-4047.911,600.5391,92.52572,0,0,0,100,0),
+(@PATH,7,-4016.922,616.1044,98.47014,0,0,0,100,0),
+(@PATH,8,-4000.944,650.089,84.74791,0,0,0,100,0);
+
+SET @NPC := 75548;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4052.34,`position_y`=716.3079,`position_z`=48.66938 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4019.384,700.1765,47.08604,0,0,0,100,0),
+(@PATH,2,-3983.657,716.8768,52.75271,0,0,0,100,0),
+(@PATH,3,-3967.16,750.4713,65.47495,0,0,0,100,0),
+(@PATH,4,-3982.856,783.4985,67.83604,0,0,0,100,0),
+(@PATH,5,-4017.322,800.1605,65.75271,0,0,0,100,0),
+(@PATH,6,-4048.333,784.6697,60.58604,0,0,0,100,0),
+(@PATH,7,-4067.148,750.3481,53.25271,0,0,0,100,0),
+(@PATH,8,-4052.34,716.3079,48.66938,0,0,0,100,0);
+
+SET @NPC := 75549;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3949.365,`position_y`=819.178,`position_z`=51.50261 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3933.805,784.3923,51.50261,0,0,0,100,0),
+(@PATH,2,-3951.698,751.0433,51.50261,0,0,0,100,0),
+(@PATH,3,-3980.543,733.1439,58.86372,0,0,0,100,0),
+(@PATH,4,-4016.032,747.1483,64.55817,0,0,0,100,0),
+(@PATH,5,-4032.366,782.211,60.08595,0,0,0,100,0),
+(@PATH,6,-4017.203,816.9814,53.30817,0,0,0,100,0),
+(@PATH,7,-3985.723,832.2205,51.50261,0,0,0,100,0),
+(@PATH,8,-3949.365,819.178,51.50261,0,0,0,100,0);
+
+SET @NPC := 75550;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3916.397,`position_y`=883.2978,`position_z`=81.9971 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3948.779,899.8286,68.13598,0,0,0,100,0),
+(@PATH,2,-3982.235,885.5906,61.1082,0,0,0,100,0),
+(@PATH,3,-3999.414,851.4448,62.69153,0,0,0,100,0),
+(@PATH,4,-3983.74,817.0834,58.96931,0,0,0,100,0),
+(@PATH,5,-3950.159,800.5572,63.10819,0,0,0,100,0),
+(@PATH,6,-3918.94,815.5467,72.46931,0,0,0,100,0),
+(@PATH,7,-3900.264,851.1897,81.30264,0,0,0,100,0),
+(@PATH,8,-3916.397,883.2978,81.9971,0,0,0,100,0);
+
+SET @NPC := 75551;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4084.883,`position_y`=914.0491,`position_z`=72.2939 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4099.644,950.2539,69.2939,0,0,0,100,0),
+(@PATH,2,-4086.421,983.3143,71.12724,0,0,0,100,0),
+(@PATH,3,-4050.086,1000.082,74.32168,0,0,0,100,0),
+(@PATH,4,-4018.68,983.5675,74.32168,0,0,0,100,0),
+(@PATH,5,-4001.11,950.1692,74.32168,0,0,0,100,0),
+(@PATH,6,-4016.584,917.4998,74.32168,0,0,0,100,0),
+(@PATH,7,-4048.498,899.8286,74.32168,0,0,0,100,0),
+(@PATH,8,-4084.883,914.0491,72.2939,0,0,0,100,0);
+
+SET @NPC := 75552;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3915.657,`position_y`=833.4163,`position_z`=47.38418 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3948.898,849.9359,47.38418,0,0,0,100,0),
+(@PATH,2,-3964.938,879.6131,47.38418,0,0,0,100,0),
+(@PATH,3,-3948.945,916.1858,47.38418,0,0,0,100,0),
+(@PATH,4,-3916.809,932.6107,48.16196,0,0,0,100,0),
+(@PATH,5,-3886.793,916.5725,53.96752,0,0,0,100,0),
+(@PATH,6,-3866.807,883.3404,60.02308,0,0,0,100,0),
+(@PATH,7,-3884.739,849.9593,54.30085,0,0,0,100,0),
+(@PATH,8,-3915.657,833.4163,47.38418,0,0,0,100,0);
+
+SET @NPC := 75553;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4047.742,`position_y`=1066.566,`position_z`=106.1299 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4082.141,1050.517,104.5466,0,0,0,100,0),
+(@PATH,2,-4099.718,1017.106,98.4355,0,0,0,100,0),
+(@PATH,3,-4082.201,985.4608,87.46328,0,0,0,100,0),
+(@PATH,4,-4048.188,966.8837,78.15773,0,0,0,100,0),
+(@PATH,5,-4017.819,980.5856,72.37994,0,0,0,100,0),
+(@PATH,6,-4000.326,1016.784,86.21326,0,0,0,100,0),
+(@PATH,7,-4014.791,1050.645,97.40771,0,0,0,100,0),
+(@PATH,8,-4047.742,1066.566,106.1299,0,0,0,100,0);
+
+SET @NPC := 75554;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3900.323,`position_y`=984.7424,`position_z`=60.60864 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3918.999,953.8466,58.96975,0,0,0,100,0),
+(@PATH,2,-3950.793,934.2088,58.96975,0,0,0,100,0),
+(@PATH,3,-3982.866,950.2649,58.96975,0,0,0,100,0),
+(@PATH,4,-4000.046,985.8019,61.02531,0,0,0,100,0),
+(@PATH,5,-3981.982,1017.846,58.96975,0,0,0,100,0),
+(@PATH,6,-3949.962,1033.053,56.85864,0,0,0,100,0),
+(@PATH,7,-3918.825,1014.746,58.33086,0,0,0,100,0),
+(@PATH,8,-3900.323,984.7424,60.60864,0,0,0,100,0);
+
+SET @NPC := 75555;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3950.083,`position_y`=985.4277,`position_z`=83.53654 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3965.832,952.775,76.7032,0,0,0,100,0),
+(@PATH,2,-3951.587,918.8143,71.53653,0,0,0,100,0),
+(@PATH,3,-3916.848,899.7321,72.39764,0,0,0,100,0),
+(@PATH,4,-3885.93,916.5598,83.34209,0,0,0,100,0),
+(@PATH,5,-3867.241,951.6891,90.39765,0,0,0,100,0),
+(@PATH,6,-3882.38,983.3097,81.48098,0,0,0,100,0),
+(@PATH,7,-3915.022,1000.09,72.17542,0,0,0,100,0),
+(@PATH,8,-3950.083,985.4277,83.53654,0,0,0,100,0);
+
+SET @NPC := 75556;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3966.719,`position_y`=1048.378,`position_z`=69.52766 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3983.504,1016.722,67.94434,0,0,0,100,0),
+(@PATH,2,-4015.046,1002.573,69.52766,0,0,0,100,0),
+(@PATH,3,-4049.708,1017.723,72.13878,0,0,0,100,0),
+(@PATH,4,-4066.48,1048.968,72.66656,0,0,0,100,0),
+(@PATH,5,-4048.204,1083.848,71.19434,0,0,0,100,0),
+(@PATH,6,-4016.47,1100.259,72.47211,0,0,0,100,0),
+(@PATH,7,-3985.822,1082.684,70.97211,0,0,0,100,0),
+(@PATH,8,-3966.719,1048.378,69.52766,0,0,0,100,0);
+
+SET @NPC := 75557;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3950.767,`position_y`=1000.512,`position_z`=87.49402 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3918.137,1015.368,90.16069,0,0,0,100,0),
+(@PATH,2,-3900.402,1050.901,91.7718,0,0,0,100,0),
+(@PATH,3,-3917.262,1083.885,99.32737,0,0,0,100,0),
+(@PATH,4,-3949.68,1100.575,106.7718,0,0,0,100,0),
+(@PATH,5,-3981.045,1082.341,107.8829,0,0,0,100,0),
+(@PATH,6,-3999.798,1048.804,99.57736,0,0,0,100,0),
+(@PATH,7,-3985.399,1018.346,91.7718,0,0,0,100,0),
+(@PATH,8,-3950.767,1000.512,87.49402,0,0,0,100,0);
+
+SET @NPC := 75558;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4066.473,`position_y`=752.3994,`position_z`=43.04424 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4083.436,721.6484,43.04424,0,0,0,100,0),
+(@PATH,2,-4109.103,700.2794,43.04424,0,0,0,100,0),
+(@PATH,3,-4114.49,699.9313,43.04424,0,0,0,100,0),
+(@PATH,4,-4149.18,716.9812,43.04424,0,0,0,100,0),
+(@PATH,5,-4164.394,749.7984,44.87757,0,0,0,100,0),
+(@PATH,6,-4147.782,783.0017,46.62758,0,0,0,100,0),
+(@PATH,7,-4117.128,799.6888,51.93314,0,0,0,100,0),
+(@PATH,8,-4082.698,785.6704,50.3498,0,0,0,100,0),
+(@PATH,9,-4066.473,752.3994,43.04424,0,0,0,100,0);
+
+SET @NPC := 86103;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `id`=21648,`spawndist`=0,`MovementType`=2,`position_x`=-3981.939,`position_y`=1200.395,`position_z`=108.2629 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4015.405,1186.572,107.8463,0,0,0,100,0),
+(@PATH,2,-4032.093,1150.835,100.8185,0,0,0,100,0),
+(@PATH,3,-4016.442,1117.503,95.84628,0,0,0,100,0),
+(@PATH,4,-3982.193,1100.35,95.62405,0,0,0,100,0),
+(@PATH,5,-3950.59,1116.853,99.12405,0,0,0,100,0),
+(@PATH,6,-3933.569,1150.704,103.263,0,0,0,100,0),
+(@PATH,7,-3949.776,1184.953,106.8185,0,0,0,100,0),
+(@PATH,8,-3981.939,1200.395,108.2629,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql b/sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql
new file mode 100644
index 00000000000..6669edd4929
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql
@@ -0,0 +1,31 @@
+-- Gossip Menu insert
+DELETE FROM `gossip_menu` WHERE `entry`=3067 AND `text_id`=3801;
+DELETE FROM `gossip_menu` WHERE `entry`=3481 AND `text_id`=4953;
+DELETE FROM `gossip_menu` WHERE `entry`=4061 AND `text_id`=4954;
+DELETE FROM `gossip_menu` WHERE `entry`=4062 AND `text_id`=4955;
+DELETE FROM `gossip_menu` WHERE `entry`=4063 AND `text_id`=4956;
+DELETE FROM `gossip_menu` WHERE `entry`=4064 AND `text_id`=4957;
+DELETE FROM `gossip_menu` WHERE `entry`=4065 AND `text_id`=4958;
+DELETE FROM `gossip_menu` WHERE `entry`=6627 AND `text_id`=7881;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(3067,3801),
+(3481,4953),
+(4061,4954),
+(4062,4955),
+(4063,4956),
+(4064,4957),
+(4065,4958),
+(6627,7881);
+-- Creature Gossip_menu_id Update
+UPDATE `creature_template` SET `gossip_menu_id`=4573 WHERE `entry`=4091;
+UPDATE `creature_template` SET `gossip_menu_id`=3067 WHERE `entry`=7866;
+UPDATE `creature_template` SET `gossip_menu_id`=3481 WHERE `entry`=11548;
+UPDATE `creature_template` SET `gossip_menu_id`=6944 WHERE `entry`=12577;
+-- Creature Gossip_menu_option Update
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=3481;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(3481,0,0, 'The land of Azshara.',1,1,4061,0,0,0,0, ''),
+(3481,1,0, 'The Ruins of Eldarath.',1,1,4062,0,0,0,0, ''),
+(3481,2,0, 'The mage tower to the north.',1,1,4063,0,0,0,0, ''),
+(3481,3,0, 'The Timbermaw furbolgs.',1,1,4064,0,0,0,0, ''),
+(3481,4,0, 'The presence of blue dragons.',1,1,4065,0,0,0,0, '');
diff --git a/sql/old/3.3.5a/2011_03_02_4_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_02_4_world_waypoint_data.sql
new file mode 100644
index 00000000000..e2413c0f6ff
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_4_world_waypoint_data.sql
@@ -0,0 +1,164 @@
+-- Waypoints for Vilewing Chimaera
+SET @NPC := 84613;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3495.376,`position_y`=2654.514,`position_z`=85.14965 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84611,84490);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3513.771,2667.212,85.87186,0,0,0,100,0),
+(@PATH,2,-3527.99,2668.341,87.39961,0,0,0,100,0),
+(@PATH,3,-3568.938,2660.981,87.3718,0,0,0,100,0),
+(@PATH,4,-3605.726,2631.423,89.09409,0,0,0,100,0),
+(@PATH,5,-3606.994,2590.197,89.01077,0,0,0,100,0),
+(@PATH,6,-3624.849,2552.972,89.84412,0,0,0,100,0),
+(@PATH,7,-3632.875,2523.194,90.78855,0,0,0,100,0),
+(@PATH,8,-3623.275,2498.775,93.42754,0,0,0,100,0),
+(@PATH,9,-3594.59,2497.109,91.81643,0,0,0,100,0),
+(@PATH,10,-3571.224,2522.083,89.76082,0,0,0,100,0),
+(@PATH,11,-3555.303,2550.05,88.20523,0,0,0,100,0),
+(@PATH,12,-3546.012,2576.069,86.67743,0,0,0,100,0),
+(@PATH,13,-3533.117,2604.753,86.59406,0,0,0,100,0),
+(@PATH,14,-3505.657,2622.679,86.03844,0,0,0,100,0),
+(@PATH,15,-3495.376,2654.514,85.14965,0,0,0,100,0);
+
+SET @NPC := 84632;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3051.686,`position_y`=1036.492,`position_z`=18.42691 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84629,84630);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3078.817,1034.035,19.28807,0,0,0,100,0),
+(@PATH,2,-3088.495,1066.141,25.0936,0,0,0,100,0),
+(@PATH,3,-3087.413,1099.35,30.84361,0,0,0,100,0),
+(@PATH,4,-3067.319,1113.823,27.62129,0,0,0,100,0),
+(@PATH,5,-3035.007,1131.8,22.48246,0,0,0,100,0),
+(@PATH,6,-3022.366,1165.862,21.28805,0,0,0,100,0),
+(@PATH,7,-3028.652,1200.958,24.2047,0,0,0,100,0),
+(@PATH,8,-3053.869,1219.137,31.12142,0,0,0,100,0),
+(@PATH,9,-3098.912,1230.556,38.8714,0,0,0,100,0),
+(@PATH,10,-3120.39,1233.38,42.48251,0,0,0,100,0),
+(@PATH,11,-3155.853,1240.664,47.03807,0,0,0,100,0),
+(@PATH,12,-3184.486,1256.954,49.17699,0,0,0,100,0),
+(@PATH,13,-3200.051,1273.893,49.17699,0,0,0,100,0),
+(@PATH,14,-3198.467,1300.309,47.56586,0,0,0,100,0),
+(@PATH,15,-3180.189,1312.811,46.51028,0,0,0,100,0),
+(@PATH,16,-3166.775,1318.915,44.56582,0,0,0,100,0),
+(@PATH,17,-3133.76,1306.827,33.8992,0,0,0,100,0),
+(@PATH,18,-3107.957,1267.029,29.7603,0,0,0,100,0),
+(@PATH,19,-3102.756,1234.923,31.56591,0,0,0,100,0),
+(@PATH,20,-3081.735,1200.232,34.76027,0,0,0,100,0),
+(@PATH,21,-3064.895,1171.269,31.59359,0,0,0,100,0),
+(@PATH,22,-3032.818,1161.913,24.92694,0,0,0,100,0),
+(@PATH,23,-2998.293,1162.476,17.28803,0,0,0,100,0),
+(@PATH,24,-2989.174,1125.52,23.26031,0,0,0,100,0),
+(@PATH,25,-3019.696,1108.528,28.37141,0,0,0,100,0),
+(@PATH,26,-3030.191,1069.277,24.06586,0,0,0,100,0),
+(@PATH,27,-3051.686,1036.492,18.42691,0,0,0,100,0);
+
+SET @NPC := 84594;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3306.025,`position_y`=2329.368,`position_z`=83.54176 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84609,84610);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3306.578,2358.007,83.95837,0,0,0,100,0),
+(@PATH,2,-3312.279,2366.838,84.12508,0,0,0,100,0),
+(@PATH,3,-3339.576,2384.215,85.01395,0,0,0,100,0),
+(@PATH,4,-3375.194,2400.308,84.79176,0,0,0,100,0),
+(@PATH,5,-3413.535,2413.8,83.40285,0,0,0,100,0),
+(@PATH,6,-3449.745,2447.95,84.59732,0,0,0,100,0),
+(@PATH,7,-3484.88,2475.859,87.48625,0,0,0,100,0),
+(@PATH,8,-3516.799,2470.339,88.65293,0,0,0,100,0),
+(@PATH,9,-3551.302,2449.093,88.65293,0,0,0,100,0),
+(@PATH,10,-3577.611,2417.917,88.65293,0,0,0,100,0),
+(@PATH,11,-3587.224,2394.964,88.65293,0,0,0,100,0),
+(@PATH,12,-3578.091,2358.175,91.01408,0,0,0,100,0),
+(@PATH,13,-3542.674,2341.767,90.73628,0,0,0,100,0),
+(@PATH,14,-3508.299,2338.776,88.65293,0,0,0,100,0),
+(@PATH,15,-3480.534,2321.327,85.20841,0,0,0,100,0),
+(@PATH,16,-3438.703,2328.433,84.01396,0,0,0,100,0),
+(@PATH,17,-3402.306,2319.822,84.06959,0,0,0,100,0),
+(@PATH,18,-3367.927,2320.204,83.40282,0,0,0,100,0),
+(@PATH,19,-3336.193,2315.693,83.7084,0,0,0,100,0),
+(@PATH,20,-3306.025,2329.368,83.54176,0,0,0,100,0);
+
+SET @NPC := 84597;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3679.033,`position_y`=1980.171,`position_z`=95.40069 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3694.715,1971.449,97.03951,0,0,0,100,0),
+(@PATH,2,-3698.604,1961.438,97.51176,0,0,0,100,0),
+(@PATH,3,-3703.094,1932.741,93.09521,0,0,0,100,0),
+(@PATH,4,-3710.8,1898.883,95.06728,0,0,0,100,0),
+(@PATH,5,-3706.167,1855.215,94.65068,0,0,0,100,0),
+(@PATH,6,-3730.437,1822.595,97.15064,0,0,0,100,0),
+(@PATH,7,-3764.347,1786.201,103.5396,0,0,0,100,0),
+(@PATH,8,-3806.215,1765.616,104.6232,0,0,0,100,0),
+(@PATH,9,-3831.599,1734.274,106.4841,0,0,0,100,0),
+(@PATH,10,-3845.836,1700.599,104.7896,0,0,0,100,0),
+(@PATH,11,-3860.267,1667.299,102.9841,0,0,0,100,0),
+(@PATH,12,-3878.303,1634.768,97.234,0,0,0,100,0),
+(@PATH,13,-3905.483,1624.397,96.40066,0,0,0,100,0),
+(@PATH,14,-3934.358,1629.903,95.78949,0,0,0,100,0),
+(@PATH,15,-3941.387,1653.258,102.4008,0,0,0,100,0),
+(@PATH,16,-3933.618,1681.023,107.5399,0,0,0,100,0),
+(@PATH,17,-3911.209,1703.6,110.7342,0,0,0,100,0),
+(@PATH,18,-3870.417,1717.617,111.4286,0,0,0,100,0),
+(@PATH,19,-3851.412,1733.487,109.7619,0,0,0,100,0),
+(@PATH,20,-3832.467,1767.414,108.4843,0,0,0,100,0),
+(@PATH,21,-3821.692,1801.011,106.7619,0,0,0,100,0),
+(@PATH,22,-3804.742,1833.069,104.3174,0,0,0,100,0),
+(@PATH,23,-3771.966,1852.2,103.0675,0,0,0,100,0),
+(@PATH,24,-3733.195,1857.556,99.8175,0,0,0,100,0),
+(@PATH,25,-3700.392,1874.681,91.92853,0,0,0,100,0),
+(@PATH,26,-3669.671,1899.899,86.984,0,0,0,100,0),
+(@PATH,27,-3657.474,1933.845,83.78937,0,0,0,100,0),
+(@PATH,28,-3665.441,1967.769,90.26167,0,0,0,100,0),
+(@PATH,29,-3679.033,1980.171,95.40069,0,0,0,100,0);
+
+SET @NPC := 84488;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3642.398,`position_y`=2282.843,`position_z`=101.388 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84604);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3669.035,2270.016,101.6381,0,0,0,100,0),
+(@PATH,2,-3678.18,2255.654,102.6103,0,0,0,100,0),
+(@PATH,3,-3670.328,2221.352,101.9714,0,0,0,100,0),
+(@PATH,4,-3643.312,2194.72,101.7492,0,0,0,100,0),
+(@PATH,5,-3616.062,2171.167,100.7214,0,0,0,100,0),
+(@PATH,6,-3592.527,2149.246,97.38798,0,0,0,100,0),
+(@PATH,7,-3565.214,2111.288,91.72128,0,0,0,100,0),
+(@PATH,8,-3539.711,2073.035,90.72137,0,0,0,100,0),
+(@PATH,9,-3525.445,2044.541,86.11011,0,0,0,100,0),
+(@PATH,10,-3525.761,2011.65,86.47135,0,0,0,100,0),
+(@PATH,11,-3542.677,1995.357,88.47128,0,0,0,100,0),
+(@PATH,12,-3561.439,2002.938,85.02679,0,0,0,100,0),
+(@PATH,13,-3575.933,2019.746,82.88785,0,0,0,100,0),
+(@PATH,14,-3575.169,2047.138,81.36017,0,0,0,100,0),
+(@PATH,15,-3573.451,2072.323,84.91569,0,0,0,100,0),
+(@PATH,16,-3564.493,2102.465,90.33241,0,0,0,100,0),
+(@PATH,17,-3536.419,2134.583,97.94351,0,0,0,100,0),
+(@PATH,18,-3500.938,2154.613,104.3325,0,0,0,100,0),
+(@PATH,19,-3468.633,2165.143,101.9992,0,0,0,100,0),
+(@PATH,20,-3451.676,2176.575,102.9714,0,0,0,100,0),
+(@PATH,21,-3440.866,2214.563,102.4992,0,0,0,100,0),
+(@PATH,22,-3464.083,2240.168,96.19363,0,0,0,100,0),
+(@PATH,23,-3503.83,2238.953,96.88795,0,0,0,100,0),
+(@PATH,24,-3532.543,2227.365,98.52686,0,0,0,100,0),
+(@PATH,25,-3557.896,2223.087,99.74914,0,0,0,100,0),
+(@PATH,26,-3585.39,2233.091,100.4992,0,0,0,100,0),
+(@PATH,27,-3605.955,2248.527,99.88802,0,0,0,100,0),
+(@PATH,28,-3615.812,2270.33,99.72134,0,0,0,100,0),
+(@PATH,29,-3642.398,2282.843,101.388,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2011_03_02_5_world_sai.sql b/sql/old/3.3.5a/2011_03_02_5_world_sai.sql
new file mode 100644
index 00000000000..d318dc466a3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_5_world_sai.sql
@@ -0,0 +1,37 @@
+-- Pathing for Thulrin SAI
+-- Remove old waypoint data and scripts
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2352.691,`position_y`=5268.956,`position_z`=7.668962 WHERE `guid`=110115;
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=110115;
+DELETE FROM `waypoint_data` WHERE `id`=1101150;
+DELETE FROM waypoint_scripts WHERE `id` BETWEEN 1117 AND 1119;
+-- SAI for Thulrin
+UPDATE `creature_template` SET `AIName`='SmartAI',`equipment_id`=0 WHERE `entry`=25239;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=25239;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2523900,2523901);
+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
+-- AI
+(25239,0,0,0,11,0,100,0,0,0,0,0,53,0,25239,1,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Start WP movement'),
+(25239,0,1,0,40,0,100,0,4,25239,0,0,80,2523900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Load script 1 at WP 4'),
+(25239,0,2,0,40,0,100,0,9,25239,0,0,80,2523901,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Load script 2 at WP 9'),
+-- Script 1
+(2523900,9,0,0,0,0,100,0,0,0,0,0,54,1500,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Pause at WP 4'),
+(2523900,9,1,0,0,0,100,0,0,0,0,0,5,16,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote ONESHOT_KNEEL'),
+(2523900,9,2,0,0,0,100,0,1000,1000,0,0,71,344,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Equip sword'),
+-- Script 2
+(2523901,9,0,0,0,0,100,0,0,0,0,0,54,51000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Pause at WP 9'),
+(2523901,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.984513, 'Thulrin - Turn to pos'),
+(2523901,9,2,0,0,0,100,0,1000,1000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote STATE_USESTANDING_NOSHEATHE'),
+(2523901,9,3,0,0,0,100,0,48000,48000,0,0,71,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Equip nothing'),
+(2523901,9,4,0,0,0,100,0,0,0,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote STATE_STAND');
+-- Waypoints for Thulrin from sniff
+DELETE FROM `waypoints` WHERE `entry`=25239;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(25239,1,2347.805,5265.343,7.630844, 'Thulrin WP 1'),
+(25239,2,2344.542,5267.178,7.668962, 'Thulrin WP 2'),
+(25239,3,2340.221,5270.315,7.668962, 'Thulrin WP 3'),
+(25239,4,2336.553,5273.868,7.793962, 'Thulrin WP 4'),
+(25239,5,2339.075,5271.176,7.668962, 'Thulrin WP 5'),
+(25239,6,2346.919,5265.093,7.630844, 'Thulrin WP 6'),
+(25239,7,2351.8,5266.425,7.630844, 'Thulrin WP 7'),
+(25239,8,2352.691,5268.956,7.668962, 'Thulrin WP 8'),
+(25239,9,2352.691,5268.956,7.668962, 'Thulrin WP 9');
diff --git a/sql/old/3.3.5a/2011_03_02_6_world_sai.sql b/sql/old/3.3.5a/2011_03_02_6_world_sai.sql
new file mode 100644
index 00000000000..ed81ade61a9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_6_world_sai.sql
@@ -0,0 +1,47 @@
+-- SAI for Crust Burster 
+SET @ENTRY := 16844; 
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; 
+UPDATE `creature` SET `spawndist`=20,`MovementType`=1 WHERE `id`=@ENTRY; 
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@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,1,0,100,1,0,0,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Cast Submerge Visual'), 
+(@ENTRY,0,1,0,61,0,100,1,0,0,0,0,18,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Set Unselectable and Unattackable Flags'), 
+(@ENTRY,0,2,3,0,0,100,1,0,0,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Submerge Visual'), 
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Unselectable and Unattackable Flags'), 
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Prevent Combat Movement'), 
+(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Set Phase 1'), 
+(@ENTRY,0,6,7,0,1,100,0,1000,1000,2100,4500,11,31747,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Poison (Phase 1)'), 
+(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 1)'), 
+(@ENTRY,0,8,0,0,1,100,0,20400,20400,45000,50000,11,32738,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Bore (Phase 1)'), 
+(@ENTRY,0,9,10,9,1,100,0,20,60,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Cast Submerge Visual (Phase 1)'),
+(@ENTRY,0,10,11,61,1,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Allow Combat Movement (Phase 1)'), 
+(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 2 (Phase 1)'), 
+(@ENTRY,0,12,13,9,2,100,0,0,8,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Submerge Visual (Phase 2)'), 
+(@ENTRY,0,13,14,61,2,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 2)'), 
+(@ENTRY,0,14,15,61,2,100,0,0,8,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Unselectable and Unattackable Flags (Phase 2)'), 
+(@ENTRY,0,15,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 1 (Phase 2)'); 
+ 
+-- SAI for Marading Crust Burster 
+SET @ENTRY := 16857; 
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; 
+UPDATE `creature` SET `spawndist`=20,`MovementType`=1 WHERE `id`=@ENTRY; 
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@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,1,0,100,1,0,0,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Cast Submerge Visual'), 
+(@ENTRY,0,1,0,61,0,100,1,0,0,0,0,18,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Set Unselectable and Unattackable Flags'), 
+(@ENTRY,0,2,3,0,0,100,1,0,0,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Submerge Visual'), 
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Unselectable and Unattackable Flags'), 
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Prevent Combat Movement'), 
+(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Set Phase 1'), 
+(@ENTRY,0,6,7,0,1,100,0,1000,1000,2100,4500,11,31747,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Poison (Phase 1)'), 
+(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 1)'), 
+(@ENTRY,0,8,0,0,1,100,0,20400,20400,45000,50000,11,32738,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Bore (Phase 1)'), 
+(@ENTRY,0,9,10,9,1,100,0,20,60,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Cast Submerge Visual (Phase 1)'),
+(@ENTRY,0,10,11,61,1,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Allow Combat Movement (Phase 1)'), 
+(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 2 (Phase 1)'), 
+(@ENTRY,0,12,13,9,2,100,0,0,8,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Submerge Visual (Phase 2)'), 
+(@ENTRY,0,13,14,61,2,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 2)'), 
+(@ENTRY,0,14,15,61,2,100,0,0,8,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Unselectable and Unattackable Flags (Phase 2)'), 
+(@ENTRY,0,15,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 1 (Phase 2)');
diff --git a/sql/old/3.3.5a/2011_03_04_0_world_skill_discovery_template.sql b/sql/old/3.3.5a/2011_03_04_0_world_skill_discovery_template.sql
new file mode 100644
index 00000000000..f1840b0db8f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_0_world_skill_discovery_template.sql
@@ -0,0 +1,2 @@
+-- Debug spell, set reqSkillValue because it does not belong to any skilline
+UPDATE `skill_discovery_template` SET `reqSkillValue`=0 WHERE `reqSpell`=61756;
diff --git a/sql/old/3.3.5a/2011_03_04_1_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_03_04_1_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..f4a5825225c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_1_world_npc_spellclick_spells.sql
@@ -0,0 +1,3 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=32930;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(32930,65343,0,0,0,0,0,0,0);  -- Ride Vehicle Kologarn Arms
diff --git a/sql/old/3.3.5a/2011_03_04_1_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_03_04_1_world_vehicle_accessory.sql
new file mode 100644
index 00000000000..53cb37d43f1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_1_world_vehicle_accessory.sql
@@ -0,0 +1 @@
+UPDATE `vehicle_accessory` SET `minion`=1 WHERE `entry` IN(32640,32633);
diff --git a/sql/old/3.3.5a/2011_03_04_2_world_spell_script_names.sql b/sql/old/3.3.5a/2011_03_04_2_world_spell_script_names.sql
new file mode 100644
index 00000000000..db399ebd042
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_2_world_spell_script_names.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_profession_research';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_book_of_glyph_mastery';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(60893, 'spell_gen_profession_research'),
+(61177, 'spell_gen_profession_research'),
+(61288, 'spell_gen_profession_research'),
+(61756, 'spell_gen_profession_research'),
+(64323, 'spell_item_book_of_glyph_mastery');
diff --git a/sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql b/sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql
new file mode 100644
index 00000000000..68cef6a1b53
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql
@@ -0,0 +1,2 @@
+-- Delete MO_TRANSPORT spawns
+DELETE FROM `gameobject` WHERE `guid` IN (150163,150171);
diff --git a/sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql b/sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql
new file mode 100644
index 00000000000..01ee9d252c6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `item_template` SET `ScriptName`='' WHERE `ScriptName`='item_harvesters_gift';
+UPDATE `item_template` SET `ScriptName`='' WHERE `ScriptName`='item_flying_machine';
diff --git a/sql/old/3.3.5a/2011_03_04_4_world_spell_script_names.sql b/sql/old/3.3.5a/2011_03_04_4_world_spell_script_names.sql
new file mode 100644
index 00000000000..140d4eb8e1d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_4_world_spell_script_names.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_gift_of_the_harvester';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_death_gate';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(52481, 'spell_item_gift_of_the_harvester'),
+(52751, 'spell_dk_death_gate');
diff --git a/sql/old/3.3.5a/2011_03_05_0_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_05_0_world_waypoint_data.sql
new file mode 100644
index 00000000000..f340c55304e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_05_0_world_waypoint_data.sql
@@ -0,0 +1,208 @@
+-- Dragonmaw Skybreaker Pathing From sniff
+UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1.2125 WHERE `entry`=22274;
+DELETE FROM `creature` WHERE `guid`=132538;
+DELETE FROM `creature_addon` WHERE `guid`=132538;
+
+SET @NPC := 78291;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4919.375,`position_y`=764.9185,`position_z`=115.8213 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4899.598,731.2864,115.8213,0,0,0,100,0),
+(@PATH,2,-4897.536,699.804,115.8213,0,0,0,100,0),
+(@PATH,3,-4907.958,682.649,115.8213,0,0,0,100,0),
+(@PATH,4,-4928.547,677.3654,115.8213,0,0,0,100,0),
+(@PATH,5,-4957.558,679.2119,115.8213,0,0,0,100,0),
+(@PATH,6,-4979.058,694.0054,115.8213,0,0,0,100,0),
+(@PATH,7,-5001.202,695.435,115.8213,0,0,0,100,0),
+(@PATH,8,-5045.799,679.8455,115.8213,0,0,0,100,0),
+(@PATH,9,-5082.077,674.1318,115.8213,0,0,0,100,0),
+(@PATH,10,-5105.458,688.3859,126.0714,0,0,0,100,0),
+(@PATH,11,-5124.419,708.7602,115.8213,0,0,0,100,0),
+(@PATH,12,-5131.542,743.6093,115.8213,0,0,0,100,0),
+(@PATH,13,-5122.893,762.6793,115.8213,0,0,0,100,0),
+(@PATH,14,-5109.942,776.4905,127.7102,0,0,0,100,0),
+(@PATH,15,-5082.581,787.4044,140.2658,0,0,0,100,0),
+(@PATH,16,-5048.687,787.3963,129.2936,0,0,0,100,0),
+(@PATH,17,-5029.247,794.6903,105.6824,0,0,0,100,0),
+(@PATH,18,-5004.71,788.2552,111.238,0,0,0,100,0),
+(@PATH,19,-4974.424,775.7346,115.8213,0,0,0,100,0),
+(@PATH,20,-4944.215,765.6434,115.8213,0,0,0,100,0),
+(@PATH,21,-4919.375,764.9185,115.8213,0,0,0,100,0);
+
+SET @NPC := 78292;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4914.272,`position_y`=182.6655,`position_z`=105.3898 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4927.019,212.1301,105.3898,0,0,0,100,0),
+(@PATH,2,-4948.965,230.0244,105.3898,0,0,0,100,0),
+(@PATH,3,-4975.733,226.1698,105.3898,0,0,0,100,0),
+(@PATH,4,-4991.351,199.1344,103.001,0,0,0,100,0),
+(@PATH,5,-5005.696,153.1891,116.7409,0,0,0,100,0),
+(@PATH,6,-4998.949,135.7159,116.7409,0,0,0,100,0),
+(@PATH,7,-4970.921,115.2041,116.7409,0,0,0,100,0),
+(@PATH,8,-4920.846,153.8924,105.3898,0,0,0,100,0),
+(@PATH,9,-4914.272,182.6655,105.3898,0,0,0,100,0);
+
+SET @NPC := 78293;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5001.053,`position_y`=507.8676,`position_z`=125.1893 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4976.919,535.0216,125.1893,0,0,0,100,0),
+(@PATH,2,-4945.772,544.8293,125.1893,0,0,0,100,0),
+(@PATH,3,-4916.477,541.136,125.1893,0,0,0,100,0),
+(@PATH,4,-4894.755,534.1898,125.1893,0,0,0,100,0),
+(@PATH,5,-4878.672,517.9357,125.1893,0,0,0,100,0),
+(@PATH,6,-4867.688,472.2867,125.1893,0,0,0,100,0),
+(@PATH,7,-4866.018,440.9231,125.1893,0,0,0,100,0),
+(@PATH,8,-4884.331,411.0111,125.1893,0,0,0,100,0),
+(@PATH,9,-4909.612,389.5723,125.1893,0,0,0,100,0),
+(@PATH,10,-4945.339,386.204,125.1893,0,0,0,100,0),
+(@PATH,11,-4967.832,409.3968,125.1893,0,0,0,100,0),
+(@PATH,12,-4986.726,443.7907,125.1893,0,0,0,100,0),
+(@PATH,13,-4997.688,466.8292,125.1893,0,0,0,100,0),
+(@PATH,14,-5001.053,507.8676,125.1893,0,0,0,100,0);
+
+SET @NPC := 78294;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4957.768,`position_y`=-85.91428,`position_z`=117.7407 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4979.801,-54.69292,117.2962,0,0,0,100,0),
+(@PATH,2,-4973.231,-17.18837,111.824,0,0,0,100,0),
+(@PATH,3,-4911.041,4.472439,118.324,0,0,0,100,0),
+(@PATH,4,-4873.144,-22.93349,119.0185,0,0,0,100,0),
+(@PATH,5,-4870.32,-65.83746,122.9629,0,0,0,100,0),
+(@PATH,6,-4885.412,-99.36697,120.2129,0,0,0,100,0),
+(@PATH,7,-4918.261,-108.4286,117.824,0,0,0,100,0),
+(@PATH,8,-4957.768,-85.91428,117.7407,0,0,0,100,0);
+
+SET @NPC := 78295;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4989.571,`position_y`=277.2158,`position_z`=129.4455 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4981.606,252.022,129.4455,0,0,0,100,0),
+(@PATH,2,-4961.62,234.8766,129.4455,0,0,0,100,0),
+(@PATH,3,-4923.01,242.2214,129.4455,0,0,0,100,0),
+(@PATH,4,-4900.703,257.2026,129.4455,0,0,0,100,0),
+(@PATH,5,-4879.407,279.7445,129.4455,0,0,0,100,0),
+(@PATH,6,-4865.226,310.3156,129.4455,0,0,0,100,0),
+(@PATH,7,-4859.635,335.26,129.4455,0,0,0,100,0),
+(@PATH,8,-4863.772,361.1568,129.4455,0,0,0,100,0),
+(@PATH,9,-4897.918,374.3784,129.4455,0,0,0,100,0),
+(@PATH,10,-4935.554,362.9577,129.4455,0,0,0,100,0),
+(@PATH,11,-4956.634,339.5631,129.4455,0,0,0,100,0),
+(@PATH,12,-4972.443,308.4228,129.4455,0,0,0,100,0),
+(@PATH,13,-4989.571,277.2158,129.4455,0,0,0,100,0);
+
+SET @NPC := 78296;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5013.096,`position_y`=529.8334,`position_z`=147.466 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5034.7,530.1956,147.466,0,0,0,100,0),
+(@PATH,2,-5058.567,549.2531,147.466,0,0,0,100,0),
+(@PATH,3,-5077.942,585.5693,147.466,0,0,0,100,0),
+(@PATH,4,-5085.871,616.8538,147.466,0,0,0,100,0),
+(@PATH,5,-5073.225,640.2809,147.466,0,0,0,100,0),
+(@PATH,6,-5046.584,656.348,147.466,0,0,0,100,0),
+(@PATH,7,-5016.901,662.3196,147.466,0,0,0,100,0),
+(@PATH,8,-4990.232,642.3178,147.466,0,0,0,100,0),
+(@PATH,9,-4965.018,595.1047,147.466,0,0,0,100,0),
+(@PATH,10,-4970.888,561.2855,147.466,0,0,0,100,0),
+(@PATH,11,-4988.07,544.9948,147.466,0,0,0,100,0),
+(@PATH,12,-5013.096,529.8334,147.466,0,0,0,100,0);
+
+SET @NPC := 78297;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5115.668,`position_y`=15.1122,`position_z`=156.0377 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5081.034,3.025608,156.0377,0,0,0,100,0),
+(@PATH,2,-5054.209,-29.95432,156.0377,0,0,0,100,0),
+(@PATH,3,-5044.757,-53.49219,156.0377,0,0,0,100,0),
+(@PATH,4,-5063.791,-87.67003,156.0377,0,0,0,100,0),
+(@PATH,5,-5100.97,-101.5627,156.0377,0,0,0,100,0),
+(@PATH,6,-5139.875,-93.61002,156.0377,0,0,0,100,0),
+(@PATH,7,-5157.834,-72.95584,158.5654,0,0,0,100,0),
+(@PATH,8,-5150.443,-50.55273,150.9543,0,0,0,100,0),
+(@PATH,9,-5154.681,-12.24284,156.0377,0,0,0,100,0),
+(@PATH,10,-5139.686,8.807183,156.0377,0,0,0,100,0),
+(@PATH,11,-5115.668,15.1122,156.0377,0,0,0,100,0);
+
+SET @NPC := 78298;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5128.899,`position_y`=485.1413,`position_z`=149.4686 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5096.786,491.9447,149.4686,0,0,0,100,0),
+(@PATH,2,-5081.393,520.9803,149.5797,0,0,0,100,0),
+(@PATH,3,-5082.821,560.8444,149.4686,0,0,0,100,0),
+(@PATH,4,-5081.688,587.3782,149.4686,0,0,0,100,0),
+(@PATH,5,-5096.75,614.0341,149.4686,0,0,0,100,0),
+(@PATH,6,-5121.846,626.2573,149.4686,0,0,0,100,0),
+(@PATH,7,-5143.037,616.5057,149.4686,0,0,0,100,0),
+(@PATH,8,-5162.803,600.3235,149.4686,0,0,0,100,0),
+(@PATH,9,-5175.979,585.7052,149.4686,0,0,0,100,0),
+(@PATH,10,-5191.311,553.0349,149.4686,0,0,0,100,0),
+(@PATH,11,-5182.97,516.0972,149.4686,0,0,0,100,0),
+(@PATH,12,-5169.338,495.5091,149.4686,0,0,0,100,0),
+(@PATH,13,-5128.899,485.1413,149.4686,0,0,0,100,0);
+
+SET @NPC := 78299;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5203.09,`position_y`=230.2053,`position_z`=125.2333 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5200.994,194.2652,125.2333,0,0,0,100,0),
+(@PATH,2,-5209.843,162.355,125.2333,0,0,0,100,0),
+(@PATH,3,-5223.84,126.7766,125.2333,0,0,0,100,0),
+(@PATH,4,-5254.94,108.4594,125.2333,0,0,0,100,0),
+(@PATH,5,-5272.563,119.1082,125.2333,0,0,0,100,0),
+(@PATH,6,-5293.776,154.223,125.2333,0,0,0,100,0),
+(@PATH,7,-5298.729,171.8369,125.2333,0,0,0,100,0),
+(@PATH,8,-5300.312,208.0347,125.2333,0,0,0,100,0),
+(@PATH,9,-5283.916,251.8668,125.2333,0,0,0,100,0),
+(@PATH,10,-5241.004,262.8554,125.2333,0,0,0,100,0),
+(@PATH,11,-5203.09,230.2053,125.2333,0,0,0,100,0);
+
+SET @NPC := 78300;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5234.025,`position_y`=262.7202,`position_z`=131.392 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5255.758,267.988,131.392,0,0,0,100,0),
+(@PATH,2,-5280.832,303.0705,131.392,0,0,0,100,0),
+(@PATH,3,-5282.729,322.4258,131.392,0,0,0,100,0),
+(@PATH,4,-5269.899,354.7595,131.392,0,0,0,100,0),
+(@PATH,5,-5244.224,370.2118,131.392,0,0,0,100,0),
+(@PATH,6,-5201.63,377.0772,131.392,0,0,0,100,0),
+(@PATH,7,-5186.241,362.2412,131.392,0,0,0,100,0),
+(@PATH,8,-5178.872,334.1438,131.392,0,0,0,100,0),
+(@PATH,9,-5178.549,305.8703,131.392,0,0,0,100,0),
+(@PATH,10,-5190.308,282.2744,131.392,0,0,0,100,0),
+(@PATH,11,-5208.153,267.4322,131.392,0,0,0,100,0),
+(@PATH,12,-5234.025,262.7202,131.392,0,0,0,100,0);