Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	sql/old/3.3.5a/2012_08_06_00_world_command.sql
	sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
	sql/old/4.3.4/2012_08_06_00_world_command_434.sql
	sql/updates/characters/2012_08_07_00_characters_characters.sql
	sql/updates/characters/2012_08_07_00_characters_characters_434.sql
	sql/updates/world/2012_08_06_00_world_command.sql

95 files changed, 2311 insertions, 0 deletions

diff --git a/sql/old/3.3.5a/2012_06_13_00_characters_character_equipmentsets.sql b/sql/old/3.3.5a/2012_06_13_00_characters_character_equipmentsets.sql
new file mode 100644
index 00000000000..ebf12062be3
--- /dev/null
+++ b/sql/old/3.3.5a/2012_06_13_00_characters_character_equipmentsets.sql
@@ -0,0 +1,22 @@
+ALTER TABLE `character_equipmentsets`
+MODIFY COLUMN `item0` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item1` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item2` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item3` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item4` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item5` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item6` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item7` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item8` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item9` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item10` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item11` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item12` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item13` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item14` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item15` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item16` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item17` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item18` int(11) unsigned NOT NULL DEFAULT 0;
+
+ALTER TABLE `character_equipmentsets` ADD COLUMN `ignore_mask` int(11) unsigned NOT NULL DEFAULT 0 AFTER `iconname`;
diff --git a/sql/old/3.3.5a/2012_08_06_00_auth_logs.sql b/sql/old/3.3.5a/2012_08_06_00_auth_logs.sql
new file mode 100644
index 00000000000..04e90e7d208
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_06_00_auth_logs.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `logs` ADD COLUMN `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `type`;
+
diff --git a/sql/old/3.3.5a/2012_08_16_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_16_00_world_creature_template.sql
new file mode 100644
index 00000000000..732f647d7b7
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_16_00_world_creature_template.sql
@@ -0,0 +1,3 @@
+-- Added trigger flags to triggers
+UPDATE `creature_template` SET `flags_extra` = flags_extra | 128 WHERE `entry` = 34862;
+UPDATE `creature_template` SET `unit_flags` = unit_flags | 256 WHERE `entry` = 34862;
diff --git a/sql/old/3.3.5a/2012_08_16_00_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_16_00_world_spell_dbc.sql
new file mode 100644
index 00000000000..248674d17a5
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_16_00_world_spell_dbc.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_dbc` WHERE `Id`=35009;
+INSERT INTO `spell_dbc` (`Id`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`Targets`,`CastingTimeIndex`,`ProcCharges`,`SpellLevel`,`RangeIndex`,`Effect1`,`EffectDieSides1`,`EffectBasePoints1`,`EffectImplicitTargetA1`,`EffectImplicitTargetB1`,`EffectRadiusIndex1`,`SpellFamilyName`,`SpellFamilyFlags2`,`DmgMultiplier1`,`SchoolMask`,`Comment`) VALUES
+(35009,134545792,1024,268435460,65536,64,1,101,1,13,125,1,-11,22,16,27,10,4,1,6,'Invisibility - Reducing threat');
diff --git a/sql/old/3.3.5a/2012_08_17_00_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_17_00_world_spell_dbc.sql
new file mode 100644
index 00000000000..ee6d2d2f3b6
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_17_00_world_spell_dbc.sql
@@ -0,0 +1 @@
+UPDATE `spell_dbc` SET `ProcChance`=101,`ProcCharges`=0,`SpellFamilyName`=3,`SpellFamilyFlags2`=0 WHERE `Id`=35009;
diff --git a/sql/old/3.3.5a/2012_08_19_00_world_pickpocketing_loot_template.sql b/sql/old/3.3.5a/2012_08_19_00_world_pickpocketing_loot_template.sql
new file mode 100644
index 00000000000..773ad9b6ebc
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_19_00_world_pickpocketing_loot_template.sql
@@ -0,0 +1,11 @@
+-- Pickpocketing_loot_template
+UPDATE creature_template SET pickpocketloot=entry WHERE entry=28200;
+DELETE FROM `pickpocketing_loot_template` WHERE entry=28200;
+INSERT INTO `pickpocketing_loot_template` (`entry`,`item`,`ChanceorQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Dark Necromance
+(28200,37467,100,1,0,1,1),-- A Steamy Romance Novel: Forbidden Love
+(28200,43575,100,1,0,1,1),-- Reinforced Junkbox
+(28200,35952,30,1,0,1,1),-- Briny Hardcheese
+(28200,33447,22,1,0,1,1),-- Runic Healing Potion
+(28200,35948,10,1,0,1,1),-- Savory Snowplum
+(28200,35950,10,1,0,1,1);-- Sweet Potato Bread
diff --git a/sql/old/3.3.5a/2012_08_19_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_19_01_world_spell_dbc.sql
new file mode 100644
index 00000000000..69a9c2a8336
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_19_01_world_spell_dbc.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_dbc` WHERE `Id` IN (68184,68620);
+INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES
+(68184, 0, 0, 545259904, 0, 5, 268697856, 128, 0, 16777216, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 7, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Faction Champions - credit marker'),
+(68620, 0, 0, 545259904, 0, 5, 268697856, 128, 0, 16777216, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 7, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Resilience Will Fix It - achievement credit marker');
diff --git a/sql/old/3.3.5a/2012_08_20_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_20_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..d0aa185ea3a
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE (`spell_id`='33695');
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(33695, 'spell_pal_exorcism_and_holy_wrath_damage');
diff --git a/sql/old/3.3.5a/2012_08_20_01_world_wintergrasp_conditions.sql b/sql/old/3.3.5a/2012_08_20_01_world_wintergrasp_conditions.sql
new file mode 100644
index 00000000000..c97c753afa8
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_01_world_wintergrasp_conditions.sql
@@ -0,0 +1,31 @@
+-- Conditions
+-- Add gossip_menu condition for 9904 Horde
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup` IN (9904,9923);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`) VALUES
+(14,9904,13759,0,1,33280), -- Must have Rank 1: Corporal
+(14,9904,13759,1,1,55629), -- Or must have Rank 2: First Lieutenant
+(14,9904,13761,0,11,33280), -- Must not have Rank 1: Corporal
+(14,9904,13761,0,11,55629), -- Must not have Rank 2: First Lieutenant
+-- Add gossip_menu condition for 9923 Alliance
+(14,9923,13798,0,1,33280), -- Must have Rank 1: Corporal
+(14,9923,13798,1,1,55629), -- Or must have Rank 2: First Lieutenant
+(14,9923,14172,0,11,33280), -- Must not have Rank 1: Corporal
+(14,9923,14172,0,11,55629), -- Must not have Rank 2: First Lieutenant
+-- Add conditions to gossip options horde
+(15,9904,0,0,1,33280), -- Must have reached Rank 1: Corporal
+(15,9904,0,1,1,55629), -- Or must have reached Rank 2: First Lieutenant
+(15,9904,1,0,1,55629), -- Must have reached Rank 2: First Lieutenant
+(15,9904,2,0,1,55629), -- Must have reached Rank 2: First Lieutenant
+-- Add conditions to gossip options alliance
+(15,9923,0,0,1,33280), -- Must have reached Rank 1: Corporal
+(15,9923,0,1,1,55629), -- Or must have reached Rank 2: First Lieutenant
+(15,9923,1,0,1,55629), -- Must have reached Rank 2: First Lieutenant
+(15,9923,2,0,1,55629); -- Must have reached Rank 2: First Lieutenant
+
+/* Spell target conditions for spawning WG siege machines in proper place while building it */
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (56575,56661,56663,61408);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 56575, 0, 0, 31, 0, 3, 27852, 0, 0, 0, '', NULL),
+(13, 1, 56661, 0, 0, 31, 0, 3, 27852, 0, 0, 0, '', NULL),
+(13, 1, 56663, 0, 0, 31, 0, 3, 27852, 0, 0, 0, '', NULL),
+(13, 1, 61408, 0, 0, 31, 0, 3, 27852, 0, 0, 0, '', NULL);
diff --git a/sql/old/3.3.5a/2012_08_20_02_world_wintergrasp_creatures.sql b/sql/old/3.3.5a/2012_08_20_02_world_wintergrasp_creatures.sql
new file mode 100644
index 00000000000..1e75f37d32f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_02_world_wintergrasp_creatures.sql
@@ -0,0 +1,64 @@
+UPDATE `creature_template` SET `exp`=0, `ScriptName`= 'npc_wg_spirit_guide' WHERE `entry`=31841; -- Taunka Spirit Guide
+UPDATE `creature_template` SET `exp`=0, `ScriptName`= 'npc_wg_spirit_guide' WHERE `entry`=31842; -- Dwarven Spirit Guide
+UPDATE `creature_template` SET `exp`=0, `ScriptName`= 'npc_wg_quest_giver' WHERE `entry`=31052; -- Bowyer Randolph
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=39172; -- Marshal Magruder
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=30488; -- Travis Day
+UPDATE `creature_template` SET `exp`=0, `ScriptName`= 'npc_wg_quest_giver' WHERE `entry`=31053; -- Primalist Mulfort
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4, `ScriptName`= 'npc_wg_quest_giver' WHERE `entry`=31107; -- Lieutenant Murp (?)
+UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|768 WHERE `entry`=39173; -- Champion Ros'slai
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|16 WHERE `entry`=30740; -- Valiance Expedition Champion (?)
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=27852; -- Wintergrasp Control Arms
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1735,`npcflag`=16777216, `spell1`=51421, /* Fire Cannon */ `spell2`=0,`spell3`=0,`spell4`=0,`spell5`=0,`spell6`=0,`spell7`=0,`spell8`=0 WHERE `entry`=28366; -- Wintergrasp Tower Cannon
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1735,`npcflag`=16777216,`unit_flags`=16384,`unit_class`=4,`speed_walk`=1.2,`spell1`=57609, /* Fire Cannon */ `spell2`=0,`spell3`=0,`spell4`=0,`spell5`=0,`spell6`=0,`spell7`=0,`spell8`=0 WHERE `entry`=32629; -- Wintergrasp Siege Turret (H)
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1735,`npcflag`=16777216,`unit_flags`=16384,`unit_class`=4,`speed_walk`=1.2, `spell1`=57609, /* Fire Cannon */ `spell2`=0,`spell3`=0,`spell4`=0,`spell5`=0,`spell6`=0,`spell7`=0,`spell8`=0 WHERE `entry`=28319; -- Wintergrasp Siege Turret (A)
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1735,`npcflag`=16777216,`unit_flags`=16384,`unit_class`=4,`speed_walk`=1.2,`speed_run`=1, `spell1`=54109, /* Ram */ `spell2`=0,`spell3`=0,`spell4`=0,`spell5`=0,`spell6`=0,`spell7`=0,`spell8`=0 WHERE `entry`=32627; -- Wintergrasp Siege Engine (H)
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1735,`npcflag`=16777216,`unit_flags`=16384,`unit_class`=4,`speed_walk`=1.2,`speed_run`=1, `spell1`=54109, /* Ram */ `spell2`=0,`spell3`=0,`spell4`=0,`spell5`=0,`spell6`=0,`spell7`=0,`spell8`=0 WHERE `entry`=28312; -- Wintergrasp Siege Engine (A)
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1735,`npcflag`=16777216,`unit_flags`=16384,`speed_walk`=1.2,`speed_run`=1, `spell1`=54107, /* Ram */ `spell2`=50896, /* Hurl Boulder */ `spell3`=0,`spell4`=0,`spell5`=0,`spell6`=0,`spell7`=0,`spell8`=0 WHERE `entry`=28094; -- Wintergrasp Demolisher
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1735,`npcflag`=16777216,`unit_flags`=16384,`unit_class`=4,`speed_walk`=2.8,`speed_run`=1.71429, `spell1`=57606, /* Plague Barrel */ `spell2`=50989, /* Flame Breath */ `spell3`=0,`spell4`=0,`spell5`=0,`spell6`=0,`spell7`=0,`spell8`=0 WHERE `entry`=27881; -- Wintergrasp Catapult
+UPDATE `creature_template` SET `ScriptName`= 'npc_wg_queue' WHERE `entry` IN (32169,32170,35599,35596,35600,35601,35598,35603,35602,35597,35612,35611); -- <Wintergrasp Battle-Master>
+UPDATE `creature_template` SET `ScriptName`= 'npc_wg_demolisher_engineer' WHERE `entry` IN (30400,30499); -- Goblin Mechanic, Gnomish Engineer
+UPDATE `creature_template` SET `ScriptName`= 'npc_wg_quest_giver' WHERE `entry` IN (31054,31091,31036,31101,31051,31153,31151,31102,31106);
+UPDATE `creature_template` SET `gossip_menu_id`=9904 WHERE `entry`=30400;
+UPDATE `creature_template` SET `gossip_menu_id`=10229 WHERE `entry`=31091;
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1.65,`gender`=0 WHERE `modelid`=27894; -- Knight Dameron
+UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1.65,`gender`=0 WHERE `modelid`=31346; -- Marshal Magruder
+UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1.65,`gender`=0 WHERE `modelid`=31347; -- Champion Ros'slai
+UPDATE `creature_model_info` SET `bounding_radius`=0.305,`combat_reach`=5,`gender`=2 WHERE `modelid`=25301; -- Wintergrasp Siege Turret
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (31841,31842,30400,30499,30489,30869,31036,31051,31052,31054,31108,31109,31153,32294,39172,30870,31053,31091,31101,31102,31106,31107,31151,32296,39173,30740,32629,28319,28366,32627,28312,28094,27881,30739);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(31841,0,0,1,0, '58729'), -- Taunka Spirit Guide (Spiritual Immunity, Spirit Heal Channel) FIX: Do we need the spell that revives players here (22011)? It has a duration (found in sniffs). 
+(31842,0,0,1,0, '58729'), -- Dwarven Spirit Guide                                               This spell (and the spell it triggers, are used in the "ressurect system" in Battleground.cpp
+(30400,0,0,1,0, NULL), -- Goblin Mechanic
+(30499,0,0,1,0, NULL), -- Gnomish Engineer
+(30489,0,0,1,0, NULL), -- Morgan Day
+(30869,0,0,1,0, NULL), -- Arzo Safeflight
+(31036,14337,0,257,0, NULL), -- Commander Zanneth
+(31051,0,0,1,0, NULL), -- Sorceress Kaylana
+(31052,0,0,257,0, NULL), -- Bowyer Randolph
+(31054,0,0,257,0, NULL), -- Anchorite Tessa
+(31108,0,0,257,0, NULL), -- Siege Master Stouthandle
+(31109,0,0,257,0, NULL), -- Senior Demolitionist Legoso
+(31153,6569,0,257,0, NULL), -- Tactical Officer Ahbramis
+(32294,27247,0,1,0, NULL), -- Knight Dameron
+(39172,28912,0,1,0, NULL), -- Marshal Magruder
+(30870,0,0,1,0, NULL), -- Herzo Safeflight
+(31053,0,0,257,0, '18950'), -- Primalist Mulfort (Invisibility and Stealth Detection ... why?)
+(31091,0,0,257,0, '18950'), -- Commander Dardosh (Invisibility and Stealth Detection)
+(31101,0,0,1,0, NULL), -- Hoodoo Master Fu'jin
+(31102,0,0,1,0, NULL), -- Vieron Blazefeather
+(31106,0,0,257,0, NULL), -- Siegesmith Stronghoof
+(31107,0,0,257,0, NULL), -- Lieutenant Murp
+(31151,0,0,257,0, NULL), -- Tactical Officer Kilrath
+(32296,27245,0,1,0, NULL), -- Stone Guard Mukar
+(39173,29261,0,1,0, NULL), -- Champion Ros'slai
+(30740,0,0,257,375, NULL), -- Valiance Expedition Champion
+(32629,0,0,257,0, NULL), -- Wintergrasp Siege Turret
+(28319,0,0,257,0, NULL), -- Wintergrasp Siege Turret
+(28366,0,0,257,0, NULL), -- Wintergrasp Tower Cannon
+(32627,0,0,257,0, NULL), -- Wintergrasp Siege Engine
+(28312,0,0,257,0, NULL), -- Wintergrasp Siege Engine
+(28094,0,0,257,0, NULL), -- Wintergrasp Demolisher
+(27881,0,0,257,0, NULL), -- Wintergrasp Catapult
+(30739,0,0,257,375, NULL); -- Warsong Champion
diff --git a/sql/old/3.3.5a/2012_08_20_03_world_wintergrasp_gameobjects.sql b/sql/old/3.3.5a/2012_08_20_03_world_wintergrasp_gameobjects.sql
new file mode 100644
index 00000000000..c309bf1d9dd
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_03_world_wintergrasp_gameobjects.sql
@@ -0,0 +1,86 @@
+UPDATE `gameobject_template` SET `faction`=114 WHERE `entry` IN (192310,192312,192313,192314,192316,192317,192318,192319,192320,192321,192322,192323,192324,192325,192326,192327,192328,192329,
+192330,192331,192332,192333,192334,192335,192286,192287,192292,192299,192304,192305,192306,192307,192308,192309); -- Alliance Banner
+
+UPDATE `gameobject_template` SET `faction`=114 WHERE `entry` IN (192269,192284,192285,192338,192339,192349,192350,192351,192352,192353,192354,192355,192356,192357,192358,192359,192360,192361,
+192362,192363,192364,192366,192367,192368,192369,192370,192371,192372,192373,192374,192375,192376,192377,192378,192379,192254,
+192255,192336); -- Horde Banner
+
+UPDATE `gameobject_template` SET `faction`=114 WHERE `entry` IN (193096,193097,193098,193099,193100,193101,193102,193103,193104,193105,193106,193107,193108,193109,193124,193125,193126,193127,
+193128,193129,193130,193131,193132,193133,193134,193135,193136,193137,193138,193139,193140,193141,193142,193143,193144,193145,
+193146,193147,193148,193149,193150,193151,193152,193153,193154,193155,193156,193157,193158,193159,193160,193161,193162,193163,
+193164,193165); -- nameless GOs
+
+UPDATE `gameobject_template` SET `ScriptName`= 'go_wg_vehicle_teleporter' WHERE `entry`=192951; -- Vehicle Teleporter
+
+-- Before pushing to master check if guids are free.
+-- Spawns Workshop Capture Points
+SET @GUID := 71385;
+DELETE FROM gameobject WHERE id IN (190475,190487,194959,194962);
+DELETE FROM gameobject WHERE guid BETWEEN @GUID AND @GUID+3;
+INSERT INTO gameobject (guid,id,position_x,position_y,position_z,orientation,map) VALUES
+(@GUID+0, 190475, 4949.344238, 2432.585693, 320.176971, 1.386214, 571), -- ne
+(@GUID+1, 190487, 4948.524414, 3342.337891, 376.875366, 4.400566, 571), -- nw
+(@GUID+2, 194959, 4398.076660, 2356.503662, 376.190491, 0.525406, 571), -- se
+(@GUID+3, 194962, 4390.776367, 3304.094482, 372.429077, 6.097023, 571); -- sw
+
+-- Misc objects in fortress phased properly
+SET @OGUID := 71389;
+DELETE FROM `gameobject` WHERE `id` IN (193096,193097,193098,193099,193100,193101,193102,193103,193104,193105,193106,193107,193108,193109,193124,193125,193126,193127,193128,193129,193130,193131,193132,193133,193134,193135,193136,193137,193138,193139,193140,193141,193142,193143,193144,193145,193146,193147,193148,193149,193150,193151,193152,193153,193154,193155,193156,193157,193158,193159,193160,193161,193162,193163,193164,193165);
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+55;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@OGUID+0,193096,571,1,128,5379.885,3008.093,409.181915,-3.124123,0,0,0,0,120,0,1),
+(@OGUID+1,193097,571,1,128,5381.73975,3008.15454,409.181915,2.98449826,0,0,0,0,120,0,1),
+(@OGUID+2,193098,571,1,128,5383.672,3008.02783,409.181915,-3.115388,0,0,0,0,120,0,1),
+(@OGUID+3,193099,571,1,128,5386.25342,3007.79614,409.181915,2.932139,0,0,0,0,120,0,1),
+(@OGUID+4,193100,571,1,128,5387.354,3009.64941,409.181915,-1.30899549,0,0,0,0,120,0,1),
+(@OGUID+5,193101,571,1,128,5381.12744,3010.09717,409.181915,-2.72271276,0,0,0,0,120,0,1),
+(@OGUID+6,193102,571,1,128,5383.12061,3007.90967,410.8231,-2.530723,0,0,0,0,120,0,1),
+(@OGUID+7,193103,571,1,128,5381.105,3007.89575,410.8231,-3.09791875,0,0,0,0,120,0,1),
+(@OGUID+8,193104,571,1,128,5376.777,3010.619,409.191742,-2.60926127,0,0,0,0,120,0,1),
+(@OGUID+9,193105,571,1,128,5381.47559,3010.24731,410.8231,-2.80997539,0,0,0,0,120,0,1),
+(@OGUID+10,193106,571,1,128,5381.059,3009.85864,410.8231,2.66161919,0,0,0,0,120,0,1),
+(@OGUID+11,193107,571,1,128,5381.038,3010.44263,410.8157,-2.0507617,0,0,0,0,120,0,1),
+(@OGUID+12,193108,571,1,128,5379.83154,3007.82373,410.8161,-2.02457881,0,0,0,0,120,0,1),
+(@OGUID+13,193109,571,1,128,5379.99463,3008.40356,410.815918,-3.03687477,0,0,0,0,120,0,1),
+(@OGUID+14,193124,571,1,128,5293.65869,2924.44019,409.29306,1.20427489,0,0,0,0,120,0,1),
+(@OGUID+15,193125,571,1,1,5293.28,2932.32813,409.065247,-2.49581814,0,0,0,0,120,0,1),
+(@OGUID+16,193126,571,1,1,5292.30469,2930.5105,409.157135,-3.06302428,0,0,0,0,120,0,1),
+(@OGUID+17,193127,571,1,64,5293.349,2923.712,409.844757,-1.8762306,0,0,0,0,120,0,1),
+(@OGUID+18,193128,571,1,128,5293.12256,2895.22754,409.208771,-0.9861096,0,0,0,0,120,0,1),
+(@OGUID+19,193129,571,1,128,5292.913,2895.54346,410.419617,-0.122171074,0,0,0,0,120,0,1),
+(@OGUID+20,193130,571,1,128,5294.09473,2894.191,409.164063,-0.7330382,0,0,0,0,120,0,1),
+(@OGUID+21,193131,571,1,128,5295.1875,2895.382,409.143219,-0.349065244,0,0,0,0,120,0,1),
+(@OGUID+22,193132,571,1,128,5294.527,2895.57471,410.6591,-1.92858779,0,0,0,0,120,0,1),
+(@OGUID+23,193133,571,1,128,5295.3916,2895.05737,410.6686,0.6894028,0,0,0,0,120,0,1),
+(@OGUID+24,193134,571,1,128,5295.13525,2895.68481,410.618866,-2.22529364,0,0,0,0,120,0,1),
+(@OGUID+25,193135,571,1,128,5294.97559,2895.33521,410.657684,-2.73143482,0,0,0,0,120,0,1),
+(@OGUID+26,193136,571,1,128,5293.22559,2895.46436,410.413483,-0.802850962,0,0,0,0,120,0,1),
+(@OGUID+27,193137,571,1,128,5295.56,2895.24146,410.628052,-2.11184788,0,0,0,0,120,0,1),
+(@OGUID+28,193138,571,1,128,5293.741,2894.48169,409.183167,-2.72271276,0,0,0,0,120,0,1),
+(@OGUID+29,193139,571,1,64,5294.599,2786.85254,409.8877,-2.356195,0,0,0,0,120,0,1),
+(@OGUID+30,193140,571,1,64,5294.37939,2785.03833,409.175018,-2.33873963,0,0,0,0,120,0,1),
+(@OGUID+31,193141,571,1,64,5293.205,2787.03052,409.218872,3.03687477,0,0,0,0,120,0,1),
+(@OGUID+32,193142,571,1,64,5294.241,2786.42456,409.174347,0.0174524616,0,0,0,0,120,0,1),
+(@OGUID+33,193143,571,1,64,5291.705,2785.86646,409.282135,-2.03330517,0,0,0,0,120,0,1),
+(@OGUID+34,193144,571,1,64,5293.03369,2785.632,409.22522,-1.2915417,0,0,0,0,120,0,1),
+(@OGUID+35,193145,571,1,64,5295.866,2787.7666,409.1923,2.155478,0,0,0,0,120,0,1),
+(@OGUID+36,193146,571,1,64,5293.56445,2787.31079,410.55954,0.261798173,0,0,0,0,120,0,1),
+(@OGUID+37,193147,571,1,128,5233.12061,2920.362,409.163544,-0.7243115,0,0,0,0,120,0,1),
+(@OGUID+38,193148,571,1,128,5238.27539,2920.67358,409.256439,-0.418878615,0,0,0,0,120,0,1),
+(@OGUID+39,193149,571,1,128,5235.902,2920.751,409.224457,-0.951203167,0,0,0,0,120,0,1),
+(@OGUID+40,193150,571,1,128,5237.36963,2919.89771,409.556641,0.8202983,0,0,0,0,120,0,1),
+(@OGUID+41,193151,571,1,128,5234.19775,2918.99731,409.322754,-2.33873963,0,0,0,0,120,0,1),
+(@OGUID+42,193152,571,1,128,5234.52344,2921.76221,409.175781,-2.2165668,0,0,0,0,120,0,1),
+(@OGUID+43,193153,571,1,128,5234.119,2918.93921,409.1339,-3.098036,0,0,0,0,120,0,1),
+(@OGUID+44,193154,571,1,128,5234.26758,2919.40015,409.502869,-2.18166113,0,0,0,0,120,0,1),
+(@OGUID+45,193155,571,1,128,5293.37939,2746.05566,409.22052,-0.06981169,0,0,0,0,120,0,1),
+(@OGUID+46,193156,571,1,128,5293.65039,2755.67529,409.1913,-0.43633157,0,0,0,0,120,0,1),
+(@OGUID+47,193157,571,1,128,5292.23535,2753.59473,409.0867,-0.357789934,0,0,0,0,120,0,1),
+(@OGUID+48,193158,571,1,128,5292.42969,2748.62427,409.131042,0.253072351,0,0,0,0,120,0,1),
+(@OGUID+49,193159,571,1,128,5293.384,2750.90283,409.234924,-0.0610866137,0,0,0,0,120,0,1),
+(@OGUID+50,193160,571,1,64,5371.89746,2805.47583,409.3072,0.0610866137,0,0,0,0,120,0,1),
+(@OGUID+51,193161,571,1,64,5376.616,2875.105,409.254822,1.59697616,0,0,0,0,120,0,1),
+(@OGUID+52,193162,571,1,128,5377.54932,2870.92456,409.239166,-0.549776852,0,0,0,0,120,0,1),
+(@OGUID+53,193163,571,1,128,5378.068,2813.61719,409.239166,1.55334139,0,0,0,0,120,0,1),
+(@OGUID+54,193164,571,1,128,5378.921,2805.43677,409.239166,1.53588688,0,0,0,0,120,0,1),
+(@OGUID+55,193165,571,1,128,5378.452,2876.67456,409.239166,1.54461825,0,0,0,0,120,0,1);
diff --git a/sql/old/3.3.5a/2012_08_20_04_world_wintergrasp_gossips.sql b/sql/old/3.3.5a/2012_08_20_04_world_wintergrasp_gossips.sql
new file mode 100644
index 00000000000..87b96b765a6
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_04_world_wintergrasp_gossips.sql
@@ -0,0 +1,20 @@
+-- Gossip Menu
+DELETE FROM `gossip_menu` WHERE `entry`=9904 AND `text_id`=13759;
+DELETE FROM `gossip_menu` WHERE `entry`=9904 AND `text_id`=13761;
+DELETE FROM `gossip_menu` WHERE `entry`=9923 AND `text_id`=14172;
+DELETE FROM `gossip_menu` WHERE `entry`=10229 AND `text_id`=14221;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(9904,13759),
+(9904,13761),
+(9923,14172),
+(10229,14221);
+
+-- Gossip Menu Option
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=9904;
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=10129 AND `id` IN (2,4);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(9904,0,0, 'I would like to build a catapult.',1,1,0,0,0,0, ''),
+(9904,1,0, 'I would like to build a demolisher.',1,1,0,0,0,0, ''),
+(9904,2,0, 'I would like to build a siege engine.',1,1,0,0,0,0, ''),
+(10129,2,0, 'Guide me to the Broken Temple Graveyard.',1,1,0,0,0,0, ''),
+(10129,4,0, 'Guide me to the Eastspark Graveyard.',1,1,0,0,0,0, '');
diff --git a/sql/old/3.3.5a/2012_08_20_05_world_wintergrasp_quests.sql b/sql/old/3.3.5a/2012_08_20_05_world_wintergrasp_quests.sql
new file mode 100644
index 00000000000..d456f5d5e71
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_05_world_wintergrasp_quests.sql
@@ -0,0 +1,16 @@
+-- Wintergrasp Quests - Horde
+UPDATE `quest_template` SET `ExclusiveGroup`=13180 WHERE `id` IN (13180,13178); -- Slay them all!
+UPDATE `quest_template` SET `ExclusiveGroup`=13185 WHERE `id` IN (13185,13223); -- Stop/Defend the Siege
+UPDATE `quest_template` SET `ExclusiveGroup`=13201 WHERE `id` IN (13201,13194); -- Healing with Roses
+UPDATE `quest_template` SET `ExclusiveGroup`=13199 WHERE `id` IN (13193,13199); -- Bones and Arrows
+UPDATE `quest_template` SET `ExclusiveGroup`=13192 WHERE `id` IN (13192,13202); -- Warding/Jinxing the Walls
+UPDATE `quest_template` SET `ExclusiveGroup`=13200 WHERE `id` IN (13200,13191); -- Fueling the Demolishers
+
+-- Wintergrasp Quests - Alliance
+UPDATE `quest_template` SET `ExclusiveGroup`=13179 WHERE `id` IN (13179,13177); -- No Mercy for the Merciless
+UPDATE `quest_template` SET `ExclusiveGroup`=13186 WHERE `id` IN (13186,13222); -- Stop/Defend the Siege
+UPDATE `quest_template` SET `ExclusiveGroup`=13195 WHERE `id` IN (13195,13156); -- A Rare Herb
+UPDATE `quest_template` SET `ExclusiveGroup`=13196 WHERE `id` IN (13196,13154); -- Bones and Arrows
+UPDATE `quest_template` SET `ExclusiveGroup`=13198 WHERE `id` IN (13198,13153); -- Warding the Warriors
+
+-- Note: The offered quests (they are in pairs) depend on who controls the keep. npc_wg_quest_giver does that already?
diff --git a/sql/old/3.3.5a/2012_08_20_06_world_wintergrasp_spells.sql b/sql/old/3.3.5a/2012_08_20_06_world_wintergrasp_spells.sql
new file mode 100644
index 00000000000..cb2bd219e40
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_06_world_wintergrasp_spells.sql
@@ -0,0 +1,81 @@
+--  54640 Teleport (Teleports defenders behind the walls on the Isle of Ulduran, Strand of the Ancients) - FIX THIS?
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=54640;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(54640,54643,0, 'WG teleporter');
+
+-- Spell area
+DELETE FROM `spell_area` WHERE `spell` IN (58730,57940);
+INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES
+(58730,4581,0,0,0,0,0,2,1), -- Restricted Flight Area (Wintergrasp Eject)
+(58730,4539,0,0,0,0,0,2,1),
+(58730,4197,0,0,0,0,0,2,1),
+(58730,4585,0,0,0,0,0,2,1),
+(58730,4612,0,0,0,0,0,2,1),
+(58730,4582,0,0,0,0,0,2,1),
+(58730,4583,0,0,0,0,0,2,1),
+(58730,4589,0,0,0,0,0,2,1),
+(58730,4575,0,0,0,0,0,2,1),
+(58730,4538,0,0,0,0,0,2,1),
+(58730,4577,0,0,0,0,0,2,1),
+(57940,65,0,0,0,0,0,2,1), -- Essence of Wintergrasp
+(57940,66,0,0,0,0,0,2,1),
+(57940,67,0,0,0,0,0,2,1),
+(57940,206,0,0,0,0,0,2,1),
+(57940,210,0,0,0,0,0,2,1),
+(57940,394,0,0,0,0,0,2,1),
+(57940,395,0,0,0,0,0,2,1),
+(57940,1196,0,0,0,0,0,2,1),
+(57940,2817,0,0,0,0,0,2,1),
+(57940,3456,0,0,0,0,0,2,1),
+(57940,3477,0,0,0,0,0,2,1),
+(57940,3537,0,0,0,0,0,2,1),
+(57940,3711,0,0,0,0,0,2,1),
+(57940,4100,0,0,0,0,0,2,1),
+(57940,4196,0,0,0,0,0,2,1),
+(57940,4228,0,0,0,0,0,2,1),
+(57940,4264,0,0,0,0,0,2,1),
+(57940,4265,0,0,0,0,0,2,1),
+(57940,4272,0,0,0,0,0,2,1),
+(57940,4273,0,0,0,0,0,2,1),
+(57940,4395,0,0,0,0,0,2,1),
+(57940,4415,0,0,0,0,0,2,1),
+(57940,4416,0,0,0,0,0,2,1),
+(57940,4493,0,0,0,0,0,2,1),
+(57940,4494,0,0,0,0,0,2,1),
+(57940,4603,0,0,0,0,0,2,1);
+
+DELETE FROM `spell_area` WHERE `spell` IN (56618, 56617);
+INSERT INTO `spell_area` (`spell`,`area`,`autocast`) VALUES
+(56618, 4538, 1),
+(56617, 4538, 1),
+(56618, 4539, 1),
+(56617, 4539, 1),
+(56618, 4611, 1),
+(56617, 4611, 1),
+(56618, 4612, 1),
+(56617, 4612, 1);
+
+-- Spell scripts. replace with SAI
+DELETE FROM `spell_scripts` WHERE `id`=49899;
+INSERT INTO `spell_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(49899,0,1,406,0,0,0,0,0,0); -- Activate Robotic Arms 
+
+-- Spell Target position for Wintergrasp Graveyard spells
+DELETE FROM `spell_target_position` WHERE `id` IN (59760,59762,59763,59765,59766,59767,59769);
+INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
+(59760,571,5537.986,2897.493,517.057,4.819249), -- Teleport: Fortress Graveyard 
+(59762,571,5104.750,2300.940,368.579,0.733038), -- Teleport: Sunken Ring "area 4538"
+(59763,571,5099.120,3466.036,368.484,5.317802), -- Teleport: Broken Temple "area 4539 & 4589"
+(59765,571,5032.454,3711.382,372.468,3.971623), -- Teleport: Horde Landing Zone
+(59766,571,4331.716,3235.695,390.251,0.008500), -- Teleport: Westspark Factory Graveyard "area 4611"
+(59767,571,4314.648,2408.522,392.642,6.268125), -- Teleport: Eastspark Factory Graveyard "area 4612"
+(59769,571,5140.790,2179.120,390.950,1.972220); -- Teleport: Alliance Landing Zone
+
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (61409, 56662, 56664, 56659, 49899, 61178);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(61409, 'spell_wintergrasp_force_building'),
+(56659, 'spell_wintergrasp_force_building'),
+(56662, 'spell_wintergrasp_force_building'),
+(56664, 'spell_wintergrasp_force_building'),
+(49899, 'spell_wintergrasp_force_building'),
+(61178, 'spell_wintergrasp_grab_passenger');
diff --git a/sql/old/3.3.5a/2012_08_20_07_world_wintergrasp_texts.sql b/sql/old/3.3.5a/2012_08_20_07_world_wintergrasp_texts.sql
new file mode 100644
index 00000000000..090c5350c74
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_07_world_wintergrasp_texts.sql
@@ -0,0 +1,108 @@
+-- Unused yet: 
+-- Wintergrasp is under attack!
+-- Wintergrasp Fortress is under attack!
+-- Winter's Edge Tower is under attack!
+-- Eastern Bridge is under attack!
+-- Western Bridge is under attack!
+-- Westspark Bridge is under attack!
+-- Flamewatch Tower is under attack!
+
+-- 'You have reached Rank 1: Corporal' Sent to player by raid leader
+-- 'You have reached Rank 2: First Lieutenant' Sent to player by raid leader
+
+-- Wintergrasp coreside texts
+DELETE FROM `trinity_string` WHERE `entry` BETWEEN 12050 AND 12072;
+INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`)VALUES
+(12050, '%s has been captured by %s ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12051, '%s is under attack by %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12052, 'The Broken Temple siege workshop', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12053, 'Eastspark siege workshop', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12054, 'Westspark siege workshop', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12055, 'The Sunken Ring siege workshop', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12057, 'Alliance', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12056, 'Horde', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12058, 'The battle for Wintergrasp is about to begin!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12059, 'You have reached Rank 1: Corporal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12060, 'You have reached Rank 2: First Lieutenant', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12061, 'The south-eastern keep tower', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12062, 'The north-eastern keep tower', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12063, 'The south-western keep tower', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12064, 'The north-western keep tower', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12065, '%s has been damaged !', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12066, '%s has been destroyed!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12067, 'The battle for Wintergrasp begin!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12068, '%s has successfully defended the Wintergrasp fortress!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12069, 'The southern tower', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12070, 'The eastern tower', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12071, 'The western tower', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(12072, 'The Wintergrasp fortress has been captured by %s !', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+-- Wintergrasp script texts
+DELETE FROM `script_texts` WHERE entry BETWEEN -1850507 AND -1850500;
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`)VALUES
+(0, -1850500, 'Guide me to the Fortress Graveyard.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
+(0, -1850501, 'Guide me to the Sunken Ring Graveyard.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
+(0, -1850502, 'Guide me to the Broken Temple Graveyard.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
+(0, -1850503, 'Guide me to the Westspark Graveyard.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
+(0, -1850504, 'Guide me to the Eastspark Graveyard.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
+(0, -1850505, 'Guide me back to the Horde landing camp.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
+(0, -1850506, 'Guide me back to the Alliance landing camp.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
+(0, -1850507, 'Se mettre dans la file pour le Joug-d''hiver.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''); -- (Needs proper english text, maybe "Get in the queue for Wintergrasp."?)
+
+-- New support-commands for battlefield class
+DELETE FROM `command` WHERE name IN ('bf start', 'bf stop', 'bf enable', 'bf switch', 'bf timer');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('bf start',3,'Syntax: .bf start #battleid'),
+('bf stop',3,'Syntax: .bf stop #battleid'),
+('bf enable',3,'Syntax: .bf enable #battleid'),
+('bf switch',3,'Syntax: .bf switch #battleid'),
+('bf timer',3,'Syntax: .bf timer #battleid #timer');
+
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=15214 AND `groupid` BETWEEN 0 AND 30;
+DELETE FROM `creature_text` WHERE `entry` IN (31036,31091) AND `groupid` BETWEEN 0 AND 3;
+DELETE FROM `creature_text` WHERE `entry` IN (31108,31109,34924) AND `groupid`=0;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(15214,0,0, 'Let the battle begin!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,1,0, 'The southern tower has been damaged!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,2,0, 'The southern tower has been destroyed!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,3,0, 'The eastern tower has been damaged!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,4,0, 'The eastern tower has been destroyed!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,5,0, 'The western tower has been damaged!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,6,0, 'The western tower has been destroyed!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,7,0, 'The north-western keep tower has been damaged!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,8,0, 'The north-western keep tower has been destroyed!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,9,0, 'The south-eastern keep tower has been damaged!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,10,0, 'The south-eastern keep tower has been destroyed!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,11,0, 'The Broken Temple siege workshop has been attacked by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,12,0, 'The Broken Temple siege workshop has been captured by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,13,0, 'The Broken Temple siege workshop has been attacked by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,14,0, 'The Broken Temple siege workshop has been captured by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,15,0, 'The Eastspark siege workshop has been attacked by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,16,0, 'The Eastspark siege workshop has been captured by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,17,0, 'The Eastspark siege workshop has been attacked by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,18,0, 'The Eastspark siege workshop has been captured by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,19,0, 'The Sunken Ring siege workshop has been attacked by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,20,0, 'The Sunken Ring siege workshop has been captured by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,21,0, 'The Sunken Ring siege workshop has been attacked by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,22,0, 'The Sunken Ring siege workshop has been captured by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,23,0, 'The Westspark siege workshop has been attacked by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,24,0, 'The Westspark siege workshop has been captured by the Alliance!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,25,0, 'The Westspark siege workshop has been attacked by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,26,0, 'The Westspark siege workshop has been captured by the Horde!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,27,0, 'The Alliance has defended Wintergrasp Fortress!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,28,0, 'The Alliance has captured Wintergrasp Fortress!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,29,0, 'The Horde has defended Wintergrasp Fortress!',3,0,100,0,0,0, 'Invisible Stalker'),
+(15214,30,0, 'The Horde has captured Wintergrasp Fortress!',3,0,100,0,0,0, 'Invisible Stalker'),
+-- Not sure if all Alliance text is here, need horde text
+(31036,0,0, 'The first of the Horde towers has fallen! Destroy all three and we will hasten their retreat!',1,7,100,0,0,0, 'Commander Zanneth'),
+(31036,1,0, 'The second tower has fallen! Destroy the final tower and we will hasten their retreat!',1,7,100,0,0,0, 'Commander Zanneth'),
+(31036,2,0, 'The Horde towers have fallen! We have forced their hand. Finish off the remaining forces!',1,7,100,0,0,0, 'Commander Zanneth'),
+(31036,3,0, 'Show those animals no mercy, $n!',0,7,100,0,0,0, 'Commander Zanneth'),
+(31091,0,0, 'The first of the Alliance towers has fallen! Destroy all three and we will hasten their retreat!',1,7,100,0,0,0, 'Commander Dardosh'),
+(31091,1,0, 'Lok''tar! The second tower falls! Destroy the final tower and we will hasten their retreat!',1,7,100,0,0,0, 'Commander Dardosh'),
+(31091,2,0, 'The Alliance towers have fallen! We have forced their hand. Finish off the remaining forces!',1,7,100,0,0,0, 'Commander Dardosh'),
+(31091,3,0, 'Show those animals no mercy, $n!',0,7,100,0,0,0, 'Commander Dardosh'), -- ???
+(31108,0,0, 'Stop the Horde from retrieving the embers, $n. We cannot risk them having the advantage when the battle resumes!',0,7,100,0,0,0, 'Siege Master Stouthandle'),
+(31109,0,0, 'Destroy their foul machines of war, $n!',0,7,100,0,0,0, 'Senior Demolitionist Legoso'),
+(34924,0,0, 'The gates have been breached! Defend the keep!',1,0,100,0,0,0, 'High Commander Halford Wyrmbane');
diff --git a/sql/old/3.3.5a/2012_08_20_08_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_08_20_08_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..fa995e7804f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_08_world_achievement_criteria_data.sql
@@ -0,0 +1,4 @@
+DELETE FROM `achievement_criteria_data` WHERE criteria_id = 7703;
+INSERT INTO `achievement_criteria_data` VALUES
+(7703, 6, 4197, 0, ''),
+(7703, 11, 0, 0, 'achievement_wg_didnt_stand_a_chance');
diff --git a/sql/old/3.3.5a/2012_08_20_09_world_disables.sql b/sql/old/3.3.5a/2012_08_20_09_world_disables.sql
new file mode 100644
index 00000000000..fa5010b669f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_20_09_world_disables.sql
@@ -0,0 +1 @@
+DELETE FROM `disables` WHERE `entry` = 7703 AND `sourceType` = 4;
diff --git a/sql/old/3.3.5a/2012_08_21_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_08_21_00_world_spell_proc_event.sql
new file mode 100644
index 00000000000..e1a8b59acae
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_21_00_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry`=64752;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+(64752,0,7,8392704,256,2097152,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2012_08_21_01_world_command.sql b/sql/old/3.3.5a/2012_08_21_01_world_command.sql
new file mode 100644
index 00000000000..df833d2d246
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_21_01_world_command.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE name='quest reward';
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('quest reward',3,'Syntax: .quest reward #questId\n\n\Grants quest reward to selected player and removes quest from his log (quest must be in completed state).');
diff --git a/sql/old/3.3.5a/2012_08_21_02_world_wintergrasp_conditions.sql b/sql/old/3.3.5a/2012_08_21_02_world_wintergrasp_conditions.sql
new file mode 100644
index 00000000000..caf8a0cc1e4
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_21_02_world_wintergrasp_conditions.sql
@@ -0,0 +1,23 @@
+-- Conditions
+-- Add gossip_menu condition for 9904 Horde
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup` IN (9904,9923);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`NegativeCondition`) VALUES
+(14,9904,13759,0,1,33280,0), -- Must have Rank 1: Corporal
+(14,9904,13759,1,1,55629,0), -- Or must have Rank 2: First Lieutenant
+(14,9904,13761,0,1,33280,1), -- Must not have Rank 1: Corporal
+(14,9904,13761,0,1,55629,1), -- Must not have Rank 2: First Lieutenant
+-- Add gossip_menu condition for 9923 Alliance
+(14,9923,13798,0,1,33280,0), -- Must have Rank 1: Corporal
+(14,9923,13798,1,1,55629,0), -- Or must have Rank 2: First Lieutenant
+(14,9923,14172,0,1,33280,1), -- Must not have Rank 1: Corporal
+(14,9923,14172,0,1,55629,1), -- Must not have Rank 2: First Lieutenant
+-- Add conditions to gossip options horde
+(15,9904,0,0,1,33280,0), -- Must have reached Rank 1: Corporal
+(15,9904,0,1,1,55629,0), -- Or must have reached Rank 2: First Lieutenant
+(15,9904,1,0,1,55629,0), -- Must have reached Rank 2: First Lieutenant
+(15,9904,2,0,1,55629,0), -- Must have reached Rank 2: First Lieutenant
+-- Add conditions to gossip options alliance
+(15,9923,0,0,1,33280,0), -- Must have reached Rank 1: Corporal
+(15,9923,0,1,1,55629,0), -- Or must have reached Rank 2: First Lieutenant
+(15,9923,1,0,1,55629,0), -- Must have reached Rank 2: First Lieutenant
+(15,9923,2,0,1,55629,0); -- Must have reached Rank 2: First Lieutenant
diff --git a/sql/old/3.3.5a/2012_08_23_00_world_wintergrasp_spell_script_names.sql b/sql/old/3.3.5a/2012_08_23_00_world_wintergrasp_spell_script_names.sql
new file mode 100644
index 00000000000..a3dbf81d425
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_23_00_world_wintergrasp_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` = 54640;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(54640, 'spell_wintergrasp_defender_teleport');
diff --git a/sql/old/3.3.5a/2012_08_23_01_world_wintergrasp_gameobject.sql b/sql/old/3.3.5a/2012_08_23_01_world_wintergrasp_gameobject.sql
new file mode 100644
index 00000000000..27f7b4027f1
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_23_01_world_wintergrasp_gameobject.sql
@@ -0,0 +1 @@
+DELETE FROM `gameobject` WHERE `guid` IN (67259,67135,60476,66674,66675,67127,67128,66728,66731,67125,66730,66732,67126,67256,67132,67133,66733,67134,67251,67255,67129,67130,67131,67253,67258,67259,67260,75975,75976,76021,76022,66729,66718,66719,66720,66721,66722,66723,66724,66725,66726);
diff --git a/sql/old/3.3.5a/2012_08_25_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_25_00_world_creature_template.sql
new file mode 100644
index 00000000000..f7ec4c87fb9
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_25_00_world_creature_template.sql
@@ -0,0 +1,3 @@
+-- Wintergrasp Siege Turret
+UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1732 WHERE `entry`=28319; -- Alliance
+UPDATE `creature_template` SET `faction_A`=1735,`faction_H`=1735 WHERE `entry`=32629; -- Horde
diff --git a/sql/old/3.3.5a/2012_08_25_01_world_creature_template.sql b/sql/old/3.3.5a/2012_08_25_01_world_creature_template.sql
new file mode 100644
index 00000000000..ef8e5bdd8fc
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_25_01_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `faction_A`=103,`faction_H`=103 WHERE `entry` IN (30890,31540); -- Twilight Whelp
diff --git a/sql/old/3.3.5a/2012_08_26_00_world_conditions.sql b/sql/old/3.3.5a/2012_08_26_00_world_conditions.sql
new file mode 100644
index 00000000000..c33d9bfc878
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_26_00_world_conditions.sql
@@ -0,0 +1,5 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=61632;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,7,61632,0,0,31,0,3,30449,0,0,0,'','Sartharion Berserk - Only hit Tenebron, Shadron & Vesperon'),
+(13,7,61632,0,1,31,0,3,30451,0,0,0,'','Sartharion Berserk - Only hit Tenebron, Shadron & Vesperon'),
+(13,7,61632,0,2,31,0,3,30452,0,0,0,'','Sartharion Berserk - Only hit Tenebron, Shadron & Vesperon');
diff --git a/sql/old/3.3.5a/2012_08_26_01_world_creature.sql b/sql/old/3.3.5a/2012_08_26_01_world_creature.sql
new file mode 100644
index 00000000000..af14886850d
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_26_01_world_creature.sql
@@ -0,0 +1 @@
+UPDATE `creature` SET `phaseMask`=256 WHERE `id`=34300;
diff --git a/sql/old/3.3.5a/2012_08_26_02_world_spell_area.sql b/sql/old/3.3.5a/2012_08_26_02_world_spell_area.sql
new file mode 100644
index 00000000000..c4eae68e3c4
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_26_02_world_spell_area.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_area` WHERE spell=58045;
+INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES
+(58045,4197,0,0,0,0,0,2,1);
diff --git a/sql/old/3.3.5a/2012_08_26_03_world_spell_area.sql b/sql/old/3.3.5a/2012_08_26_03_world_spell_area.sql
new file mode 100644
index 00000000000..65072d2b4a7
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_26_03_world_spell_area.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_area` WHERE spell=74411 AND `area`=4197;
+INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES
+(74411,4197,0,0,0,0,0,2,1);
diff --git a/sql/old/3.3.5a/2012_08_27_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_27_00_world_creature_template.sql
new file mode 100644
index 00000000000..804d7b5c61d
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_00_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- NPC script linking for Wyrmrest Defender ID: 27629
+UPDATE `creature_template` SET `ScriptName`='npc_wyrmrest_defender' WHERE `entry`=27629;
diff --git a/sql/old/3.3.5a/2012_08_27_00_world_spell_script_name.sql b/sql/old/3.3.5a/2012_08_27_00_world_spell_script_name.sql
new file mode 100644
index 00000000000..1d036df0a65
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_00_world_spell_script_name.sql
@@ -0,0 +1,4 @@
+-- Spell script name linking for Defending Wyrmrest Temple: Character Script Cast From Gossip ID: 49123
+DELETE FROM `spell_script_names` WHERE `spell_id`=49213;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(49213,'spell_q12372_cast_from_gossip_trigger');
diff --git a/sql/old/3.3.5a/2012_08_27_01_world_sai.sql b/sql/old/3.3.5a/2012_08_27_01_world_sai.sql
new file mode 100644
index 00000000000..302c3ac1942
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_01_world_sai.sql
@@ -0,0 +1,13 @@
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17398;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=17398;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN  (-85712,-85717,-85719,-85724);
+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
+(-85724, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22299, 0, 0, 0, 0, 0, 0, 'Blood Furnace - First Cell'),
+(-85719, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22297, 0, 0, 0, 0, 0, 0, 'Blood Furnace - Second Cell'),
+(-85717, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22298, 0, 0, 0, 0, 0, 0, 'Blood Furnace - Third Cell'),
+(-85712, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22296, 0, 0, 0, 0, 0, 0, 'Blood Furnace - Fourth Cell');
+
+DELETE FROM `gameobject_scripts` WHERE `id`=150441;
+INSERT INTO `gameobject_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(150441, 3, 11, 22295, 0, 0, 0, 0, 0, 0);
diff --git a/sql/old/3.3.5a/2012_08_27_02_world_creature.sql b/sql/old/3.3.5a/2012_08_27_02_world_creature.sql
new file mode 100644
index 00000000000..3595ea7b576
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_02_world_creature.sql
@@ -0,0 +1,4 @@
+SET @GUID = 42638; -- Set by TDB team (need X)
+DELETE FROM `creature` WHERE `guid`=@GUID AND `id`=7172;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES
+(@GUID,7172,70,1,1,0,0,150.466,306.014,-49.543,5.2359,300,0,0,1,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2012_08_27_02_world_playercreateinfo_spell.sql b/sql/old/3.3.5a/2012_08_27_02_world_playercreateinfo_spell.sql
new file mode 100644
index 00000000000..9c664142bba
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_02_world_playercreateinfo_spell.sql
@@ -0,0 +1,9 @@
+DELETE FROM `playercreateinfo_spell` WHERE `Spell` IN (59221,59535,59536,59538,59539,59540,59541);
+INSERT INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) VALUES
+(11,1,59221,'Shadow Resistance'),
+(11,2,59535,'Shadow Resistance'),
+(11,3,59536,'Shadow Resistance'),
+(11,5,59538,'Shadow Resistance'),
+(11,6,59539,'Shadow Resistance'),
+(11,7,59540,'Shadow Resistance'),
+(11,8,59541,'Shadow Resistance');
diff --git a/sql/old/3.3.5a/2012_08_27_03_world_gameobject.sql b/sql/old/3.3.5a/2012_08_27_03_world_gameobject.sql
new file mode 100644
index 00000000000..1bf836c96e0
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_03_world_gameobject.sql
@@ -0,0 +1,6 @@
+-- Spawn Blackened Urn (194092) GO based on sniff by Aokromes
+SET @GUID := 334; -- Set by TDB team
+
+DELETE FROM `gameobject` WHERE `id`=194092;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@GUID,194092,532,1,1,-11126.87,-1874.455,91.47264,6.056293,0,0,-0.113203,0.9935719,180,100,1);
diff --git a/sql/old/3.3.5a/2012_08_27_04_world_quest_template.sql b/sql/old/3.3.5a/2012_08_27_04_world_quest_template.sql
new file mode 100644
index 00000000000..9169a6e5862
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_04_world_quest_template.sql
@@ -0,0 +1 @@
+UPDATE `quest_template` SET `NextQuestId`=12257 WHERE `ID`=12468;
diff --git a/sql/old/3.3.5a/2012_08_27_05_world_sai.sql b/sql/old/3.3.5a/2012_08_27_05_world_sai.sql
new file mode 100644
index 00000000000..3da0143e6e6
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_05_world_sai.sql
@@ -0,0 +1,56 @@
+-- A Race Against Time (11671)
+
+SET @NPC_SALRAND                := 25584; -- Inquisitor Salrand
+SET @NPC_BERYL_INVISMAN         := 25594; -- Beryl Point InvisMan
+SET @GOB_BERYL_SHIELD           := 187773; -- Beryl Shield
+SET @GOB_BERYL_SHIELD_FOCUS     := 300176; -- TEMP Beryl Force Shield
+SET @SPELL_BEAM                 := 45777; -- Salrand's Beam
+SET @SPELL_THROW_DETONATOR      := 45780; -- Throw Beryl Shield Detonator
+SET @SPELL_SUMMON_DETONATOR     := 45791; -- Summon Beryl Detonator
+SET @SPELL_EXPLOSION            := 45796; -- Beryl Shield Explosion
+SET @SPELL_LOCKBOX              := 45809; -- Summon Salrand's Lockbox
+SET @GUID                       := 60441; -- used for a wrong go spawn,will reuse
+
+UPDATE `gameobject_template` SET `data1`=80 WHERE  `entry`=300176; -- spell focus radius
+UPDATE `gameobject_template` SET `flags`=32 WHERE  `entry`=187773; -- shield:nodespawn flag
+
+-- missing spell focus
+DELETE FROM `gameobject` WHERE `guid`=@GUID;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@GUID,@GOB_BERYL_SHIELD_FOCUS,571,1,1,3392.85,6161.089,79.8313,0,0,0,0,0,300,0,1);
+
+UPDATE `creature_template` SET `InhabitType`=0x4,`unit_flags`=0x100,`AIName`='SmartAI' WHERE `entry`=@NPC_SALRAND;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@NPC_BERYL_INVISMAN;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_SALRAND;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_SALRAND,0,0x0,0x1,'45775');
+
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@NPC_SALRAND;
+DELETE FROM `smart_scripts` WHERE (`source_type`=0 AND `entryorguid` IN (@NPC_SALRAND,@NPC_BERYL_INVISMAN)) OR (`source_type`=9 AND `entryorguid` IN (@NPC_SALRAND*100,@NPC_BERYL_INVISMAN*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
+(@NPC_SALRAND,0,0,0,38,0,100,1,1,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On data 1 1 - Say'),
+(@NPC_SALRAND,0,1,2,38,0,100,1,1,2,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'On data 1 2 - Say'),
+(@NPC_SALRAND,0,2,0,61,0,100,1,0,0,0,0,80,@NPC_SALRAND*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'On link - Run script'),
+(@NPC_SALRAND,0,3,4,6,0,100,1,0,0,0,0,11,@SPELL_LOCKBOX,0,0,0,0,0,1,0,0,0,0,0,0,0,'On death - Cast spell'),
+(@NPC_SALRAND,0,4,0,61,0,100,1,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'On death - Say'),
+(@NPC_SALRAND,0,5,0,11,0,100,1,0,0,0,0,24,0,0,0,0,0,0,15,0,0,0,0,0,0,0,'On respawn - Evade'),
+(@NPC_SALRAND*100,9,0,0,0,0,100,0,0,0,0,0,60,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - set fly off'),
+(@NPC_SALRAND*100,9,1,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,3392.852,6161.092,79.83095,0,'On script - Move to pos'),
+(@NPC_SALRAND*100,9,2,0,0,0,100,0,3000,3000,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - Set unit flags'),
+--
+(@NPC_BERYL_INVISMAN,0,0,0,8,0,100,0,@SPELL_THROW_DETONATOR,0,0,0,80,@NPC_BERYL_INVISMAN*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'On spellhit - Run Script'),
+(@NPC_BERYL_INVISMAN*100,9,0,0,0,0,100,0,0,0,0,0,11,@SPELL_SUMMON_DETONATOR,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - Cast Spell'),
+(@NPC_BERYL_INVISMAN*100,9,1,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,@NPC_SALRAND,100,0,0,0,0,0,'On script - Set Data'),
+(@NPC_BERYL_INVISMAN*100,9,2,0,0,0,100,0,8000,8000,0,0,45,1,2,0,0,0,0,19,@NPC_SALRAND,100,0,0,0,0,0,'On script - Set Data'),
+(@NPC_BERYL_INVISMAN*100,9,3,0,0,0,100,0,2000,2000,0,0,11,@SPELL_EXPLOSION,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - Cast Spell');
+
+DELETE FROM `creature_text` WHERE `entry`=@NPC_SALRAND;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@NPC_SALRAND,0,0,'What is the meaning of this disturbance?!',14,0,100,0,0,0,'Inquisitor Salrand to Beryl Point InvisMan'),
+(@NPC_SALRAND,1,0,'Who dares interrupt my work!? Show yourself, coward!',14,0,100,0,0,0,'Inquisitor Salrand to Beryl Point InvisMan'),
+(@NPC_SALRAND,2,0,'I''ve destroyed the key! Your cherished archmage belongs to Malygos!',12,0,100,0,0,0,'Inquisitor Salrand');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_THROW_DETONATOR;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,@SPELL_THROW_DETONATOR,0,0,31,0,3,@NPC_BERYL_INVISMAN,0,0,0,'','Throw Beryl Shield Detonator target npc');
diff --git a/sql/old/3.3.5a/2012_08_27_06_world_sai.sql b/sql/old/3.3.5a/2012_08_27_06_world_sai.sql
new file mode 100644
index 00000000000..8b1aafd1558
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_06_world_sai.sql
@@ -0,0 +1,43 @@
+-- Fix {Q/A} The Shining Light ID: 11288
+-- Makes it blizzlike timed 10 minutes
+UPDATE `quest_template` SET `LimitTime`=600 WHERE `id`=11288;
+-- Decomposing Ghoul SAI
+SET @Ghoul := 24177;
+SET @SpellTrigger := 43202;
+SET @Spell := 43203;
+SET @Ares  := 24189;
+UPDATE `creature_template` SET `AIname`='SmartAI' WHERE `entry`=@Ghoul;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Ghoul;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@Ghoul,0,0,0,1,0,100,0,20000,300000,50000,350000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Occ - Say random text'),
+(@Ghoul,0,1,2,8,0,100,0,@Spell,0,0,0,18,33685506,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - On hit by spell - Set unit flag for not targetable'),
+(@Ghoul,0,2,3,61,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Linked with previous event - Switch faction to clear aggro'),
+(@Ghoul,0,3,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Linked with previous event - Say random text'),
+(@Ghoul,0,4,5,1,0,100,0,3500,3500,3500,3500,19,33685506,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - OOC for 3,5 sec - Remove unit flag'),
+(@Ghoul,0,5,0,61,0,100,0,0,0,0,0,2,14,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Linked with previous event - Change faction back to 14');
+-- Add SAI for Ares - quest giver
+UPDATE `creature_template` SET `AIname`='SmartAI' WHERE `entry`=@Ares;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Ares;
+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
+(@Ares,0,0,0,19,0,100,0,11288,0,0,0,85,@SpellTrigger,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ares - On target quest accepted 11288 - Cast spell Shining Light');
+-- Decomposing Ghoul texts
+DELETE FROM `creature_text` WHERE `entry`=@Ghoul;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@Ghoul,0,1,'Light... light so bright...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,2,'ARGHHHH...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,3,'Away... go...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,4,'Bad light... hurt...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,5,'BURNS! IT BURNS!',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,1,1,'So... Hungry...',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,2,'Closer... come closer...',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,3,'FEED ME...',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,4,'FOOD! EAT YOU!',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,5,'BRAINNNS!',12,0,50,0,0,0,'Decomposing Ghoul - OOC');
+-- Add conditions for spell Shining Light to hit only Ghouls
+DELETE FROM `conditions` WHERE `SourceEntry`=@Spell AND `SourceTypeOrReferenceId`=13;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(13,1,@Spell,0,0,31,0,3,@Ghoul,0,0,0,'', 'Shinning Light can only hit Decomposing Ghouls');
+-- Add conditions for spell Shining Light to be available only, if on quest
+DELETE FROM `conditions` WHERE `SourceEntry`=@Spell AND `SourceTypeOrReferenceId`=17;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(17,0,@Spell,0,0,9,0,11288,0,0,0,0,'', 'Shinning Light can only hit targets on the quest');
diff --git a/sql/old/3.3.5a/2012_08_27_07_world_spell_area.sql b/sql/old/3.3.5a/2012_08_27_07_world_spell_area.sql
new file mode 100644
index 00000000000..18be6ff0dbe
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_07_world_spell_area.sql
@@ -0,0 +1,4 @@
+-- Fix quest - The Angry Gorloc ID: 12578
+DELETE FROM `spell_area` WHERE `spell`=54057;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`) VALUES
+(54057, 4297, 12578, 1, 12578, 0, 0, 2, 1);
diff --git a/sql/old/3.3.5a/2012_08_27_08_world_misc.sql b/sql/old/3.3.5a/2012_08_27_08_world_misc.sql
new file mode 100644
index 00000000000..62a57cd42de
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_08_world_misc.sql
@@ -0,0 +1,29 @@
+-- Fire Upon the Waters (12243) quest fix
+-- add Fire Upon the Waters Kill Credit Bunny at sail locations
+SET @GUID =42887;
+DELETE FROM `creature` WHERE `id`=28013;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+0,28013,571,1,1,0,0,2488.86,-400.017,19.0803,2.99498,300,0,0,42,0,0,0,33554432,0),
+(@GUID+1,28013,571,1,1,0,0,2458.96,-401.066,20.7778,0.108631,300,0,0,42,0,0,0,33554432,0);
+
+-- SAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 28013;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28013 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 
+(28013,0,0,0,8,0,100,0,48455,0,0,0,33,28013,0,0,0,0,0,7,0,0,0,0,0,0,0,"Fire Upon the Waters Kill Credit Bunny - On SpellHit Apothecary's Burning Water - Call KilledMonster Fire Upon the Waters Kill Credit Bunny");
+
+-- Ensure spell only works on Fire Upon the Waters Kill Credit Bunny
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=48455;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,48455,0,0,31,0,3,28013,0,0,0,'',"Fire Upon the Waters - spell to Fire Upon the Waters Kill Credit Bunny");
+
+-- add quest item loot to Captain Shely
+DELETE FROM `creature_loot_template` WHERE `entry`=27232;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(27232,37305,-100,1,0,1,1), -- Captain Shely's Rutters
+(27232,43851,25,1,0,1,1), -- Fur Clothing Scraps
+(27232,33470,10,1,0,1,3), -- Frostweave Cloth
+(27232,33443,5,1,0,1,1), -- Sour Goat Cheese
+(27232,33444,2,1,0,1,1), -- Pungent Seal Whey
+(27232,22829,1,1,0,1,1), -- Super Healing Potion
+(27232,45912,0.05,1,0,1,1); -- Book Glyph of Mastery
diff --git a/sql/old/3.3.5a/2012_08_27_09_world_conditions.sql b/sql/old/3.3.5a/2012_08_27_09_world_conditions.sql
new file mode 100644
index 00000000000..6d536859060
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_09_world_conditions.sql
@@ -0,0 +1,8 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (62973,62991);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,3,62973,0,0, 1,0,62972,0,0,0,0,'','Foam Sword Attack'),
+(13,3,62973,0,0,31,0,4,0,0,0,0,'','Foam Sword Attack'),
+(13,3,62973,0,0,33,0,1,0,0,1,0,'','Foam Sword Attack'),
+(13,3,62991,0,0, 1,0,62972,0,0,0,0,'','Bonked!'),
+(13,3,62991,0,0,31,0,4,0,0,0,0,'','Bonked!'),
+(13,3,62991,0,0,33,0,1,0,0,1,0,'','Bonked!');
diff --git a/sql/old/3.3.5a/2012_08_27_10_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_27_10_world_spell_script_names.sql
new file mode 100644
index 00000000000..9ffb153f498
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_27_10_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`IN (64142,62991);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(64142,'spell_gen_upper_deck_create_foam_sword'),
+(62991,'spell_gen_bonked');
diff --git a/sql/old/3.3.5a/2012_08_28_00_world_spell_script_name.sql b/sql/old/3.3.5a/2012_08_28_00_world_spell_script_name.sql
new file mode 100644
index 00000000000..01cfeb35f1f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_28_00_world_spell_script_name.sql
@@ -0,0 +1,4 @@
+-- Spell script name linking for Defending Wyrmrest Temple: Destabilize Azure Dragonshrine Effect
+DELETE FROM `spell_script_names` WHERE `spell_id`=49370 ;
+INSERT INTO `spell_script_names` VALUES
+(49370,'spell_q12372_destabilize_azure_dragonshrine_dummy');
diff --git a/sql/old/3.3.5a/2012_08_28_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_08_28_01_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..bf247399553
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_28_01_world_achievement_criteria_data.sql
@@ -0,0 +1,6 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (11478,11479,12827,12828);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+(11478, 12, 0, 0, ''), -- Koralon the Flame Watcher (10 player)
+(11479, 12, 1, 0, ''), -- Koralon the Flame Watcher (25 player)
+(12827, 12, 0, 0, ''), -- Toravon the Ice Watcher (10 player)
+(12828, 12, 1, 0, ''); -- Toravon the Ice Watcher (25 player)
diff --git a/sql/old/3.3.5a/2012_08_29_00_world_blood_furnace.sql b/sql/old/3.3.5a/2012_08_29_00_world_blood_furnace.sql
new file mode 100644
index 00000000000..85b493da202
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_29_00_world_blood_furnace.sql
@@ -0,0 +1,290 @@
+SET @GUID := 138106; -- 149
+
+-- Delete old data before inserting new data. This could make trouble later on.
+DELETE `creature_addon` FROM `creature_addon` INNER JOIN `creature` ON `creature`.`guid`=`creature_addon`.`guid` WHERE `map`=542;
+DELETE `creature_formations` FROM `creature_formations` INNER JOIN `creature` ON `creature`.`guid`=`creature_formations`.`memberGUID` OR `creature`.`guid`=`creature_formations`.`leaderGUID` WHERE `map`=542;
+DELETE `linked_respawn` FROM `linked_respawn` INNER JOIN `creature` ON `creature`.`guid`=`linked_respawn`.`linkedGuid` WHERE `map`=542;
+
+
+-- CREATURE_TEMPLATE
+-- Trash
+UPDATE `creature_template` SET `speed_walk`=1.1 WHERE `entry`=17624;
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=17398;
+-- Broggok
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|256|512|2 WHERE `entry` IN(17380,18601);
+
+-- CREATURE
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+148 OR `map`=542;
+INSERT INTO `creature`(`guid`,`id`,`map`,`spawnMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`curhealth`,`curmana`,`MovementType`) VALUES 
+(@GUID+88,17414,542,3,317.15,189.009,10.0509,1.88412,7200,10472,5875,0),
+(@GUID+92,17414,542,3,436.311,198.522,11.4389,1.34468,7200,10472,5875,0),
+(@GUID+91,17414,542,3,345.706,198.519,11.139,1.6879,7200,10472,5875,0),
+(@GUID+96,17398,542,3,379.741,192.233,9.59787,3.36158,7200,7210,0,0),
+(@GUID+103,17414,542,3,448.428,190.764,9.6054,1.01795,7200,10472,5875,0),
+(@GUID+97,17395,542,3,373.636,184.777,9.59848,1.15697,7200,10472,17625,0),
+(@GUID+95,17371,542,3,371.98,194.243,9.59956,5.36434,7200,10472,5875,0),
+(@GUID+94,17491,542,3,480.502,180.017,9.61526,3.42991,7200,7479,0,0),
+(@GUID+26,17398,542,3,412.728,85.7323,9.65141,0.141552,7200,6963,0,0),
+(@GUID+125,17477,542,3,485.76,8.63405,9.54898,1.43024,7200,4126,9944,0),
+(@GUID+68,17371,542,3,327.262,30.5611,9.61686,4.68833,7200,10472,5875,2),
+(@GUID+124,17477,542,3,490.168,11.6964,9.54898,1.13336,7200,4126,9944,0),
+(@GUID+123,17477,542,3,489.518,5.51373,9.54353,1.96038,7200,4126,9944,0),
+(@GUID+122,17371,542,3,494.46,7.58925,9.54249,2.87616,7200,10472,5875,0),
+(@GUID+112,17414,542,3,479.898,98.2961,9.62183,6.09707,7200,10472,5875,0),
+(@GUID+120,17491,542,3,433.6,-18.2301,9.55216,0.450845,7200,7479,0,0),
+(@GUID+126,17477,542,3,484.202,13.9732,9.5505,6.25258,7200,4126,9944,0),
+(@GUID+128,17371,542,3,465.905,-19.9126,9.55319,5.19624,7200,10472,5875,2),
+(@GUID+129,17371,542,3,476.506,-63.3028,9.54636,0,7200,10472,5875,2),
+(@GUID+131,17491,542,3,495.566,-43.8895,9.5591,2.9343,7200,7479,0,0),
+(@GUID+46,17477,542,3,-10.8822,-85.2033,-41.3341,2.09342,7200,4126,9944,0),
+(@GUID+55,17397,542,3,224.587,-96.0037,9.61879,0.647748,7200,11965,2486,0),
+(@GUID+54,17397,542,3,231.512,-91.5716,9.62435,3.65189,7200,11965,2486,0),
+(@GUID+56,17477,542,3,227.94,-93.8952,9.61879,0.561355,7200,4126,9944,0),
+(@GUID+53,17491,542,3,234.022,-106.406,9.61037,1.88867,7200,7479,0,0),
+(@GUID+52,17477,542,3,28.2572,-85.4531,-41.0542,4.63284,7200,4126,9944,0),
+(@GUID+59,17477,542,3,241.827,-68.3783,9.61987,1.82585,7200,4126,9944,0),
+(@GUID+58,17397,542,3,242.883,-72.4289,9.61514,1.81799,7200,11965,2486,0),
+(@GUID+57,17397,542,3,240.674,-64.4904,9.62484,5.05383,7200,11965,2486,0),
+(@GUID+14,21174,542,3,320.912,-83.0625,-133.307,3.00197,7200,8338000,0,0),
+(@GUID+136,17477,542,3,412.944,-83.971,9.61695,5.1156,7200,4126,9944,0),
+(@GUID+137,17477,542,3,420.081,-88.5245,9.62061,0.206074,7200,4126,9944,0),
+(@GUID+139,17491,542,3,404.193,-62.5071,9.61827,5.54913,7200,7479,0,0),
+(@GUID+134,17477,542,3,432.656,-78.7667,9.62296,1.5821,7200,4126,9944,0),
+(@GUID+140,17477,542,3,419.961,-76.9838,9.62318,5.67087,7200,4126,9944,0),
+(@GUID+135,17477,542,3,427.911,-69.9011,9.61668,4.99622,7200,4126,9944,0),
+(@GUID+142,18894,542,3,355.194,-175.571,-25.5497,0.0701911,7200,14958,0,0),
+(@GUID+144,18894,542,3,325.278,-191.535,-25.5078,1.49412,7200,14958,0,0),
+(@GUID+145,17371,542,3,312.396,-174.925,-25.5082,6.21829,7200,10472,5875,0),
+(@GUID+146,18894,542,3,312.116,-179.382,-25.5071,6.20258,7200,14958,0,0),
+(@GUID+147,18894,542,3,313.392,-170.618,-25.5086,6.20651,7200,14958,0,0),
+(@GUID+78,17371,542,3,331.268,69.7599,9.61402,1.77024,7200,10472,5875,0),
+(@GUID+70,17397,542,3,313.949,13.7401,9.61652,4.38997,7200,11965,2486,0),
+(@GUID+69,17395,542,3,311.261,7.92634,9.62195,0.656179,7200,10472,17625,0),
+(@GUID+71,17397,542,3,317.184,8.72084,9.6192,2.67896,7200,11965,2486,0),
+(@GUID+75,17491,542,3,314.564,-7.67602,9.6169,2.30511,7200,7479,0,0),
+(@GUID+77,17370,542,3,331.076,28.8939,9.62118,4.2576,7200,14958,0,0),
+(@GUID+73,17395,542,3,338.84,8.10661,9.61679,5.05086,7200,10472,17625,0),
+(@GUID+72,17395,542,3,338.242,1.09978,9.61664,1.01391,7200,10472,17625,0),
+(@GUID+25,17398,542,3,413.285,81.8238,9.65038,0.154642,7200,6963,0,0),
+(@GUID+24,17398,542,3,500.076,84.7778,9.65474,3.08941,7200,6963,0,0),
+(@GUID+23,17398,542,3,502.724,82.8731,9.65935,3.08941,7200,6963,0,0),
+(@GUID+22,17398,542,3,498.962,83.0695,9.6524,3.08941,7200,6963,0,0),
+(@GUID+21,17398,542,3,498.393,86.641,9.65219,3.19309,7200,6963,0,0),
+(@GUID+104,17414,542,3,327.172,188.393,9.61882,1.09492,7200,10472,5875,0),
+(@GUID+27,17398,542,3,409.226,83.2983,9.65786,0.141552,7200,6963,0,0),
+(@GUID+28,17398,542,3,412.081,112.626,9.65613,6.1865,7200,6963,0,0),
+(@GUID+29,17398,542,3,412.462,116.555,9.65317,6.1865,7200,6963,0,0),
+(@GUID+30,17398,542,3,411.735,114.446,9.65571,0.00803471,7200,6963,0,0),
+(@GUID+31,17398,542,3,409.699,113.048,9.65731,0.0185067,7200,6963,0,0),
+(@GUID+32,17398,542,3,407.17,115.172,9.66061,0.0185067,7200,6963,0,0),
+(@GUID+33,17398,542,3,495.677,116.285,9.64388,3.14963,7200,6963,0,0),
+(@GUID+34,17398,542,3,495.696,113.877,9.64425,3.14963,7200,6963,0,0),
+(@GUID+35,17398,542,3,499.774,112.283,9.65334,3.14963,7200,6963,0,0),
+(@GUID+36,17398,542,3,503.042,114.321,9.65788,3.14963,7200,6963,0,0),
+(@GUID+37,17398,542,3,503.024,116.589,9.65788,3.14963,7200,6963,0,0),
+(@GUID+38,17398,542,3,499.499,118.085,9.65347,3.14963,7200,6963,0,0),
+(@GUID+111,17414,542,3,482.454,103.335,9.61156,5.27398,7200,10472,5875,0),
+(@GUID+110,17414,542,3,458.068,92.7015,9.61519,1.89206,7200,10472,5875,0),
+(@GUID+109,17414,542,3,452.317,94.5807,9.61519,0.545102,7200,10843,6015,0),
+(@GUID+108,17395,542,3,457.121,99.2828,9.61496,4.44777,7200,10472,17625,0),
+(@GUID+102,17370,542,3,466.171,176.663,9.6201,2.8927,7200,14958,0,2),
+(@GUID+98,17371,542,3,412.814,195.493,9.60144,3.55951,7200,10472,5875,0),
+(@GUID+100,17395,542,3,403.447,190.68,9.59739,0.0770466,7200,10472,17625,0),
+(@GUID+99,17398,542,3,411.319,185.388,9.60154,2.28952,7200,6963,0,0),
+(@GUID+101,17370,542,3,466.657,179.674,9.61915,2.88877,7200,14958,0,2),
+(@GUID+76,17370,542,3,323.216,28.6452,9.62206,4.92205,7200,14958,0,0),
+(@GUID+74,17397,542,3,344.219,5.00403,9.62297,3.2955,7200,11965,2486,0),
+(@GUID+67,17370,542,3,286.75,-7.12364,9.33158,3.50552,7200,14958,0,0),
+(@GUID+65,17370,542,3,258.511,-30.4009,6.95261,4.07258,7200,14958,0,0),
+(@GUID+63,17371,542,3,246.377,-85.311,9.61661,3.04947,7200,10472,5875,2),
+(@GUID+62,17477,542,3,226.371,-71.3008,9.61766,2.01394,7200,4126,9944,0),
+(@GUID+60,17397,542,3,224.497,-68.0896,9.62108,5.19786,7200,11965,2486,0),
+(@GUID+61,17397,542,3,227.979,-74.6894,9.61909,1.96987,7200,11965,2486,0),
+(@GUID+106,17626,542,3,458.614,116.989,9.61455,3.07559,7200,14958,0,0),
+(@GUID+43,17491,542,3,182.461,-68.9882,9.62108,3.98337,7200,7479,0,0),
+(@GUID+42,17491,542,3,107.083,-96.6171,-14.2289,0.930522,7200,7479,0,0),
+(@GUID+51,17397,542,3,27.6779,-90.5785,-40.7088,1.48496,7200,11965,2486,0),
+(@GUID+82,17414,542,3,304.249,103.356,9.62076,5.61477,7200,10843,6015,0),
+(@GUID+83,17371,542,3,308.919,100.519,9.62138,2.61455,7200,10472,5875,0),
+(@GUID+86,17626,542,3,356.154,108.175,9.62332,4.06125,7200,14958,0,0),
+(@GUID+85,17371,542,3,343.419,102.651,9.6201,5.16709,7200,10472,5875,0),
+(@GUID+93,17414,542,3,346.912,193.875,9.60419,1.74602,7200,10472,5875,0),
+(@GUID+115,17414,542,3,476.291,65.9018,9.60985,3.98357,7200,10472,5875,0),
+(@GUID+114,17414,542,3,469.409,65.9985,9.61271,5.036,7200,10843,6015,0),
+(@GUID+116,17371,542,3,472.66,59.4292,9.6097,1.58025,7200,10472,5875,0),
+(@GUID+105,17624,542,3,456.429,118.903,9.61496,3.16198,7200,16023,0,0),
+(@GUID+107,17626,542,3,458.704,120.842,9.61456,3.1619,7200,14958,0,2),
+(@GUID+127,18894,542,3,462.905,-19.9126,9.55215,5.18053,7200,14958,0,0),
+(@GUID+41,17377,542,3,325.862,-87.2087,-24.6512,5.87314,43200,34830,6156,0),
+(@GUID+143,18894,542,3,333.631,-192.252,-25.5027,1.51768,7200,14958,0,0),
+(@GUID+148,17371,542,3,329.584,-189.111,-25.5067,1.50511,7200,10472,5875,0),
+(@GUID+132,17371,542,3,424.675,-83.9057,9.6166,0.059993,7200,10472,5875,0),
+(@GUID+130,18894,542,3,475.417,-66.3289,9.54527,0,7200,14958,0,0),
+(@GUID+40,18894,542,3,455.566,-79.108,9.61164,0.09548,7200,14958,0,0),
+(@GUID+39,18894,542,3,455.793,-89.9999,9.60743,0.09548,7200,14958,0,0),
+(@GUID+121,17371,542,3,487.933,17.2848,9.55353,4.54905,7200,10472,5875,0),
+(@GUID+119,17414,542,3,445.422,63.6577,9.61209,3.54218,7200,10472,5875,0),
+(@GUID+118,17371,542,3,442.237,56.965,9.61104,1.84965,7200,10472,5875,0),
+(@GUID+117,17371,542,3,437.232,64.7644,9.60927,5.1656,7200,10472,5875,0),
+(@GUID+113,17414,542,3,483.48,91.8948,9.62303,1.14828,7200,10472,5875,0),
+(@GUID+20,17398,542,3,437.158,201.984,11.6815,4.639,7200,6963,0,0),
+(@GUID+19,17398,542,3,345.078,202.309,11.6826,4.90708,7200,6963,0,0),
+(@GUID+18,17398,542,3,314.478,195.642,11.6815,5.01966,7200,6963,0,0),
+(@GUID+17,17381,542,3,327.17,137.816,9.61546,4.72121,43200,38722,0,0),
+(@GUID+90,17370,542,3,372.443,187.252,9.59815,3.08144,7200,14958,0,2),
+(@GUID+87,17491,542,3,301.987,172.031,9.61921,0.398146,7200,7479,0,0),
+(@GUID+89,17370,542,3,372.443,191.252,9.59815,3.3214,7200,14958,0,2),
+(@GUID+80,17626,542,3,343.075,57.8455,9.6156,0,7200,14958,0,0),
+(@GUID+81,17624,542,3,327.255,54.8455,9.61645,0,7200,16023,0,2),
+(@GUID+15,17414,542,3,352.426,85.7746,9.6222,6.27838,7200,10472,5875,0),
+(@GUID+84,17414,542,3,346.54,96.449,9.6201,2.21792,7200,10472,5875,0),
+(@GUID+16,17414,542,3,302.425,61.1739,9.61642,3.14962,7200,10472,5875,0),
+(@GUID+79,17414,542,3,328.075,76.9842,9.61402,5.19851,7200,10472,5875,0),
+(@GUID+133,17477,542,3,433.797,-90.9604,9.62448,1.93317,7200,4126,9944,0),
+(@GUID+141,18894,542,3,355.299,-163.451,-25.5338,6.16881,7200,14958,0,0),
+(@GUID+138,17477,542,3,423.255,-96.3954,9.61869,1.21688,7200,4126,9944,0),
+(@GUID+66,17626,542,3,279.674,1.44232,8.11077,3.8723,7200,14958,0,0),
+(@GUID+64,17626,542,3,250.468,-24.7817,6.95538,4.23202,7200,14958,0,0),
+(@GUID+50,17397,542,3,29.672,-80.5135,-40.787,4.36738,7200,11965,2486,0),
+(@GUID+44,17397,542,3,-12.9018,-81.3588,-41.3358,5.36252,7200,11965,2486,0),
+(@GUID+47,17397,542,3,6.99569,-89.3037,-41.3305,1.28394,7200,11965,2486,0),
+(@GUID+45,17397,542,3,-9.04048,-88.5931,-41.3341,1.99081,7200,11965,2486,0),
+(@GUID+49,17477,542,3,8.90866,-85.0585,-41.3294,1.02944,7200,4126,9944,0),
+(@GUID+48,17397,542,3,10.3856,-81.342,-41.3294,4.24882,7200,11965,2486,0),
+(@GUID+9,17380,542,3,455.336,-1.82919,9.6299,1.43117,43200,30960,18468,0),
+(@GUID+8,17370,542,3,7.83757,-54.6224,-41.258,1.62316,7200,14958,0,0),
+(@GUID+7,17370,542,3,-4.06964,-56.7616,-41.258,1.41372,7200,14958,0,0),
+(@GUID+6,17370,542,3,49.3209,-93.3478,-40.1855,2.86234,7200,14958,0,0),
+(@GUID+5,17370,542,3,49.2232,-75.6242,-40.1856,2.98451,7200,14958,0,0),
+(@GUID+4,17256,542,3,369.461,-118.757,-137.368,2.54818,604800,152964,1016100,0),
+(@GUID+3,17256,542,3,369.15,-55.5658,-137.368,3.71755,604800,152964,1016100,0),
+(@GUID+2,17256,542,3,307.784,-31.8502,-137.368,4.95674,604800,152964,1016100,0),
+(@GUID+1,17256,542,3,274.133,-87.1647,-137.368,0.017453,604800,152964,1016100,0),
+(@GUID+0,17256,542,3,308.203,-141.769,-137.368,1.36136,604800,152964,1016100,0);
+
+-- GAMEOBJECT_TEMPLATE
+UPDATE `gameobject_template` SET `ScriptName`='go_broggok_lever' WHERE `entry`=181982;
+
+-- CREATURE_MODEL_INFO
+-- Old modelid_other_gender 12471. Need to do this because modelid in creature uses creature_model_info, too... so it would still bug.
+UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid`=16332;
+
+-- CREATURE_ADDON
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+144;
+INSERT INTO `creature_addon`(`guid`,`path_id`,`bytes2`) VALUES
+(@GUID+0,0,4097),
+(@GUID+1,0,4097),
+(@GUID+2,0,4097),
+(@GUID+3,0,4097),
+(@GUID+4,0,4097),
+(@GUID+15,856820,0),
+(@GUID+63,(@GUID+63)*10,0),
+(@GUID+68,(@GUID+68)*10,0),
+(@GUID+81,(@GUID+81)*10,0),
+(@GUID+89,(@GUID+89)*10,0),
+(@GUID+90,(@GUID+90)*10,0),
+(@GUID+101,(@GUID+101)*10,0),
+(@GUID+102,(@GUID+102)*10,0),
+(@GUID+107,(@GUID+107)*10,0),
+(@GUID+128,(@GUID+128)*10,0),
+(@GUID+129,(@GUID+129)*10,0);
+
+-- CREATURE_FORMATIONS
+DELETE FROM `creature_formations` WHERE `leaderGUID` BETWEEN @GUID AND @GUID+148 OR `memberGUID` BETWEEN @GUID AND @GUID+148;
+INSERT INTO `creature_formations`(`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(@GUID+81,@GUID+81,0,0,2),
+(@GUID+81,@GUID+80,3,290,2),
+(@GUID+107,@GUID+107,0,0,2),
+(@GUID+107,@GUID+105,4,220,2),
+(@GUID+107,@GUID+106,3,285,2),
+(@GUID+129,@GUID+129,0,0,2),
+(@GUID+129,@GUID+130,3,90,2),
+(@GUID+143,@GUID+143,0,0,2),
+(@GUID+143,@GUID+148,3,120,2),
+(@GUID+143,@GUID+144,3,240,2),
+(@GUID+146,@GUID+146,0,0,2),
+(@GUID+146,@GUID+145,3,120,2),
+(@GUID+146,@GUID+147,3,240,2),
+(@GUID+128,@GUID+128,0,0,2),
+(@GUID+128,@GUID+127,4,45,2);
+
+-- WAYPOINT_DATA
+DELETE FROM `waypoint_data` WHERE `id` BETWEEN @GUID*10 AND (@GUID+148)*10;
+INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+((@GUID+63 )*10,1,247.229,-66.59,9.62258),
+((@GUID+63 )*10,2,246.245,-85.1909,9.61548),
+((@GUID+63 )*10,3,219.765,-84.577,9.58612),
+((@GUID+63 )*10,4,246.377,-85.311,9.61661),
+((@GUID+68 )*10,1,328.417,-4.58593,9.61603),
+((@GUID+68 )*10,2,327.28,24.0565,9.61603),
+((@GUID+81 )*10,1,327.255,54.8455,9.61346),
+((@GUID+81 )*10,18,322.72,55.3961,9.6137),
+((@GUID+81 )*10,17,317.328,58.7127,9.6137),
+((@GUID+81 )*10,16,315.042,62.5956,9.61509),
+((@GUID+81 )*10,15,312.513,72.6059,9.6179),
+((@GUID+81 )*10,14,311.755,83.2112,9.6179),
+((@GUID+81 )*10,13,312.519,89.5342,9.6179),
+((@GUID+81 )*10,12,313.959,93.8532,9.61756),
+((@GUID+81 )*10,11,317.588,98.5635,9.61631),
+((@GUID+81 )*10,10,322.28,101.14,9.61572),
+((@GUID+81 )*10,9,328.8,102.991,9.61528),
+((@GUID+81 )*10,8,334.164,102.162,9.61808),
+((@GUID+81 )*10,7,339.203,99.0606,9.61948),
+((@GUID+81 )*10,6,342.812,94.2829,9.61948),
+((@GUID+81 )*10,5,345.611,85.8321,9.61948),
+((@GUID+81 )*10,4,344.882,74.8707,9.61869),
+((@GUID+81 )*10,3,343.069,64.3213,9.61614),
+((@GUID+81 )*10,2,340.959,59.932,9.61435),
+((@GUID+89 )*10,1,372.443,191.252,9.59815),
+((@GUID+89 )*10,2,329.021,185.273,9.61524),
+((@GUID+90 )*10,1,372.443,187.252,9.59815),
+((@GUID+90 )*10,2,329.021,181.273,9.61524),
+((@GUID+101)*10,1,416.026,191.714,9.59825),
+((@GUID+101)*10,2,466.657,179.674,9.61915),
+((@GUID+102)*10,1,415.314,187.668,9.59825),
+((@GUID+102)*10,2,466.171,176.663,9.6201),
+((@GUID+107)*10,18,464.47,117.962,9.62),
+((@GUID+107)*10,17,471.688,113.794,9.62),
+((@GUID+107)*10,16,477.046,107.409,9.62),
+((@GUID+107)*10,15,479.897,99.5768,9.62),
+((@GUID+107)*10,14,479.897,91.2417,9.62),
+((@GUID+107)*10,13,477.046,83.4093,9.62),
+((@GUID+107)*10,12,471.688,77.0242,9.62),
+((@GUID+107)*10,11,464.47,72.8567,9.62),
+((@GUID+107)*10,10,456.261,71.4093,9.62),
+((@GUID+107)*10,9,448.053,72.8567,9.62),
+((@GUID+107)*10,8,440.834,77.0242,9.62),
+((@GUID+107)*10,7,435.477,83.4093,9.62),
+((@GUID+107)*10,6,432.626,91.2417,9.62),
+((@GUID+107)*10,5,432.626,99.5768,9.62),
+((@GUID+107)*10,4,435.477,107.409,9.62),
+((@GUID+107)*10,3,440.834,113.794,9.62),
+((@GUID+107)*10,2,448.053,117.962,9.62),
+((@GUID+107)*10,1,456.261,119.409,9.62),
+((@GUID+128)*10,1,475.83,-58.5353,9.5419),
+((@GUID+128)*10,2,474.83,-54.6723,9.5419),
+((@GUID+128)*10,3,465.9,-19.9126,9.55319),
+((@GUID+128)*10,4,466.89,-23.7756,9.55319),
+((@GUID+129)*10,1,482.43,-67.1466,9.56),
+((@GUID+129)*10,2,486.942,-69.7513,9.56),
+((@GUID+129)*10,3,490.29,-73.742,9.56),
+((@GUID+129)*10,4,492.072,-78.6373,9.56),
+((@GUID+129)*10,5,492.072,-83.8467,9.56),
+((@GUID+129)*10,6,490.29,-88.742,9.56),
+((@GUID+129)*10,7,486.942,-92.7327,9.56),
+((@GUID+129)*10,8,482.43,-95.3374,9.56),
+((@GUID+129)*10,9,477.3,-96.242,9.56),
+((@GUID+129)*10,10,472.17,-95.3374,9.56),
+((@GUID+129)*10,11,467.658,-92.7327,9.56),
+((@GUID+129)*10,12,464.31,-88.742,9.56),
+((@GUID+129)*10,13,462.528,-83.8467,9.56),
+((@GUID+129)*10,14,462.528,-78.6373,9.56),
+((@GUID+129)*10,15,464.31,-73.742,9.56),
+((@GUID+129)*10,16,467.658,-69.7513,9.56),
+((@GUID+129)*10,17,472.17,-67.1466,9.56),
+((@GUID+129)*10,18,477.3,-66.242,9.56);
+
+-- Revert a previous bad fix
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17398;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN  (-85712,-85717,-85719,-85724) AND `source_type`=0;
+DELETE FROM `gameobject_scripts` WHERE `id`=150441;
diff --git a/sql/old/3.3.5a/2012_08_30_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_30_00_world_creature_template.sql
new file mode 100644
index 00000000000..27c1c1dedd4
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_30_00_world_creature_template.sql
@@ -0,0 +1 @@
+ALTER TABLE `creature_template` ADD `unit_flags2` int(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `unit_flags`;
diff --git a/sql/old/3.3.5a/2012_08_30_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_30_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..d7602dd8c79
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_30_00_world_spell_script_names.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (41054, 63418, 69893, 45205, 69896, 57594);
+INSERT INTO `spell_script_names` VALUES
+(41054, "spell_gen_clone_weapon_aura"),
+(63418, "spell_gen_clone_weapon_aura"),
+(69893, "spell_gen_clone_weapon_aura"),
+(45205, "spell_gen_clone_weapon_aura"),
+(69896, "spell_gen_clone_weapon_aura"),
+(57594, "spell_gen_clone_weapon_aura");
diff --git a/sql/old/3.3.5a/2012_08_31_00_world_command.sql b/sql/old/3.3.5a/2012_08_31_00_world_command.sql
new file mode 100644
index 00000000000..c0686d6d907
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_31_00_world_command.sql
@@ -0,0 +1,14 @@
+DELETE FROM `command` WHERE `name`='explorecheat';
+DELETE FROM `command` WHERE `name`='taxicheat';
+DELETE FROM `command` WHERE `name`='waterwalk';
+
+DELETE FROM `command` WHERE `name`='cheat' OR `name` LIKE 'cheat%';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES 
+('cheat',           2, 'Syntax: .cheat $subcommand\r\nType .cheat to see the list of possible subcommands or .help cheat $subcommand to see info on subcommands'),
+('cheat god',       2, 'Syntax: .cheat god [on/off]\r\nEnables or disables your character''s ability to take damage.'),
+('cheat casttime',  2, 'Syntax: .cheat casttime [on/off]\r\nEnables or disables your character''s spell cast times.'),
+('cheat cooldown',  2, 'Syntax: .cheat cooldown [on/off]\r\nEnables or disables your character''s spell cooldowns.'),
+('cheat power',     2, 'Syntax: .cheat power [on/off]\r\nEnables or disables your character''s spell cost (e.g mana).'),
+('cheat waterwalk', 2, 'Syntax: .cheat waterwalk on/off\r\nSet on/off waterwalk state for selected player or self if no player selected.'),
+('cheat explore',   2, 'Syntax: .cheat explore #flag\r\nReveal or hide all maps for the selected player. If no player is selected, hide or reveal maps to you.\r\nUse a #flag of value 1 to reveal, use a #flag value of 0 to hide all maps.'),
+('cheat taxi',      2, 'Syntax: .cheat taxi on/off\r\nTemporary grant access or remove to all taxi routes for the selected character.\r\n If no character is selected, hide or reveal all routes to you.Visited taxi nodes sill accessible after removing access.');
diff --git a/sql/old/3.3.5a/2012_08_31_00_world_sai.sql b/sql/old/3.3.5a/2012_08_31_00_world_sai.sql
new file mode 100644
index 00000000000..fd7e0d7810f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_08_31_00_world_sai.sql
@@ -0,0 +1,50 @@
+-- Defending Your Title (13423)
+-- Taking on All Challengers (12971)
+
+SET @NPC_CHALLENGER      := 30012; -- Victorious Challenger
+SET @QUEST1              := 12971;
+SET @QUEST2              := 13423;
+SET @GOSSIP_MENUID       := 9865;
+SET @SPELL_SUNDER        := 11971; -- Sunder Armor
+SET @SPELL_REND          := 11977; -- Rend
+
+UPDATE `creature_template` SET `faction_A`=2109,`faction_H`=2109,`unit_flags`=0x8000,`npcflag`=0x1,`gossip_menu_id`=@GOSSIP_MENUID,`AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@NPC_CHALLENGER;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_CHALLENGER;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_CHALLENGER,0,0x0,0x1,'');
+
+DELETE FROM `creature_text` WHERE `entry`=@NPC_CHALLENGER;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@NPC_CHALLENGER,0,0,'You will not defeat me!',12,0,100,0,0,0,'Victorious Challenger'),
+(@NPC_CHALLENGER,0,1,'You''re not worthy of Thorim!',12,0,100,0,0,0,'Victorious Challenger'),
+(@NPC_CHALLENGER,0,2,'Good luck...  You''ll need it!',12,0,100,0,0,0,'Victorious Challenger'),
+(@NPC_CHALLENGER,0,3,'May the best win!',12,0,100,0,0,0,'Victorious Challenger');
+
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP_MENUID;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(@GOSSIP_MENUID,13660);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP_MENUID;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(@GOSSIP_MENUID,0,0,'Let''s do this, sister.',1,1,0,0,0,0,'');
+
+DELETE FROM `creature_equip_template` WHERE `entry`=@NPC_CHALLENGER;
+INSERT INTO `creature_equip_template` (`entry`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES
+(@NPC_CHALLENGER,40542,39288,0);
+
+DELETE FROM `smart_scripts` WHERE (`source_type`=0 AND `entryorguid`=@NPC_CHALLENGER) OR (`source_type`=9 AND `entryorguid`=@NPC_CHALLENGER*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
+(@NPC_CHALLENGER,0,0,0,25,0,100,0,0,0,0,0,2,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Victorious Challenger - On Reset - Set Default Faction'),
+(@NPC_CHALLENGER,0,1,2,62,0,100,0,@GOSSIP_MENUID,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Victorious Challenger - On Gossip - Close Gossip'),
+(@NPC_CHALLENGER,0,2,0,61,0,100,0,0,0,0,0,80,@NPC_CHALLENGER*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Victorious Challenger - On Gossip - Run Timed Script'),
+(@NPC_CHALLENGER,0,3,0,9,0,100,0,0,5,5000,10000,11,@SPELL_SUNDER,0,0,0,0,0,2,0,0,0,0,0,0,0,'Victorious Challenger - On Range - Cast Sunder Armor'),
+(@NPC_CHALLENGER,0,4,0,0,0,100,0,10000,15000,15000,20000,11,@SPELL_REND,0,0,0,0,0,2,0,0,0,0,0,0,0,'Victorious Challenger - IC - Cast Rend'),
+(@NPC_CHALLENGER*100,9,0,0,0,0,100,0,1000,1000,1000,1000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Victorious Challenger - Timed - Talk'),
+(@NPC_CHALLENGER*100,9,1,0,0,0,100,0,3000,3000,3000,3000,2,14,0,0,0,0,0,1,0,0,0,0,0,0,0,'Victorious Challenger - Timed - Set Faction Hostile'),
+(@NPC_CHALLENGER*100,9,2,0,0,0,100,0,0,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Victorious Challenger - Timed - Attack Invoker');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP_MENUID;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,@GOSSIP_MENUID,0,0,0,9,0,@QUEST1,0,0,0,0,'','Show gossip option 0 if player has quest Taking on All Challengers'),
+(15,@GOSSIP_MENUID,0,0,1,9,0,@QUEST2,0,0,0,0,'','Show gossip option 0 if player has quest Defending Your Title');
diff --git a/sql/old/3.3.5a/2012_09_01_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_01_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..add7621b74c
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_01_00_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+-- Unlocking zuluhed chains
+DELETE FROM `spell_script_names` WHERE `spell_id`=38790;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(38790, 'spell_unlocking_zuluheds_chains');
diff --git a/sql/old/3.3.5a/2012_09_02_00_world_quest_template.sql b/sql/old/3.3.5a/2012_09_02_00_world_quest_template.sql
new file mode 100644
index 00000000000..d7e3948ef4f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_02_00_world_quest_template.sql
@@ -0,0 +1,49 @@
+-- Kandrostrasz <Brood of Alexstrasza> (15503) quests RequiredClasses fix by nelegalno
+UPDATE `quest_template` SET `RequiredClasses` = 1 WHERE `Id` IN (8559,8560); -- Warrior
+UPDATE `quest_template` SET `RequiredClasses` = 2 WHERE `Id` IN (8629,8655); -- Paladin
+UPDATE `quest_template` SET `RequiredClasses` = 4 WHERE `Id` IN (8626,8658); -- Hunter
+UPDATE `quest_template` SET `RequiredClasses` = 8 WHERE `Id` IN (8637,8640); -- Rogue
+UPDATE `quest_template` SET `RequiredClasses` = 16 WHERE `Id` IN (8593,8596); -- Priest
+UPDATE `quest_template` SET `RequiredClasses` = 64 WHERE `Id` IN (8621,8624); -- Shaman
+UPDATE `quest_template` SET `RequiredClasses` = 128 WHERE `Id` IN (8631,8634); -- Mage
+UPDATE `quest_template` SET `RequiredClasses` = 256 WHERE `Id` IN (8660,8663); -- Warlock
+UPDATE `quest_template` SET `RequiredClasses` = 1024 WHERE `Id` IN (8665,8668); -- Druid
+
+-- Andorgos <Brood of Malygos> (15502) quests RequiredClasses fix by nelegalno
+UPDATE `quest_template` SET `RequiredClasses` = 1 WHERE `Id` IN (8544,8561); -- Warrior
+UPDATE `quest_template` SET `RequiredClasses` = 2 WHERE `Id` IN (8628,8630); -- Paladin
+UPDATE `quest_template` SET `RequiredClasses` = 4 WHERE `Id` IN (8657,8659); -- Hunter
+UPDATE `quest_template` SET `RequiredClasses` = 8 WHERE `Id` IN (8639,8641); -- Rogue
+UPDATE `quest_template` SET `RequiredClasses` = 16 WHERE `Id` IN (8592,8594); -- Priest
+UPDATE `quest_template` SET `RequiredClasses` = 64 WHERE `Id` IN (8602,8623); -- Shaman
+UPDATE `quest_template` SET `RequiredClasses` = 128 WHERE `Id` IN (8625,8632); -- Mage
+UPDATE `quest_template` SET `RequiredClasses` = 256 WHERE `Id` IN (8662,8664); -- Warlock
+UPDATE `quest_template` SET `RequiredClasses` = 1024 WHERE `Id` IN (8667,8669); -- Druid
+
+-- Craftsman Wilhelm <Brotherhood of the Light> (16376) NPCs quests
+UPDATE `quest_template` SET `RequiredClasses` = 3 WHERE `Id` IN (9234,9235,9236); -- Warrior, Paladin
+UPDATE `quest_template` SET `RequiredClasses` = 68 WHERE `Id` IN (9244,9245,9246); -- Hunter, Shaman
+UPDATE `quest_template` SET `RequiredClasses` = 400 WHERE `Id` IN (9238,9239,9240); -- Priest, Mage, Warlock
+UPDATE `quest_template` SET `RequiredClasses` = 1032 WHERE `Id` IN (9241,9242,9243); -- Rogue, Druid
+
+-- Zanza the Restless (15042) NPCs quests
+UPDATE `quest_template` SET `RequiredClasses` = 1 WHERE `Id` = 8184; -- Warrior
+UPDATE `quest_template` SET `RequiredClasses` = 2 WHERE `Id` = 8185; -- Paladin
+UPDATE `quest_template` SET `RequiredClasses` = 4 WHERE `Id` = 8187; -- Hunter
+UPDATE `quest_template` SET `RequiredClasses` = 8 WHERE `Id` = 8186; -- Rogue
+UPDATE `quest_template` SET `RequiredClasses` = 16 WHERE `Id` = 8191; -- Priest
+UPDATE `quest_template` SET `RequiredClasses` = 64 WHERE `Id` = 8188; -- Shaman
+UPDATE `quest_template` SET `RequiredClasses` = 128 WHERE `Id` = 8189; -- Mage
+UPDATE `quest_template` SET `RequiredClasses` = 256 WHERE `Id` = 8190; -- Warlock
+UPDATE `quest_template` SET `RequiredClasses` = 1024 WHERE `Id` = 8192; -- Druid
+
+-- Vethsera <Brood of Ysera> (15504) quests RequiredClasses fix by nelegalno
+UPDATE `quest_template` SET `RequiredClasses` = 1 WHERE `Id` = 8562; -- Warrior
+UPDATE `quest_template` SET `RequiredClasses` = 2 WHERE `Id` = 8627; -- Paladin
+UPDATE `quest_template` SET `RequiredClasses` = 4 WHERE `Id` = 8656; -- Hunter
+UPDATE `quest_template` SET `RequiredClasses` = 8 WHERE `Id` = 8638; -- Rogue
+UPDATE `quest_template` SET `RequiredClasses` = 16 WHERE `Id` = 8603; -- Priest
+UPDATE `quest_template` SET `RequiredClasses` = 64 WHERE `Id` = 8622; -- Shaman
+UPDATE `quest_template` SET `RequiredClasses` = 128 WHERE `Id` = 8633; -- Mage
+UPDATE `quest_template` SET `RequiredClasses` = 256 WHERE `Id` = 8661; -- Warlock
+UPDATE `quest_template` SET `RequiredClasses` = 1024 WHERE `Id` = 8666; -- Druid
diff --git a/sql/old/3.3.5a/2012_09_02_01_world_sai.sql b/sql/old/3.3.5a/2012_09_02_01_world_sai.sql
new file mode 100644
index 00000000000..971c50d9c05
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_02_01_world_sai.sql
@@ -0,0 +1,36 @@
+-- Lok'lira the Crone
+SET @ENTRY := 29975;
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`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,9910,0,0,0,33,30467,0,0,0,0,0,7,0,0,0,0,0,0,0,'Loklira - gossip select 4 - The Hyldsmeet Kill 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,'Loklira - gossip select 4 - Close gossip');
+
+UPDATE `gossip_menu_option` SET `action_menu_id`=9908 WHERE `menu_id`=9907;
+UPDATE `gossip_menu_option` SET `action_menu_id`=9909 WHERE `menu_id`=9908;
+UPDATE `gossip_menu_option` SET `action_menu_id`=9910 WHERE `menu_id`=9909;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9907;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9907,0,0,9,12970,0,0,0,'','Loklira - Show gossip if quest accepted');
+
+-- Thorim
+SET @THORIM :=29445;
+UPDATE `creature` SET `modelid`=0 WHERE `id`=@THORIM;
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@THORIM;
+DELETE FROM `creature_addon` WHERE `guid`=97128;
+DELETE FROM `creature_template_addon` WHERE `entry`=@THORIM;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@THORIM,0,0,1,0,0,'');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@THORIM 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
+(@THORIM,0,0,0,62,0,100,0,9926,0,0,0,33,30514,0,0,0,0,0,7,0,0,0,0,0,0,0,'Thorim - gossip select  - give quest credit');
+
+UPDATE `gossip_menu_option` SET `action_menu_id`=9927 WHERE `menu_id`=9924;
+UPDATE `gossip_menu_option` SET `action_menu_id`=9926 WHERE `menu_id`=9927;
+UPDATE `gossip_menu_option` SET `action_menu_id`=9925 WHERE `menu_id`=9926;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9924;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9924,0,0,9,13064,0,0,0,'','Thorim - Show gossip if quest accepted');
diff --git a/sql/old/3.3.5a/2012_09_03_00_world_misc.sql b/sql/old/3.3.5a/2012_09_03_00_world_misc.sql
new file mode 100644
index 00000000000..e8910c78b40
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_03_00_world_misc.sql
@@ -0,0 +1,36 @@
+-- Cold Hearted (12856)
+
+SET @NPC_CAPTIVE_DRAKE        := 29708; -- Captive Proto-Drake
+SET @NPC_FREED_DRAKE          := 29709; -- Freed Proto-Drake
+SET @NPC_PRISONER             := 29639; -- Brunnhildar Prisoner
+SET @NPC_LIBERATED            := 29734; -- Liberated Brunnhildar
+
+SET @SPELL_SUM_FREE_DRAKE     := 55028; -- Summon Freed Proto-Drake
+SET @SPELL_ICE_SHARD          := 55046; -- Ice Shard (Rank 3)
+SET @SPELL_FREE_PRISONER      := 55048; -- Free Brunnhildar Prisoner
+SET @AURA_IMPRISONMENT        := 54894; -- Icy Imprisonment
+
+
+UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1.14286,`spell1`=@SPELL_ICE_SHARD,`HoverHeight`=4,`unit_flags`=0x1000008,`InhabitType`=4,`ScriptName`='npc_freed_protodrake' WHERE `entry`=@NPC_FREED_DRAKE;
+UPDATE `creature_template` SET `unit_flags`=33554432,`AIName`='SmartAI' WHERE `entry`=@NPC_LIBERATED;
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@NPC_CAPTIVE_DRAKE;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES
+(@NPC_CAPTIVE_DRAKE,@SPELL_SUM_FREE_DRAKE,1,0);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_FREED_DRAKE;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_FREED_DRAKE,0,0x3000000,0x1,'55034 61183');
+
+DELETE FROM `creature_text` WHERE `entry`=@NPC_FREED_DRAKE;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@NPC_FREED_DRAKE,0,0,'Return to Brunnhildar Village!',42,0,100,0,0,0,'Freed Proto-Drake'),
+(@NPC_FREED_DRAKE,0,1,'The proto-drake smells freedom and flies homeward!',41,0,100,0,0,0,'Freed Proto-Drake');
+
+DELETE FROM `spell_scripts` WHERE `id`=@SPELL_FREE_PRISONER;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(@SPELL_FREE_PRISONER,0,0,14,@AURA_IMPRISONMENT,0,0,0,0,0,0);
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@NPC_LIBERATED;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@NPC_LIBERATED,0,0,0,54,0,100,0,0,0,0,0,41,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Liberated Brunnhildar - On Spawn - Despawn in 30 seconds');
diff --git a/sql/old/3.3.5a/2012_09_03_01_world_gameobject_template.sql b/sql/old/3.3.5a/2012_09_03_01_world_gameobject_template.sql
new file mode 100644
index 00000000000..ff0907eee6e
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_03_01_world_gameobject_template.sql
@@ -0,0 +1 @@
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=186371; -- Zeppelin
diff --git a/sql/old/3.3.5a/2012_09_03_02_world_quest_template.sql b/sql/old/3.3.5a/2012_09_03_02_world_quest_template.sql
new file mode 100644
index 00000000000..0c0a7ce4e40
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_03_02_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Stalk the Stalker (9719) quest requirements fix
+UPDATE `quest_template` SET `RequiredRaces` = 0 WHERE `Id` = 9719;
diff --git a/sql/old/3.3.5a/2012_09_07_00_characters_characters.sql b/sql/old/3.3.5a/2012_09_07_00_characters_characters.sql
new file mode 100644
index 00000000000..26ad904b4a0
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_07_00_characters_characters.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `characters` MODIFY `name`
+    VARCHAR(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;
diff --git a/sql/old/3.3.5a/2012_09_07_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_07_00_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..3d39c06051a
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_07_00_world_spell_bonus_data.sql
@@ -0,0 +1,4 @@
+SET @Spell := 28715; -- Flamecap Fire
+DELETE FROM `spell_bonus_data` WHERE `entry`=@Spell;
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(@Spell,0,0,0,0, 'Flamecap Fire');
diff --git a/sql/old/3.3.5a/2012_09_07_01_world_creature_template.sql b/sql/old/3.3.5a/2012_09_07_01_world_creature_template.sql
new file mode 100644
index 00000000000..16e4f670fd2
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_07_01_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `unit_flags2`=`unit_flags2`|0x800; -- UNIT_FLAG2_REGENERATE_POWER
diff --git a/sql/old/3.3.5a/2012_09_07_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_07_02_world_spell_script_names.sql
new file mode 100644
index 00000000000..652d45543e3
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_07_02_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM spell_script_names WHERE spell_id = -755;
+INSERT IGNORE INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-755, 'spell_warl_health_funnel');
diff --git a/sql/old/3.3.5a/2012_09_08_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_08_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..cce5745dee9
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_08_00_world_achievement_criteria_data.sql
@@ -0,0 +1,6 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10304,10313);
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(10304,5,62320,0,''),
+(10304,12,0,0,''),
+(10313,5,62320,0,''),
+(10313,12,1,0,'');
diff --git a/sql/old/3.3.5a/2012_09_08_01_world_creature_template.sql b/sql/old/3.3.5a/2012_09_08_01_world_creature_template.sql
new file mode 100644
index 00000000000..fb34f345f2d
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_08_01_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (32930,33909); -- Kologarn
diff --git a/sql/old/3.3.5a/2012_09_08_02_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_08_02_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..2f25f6f20fa
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_08_02_world_achievement_criteria_data.sql
@@ -0,0 +1,10 @@
+-- Criteria data for achievement 'Wrecking Ball'
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (3368, 3369, 3370, 12578, 7623, 3371);
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3368, 3369, 3370, 12578, 7623, 3371);
+INSERT INTO `achievement_criteria_data`(`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(3368,2,0,0,''),
+(3369,2,0,0,''),
+(3370,2,0,0,''),
+(12578,2,0,0,''),
+(7623,2,0,0,''),
+(3371,2,0,0,'');
diff --git a/sql/old/3.3.5a/2012_09_09_00_world_command.sql b/sql/old/3.3.5a/2012_09_09_00_world_command.sql
new file mode 100644
index 00000000000..1fb3247bfbb
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_09_00_world_command.sql
@@ -0,0 +1,4 @@
+DELETE FROM `command` WHERE `name` = 'start';
+DELETE FROM `command` WHERE `name` = 'unstuck';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('unstuck', 0, 'Syntax: .unstuck $playername [inn/graveyard/startzone]\n\nTeleports specified player to specified location. Default location is player\'s current hearth location.');
diff --git a/sql/old/3.3.5a/2012_09_09_01_world_trinity_string.sql b/sql/old/3.3.5a/2012_09_09_01_world_trinity_string.sql
new file mode 100644
index 00000000000..2f3c0aa1938
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_09_01_world_trinity_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=63; -- Existing entry 63 is not present in Language.h. It's safe to remove it.
+INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
+(63, 'You can''t do that right now.');
diff --git a/sql/old/3.3.5a/2012_09_09_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_09_02_world_spell_script_names.sql
new file mode 100644
index 00000000000..a4304663d9c
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_09_02_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_warl_banish','spell_warl_create_healthstone','spell_warl_ritual_of_doom_effect');
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES 
+(710,'spell_warl_banish'),
+(6201,'spell_warl_create_healthstone');
diff --git a/sql/old/3.3.5a/2012_09_09_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_09_03_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..a08c494da1b
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_09_03_world_spell_bonus_data.sql
@@ -0,0 +1,9 @@
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (28880,59542,59543,59544,59545,59547,59548);
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(28880,0,0,0,0,'Warrior - Gift of the Naaru'),
+(59542,0,0,0,0,'Paladin - Gift of the Naaru'),
+(59543,0,0,0,0,'Hunter - Gift of the Naaru'),
+(59544,0,0,0,0,'Priest - Gift of the Naaru'),
+(59545,0,0,0,0,'Deathknight - Gift of the Naaru'),
+(59547,0,0,0,0,'Shaman - Gift of the Naaru'),
+(59548,0,0,0,0,'Mage - Gift of the Naaru');
diff --git a/sql/old/3.3.5a/2012_09_09_04_world_quest_template.sql b/sql/old/3.3.5a/2012_09_09_04_world_quest_template.sql
new file mode 100644
index 00000000000..418c5badb36
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_09_04_world_quest_template.sql
@@ -0,0 +1 @@
+UPDATE `quest_template` SET `OfferRewardText`='Excellent, $N. You''ve saved me a lot of work!$b$bBut don''t think that I''m not grateful!' WHERE `Id`=6571;
diff --git a/sql/old/3.3.5a/2012_09_10_00_world_game_event.sql b/sql/old/3.3.5a/2012_09_10_00_world_game_event.sql
new file mode 100644
index 00000000000..edd6413379c
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_00_world_game_event.sql
@@ -0,0 +1,3 @@
+UPDATE `game_event` SET `start_time`='2012-11-04 00:01:00' WHERE `eventEntry`=3; -- Darkmoon Faire - Terrokkar 
+UPDATE `game_event` SET `start_time`='2012-12-02 00:01:00' WHERE `eventEntry`=4; -- Darkmoon Faire - Elwynn 
+UPDATE `game_event` SET `start_time`='2012-10-07 00:01:00' WHERE `eventEntry`=5; -- Darkmoon Faire - Mulgore
diff --git a/sql/old/3.3.5a/2012_09_10_01_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_01_world_quest_template.sql
new file mode 100644
index 00000000000..2db8883d92c
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_01_world_quest_template.sql
@@ -0,0 +1 @@
+UPDATE `quest_template` SET `OfferRewardText`="What!? If I knew that Pao'ka Swiftmountain was going to snoop around Highperch, I would have chained him to a totem! His father was reluctant allowing him to come with me to Thousand Needles. We came here to study the different creatures that inhabit these beautiful lands.$b$bI appreciate the help you have shown Pao'ka. I hope this covers any misfortunes this deed has cost you." WHERE `Id`=4770;
diff --git a/sql/old/3.3.5a/2012_09_10_02_world_creature_text.sql b/sql/old/3.3.5a/2012_09_10_02_world_creature_text.sql
new file mode 100644
index 00000000000..7a3b1a2d86f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_02_world_creature_text.sql
@@ -0,0 +1 @@
+UPDATE `creature_text` SET `text`='Good news, everyone! I think I''ve perfected a plague that will destroy all life on Azeroth!' WHERE `entry`=36678 AND `groupid`=4 AND `id`=0;
diff --git a/sql/old/3.3.5a/2012_09_10_03_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_03_world_quest_template.sql
new file mode 100644
index 00000000000..aae769ced71
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_03_world_quest_template.sql
@@ -0,0 +1,3 @@
+-- Grark Lorkrub should be available only when Kill On Sight: High Ranking Dark Iron Officials is complete
+UPDATE `quest_template` SET `NextQuestId`=4122 WHERE `Id`=4082;
+UPDATE `quest_template` SET `PrevQuestId`=4082 WHERE `Id`=4122;
diff --git a/sql/old/3.3.5a/2012_09_10_04_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_04_world_quest_template.sql
new file mode 100644
index 00000000000..5805debd094
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_04_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Fix some quest requirements
+UPDATE `quest_template` SET `PrevQuestId`=3906 WHERE `Id` IN (3907,7201); -- Disharmony of Fire and The Last Element are available only, if Disharmony of Flame is completed
diff --git a/sql/old/3.3.5a/2012_09_10_06_world_creature_template.sql b/sql/old/3.3.5a/2012_09_10_06_world_creature_template.sql
new file mode 100644
index 00000000000..24a60b107ec
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_06_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|256 WHERE `entry` IN (36897, 38138); -- Little Ooze
diff --git a/sql/old/3.3.5a/2012_09_10_07_world_go_loot_template.sql b/sql/old/3.3.5a/2012_09_10_07_world_go_loot_template.sql
new file mode 100644
index 00000000000..a5e30edfe2c
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_07_world_go_loot_template.sql
@@ -0,0 +1,2 @@
+-- Vic's Keys drop chance ( http://old.wowhead.com/object=190778 ) by nelegalno
+UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance` = -100 WHERE `entry`=24861 AND `item`=39264;
diff --git a/sql/old/3.3.5a/2012_09_10_08_world_spell_area.sql b/sql/old/3.3.5a/2012_09_10_08_world_spell_area.sql
new file mode 100644
index 00000000000..4e4e36051c9
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_08_world_spell_area.sql
@@ -0,0 +1,5 @@
+-- Cast Armistice in front of the pavillions as well
+DELETE FROM `spell_area` WHERE `spell`=64373 AND `area` IN (4676, 4677);
+INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES
+(64373,4676,0,0,0,0,0,2,1), -- Sunreaver Pavillion
+(64373,4677,0,0,0,0,0,2,1); -- SIlver Covenant Pavillion
diff --git a/sql/old/3.3.5a/2012_09_10_09_world_creature_involvedrelation.sql b/sql/old/3.3.5a/2012_09_10_09_world_creature_involvedrelation.sql
new file mode 100644
index 00000000000..e30e1559c54
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_09_world_creature_involvedrelation.sql
@@ -0,0 +1,4 @@
+DELETE FROM creature_involvedrelation WHERE quest IN (25500, 25286);
+INSERT INTO creature_involvedrelation (id, quest) VALUES
+(39675, 25500),
+(39675, 25286);
diff --git a/sql/old/3.3.5a/2012_09_10_10_world_gossips.sql b/sql/old/3.3.5a/2012_09_10_10_world_gossips.sql
new file mode 100644
index 00000000000..042b05dc83a
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_10_world_gossips.sql
@@ -0,0 +1,111 @@
+-- gossip assignation from sniff
+UPDATE `creature_template` SET `gossip_menu_id`=4534 WHERE `entry`=3047; -- Archmage Shymm <Mage Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=4536 WHERE `entry`=3048; -- Ursyn Ghull <Mage Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=12670 WHERE `entry`=6328; -- Dannie Fizzwizzle <Demon Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=12670 WHERE `entry`=6373; -- Dane Winslow <Demon Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=12670 WHERE `entry`=6374; -- Cylina Darkheart <Demon Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=1622 WHERE `entry`=8965; -- Shawn
+UPDATE `creature_template` SET `gossip_menu_id`=4119 WHERE `entry`=11047; -- Kray <Apprentice Alchemist>
+UPDATE `creature_template` SET `gossip_menu_id`=4266 WHERE `entry`=11051; -- Vhan <Apprentice Tailor>
+UPDATE `creature_template` SET `gossip_menu_id`=4154 WHERE `entry`=11065; -- Thonys Pillarstone <Apprentice Enchanter>
+UPDATE `creature_template` SET `gossip_menu_id`=4158 WHERE `entry`=11071; -- Mot Dawnstrider <Apprentice Enchanter>
+UPDATE `creature_template` SET `gossip_menu_id`=4204 WHERE `entry`=11081; -- Faldron <Apprentice Leatherworker>
+UPDATE `creature_template` SET `gossip_menu_id`=4181 WHERE `entry`=11083; -- Darianna <Apprentice Leatherworker>
+UPDATE `creature_template` SET `gossip_menu_id`=4207 WHERE `entry`=11084; -- Tarn <Apprentice Leatherworker>
+UPDATE `creature_template` SET `gossip_menu_id`=5142 WHERE `entry`=13442; -- Arch Druid Renferal
+UPDATE `creature_template` SET `gossip_menu_id`=5141 WHERE `entry`=13443; -- Druid of the Grove
+UPDATE `creature_template` SET `gossip_menu_id`=5081 WHERE `entry`=13447; -- Corporal Noreg Stormpike
+UPDATE `creature_template` SET `gossip_menu_id`=5281 WHERE `entry`=13577; -- Stormpike Ram Rider Commander
+UPDATE `creature_template` SET `gossip_menu_id`=7993 WHERE `entry`=15991; -- Lady Dena Kennedy
+UPDATE `creature_template` SET `gossip_menu_id`=7471 WHERE `entry`=17421; -- Clopper Wizbang <Explorers' League>
+UPDATE `creature_template` SET `gossip_menu_id`=7455 WHERE `entry`=17424; -- Anchorite Paetheus <First Aid Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=7459 WHERE `entry`=17434; -- Morae <Herbalism Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=7461 WHERE `entry`=17599; -- Aonar
+UPDATE `creature_template` SET `gossip_menu_id`=7462 WHERE `entry`=17649; -- Kessel <Elekk Lord>
+UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=17666; -- Astur <Stable Master>
+UPDATE `creature_template` SET `gossip_menu_id`=7463 WHERE `entry`=17676; -- Achelus
+UPDATE `creature_template` SET `gossip_menu_id`=7464 WHERE `entry`=17703; -- Messenger Hermesius
+UPDATE `creature_template` SET `gossip_menu_id`=8298 WHERE `entry`=17712; -- Captain Edward Hanes
+UPDATE `creature_template` SET `gossip_menu_id`=7835 WHERE `entry`=17927; -- Scout Jorli
+UPDATE `creature_template` SET `gossip_menu_id`=7738 WHERE `entry`=18252; -- Andarl
+UPDATE `creature_template` SET `gossip_menu_id`=7753 WHERE `entry`=18387; -- Bertelm
+UPDATE `creature_template` SET `gossip_menu_id`=7743 WHERE `entry`=18389; -- Thander
+UPDATE `creature_template` SET `gossip_menu_id`=7752 WHERE `entry`=18390; -- Ros'eleth
+UPDATE `creature_template` SET `gossip_menu_id`=7695 WHERE `entry`=18416; -- Huntress Kima
+UPDATE `creature_template` SET `gossip_menu_id`=7698 WHERE `entry`=18459; -- Jenai Starwhisper
+UPDATE `creature_template` SET `gossip_menu_id`=7745 WHERE `entry`=18704; -- Taela Everstride
+UPDATE `creature_template` SET `gossip_menu_id`=7773 WHERE `entry`=18713; -- Lieutenant Gravelhammer
+UPDATE `creature_template` SET `gossip_menu_id`=7814 WHERE `entry`=18745; -- Captain Auric Sunchaser
+UPDATE `creature_template` SET `gossip_menu_id`=7833 WHERE `entry`=18804; -- Prospector Nachlan <Explorers' League>
+UPDATE `creature_template` SET `gossip_menu_id`=7940 WHERE `entry`=19137; -- "Shotgun" Jones <Nesingwary Safari>
+UPDATE `creature_template` SET `gossip_menu_id`=8433 WHERE `entry`=19340; -- Mi'irku Farstep <Portal Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=7973 WHERE `entry`=19375; -- Eli Thunderstrike <Sky'ree's Keeper>
+UPDATE `creature_template` SET `gossip_menu_id`=8251 WHERE `entry`=21151; -- Borgrim Stouthammer <Explorers' League>
+UPDATE `creature_template` SET `gossip_menu_id`=8247 WHERE `entry`=21158; -- Commander Skyshadow
+UPDATE `creature_template` SET `gossip_menu_id`=8252 WHERE `entry`=21197; -- Bronwyn Stouthammer <Explorers' League>
+UPDATE `creature_template` SET `gossip_menu_id`=8566 WHERE `entry`=22832; -- Morthis Whisperwing <Druid of the Talon>
+
+-- gossip from sniff
+DELETE FROM `gossip_menu` WHERE (`entry`=1621 AND `text_id`=2273) OR (`entry`=1622 AND `text_id`=2276) OR (`entry`=4119 AND `text_id`=5040) OR (`entry`=4154 AND `text_id`=5184) OR (`entry`=4158 AND `text_id`=5196) OR (`entry`=4181 AND `text_id`=5273) OR (`entry`=4204 AND `text_id`=5325) OR (`entry`=4207 AND `text_id`=5340) OR (`entry`=4266 AND `text_id`=5428) OR (`entry`=4534 AND `text_id`=563) OR (`entry`=4536 AND `text_id`=563) OR (`entry`=5081 AND `text_id`=6288) OR (`entry`=5141 AND `text_id`=6173) OR (`entry`=5142 AND `text_id`=6174) OR (`entry`=5281 AND `text_id`=6313) OR (`entry`=7455 AND `text_id`=9029) OR (`entry`=7459 AND `text_id`=9034) OR (`entry`=7461 AND `text_id`=9037) OR (`entry`=7462 AND `text_id`=9041) OR (`entry`=7463 AND `text_id`=9042) OR (`entry`=7464 AND `text_id`=9043) OR (`entry`=7471 AND `text_id`=9054) OR (`entry`=7695 AND `text_id`=9389) OR (`entry`=7698 AND `text_id`=9393) OR (`entry`=7738 AND `text_id`=9471) OR (`entry`=7743 AND `text_id`=9481) OR (`entry`=7745 AND `text_id`=9484) OR (`entry`=7752 AND `text_id`=9492) OR (`entry`=7753 AND `text_id`=9493) OR (`entry`=7773 AND `text_id`=9521) OR (`entry`=7814 AND `text_id`=9566) OR (`entry`=7833 AND `text_id`=9586) OR (`entry`=7835 AND `text_id`=9591) OR (`entry`=7940 AND `text_id`=9733) OR (`entry`=7973 AND `text_id`=9805) OR (`entry`=7993 AND `text_id`=9845) OR (`entry`=8247 AND `text_id`=10264) OR (`entry`=8251 AND `text_id`=10270) OR (`entry`=8252 AND `text_id`=10271) OR (`entry`=8298 AND `text_id`=10352) OR (`entry`=8432 AND `text_id`=10538) OR (`entry`=8433 AND `text_id`=10291) OR (`entry`=8433 AND `text_id`=10292) OR (`entry`=8566 AND `text_id`=10735);
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
+(1621, 2273), -- 8962
+(1622, 2276), -- 8965
+(4119, 5040), -- 11047
+(4154, 5184), -- 11065
+(4158, 5196), -- 11071
+(4181, 5273), -- 11083
+(4204, 5325), -- 11081
+(4207, 5340), -- 11084
+(4266, 5428), -- 11051
+(4534, 563), -- 3047
+(4536, 563), -- 3048
+(5081, 6288), -- 13447
+(5141, 6173), -- 13443
+(5142, 6174), -- 13442
+(5281, 6313), -- 13577
+(7455, 9029), -- 17424
+(7459, 9034), -- 17434
+(7461, 9037), -- 17599
+(7462, 9041), -- 17649
+(7463, 9042), -- 17676
+(7464, 9043), -- 17703
+(7471, 9054), -- 17421
+(7695, 9389), -- 18416
+(7698, 9393), -- 18459
+(7738, 9471), -- 18252
+(7743, 9481), -- 18389
+(7745, 9484), -- 18704
+(7752, 9492), -- 18390
+(7753, 9493), -- 18387
+(7773, 9521), -- 18713
+(7814, 9566), -- 18745
+(7833, 9586), -- 18804
+(7835, 9591), -- 17927
+(7940, 9733), -- 19137
+(7973, 9805), -- 19375
+(7993, 9845), -- 15991
+(8247, 10264), -- 21158
+(8251, 10270), -- 21151
+(8252, 10271), -- 21197
+(8298, 10352), -- 17712
+(8432, 10538), -- 21983
+(8433, 10291), -- 19340
+(8433, 10292), -- 19340
+(8566, 10735); -- 22832
+
+-- correct npc_flags for npc from sniff
+UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3210; -- Brave Proudsnout
+UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3211; -- Brave Lightninghorn
+UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3213; -- Brave Running Wolf
+UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3214; -- Brave Greathoof
+UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3502; -- Ratchet Bruiser
+UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=21151; -- Borgrim Stouthammer <Explorers' League>
+UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=21197; -- Bronwyn Stouthammer <Explorers' League>
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=21469; -- Daranelle
+
+-- Add condition
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=14 AND `SourceGroup`=8433 AND `SourceEntry`=10291) OR (`SourceTypeOrReferenceId`=14 AND `SourceGroup`=8433 AND `SourceEntry`=10292) OR (`SourceTypeOrReferenceId`=14 AND `SourceGroup`=12670 AND `SourceEntry`=12549);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,8433,10291,0,0,15,0,128,0,0,1,0,'','Show gossip text if player is not a mage'),
+(14,8433,10292,0,0,15,0,128,0,0,0,0,'','Show gossip text if player is a mage'),
+(14,12670,12549,0,0,15,0,256,0,0,1,0,'','Show gossip text if player is not a Warlock');
diff --git a/sql/old/3.3.5a/2012_09_10_11_world_event_scripts.sql b/sql/old/3.3.5a/2012_09_10_11_world_event_scripts.sql
new file mode 100644
index 00000000000..e0b122ede05
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_11_world_event_scripts.sql
@@ -0,0 +1,7 @@
+-- Finding the Keymaster by nelegalno
+
+UPDATE `quest_template` SET `SpecialFlags` = 0, `RequiredSpellCast1` = 0 WHERE `ID` = 10256;
+DELETE FROM `event_scripts` WHERE id=12857;
+INSERT INTO `event_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(12857,0,10,19938,3000000,0,2248.43,2227.97,138.56,2.48121),
+(12857,1,8,19938,1,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2012_09_10_12_world_sai.sql b/sql/old/3.3.5a/2012_09_10_12_world_sai.sql
new file mode 100644
index 00000000000..99111fb5961
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_12_world_sai.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry`=20243;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=20243 AND `id`=0 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
+(20243,0,0,0,8,0,100,0,256,0,0,0,19,0,0,0,0,0,0,1,0,0,0,0.0,0.0,0.0,0.0,"Scrapped Fel Reaver - On Spellhit - Remove - OOC Not attackable - flags");
diff --git a/sql/old/3.3.5a/2012_09_10_13_world_creature_model_info.sql b/sql/old/3.3.5a/2012_09_10_13_world_creature_model_info.sql
new file mode 100644
index 00000000000..339072d0502
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_10_13_world_creature_model_info.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_model_info` SET `modelid_other_gender`=4264 WHERE `modelid`=4261; -- Female orc grunt
+UPDATE `creature_model_info` SET `modelid_other_gender`=4263 WHERE `modelid`=4262; -- Female tauren
+UPDATE `creature_model_info` SET `modelid_other_gender`=4262 WHERE `modelid`=4263; -- Male tauren
+UPDATE `creature_model_info` SET `modelid_other_gender`=4261 WHERE `modelid`=4264; -- Male orc grunt
diff --git a/sql/old/3.3.5a/2012_09_11_00_world_misc.sql b/sql/old/3.3.5a/2012_09_11_00_world_misc.sql
new file mode 100644
index 00000000000..0f47f1bf2e9
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_11_00_world_misc.sql
@@ -0,0 +1,11 @@
+-- ToCr orbs
+
+SET @NPC_ORB1  := 34606; -- Frost Sphere
+SET @NPC_ORB2  := 34649; -- Frost Sphere
+
+UPDATE `creature_template` SET `speed_walk`=1.2,`speed_run`=1.42,`InhabitType`=7 WHERE `entry` IN (@NPC_ORB1,@NPC_ORB2);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (@NPC_ORB1,@NPC_ORB2);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_ORB1,0,0x3000000,0x1,''),
+(@NPC_ORB2,0,0x3000000,0x1,'');
diff --git a/sql/old/3.3.5a/2012_09_12_00_world_misc.sql b/sql/old/3.3.5a/2012_09_12_00_world_misc.sql
new file mode 100644
index 00000000000..50896ce414c
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_12_00_world_misc.sql
@@ -0,0 +1,9 @@
+-- East Porticullis(195648): close and corrections
+UPDATE `gameobject` SET `phaseMask`=1,`rotation2`=0.7071065,`rotation3`=0.707107,`spawntimesecs`=7200,`animprogress`=255,`state`=0 WHERE `guid`=151176;
+
+-- North Portcullis(195650): delete extra spawn and corrections
+DELETE FROM `gameobject` WHERE `guid`=150080;
+UPDATE `gameobject` SET `phaseMask`=1,`rotation2`=0.7071065,`rotation3`=0.707107,`spawntimesecs`=7200,`animprogress`=255,`state`=1 WHERE `guid`=151178;
+
+-- Web Door(195485): corrections
+UPDATE `gameobject` SET `spawnMask`=15,`rotation2`=0.7071067,`rotation3`=0.7071068,`spawntimesecs`=7200,`animprogress`=255 WHERE `guid`=151192;
diff --git a/sql/old/3.3.5a/2012_09_12_01_world_creature.sql b/sql/old/3.3.5a/2012_09_12_01_world_creature.sql
new file mode 100644
index 00000000000..1b7fa2d78ef
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_12_01_world_creature.sql
@@ -0,0 +1 @@
+DELETE FROM `creature` WHERE `id`=36095;
diff --git a/sql/old/3.3.5a/2012_09_13_00_world_item_template.sql b/sql/old/3.3.5a/2012_09_13_00_world_item_template.sql
new file mode 100644
index 00000000000..48b9d3a107f
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_13_00_world_item_template.sql
@@ -0,0 +1 @@
+ALTER TABLE `item_template` CHANGE unk0 SoundOverrideSubclass tinyint(3) NOT NULL DEFAULT '-1';
diff --git a/sql/old/3.3.5a/2012_09_13_01_world_fires_over_skettis.sql b/sql/old/3.3.5a/2012_09_13_01_world_fires_over_skettis.sql
new file mode 100644
index 00000000000..de9ba5a78fe
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_13_01_world_fires_over_skettis.sql
@@ -0,0 +1,91 @@
+-- Add support for quest ID: 11008 - "Fires Over Skettis" based on Warpten fix and Nelegalno/shlomi1515 updates
+-- Also add support for achievement - http://www.wowhead.com/achievement=1275/bombs-away
+SET @TRIGGER :=  22991;
+SET @EGG :=     185549;
+SET @SKYBLAST := 39844;
+SET @SUMMEGG :=  39843;
+-- Adds SAI support for Monstrous Kaliri Egg Trigger and the GO
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@TRIGGER;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@TRIGGER AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@TRIGGER*100 AND `source_type`=9;
+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 
+(@TRIGGER,0,0,0,25,0,100,0,0,0,0,0,11,@SUMMEGG,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger - On spawn/reset - Summon Monstrous Kaliri Egg (object wild)'),
+(@TRIGGER,0,1,2,8,0,100,0,@SKYBLAST,0,0,0,33,@TRIGGER,0,0,0,0,0,16,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger - On Skyguard Blasting Charge hit - Give kill credit to invoker party'),
+(@TRIGGER,0,2,3,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,20,@EGG,1,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger - Linked with previous event - Despawn'),
+(@TRIGGER,0,3,0,61,0,100,0,0,0,0,0,80,@TRIGGER*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger - Linked with previous event - Start script 0'),
+(@TRIGGER*100,9,0,0,0,0,100,0,44000,44000,0,0,11,@SUMMEGG,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger /On actionlist/ - Action 0 - Cast Summon Monstrous Kaliri Egg');
+-- Add SAI for Cannonball Stack
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@EGG;
+DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid`=@EGG;
+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
+(@EGG,1,0,0,38,0,100,0,0,1,0,0,70,45,0,0,0,0,0,1,0,0,0,0,0,0,0,' Monstrous Kaliri Egg - On data set 0 1 - Respawn object /make it reappear after 45 secs/');
+-- Remove achievement from disabled
+DELETE FROM `disables` WHERE  `sourceType`=4 AND `entry`=3922;
+-- Insert GO spawns taken directly from already spawned triggers coordinates = no need to sniff them
+SET @guid := 74685;
+DELETE FROM `gameobject` WHERE `id`=@EGG;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`) VALUES
+(@guid+0,@EGG,530,1,1,-3857.69,3426.25,363.733,-0.087267,180),
+(@guid+1,@EGG,530,1,1,-3845.16,3332.2,338.59,2.9147,180),
+(@guid+2,@EGG,530,1,1,-3965.16,3232.7,347.552,-0.122173,180),
+(@guid+3,@EGG,530,1,1,-3955.86,3222.16,347.503,0.244346,180),
+(@guid+4,@EGG,530,1,1,-3953.3,3227.94,347.564,-0.244346,180),
+(@guid+5,@EGG,530,1,1,-4044.66,3287.29,348.362,0.349066,180),
+(@guid+6,@EGG,530,1,1,-4041.39,3271,346.642,-2.09439,180),
+(@guid+7,@EGG,530,1,1,-4049.31,3285.9,348.335,1.43117,180),
+(@guid+8,@EGG,530,1,1,-4076.99,3415.22,334.008,-2.33874,180),
+(@guid+9,@EGG,530,1,1,-4076.79,3412.91,334.617,-1.0821,180),
+(@guid+10,@EGG,530,1,1,-4077.92,3412.57,334.768,-0.733038,180),
+(@guid+11,@EGG,530,1,1,-4107.93,3121.5,357.427,1.01229,180),
+(@guid+12,@EGG,530,1,1,-4108.31,3123.66,357.633,-0.680679,180),
+(@guid+13,@EGG,530,1,1,-4110.19,3122.64,358.083,-0.034907,180),
+(@guid+14,@EGG,530,1,1,-3996.89,3142.12,372.729,3.05433,180),
+(@guid+15,@EGG,530,1,1,-4109.06,3019.1,352.24,0.261799,180),
+(@guid+16,@EGG,530,1,1,-4018.35,3076.7,375.29,-0.733038,180),
+(@guid+17,@EGG,530,1,1,-4184.98,3044.71,352.394,1.81514,180),
+(@guid+18,@EGG,530,1,1,-4187.52,3040.39,352.071,-0.017453,180),
+(@guid+19,@EGG,530,1,1,-4189.67,3039.9,352.247,-0.785398,180),
+(@guid+20,@EGG,530,1,1,-4192.61,3045.1,352.096,3.14159,180),
+(@guid+21,@EGG,530,1,1,-4192.02,3046.91,352.297,2.46091,180),
+(@guid+22,@EGG,530,1,1,-4186.47,3047.19,352.316,2.60054,180),
+(@guid+23,@EGG,530,1,1,-3915.67,2983.4,396.957,-1.91986,180),
+(@guid+24,@EGG,530,1,1,-3883.21,3004.11,399.738,-1.64061,180),
+(@guid+25,@EGG,530,1,1,-3883.26,3001.55,399.431,-2.3911,180),
+(@guid+26,@EGG,530,1,1,-3884.29,3003.3,400.063,-1.88496,180),
+(@guid+27,@EGG,530,1,1,-3903.02,3095.85,383.783,-2.28638,180),
+(@guid+28,@EGG,530,1,1,-3898.45,3093.06,383.667,2.53073,180),
+(@guid+29,@EGG,530,1,1,-3900.75,3100.75,383.795,-0.436333,180),
+(@guid+30,@EGG,530,1,1,-4107.81,3023.42,352.142,1.06465,180),
+(@guid+31,@EGG,530,1,1,-4113.58,3022.4,352.157,-0.645772,180),
+(@guid+32,@EGG,530,1,1,-3893.09,3677.17,374.516,-1.23918,180),
+(@guid+33,@EGG,530,1,1,-3892.47,3674,374.478,-2.14675,180),
+(@guid+34,@EGG,530,1,1,-4198.53,3168.91,355.847,-0.383972,180),
+(@guid+35,@EGG,530,1,1,-4197.01,3170.04,356.117,-1.15192,180),
+(@guid+36,@EGG,530,1,1,-4196.54,3167.69,356.348,-0.541052,180),
+(@guid+37,@EGG,530,1,1,-4020.07,3077.84,374.391,1.53589,180),
+(@guid+38,@EGG,530,1,1,-4019.32,3079.74,375.109,-1.25664,180),
+(@guid+39,@EGG,530,1,1,-3917.21,2981.62,396.483,0.733038,180),
+(@guid+40,@EGG,530,1,1,-3918.45,2982.44,397.24,-1.72788,180),
+(@guid+41,@EGG,530,1,1,-3839.35,3344.85,337.834,2.75762,180),
+(@guid+42,@EGG,530,1,1,-3835.3,3344.77,338.155,-0.767945,180),
+(@guid+43,@EGG,530,1,1,-3846.43,3430.29,363.729,0.488692,180),
+(@guid+44,@EGG,530,1,1,-3864.13,3439.06,363.679,-0.05236,180),
+(@guid+45,@EGG,530,1,1,-3863.24,3440.42,363.655,0.349066,180),
+(@guid+46,@EGG,530,1,1,-3846.35,3439.34,363.628,-0.122173,180),
+(@guid+47,@EGG,530,1,1,-3847.32,3441.39,363.648,0.453786,180),
+(@guid+48,@EGG,530,1,1,-3686.21,3301,320.513,0.837758,180),
+(@guid+49,@EGG,530,1,1,-3687.77,3299.85,320.307,2.75762,180),
+(@guid+50,@EGG,530,1,1,-3692.64,3302.07,320.396,-0.226893,180),
+(@guid+51,@EGG,530,1,1,-3661.91,3379.15,320.377,0.890118,180),
+(@guid+52,@EGG,530,1,1,-3660.65,3381.9,320.182,1.18682,180),
+(@guid+53,@EGG,530,1,1,-3665.48,3380.11,320.365,-0.471239,180),
+(@guid+54,@EGG,530,1,1,-3685.07,3305.97,320.198,-2.87979,180),
+(@guid+55,@EGG,530,1,1,-3688.3,3308.93,320.337,1.65806,180),
+(@guid+56,@EGG,530,1,1,-3690.65,3306.77,320.43,-2.79253,180),
+(@guid+57,@EGG,530,1,1,-3879.37,3665.22,374.393,-2.30383,180),
+(@guid+58,@EGG,530,1,1,-3990.42,3139.13,372.878,-2.61799,180),
+(@guid+59,@EGG,530,1,1,-3991.59,3134.33,372.703,-0.017453,180),
+(@guid+60,@EGG,530,1,1,-3884.89,3684.98,374.492,-2.53073,180),
+(@guid+61,@EGG,530,1,1,-3800.8,3789.62,314,6.0912,180),
+(@guid+62,@EGG,530,1,1,-3799.02,3788.06,314.158,3.19395,180),
+(@guid+63,@EGG,530,1,1,-3798.91,3790.61,313.852,3.63029,180);
diff --git a/sql/old/3.3.5a/2012_09_13_01_world_ogrila.sql b/sql/old/3.3.5a/2012_09_13_01_world_ogrila.sql
new file mode 100644
index 00000000000..4ccb02e02e5
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_13_01_world_ogrila.sql
@@ -0,0 +1,158 @@
+-- Quest support for http://www.wowhead.com/quest=11010 "Bombing Run", http://www.wowhead.com/quest=11102 "Bombing Run" /druid/ and http://www.wowhead.com/quest=11023 "Bomb Them Again!"
+-- Achievement support for http://www.wowhead.com/achievement=1282 and http://www.wowhead.com/achievement=1276,
+-- Based on Warpten Script
+SET @SKYGUARD_BOMB       := 32456;
+SET @Run_Dummy           := 23118;
+SET @Explosion_Bunny     := 23119;
+SET @Flak_Cannon         := 23076;
+SET @Flak_Cannon2        := 23082;
+SET @Fel_Cannon_Dummy    := 23077;
+SET @RUN_MARK            := 40196;
+SET @THROW_BOMB          := 40160;
+SET @EXPLOSION_VISUAL    := 40162;
+SET @See_Invisibility    := 40195;
+SET @Invisibility        := 40194;
+SET @CANNONBALL_STACK   := 185861;
+-- Add class requirements for druid version of "Bombing Run"
+UPDATE `quest_template` SET `RequiredClasses`=1024 WHERE `Id`=11102;
+-- Add SAI support for Bombing Run Target Dummy
+UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=`flags_extra`|128 WHERE `entry`=@Run_Dummy;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Run_Dummy;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Run_Dummy;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@Run_Dummy*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
+(@Run_Dummy,0,0,1,8,0,100,0,@THROW_BOMB,0,1000,1000,33,@Run_Dummy,0,0,0,0,0,16,0,0,0,0,0,0,0, 'Run Target Dummy - On spell Throw Bomb hit - Give kill credit to invoker party'),
+(@Run_Dummy,0,1,2,61,0,100,0,0,0,0,0,28,@RUN_MARK,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Run Target Dummy - Linked with previous event - Remove auras from hunter mark'),
+(@Run_Dummy,0,2,3,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,20,@CANNONBALL_STACK,3,0,0,0,0,0, 'Run Target Dummy - Linked with previous event - Data set 0 1 on Cannonball Stack'),
+(@Run_Dummy,0,3,4,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,19,@Explosion_Bunny,3,0,0,0,0,0, 'Run Target Dummy - Linked with previous event - Data set 0 1 on Explosion Bunny'),
+(@Run_Dummy,0,4,0,61,0,100,0,0,0,0,0,80,@Run_Dummy*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Run Target Dummy - Linked with previous event - Start script 0'),
+(@Run_Dummy*100,9,0,0,0,0,100,0,29000,29000,0,0,11,@RUN_MARK,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Run Target Dummy - Action 0 - Cast run mark on self');
+-- Add SAI for Cannonball Stack
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@CANNONBALL_STACK;
+DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid`=@CANNONBALL_STACK;
+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
+(@CANNONBALL_STACK,1,0,0,38,0,100,0,0,1,0,0,70,30,0,0,0,0,0,1,0,0,0,0,0,0,0,' Cannonball Stack - On data set 0 1 - Respawn object /make it reappear after 30 secs/');
+-- Add SAI support for Bombing Run Fel Cannon Dummy
+UPDATE `creature_template` SET `AIName`='SmartAI',`unit_flags`=4,`flags_extra`=`flags_extra`|128 WHERE `entry`=@Fel_Cannon_Dummy;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Fel_Cannon_Dummy;
+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
+(@Fel_Cannon_Dummy,0,0,0,8,0,100,0,40110,0,4350,5000,11,40119,0,0,0,0,0,19,@Flak_Cannon,5,0,0,0,0,0, 'Fel Cannon Dummy - On spell hit by Cannon trigger - Cast Aggro Burst on Flak Cannon');
+-- Add SAI support for Bombing Run Flak Cannon
+UPDATE `creature_template` SET `AIName`='SmartAI',`unit_flags`=`unit_flags`|4|256|131072,`flags_extra`=`flags_extra`|2 WHERE `entry`=@Flak_Cannon;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Flak_Cannon;
+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
+(@Flak_Cannon,0,0,0,25,0,100,0,0,0,0,0,11,40111,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Flak Cannon - On reset - Cast The Aggro Bunnies'),
+(@Flak_Cannon,0,1,2,8,0,100,0,41598,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Flak Cannon - On hit by Bolt Pair - Set orientation to invoker'),
+(@Flak_Cannon,0,2,0,61,0,100,0,0,0,0,0,11,40109,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Flak Cannon - Linked with previous event - Cast spell The Bolt');
+-- Add SAI support for Bombing Run Flak Cannon 2 /target bunny/
+UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=`flags_extra`|128,`InhabitType`=4 WHERE `entry`=@Flak_Cannon2;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Flak_Cannon2;
+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
+(@Flak_Cannon2,0,0,0,54,0,100,0,0,0,0,0,11,41598,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Flak Cannon 2 - On just summoned - Cast The Bolt Pair on invoker'),
+(@Flak_Cannon2,0,1,2,8,0,100,0,40109,0,0,0,11,40075,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Flak Cannon 2 - On spell hit Cannon Bolt - Cast on self Fel Flak Fire'),
+(@Flak_Cannon2,0,2,0,61,0,100,0,0,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Flak Cannon 2 - Linked with previous event - Despawn in 5 sec');
+-- Add SAI support for Explosion Bunny
+UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=`flags_extra`|128,`unit_flags`=0 WHERE `entry`=@Explosion_Bunny;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Explosion_Bunny;
+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
+(@Explosion_Bunny,0,0,0,38,0,100,0,0,1,0,0,11,@EXPLOSION_VISUAL,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Explosion Bunny - On data set 0 1 - Cast Explosion Visual on self');
+-- Add conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (@THROW_BOMB,40110,40112,40075);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (@THROW_BOMB,40200,41598,40111);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=@Fel_Cannon_Dummy;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`Comment`) VALUES
+(17,0,@THROW_BOMB,0,29,0,@Run_Dummy,35,0,0,0,'Throw Bomb requires Run Target Dummy within 35y'),
+(13,1,@THROW_BOMB,0,31,0,3,@Run_Dummy,0,0,0,'Throw Bomb implicit effect 0 can hit only Run Target Dummy'),
+(13,1,@THROW_BOMB,0,1,0,@RUN_MARK,0,0,0,0,'Throw Bomb can hit only targets under the aura of 40196'),
+(17,0,40200,0,9,0,11010,0,0,1,0,'To cast remove see invisibility player must not be on quest 11010'),
+(17,0,40200,0,9,0,11102,0,0,1,0,'To cast remove see invisibility player must not be on quest 11102'),
+(17,0,40200,0,9,0,11023,0,0,1,0,'To cast remove see invisibility player must not be on quest 11023'),
+(13,1,40110,0,31,0,3,23077,0,0,0,'Cannon Trigger implicit targets can be only Fel Cannon Dummies'),
+(13,1,40110,0,35,0,1,65,2,0,0,'Cannon Trigger implicit hit can happen only on targets under 65 yards range'),
+(17,0,40111,0,29,0,@Fel_Cannon_Dummy,10,0,1,0,'The Aggro Bunnies caster should not be around Fel Cannon Dummies to cast'),
+(13,1,40112,0,31,0,4,0,0,0,0,'Bombing Run Dummy aggro check can hit players'),
+(13,3,40075,0,31,0,4,0,0,0,0,'Fel Flak Fire effect 2 can hit only players'),
+(22,1,@Fel_Cannon_Dummy,0,1,1,40119,0,0,1,0,'Fel Cannon Dummy event 0 will happen only if target is missing aura from aggro burst');
+-- Insert addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (@Run_Dummy,@Explosion_Bunny,@Fel_Cannon_Dummy);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@Run_Dummy,0,0,0,0,'40196 40194 40195'), -- Mark, See Invisibility, Invisibility
+(@Explosion_Bunny,0,0,0,0,'40194 40195'), -- See Invisibility, Invisibility
+(@Fel_Cannon_Dummy,0,0,0,0,'40113'); -- The Aggro Check Aura
+-- Remove achievement from disabled
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry`=3923;
+-- Add missing spell from dbc
+DELETE FROM `spell_dbc` WHERE `Id`=40200;
+INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES
+(40200,0,0,256,0,0,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,26,1,0,-1,0,0,164,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,'Bombing Run: See Invisibility Aura Remover');
+-- Spell area - Check to cast remove aura /against see invisibility aura/, if having it and not on quest
+DELETE FROM `spell_area` WHERE `spell`=40200;
+INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES
+(40200,3522,0,0,0,@See_Invisibility,0,2,1);
+-- Insert cannonballs spawns /based on sniffs/
+SET @guid := 14811;
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @guid+0 AND @guid+13;
+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,@CANNONBALL_STACK,530,1,1,2825.11,7024.05,369.982,5.69617,0,0,0.289313,-0.957235,300,0,1),
+(@guid+1,@CANNONBALL_STACK,530,1,1,2938.26,7094.72,369.413,2.78314,0,0,0.983982,0.178267,300,0,1),
+(@guid+2,@CANNONBALL_STACK,530,1,1,2924.84,7031.46,367.857,4.26205,0,0,0.847134,-0.53138,300,0,1),
+(@guid+3,@CANNONBALL_STACK,530,1,1,2938.02,7015.59,365.75,3.65778,0,0,0.966879,-0.255237,300,0,1),
+(@guid+4,@CANNONBALL_STACK,530,1,1,2998.57,7043.55,368.539,5.91266,0,0,0.184206,-0.982888,300,0,1),
+(@guid+5,@CANNONBALL_STACK,530,1,1,2982,7054.94,368.32,4.99766,0,0,0.599411,-0.800442,300,0,1),
+(@guid+6,@CANNONBALL_STACK,530,1,1,2978.73,6889.19,369.701,0.689745,0,0,0.338077,0.941119,300,0,1),
+(@guid+7,@CANNONBALL_STACK,530,1,1,2941.56,6827.17,367.3,4.08109,0,0,0.891683,-0.452661,300,0,1),
+(@guid+8,@CANNONBALL_STACK,530,1,1,2953.55,6859.3,369.954,6.14433,0,0,0.0693712,-0.997591,300,0,1),
+(@guid+9,@CANNONBALL_STACK,530,1,1,3023.13,6799.74,374.46,1.58666,0,0,0.712695,0.701474,300,0,1),
+(@guid+10,@CANNONBALL_STACK,530,1,1,3028.3,6824.84,373.591,5.0275,0,0,0.587401,-0.809296,300,0,1),
+(@guid+11,@CANNONBALL_STACK,530,1,1,3022.15,6859.05,369.546,3.44885,0,0,0.988222,-0.153025,300,0,1),
+(@guid+12,@CANNONBALL_STACK,530,1,1,3016.28,6876.11,370.188,3.47791,0,0,0.985895,-0.167365,300,0,1),
+(@guid+13,@CANNONBALL_STACK,530,1,1,2940.6,7106.65,370.123,0.88561,0,0,0.428475,0.903553,300,0,1);
+-- Insert spawns for Fel Flak Cannons, Run Target Dummies and Explosion Bunnies /based on sniffs/
+SET @guid := 85656;
+DELETE FROM `creature` WHERE `guid` BETWEEN @guid+0 AND @guid+44;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@guid+0,23118,530,1,1,0,0,2764.71,7024.45,370.203,0,300,0,0,42,0,0,0,33554432,0),
+(@guid+1,23119,530,1,1,0,0,2764.71,7024.45,370.203,0,300,0,0,6986,0,0,0,33554432,0),
+(@guid+2,23118,530,1,1,0,0,2786.61,7036.28,370.686,0,300,0,0,42,0,0,0,33554432,0),
+(@guid+3,23119,530,1,1,0,0,2786.61,7036.28,370.686,0,300,0,0,6986,0,0,0,33554432,0),
+(@guid+4,23118,530,1,1,0,0,2824.71,7044.79,369.877,0,300,0,0,42,0,0,0,33554432,0),
+(@guid+5,23119,530,1,1,0,0,2824.71,7044.79,369.877,0,300,0,0,6986,0,0,0,33554432,0),
+(@guid+6,23076,530,1,1,0,0,2775.81,7030.75,370.337,1.85606,300,0,0,22140,0,0,0,0,0),
+(@guid+7,23076,530,1,1,0,0,2933.28,7103.93,369.209,2.58129,300,0,0,21543,0,0,0,0,0),
+(@guid+8,23119,530,1,1,0,0,2940.82,7107.17,370.115,4.65944,300,0,0,6986,0,0,0,33554432,0),
+(@guid+9,23118,530,1,1,0,0,2940.82,7107.17,370.115,4.65944,300,0,0,42,0,0,0,33554432,0),
+(@guid+10,23118,530,1,1,0,0,2825.11,7024.05,369.982,5.69617,300,0,0,42,0,0,0,33554432,0),
+(@guid+11,23119,530,1,1,0,0,2825.11,7024.05,369.982,5.69617,300,0,0,6986,0,0,0,33554432,0),
+(@guid+12,23076,530,1,1,0,0,2834.14,7018.43,368.459,5.42992,300,0,0,21543,0,0,0,0,0),
+(@guid+13,23119,530,1,1,0,0,2938.84,7094.48,371.493,0.242375,300,0,0,6986,0,0,0,33554432,0),
+(@guid+14,23118,530,1,1,0,0,2938.84,7094.48,371.493,0.242375,300,0,0,42,0,0,0,33554432,0),
+(@guid+15,23076,530,1,1,0,0,2925.49,7021.72,367.007,3.59446,300,0,0,22140,0,0,0,0,0),
+(@guid+16,23119,530,1,1,0,0,2924.84,7031.46,367.857,4.26205,300,0,0,6986,0,0,0,33554432,0),
+(@guid+17,23118,530,1,1,0,0,2924.84,7031.46,367.857,4.26205,300,0,0,42,0,0,0,33554432,0),
+(@guid+18,23119,530,1,1,0,0,2938.02,7015.59,366.54,3.65778,300,0,0,6986,0,0,0,33554432,0),
+(@guid+19,23118,530,1,1,0,0,2938.02,7015.59,366.54,3.65778,300,0,0,42,0,0,0,33554432,0),
+(@guid+20,23076,530,1,1,0,0,2994.48,7039.91,369.42,5.26077,300,0,0,22140,0,0,0,0,0),
+(@guid+21,23119,530,1,1,0,0,2998.57,7043.55,368.539,5.91266,300,0,0,6986,0,0,0,33554432,0),
+(@guid+22,23118,530,1,1,0,0,2998.57,7043.55,368.539,5.91266,300,0,0,42,0,0,0,33554432,0),
+(@guid+23,23119,530,1,1,0,0,2982,7054.94,368.82,4.99766,300,0,0,6986,0,0,0,33554432,0),
+(@guid+24,23118,530,1,1,0,0,2982,7054.94,368.82,4.99766,300,0,0,42,0,0,0,33554432,0),
+(@guid+25,23076,530,1,1,0,0,2982.59,6886.5,370.082,0.831123,300,0,0,22140,0,0,0,0,0),
+(@guid+26,23118,530,1,1,0,0,2978.74,6889.12,371.288,0.897875,300,0,0,42,0,0,0,33554432,0),
+(@guid+27,23119,530,1,1,0,0,2978.74,6889.12,371.288,0.897875,300,0,0,6986,0,0,0,33554432,0),
+(@guid+28,23118,530,1,1,0,0,2941.56,6827.17,367.3,4.54054,300,0,0,42,0,0,0,33554432,0),
+(@guid+29,23119,530,1,1,0,0,2941.56,6827.17,367.3,4.54054,300,0,0,6986,0,0,0,33554432,0),
+(@guid+30,23076,530,1,1,0,0,2938.19,6818.01,366.959,3.31926,300,0,0,21543,0,0,0,0,0),
+(@guid+31,23076,530,1,1,0,0,2946.3,6875.71,370.04,3.2148,300,0,0,22140,0,0,0,0,0),
+(@guid+32,23118,530,1,1,0,0,2953.55,6859.3,369.954,6.14433,300,0,0,42,0,0,0,33554432,0),
+(@guid+33,23119,530,1,1,0,0,2953.55,6859.3,369.954,6.14433,300,0,0,6986,0,0,0,33554432,0),
+(@guid+34,23119,530,1,1,0,0,3023.13,6799.74,374.46,1.58666,300,0,0,6986,0,0,0,33554432,0),
+(@guid+35,23118,530,1,1,0,0,3023.13,6799.74,374.46,1.58666,300,0,0,42,0,0,0,33554432,0),
+(@guid+36,23076,530,1,1,0,0,3028.22,6807.09,374.075,5.94641,300,0,0,22140,0,0,0,0,0),
+(@guid+37,23118,530,1,1,0,0,3028.3,6824.84,373.591,5.0275,300,0,0,42,0,0,0,33554432,0),
+(@guid+38,23119,530,1,1,0,0,3028.3,6824.84,373.591,5.0275,300,0,0,6986,0,0,0,33554432,0),
+(@guid+39,23119,530,1,1,0,0,3022.15,6859.05,369.546,3.44885,300,0,0,6986,0,0,0,33554432,0),
+(@guid+40,23118,530,1,1,0,0,3022.15,6859.05,369.546,3.44885,300,0,0,42,0,0,0,33554432,0),
+(@guid+41,23076,530,1,1,0,0,3022.21,6864.61,369.93,0.100696,300,0,0,22140,0,0,0,0,0),
+(@guid+42,23118,530,1,1,0,0,3016.28,6876.11,370.188,3.47791,300,0,0,42,0,0,0,33554432,0),
+(@guid+43,23119,530,1,1,0,0,3016.28,6876.11,370.188,3.47791,300,0,0,6986,0,0,0,33554432,0),
+(@guid+44,23076,530,1,1,0,0,2816.74,7057.61,369.779,1.4555,300,0,0,21543,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2012_09_13_01_world_spell_script_name.sql b/sql/old/3.3.5a/2012_09_13_01_world_spell_script_name.sql
new file mode 100644
index 00000000000..61e4067c544
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_13_01_world_spell_script_name.sql
@@ -0,0 +1,14 @@
+-- Add spell script name for Fires Over Skettis and Bombing Run quests
+DELETE FROM `spell_script_names` WHERE `spell_id`=40113;
+DELETE FROM `spell_script_names` WHERE `spell_id`=40160;
+DELETE FROM `spell_script_names` WHERE `spell_id`=39844;
+DELETE FROM `spell_script_names` WHERE `spell_id`=40056;
+DELETE FROM `spell_script_names` WHERE `spell_id`=40112;
+DELETE FROM `spell_script_names` WHERE `spell_id`=40119;
+INSERT INTO `spell_script_names` VALUES
+(39844,'spell_q11010_q11102_q11023_q11008_check_fly_mount'),
+(40160,'spell_q11010_q11102_q11023_q11008_check_fly_mount'),
+(40113,'spell_q11010_q11102_q11023_aggro_check_aura'),
+(40056,'spell_q11010_q11102_q11023_choose_loc'),
+(40112,'spell_q11010_q11102_q11023_aggro_check'),
+(40119,'spell_q11010_q11102_q11023_aggro_burst');
diff --git a/sql/old/3.3.5a/2012_09_13_01_world_spell_target_position.sql b/sql/old/3.3.5a/2012_09_13_01_world_spell_target_position.sql
new file mode 100644
index 00000000000..0879dbbbda0
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_13_01_world_spell_target_position.sql
@@ -0,0 +1,15 @@
+DELETE FROM `spell_target_position` WHERE `id` IN (60323,60324,60325,60326,60327,60328,60329,60330,60331,60332,60333,60334,60335);
+INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
+(60323,0,-5506.339,-704.348,392.686,0.595), -- Steelgrills Depot
+(60324,0,-9470.760,3.909,49.794,4.802), -- Lions Pride Inn, Goldshire
+(60325,1,-3721.306,-4411.906,25.247,0.831), -- Theramore isle, Dustwallow Marsh
+(60326,0,286.314,-2184.086,122.612,2.271), -- Aerie Peak, The Hinterlands
+(60327,1,6395.708,433.256,33.260,0.566), -- Auberdine, Darkshore
+(60328,0,-14412.923,692.017,22.248,1.231), -- Boote Bay
+(60329,1,-7135.717,-3787.769,8.799,5.992), -- Tanaris, Gadgetzan
+(60330,0,-10336.138,-2934.057,116.723,4.523), -- Swamp of Sorrows, Z coord is intended
+(60331,0,-10446.900,-3261.909,20.179,5.875), -- Stonard, Swamp of Sorrows
+(60332,0,-103.988,-902.795,55.534,5.924), -- Tarren Mill, Hillsbrad Foothils
+(60333,0,1804.836,196.322,70.399,1.572), -- Undercity
+(60334,1,-1060.266,23.137,141.455,5.967), -- Thunder Bluff
+(60335,1,-506.224,-2590.084,113.150,2.445); -- Barrens, The Crossroads
diff --git a/sql/old/3.3.5a/2012_09_13_02_world_trinity_string.sql b/sql/old/3.3.5a/2012_09_13_02_world_trinity_string.sql
new file mode 100644
index 00000000000..f7214ad127b
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_13_02_world_trinity_string.sql
@@ -0,0 +1,12 @@
+DELETE FROM `command` WHERE `name` = 'cheat status';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('cheat status', 2, 'Syntax: .cheat status \n\nShows the cheats you currently have enabled.');
+
+DELETE FROM `trinity_string` WHERE `entry` BETWEEN 357 AND 362;
+INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
+(357, 'Cheat Command Status:'),
+(358, 'Godmode: %s.'),
+(359, 'Casttime: %s.'),
+(360, 'Cooldown: %s.'),
+(361, 'Power: %s.'),
+(362, 'Waterwalk: %s.');
diff --git a/sql/old/3.3.5a/2012_09_14_00_world_creature_template.sql b/sql/old/3.3.5a/2012_09_14_00_world_creature_template.sql
new file mode 100644
index 00000000000..335b92e9af7
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_14_00_world_creature_template.sql
@@ -0,0 +1,287 @@
+UPDATE `creature_template` SET `lootid`=18604 WHERE `entry`=17400;
+UPDATE `creature_template` SET `lootid`=18605 WHERE `entry`=17401;
+UPDATE `creature_template` SET `lootid`=19884 WHERE `entry`=17816;
+UPDATE `creature_template` SET `lootid`=19885 WHERE `entry`=17957;
+UPDATE `creature_template` SET `lootid`=19886 WHERE `entry`=17958;
+UPDATE `creature_template` SET `lootid`=19887 WHERE `entry`=17961;
+UPDATE `creature_template` SET `lootid`=19888 WHERE `entry`=17938;
+UPDATE `creature_template` SET `lootid`=19889 WHERE `entry`=17959;
+UPDATE `creature_template` SET `lootid`=19890 WHERE `entry`=17960;
+UPDATE `creature_template` SET `lootid`=19891 WHERE `entry`=17940;
+UPDATE `creature_template` SET `lootid`=19892 WHERE `entry`=17817;
+UPDATE `creature_template` SET `lootid`=19902 WHERE `entry`=17963;
+UPDATE `creature_template` SET `lootid`=19903 WHERE `entry`=17962;
+UPDATE `creature_template` SET `lootid`=19904 WHERE `entry`=17964;
+UPDATE `creature_template` SET `lootid`=20164 WHERE `entry`=17723;
+UPDATE `creature_template` SET `lootid`=20173 WHERE `entry`=17731;
+UPDATE `creature_template` SET `lootid`=20174 WHERE `entry`=19632;
+UPDATE `creature_template` SET `lootid`=20175 WHERE `entry`=17732;
+UPDATE `creature_template` SET `lootid`=20177 WHERE `entry`=17730;
+UPDATE `creature_template` SET `lootid`=20179 WHERE `entry`=17771;
+UPDATE `creature_template` SET `lootid`=20180 WHERE `entry`=17729;
+UPDATE `creature_template` SET `lootid`=20181 WHERE `entry`=17728;
+UPDATE `creature_template` SET `lootid`=20185 WHERE `entry`=17724;
+UPDATE `creature_template` SET `lootid`=20187 WHERE `entry`=17734;
+UPDATE `creature_template` SET `lootid`=20188 WHERE `entry`=17725;
+UPDATE `creature_template` SET `lootid`=20190 WHERE `entry`=17871;
+UPDATE `creature_template` SET `lootid`=20191 WHERE `entry`=17726;
+UPDATE `creature_template` SET `lootid`=20192 WHERE `entry`=17727;
+UPDATE `creature_template` SET `lootid`=20193 WHERE `entry`=17735;
+UPDATE `creature_template` SET `lootid`=20255 WHERE `entry`=18311;
+UPDATE `creature_template` SET `lootid`=20256 WHERE `entry`=18331;
+UPDATE `creature_template` SET `lootid`=20257 WHERE `entry`=18317;
+UPDATE `creature_template` SET `lootid`=20258 WHERE `entry`=18309;
+UPDATE `creature_template` SET `lootid`=20259 WHERE `entry`=18313;
+UPDATE `creature_template` SET `lootid`=20260 WHERE `entry`=18312;
+UPDATE `creature_template` SET `lootid`=20261 WHERE `entry`=18315;
+UPDATE `creature_template` SET `lootid`=20263 WHERE `entry`=19306;
+UPDATE `creature_template` SET `lootid`=20264 WHERE `entry`=18314;
+UPDATE `creature_template` SET `lootid`=20265 WHERE `entry`=19307;
+UPDATE `creature_template` SET `lootid`=20298 WHERE `entry`=18524;
+UPDATE `creature_template` SET `lootid`=20299 WHERE `entry`=18497;
+UPDATE `creature_template` SET `lootid`=20300 WHERE `entry`=18702;
+UPDATE `creature_template` SET `lootid`=20301 WHERE `entry`=18493;
+UPDATE `creature_template` SET `lootid`=20302 WHERE `entry`=18495;
+UPDATE `creature_template` SET `lootid`=20309 WHERE `entry`=18503;
+UPDATE `creature_template` SET `lootid`=20310 WHERE `entry`=18557;
+UPDATE `creature_template` SET `lootid`=20311 WHERE `entry`=18556;
+UPDATE `creature_template` SET `lootid`=20312 WHERE `entry`=18558;
+UPDATE `creature_template` SET `lootid`=20313 WHERE `entry`=18559;
+UPDATE `creature_template` SET `lootid`=20315 WHERE `entry`=18521;
+UPDATE `creature_template` SET `lootid`=20320 WHERE `entry`=18500;
+UPDATE `creature_template` SET `lootid`=20321 WHERE `entry`=18498;
+UPDATE `creature_template` SET `lootid`=20322 WHERE `entry`=18499;
+UPDATE `creature_template` SET `lootid`=20323 WHERE `entry`=18501;
+UPDATE `creature_template` SET `lootid`=20525 WHERE `entry`=18934;
+UPDATE `creature_template` SET `lootid`=20526 WHERE `entry`=17820;
+UPDATE `creature_template` SET `lootid`=20527 WHERE `entry`=17819;
+UPDATE `creature_template` SET `lootid`=20528 WHERE `entry`=17840;
+UPDATE `creature_template` SET `lootid`=20529 WHERE `entry`=17860;
+UPDATE `creature_template` SET `lootid`=20530 WHERE `entry`=17833;
+UPDATE `creature_template` SET `lootid`=20532 WHERE `entry`=18171;
+UPDATE `creature_template` SET `lootid`=20533 WHERE `entry`=18172;
+UPDATE `creature_template` SET `lootid`=20534 WHERE `entry`=18170;
+UPDATE `creature_template` SET `lootid`=20537 WHERE `entry`=17815;
+UPDATE `creature_template` SET `lootid`=20538 WHERE `entry`=17814;
+UPDATE `creature_template` SET `lootid`=20543 WHERE `entry`=17846;
+UPDATE `creature_template` SET `lootid`=20545 WHERE `entry`=18092;
+UPDATE `creature_template` SET `lootid`=20546 WHERE `entry`=18094;
+UPDATE `creature_template` SET `lootid`=20547 WHERE `entry`=18093;
+UPDATE `creature_template` SET `lootid`=20620 WHERE `entry`=17721;
+UPDATE `creature_template` SET `lootid`=20621 WHERE `entry`=17800;
+UPDATE `creature_template` SET `lootid`=20622 WHERE `entry`=17803;
+UPDATE `creature_template` SET `lootid`=20623 WHERE `entry`=17801;
+UPDATE `creature_template` SET `lootid`=20624 WHERE `entry`=17805;
+UPDATE `creature_template` SET `lootid`=20625 WHERE `entry`=17722;
+UPDATE `creature_template` SET `lootid`=20626 WHERE `entry`=17802;
+UPDATE `creature_template` SET `lootid`=20627 WHERE `entry`=17917;
+UPDATE `creature_template` SET `lootid`=20628 WHERE `entry`=17799;
+UPDATE `creature_template` SET `lootid`=20638 WHERE `entry`=18633;
+UPDATE `creature_template` SET `lootid`=20639 WHERE `entry`=18636;
+UPDATE `creature_template` SET `lootid`=20640 WHERE `entry`=18631;
+UPDATE `creature_template` SET `lootid`=20641 WHERE `entry`=18635;
+UPDATE `creature_template` SET `lootid`=20642 WHERE `entry`=18632;
+UPDATE `creature_template` SET `lootid`=20643 WHERE `entry`=18641;
+UPDATE `creature_template` SET `lootid`=20644 WHERE `entry`=18830;
+UPDATE `creature_template` SET `lootid`=20645 WHERE `entry`=18794;
+UPDATE `creature_template` SET `lootid`=20646 WHERE `entry`=18637;
+UPDATE `creature_template` SET `lootid`=20647 WHERE `entry`=18639;
+UPDATE `creature_template` SET `lootid`=20648 WHERE `entry`=18634;
+UPDATE `creature_template` SET `lootid`=20649 WHERE `entry`=18640;
+UPDATE `creature_template` SET `lootid`=20650 WHERE `entry`=18638;
+UPDATE `creature_template` SET `lootid`=20651 WHERE `entry`=18642;
+UPDATE `creature_template` SET `lootid`=20652 WHERE `entry`=18796;
+UPDATE `creature_template` SET `lootid`=20655 WHERE `entry`=18663;
+UPDATE `creature_template` SET `lootid`=20656 WHERE `entry`=18848;
+UPDATE `creature_template` SET `lootid`=20660 WHERE `entry`=19208;
+UPDATE `creature_template` SET `lootid`=20661 WHERE `entry`=19209;
+UPDATE `creature_template` SET `lootid`=20686 WHERE `entry`=19429;
+UPDATE `creature_template` SET `lootid`=20688 WHERE `entry`=19428;
+UPDATE `creature_template` SET `lootid`=20691 WHERE `entry`=18327;
+UPDATE `creature_template` SET `lootid`=20692 WHERE `entry`=18323;
+UPDATE `creature_template` SET `lootid`=20693 WHERE `entry`=18318;
+UPDATE `creature_template` SET `lootid`=20694 WHERE `entry`=18328;
+UPDATE `creature_template` SET `lootid`=20695 WHERE `entry`=18325;
+UPDATE `creature_template` SET `lootid`=20696 WHERE `entry`=18322;
+UPDATE `creature_template` SET `lootid`=20697 WHERE `entry`=18319;
+UPDATE `creature_template` SET `lootid`=20698 WHERE `entry`=18320;
+UPDATE `creature_template` SET `lootid`=20699 WHERE `entry`=18326;
+UPDATE `creature_template` SET `lootid`=20701 WHERE `entry`=18321;
+UPDATE `creature_template` SET `lootid`=20993 WHERE `entry`=20923;
+UPDATE `creature_template` SET `lootid`=21522 WHERE `entry`=19510;
+UPDATE `creature_template` SET `lootid`=21523 WHERE `entry`=20990;
+UPDATE `creature_template` SET `lootid`=21524 WHERE `entry`=19167;
+UPDATE `creature_template` SET `lootid`=21527 WHERE `entry`=19231;
+UPDATE `creature_template` SET `lootid`=21528 WHERE `entry`=19712;
+UPDATE `creature_template` SET `lootid`=21531 WHERE `entry`=19716;
+UPDATE `creature_template` SET `lootid`=21532 WHERE `entry`=19713;
+UPDATE `creature_template` SET `lootid`=21539 WHERE `entry`=19168;
+UPDATE `creature_template` SET `lootid`=21540 WHERE `entry`=20988;
+UPDATE `creature_template` SET `lootid`=21541 WHERE `entry`=20059;
+UPDATE `creature_template` SET `lootid`=21542 WHERE `entry`=19735;
+UPDATE `creature_template` SET `lootid`=21543 WHERE `entry`=19166;
+UPDATE `creature_template` SET `lootid`=21585 WHERE `entry`=20857;
+UPDATE `creature_template` SET `lootid`=21586 WHERE `entry`=20869;
+UPDATE `creature_template` SET `lootid`=21587 WHERE `entry`=20859;
+UPDATE `creature_template` SET `lootid`=21588 WHERE `entry`=20911;
+UPDATE `creature_template` SET `lootid`=21589 WHERE `entry`=20905;
+UPDATE `creature_template` SET `lootid`=21591 WHERE `entry`=20867;
+UPDATE `creature_template` SET `lootid`=21593 WHERE `entry`=20868;
+UPDATE `creature_template` SET `lootid`=21594 WHERE `entry`=20880;
+UPDATE `creature_template` SET `lootid`=21595 WHERE `entry`=20879;
+UPDATE `creature_template` SET `lootid`=21596 WHERE `entry`=20896;
+UPDATE `creature_template` SET `lootid`=21597 WHERE `entry`=20897;
+UPDATE `creature_template` SET `lootid`=21598 WHERE `entry`=20898;
+UPDATE `creature_template` SET `lootid`=21601 WHERE `entry`=20912;
+UPDATE `creature_template` SET `lootid`=21604 WHERE `entry`=20875;
+UPDATE `creature_template` SET `lootid`=21605 WHERE `entry`=20873;
+UPDATE `creature_template` SET `lootid`=21606 WHERE `entry`=20906;
+UPDATE `creature_template` SET `lootid`=21607 WHERE `entry`=20865;
+UPDATE `creature_template` SET `lootid`=21608 WHERE `entry`=20864;
+UPDATE `creature_template` SET `lootid`=21610 WHERE `entry`=20901;
+UPDATE `creature_template` SET `lootid`=21611 WHERE `entry`=20902;
+UPDATE `creature_template` SET `lootid`=21613 WHERE `entry`=20882;
+UPDATE `creature_template` SET `lootid`=21614 WHERE `entry`=20866;
+UPDATE `creature_template` SET `lootid`=21615 WHERE `entry`=20883;
+UPDATE `creature_template` SET `lootid`=21616 WHERE `entry`=20909;
+UPDATE `creature_template` SET `lootid`=21617 WHERE `entry`=20908;
+UPDATE `creature_template` SET `lootid`=21618 WHERE `entry`=20910;
+UPDATE `creature_template` SET `lootid`=21619 WHERE `entry`=20881;
+UPDATE `creature_template` SET `lootid`=21621 WHERE `entry`=20900;
+UPDATE `creature_template` SET `lootid`=21842 WHERE `entry`=21126;
+UPDATE `creature_template` SET `lootid`=21843 WHERE `entry`=21127;
+UPDATE `creature_template` SET `lootid`=21914 WHERE `entry`=21694;
+UPDATE `creature_template` SET `lootid`=21916 WHERE `entry`=21696;
+UPDATE `creature_template` SET `lootid`=21917 WHERE `entry`=21695;
+UPDATE `creature_template` SET `lootid`=21989 WHERE `entry`=21891;
+UPDATE `creature_template` SET `lootid`=21990 WHERE `entry`=21904;
+UPDATE `creature_template` SET `lootid`=22129 WHERE `entry`=22128;
+UPDATE `creature_template` SET `lootid`=22162 WHERE `entry`=18983;
+UPDATE `creature_template` SET `lootid`=22163 WHERE `entry`=17952;
+UPDATE `creature_template` SET `lootid`=22173 WHERE `entry`=18982;
+UPDATE `creature_template` SET `lootid`=22346 WHERE `entry`=21702;
+UPDATE `creature_template` SET `lootid`=22530 WHERE `entry`=13536;
+UPDATE `creature_template` SET `lootid`=22532 WHERE `entry`=13539;
+UPDATE `creature_template` SET `lootid`=22533 WHERE `entry`=13424;
+UPDATE `creature_template` SET `lootid`=22534 WHERE `entry`=13542;
+UPDATE `creature_template` SET `lootid`=22535 WHERE `entry`=13554;
+UPDATE `creature_template` SET `lootid`=22536 WHERE `entry`=13545;
+UPDATE `creature_template` SET `lootid`=22537 WHERE `entry`=13557;
+UPDATE `creature_template` SET `lootid`=22538 WHERE `entry`=13425;
+UPDATE `creature_template` SET `lootid`=22539 WHERE `entry`=13155;
+UPDATE `creature_template` SET `lootid`=22543 WHERE `entry`=14770;
+UPDATE `creature_template` SET `lootid`=22547 WHERE `entry`=14768;
+UPDATE `creature_template` SET `lootid`=22550 WHERE `entry`=13378;
+UPDATE `creature_template` SET `lootid`=22555 WHERE `entry`=603;
+UPDATE `creature_template` SET `lootid`=22565 WHERE `entry`=13377;
+UPDATE `creature_template` SET `lootid`=22576 WHERE `entry`=13416;
+UPDATE `creature_template` SET `lootid`=22578 WHERE `entry`=13151;
+UPDATE `creature_template` SET `lootid`=22579 WHERE `entry`=14767;
+UPDATE `creature_template` SET `lootid`=22587 WHERE `entry`=13526;
+UPDATE `creature_template` SET `lootid`=22592 WHERE `entry`=13530;
+UPDATE `creature_template` SET `lootid`=22595 WHERE `entry`=14769;
+UPDATE `creature_template` SET `lootid`=22607 WHERE `entry`=13527;
+UPDATE `creature_template` SET `lootid`=22612 WHERE `entry`=13531;
+UPDATE `creature_template` SET `lootid`=22613 WHERE `entry`=13140;
+UPDATE `creature_template` SET `lootid`=22614 WHERE `entry`=13319;
+UPDATE `creature_template` SET `lootid`=22615 WHERE `entry`=13320;
+UPDATE `creature_template` SET `lootid`=22616 WHERE `entry`=13154;
+UPDATE `creature_template` SET `lootid`=22617 WHERE `entry`=13152;
+UPDATE `creature_template` SET `lootid`=22618 WHERE `entry`=13318;
+UPDATE `creature_template` SET `lootid`=22619 WHERE `entry`=13153;
+UPDATE `creature_template` SET `lootid`=22620 WHERE `entry`=13139;
+UPDATE `creature_template` SET `lootid`=22621 WHERE `entry`=13446;
+UPDATE `creature_template` SET `lootid`=22623 WHERE `entry`=13597;
+UPDATE `creature_template` SET `lootid`=22624 WHERE `entry`=13357;
+UPDATE `creature_template` SET `lootid`=22628 WHERE `entry`=13841;
+UPDATE `creature_template` SET `lootid`=22634 WHERE `entry`=13598;
+UPDATE `creature_template` SET `lootid`=22635 WHERE `entry`=13356;
+UPDATE `creature_template` SET `lootid`=22639 WHERE `entry`=13449;
+UPDATE `creature_template` SET `lootid`=22640 WHERE `entry`=13840;
+UPDATE `creature_template` SET `lootid`=22645 WHERE `entry`=12048;
+UPDATE `creature_template` SET `lootid`=22649 WHERE `entry`=12052;
+UPDATE `creature_template` SET `lootid`=22657 WHERE `entry`=12047;
+UPDATE `creature_template` SET `lootid`=22662 WHERE `entry`=13325;
+UPDATE `creature_template` SET `lootid`=22663 WHERE `entry`=13327;
+UPDATE `creature_template` SET `lootid`=22664 WHERE `entry`=13330;
+UPDATE `creature_template` SET `lootid`=22667 WHERE `entry`=13335;
+UPDATE `creature_template` SET `lootid`=22668 WHERE `entry`=13336;
+UPDATE `creature_template` SET `lootid`=22669 WHERE `entry`=13337;
+UPDATE `creature_template` SET `lootid`=22671 WHERE `entry`=13426;
+UPDATE `creature_template` SET `lootid`=22672 WHERE `entry`=13427;
+UPDATE `creature_template` SET `lootid`=22673 WHERE `entry`=13428;
+UPDATE `creature_template` SET `lootid`=22676 WHERE `entry`=13528;
+UPDATE `creature_template` SET `lootid`=22679 WHERE `entry`=13440;
+UPDATE `creature_template` SET `lootid`=22687 WHERE `entry`=13324;
+UPDATE `creature_template` SET `lootid`=22688 WHERE `entry`=13329;
+UPDATE `creature_template` SET `lootid`=22689 WHERE `entry`=13524;
+UPDATE `creature_template` SET `lootid`=22691 WHERE `entry`=13576;
+UPDATE `creature_template` SET `lootid`=22700 WHERE `entry`=13298;
+UPDATE `creature_template` SET `lootid`=22701 WHERE `entry`=13145;
+UPDATE `creature_template` SET `lootid`=22702 WHERE `entry`=13296;
+UPDATE `creature_template` SET `lootid`=22703 WHERE `entry`=13147;
+UPDATE `creature_template` SET `lootid`=22704 WHERE `entry`=13299;
+UPDATE `creature_template` SET `lootid`=22705 WHERE `entry`=13300;
+UPDATE `creature_template` SET `lootid`=22706 WHERE `entry`=13146;
+UPDATE `creature_template` SET `lootid`=22707 WHERE `entry`=13137;
+UPDATE `creature_template` SET `lootid`=22708 WHERE `entry`=13138;
+UPDATE `creature_template` SET `lootid`=22709 WHERE `entry`=13297;
+UPDATE `creature_template` SET `lootid`=22710 WHERE `entry`=13143;
+UPDATE `creature_template` SET `lootid`=22711 WHERE `entry`=13144;
+UPDATE `creature_template` SET `lootid`=22713 WHERE `entry`=13525;
+UPDATE `creature_template` SET `lootid`=22718 WHERE `entry`=13529;
+UPDATE `creature_template` SET `lootid`=22719 WHERE `entry`=13333;
+UPDATE `creature_template` SET `lootid`=22725 WHERE `entry`=10984;
+UPDATE `creature_template` SET `lootid`=22736 WHERE `entry`=13776;
+UPDATE `creature_template` SET `lootid`=22754 WHERE `entry`=13537;
+UPDATE `creature_template` SET `lootid`=22759 WHERE `entry`=13777;
+UPDATE `creature_template` SET `lootid`=22764 WHERE `entry`=13676;
+UPDATE `creature_template` SET `lootid`=22765 WHERE `entry`=13618;
+UPDATE `creature_template` SET `lootid`=22768 WHERE `entry`=13150;
+UPDATE `creature_template` SET `lootid`=22769 WHERE `entry`=13149;
+UPDATE `creature_template` SET `lootid`=22774 WHERE `entry`=13541;
+UPDATE `creature_template` SET `lootid`=22776 WHERE `entry`=13544;
+UPDATE `creature_template` SET `lootid`=22788 WHERE `entry`=12156;
+UPDATE `creature_template` SET `lootid`=22789 WHERE `entry`=12158;
+UPDATE `creature_template` SET `lootid`=22790 WHERE `entry`=13956;
+UPDATE `creature_template` SET `lootid`=22791 WHERE `entry`=13958;
+UPDATE `creature_template` SET `lootid`=22792 WHERE `entry`=12157;
+UPDATE `creature_template` SET `lootid`=22794 WHERE `entry`=10983;
+UPDATE `creature_template` SET `lootid`=22795 WHERE `entry`=13957;
+UPDATE `creature_template` SET `lootid`=22796 WHERE `entry`=11679;
+UPDATE `creature_template` SET `lootid`=25548 WHERE `entry`=24976;
+UPDATE `creature_template` SET `lootid`=25551 WHERE `entry`=24698;
+UPDATE `creature_template` SET `lootid`=29274 WHERE `entry`=16506;
+UPDATE `creature_template` SET `lootid`=29833 WHERE `entry`=16156;
+UPDATE `creature_template` SET `lootid`=30759 WHERE `entry`=22262;
+UPDATE `creature_template` SET `lootid`=30760 WHERE `entry`=22261;
+UPDATE `creature_template` SET `lootid`=30761 WHERE `entry`=22263;
+UPDATE `creature_template` SET `lootid`=30763 WHERE `entry`=23174;
+UPDATE `creature_template` SET `lootid`=30773 WHERE `entry`=23386;
+UPDATE `creature_template` SET `lootid`=30822 WHERE `entry`=26690;
+UPDATE `creature_template` SET `lootid`=30823 WHERE `entry`=26691;
+UPDATE `creature_template` SET `lootid`=31178 WHERE `entry`=27729;
+UPDATE `creature_template` SET `lootid`=31179 WHERE `entry`=28249;
+UPDATE `creature_template` SET `lootid`=31180 WHERE `entry`=27732;
+UPDATE `creature_template` SET `lootid`=31184 WHERE `entry`=28200;
+UPDATE `creature_template` SET `lootid`=31187 WHERE `entry`=27734;
+UPDATE `creature_template` SET `lootid`=31188 WHERE `entry`=28199;
+UPDATE `creature_template` SET `lootid`=31199 WHERE `entry`=27736;
+UPDATE `creature_template` SET `lootid`=31200 WHERE `entry`=28201;
+UPDATE `creature_template` SET `lootid`=31201 WHERE `entry`=27731;
+UPDATE `creature_template` SET `lootid`=31202 WHERE `entry`=27742;
+UPDATE `creature_template` SET `lootid`=31203 WHERE `entry`=27744;
+UPDATE `creature_template` SET `lootid`=31206 WHERE `entry`=27743;
+UPDATE `creature_template` SET `lootid`=33391 WHERE `entry`=32915;
+UPDATE `creature_template` SET `lootid`=33773 WHERE `entry`=33772;
+UPDATE `creature_template` SET `lootid`=34106 WHERE `entry`=33432;
+UPDATE `creature_template` SET `lootid`=34108 WHERE `entry`=33651;
+UPDATE `creature_template` SET `lootid`=35306 WHERE `entry`=35305;
+UPDATE `creature_template` SET `lootid`=35308 WHERE `entry`=35307;
+UPDATE `creature_template` SET `lootid`=35310 WHERE `entry`=35309;
+UPDATE `creature_template` SET `lootid`=35359 WHERE `entry`=35143;
+UPDATE `creature_template` SET `lootid`=38151 WHERE `entry`=37532;
+UPDATE `creature_template` SET `lootid`=39805 WHERE `entry`=39946;
+UPDATE `creature_template` SET `lootid`=39823 WHERE `entry`=39948;
+UPDATE `creature_template` SET `lootid`=39920 WHERE `entry`=39947;
+UPDATE `creature_template` SET `lootid`=40420 WHERE `entry`=40419;
diff --git a/sql/old/3.3.5a/2012_09_14_00_world_sai.sql b/sql/old/3.3.5a/2012_09_14_00_world_sai.sql
new file mode 100644
index 00000000000..13f11b7a795
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_14_00_world_sai.sql
@@ -0,0 +1 @@
+UPDATE `smart_scripts` SET `event_param1` = 35282, `action_param1` = 256, `comment` = 'Scrapped Fel Reaver - On Spellhit - Remove - OOC Not attackable - flags'  WHERE `entryorguid` = 20243;
diff --git a/sql/old/3.3.5a/2012_09_14_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_14_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..77ab9e89b04
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_14_01_world_creature_loot_template.sql
@@ -0,0 +1,5 @@
+DELETE FROM `creature_loot_template` WHERE `entry` = 37126;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(37126, 49426, 100, 1, 0, 1, 1),
+(37126, 1, 100, 1, 0, -100002, 1);
+UPDATE `creature_template` SET `lootid` = 37126 WHERE `entry` IN (37126,38258);
diff --git a/sql/old/3.3.5a/2012_09_15_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_15_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..a30eff7024e
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_15_00_world_achievement_criteria_data.sql
@@ -0,0 +1,6 @@
+-- Insert achievement instance criteria data scripts
+DELETE FROM `achievement_criteria_data` WHERE `type`=11 and `criteria_id` IN (7323,7324,7325);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+(7323,11,0,0,'achievement_ruby_void'),
+(7324,11,0,0,'achievement_emerald_void'),
+(7325,11,0,0,'achievement_amber_void');
diff --git a/sql/old/3.3.5a/2012_09_15_00_world_creature_template.sql b/sql/old/3.3.5a/2012_09_15_00_world_creature_template.sql
new file mode 100644
index 00000000000..3db5a598c1d
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_15_00_world_creature_template.sql
@@ -0,0 +1,288 @@
+UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (17400,17401,17816,17957,17958,17961,17938,17959,17960,17940,17817,17963,17962,17964,17723,17731,19632,17732,17730,17771,17729,17728,17724,17734,17725,17871,17726,17727,17735,18311,18331,18317,18309,18313,18312,18315,19306,18314,19307,18524,18497,18702,18493,18495,18503,18557,18556,18558,18559,18521,18500,18498,18499,18501,18934,17820,17819,17840,17860,17833,18171,18172,18170,17815,17814,17846,18092,18094,18093,17721,17800,17803,17801,17805,17722,17802,17917,17799,18633,18636,18631,18635,18632,18641,18830,18794,18637,18639,18634,18640,18638,18642,18796,18663,18848,19208,19209,19429,19428,18327,18323,18318,18328,18325,18322,18319,18320,18326,18321,20923,19510,20990,19167,19231,19712,19716,19713,19168,20988,20059,19735,19166,20857,20869,20859,20911,20905,20867,20868,20880,20879,20896,20897,20898,20912,20875,20873,20906,20865,20864,20901,20902,20882,20866,20883,20909,20908,20910,20881,20900,21126,21127,21694,21696,21695,21891,21904,22128,18983,17952,18982,21702,13536,13539,13424,13542,13554,13545,13557,13425,13155,14770,14768,13378,603,13377,13416,13151,14767,13526,13530,14769,13527,13531,13140,13319,13320,13154,13152,13318,13153,13139,13446,13597,13357,13841,13598,13356,13449,13840,12048,12052,12047,13325,13327,13330,13335,13336,13337,13426,13427,13428,13528,13440,13324,13329,13524,13576,13298,13145,13296,13147,13299,13300,13146,13137,13138,13297,13143,13144,13525,13529,13333,10984,13776,13537,13777,13676,13618,13150,13149,13541,13544,12156,12158,13956,13958,12157,10983,13957,11679,24976,24698,16506,16156,22262,22261,22263,23174,23386,26690,26691,27729,28249,27732,28200,27734,28199,27736,28201,27731,27742,27744,27743,32915,33772,33432,33651,35305,35307,35309,35143,37532,39946,39948,39947,40419);
+UPDATE `creature_template` SET `lootid`=17400 WHERE `entry`=18604;
+UPDATE `creature_template` SET `lootid`=17401 WHERE `entry`=18605;
+UPDATE `creature_template` SET `lootid`=17816 WHERE `entry`=19884;
+UPDATE `creature_template` SET `lootid`=17957 WHERE `entry`=19885;
+UPDATE `creature_template` SET `lootid`=17958 WHERE `entry`=19886;
+UPDATE `creature_template` SET `lootid`=17961 WHERE `entry`=19887;
+UPDATE `creature_template` SET `lootid`=17938 WHERE `entry`=19888;
+UPDATE `creature_template` SET `lootid`=17959 WHERE `entry`=19889;
+UPDATE `creature_template` SET `lootid`=17960 WHERE `entry`=19890;
+UPDATE `creature_template` SET `lootid`=17940 WHERE `entry`=19891;
+UPDATE `creature_template` SET `lootid`=17817 WHERE `entry`=19892;
+UPDATE `creature_template` SET `lootid`=17963 WHERE `entry`=19902;
+UPDATE `creature_template` SET `lootid`=17962 WHERE `entry`=19903;
+UPDATE `creature_template` SET `lootid`=17964 WHERE `entry`=19904;
+UPDATE `creature_template` SET `lootid`=17723 WHERE `entry`=20164;
+UPDATE `creature_template` SET `lootid`=17731 WHERE `entry`=20173;
+UPDATE `creature_template` SET `lootid`=19632 WHERE `entry`=20174;
+UPDATE `creature_template` SET `lootid`=17732 WHERE `entry`=20175;
+UPDATE `creature_template` SET `lootid`=17730 WHERE `entry`=20177;
+UPDATE `creature_template` SET `lootid`=17771 WHERE `entry`=20179;
+UPDATE `creature_template` SET `lootid`=17729 WHERE `entry`=20180;
+UPDATE `creature_template` SET `lootid`=17728 WHERE `entry`=20181;
+UPDATE `creature_template` SET `lootid`=17724 WHERE `entry`=20185;
+UPDATE `creature_template` SET `lootid`=17734 WHERE `entry`=20187;
+UPDATE `creature_template` SET `lootid`=17725 WHERE `entry`=20188;
+UPDATE `creature_template` SET `lootid`=17871 WHERE `entry`=20190;
+UPDATE `creature_template` SET `lootid`=17726 WHERE `entry`=20191;
+UPDATE `creature_template` SET `lootid`=17727 WHERE `entry`=20192;
+UPDATE `creature_template` SET `lootid`=17735 WHERE `entry`=20193;
+UPDATE `creature_template` SET `lootid`=18311 WHERE `entry`=20255;
+UPDATE `creature_template` SET `lootid`=18331 WHERE `entry`=20256;
+UPDATE `creature_template` SET `lootid`=18317 WHERE `entry`=20257;
+UPDATE `creature_template` SET `lootid`=18309 WHERE `entry`=20258;
+UPDATE `creature_template` SET `lootid`=18313 WHERE `entry`=20259;
+UPDATE `creature_template` SET `lootid`=18312 WHERE `entry`=20260;
+UPDATE `creature_template` SET `lootid`=18315 WHERE `entry`=20261;
+UPDATE `creature_template` SET `lootid`=19306 WHERE `entry`=20263;
+UPDATE `creature_template` SET `lootid`=18314 WHERE `entry`=20264;
+UPDATE `creature_template` SET `lootid`=19307 WHERE `entry`=20265;
+UPDATE `creature_template` SET `lootid`=18524 WHERE `entry`=20298;
+UPDATE `creature_template` SET `lootid`=18497 WHERE `entry`=20299;
+UPDATE `creature_template` SET `lootid`=18702 WHERE `entry`=20300;
+UPDATE `creature_template` SET `lootid`=18493 WHERE `entry`=20301;
+UPDATE `creature_template` SET `lootid`=18495 WHERE `entry`=20302;
+UPDATE `creature_template` SET `lootid`=18503 WHERE `entry`=20309;
+UPDATE `creature_template` SET `lootid`=18557 WHERE `entry`=20310;
+UPDATE `creature_template` SET `lootid`=18556 WHERE `entry`=20311;
+UPDATE `creature_template` SET `lootid`=18558 WHERE `entry`=20312;
+UPDATE `creature_template` SET `lootid`=18559 WHERE `entry`=20313;
+UPDATE `creature_template` SET `lootid`=18521 WHERE `entry`=20315;
+UPDATE `creature_template` SET `lootid`=18500 WHERE `entry`=20320;
+UPDATE `creature_template` SET `lootid`=18498 WHERE `entry`=20321;
+UPDATE `creature_template` SET `lootid`=18499 WHERE `entry`=20322;
+UPDATE `creature_template` SET `lootid`=18501 WHERE `entry`=20323;
+UPDATE `creature_template` SET `lootid`=18934 WHERE `entry`=20525;
+UPDATE `creature_template` SET `lootid`=17820 WHERE `entry`=20526;
+UPDATE `creature_template` SET `lootid`=17819 WHERE `entry`=20527;
+UPDATE `creature_template` SET `lootid`=17840 WHERE `entry`=20528;
+UPDATE `creature_template` SET `lootid`=17860 WHERE `entry`=20529;
+UPDATE `creature_template` SET `lootid`=17833 WHERE `entry`=20530;
+UPDATE `creature_template` SET `lootid`=18171 WHERE `entry`=20532;
+UPDATE `creature_template` SET `lootid`=18172 WHERE `entry`=20533;
+UPDATE `creature_template` SET `lootid`=18170 WHERE `entry`=20534;
+UPDATE `creature_template` SET `lootid`=17815 WHERE `entry`=20537;
+UPDATE `creature_template` SET `lootid`=17814 WHERE `entry`=20538;
+UPDATE `creature_template` SET `lootid`=17846 WHERE `entry`=20543;
+UPDATE `creature_template` SET `lootid`=18092 WHERE `entry`=20545;
+UPDATE `creature_template` SET `lootid`=18094 WHERE `entry`=20546;
+UPDATE `creature_template` SET `lootid`=18093 WHERE `entry`=20547;
+UPDATE `creature_template` SET `lootid`=17721 WHERE `entry`=20620;
+UPDATE `creature_template` SET `lootid`=17800 WHERE `entry`=20621;
+UPDATE `creature_template` SET `lootid`=17803 WHERE `entry`=20622;
+UPDATE `creature_template` SET `lootid`=17801 WHERE `entry`=20623;
+UPDATE `creature_template` SET `lootid`=17805 WHERE `entry`=20624;
+UPDATE `creature_template` SET `lootid`=17722 WHERE `entry`=20625;
+UPDATE `creature_template` SET `lootid`=17802 WHERE `entry`=20626;
+UPDATE `creature_template` SET `lootid`=17917 WHERE `entry`=20627;
+UPDATE `creature_template` SET `lootid`=17799 WHERE `entry`=20628;
+UPDATE `creature_template` SET `lootid`=18633 WHERE `entry`=20638;
+UPDATE `creature_template` SET `lootid`=18636 WHERE `entry`=20639;
+UPDATE `creature_template` SET `lootid`=18631 WHERE `entry`=20640;
+UPDATE `creature_template` SET `lootid`=18635 WHERE `entry`=20641;
+UPDATE `creature_template` SET `lootid`=18632 WHERE `entry`=20642;
+UPDATE `creature_template` SET `lootid`=18641 WHERE `entry`=20643;
+UPDATE `creature_template` SET `lootid`=18830 WHERE `entry`=20644;
+UPDATE `creature_template` SET `lootid`=18794 WHERE `entry`=20645;
+UPDATE `creature_template` SET `lootid`=18637 WHERE `entry`=20646;
+UPDATE `creature_template` SET `lootid`=18639 WHERE `entry`=20647;
+UPDATE `creature_template` SET `lootid`=18634 WHERE `entry`=20648;
+UPDATE `creature_template` SET `lootid`=18640 WHERE `entry`=20649;
+UPDATE `creature_template` SET `lootid`=18638 WHERE `entry`=20650;
+UPDATE `creature_template` SET `lootid`=18642 WHERE `entry`=20651;
+UPDATE `creature_template` SET `lootid`=18796 WHERE `entry`=20652;
+UPDATE `creature_template` SET `lootid`=18663 WHERE `entry`=20655;
+UPDATE `creature_template` SET `lootid`=18848 WHERE `entry`=20656;
+UPDATE `creature_template` SET `lootid`=19208 WHERE `entry`=20660;
+UPDATE `creature_template` SET `lootid`=19209 WHERE `entry`=20661;
+UPDATE `creature_template` SET `lootid`=19429 WHERE `entry`=20686;
+UPDATE `creature_template` SET `lootid`=19428 WHERE `entry`=20688;
+UPDATE `creature_template` SET `lootid`=18327 WHERE `entry`=20691;
+UPDATE `creature_template` SET `lootid`=18323 WHERE `entry`=20692;
+UPDATE `creature_template` SET `lootid`=18318 WHERE `entry`=20693;
+UPDATE `creature_template` SET `lootid`=18328 WHERE `entry`=20694;
+UPDATE `creature_template` SET `lootid`=18325 WHERE `entry`=20695;
+UPDATE `creature_template` SET `lootid`=18322 WHERE `entry`=20696;
+UPDATE `creature_template` SET `lootid`=18319 WHERE `entry`=20697;
+UPDATE `creature_template` SET `lootid`=18320 WHERE `entry`=20698;
+UPDATE `creature_template` SET `lootid`=18326 WHERE `entry`=20699;
+UPDATE `creature_template` SET `lootid`=18321 WHERE `entry`=20701;
+UPDATE `creature_template` SET `lootid`=20923 WHERE `entry`=20993;
+UPDATE `creature_template` SET `lootid`=19510 WHERE `entry`=21522;
+UPDATE `creature_template` SET `lootid`=20990 WHERE `entry`=21523;
+UPDATE `creature_template` SET `lootid`=19167 WHERE `entry`=21524;
+UPDATE `creature_template` SET `lootid`=19231 WHERE `entry`=21527;
+UPDATE `creature_template` SET `lootid`=19712 WHERE `entry`=21528;
+UPDATE `creature_template` SET `lootid`=19716 WHERE `entry`=21531;
+UPDATE `creature_template` SET `lootid`=19713 WHERE `entry`=21532;
+UPDATE `creature_template` SET `lootid`=19168 WHERE `entry`=21539;
+UPDATE `creature_template` SET `lootid`=20988 WHERE `entry`=21540;
+UPDATE `creature_template` SET `lootid`=20059 WHERE `entry`=21541;
+UPDATE `creature_template` SET `lootid`=19735 WHERE `entry`=21542;
+UPDATE `creature_template` SET `lootid`=19166 WHERE `entry`=21543;
+UPDATE `creature_template` SET `lootid`=20857 WHERE `entry`=21585;
+UPDATE `creature_template` SET `lootid`=20869 WHERE `entry`=21586;
+UPDATE `creature_template` SET `lootid`=20859 WHERE `entry`=21587;
+UPDATE `creature_template` SET `lootid`=20911 WHERE `entry`=21588;
+UPDATE `creature_template` SET `lootid`=20905 WHERE `entry`=21589;
+UPDATE `creature_template` SET `lootid`=20867 WHERE `entry`=21591;
+UPDATE `creature_template` SET `lootid`=20868 WHERE `entry`=21593;
+UPDATE `creature_template` SET `lootid`=20880 WHERE `entry`=21594;
+UPDATE `creature_template` SET `lootid`=20879 WHERE `entry`=21595;
+UPDATE `creature_template` SET `lootid`=20896 WHERE `entry`=21596;
+UPDATE `creature_template` SET `lootid`=20897 WHERE `entry`=21597;
+UPDATE `creature_template` SET `lootid`=20898 WHERE `entry`=21598;
+UPDATE `creature_template` SET `lootid`=20912 WHERE `entry`=21601;
+UPDATE `creature_template` SET `lootid`=20875 WHERE `entry`=21604;
+UPDATE `creature_template` SET `lootid`=20873 WHERE `entry`=21605;
+UPDATE `creature_template` SET `lootid`=20906 WHERE `entry`=21606;
+UPDATE `creature_template` SET `lootid`=20865 WHERE `entry`=21607;
+UPDATE `creature_template` SET `lootid`=20864 WHERE `entry`=21608;
+UPDATE `creature_template` SET `lootid`=20901 WHERE `entry`=21610;
+UPDATE `creature_template` SET `lootid`=20902 WHERE `entry`=21611;
+UPDATE `creature_template` SET `lootid`=20882 WHERE `entry`=21613;
+UPDATE `creature_template` SET `lootid`=20866 WHERE `entry`=21614;
+UPDATE `creature_template` SET `lootid`=20883 WHERE `entry`=21615;
+UPDATE `creature_template` SET `lootid`=20909 WHERE `entry`=21616;
+UPDATE `creature_template` SET `lootid`=20908 WHERE `entry`=21617;
+UPDATE `creature_template` SET `lootid`=20910 WHERE `entry`=21618;
+UPDATE `creature_template` SET `lootid`=20881 WHERE `entry`=21619;
+UPDATE `creature_template` SET `lootid`=20900 WHERE `entry`=21621;
+UPDATE `creature_template` SET `lootid`=21126 WHERE `entry`=21842;
+UPDATE `creature_template` SET `lootid`=21127 WHERE `entry`=21843;
+UPDATE `creature_template` SET `lootid`=21694 WHERE `entry`=21914;
+UPDATE `creature_template` SET `lootid`=21696 WHERE `entry`=21916;
+UPDATE `creature_template` SET `lootid`=21695 WHERE `entry`=21917;
+UPDATE `creature_template` SET `lootid`=21891 WHERE `entry`=21989;
+UPDATE `creature_template` SET `lootid`=21904 WHERE `entry`=21990;
+UPDATE `creature_template` SET `lootid`=22128 WHERE `entry`=22129;
+UPDATE `creature_template` SET `lootid`=18983 WHERE `entry`=22162;
+UPDATE `creature_template` SET `lootid`=17952 WHERE `entry`=22163;
+UPDATE `creature_template` SET `lootid`=18982 WHERE `entry`=22173;
+UPDATE `creature_template` SET `lootid`=21702 WHERE `entry`=22346;
+UPDATE `creature_template` SET `lootid`=13536 WHERE `entry`=22530;
+UPDATE `creature_template` SET `lootid`=13539 WHERE `entry`=22532;
+UPDATE `creature_template` SET `lootid`=13424 WHERE `entry`=22533;
+UPDATE `creature_template` SET `lootid`=13542 WHERE `entry`=22534;
+UPDATE `creature_template` SET `lootid`=13554 WHERE `entry`=22535;
+UPDATE `creature_template` SET `lootid`=13545 WHERE `entry`=22536;
+UPDATE `creature_template` SET `lootid`=13557 WHERE `entry`=22537;
+UPDATE `creature_template` SET `lootid`=13425 WHERE `entry`=22538;
+UPDATE `creature_template` SET `lootid`=13155 WHERE `entry`=22539;
+UPDATE `creature_template` SET `lootid`=14770 WHERE `entry`=22543;
+UPDATE `creature_template` SET `lootid`=14768 WHERE `entry`=22547;
+UPDATE `creature_template` SET `lootid`=13378 WHERE `entry`=22550;
+UPDATE `creature_template` SET `lootid`=603 WHERE `entry`=22555;
+UPDATE `creature_template` SET `lootid`=13377 WHERE `entry`=22565;
+UPDATE `creature_template` SET `lootid`=13416 WHERE `entry`=22576;
+UPDATE `creature_template` SET `lootid`=13151 WHERE `entry`=22578;
+UPDATE `creature_template` SET `lootid`=14767 WHERE `entry`=22579;
+UPDATE `creature_template` SET `lootid`=13526 WHERE `entry`=22587;
+UPDATE `creature_template` SET `lootid`=13530 WHERE `entry`=22592;
+UPDATE `creature_template` SET `lootid`=14769 WHERE `entry`=22595;
+UPDATE `creature_template` SET `lootid`=13527 WHERE `entry`=22607;
+UPDATE `creature_template` SET `lootid`=13531 WHERE `entry`=22612;
+UPDATE `creature_template` SET `lootid`=13140 WHERE `entry`=22613;
+UPDATE `creature_template` SET `lootid`=13319 WHERE `entry`=22614;
+UPDATE `creature_template` SET `lootid`=13320 WHERE `entry`=22615;
+UPDATE `creature_template` SET `lootid`=13154 WHERE `entry`=22616;
+UPDATE `creature_template` SET `lootid`=13152 WHERE `entry`=22617;
+UPDATE `creature_template` SET `lootid`=13318 WHERE `entry`=22618;
+UPDATE `creature_template` SET `lootid`=13153 WHERE `entry`=22619;
+UPDATE `creature_template` SET `lootid`=13139 WHERE `entry`=22620;
+UPDATE `creature_template` SET `lootid`=13446 WHERE `entry`=22621;
+UPDATE `creature_template` SET `lootid`=13597 WHERE `entry`=22623;
+UPDATE `creature_template` SET `lootid`=13357 WHERE `entry`=22624;
+UPDATE `creature_template` SET `lootid`=13841 WHERE `entry`=22628;
+UPDATE `creature_template` SET `lootid`=13598 WHERE `entry`=22634;
+UPDATE `creature_template` SET `lootid`=13356 WHERE `entry`=22635;
+UPDATE `creature_template` SET `lootid`=13449 WHERE `entry`=22639;
+UPDATE `creature_template` SET `lootid`=13840 WHERE `entry`=22640;
+UPDATE `creature_template` SET `lootid`=12048 WHERE `entry`=22645;
+UPDATE `creature_template` SET `lootid`=12052 WHERE `entry`=22649;
+UPDATE `creature_template` SET `lootid`=12047 WHERE `entry`=22657;
+UPDATE `creature_template` SET `lootid`=13325 WHERE `entry`=22662;
+UPDATE `creature_template` SET `lootid`=13327 WHERE `entry`=22663;
+UPDATE `creature_template` SET `lootid`=13330 WHERE `entry`=22664;
+UPDATE `creature_template` SET `lootid`=13335 WHERE `entry`=22667;
+UPDATE `creature_template` SET `lootid`=13336 WHERE `entry`=22668;
+UPDATE `creature_template` SET `lootid`=13337 WHERE `entry`=22669;
+UPDATE `creature_template` SET `lootid`=13426 WHERE `entry`=22671;
+UPDATE `creature_template` SET `lootid`=13427 WHERE `entry`=22672;
+UPDATE `creature_template` SET `lootid`=13428 WHERE `entry`=22673;
+UPDATE `creature_template` SET `lootid`=13528 WHERE `entry`=22676;
+UPDATE `creature_template` SET `lootid`=13440 WHERE `entry`=22679;
+UPDATE `creature_template` SET `lootid`=13324 WHERE `entry`=22687;
+UPDATE `creature_template` SET `lootid`=13329 WHERE `entry`=22688;
+UPDATE `creature_template` SET `lootid`=13524 WHERE `entry`=22689;
+UPDATE `creature_template` SET `lootid`=13576 WHERE `entry`=22691;
+UPDATE `creature_template` SET `lootid`=13298 WHERE `entry`=22700;
+UPDATE `creature_template` SET `lootid`=13145 WHERE `entry`=22701;
+UPDATE `creature_template` SET `lootid`=13296 WHERE `entry`=22702;
+UPDATE `creature_template` SET `lootid`=13147 WHERE `entry`=22703;
+UPDATE `creature_template` SET `lootid`=13299 WHERE `entry`=22704;
+UPDATE `creature_template` SET `lootid`=13300 WHERE `entry`=22705;
+UPDATE `creature_template` SET `lootid`=13146 WHERE `entry`=22706;
+UPDATE `creature_template` SET `lootid`=13137 WHERE `entry`=22707;
+UPDATE `creature_template` SET `lootid`=13138 WHERE `entry`=22708;
+UPDATE `creature_template` SET `lootid`=13297 WHERE `entry`=22709;
+UPDATE `creature_template` SET `lootid`=13143 WHERE `entry`=22710;
+UPDATE `creature_template` SET `lootid`=13144 WHERE `entry`=22711;
+UPDATE `creature_template` SET `lootid`=13525 WHERE `entry`=22713;
+UPDATE `creature_template` SET `lootid`=13529 WHERE `entry`=22718;
+UPDATE `creature_template` SET `lootid`=13333 WHERE `entry`=22719;
+UPDATE `creature_template` SET `lootid`=10984 WHERE `entry`=22725;
+UPDATE `creature_template` SET `lootid`=13776 WHERE `entry`=22736;
+UPDATE `creature_template` SET `lootid`=13537 WHERE `entry`=22754;
+UPDATE `creature_template` SET `lootid`=13777 WHERE `entry`=22759;
+UPDATE `creature_template` SET `lootid`=13676 WHERE `entry`=22764;
+UPDATE `creature_template` SET `lootid`=13618 WHERE `entry`=22765;
+UPDATE `creature_template` SET `lootid`=13150 WHERE `entry`=22768;
+UPDATE `creature_template` SET `lootid`=13149 WHERE `entry`=22769;
+UPDATE `creature_template` SET `lootid`=13541 WHERE `entry`=22774;
+UPDATE `creature_template` SET `lootid`=13544 WHERE `entry`=22776;
+UPDATE `creature_template` SET `lootid`=12156 WHERE `entry`=22788;
+UPDATE `creature_template` SET `lootid`=12158 WHERE `entry`=22789;
+UPDATE `creature_template` SET `lootid`=13956 WHERE `entry`=22790;
+UPDATE `creature_template` SET `lootid`=13958 WHERE `entry`=22791;
+UPDATE `creature_template` SET `lootid`=12157 WHERE `entry`=22792;
+UPDATE `creature_template` SET `lootid`=10983 WHERE `entry`=22794;
+UPDATE `creature_template` SET `lootid`=13957 WHERE `entry`=22795;
+UPDATE `creature_template` SET `lootid`=11679 WHERE `entry`=22796;
+UPDATE `creature_template` SET `lootid`=24976 WHERE `entry`=25548;
+UPDATE `creature_template` SET `lootid`=24698 WHERE `entry`=25551;
+UPDATE `creature_template` SET `lootid`=16506 WHERE `entry`=29274;
+UPDATE `creature_template` SET `lootid`=16156 WHERE `entry`=29833;
+UPDATE `creature_template` SET `lootid`=22262 WHERE `entry`=30759;
+UPDATE `creature_template` SET `lootid`=22261 WHERE `entry`=30760;
+UPDATE `creature_template` SET `lootid`=22263 WHERE `entry`=30761;
+UPDATE `creature_template` SET `lootid`=23174 WHERE `entry`=30763;
+UPDATE `creature_template` SET `lootid`=23386 WHERE `entry`=30773;
+UPDATE `creature_template` SET `lootid`=26690 WHERE `entry`=30822;
+UPDATE `creature_template` SET `lootid`=26691 WHERE `entry`=30823;
+UPDATE `creature_template` SET `lootid`=27729 WHERE `entry`=31178;
+UPDATE `creature_template` SET `lootid`=28249 WHERE `entry`=31179;
+UPDATE `creature_template` SET `lootid`=27732 WHERE `entry`=31180;
+UPDATE `creature_template` SET `lootid`=28200 WHERE `entry`=31184;
+UPDATE `creature_template` SET `lootid`=27734 WHERE `entry`=31187;
+UPDATE `creature_template` SET `lootid`=28199 WHERE `entry`=31188;
+UPDATE `creature_template` SET `lootid`=27736 WHERE `entry`=31199;
+UPDATE `creature_template` SET `lootid`=28201 WHERE `entry`=31200;
+UPDATE `creature_template` SET `lootid`=27731 WHERE `entry`=31201;
+UPDATE `creature_template` SET `lootid`=27742 WHERE `entry`=31202;
+UPDATE `creature_template` SET `lootid`=27744 WHERE `entry`=31203;
+UPDATE `creature_template` SET `lootid`=27743 WHERE `entry`=31206;
+UPDATE `creature_template` SET `lootid`=32915 WHERE `entry`=33391;
+UPDATE `creature_template` SET `lootid`=33772 WHERE `entry`=33773;
+UPDATE `creature_template` SET `lootid`=33432 WHERE `entry`=34106;
+UPDATE `creature_template` SET `lootid`=33651 WHERE `entry`=34108;
+UPDATE `creature_template` SET `lootid`=35305 WHERE `entry`=35306;
+UPDATE `creature_template` SET `lootid`=35307 WHERE `entry`=35308;
+UPDATE `creature_template` SET `lootid`=35309 WHERE `entry`=35310;
+UPDATE `creature_template` SET `lootid`=35143 WHERE `entry`=35359;
+UPDATE `creature_template` SET `lootid`=37532 WHERE `entry`=38151;
+UPDATE `creature_template` SET `lootid`=39946 WHERE `entry`=39805;
+UPDATE `creature_template` SET `lootid`=39948 WHERE `entry`=39823;
+UPDATE `creature_template` SET `lootid`=39947 WHERE `entry`=39920;
+UPDATE `creature_template` SET `lootid`=40419 WHERE `entry`=40420;
diff --git a/sql/old/3.3.5a/2012_09_15_00_world_disables.sql b/sql/old/3.3.5a/2012_09_15_00_world_disables.sql
new file mode 100644
index 00000000000..371315b5be7
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_15_00_world_disables.sql
@@ -0,0 +1,4 @@
+-- Remove achievements from disables
+DELETE FROM `disables` WHERE  `sourceType`=4 AND `entry`=7323; -- Ruby Void
+DELETE FROM `disables` WHERE  `sourceType`=4 AND `entry`=7324; -- Emerald Void
+DELETE FROM `disables` WHERE  `sourceType`=4 AND `entry`=7325; -- Amber Void
diff --git a/sql/old/3.3.5a/2012_09_15_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_15_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..71068d95bde
--- /dev/null
+++ b/sql/old/3.3.5a/2012_09_15_01_world_creature_loot_template.sql
@@ -0,0 +1,19 @@
+SET @SisterSvalna := 37126; -- Sister Svalna
+
+CALL `sp_get_ref_id`('RAID_CRE',@Reference);
+SET @RefSisterSvalna := @Reference+1;
+
+DELETE FROM `creature_loot_template` WHERE `entry`=@SisterSvalna;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@SisterSvalna,49426,100,1,0,1,1),-- Sister Svalna dropping 1 Emblem of Frost
+(@SisterSvalna,1,100,1,0,-@RefSisterSvalna,1);
+
+DELETE FROM `reference_loot_template` WHERE `entry`=@RefSisterSvalna;
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@RefSisterSvalna,50452,6,1,1,1,1), -- Wodin's Lucky Necklace
+(@RefSisterSvalna,50453,5,1,1,1,1); -- Ring of Rotting Sinew
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=10 AND `SourceGroup`=@RefSisterSvalna;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(10,@RefSisterSvalna,50452,0,0,19,0,3,0,0,0,0,'', 'Wodin''s Lucky Necklace only 25 heroic'),
+(10,@RefSisterSvalna,50453,0,0,19,0,3,0,0,0,0,'', 'Ring of Rotting Sinew only 25 heroic');