From 8458153b697b9c83df36485e17ef8f21a2cf9e88 Mon Sep 17 00:00:00 2001
From: Nay <dnpd.dd@gmail.com>
Date: Sun, 27 Mar 2011 22:18:22 +0100
Subject: SQL: Rename files; it should fix batch scripts to import SQL files
 behavior.

New format: <year(4)>_<month(2)>_<day(2)>_<incremental(2)>_<db>_<table/content>.sql
---
 sql/old/3.3.5a/2011_01_06_00_world_scriptname.sql  |   1 +
 sql/old/3.3.5a/2011_01_06_01_world_scriptname.sql  |   1 +
 sql/old/3.3.5a/2011_01_06_02_world_scriptname.sql  |   1 +
 sql/old/3.3.5a/2011_01_06_0_world_scriptname.sql   |   1 -
 sql/old/3.3.5a/2011_01_06_1_world_scriptname.sql   |   1 -
 sql/old/3.3.5a/2011_01_06_2_world_scriptname.sql   |   1 -
 .../2011_01_08_00_world_spell_script_names.sql     |   5 +
 sql/old/3.3.5a/2011_01_08_01_world_scriptname.sql  |   2 +
 sql/old/3.3.5a/2011_01_08_02_world_scriptname.sql  |  30 +
 .../3.3.5a/2011_01_08_03_world_trinity_strings.sql |  23 +
 .../2011_01_08_04_world_spell_linked_spell.sql     |   7 +
 .../2011_01_08_0_world_spell_script_names.sql      |   5 -
 sql/old/3.3.5a/2011_01_08_1_world_scriptname.sql   |   2 -
 sql/old/3.3.5a/2011_01_08_2_world_scriptname.sql   |  30 -
 .../3.3.5a/2011_01_08_3_world_trinity_strings.sql  |  23 -
 .../2011_01_08_4_world_spell_linked_spell.sql      |   7 -
 sql/old/3.3.5a/2011_01_09_00_world_scriptname.sql  |   1 +
 sql/old/3.3.5a/2011_01_09_0_world_scriptname.sql   |   1 -
 .../2011_01_10_00_world_spell_linked_spell.sql     |   3 +
 .../2011_01_10_0_world_spell_linked_spell.sql      |   3 -
 .../2011_01_16_00_world_spell_script_names.sql     |   7 +
 .../2011_01_16_0_world_spell_script_names.sql      |   7 -
 .../2011_01_19_00_characters_account_data.sql      |   5 +
 sql/old/3.3.5a/2011_01_19_00_characters_addons.sql |   3 +
 .../3.3.5a/2011_01_19_00_characters_arena_team.sql |   4 +
 .../2011_01_19_00_characters_auctionhouse.sql      |  11 +
 .../3.3.5a/2011_01_19_00_characters_bugreport.sql  |   3 +
 .../3.3.5a/2011_01_19_00_characters_channels.sql   |   5 +
 ..._01_19_00_characters_character_account_data.sql |   5 +
 ...1_01_19_00_characters_character_achievement.sql |   4 +
 ...0_characters_character_achievement_progress.sql |   5 +
 .../2011_01_19_00_characters_character_action.sql  |   4 +
 ...1_01_19_00_characters_character_arena_stats.sql |   3 +
 .../2011_01_19_00_characters_character_aura.sql    |   4 +
 .../2011_01_19_00_characters_character_banned.sql  |   6 +
 ...9_00_characters_character_battleground_data.sql |   9 +
 ...00_characters_character_battleground_random.sql |   2 +
 ..._01_19_00_characters_character_declinedname.sql |   3 +
 ...01_19_00_characters_character_equipmentsets.sql |  23 +
 .../2011_01_19_00_characters_character_gifts.sql   |   5 +
 .../2011_01_19_00_characters_character_glyphs.sql  |   8 +
 ...2011_01_19_00_characters_character_homebind.sql |   5 +
 ...2011_01_19_00_characters_character_instance.sql |   4 +
 ...011_01_19_00_characters_character_inventory.sql |   5 +
 .../2011_01_19_00_characters_character_pet.sql     |  20 +
 ...19_00_characters_character_pet_declinedname.sql |   4 +
 ...1_01_19_00_characters_character_queststatus.sql |  15 +
 ...9_00_characters_character_queststatus_daily.sql |   5 +
 ..._00_characters_character_queststatus_weekly.sql |   4 +
 ...11_01_19_00_characters_character_reputation.sql |   5 +
 .../2011_01_19_00_characters_character_skills.sql  |   6 +
 .../2011_01_19_00_characters_character_social.sql  |   8 +
 .../2011_01_19_00_characters_character_spell.sql   |   4 +
 ...1_19_00_characters_character_spell_cooldown.sql |   5 +
 .../2011_01_19_00_characters_character_stats.sql   |   2 +
 .../2011_01_19_00_characters_character_talent.sql  |   3 +
 ...2011_01_19_00_characters_character_tutorial.sql |  15 +
 .../3.3.5a/2011_01_19_00_characters_characters.sql |  23 +
 sql/old/3.3.5a/2011_01_19_00_characters_corpse.sql |  11 +
 .../2011_01_19_00_characters_creature_respawn.sql  |   3 +
 ..._19_00_characters_game_event_condition_save.sql |   3 +
 .../2011_01_19_0_characters_account_data.sql       |   5 -
 sql/old/3.3.5a/2011_01_19_0_characters_addons.sql  |   3 -
 .../3.3.5a/2011_01_19_0_characters_arena_team.sql  |   4 -
 .../2011_01_19_0_characters_auctionhouse.sql       |  11 -
 .../3.3.5a/2011_01_19_0_characters_bugreport.sql   |   3 -
 .../3.3.5a/2011_01_19_0_characters_channels.sql    |   5 -
 ...1_01_19_0_characters_character_account_data.sql |   5 -
 ...11_01_19_0_characters_character_achievement.sql |   4 -
 ...0_characters_character_achievement_progress.sql |   5 -
 .../2011_01_19_0_characters_character_action.sql   |   4 -
 ...11_01_19_0_characters_character_arena_stats.sql |   3 -
 .../2011_01_19_0_characters_character_aura.sql     |   4 -
 .../2011_01_19_0_characters_character_banned.sql   |   6 -
 ...19_0_characters_character_battleground_data.sql |   9 -
 ..._0_characters_character_battleground_random.sql |   2 -
 ...1_01_19_0_characters_character_declinedname.sql |   3 -
 ..._01_19_0_characters_character_equipmentsets.sql |  23 -
 .../2011_01_19_0_characters_character_gifts.sql    |   5 -
 .../2011_01_19_0_characters_character_glyphs.sql   |   8 -
 .../2011_01_19_0_characters_character_homebind.sql |   5 -
 .../2011_01_19_0_characters_character_instance.sql |   4 -
 ...2011_01_19_0_characters_character_inventory.sql |   5 -
 .../2011_01_19_0_characters_character_pet.sql      |  20 -
 ..._19_0_characters_character_pet_declinedname.sql |   4 -
 ...11_01_19_0_characters_character_queststatus.sql |  15 -
 ...19_0_characters_character_queststatus_daily.sql |   5 -
 ...9_0_characters_character_queststatus_weekly.sql |   4 -
 ...011_01_19_0_characters_character_reputation.sql |   5 -
 .../2011_01_19_0_characters_character_skills.sql   |   6 -
 .../2011_01_19_0_characters_character_social.sql   |   8 -
 .../2011_01_19_0_characters_character_spell.sql    |   4 -
 ...01_19_0_characters_character_spell_cooldown.sql |   5 -
 .../2011_01_19_0_characters_character_stats.sql    |   2 -
 .../2011_01_19_0_characters_character_talent.sql   |   3 -
 .../2011_01_19_0_characters_character_tutorial.sql |  15 -
 .../3.3.5a/2011_01_19_0_characters_characters.sql  |  23 -
 sql/old/3.3.5a/2011_01_19_0_characters_corpse.sql  |  11 -
 .../2011_01_19_0_characters_creature_respawn.sql   |   3 -
 ...1_19_0_characters_game_event_condition_save.sql |   3 -
 .../2011_01_20_00_characters_game_event_save.sql   |   3 +
 ...2011_01_20_00_characters_gameobject_respawn.sql |   3 +
 .../2011_01_20_00_characters_gm_subsurveys.sql     |   6 +
 .../3.3.5a/2011_01_20_00_characters_gm_surveys.sql |   6 +
 .../3.3.5a/2011_01_20_00_characters_gm_tickets.sql |  13 +
 .../2011_01_20_00_characters_group_instance.sql    |   4 +
 .../2011_01_20_00_characters_group_member.sql      |   4 +
 sql/old/3.3.5a/2011_01_20_00_characters_groups.sql |  17 +
 sql/old/3.3.5a/2011_01_20_00_characters_guild.sql  |  13 +
 ...011_01_20_00_characters_guild_bank_eventlog.sql |   8 +
 .../2011_01_20_00_characters_guild_bank_item.sql   |   4 +
 .../2011_01_20_00_characters_guild_bank_right.sql  |   5 +
 .../2011_01_20_00_characters_guild_bank_tab.sql    |   5 +
 .../2011_01_20_00_characters_guild_eventlog.sql    |   8 +
 .../2011_01_20_00_characters_guild_member.sql      |  21 +
 .../3.3.5a/2011_01_20_00_characters_guild_rank.sql |   7 +
 .../3.3.5a/2011_01_20_00_characters_instance.sql   |   6 +
 .../2011_01_20_00_characters_instance_reset.sql    |   4 +
 .../2011_01_20_00_characters_item_instance.sql     |  10 +
 ...11_01_20_00_characters_item_refund_instance.sql |   6 +
 ..._20_00_characters_item_soulbound_trace_data.sql |   3 +
 .../2011_01_20_00_characters_lag_reports.sql       |   6 +
 sql/old/3.3.5a/2011_01_20_00_characters_mail.sql   |  11 +
 .../3.3.5a/2011_01_20_00_characters_mail_items.sql |   4 +
 .../3.3.5a/2011_01_20_00_characters_pet_aura.sql   |  10 +
 .../3.3.5a/2011_01_20_00_characters_pet_spell.sql  |   5 +
 ...2011_01_20_00_characters_pet_spell_cooldown.sql |   4 +
 .../3.3.5a/2011_01_20_00_characters_petition.sql   |   4 +
 .../2011_01_20_00_characters_petition_sign.sql     |   6 +
 .../2011_01_20_00_characters_worldstates.sql       |   5 +
 sql/old/3.3.5a/2011_01_20_00_world_scriptname.sql  |   5 +
 .../2011_01_20_0_characters_game_event_save.sql    |   3 -
 .../2011_01_20_0_characters_gameobject_respawn.sql |   3 -
 .../2011_01_20_0_characters_gm_subsurveys.sql      |   6 -
 .../3.3.5a/2011_01_20_0_characters_gm_surveys.sql  |   6 -
 .../3.3.5a/2011_01_20_0_characters_gm_tickets.sql  |  13 -
 .../2011_01_20_0_characters_group_instance.sql     |   4 -
 .../2011_01_20_0_characters_group_member.sql       |   4 -
 sql/old/3.3.5a/2011_01_20_0_characters_groups.sql  |  17 -
 sql/old/3.3.5a/2011_01_20_0_characters_guild.sql   |  13 -
 ...2011_01_20_0_characters_guild_bank_eventlog.sql |   8 -
 .../2011_01_20_0_characters_guild_bank_item.sql    |   4 -
 .../2011_01_20_0_characters_guild_bank_right.sql   |   5 -
 .../2011_01_20_0_characters_guild_bank_tab.sql     |   5 -
 .../2011_01_20_0_characters_guild_eventlog.sql     |   8 -
 .../2011_01_20_0_characters_guild_member.sql       |  21 -
 .../3.3.5a/2011_01_20_0_characters_guild_rank.sql  |   7 -
 .../3.3.5a/2011_01_20_0_characters_instance.sql    |   6 -
 .../2011_01_20_0_characters_instance_reset.sql     |   4 -
 .../2011_01_20_0_characters_item_instance.sql      |  10 -
 ...011_01_20_0_characters_item_refund_instance.sql |   6 -
 ...1_20_0_characters_item_soulbound_trace_data.sql |   3 -
 .../3.3.5a/2011_01_20_0_characters_lag_reports.sql |   6 -
 sql/old/3.3.5a/2011_01_20_0_characters_mail.sql    |  11 -
 .../3.3.5a/2011_01_20_0_characters_mail_items.sql  |   4 -
 .../3.3.5a/2011_01_20_0_characters_pet_aura.sql    |  10 -
 .../3.3.5a/2011_01_20_0_characters_pet_spell.sql   |   5 -
 .../2011_01_20_0_characters_pet_spell_cooldown.sql |   4 -
 .../3.3.5a/2011_01_20_0_characters_petition.sql    |   4 -
 .../2011_01_20_0_characters_petition_sign.sql      |   6 -
 .../3.3.5a/2011_01_20_0_characters_worldstates.sql |   5 -
 sql/old/3.3.5a/2011_01_20_0_world_scriptname.sql   |   5 -
 .../2011_01_22_00_world_spell_script_names.sql     |  27 +
 ...011_01_22_01_characters_character_inventory.sql |   2 +
 .../2011_01_22_0_world_spell_script_names.sql      |  27 -
 ...2011_01_22_1_characters_character_inventory.sql |   2 -
 ..._01_24_00_characters_account_instance_times.sql |  10 +
 sql/old/3.3.5a/2011_01_24_00_world_scriptname.sql  |  11 +
 ...1_01_24_0_characters_account_instance_times.sql |  10 -
 sql/old/3.3.5a/2011_01_24_0_world_scriptname.sql   |  11 -
 sql/old/3.3.5a/2011_01_26_00_world_scriptname.sql  |   1 +
 .../2011_01_26_00_world_spell_script_names.sql     |   3 +
 sql/old/3.3.5a/2011_01_26_0_world_scriptname.sql   |   1 -
 .../2011_01_26_0_world_spell_script_names.sql      |   3 -
 .../2011_01_28_00_world_spell_linked_spell.sql     |   1 +
 .../2011_01_28_00_world_spell_script_names.sql     |   3 +
 .../2011_01_28_01_world_spell_script_names.sql     |   3 +
 .../2011_01_28_0_world_spell_linked_spell.sql      |   1 -
 .../2011_01_28_0_world_spell_script_names.sql      |   3 -
 .../2011_01_28_1_world_spell_script_names.sql      |   3 -
 .../2011_01_29_00_world_spell_linked_spell.sql     |   9 +
 .../2011_01_29_0_world_spell_linked_spell.sql      |   9 -
 .../2011_01_30_00_world_spell_proc_event.sql       |   4 +
 .../2011_01_30_00_world_spell_script_names.sql     |   3 +
 sql/old/3.3.5a/2011_01_30_01_world_scriptnames.sql |   1 +
 .../3.3.5a/2011_01_30_0_world_spell_proc_event.sql |   4 -
 .../2011_01_30_0_world_spell_script_names.sql      |   3 -
 sql/old/3.3.5a/2011_01_30_1_world_scriptnames.sql  |   1 -
 .../2011_01_31_00_world_spell_bonus_data.sql       |   3 +
 .../2011_01_31_00_world_spell_proc_event.sql       |   3 +
 .../2011_01_31_00_world_spell_script_names.sql     |   3 +
 .../2011_01_31_01_world_spell_proc_event.sql       |   3 +
 .../2011_01_31_01_world_spell_script_names.sql     |   3 +
 .../3.3.5a/2011_01_31_0_world_spell_bonus_data.sql |   3 -
 .../3.3.5a/2011_01_31_0_world_spell_proc_event.sql |   3 -
 .../2011_01_31_0_world_spell_script_names.sql      |   3 -
 .../3.3.5a/2011_01_31_1_world_spell_proc_event.sql |   3 -
 .../2011_01_31_1_world_spell_script_names.sql      |   3 -
 .../3.3.5a/2011_02_03_00_characters_instance.sql   |   1 +
 .../2011_02_03_00_world_instance_encounters.sql    | 638 +++++++++++++++++++++
 sql/old/3.3.5a/2011_02_03_01_world_command.sql     |   1 +
 .../2011_02_03_02_world_lfg_dungeon_encounters.sql |   1 +
 sql/old/3.3.5a/2011_02_03_03_world_spell_dbc.sql   |  18 +
 .../3.3.5a/2011_02_03_0_characters_instance.sql    |   1 -
 .../2011_02_03_0_world_instance_encounters.sql     | 638 ---------------------
 sql/old/3.3.5a/2011_02_03_1_world_command.sql      |   1 -
 .../2011_02_03_2_world_lfg_dungeon_encounters.sql  |   1 -
 sql/old/3.3.5a/2011_02_03_3_world_spell_dbc.sql    |  18 -
 ...2_04_00_world_battleground_isle_of_conquest.sql |  78 +++
 sql/old/3.3.5a/2011_02_04_00_world_conditions.sql  |   5 +
 .../3.3.5a/2011_02_04_00_world_creature_631.sql    |  70 +++
 .../2011_02_04_00_world_creature_questrelation.sql |   2 +
 .../2011_02_04_00_world_creature_template.sql      |   2 +
 sql/old/3.3.5a/2011_02_04_00_world_game_event.sql  |  15 +
 ...011_02_04_00_world_gameobject_questrelation.sql |   3 +
 .../2011_02_04_00_world_instance_pit_of_saron.sql  | 129 +++++
 .../2011_02_04_00_world_item_loot_template.sql     |   7 +
 .../2011_02_04_00_world_mail_loot_template.sql     |  34 ++
 .../3.3.5a/2011_02_04_00_world_quest_template.sql  |   2 +
 sql/old/3.3.5a/2011_02_04_00_world_sai.sql         |   5 +
 .../2011_02_04_00_world_spell_script_names.sql     |  17 +
 .../2011_02_04_00_world_spell_target_position.sql  |   3 +
 sql/old/3.3.5a/2011_02_04_01_world_game_event.sql  |   2 +
 .../3.3.5a/2011_02_04_01_world_quest_template.sql  |   2 +
 sql/old/3.3.5a/2011_02_04_01_world_sai.sql         |   5 +
 .../3.3.5a/2011_02_04_02_world_quest_template.sql  |   2 +
 sql/old/3.3.5a/2011_02_04_02_world_sai.sql         |  12 +
 .../3.3.5a/2011_02_04_03_world_quest_template.sql  |   3 +
 sql/old/3.3.5a/2011_02_04_03_world_sai.sql         |  28 +
 .../3.3.5a/2011_02_04_04_world_quest_template.sql  |   3 +
 sql/old/3.3.5a/2011_02_04_04_world_sai.sql         |  37 ++
 ...02_04_0_world_battleground_isle_of_conquest.sql |  78 ---
 sql/old/3.3.5a/2011_02_04_0_world_conditions.sql   |   5 -
 sql/old/3.3.5a/2011_02_04_0_world_creature_631.sql |  70 ---
 .../2011_02_04_0_world_creature_questrelation.sql  |   2 -
 .../2011_02_04_0_world_creature_template.sql       |   2 -
 sql/old/3.3.5a/2011_02_04_0_world_game_event.sql   |  15 -
 ...2011_02_04_0_world_gameobject_questrelation.sql |   3 -
 .../2011_02_04_0_world_instance_pit_of_saron.sql   | 129 -----
 .../2011_02_04_0_world_item_loot_template.sql      |   7 -
 .../2011_02_04_0_world_mail_loot_template.sql      |  34 --
 .../3.3.5a/2011_02_04_0_world_quest_template.sql   |   2 -
 sql/old/3.3.5a/2011_02_04_0_world_sai.sql          |   5 -
 .../2011_02_04_0_world_spell_script_names.sql      |  17 -
 .../2011_02_04_0_world_spell_target_position.sql   |   3 -
 sql/old/3.3.5a/2011_02_04_1_world_game_event.sql   |   2 -
 .../3.3.5a/2011_02_04_1_world_quest_template.sql   |   2 -
 sql/old/3.3.5a/2011_02_04_1_world_sai.sql          |   5 -
 .../3.3.5a/2011_02_04_2_world_quest_template.sql   |   2 -
 sql/old/3.3.5a/2011_02_04_2_world_sai.sql          |  12 -
 .../3.3.5a/2011_02_04_3_world_quest_template.sql   |   3 -
 sql/old/3.3.5a/2011_02_04_3_world_sai.sql          |  28 -
 .../3.3.5a/2011_02_04_4_world_quest_template.sql   |   3 -
 sql/old/3.3.5a/2011_02_04_4_world_sai.sql          |  37 --
 sql/old/3.3.5a/2011_02_05_00_world_sai.sql         | 109 ++++
 .../3.3.5a/2011_02_05_01_world_quest_template.sql  |   9 +
 .../2011_02_05_02_world_creature_template.sql      |   2 +
 .../2011_02_05_03_world_creature_template.sql      |   7 +
 sql/old/3.3.5a/2011_02_05_04_world_game_event.sql  |  42 ++
 sql/old/3.3.5a/2011_02_05_05_world_sai.sql         |  17 +
 .../3.3.5a/2011_02_05_06_world_waypoint_data.sql   |   2 +
 sql/old/3.3.5a/2011_02_05_07_world_sai.sql         |  80 +++
 sql/old/3.3.5a/2011_02_05_08_world_sai.sql         |  75 +++
 sql/old/3.3.5a/2011_02_05_0_world_sai.sql          | 109 ----
 .../3.3.5a/2011_02_05_1_world_quest_template.sql   |   9 -
 .../2011_02_05_2_world_creature_template.sql       |   2 -
 .../2011_02_05_3_world_creature_template.sql       |   7 -
 sql/old/3.3.5a/2011_02_05_4_world_game_event.sql   |  42 --
 sql/old/3.3.5a/2011_02_05_5_world_sai.sql          |  17 -
 .../3.3.5a/2011_02_05_6_world_waypoint_data.sql    |   2 -
 sql/old/3.3.5a/2011_02_05_7_world_sai.sql          |  80 ---
 sql/old/3.3.5a/2011_02_05_8_world_sai.sql          |  75 ---
 ...011_02_06_00_world_instance_sindragosa_lair.sql |  73 +++
 .../2011_02_06_01_world_creature_loot_template.sql |   2 +
 .../2011_02_06_02_world_item_loot_template.sql     |   4 +
 ...2011_02_06_0_world_instance_sindragosa_lair.sql |  73 ---
 .../2011_02_06_1_world_creature_loot_template.sql  |   2 -
 .../2011_02_06_2_world_item_loot_template.sql      |   4 -
 ...11_02_07_00_world_achievement_criteria_data.sql |  18 +
 .../2011_02_07_00_world_areatrigger_scripts.sql    |   3 +
 .../2011_02_07_00_world_creature_template.sql      |   5 +
 .../3.3.5a/2011_02_07_00_world_creature_text.sql   |  14 +
 sql/old/3.3.5a/2011_02_07_00_world_scriptname.sql  |   5 +
 .../2011_02_07_00_world_spell_linked_spell.sql     |   4 +
 .../2011_02_07_00_world_spell_script_names.sql     |  30 +
 .../2011_02_07_01_world_creature_questrelation.sql |  12 +
 sql/old/3.3.5a/2011_02_07_02_world_sai.sql         |  58 ++
 ...011_02_07_0_world_achievement_criteria_data.sql |  18 -
 .../2011_02_07_0_world_areatrigger_scripts.sql     |   3 -
 .../2011_02_07_0_world_creature_template.sql       |   5 -
 .../3.3.5a/2011_02_07_0_world_creature_text.sql    |  14 -
 sql/old/3.3.5a/2011_02_07_0_world_scriptname.sql   |   5 -
 .../2011_02_07_0_world_spell_linked_spell.sql      |   4 -
 .../2011_02_07_0_world_spell_script_names.sql      |  30 -
 .../2011_02_07_1_world_creature_questrelation.sql  |  12 -
 sql/old/3.3.5a/2011_02_07_2_world_sai.sql          |  58 --
 ...2011_02_080_0_world_instance_saurfang_traps.sql |  18 +
 .../2011_02_08_00_world_areatrigger_scripts.sql    |   4 +
 sql/old/3.3.5a/2011_02_08_00_world_scriptname.sql  |   1 +
 .../2011_02_08_01_world_creature_template.sql      |   2 +
 .../2011_02_08_02_world_waypoint_scripts.sql       |   2 +
 .../2011_02_08_0_world_areatrigger_scripts.sql     |   4 -
 .../2011_02_08_0_world_instance_saurfang_traps.sql |  18 -
 sql/old/3.3.5a/2011_02_08_0_world_scriptname.sql   |   1 -
 .../2011_02_08_1_world_creature_template.sql       |   2 -
 .../3.3.5a/2011_02_08_2_world_waypoint_scripts.sql |   2 -
 sql/old/3.3.5a/2011_02_10_00_world_sai.sql         | 131 +++++
 sql/old/3.3.5a/2011_02_10_01_world_sai.sql         |  50 ++
 .../3.3.5a/2011_02_10_02_world_instance_oculus.sql |  33 ++
 .../2011_02_10_03_world_creature_template.sql      |   2 +
 sql/old/3.3.5a/2011_02_10_04_world_scriptname.sql  |   2 +
 sql/old/3.3.5a/2011_02_10_0_world_sai.sql          | 131 -----
 sql/old/3.3.5a/2011_02_10_1_world_sai.sql          |  50 --
 .../3.3.5a/2011_02_10_2_world_instance_oculus.sql  |  33 --
 .../2011_02_10_3_world_creature_template.sql       |   2 -
 sql/old/3.3.5a/2011_02_10_4_world_scriptname.sql   |   2 -
 sql/old/3.3.5a/2011_02_11_00_world_coredevdata.sql |  45 ++
 sql/old/3.3.5a/2011_02_11_01_world_command.sql     |   3 +
 sql/old/3.3.5a/2011_02_11_01_world_coredevdata.sql |  36 ++
 sql/old/3.3.5a/2011_02_11_02_world_npc_gossip.sql  |   1 +
 ...11_02_11_03_world_creature_involvedrelation.sql |   2 +
 .../2011_02_11_04_world_game_event_npc_gossip.sql  |   1 +
 sql/old/3.3.5a/2011_02_11_0_world_coredevdata.sql  |  45 --
 sql/old/3.3.5a/2011_02_11_1_world_command.sql      |   3 -
 sql/old/3.3.5a/2011_02_11_1_world_coredevdata.sql  |  36 --
 sql/old/3.3.5a/2011_02_11_2_world_npc_gossip.sql   |   1 -
 ...011_02_11_3_world_creature_involvedrelation.sql |   2 -
 .../2011_02_11_4_world_game_event_npc_gossip.sql   |   1 -
 .../2011_02_12_00_world_spell_script_names.sql     |   3 +
 .../2011_02_12_0_world_spell_script_names.sql      |   3 -
 sql/old/3.3.5a/2011_02_15_00_world_sai.sql         | 139 +++++
 sql/old/3.3.5a/2011_02_15_01_world_sai.sql         |  74 +++
 .../2011_02_15_02_world_game_event_liita.sql       | 270 +++++++++
 .../2011_02_15_03_world_creature_template.sql      |   1 +
 .../3.3.5a/2011_02_15_03_world_creature_text.sql   |   4 +
 sql/old/3.3.5a/2011_02_15_03_world_scriptname.sql  |   1 +
 .../2011_02_15_03_world_spell_script_names.sql     |   3 +
 .../2011_02_15_04_world_spell_linked_spell.sql     |   1 +
 .../2011_02_15_04_world_spell_script_names.sql     |   3 +
 sql/old/3.3.5a/2011_02_15_0_world_sai.sql          | 139 -----
 sql/old/3.3.5a/2011_02_15_1_world_sai.sql          |  74 ---
 .../3.3.5a/2011_02_15_2_world_game_event_liita.sql | 270 ---------
 .../2011_02_15_3_world_creature_template.sql       |   1 -
 .../3.3.5a/2011_02_15_3_world_creature_text.sql    |   4 -
 sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql   |   1 -
 .../2011_02_15_3_world_spell_script_names.sql      |   3 -
 .../2011_02_15_4_world_spell_linked_spell.sql      |   1 -
 .../2011_02_15_4_world_spell_script_names.sql      |   3 -
 .../2011_02_16_00_world_spell_script_names.sql     |   3 +
 sql/old/3.3.5a/2011_02_16_01_world_conditions.sql  |   4 +
 .../2011_02_16_0_world_spell_script_names.sql      |   3 -
 sql/old/3.3.5a/2011_02_16_1_world_conditions.sql   |   4 -
 sql/old/3.3.5a/2011_02_18_00_world_creature.sql    |   6 +
 .../3.3.5a/2011_02_18_00_world_creature_text.sql   |   6 +
 sql/old/3.3.5a/2011_02_18_00_world_pool_quest.sql  |  28 +
 sql/old/3.3.5a/2011_02_18_00_world_scriptname.sql  |   1 +
 .../2011_02_18_00_world_spell_linked_spell.sql     |   3 +
 .../2011_02_18_01_world_spell_linked_spell.sql     |   3 +
 sql/old/3.3.5a/2011_02_18_02_world_misc.sql        |  36 ++
 .../3.3.5a/2011_02_18_03_world_loot_template.sql   |   2 +
 sql/old/3.3.5a/2011_02_18_04_world_eai.sql         |   2 +
 sql/old/3.3.5a/2011_02_18_05_world_sai.sql         |  80 +++
 sql/old/3.3.5a/2011_02_18_0_world_creature.sql     |   6 -
 .../3.3.5a/2011_02_18_0_world_creature_text.sql    |   6 -
 sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql   |  28 -
 sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql   |   1 -
 .../2011_02_18_0_world_spell_linked_spell.sql      |   3 -
 .../2011_02_18_1_world_spell_linked_spell.sql      |   3 -
 sql/old/3.3.5a/2011_02_18_2_world_misc.sql         |  36 --
 .../3.3.5a/2011_02_18_3_world_loot_template.sql    |   2 -
 sql/old/3.3.5a/2011_02_18_4_world_eai.sql          |   2 -
 sql/old/3.3.5a/2011_02_18_5_world_sai.sql          |  80 ---
 sql/old/3.3.5a/2011_02_19_00_world_conditions.sql  |   4 +
 .../2011_02_19_00_world_creature_template.sql      |   2 +
 sql/old/3.3.5a/2011_02_19_00_world_scriptname.sql  |   1 +
 .../2011_02_19_00_world_spell_script_names.sql     |  22 +
 ...11_02_19_01_world_instance_icecrown_citadel.sql | 109 ++++
 sql/old/3.3.5a/2011_02_19_0_world_conditions.sql   |   4 -
 .../2011_02_19_0_world_creature_template.sql       |   2 -
 sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql   |   1 -
 .../2011_02_19_0_world_spell_script_names.sql      |  22 -
 ...011_02_19_1_world_instance_icecrown_citadel.sql | 109 ----
 .../3.3.5a/2011_02_20_00_world_smart_scripts.sql   |   7 +
 .../3.3.5a/2011_02_20_01_world_smart_scripts.sql   |  24 +
 ...11_02_20_02_world_instance_icecrown_citadel.sql |  61 ++
 .../3.3.5a/2011_02_20_0_world_smart_scripts.sql    |   7 -
 .../3.3.5a/2011_02_20_1_world_smart_scripts.sql    |  24 -
 ...011_02_20_2_world_instance_icecrown_citadel.sql |  61 --
 sql/old/3.3.5a/2011_02_22_00_world_scriptname.sql  |   1 +
 .../2011_02_22_01_world_spell_script_names.sql     |   8 +
 sql/old/3.3.5a/2011_02_22_02_world_conditions.sql  |   3 +
 .../2011_02_22_03_world_creature_template.sql      |   1 +
 .../2011_02_22_04_world_vehicle_accessory.sql      |   3 +
 sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql   |   1 -
 .../2011_02_22_1_world_spell_script_names.sql      |   8 -
 sql/old/3.3.5a/2011_02_22_2_world_conditions.sql   |   3 -
 .../2011_02_22_3_world_creature_template.sql       |   1 -
 .../2011_02_22_4_world_vehicle_accessory.sql       |   3 -
 .../2011_02_23_01_world_creature_template.sql      |   5 +
 sql/old/3.3.5a/2011_02_23_02_world_conditions.sql  |   8 +
 .../2011_02_23_03_world_vehicle_accessory.sql      |   1 +
 .../2011_02_23_04_world_spell_script_names.sql     |   4 +
 .../2011_02_23_05_world_creature_template.sql      |   1 +
 sql/old/3.3.5a/2011_02_23_06_world_creatures.sql   |  40 ++
 sql/old/3.3.5a/2011_02_23_07_world_misc.sql        |  76 +++
 sql/old/3.3.5a/2011_02_23_07_world_scriptname.sql  |   1 +
 sql/old/3.3.5a/2011_02_23_08_world_sai.sql         | 106 ++++
 .../2011_02_23_09_world_spell_linked_spell.sql     |   3 +
 .../2011_02_23_1_world_creature_template.sql       |   5 -
 sql/old/3.3.5a/2011_02_23_2_world_conditions.sql   |   8 -
 .../2011_02_23_3_world_vehicle_accessory.sql       |   1 -
 .../2011_02_23_4_world_spell_script_names.sql      |   4 -
 .../2011_02_23_5_world_creature_template.sql       |   1 -
 sql/old/3.3.5a/2011_02_23_6_world_creatures.sql    |  40 --
 sql/old/3.3.5a/2011_02_23_7_world_misc.sql         |  76 ---
 sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql   |   1 -
 sql/old/3.3.5a/2011_02_23_8_world_sai.sql          | 106 ----
 .../2011_02_23_9_world_spell_linked_spell.sql      |   3 -
 .../2011_02_24_00_characters_account_data.sql      |   1 +
 ...2011_02_24_01_characters_character_tutorial.sql |   2 +
 .../2011_02_24_0_characters_account_data.sql       |   1 -
 .../2011_02_24_1_characters_character_tutorial.sql |   2 -
 sql/old/3.3.5a/2011_02_25_00_world_creatures.sql   |   8 +
 .../2011_02_25_01_world_spell_script_names.sql     |   3 +
 .../2011_02_25_02_world_spell_proc_event.sql       |   3 +
 sql/old/3.3.5a/2011_02_25_0_world_creatures.sql    |   8 -
 .../2011_02_25_1_world_spell_script_names.sql      |   3 -
 .../3.3.5a/2011_02_25_2_world_spell_proc_event.sql |   3 -
 sql/old/3.3.5a/2011_02_26_00_world_sai.sql         |  35 ++
 sql/old/3.3.5a/2011_02_26_01_world_sai.sql         |   9 +
 sql/old/3.3.5a/2011_02_26_02_world_sai.sql         | 117 ++++
 sql/old/3.3.5a/2011_02_26_03_world_creatures.sql   |   2 +
 .../2011_02_26_04_world_spell_linked_spell.sql     |   8 +
 .../2011_02_26_05_world_npc_spellclick_spells.sql  |  68 +++
 sql/old/3.3.5a/2011_02_26_0_world_sai.sql          |  35 --
 sql/old/3.3.5a/2011_02_26_1_world_sai.sql          |   9 -
 sql/old/3.3.5a/2011_02_26_2_world_sai.sql          | 117 ----
 sql/old/3.3.5a/2011_02_26_3_world_creatures.sql    |   2 -
 .../2011_02_26_4_world_spell_linked_spell.sql      |   8 -
 .../2011_02_26_5_world_npc_spellclick_spells.sql   |  68 ---
 .../2011_02_27_00_world_creature_template.sql      |  29 +
 .../2011_02_27_01_world_creature_template.sql      |  66 +++
 .../2011_02_27_02_world_npc_spellclick_spells.sql  |  11 +
 .../2011_02_27_03_world_npc_spellclick_spells.sql  |   3 +
 .../2011_02_27_04_world_creature_template.sql      |  75 +++
 .../2011_02_27_0_world_creature_template.sql       |  29 -
 .../2011_02_27_1_world_creature_template.sql       |  66 ---
 .../2011_02_27_2_world_npc_spellclick_spells.sql   |  11 -
 .../2011_02_27_3_world_npc_spellclick_spells.sql   |   3 -
 .../2011_02_27_4_world_creature_template.sql       |  75 ---
 .../2011_02_28_00_world_npc_spellclick_spells.sql  |  13 +
 .../2011_02_28_01_world_quest_start_scripts.sql    |   2 +
 sql/old/3.3.5a/2011_02_28_02_world_sai.sql         |  31 +
 sql/old/3.3.5a/2011_02_28_03_world_sai.sql         |  65 +++
 sql/old/3.3.5a/2011_02_28_04_world_sai.sql         |  55 ++
 sql/old/3.3.5a/2011_02_28_05_world_vehicles.sql    | 129 +++++
 sql/old/3.3.5a/2011_02_28_06_world_gameobject.sql  |   1 +
 .../2011_02_28_07_world_creature_template.sql      |   1 +
 .../2011_02_28_0_world_npc_spellclick_spells.sql   |  13 -
 .../2011_02_28_1_world_quest_start_scripts.sql     |   2 -
 sql/old/3.3.5a/2011_02_28_2_world_sai.sql          |  31 -
 sql/old/3.3.5a/2011_02_28_3_world_sai.sql          |  65 ---
 sql/old/3.3.5a/2011_02_28_4_world_sai.sql          |  55 --
 sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql     | 129 -----
 sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql   |   1 -
 .../2011_02_28_7_world_creature_template.sql       |   1 -
 sql/old/3.3.5a/2011_03_01_01_world_conditions.sql  |   6 +
 .../2011_03_01_02_world_creature_template.sql      |   3 +
 sql/old/3.3.5a/2011_03_01_03_world_sai.sql         |  31 +
 sql/old/3.3.5a/2011_03_01_03_world_scriptname.sql  |   1 +
 sql/old/3.3.5a/2011_03_01_04_world_sai.sql         | 159 +++++
 sql/old/3.3.5a/2011_03_01_05_world_npc_trainer.sql |   2 +
 sql/old/3.3.5a/2011_03_01_1_world_conditions.sql   |   6 -
 .../2011_03_01_2_world_creature_template.sql       |   3 -
 sql/old/3.3.5a/2011_03_01_3_world_sai.sql          |  31 -
 sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql   |   1 -
 sql/old/3.3.5a/2011_03_01_4_world_sai.sql          | 159 -----
 sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql  |   2 -
 .../2011_03_02_00_world_creature_template.sql      |   2 +
 .../2011_03_02_01_world_achievement_reward.sql     |   5 +
 .../3.3.5a/2011_03_02_02_world_waypoint_data.sql   | 312 ++++++++++
 sql/old/3.3.5a/2011_03_02_03_world_gossip_menu.sql |  31 +
 .../3.3.5a/2011_03_02_04_world_waypoint_data.sql   | 164 ++++++
 sql/old/3.3.5a/2011_03_02_05_world_sai.sql         |  37 ++
 sql/old/3.3.5a/2011_03_02_06_world_sai.sql         |  47 ++
 .../2011_03_02_0_world_creature_template.sql       |   2 -
 .../2011_03_02_1_world_achievement_reward.sql      |   5 -
 .../3.3.5a/2011_03_02_2_world_waypoint_data.sql    | 312 ----------
 sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql  |  31 -
 .../3.3.5a/2011_03_02_4_world_waypoint_data.sql    | 164 ------
 sql/old/3.3.5a/2011_03_02_5_world_sai.sql          |  37 --
 sql/old/3.3.5a/2011_03_02_6_world_sai.sql          |  47 --
 ...011_03_04_00_world_skill_discovery_template.sql |   2 +
 .../2011_03_04_01_world_npc_spellclick_spells.sql  |   3 +
 .../2011_03_04_01_world_vehicle_accessory.sql      |   1 +
 .../2011_03_04_02_world_spell_script_names.sql     |   8 +
 sql/old/3.3.5a/2011_03_04_03_world_gameobject.sql  |   2 +
 sql/old/3.3.5a/2011_03_04_04_world_scriptname.sql  |   2 +
 .../2011_03_04_04_world_spell_script_names.sql     |   5 +
 ...2011_03_04_0_world_skill_discovery_template.sql |   2 -
 .../2011_03_04_1_world_npc_spellclick_spells.sql   |   3 -
 .../2011_03_04_1_world_vehicle_accessory.sql       |   1 -
 .../2011_03_04_2_world_spell_script_names.sql      |   8 -
 sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql   |   2 -
 sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql   |   2 -
 .../2011_03_04_4_world_spell_script_names.sql      |   5 -
 .../3.3.5a/2011_03_05_00_world_waypoint_data.sql   | 208 +++++++
 .../3.3.5a/2011_03_05_0_world_waypoint_data.sql    | 208 -------
 508 files changed, 5613 insertions(+), 5613 deletions(-)
 create mode 100644 sql/old/3.3.5a/2011_01_06_00_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_06_01_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_06_02_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_06_0_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_06_1_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_06_2_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_08_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_08_01_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_08_02_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_08_03_world_trinity_strings.sql
 create mode 100644 sql/old/3.3.5a/2011_01_08_04_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_08_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_08_1_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_08_2_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_08_3_world_trinity_strings.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_08_4_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_01_09_00_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_09_0_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_10_00_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_10_0_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_01_16_00_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_16_0_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_account_data.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_addons.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_arena_team.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_auctionhouse.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_bugreport.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_channels.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_account_data.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_achievement.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_achievement_progress.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_action.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_arena_stats.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_aura.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_banned.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_data.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_random.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_declinedname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_equipmentsets.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_gifts.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_glyphs.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_homebind.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_instance.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_inventory.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_pet.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_pet_declinedname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_daily.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_weekly.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_reputation.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_skills.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_social.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_spell_cooldown.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_stats.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_talent.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_character_tutorial.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_characters.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_corpse.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_creature_respawn.sql
 create mode 100644 sql/old/3.3.5a/2011_01_19_00_characters_game_event_condition_save.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_account_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_addons.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_arena_team.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_auctionhouse.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_bugreport.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_channels.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_account_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_achievement.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_achievement_progress.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_action.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_arena_stats.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_aura.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_banned.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_random.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_declinedname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_equipmentsets.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_gifts.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_glyphs.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_homebind.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_instance.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_inventory.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_pet.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_pet_declinedname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_daily.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_weekly.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_reputation.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_skills.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_social.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_spell_cooldown.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_stats.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_talent.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_character_tutorial.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_characters.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_corpse.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_creature_respawn.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_19_0_characters_game_event_condition_save.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_game_event_save.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_gameobject_respawn.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_gm_subsurveys.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_gm_surveys.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_gm_tickets.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_group_instance.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_group_member.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_groups.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_eventlog.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_item.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_right.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_tab.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild_eventlog.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild_member.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_guild_rank.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_instance.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_instance_reset.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_item_instance.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_item_refund_instance.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_item_soulbound_trace_data.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_lag_reports.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_mail.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_mail_items.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_pet_aura.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_pet_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_pet_spell_cooldown.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_petition.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_petition_sign.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_characters_worldstates.sql
 create mode 100644 sql/old/3.3.5a/2011_01_20_00_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_game_event_save.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_gameobject_respawn.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_gm_subsurveys.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_gm_surveys.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_gm_tickets.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_group_instance.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_group_member.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_groups.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_eventlog.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_item.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_right.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_tab.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild_eventlog.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild_member.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_guild_rank.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_instance.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_instance_reset.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_item_instance.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_item_refund_instance.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_item_soulbound_trace_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_lag_reports.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_mail.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_mail_items.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_pet_aura.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_pet_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_pet_spell_cooldown.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_petition.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_petition_sign.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_characters_worldstates.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_20_0_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_22_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_22_01_characters_character_inventory.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_22_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_22_1_characters_character_inventory.sql
 create mode 100644 sql/old/3.3.5a/2011_01_24_00_characters_account_instance_times.sql
 create mode 100644 sql/old/3.3.5a/2011_01_24_00_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_24_0_characters_account_instance_times.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_24_0_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_26_00_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_01_26_00_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_26_0_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_26_0_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_28_00_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_01_28_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_28_01_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_28_0_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_28_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_28_1_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_29_00_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_29_0_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_01_30_00_world_spell_proc_event.sql
 create mode 100644 sql/old/3.3.5a/2011_01_30_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_30_01_world_scriptnames.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_30_0_world_spell_proc_event.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_30_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_30_1_world_scriptnames.sql
 create mode 100644 sql/old/3.3.5a/2011_01_31_00_world_spell_bonus_data.sql
 create mode 100644 sql/old/3.3.5a/2011_01_31_00_world_spell_proc_event.sql
 create mode 100644 sql/old/3.3.5a/2011_01_31_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_01_31_01_world_spell_proc_event.sql
 create mode 100644 sql/old/3.3.5a/2011_01_31_01_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_31_0_world_spell_bonus_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_31_0_world_spell_proc_event.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_31_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_31_1_world_spell_proc_event.sql
 delete mode 100644 sql/old/3.3.5a/2011_01_31_1_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_03_00_characters_instance.sql
 create mode 100644 sql/old/3.3.5a/2011_02_03_00_world_instance_encounters.sql
 create mode 100644 sql/old/3.3.5a/2011_02_03_01_world_command.sql
 create mode 100644 sql/old/3.3.5a/2011_02_03_02_world_lfg_dungeon_encounters.sql
 create mode 100644 sql/old/3.3.5a/2011_02_03_03_world_spell_dbc.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_03_0_characters_instance.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_03_0_world_instance_encounters.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_03_1_world_command.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_03_2_world_lfg_dungeon_encounters.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_03_3_world_spell_dbc.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_battleground_isle_of_conquest.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_conditions.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_creature_631.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_creature_questrelation.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_game_event.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_gameobject_questrelation.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_instance_pit_of_saron.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_item_loot_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_mail_loot_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_quest_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_00_world_spell_target_position.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_01_world_game_event.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_01_world_quest_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_01_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_02_world_quest_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_02_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_03_world_quest_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_03_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_04_world_quest_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_04_04_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_battleground_isle_of_conquest.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_conditions.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_creature_631.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_creature_questrelation.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_game_event.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_gameobject_questrelation.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_instance_pit_of_saron.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_item_loot_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_mail_loot_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_quest_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_0_world_spell_target_position.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_1_world_game_event.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_1_world_quest_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_1_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_2_world_quest_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_2_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_3_world_quest_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_3_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_4_world_quest_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_04_4_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_00_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_01_world_quest_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_02_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_03_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_04_world_game_event.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_05_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_06_world_waypoint_data.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_07_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_05_08_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_0_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_1_world_quest_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_2_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_3_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_4_world_game_event.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_5_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_6_world_waypoint_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_7_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_05_8_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_06_00_world_instance_sindragosa_lair.sql
 create mode 100644 sql/old/3.3.5a/2011_02_06_01_world_creature_loot_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_06_02_world_item_loot_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_06_0_world_instance_sindragosa_lair.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_06_1_world_creature_loot_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_06_2_world_item_loot_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_00_world_achievement_criteria_data.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_00_world_areatrigger_scripts.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_00_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_00_world_creature_text.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_00_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_00_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_01_world_creature_questrelation.sql
 create mode 100644 sql/old/3.3.5a/2011_02_07_02_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_0_world_achievement_criteria_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_0_world_areatrigger_scripts.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_0_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_0_world_creature_text.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_0_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_0_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_1_world_creature_questrelation.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_07_2_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_080_0_world_instance_saurfang_traps.sql
 create mode 100644 sql/old/3.3.5a/2011_02_08_00_world_areatrigger_scripts.sql
 create mode 100644 sql/old/3.3.5a/2011_02_08_00_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_08_01_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_08_02_world_waypoint_scripts.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_08_0_world_areatrigger_scripts.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_08_0_world_instance_saurfang_traps.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_08_0_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_08_1_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_08_2_world_waypoint_scripts.sql
 create mode 100644 sql/old/3.3.5a/2011_02_10_00_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_10_01_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_10_02_world_instance_oculus.sql
 create mode 100644 sql/old/3.3.5a/2011_02_10_03_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_10_04_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_10_0_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_10_1_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_10_2_world_instance_oculus.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_10_3_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_10_4_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_11_00_world_coredevdata.sql
 create mode 100644 sql/old/3.3.5a/2011_02_11_01_world_command.sql
 create mode 100644 sql/old/3.3.5a/2011_02_11_01_world_coredevdata.sql
 create mode 100644 sql/old/3.3.5a/2011_02_11_02_world_npc_gossip.sql
 create mode 100644 sql/old/3.3.5a/2011_02_11_03_world_creature_involvedrelation.sql
 create mode 100644 sql/old/3.3.5a/2011_02_11_04_world_game_event_npc_gossip.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_11_0_world_coredevdata.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_11_1_world_command.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_11_1_world_coredevdata.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_11_2_world_npc_gossip.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_11_3_world_creature_involvedrelation.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_11_4_world_game_event_npc_gossip.sql
 create mode 100644 sql/old/3.3.5a/2011_02_12_00_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_12_0_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_00_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_01_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_02_world_game_event_liita.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_03_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_03_world_creature_text.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_03_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_03_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_04_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_02_15_04_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_0_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_1_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_2_world_game_event_liita.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_3_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_3_world_creature_text.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_3_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_4_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_15_4_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_16_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_16_01_world_conditions.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_16_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_16_1_world_conditions.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_00_world_creature.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_00_world_creature_text.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_00_world_pool_quest.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_00_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_00_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_01_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_02_world_misc.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_03_world_loot_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_04_world_eai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_18_05_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_0_world_creature.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_0_world_creature_text.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_0_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_1_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_2_world_misc.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_3_world_loot_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_4_world_eai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_18_5_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_19_00_world_conditions.sql
 create mode 100644 sql/old/3.3.5a/2011_02_19_00_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_19_00_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_19_00_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_19_01_world_instance_icecrown_citadel.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_19_0_world_conditions.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_19_0_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_19_0_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_19_1_world_instance_icecrown_citadel.sql
 create mode 100644 sql/old/3.3.5a/2011_02_20_00_world_smart_scripts.sql
 create mode 100644 sql/old/3.3.5a/2011_02_20_01_world_smart_scripts.sql
 create mode 100644 sql/old/3.3.5a/2011_02_20_02_world_instance_icecrown_citadel.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_20_0_world_smart_scripts.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_20_1_world_smart_scripts.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_20_2_world_instance_icecrown_citadel.sql
 create mode 100644 sql/old/3.3.5a/2011_02_22_00_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_22_01_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_22_02_world_conditions.sql
 create mode 100644 sql/old/3.3.5a/2011_02_22_03_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_22_04_world_vehicle_accessory.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_22_1_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_22_2_world_conditions.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_22_3_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_22_4_world_vehicle_accessory.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_01_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_02_world_conditions.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_03_world_vehicle_accessory.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_04_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_05_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_06_world_creatures.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_07_world_misc.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_07_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_08_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_23_09_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_1_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_2_world_conditions.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_3_world_vehicle_accessory.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_4_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_5_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_6_world_creatures.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_7_world_misc.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_8_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_23_9_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_02_24_00_characters_account_data.sql
 create mode 100644 sql/old/3.3.5a/2011_02_24_01_characters_character_tutorial.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_24_0_characters_account_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_24_1_characters_character_tutorial.sql
 create mode 100644 sql/old/3.3.5a/2011_02_25_00_world_creatures.sql
 create mode 100644 sql/old/3.3.5a/2011_02_25_01_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_02_25_02_world_spell_proc_event.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_25_0_world_creatures.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_25_1_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_25_2_world_spell_proc_event.sql
 create mode 100644 sql/old/3.3.5a/2011_02_26_00_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_26_01_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_26_02_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_26_03_world_creatures.sql
 create mode 100644 sql/old/3.3.5a/2011_02_26_04_world_spell_linked_spell.sql
 create mode 100644 sql/old/3.3.5a/2011_02_26_05_world_npc_spellclick_spells.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_26_0_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_26_1_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_26_2_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_26_3_world_creatures.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_26_4_world_spell_linked_spell.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_26_5_world_npc_spellclick_spells.sql
 create mode 100644 sql/old/3.3.5a/2011_02_27_00_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_27_01_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_27_02_world_npc_spellclick_spells.sql
 create mode 100644 sql/old/3.3.5a/2011_02_27_03_world_npc_spellclick_spells.sql
 create mode 100644 sql/old/3.3.5a/2011_02_27_04_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_27_0_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_27_1_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_27_2_world_npc_spellclick_spells.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_27_3_world_npc_spellclick_spells.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_27_4_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_00_world_npc_spellclick_spells.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_01_world_quest_start_scripts.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_02_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_03_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_04_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_05_world_vehicles.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_06_world_gameobject.sql
 create mode 100644 sql/old/3.3.5a/2011_02_28_07_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_0_world_npc_spellclick_spells.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_1_world_quest_start_scripts.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_2_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_3_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_4_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql
 delete mode 100644 sql/old/3.3.5a/2011_02_28_7_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_03_01_01_world_conditions.sql
 create mode 100644 sql/old/3.3.5a/2011_03_01_02_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_03_01_03_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_03_01_03_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_03_01_04_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_03_01_05_world_npc_trainer.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_01_1_world_conditions.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_01_2_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_01_3_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_01_4_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql
 create mode 100644 sql/old/3.3.5a/2011_03_02_00_world_creature_template.sql
 create mode 100644 sql/old/3.3.5a/2011_03_02_01_world_achievement_reward.sql
 create mode 100644 sql/old/3.3.5a/2011_03_02_02_world_waypoint_data.sql
 create mode 100644 sql/old/3.3.5a/2011_03_02_03_world_gossip_menu.sql
 create mode 100644 sql/old/3.3.5a/2011_03_02_04_world_waypoint_data.sql
 create mode 100644 sql/old/3.3.5a/2011_03_02_05_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_03_02_06_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_02_0_world_creature_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_02_1_world_achievement_reward.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_02_2_world_waypoint_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_02_4_world_waypoint_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_02_5_world_sai.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_02_6_world_sai.sql
 create mode 100644 sql/old/3.3.5a/2011_03_04_00_world_skill_discovery_template.sql
 create mode 100644 sql/old/3.3.5a/2011_03_04_01_world_npc_spellclick_spells.sql
 create mode 100644 sql/old/3.3.5a/2011_03_04_01_world_vehicle_accessory.sql
 create mode 100644 sql/old/3.3.5a/2011_03_04_02_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_03_04_03_world_gameobject.sql
 create mode 100644 sql/old/3.3.5a/2011_03_04_04_world_scriptname.sql
 create mode 100644 sql/old/3.3.5a/2011_03_04_04_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_04_0_world_skill_discovery_template.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_04_1_world_npc_spellclick_spells.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_04_1_world_vehicle_accessory.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_04_2_world_spell_script_names.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_04_4_world_spell_script_names.sql
 create mode 100644 sql/old/3.3.5a/2011_03_05_00_world_waypoint_data.sql
 delete mode 100644 sql/old/3.3.5a/2011_03_05_0_world_waypoint_data.sql

(limited to 'sql/old')

diff --git a/sql/old/3.3.5a/2011_01_06_00_world_scriptname.sql b/sql/old/3.3.5a/2011_01_06_00_world_scriptname.sql
new file mode 100644
index 00000000000..3de65d244bb
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_06_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='mob_SonOfFlame' WHERE `entry`=12143;
diff --git a/sql/old/3.3.5a/2011_01_06_01_world_scriptname.sql b/sql/old/3.3.5a/2011_01_06_01_world_scriptname.sql
new file mode 100644
index 00000000000..9d5c8a3f19f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_06_01_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_brunnhildar_prisoner' WHERE `entry`=29639;
diff --git a/sql/old/3.3.5a/2011_01_06_02_world_scriptname.sql b/sql/old/3.3.5a/2011_01_06_02_world_scriptname.sql
new file mode 100644
index 00000000000..8fcf3be4d09
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_06_02_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_jungle_punch_target' WHERE `entry` IN(27986,28047,28568);
diff --git a/sql/old/3.3.5a/2011_01_06_0_world_scriptname.sql b/sql/old/3.3.5a/2011_01_06_0_world_scriptname.sql
deleted file mode 100644
index 3de65d244bb..00000000000
--- a/sql/old/3.3.5a/2011_01_06_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='mob_SonOfFlame' WHERE `entry`=12143;
diff --git a/sql/old/3.3.5a/2011_01_06_1_world_scriptname.sql b/sql/old/3.3.5a/2011_01_06_1_world_scriptname.sql
deleted file mode 100644
index 9d5c8a3f19f..00000000000
--- a/sql/old/3.3.5a/2011_01_06_1_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_brunnhildar_prisoner' WHERE `entry`=29639;
diff --git a/sql/old/3.3.5a/2011_01_06_2_world_scriptname.sql b/sql/old/3.3.5a/2011_01_06_2_world_scriptname.sql
deleted file mode 100644
index 8fcf3be4d09..00000000000
--- a/sql/old/3.3.5a/2011_01_06_2_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_jungle_punch_target' WHERE `entry` IN(27986,28047,28568);
diff --git a/sql/old/3.3.5a/2011_01_08_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_08_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..8d3e7197b48
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_08_00_world_spell_script_names.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (62521,62524,62525);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(62521,'spell_attuned_to_nature_dose_reduction'),
+(62524,'spell_attuned_to_nature_dose_reduction'),
+(62525,'spell_attuned_to_nature_dose_reduction');
diff --git a/sql/old/3.3.5a/2011_01_08_01_world_scriptname.sql b/sql/old/3.3.5a/2011_01_08_01_world_scriptname.sql
new file mode 100644
index 00000000000..aade302cbe1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_08_01_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='npc_right_arm' WHERE `entry`=32934;
+UPDATE `creature_template` SET `ScriptName`='npc_left_arm' WHERE `entry`=32933;
diff --git a/sql/old/3.3.5a/2011_01_08_02_world_scriptname.sql b/sql/old/3.3.5a/2011_01_08_02_world_scriptname.sql
new file mode 100644
index 00000000000..8c35e0d3712
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_08_02_world_scriptname.sql
@@ -0,0 +1,30 @@
+DELETE FROM spell_script_names WHERE spell_id IN (66630,66637,66656);
+INSERT INTO spell_script_names (spell_id,ScriptName) VALUES 
+(66630,'spell_gen_gunship_portal'),
+(66637,'spell_gen_gunship_portal'),
+(66656,'spell_gen_parachute_ic');
+
+-- Achievement Mine
+DELETE FROM `achievement_criteria_data` WHERE criteria_id IN (12062,12063,12064,12065);
+INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES
+(12062,11,'achievement_bg_control_all_nodes'),
+(12063,11,'achievement_bg_control_all_nodes'),
+(12064,11,'achievement_bg_control_all_nodes'),
+(12065,11,'achievement_bg_control_all_nodes');
+
+-- Achievement Four Car Garage
+UPDATE `creature_template` SET `ScriptName`='npc_four_car_garage' WHERE `entry` IN (34802,34793,34775,35069,34776);
+
+-- Achievement Glaive Grave
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12183;
+INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES (12183,11,'achievement_bg_ic_glaive_grave');
+
+-- Achievement Mowed Down
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12068;
+INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES (12068,11,'achievement_bg_ic_mowed_down');
+
+-- Achievement Resource Glut
+DELETE FROM `achievement_criteria_data` WHERE criteria_id IN (12060,12061);
+INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES
+(12060,11,'achievement_bg_ic_resource_glut'),
+(12061,11,'achievement_bg_ic_resource_glut');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_08_03_world_trinity_strings.sql b/sql/old/3.3.5a/2011_01_08_03_world_trinity_strings.sql
new file mode 100644
index 00000000000..39c66ba9e41
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_08_03_world_trinity_strings.sql
@@ -0,0 +1,23 @@
+-- strings used by the BG
+DELETE FROM trinity_string WHERE entry > 1204 AND entry <1225;
+INSERT INTO trinity_string (`entry`,`content_default`) VALUES
+(1205,'The battle will begin in two minutes.'),
+(1206,'The battle will begin in 1 minute.'),
+(1208,'The battle has begun!'),
+(1207,'The battle will begin in 30 seconds!'),
+(1209,'the alliance keep'),
+(1210,'the horde keep'),
+(1211,'%s wins!'),
+(1212,'The west gate of %s is destroyed!'),
+(1213,'The east gate of %s is destroyed!'),
+(1214,'The south gate of %s is destroyed!'),
+(1215,'The north gate of %s is destroyed!'),
+(1216,'$n has assaulted the %s'),
+(1217,'$n has defended the %s'),
+(1218,'$n claims the %s! If left unchallenged, the %s will control it in 1 minute!'),
+(1219,'The %s has taken the %s'),
+(1220,'Workshop'),
+(1221,'Docks'),
+(1222,'Refinery'),
+(1223,'Quarry'),
+(1224,'Hangar');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_08_04_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_08_04_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..958d533c14c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_08_04_world_spell_linked_spell.sql
@@ -0,0 +1,7 @@
+-- Spells from teleporters
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (66548, 66549, 66550, 66551);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(66548, 66550, 0, 'Isle of Conquest (IN>OUT)'),
+(66549, 66551, 0, 'Isle of Conquest (OUT>IN)'),
+(66551, -66548, 2, 'Isle of Conquest Teleport (OUT>IN) Debuff limit'),
+(66550, -66549, 2, 'Isle of Conquest Teleport (IN>OUT) Debuff limit');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_08_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_08_0_world_spell_script_names.sql
deleted file mode 100644
index 8d3e7197b48..00000000000
--- a/sql/old/3.3.5a/2011_01_08_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (62521,62524,62525);
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(62521,'spell_attuned_to_nature_dose_reduction'),
-(62524,'spell_attuned_to_nature_dose_reduction'),
-(62525,'spell_attuned_to_nature_dose_reduction');
diff --git a/sql/old/3.3.5a/2011_01_08_1_world_scriptname.sql b/sql/old/3.3.5a/2011_01_08_1_world_scriptname.sql
deleted file mode 100644
index aade302cbe1..00000000000
--- a/sql/old/3.3.5a/2011_01_08_1_world_scriptname.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_right_arm' WHERE `entry`=32934;
-UPDATE `creature_template` SET `ScriptName`='npc_left_arm' WHERE `entry`=32933;
diff --git a/sql/old/3.3.5a/2011_01_08_2_world_scriptname.sql b/sql/old/3.3.5a/2011_01_08_2_world_scriptname.sql
deleted file mode 100644
index 8c35e0d3712..00000000000
--- a/sql/old/3.3.5a/2011_01_08_2_world_scriptname.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-DELETE FROM spell_script_names WHERE spell_id IN (66630,66637,66656);
-INSERT INTO spell_script_names (spell_id,ScriptName) VALUES 
-(66630,'spell_gen_gunship_portal'),
-(66637,'spell_gen_gunship_portal'),
-(66656,'spell_gen_parachute_ic');
-
--- Achievement Mine
-DELETE FROM `achievement_criteria_data` WHERE criteria_id IN (12062,12063,12064,12065);
-INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES
-(12062,11,'achievement_bg_control_all_nodes'),
-(12063,11,'achievement_bg_control_all_nodes'),
-(12064,11,'achievement_bg_control_all_nodes'),
-(12065,11,'achievement_bg_control_all_nodes');
-
--- Achievement Four Car Garage
-UPDATE `creature_template` SET `ScriptName`='npc_four_car_garage' WHERE `entry` IN (34802,34793,34775,35069,34776);
-
--- Achievement Glaive Grave
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12183;
-INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES (12183,11,'achievement_bg_ic_glaive_grave');
-
--- Achievement Mowed Down
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12068;
-INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES (12068,11,'achievement_bg_ic_mowed_down');
-
--- Achievement Resource Glut
-DELETE FROM `achievement_criteria_data` WHERE criteria_id IN (12060,12061);
-INSERT INTO `achievement_criteria_data` (criteria_id,type,ScriptName) VALUES
-(12060,11,'achievement_bg_ic_resource_glut'),
-(12061,11,'achievement_bg_ic_resource_glut');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_08_3_world_trinity_strings.sql b/sql/old/3.3.5a/2011_01_08_3_world_trinity_strings.sql
deleted file mode 100644
index 39c66ba9e41..00000000000
--- a/sql/old/3.3.5a/2011_01_08_3_world_trinity_strings.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- strings used by the BG
-DELETE FROM trinity_string WHERE entry > 1204 AND entry <1225;
-INSERT INTO trinity_string (`entry`,`content_default`) VALUES
-(1205,'The battle will begin in two minutes.'),
-(1206,'The battle will begin in 1 minute.'),
-(1208,'The battle has begun!'),
-(1207,'The battle will begin in 30 seconds!'),
-(1209,'the alliance keep'),
-(1210,'the horde keep'),
-(1211,'%s wins!'),
-(1212,'The west gate of %s is destroyed!'),
-(1213,'The east gate of %s is destroyed!'),
-(1214,'The south gate of %s is destroyed!'),
-(1215,'The north gate of %s is destroyed!'),
-(1216,'$n has assaulted the %s'),
-(1217,'$n has defended the %s'),
-(1218,'$n claims the %s! If left unchallenged, the %s will control it in 1 minute!'),
-(1219,'The %s has taken the %s'),
-(1220,'Workshop'),
-(1221,'Docks'),
-(1222,'Refinery'),
-(1223,'Quarry'),
-(1224,'Hangar');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_08_4_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_08_4_world_spell_linked_spell.sql
deleted file mode 100644
index 958d533c14c..00000000000
--- a/sql/old/3.3.5a/2011_01_08_4_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Spells from teleporters
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (66548, 66549, 66550, 66551);
-INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
-(66548, 66550, 0, 'Isle of Conquest (IN>OUT)'),
-(66549, 66551, 0, 'Isle of Conquest (OUT>IN)'),
-(66551, -66548, 2, 'Isle of Conquest Teleport (OUT>IN) Debuff limit'),
-(66550, -66549, 2, 'Isle of Conquest Teleport (IN>OUT) Debuff limit');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_09_00_world_scriptname.sql b/sql/old/3.3.5a/2011_01_09_00_world_scriptname.sql
new file mode 100644
index 00000000000..ad34c7281dd
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_09_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_four_car_garage' WHERE `entry`=35273;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_09_0_world_scriptname.sql b/sql/old/3.3.5a/2011_01_09_0_world_scriptname.sql
deleted file mode 100644
index ad34c7281dd..00000000000
--- a/sql/old/3.3.5a/2011_01_09_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_four_car_garage' WHERE `entry`=35273;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_10_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_10_00_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..aea063c7505
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_10_00_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=58875 AND `spell_effect`=58876;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(58875,58876,1, 'Spirit Walk');
diff --git a/sql/old/3.3.5a/2011_01_10_0_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_10_0_world_spell_linked_spell.sql
deleted file mode 100644
index aea063c7505..00000000000
--- a/sql/old/3.3.5a/2011_01_10_0_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=58875 AND `spell_effect`=58876;
-INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
-(58875,58876,1, 'Spirit Walk');
diff --git a/sql/old/3.3.5a/2011_01_16_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_16_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..2d0c1f28efd
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_16_00_world_spell_script_names.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_marrowgar_coldflame_trigger';
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (69146,70823,70824,70825) AND `ScriptName`='spell_marrowgar_coldflame_damage';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(69146,'spell_marrowgar_coldflame_damage'),
+(70823,'spell_marrowgar_coldflame_damage'),
+(70824,'spell_marrowgar_coldflame_damage'),
+(70825,'spell_marrowgar_coldflame_damage');
diff --git a/sql/old/3.3.5a/2011_01_16_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_16_0_world_spell_script_names.sql
deleted file mode 100644
index 2d0c1f28efd..00000000000
--- a/sql/old/3.3.5a/2011_01_16_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_marrowgar_coldflame_trigger';
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (69146,70823,70824,70825) AND `ScriptName`='spell_marrowgar_coldflame_damage';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(69146,'spell_marrowgar_coldflame_damage'),
-(70823,'spell_marrowgar_coldflame_damage'),
-(70824,'spell_marrowgar_coldflame_damage'),
-(70825,'spell_marrowgar_coldflame_damage');
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_account_data.sql b/sql/old/3.3.5a/2011_01_19_00_characters_account_data.sql
new file mode 100644
index 00000000000..26e465268d6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_account_data.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `account_data` 
+CHANGE `account` `account` INT(10) UNSIGNED DEFAULT '0' NOT NULL, 
+CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, 
+CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `data` `data` BLOB NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_addons.sql b/sql/old/3.3.5a/2011_01_19_00_characters_addons.sql
new file mode 100644
index 00000000000..90ebbce5613
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_addons.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `addons` 
+ROW_FORMAT=DEFAULT,
+CHANGE `crc` `crc` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_arena_team.sql b/sql/old/3.3.5a/2011_01_19_00_characters_arena_team.sql
new file mode 100644
index 00000000000..5942e008bb5
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_arena_team.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `arena_team` 
+CHANGE `name` `name` VARCHAR(24) NOT NULL,
+CHANGE `EmblemStyle` `EmblemStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BorderStyle` `BorderStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_auctionhouse.sql b/sql/old/3.3.5a/2011_01_19_00_characters_auctionhouse.sql
new file mode 100644
index 00000000000..20719a2ca61
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_auctionhouse.sql
@@ -0,0 +1,11 @@
+ALTER TABLE `auctionhouse`
+CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `auctioneerguid` `auctioneerguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `itemguid` `itemguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `itemowner` `itemowner` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `buyoutprice` `buyoutprice` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `buyguid` `buyguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `lastbid` `lastbid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `startbid` `startbid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `deposit` `deposit` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_bugreport.sql b/sql/old/3.3.5a/2011_01_19_00_characters_bugreport.sql
new file mode 100644
index 00000000000..1ceb0abe429
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_bugreport.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `bugreport`
+ROW_FORMAT=DEFAULT,
+CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_channels.sql b/sql/old/3.3.5a/2011_01_19_00_characters_channels.sql
new file mode 100644
index 00000000000..cd70f39e30f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_channels.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `channels`
+ROW_FORMAT=DEFAULT,
+CHANGE `BannedList` `BannedList` TEXT,
+DROP PRIMARY KEY, 
+ADD PRIMARY KEY (`m_name`, `m_team`);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_account_data.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_account_data.sql
new file mode 100644
index 00000000000..bf5898266d7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_account_data.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_account_data`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `data` `data` BLOB NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_achievement.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_achievement.sql
new file mode 100644
index 00000000000..cbfc6e95aa8
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_achievement.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `character_achievement`
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `achievement` `achievement` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `date` `date` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_achievement_progress.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_achievement_progress.sql
new file mode 100644
index 00000000000..ba91258f82d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_achievement_progress.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_achievement_progress`
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `criteria` `criteria` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `counter` `counter` INT(10) UNSIGNED NOT NULL,
+CHANGE `date` `date` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_action.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_action.sql
new file mode 100644
index 00000000000..d2d235e270c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_action.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `character_action`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `action` `action` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_arena_stats.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_arena_stats.sql
new file mode 100644
index 00000000000..e68048d2f0e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_arena_stats.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `character_arena_stats`
+ENGINE=InnoDB,
+CHANGE `slot` `slot` TINYINT(3) NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_aura.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_aura.sql
new file mode 100644
index 00000000000..072c88235e7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_aura.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `character_aura`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_banned.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_banned.sql
new file mode 100644
index 00000000000..da3d46d9929
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_banned.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `character_banned`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Account id',
+CHANGE `bandate` `bandate` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `unbandate` `unbandate` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `active` `active` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_data.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_data.sql
new file mode 100644
index 00000000000..09f24ed8bf9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_data.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `character_battleground_data`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `instance_id` `instance_id` INT(10) UNSIGNED NOT NULL, 
+CHANGE `team` `team` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `join_map` `join_map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `taxi_start` `taxi_start` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `taxi_end` `taxi_end` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `mount_spell` `mount_spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_random.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_random.sql
new file mode 100644
index 00000000000..cf76a17fc0c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_battleground_random.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `character_battleground_random`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_declinedname.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_declinedname.sql
new file mode 100644
index 00000000000..912db55712b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_declinedname.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `character_declinedname`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_equipmentsets.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_equipmentsets.sql
new file mode 100644
index 00000000000..3f4fe76d189
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_equipmentsets.sql
@@ -0,0 +1,23 @@
+ALTER TABLE `character_equipmentsets`
+CHANGE `guid` `guid` INT(10) DEFAULT '0' NOT NULL,
+CHANGE `setindex` `setindex` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `name` `name` VARCHAR(31) NOT NULL,
+CHANGE `item0` `item0` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item1` `item1` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item2` `item2` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item3` `item3` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item4` `item4` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item5` `item5` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item6` `item6` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item7` `item7` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item8` `item8` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item9` `item9` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item10` `item10` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item11` `item11` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item12` `item12` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item13` `item13` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item14` `item14` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item15` `item15` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item16` `item16` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item17` `item17` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
+CHANGE `item18` `item18` INT(10) UNSIGNED NOT NULL DEFAULT '0';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_gifts.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_gifts.sql
new file mode 100644
index 00000000000..2012eb96315
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_gifts.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_gifts`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `item_guid` `item_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `entry` `entry` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `flags` `flags` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_glyphs.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_glyphs.sql
new file mode 100644
index 00000000000..73bb65f4ef9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_glyphs.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `character_glyphs`
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `glyph1` `glyph1` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `glyph2` `glyph2` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
+CHANGE `glyph3` `glyph3` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
+CHANGE `glyph4` `glyph4` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
+CHANGE `glyph5` `glyph5` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
+CHANGE `glyph6` `glyph6` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_homebind.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_homebind.sql
new file mode 100644
index 00000000000..49c450011fc
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_homebind.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_homebind`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Map Identifier',
+CHANGE `zone` `zone` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Zone Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_instance.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_instance.sql
new file mode 100644
index 00000000000..aba0047f7e1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_instance.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `character_instance`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `permanent` `permanent` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_inventory.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_inventory.sql
new file mode 100644
index 00000000000..aca08d1ec38
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_inventory.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_inventory`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `bag` `bag` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `item` `item` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Item Global Unique Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_pet.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_pet.sql
new file mode 100644
index 00000000000..51a4c7e0260
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_pet.sql
@@ -0,0 +1,20 @@
+ALTER TABLE `character_pet`
+ROW_FORMAT=DEFAULT,
+CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `entry` `entry` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `owner` `owner` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `modelid` `modelid` INT(10) UNSIGNED DEFAULT '0' NULL ,
+CHANGE `CreatedBySpell` `CreatedBySpell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `level` `level` SMALLINT(5) UNSIGNED DEFAULT '1' NOT NULL,
+CHANGE `exp` `exp` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `Reactstate` `Reactstate` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `name` `name` VARCHAR(21) DEFAULT 'Pet' NOT NULL,
+CHANGE `renamed` `renamed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `slot` `slot` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `curhealth` `curhealth` INT(10) UNSIGNED DEFAULT '1' NOT NULL,
+CHANGE `curmana` `curmana` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `curhappiness` `curhappiness` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `savetime` `savetime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `resettalents_cost` `resettalents_cost` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `resettalents_time` `resettalents_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `abdata` `abdata` TEXT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_pet_declinedname.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_pet_declinedname.sql
new file mode 100644
index 00000000000..f0adc06c763
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_pet_declinedname.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `character_pet_declinedname`
+ROW_FORMAT=DEFAULT,
+CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `owner` `owner` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus.sql
new file mode 100644
index 00000000000..4bc7eddd39a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus.sql
@@ -0,0 +1,15 @@
+ALTER TABLE `character_queststatus`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `quest` `quest` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Quest Identifier',
+CHANGE `status` `status` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `explored` `explored` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `timer` `timer` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `mobcount1` `mobcount1` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `mobcount2` `mobcount2` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `mobcount3` `mobcount3` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `mobcount4` `mobcount4` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `itemcount1` `itemcount1` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `itemcount2` `itemcount2` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `itemcount3` `itemcount3` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `itemcount4` `itemcount4` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_daily.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_daily.sql
new file mode 100644
index 00000000000..334123e8df6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_daily.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_queststatus_daily`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `quest` `quest` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Quest Identifier',
+CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_weekly.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_weekly.sql
new file mode 100644
index 00000000000..fcf54ce0c14
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_queststatus_weekly.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `character_queststatus_weekly`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `quest` `quest` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Quest Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_reputation.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_reputation.sql
new file mode 100644
index 00000000000..04acd20bd6c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_reputation.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_reputation`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `faction` `faction` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `flags` `flags` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_skills.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_skills.sql
new file mode 100644
index 00000000000..99bd2e754aa
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_skills.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `character_skills`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `skill` `skill` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `value` `value` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `max` `max` SMALLINT(5) UNSIGNED NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_social.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_social.sql
new file mode 100644
index 00000000000..54a605b0de7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_social.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `character_social`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
+CHANGE `friend` `friend` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Friend Global Unique Identifier',
+CHANGE `flags` `flags` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Friend Flags',
+DROP INDEX `guid`,
+DROP INDEX `guid_flags`,
+DROP INDEX `friend_flags`;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_spell.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_spell.sql
new file mode 100644
index 00000000000..cbc8b45c677
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_spell.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `character_spell`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_spell_cooldown.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_spell_cooldown.sql
new file mode 100644
index 00000000000..f4558168bcb
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_spell_cooldown.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `character_spell_cooldown`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier, Low part',
+CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier',
+CHANGE `item` `item` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Item Identifier',
+CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_stats.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_stats.sql
new file mode 100644
index 00000000000..5cf885950c3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_stats.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `character_stats`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier, Low part';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_talent.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_talent.sql
new file mode 100644
index 00000000000..47c7bd1ade0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_talent.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `character_talent`
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_character_tutorial.sql b/sql/old/3.3.5a/2011_01_19_00_characters_character_tutorial.sql
new file mode 100644
index 00000000000..17e54576050
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_character_tutorial.sql
@@ -0,0 +1,15 @@
+ALTER TABLE `character_tutorial`
+ROW_FORMAT=DEFAULT,
+CHANGE `account` `account` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Account Identifier',
+DROP PRIMARY KEY, 
+ADD PRIMARY KEY (`account`),
+DROP `realmid`,
+CHANGE `tut0` `tut0` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `tut1` `tut1` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `tut2` `tut2` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `tut3` `tut3` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `tut4` `tut4` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `tut5` `tut5` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `tut6` `tut6` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `tut7` `tut7` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+DROP KEY `acc_key`;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_characters.sql b/sql/old/3.3.5a/2011_01_19_00_characters_characters.sql
new file mode 100644
index 00000000000..08cf4c0d630
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_characters.sql
@@ -0,0 +1,23 @@
+ALTER TABLE `characters`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `account` `account` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Account Identifier',
+CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Map Identifier',
+CHANGE `instance_id` `instance_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance_mode_mask` `instance_mode_mask` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `taximask` `taximask` TEXT NOT NULL,
+CHANGE `totaltime` `totaltime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `leveltime` `leveltime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `logout_time` `logout_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `resettalents_cost` `resettalents_cost` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `resettalents_time` `resettalents_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `transguid` `transguid` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `extra_flags` `extra_flags` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `stable_slots` `stable_slots` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `at_login` `at_login` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `zone` `zone` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `death_expire_time` `death_expire_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `watchedFaction` `watchedFaction` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `latency` `latency` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `deleteInfos_Account` `deleteInfos_Account` INT(10) UNSIGNED NULL ,
+CHANGE `deleteDate` `deleteDate` INT(10) UNSIGNED NULL ;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_corpse.sql b/sql/old/3.3.5a/2011_01_19_00_characters_corpse.sql
new file mode 100644
index 00000000000..9902583b5cb
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_corpse.sql
@@ -0,0 +1,11 @@
+ALTER TABLE `corpse`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `player` `player` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
+DROP COLUMN `zone`,
+CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Map Identifier',
+CHANGE `phaseMask` `phaseMask` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL,
+CHANGE `flags` `flags` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `dynFlags` `dynFlags` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_creature_respawn.sql b/sql/old/3.3.5a/2011_01_19_00_characters_creature_respawn.sql
new file mode 100644
index 00000000000..eb476844361
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_creature_respawn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `creature_respawn`
+CHANGE `respawntime` `respawntime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_00_characters_game_event_condition_save.sql b/sql/old/3.3.5a/2011_01_19_00_characters_game_event_condition_save.sql
new file mode 100644
index 00000000000..06dec4e9ead
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_19_00_characters_game_event_condition_save.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `game_event_condition_save`
+CHANGE `event_id` `event_id` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `condition_id` `condition_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_account_data.sql b/sql/old/3.3.5a/2011_01_19_0_characters_account_data.sql
deleted file mode 100644
index 26e465268d6..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_account_data.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `account_data` 
-CHANGE `account` `account` INT(10) UNSIGNED DEFAULT '0' NOT NULL, 
-CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, 
-CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `data` `data` BLOB NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_addons.sql b/sql/old/3.3.5a/2011_01_19_0_characters_addons.sql
deleted file mode 100644
index 90ebbce5613..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_addons.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `addons` 
-ROW_FORMAT=DEFAULT,
-CHANGE `crc` `crc` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_arena_team.sql b/sql/old/3.3.5a/2011_01_19_0_characters_arena_team.sql
deleted file mode 100644
index 5942e008bb5..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_arena_team.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `arena_team` 
-CHANGE `name` `name` VARCHAR(24) NOT NULL,
-CHANGE `EmblemStyle` `EmblemStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `BorderStyle` `BorderStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_auctionhouse.sql b/sql/old/3.3.5a/2011_01_19_0_characters_auctionhouse.sql
deleted file mode 100644
index 20719a2ca61..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_auctionhouse.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE `auctionhouse`
-CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `auctioneerguid` `auctioneerguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `itemguid` `itemguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `itemowner` `itemowner` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `buyoutprice` `buyoutprice` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `buyguid` `buyguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `lastbid` `lastbid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `startbid` `startbid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `deposit` `deposit` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_bugreport.sql b/sql/old/3.3.5a/2011_01_19_0_characters_bugreport.sql
deleted file mode 100644
index 1ceb0abe429..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_bugreport.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `bugreport`
-ROW_FORMAT=DEFAULT,
-CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_channels.sql b/sql/old/3.3.5a/2011_01_19_0_characters_channels.sql
deleted file mode 100644
index cd70f39e30f..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_channels.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `channels`
-ROW_FORMAT=DEFAULT,
-CHANGE `BannedList` `BannedList` TEXT,
-DROP PRIMARY KEY, 
-ADD PRIMARY KEY (`m_name`, `m_team`);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_account_data.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_account_data.sql
deleted file mode 100644
index bf5898266d7..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_account_data.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_account_data`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `data` `data` BLOB NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_achievement.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_achievement.sql
deleted file mode 100644
index cbfc6e95aa8..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_achievement.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `character_achievement`
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
-CHANGE `achievement` `achievement` SMALLINT(5) UNSIGNED NOT NULL,
-CHANGE `date` `date` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_achievement_progress.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_achievement_progress.sql
deleted file mode 100644
index ba91258f82d..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_achievement_progress.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_achievement_progress`
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
-CHANGE `criteria` `criteria` SMALLINT(5) UNSIGNED NOT NULL,
-CHANGE `counter` `counter` INT(10) UNSIGNED NOT NULL,
-CHANGE `date` `date` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_action.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_action.sql
deleted file mode 100644
index d2d235e270c..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_action.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `character_action`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `action` `action` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_arena_stats.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_arena_stats.sql
deleted file mode 100644
index e68048d2f0e..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_arena_stats.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `character_arena_stats`
-ENGINE=InnoDB,
-CHANGE `slot` `slot` TINYINT(3) NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_aura.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_aura.sql
deleted file mode 100644
index 072c88235e7..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_aura.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `character_aura`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_banned.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_banned.sql
deleted file mode 100644
index da3d46d9929..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_banned.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `character_banned`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Account id',
-CHANGE `bandate` `bandate` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `unbandate` `unbandate` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `active` `active` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_data.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_data.sql
deleted file mode 100644
index 09f24ed8bf9..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_data.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE `character_battleground_data`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `instance_id` `instance_id` INT(10) UNSIGNED NOT NULL, 
-CHANGE `team` `team` SMALLINT(5) UNSIGNED NOT NULL,
-CHANGE `join_map` `join_map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `taxi_start` `taxi_start` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `taxi_end` `taxi_end` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `mount_spell` `mount_spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_random.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_random.sql
deleted file mode 100644
index cf76a17fc0c..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_battleground_random.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `character_battleground_random`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_declinedname.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_declinedname.sql
deleted file mode 100644
index 912db55712b..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_declinedname.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `character_declinedname`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_equipmentsets.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_equipmentsets.sql
deleted file mode 100644
index 3f4fe76d189..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_equipmentsets.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-ALTER TABLE `character_equipmentsets`
-CHANGE `guid` `guid` INT(10) DEFAULT '0' NOT NULL,
-CHANGE `setindex` `setindex` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `name` `name` VARCHAR(31) NOT NULL,
-CHANGE `item0` `item0` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item1` `item1` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item2` `item2` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item3` `item3` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item4` `item4` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item5` `item5` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item6` `item6` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item7` `item7` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item8` `item8` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item9` `item9` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item10` `item10` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item11` `item11` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item12` `item12` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item13` `item13` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item14` `item14` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item15` `item15` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item16` `item16` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item17` `item17` INT(10) UNSIGNED NOT NULL DEFAULT '0', 
-CHANGE `item18` `item18` INT(10) UNSIGNED NOT NULL DEFAULT '0';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_gifts.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_gifts.sql
deleted file mode 100644
index 2012eb96315..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_gifts.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_gifts`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `item_guid` `item_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `entry` `entry` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `flags` `flags` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_glyphs.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_glyphs.sql
deleted file mode 100644
index 73bb65f4ef9..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_glyphs.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `character_glyphs`
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
-CHANGE `glyph1` `glyph1` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `glyph2` `glyph2` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
-CHANGE `glyph3` `glyph3` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
-CHANGE `glyph4` `glyph4` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
-CHANGE `glyph5` `glyph5` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ,
-CHANGE `glyph6` `glyph6` SMALLINT(5) UNSIGNED DEFAULT '0' NULL ;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_homebind.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_homebind.sql
deleted file mode 100644
index 49c450011fc..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_homebind.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_homebind`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Map Identifier',
-CHANGE `zone` `zone` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Zone Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_instance.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_instance.sql
deleted file mode 100644
index aba0047f7e1..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_instance.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `character_instance`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `permanent` `permanent` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_inventory.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_inventory.sql
deleted file mode 100644
index aca08d1ec38..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_inventory.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_inventory`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `bag` `bag` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `item` `item` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Item Global Unique Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_pet.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_pet.sql
deleted file mode 100644
index 51a4c7e0260..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_pet.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-ALTER TABLE `character_pet`
-ROW_FORMAT=DEFAULT,
-CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `entry` `entry` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `owner` `owner` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `modelid` `modelid` INT(10) UNSIGNED DEFAULT '0' NULL ,
-CHANGE `CreatedBySpell` `CreatedBySpell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `level` `level` SMALLINT(5) UNSIGNED DEFAULT '1' NOT NULL,
-CHANGE `exp` `exp` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `Reactstate` `Reactstate` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `name` `name` VARCHAR(21) DEFAULT 'Pet' NOT NULL,
-CHANGE `renamed` `renamed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `slot` `slot` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `curhealth` `curhealth` INT(10) UNSIGNED DEFAULT '1' NOT NULL,
-CHANGE `curmana` `curmana` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `curhappiness` `curhappiness` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `savetime` `savetime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `resettalents_cost` `resettalents_cost` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `resettalents_time` `resettalents_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `abdata` `abdata` TEXT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_pet_declinedname.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_pet_declinedname.sql
deleted file mode 100644
index f0adc06c763..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_pet_declinedname.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `character_pet_declinedname`
-ROW_FORMAT=DEFAULT,
-CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `owner` `owner` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus.sql
deleted file mode 100644
index 4bc7eddd39a..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-ALTER TABLE `character_queststatus`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `quest` `quest` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Quest Identifier',
-CHANGE `status` `status` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `explored` `explored` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `timer` `timer` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `mobcount1` `mobcount1` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `mobcount2` `mobcount2` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `mobcount3` `mobcount3` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `mobcount4` `mobcount4` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `itemcount1` `itemcount1` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `itemcount2` `itemcount2` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `itemcount3` `itemcount3` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `itemcount4` `itemcount4` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_daily.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_daily.sql
deleted file mode 100644
index 334123e8df6..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_daily.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_queststatus_daily`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `quest` `quest` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Quest Identifier',
-CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_weekly.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_weekly.sql
deleted file mode 100644
index fcf54ce0c14..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_queststatus_weekly.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `character_queststatus_weekly`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `quest` `quest` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Quest Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_reputation.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_reputation.sql
deleted file mode 100644
index 04acd20bd6c..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_reputation.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_reputation`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `faction` `faction` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `flags` `flags` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_skills.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_skills.sql
deleted file mode 100644
index 99bd2e754aa..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_skills.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `character_skills`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `skill` `skill` SMALLINT(5) UNSIGNED NOT NULL,
-CHANGE `value` `value` SMALLINT(5) UNSIGNED NOT NULL,
-CHANGE `max` `max` SMALLINT(5) UNSIGNED NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_social.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_social.sql
deleted file mode 100644
index 54a605b0de7..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_social.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `character_social`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
-CHANGE `friend` `friend` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Friend Global Unique Identifier',
-CHANGE `flags` `flags` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Friend Flags',
-DROP INDEX `guid`,
-DROP INDEX `guid_flags`,
-DROP INDEX `friend_flags`;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_spell.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_spell.sql
deleted file mode 100644
index cbc8b45c677..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_spell.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `character_spell`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_spell_cooldown.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_spell_cooldown.sql
deleted file mode 100644
index f4558168bcb..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_spell_cooldown.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `character_spell_cooldown`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier, Low part',
-CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier',
-CHANGE `item` `item` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Item Identifier',
-CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_stats.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_stats.sql
deleted file mode 100644
index 5cf885950c3..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_stats.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `character_stats`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier, Low part';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_talent.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_talent.sql
deleted file mode 100644
index 47c7bd1ade0..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_talent.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `character_talent`
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
-CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_character_tutorial.sql b/sql/old/3.3.5a/2011_01_19_0_characters_character_tutorial.sql
deleted file mode 100644
index 17e54576050..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_character_tutorial.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-ALTER TABLE `character_tutorial`
-ROW_FORMAT=DEFAULT,
-CHANGE `account` `account` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Account Identifier',
-DROP PRIMARY KEY, 
-ADD PRIMARY KEY (`account`),
-DROP `realmid`,
-CHANGE `tut0` `tut0` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `tut1` `tut1` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `tut2` `tut2` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `tut3` `tut3` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `tut4` `tut4` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `tut5` `tut5` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `tut6` `tut6` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `tut7` `tut7` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-DROP KEY `acc_key`;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_characters.sql b/sql/old/3.3.5a/2011_01_19_0_characters_characters.sql
deleted file mode 100644
index 08cf4c0d630..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_characters.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-ALTER TABLE `characters`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `account` `account` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Account Identifier',
-CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Map Identifier',
-CHANGE `instance_id` `instance_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `instance_mode_mask` `instance_mode_mask` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `taximask` `taximask` TEXT NOT NULL,
-CHANGE `totaltime` `totaltime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `leveltime` `leveltime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `logout_time` `logout_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `resettalents_cost` `resettalents_cost` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `resettalents_time` `resettalents_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `transguid` `transguid` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `extra_flags` `extra_flags` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `stable_slots` `stable_slots` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `at_login` `at_login` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `zone` `zone` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `death_expire_time` `death_expire_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `watchedFaction` `watchedFaction` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `latency` `latency` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `deleteInfos_Account` `deleteInfos_Account` INT(10) UNSIGNED NULL ,
-CHANGE `deleteDate` `deleteDate` INT(10) UNSIGNED NULL ;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_corpse.sql b/sql/old/3.3.5a/2011_01_19_0_characters_corpse.sql
deleted file mode 100644
index 9902583b5cb..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_corpse.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE `corpse`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `player` `player` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
-DROP COLUMN `zone`,
-CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Map Identifier',
-CHANGE `phaseMask` `phaseMask` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL,
-CHANGE `flags` `flags` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `dynFlags` `dynFlags` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_creature_respawn.sql b/sql/old/3.3.5a/2011_01_19_0_characters_creature_respawn.sql
deleted file mode 100644
index eb476844361..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_creature_respawn.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `creature_respawn`
-CHANGE `respawntime` `respawntime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_19_0_characters_game_event_condition_save.sql b/sql/old/3.3.5a/2011_01_19_0_characters_game_event_condition_save.sql
deleted file mode 100644
index 06dec4e9ead..00000000000
--- a/sql/old/3.3.5a/2011_01_19_0_characters_game_event_condition_save.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `game_event_condition_save`
-CHANGE `event_id` `event_id` SMALLINT(5) UNSIGNED NOT NULL,
-CHANGE `condition_id` `condition_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_game_event_save.sql b/sql/old/3.3.5a/2011_01_20_00_characters_game_event_save.sql
new file mode 100644
index 00000000000..06cc0976974
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_game_event_save.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `game_event_save`
+CHANGE `event_id` `event_id` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `next_start` `next_start` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_gameobject_respawn.sql b/sql/old/3.3.5a/2011_01_20_00_characters_gameobject_respawn.sql
new file mode 100644
index 00000000000..bf83a59a67e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_gameobject_respawn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `gameobject_respawn`
+CHANGE `respawntime` `respawntime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_gm_subsurveys.sql b/sql/old/3.3.5a/2011_01_20_00_characters_gm_subsurveys.sql
new file mode 100644
index 00000000000..51af89da7f0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_gm_subsurveys.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `gm_subsurveys`
+ROW_FORMAT=DEFAULT,
+CHANGE `surveyid` `surveyid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+CHANGE `subsurveyid` `subsurveyid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `rank` `rank` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `comment` `comment` TEXT NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_gm_surveys.sql b/sql/old/3.3.5a/2011_01_20_00_characters_gm_surveys.sql
new file mode 100644
index 00000000000..93c37b7b45e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_gm_surveys.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `gm_surveys`
+ROW_FORMAT=DEFAULT,
+CHANGE `surveyid` `surveyid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+CHANGE `player` `player` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `mainSurvey` `mainSurvey` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `timestamp` `timestamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_gm_tickets.sql b/sql/old/3.3.5a/2011_01_20_00_characters_gm_tickets.sql
new file mode 100644
index 00000000000..9965797cbf3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_gm_tickets.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `gm_tickets`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+CHANGE `playerGuid` `playerGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `name` `name` VARCHAR(12) NOT NULL,
+CHANGE `createtime` `createtime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `timestamp` `timestamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `closed` `closed` INT(11) DEFAULT '0' NOT NULL,
+CHANGE `assignedto` `assignedto` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `completed` `completed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `escalated` `escalated` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `viewed` `viewed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_group_instance.sql b/sql/old/3.3.5a/2011_01_20_00_characters_group_instance.sql
new file mode 100644
index 00000000000..ae7f6fccf2d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_group_instance.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `group_instance`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `permanent` `permanent` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_group_member.sql b/sql/old/3.3.5a/2011_01_20_00_characters_group_member.sql
new file mode 100644
index 00000000000..03bcbe66b3d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_group_member.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `group_member`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `memberGuid` `memberGuid` INT(10) UNSIGNED NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_groups.sql b/sql/old/3.3.5a/2011_01_20_00_characters_groups.sql
new file mode 100644
index 00000000000..b986d402c8f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_groups.sql
@@ -0,0 +1,17 @@
+ALTER TABLE `groups`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `leaderGuid` `leaderGuid` INT(10) UNSIGNED NOT NULL,
+CHANGE `lootMethod` `lootMethod` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `looterGuid` `looterGuid` INT(10) UNSIGNED NOT NULL,
+CHANGE `lootThreshold` `lootThreshold` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `icon1` `icon1` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon2` `icon2` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon3` `icon3` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon4` `icon4` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon5` `icon5` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon6` `icon6` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon7` `icon7` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon8` `icon8` INT(10) UNSIGNED NOT NULL,
+CHANGE `groupType` `groupType` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `raiddifficulty` `raiddifficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild.sql
new file mode 100644
index 00000000000..89b9df1bf2e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `guild`
+ROW_FORMAT=DEFAULT,
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `name` `name` VARCHAR(24) DEFAULT '' NOT NULL,
+CHANGE `leaderguid` `leaderguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `EmblemStyle` `EmblemStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `EmblemColor` `EmblemColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BorderStyle` `BorderStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BorderColor` `BorderColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BackgroundColor` `BackgroundColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `motd` `motd` VARCHAR(128) DEFAULT '' NOT NULL,
+CHANGE `createdate` `createdate` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BankMoney` `BankMoney` BIGINT(20) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_eventlog.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_eventlog.sql
new file mode 100644
index 00000000000..627020be62f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_eventlog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `guild_bank_eventlog`
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Guild Identificator',
+CHANGE `LogGuid` `LogGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Log record identificator - auxiliary column',
+CHANGE `PlayerGuid` `PlayerGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `ItemOrMoney` `ItemOrMoney` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `ItemStackCount` `ItemStackCount` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `DestTabId` `DestTabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Destination Tab Id',
+CHANGE `TimeStamp` `TimeStamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Event UNIX time';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_item.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_item.sql
new file mode 100644
index 00000000000..d3c0157ff51
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_item.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `guild_bank_item`
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `item_guid` `item_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_right.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_right.sql
new file mode 100644
index 00000000000..9c72527ca5d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_right.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `guild_bank_right`
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `rid` `rid` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `SlotPerDay` `SlotPerDay` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_tab.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_tab.sql
new file mode 100644
index 00000000000..a096a0836cc
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild_bank_tab.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `guild_bank_tab`
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `TabName` `TabName` VARCHAR(16) DEFAULT '' NOT NULL,
+CHANGE `TabText` `TabText` VARCHAR(500) NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild_eventlog.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild_eventlog.sql
new file mode 100644
index 00000000000..cf5f71a347c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild_eventlog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `guild_eventlog`
+CHANGE `guildid` `guildid` INT(10) UNSIGNED NOT NULL COMMENT 'Guild Identificator',
+CHANGE `LogGuid` `LogGuid` INT(10) UNSIGNED NOT NULL COMMENT 'Log record identificator - auxiliary column',
+CHANGE `EventType` `EventType` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Event type',
+CHANGE `PlayerGuid1` `PlayerGuid1` INT(10) UNSIGNED NOT NULL COMMENT 'Player 1',
+CHANGE `PlayerGuid2` `PlayerGuid2` INT(10) UNSIGNED NOT NULL COMMENT 'Player 2',
+CHANGE `NewRank` `NewRank` TINYINT(3) UNSIGNED NOT NULL COMMENT 'New rank(in case promotion/demotion)',
+CHANGE `TimeStamp` `TimeStamp` INT(10) UNSIGNED NOT NULL COMMENT 'Event UNIX time';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild_member.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild_member.sql
new file mode 100644
index 00000000000..f1d2f78727e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild_member.sql
@@ -0,0 +1,21 @@
+ALTER TABLE `guild_member`
+ROW_FORMAT=DEFAULT,
+CHANGE `guildid` `guildid` INT(10) UNSIGNED NOT NULL COMMENT 'Guild Identificator',
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `rank` `rank` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `pnote` `pnote` varchar(31) NOT NULL DEFAULT '',
+CHANGE `offnote` `offnote` varchar(31) NOT NULL DEFAULT '',
+CHANGE `BankResetTimeMoney` `BankResetTimeMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankRemMoney` `BankRemMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankResetTimeTab0` `BankResetTimeTab0` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankRemSlotsTab0` `BankRemSlotsTab0` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankResetTimeTab1` `BankResetTimeTab1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankRemSlotsTab1` `BankRemSlotsTab1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankResetTimeTab2` `BankResetTimeTab2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankRemSlotsTab2` `BankRemSlotsTab2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankResetTimeTab3` `BankResetTimeTab3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankRemSlotsTab3` `BankRemSlotsTab3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankResetTimeTab4` `BankResetTimeTab4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankRemSlotsTab4` `BankRemSlotsTab4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankResetTimeTab5` `BankResetTimeTab5` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `BankRemSlotsTab5` `BankRemSlotsTab5` INT(10) UNSIGNED NOT NULL DEFAULT '0';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_guild_rank.sql b/sql/old/3.3.5a/2011_01_20_00_characters_guild_rank.sql
new file mode 100644
index 00000000000..d3adb4278a7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_guild_rank.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `guild_rank`
+ROW_FORMAT=DEFAULT,
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `rid` `rid` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `rname` `rname` VARCHAR(15) DEFAULT '' NOT NULL,
+CHANGE `rights` `rights` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BankMoneyPerDay` `BankMoneyPerDay` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_instance.sql b/sql/old/3.3.5a/2011_01_20_00_characters_instance.sql
new file mode 100644
index 00000000000..2b1be5718b5
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_instance.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `instance`
+CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `resettime` `resettime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `difficulty` `difficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `data` `data` TINYTEXT NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_instance_reset.sql b/sql/old/3.3.5a/2011_01_20_00_characters_instance_reset.sql
new file mode 100644
index 00000000000..6c72951339d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_instance_reset.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `instance_reset`
+CHANGE `mapid` `mapid` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `difficulty` `difficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `resettime` `resettime` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_item_instance.sql b/sql/old/3.3.5a/2011_01_20_00_characters_item_instance.sql
new file mode 100644
index 00000000000..649f87c4616
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_item_instance.sql
@@ -0,0 +1,10 @@
+ALTER TABLE `item_instance`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `owner_guid` `owner_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `charges` `charges` TINYTEXT,
+CHANGE `duration` `duration` INT(10) DEFAULT '0' NOT NULL,
+CHANGE `flags` `flags` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `randomPropertyId` `randomPropertyId` SMALLINT(5) DEFAULT '0' NOT NULL,
+CHANGE `durability` `durability` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `text` `text` TEXT NULL;
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_item_refund_instance.sql b/sql/old/3.3.5a/2011_01_20_00_characters_item_refund_instance.sql
new file mode 100644
index 00000000000..0bd992e4bc3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_item_refund_instance.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `item_refund_instance`
+ROW_FORMAT=DEFAULT,
+CHANGE `item_guid` `item_guid` INT(10) UNSIGNED NOT NULL COMMENT 'Item GUID',
+CHANGE `player_guid` `player_guid` INT(10) UNSIGNED NOT NULL COMMENT 'Player GUID',
+CHANGE `paidMoney` `paidMoney` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `paidExtendedCost` `paidExtendedCost` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_item_soulbound_trace_data.sql b/sql/old/3.3.5a/2011_01_20_00_characters_item_soulbound_trace_data.sql
new file mode 100644
index 00000000000..ff07610bb8f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_item_soulbound_trace_data.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `item_soulbound_trade_data`
+ROW_FORMAT=DEFAULT,
+CHANGE `itemGuid` `itemGuid` INT(10) UNSIGNED NOT NULL COMMENT 'Item GUID';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_lag_reports.sql b/sql/old/3.3.5a/2011_01_20_00_characters_lag_reports.sql
new file mode 100644
index 00000000000..ed10b9a473f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_lag_reports.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `lag_reports`
+ROW_FORMAT=DEFAULT,
+CHANGE `report_id` `report_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+CHANGE `player` `player` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `lag_type` `lag_type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_mail.sql b/sql/old/3.3.5a/2011_01_20_00_characters_mail.sql
new file mode 100644
index 00000000000..5115e97d585
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_mail.sql
@@ -0,0 +1,11 @@
+ALTER TABLE `mail`
+ROW_FORMAT=DEFAULT,
+CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Identifier',
+CHANGE `mailTemplateId` `mailTemplateId` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `sender` `sender` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
+CHANGE `receiver` `receiver` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
+CHANGE `expire_time` `expire_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `deliver_time` `deliver_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `money` `money` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `cod` `cod` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
+
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_mail_items.sql b/sql/old/3.3.5a/2011_01_20_00_characters_mail_items.sql
new file mode 100644
index 00000000000..b7618915564
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_mail_items.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `mail_items`
+CHANGE `mail_id` `mail_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `item_guid` `item_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `receiver` `receiver` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_pet_aura.sql b/sql/old/3.3.5a/2011_01_20_00_characters_pet_aura.sql
new file mode 100644
index 00000000000..38b3b82c0f1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_pet_aura.sql
@@ -0,0 +1,10 @@
+ALTER TABLE `pet_aura`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `amount0` `amount0` MEDIUMINT(8) NOT NULL, 
+CHANGE `amount1` `amount1` MEDIUMINT(8) NOT NULL, 
+CHANGE `amount2` `amount2` MEDIUMINT(8) NOT NULL, 
+CHANGE `base_amount0` `base_amount0` MEDIUMINT(8) NOT NULL, 
+CHANGE `base_amount1` `base_amount1` MEDIUMINT(8) NOT NULL, 
+CHANGE `base_amount2` `base_amount2` MEDIUMINT(8) NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_pet_spell.sql b/sql/old/3.3.5a/2011_01_20_00_characters_pet_spell.sql
new file mode 100644
index 00000000000..e95c83f5f6f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_pet_spell.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `pet_spell`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
+CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier',
+CHANGE `active` `active` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_pet_spell_cooldown.sql b/sql/old/3.3.5a/2011_01_20_00_characters_pet_spell_cooldown.sql
new file mode 100644
index 00000000000..4d8b5dfd491
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_pet_spell_cooldown.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `pet_spell_cooldown`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier, Low part',
+CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier',
+CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_petition.sql b/sql/old/3.3.5a/2011_01_20_00_characters_petition.sql
new file mode 100644
index 00000000000..a149c568429
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_petition.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `petition`
+ROW_FORMAT=DEFAULT,
+CHANGE `name` `name` VARCHAR(24) NOT NULL,
+CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_petition_sign.sql b/sql/old/3.3.5a/2011_01_20_00_characters_petition_sign.sql
new file mode 100644
index 00000000000..2d55505764d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_petition_sign.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `petition_sign`
+ROW_FORMAT=DEFAULT,
+CHANGE `petitionguid` `petitionguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `playerguid` `playerguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `player_account` `player_account` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_00_characters_worldstates.sql b/sql/old/3.3.5a/2011_01_20_00_characters_worldstates.sql
new file mode 100644
index 00000000000..f05d04f4a03
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_characters_worldstates.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `worldstates`
+ROW_FORMAT=DEFAULT,
+CHANGE `entry` `entry` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `value` `value` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `comment` `comment` TINYTEXT;
diff --git a/sql/old/3.3.5a/2011_01_20_00_world_scriptname.sql b/sql/old/3.3.5a/2011_01_20_00_world_scriptname.sql
new file mode 100644
index 00000000000..14e187a2a63
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_20_00_world_scriptname.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `ScriptName`='boss_varos' WHERE `entry`=27447;
+UPDATE `creature_template` SET `ScriptName`='npc_azure_ring_captain' WHERE `entry`=27638;
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=50053;
+INSERT INTO `spell_script_names` (spell_id,ScriptName) VALUES (50053,'spell_varos_centrifuge_shield');
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_game_event_save.sql b/sql/old/3.3.5a/2011_01_20_0_characters_game_event_save.sql
deleted file mode 100644
index 06cc0976974..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_game_event_save.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `game_event_save`
-CHANGE `event_id` `event_id` SMALLINT(5) UNSIGNED NOT NULL,
-CHANGE `next_start` `next_start` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_gameobject_respawn.sql b/sql/old/3.3.5a/2011_01_20_0_characters_gameobject_respawn.sql
deleted file mode 100644
index bf83a59a67e..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_gameobject_respawn.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `gameobject_respawn`
-CHANGE `respawntime` `respawntime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_gm_subsurveys.sql b/sql/old/3.3.5a/2011_01_20_0_characters_gm_subsurveys.sql
deleted file mode 100644
index 51af89da7f0..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_gm_subsurveys.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `gm_subsurveys`
-ROW_FORMAT=DEFAULT,
-CHANGE `surveyid` `surveyid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-CHANGE `subsurveyid` `subsurveyid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `rank` `rank` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `comment` `comment` TEXT NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_gm_surveys.sql b/sql/old/3.3.5a/2011_01_20_0_characters_gm_surveys.sql
deleted file mode 100644
index 93c37b7b45e..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_gm_surveys.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `gm_surveys`
-ROW_FORMAT=DEFAULT,
-CHANGE `surveyid` `surveyid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-CHANGE `player` `player` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `mainSurvey` `mainSurvey` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `timestamp` `timestamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_gm_tickets.sql b/sql/old/3.3.5a/2011_01_20_0_characters_gm_tickets.sql
deleted file mode 100644
index 9965797cbf3..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_gm_tickets.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE `gm_tickets`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-CHANGE `playerGuid` `playerGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `name` `name` VARCHAR(12) NOT NULL,
-CHANGE `createtime` `createtime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `timestamp` `timestamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `closed` `closed` INT(11) DEFAULT '0' NOT NULL,
-CHANGE `assignedto` `assignedto` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `completed` `completed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `escalated` `escalated` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `viewed` `viewed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_group_instance.sql b/sql/old/3.3.5a/2011_01_20_0_characters_group_instance.sql
deleted file mode 100644
index ae7f6fccf2d..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_group_instance.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `group_instance`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `permanent` `permanent` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_group_member.sql b/sql/old/3.3.5a/2011_01_20_0_characters_group_member.sql
deleted file mode 100644
index 03bcbe66b3d..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_group_member.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `group_member`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
-CHANGE `memberGuid` `memberGuid` INT(10) UNSIGNED NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_groups.sql b/sql/old/3.3.5a/2011_01_20_0_characters_groups.sql
deleted file mode 100644
index b986d402c8f..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_groups.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-ALTER TABLE `groups`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
-CHANGE `leaderGuid` `leaderGuid` INT(10) UNSIGNED NOT NULL,
-CHANGE `lootMethod` `lootMethod` TINYINT(3) UNSIGNED NOT NULL,
-CHANGE `looterGuid` `looterGuid` INT(10) UNSIGNED NOT NULL,
-CHANGE `lootThreshold` `lootThreshold` TINYINT(3) UNSIGNED NOT NULL,
-CHANGE `icon1` `icon1` INT(10) UNSIGNED NOT NULL,
-CHANGE `icon2` `icon2` INT(10) UNSIGNED NOT NULL,
-CHANGE `icon3` `icon3` INT(10) UNSIGNED NOT NULL,
-CHANGE `icon4` `icon4` INT(10) UNSIGNED NOT NULL,
-CHANGE `icon5` `icon5` INT(10) UNSIGNED NOT NULL,
-CHANGE `icon6` `icon6` INT(10) UNSIGNED NOT NULL,
-CHANGE `icon7` `icon7` INT(10) UNSIGNED NOT NULL,
-CHANGE `icon8` `icon8` INT(10) UNSIGNED NOT NULL,
-CHANGE `groupType` `groupType` TINYINT(3) UNSIGNED NOT NULL,
-CHANGE `raiddifficulty` `raiddifficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild.sql
deleted file mode 100644
index 89b9df1bf2e..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE `guild`
-ROW_FORMAT=DEFAULT,
-CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `name` `name` VARCHAR(24) DEFAULT '' NOT NULL,
-CHANGE `leaderguid` `leaderguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `EmblemStyle` `EmblemStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `EmblemColor` `EmblemColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `BorderStyle` `BorderStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `BorderColor` `BorderColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `BackgroundColor` `BackgroundColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `motd` `motd` VARCHAR(128) DEFAULT '' NOT NULL,
-CHANGE `createdate` `createdate` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `BankMoney` `BankMoney` BIGINT(20) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_eventlog.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_eventlog.sql
deleted file mode 100644
index 627020be62f..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_eventlog.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `guild_bank_eventlog`
-CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Guild Identificator',
-CHANGE `LogGuid` `LogGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Log record identificator - auxiliary column',
-CHANGE `PlayerGuid` `PlayerGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `ItemOrMoney` `ItemOrMoney` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `ItemStackCount` `ItemStackCount` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `DestTabId` `DestTabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Destination Tab Id',
-CHANGE `TimeStamp` `TimeStamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Event UNIX time';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_item.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_item.sql
deleted file mode 100644
index d3c0157ff51..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_item.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `guild_bank_item`
-CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `item_guid` `item_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_right.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_right.sql
deleted file mode 100644
index 9c72527ca5d..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_right.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `guild_bank_right`
-CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `rid` `rid` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `SlotPerDay` `SlotPerDay` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_tab.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_tab.sql
deleted file mode 100644
index a096a0836cc..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild_bank_tab.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `guild_bank_tab`
-CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `TabName` `TabName` VARCHAR(16) DEFAULT '' NOT NULL,
-CHANGE `TabText` `TabText` VARCHAR(500) NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild_eventlog.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild_eventlog.sql
deleted file mode 100644
index cf5f71a347c..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild_eventlog.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `guild_eventlog`
-CHANGE `guildid` `guildid` INT(10) UNSIGNED NOT NULL COMMENT 'Guild Identificator',
-CHANGE `LogGuid` `LogGuid` INT(10) UNSIGNED NOT NULL COMMENT 'Log record identificator - auxiliary column',
-CHANGE `EventType` `EventType` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Event type',
-CHANGE `PlayerGuid1` `PlayerGuid1` INT(10) UNSIGNED NOT NULL COMMENT 'Player 1',
-CHANGE `PlayerGuid2` `PlayerGuid2` INT(10) UNSIGNED NOT NULL COMMENT 'Player 2',
-CHANGE `NewRank` `NewRank` TINYINT(3) UNSIGNED NOT NULL COMMENT 'New rank(in case promotion/demotion)',
-CHANGE `TimeStamp` `TimeStamp` INT(10) UNSIGNED NOT NULL COMMENT 'Event UNIX time';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild_member.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild_member.sql
deleted file mode 100644
index f1d2f78727e..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild_member.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-ALTER TABLE `guild_member`
-ROW_FORMAT=DEFAULT,
-CHANGE `guildid` `guildid` INT(10) UNSIGNED NOT NULL COMMENT 'Guild Identificator',
-CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
-CHANGE `rank` `rank` TINYINT(3) UNSIGNED NOT NULL,
-CHANGE `pnote` `pnote` varchar(31) NOT NULL DEFAULT '',
-CHANGE `offnote` `offnote` varchar(31) NOT NULL DEFAULT '',
-CHANGE `BankResetTimeMoney` `BankResetTimeMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankRemMoney` `BankRemMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankResetTimeTab0` `BankResetTimeTab0` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankRemSlotsTab0` `BankRemSlotsTab0` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankResetTimeTab1` `BankResetTimeTab1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankRemSlotsTab1` `BankRemSlotsTab1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankResetTimeTab2` `BankResetTimeTab2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankRemSlotsTab2` `BankRemSlotsTab2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankResetTimeTab3` `BankResetTimeTab3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankRemSlotsTab3` `BankRemSlotsTab3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankResetTimeTab4` `BankResetTimeTab4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankRemSlotsTab4` `BankRemSlotsTab4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankResetTimeTab5` `BankResetTimeTab5` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-CHANGE `BankRemSlotsTab5` `BankRemSlotsTab5` INT(10) UNSIGNED NOT NULL DEFAULT '0';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_guild_rank.sql b/sql/old/3.3.5a/2011_01_20_0_characters_guild_rank.sql
deleted file mode 100644
index d3adb4278a7..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_guild_rank.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `guild_rank`
-ROW_FORMAT=DEFAULT,
-CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `rid` `rid` TINYINT(3) UNSIGNED NOT NULL,
-CHANGE `rname` `rname` VARCHAR(15) DEFAULT '' NOT NULL,
-CHANGE `rights` `rights` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `BankMoneyPerDay` `BankMoneyPerDay` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_instance.sql b/sql/old/3.3.5a/2011_01_20_0_characters_instance.sql
deleted file mode 100644
index 2b1be5718b5..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_instance.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `instance`
-CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `resettime` `resettime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `difficulty` `difficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `data` `data` TINYTEXT NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_instance_reset.sql b/sql/old/3.3.5a/2011_01_20_0_characters_instance_reset.sql
deleted file mode 100644
index 6c72951339d..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_instance_reset.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `instance_reset`
-CHANGE `mapid` `mapid` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `difficulty` `difficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `resettime` `resettime` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_item_instance.sql b/sql/old/3.3.5a/2011_01_20_0_characters_item_instance.sql
deleted file mode 100644
index 649f87c4616..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_item_instance.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-ALTER TABLE `item_instance`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `owner_guid` `owner_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `charges` `charges` TINYTEXT,
-CHANGE `duration` `duration` INT(10) DEFAULT '0' NOT NULL,
-CHANGE `flags` `flags` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `randomPropertyId` `randomPropertyId` SMALLINT(5) DEFAULT '0' NOT NULL,
-CHANGE `durability` `durability` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `text` `text` TEXT NULL;
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_item_refund_instance.sql b/sql/old/3.3.5a/2011_01_20_0_characters_item_refund_instance.sql
deleted file mode 100644
index 0bd992e4bc3..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_item_refund_instance.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `item_refund_instance`
-ROW_FORMAT=DEFAULT,
-CHANGE `item_guid` `item_guid` INT(10) UNSIGNED NOT NULL COMMENT 'Item GUID',
-CHANGE `player_guid` `player_guid` INT(10) UNSIGNED NOT NULL COMMENT 'Player GUID',
-CHANGE `paidMoney` `paidMoney` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `paidExtendedCost` `paidExtendedCost` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_item_soulbound_trace_data.sql b/sql/old/3.3.5a/2011_01_20_0_characters_item_soulbound_trace_data.sql
deleted file mode 100644
index ff07610bb8f..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_item_soulbound_trace_data.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `item_soulbound_trade_data`
-ROW_FORMAT=DEFAULT,
-CHANGE `itemGuid` `itemGuid` INT(10) UNSIGNED NOT NULL COMMENT 'Item GUID';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_lag_reports.sql b/sql/old/3.3.5a/2011_01_20_0_characters_lag_reports.sql
deleted file mode 100644
index ed10b9a473f..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_lag_reports.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `lag_reports`
-ROW_FORMAT=DEFAULT,
-CHANGE `report_id` `report_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-CHANGE `player` `player` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `lag_type` `lag_type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_mail.sql b/sql/old/3.3.5a/2011_01_20_0_characters_mail.sql
deleted file mode 100644
index 5115e97d585..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_mail.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE `mail`
-ROW_FORMAT=DEFAULT,
-CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Identifier',
-CHANGE `mailTemplateId` `mailTemplateId` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `sender` `sender` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
-CHANGE `receiver` `receiver` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier',
-CHANGE `expire_time` `expire_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `deliver_time` `deliver_time` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `money` `money` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `cod` `cod` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
-
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_mail_items.sql b/sql/old/3.3.5a/2011_01_20_0_characters_mail_items.sql
deleted file mode 100644
index b7618915564..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_mail_items.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `mail_items`
-CHANGE `mail_id` `mail_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `item_guid` `item_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `receiver` `receiver` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Character Global Unique Identifier';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_pet_aura.sql b/sql/old/3.3.5a/2011_01_20_0_characters_pet_aura.sql
deleted file mode 100644
index 38b3b82c0f1..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_pet_aura.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-ALTER TABLE `pet_aura`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `amount0` `amount0` MEDIUMINT(8) NOT NULL, 
-CHANGE `amount1` `amount1` MEDIUMINT(8) NOT NULL, 
-CHANGE `amount2` `amount2` MEDIUMINT(8) NOT NULL, 
-CHANGE `base_amount0` `base_amount0` MEDIUMINT(8) NOT NULL, 
-CHANGE `base_amount1` `base_amount1` MEDIUMINT(8) NOT NULL, 
-CHANGE `base_amount2` `base_amount2` MEDIUMINT(8) NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_pet_spell.sql b/sql/old/3.3.5a/2011_01_20_0_characters_pet_spell.sql
deleted file mode 100644
index e95c83f5f6f..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_pet_spell.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `pet_spell`
-ROW_FORMAT=DEFAULT,
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier',
-CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier',
-CHANGE `active` `active` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_pet_spell_cooldown.sql b/sql/old/3.3.5a/2011_01_20_0_characters_pet_spell_cooldown.sql
deleted file mode 100644
index 4d8b5dfd491..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_pet_spell_cooldown.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `pet_spell_cooldown`
-CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Global Unique Identifier, Low part',
-CHANGE `spell` `spell` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Spell Identifier',
-CHANGE `time` `time` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_petition.sql b/sql/old/3.3.5a/2011_01_20_0_characters_petition.sql
deleted file mode 100644
index a149c568429..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_petition.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `petition`
-ROW_FORMAT=DEFAULT,
-CHANGE `name` `name` VARCHAR(24) NOT NULL,
-CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_petition_sign.sql b/sql/old/3.3.5a/2011_01_20_0_characters_petition_sign.sql
deleted file mode 100644
index 2d55505764d..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_petition_sign.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `petition_sign`
-ROW_FORMAT=DEFAULT,
-CHANGE `petitionguid` `petitionguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `playerguid` `playerguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `player_account` `player_account` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_20_0_characters_worldstates.sql b/sql/old/3.3.5a/2011_01_20_0_characters_worldstates.sql
deleted file mode 100644
index f05d04f4a03..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_characters_worldstates.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `worldstates`
-ROW_FORMAT=DEFAULT,
-CHANGE `entry` `entry` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `value` `value` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
-CHANGE `comment` `comment` TINYTEXT;
diff --git a/sql/old/3.3.5a/2011_01_20_0_world_scriptname.sql b/sql/old/3.3.5a/2011_01_20_0_world_scriptname.sql
deleted file mode 100644
index 14e187a2a63..00000000000
--- a/sql/old/3.3.5a/2011_01_20_0_world_scriptname.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='boss_varos' WHERE `entry`=27447;
-UPDATE `creature_template` SET `ScriptName`='npc_azure_ring_captain' WHERE `entry`=27638;
-
-DELETE FROM `spell_script_names` WHERE `spell_id`=50053;
-INSERT INTO `spell_script_names` (spell_id,ScriptName) VALUES (50053,'spell_varos_centrifuge_shield');
diff --git a/sql/old/3.3.5a/2011_01_22_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_22_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..12b09319bcb
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_22_00_world_spell_script_names.sql
@@ -0,0 +1,27 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (72378,73058) AND `ScriptName`='spell_deathbringer_blood_nova_targeting';
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (68921,69049) AND `ScriptName`='spell_bronjahm_soulstorm_targeting';
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (70402,72511,72512,72513) AND `ScriptName`='spell_putricide_mutated_transformation_dmg';
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (72255,72444,72445,72446) AND `ScriptName`='spell_deathbringer_mark_of_the_fallen_champion';
+DELETE FROM `spell_script_names` WHERE `spell_id`=71390 AND `ScriptName`='spell_blood_queen_pact_of_the_darkfallen';
+DELETE FROM `spell_script_names` WHERE `spell_id`=48743 AND `ScriptName`='spell_dk_death_pact';
+DELETE FROM `spell_script_names` WHERE `spell_id`=59725 AND `ScriptName`='spell_warr_improved_spell_reflection';
+DELETE FROM `spell_script_names` WHERE `spell_id`=-49821 AND `ScriptName`='spell_pri_mind_sear';
+DELETE FROM `spell_script_names` WHERE `spell_id`=-27285 AND `ScriptName`='spell_warl_seed_of_corruption';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(72378,'spell_deathbringer_blood_nova_targeting'),
+(73058,'spell_deathbringer_blood_nova_targeting'),
+(68921,'spell_bronjahm_soulstorm_targeting'),
+(69049,'spell_bronjahm_soulstorm_targeting'),
+(70402,'spell_putricide_mutated_transformation_dmg'),
+(72511,'spell_putricide_mutated_transformation_dmg'),
+(72512,'spell_putricide_mutated_transformation_dmg'),
+(72513,'spell_putricide_mutated_transformation_dmg'),
+(72255,'spell_deathbringer_mark_of_the_fallen_champion'),
+(72444,'spell_deathbringer_mark_of_the_fallen_champion'),
+(72445,'spell_deathbringer_mark_of_the_fallen_champion'),
+(72446,'spell_deathbringer_mark_of_the_fallen_champion'),
+(71390,'spell_blood_queen_pact_of_the_darkfallen'),
+(48743,'spell_dk_death_pact'),
+(59725,'spell_warr_improved_spell_reflection'),
+(-49821,'spell_pri_mind_sear'),
+(-27285,'spell_warl_seed_of_corruption');
diff --git a/sql/old/3.3.5a/2011_01_22_01_characters_character_inventory.sql b/sql/old/3.3.5a/2011_01_22_01_characters_character_inventory.sql
new file mode 100644
index 00000000000..624f6dbc582
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_22_01_characters_character_inventory.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `character_inventory` 
+ADD UNIQUE KEY (`guid`,`bag`,`slot`);
diff --git a/sql/old/3.3.5a/2011_01_22_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_22_0_world_spell_script_names.sql
deleted file mode 100644
index 12b09319bcb..00000000000
--- a/sql/old/3.3.5a/2011_01_22_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (72378,73058) AND `ScriptName`='spell_deathbringer_blood_nova_targeting';
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (68921,69049) AND `ScriptName`='spell_bronjahm_soulstorm_targeting';
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (70402,72511,72512,72513) AND `ScriptName`='spell_putricide_mutated_transformation_dmg';
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (72255,72444,72445,72446) AND `ScriptName`='spell_deathbringer_mark_of_the_fallen_champion';
-DELETE FROM `spell_script_names` WHERE `spell_id`=71390 AND `ScriptName`='spell_blood_queen_pact_of_the_darkfallen';
-DELETE FROM `spell_script_names` WHERE `spell_id`=48743 AND `ScriptName`='spell_dk_death_pact';
-DELETE FROM `spell_script_names` WHERE `spell_id`=59725 AND `ScriptName`='spell_warr_improved_spell_reflection';
-DELETE FROM `spell_script_names` WHERE `spell_id`=-49821 AND `ScriptName`='spell_pri_mind_sear';
-DELETE FROM `spell_script_names` WHERE `spell_id`=-27285 AND `ScriptName`='spell_warl_seed_of_corruption';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(72378,'spell_deathbringer_blood_nova_targeting'),
-(73058,'spell_deathbringer_blood_nova_targeting'),
-(68921,'spell_bronjahm_soulstorm_targeting'),
-(69049,'spell_bronjahm_soulstorm_targeting'),
-(70402,'spell_putricide_mutated_transformation_dmg'),
-(72511,'spell_putricide_mutated_transformation_dmg'),
-(72512,'spell_putricide_mutated_transformation_dmg'),
-(72513,'spell_putricide_mutated_transformation_dmg'),
-(72255,'spell_deathbringer_mark_of_the_fallen_champion'),
-(72444,'spell_deathbringer_mark_of_the_fallen_champion'),
-(72445,'spell_deathbringer_mark_of_the_fallen_champion'),
-(72446,'spell_deathbringer_mark_of_the_fallen_champion'),
-(71390,'spell_blood_queen_pact_of_the_darkfallen'),
-(48743,'spell_dk_death_pact'),
-(59725,'spell_warr_improved_spell_reflection'),
-(-49821,'spell_pri_mind_sear'),
-(-27285,'spell_warl_seed_of_corruption');
diff --git a/sql/old/3.3.5a/2011_01_22_1_characters_character_inventory.sql b/sql/old/3.3.5a/2011_01_22_1_characters_character_inventory.sql
deleted file mode 100644
index 624f6dbc582..00000000000
--- a/sql/old/3.3.5a/2011_01_22_1_characters_character_inventory.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `character_inventory` 
-ADD UNIQUE KEY (`guid`,`bag`,`slot`);
diff --git a/sql/old/3.3.5a/2011_01_24_00_characters_account_instance_times.sql b/sql/old/3.3.5a/2011_01_24_00_characters_account_instance_times.sql
new file mode 100644
index 00000000000..72cde260a51
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_24_00_characters_account_instance_times.sql
@@ -0,0 +1,10 @@
+--
+-- Table structure for table `account_instance_times`
+--
+DROP TABLE IF EXISTS `account_instance_times`;
+CREATE TABLE `account_instance_times` (
+  `accountId` int(10) unsigned NOT NULL,
+  `instanceId` int(10) unsigned NOT NULL DEFAULT '0',
+  `releaseTime` bigint(20) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`accountId`,`instanceId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/sql/old/3.3.5a/2011_01_24_00_world_scriptname.sql b/sql/old/3.3.5a/2011_01_24_00_world_scriptname.sql
new file mode 100644
index 00000000000..6e4233c5431
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_24_00_world_scriptname.sql
@@ -0,0 +1,11 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=27638;
+UPDATE `creature_template` SET `ScriptName`='npc_azure_ring_captain' WHERE `entry`=28236;
+            
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (61407,62136,54069,56251,50785,59372);
+INSERT INTO `spell_script_names` (spell_id,ScriptName) VALUES 
+(61407,'spell_varos_energize_core_area_entry'),
+(62136,'spell_varos_energize_core_area_entry'),
+(54069,'spell_varos_energize_core_area_entry'),
+(56251,'spell_varos_energize_core_area_entry'),
+(50785,'spell_varos_energize_core_area_enemy'),
+(59372,'spell_varos_energize_core_area_enemy');
diff --git a/sql/old/3.3.5a/2011_01_24_0_characters_account_instance_times.sql b/sql/old/3.3.5a/2011_01_24_0_characters_account_instance_times.sql
deleted file mode 100644
index 72cde260a51..00000000000
--- a/sql/old/3.3.5a/2011_01_24_0_characters_account_instance_times.sql
+++ /dev/null
@@ -1,10 +0,0 @@
---
--- Table structure for table `account_instance_times`
---
-DROP TABLE IF EXISTS `account_instance_times`;
-CREATE TABLE `account_instance_times` (
-  `accountId` int(10) unsigned NOT NULL,
-  `instanceId` int(10) unsigned NOT NULL DEFAULT '0',
-  `releaseTime` bigint(20) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`accountId`,`instanceId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/sql/old/3.3.5a/2011_01_24_0_world_scriptname.sql b/sql/old/3.3.5a/2011_01_24_0_world_scriptname.sql
deleted file mode 100644
index 6e4233c5431..00000000000
--- a/sql/old/3.3.5a/2011_01_24_0_world_scriptname.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=27638;
-UPDATE `creature_template` SET `ScriptName`='npc_azure_ring_captain' WHERE `entry`=28236;
-            
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (61407,62136,54069,56251,50785,59372);
-INSERT INTO `spell_script_names` (spell_id,ScriptName) VALUES 
-(61407,'spell_varos_energize_core_area_entry'),
-(62136,'spell_varos_energize_core_area_entry'),
-(54069,'spell_varos_energize_core_area_entry'),
-(56251,'spell_varos_energize_core_area_entry'),
-(50785,'spell_varos_energize_core_area_enemy'),
-(59372,'spell_varos_energize_core_area_enemy');
diff --git a/sql/old/3.3.5a/2011_01_26_00_world_scriptname.sql b/sql/old/3.3.5a/2011_01_26_00_world_scriptname.sql
new file mode 100644
index 00000000000..810fe263f76
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_26_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='boss_eregos' WHERE `entry`=27656;
diff --git a/sql/old/3.3.5a/2011_01_26_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_26_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..1244adf63c8
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_26_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=51162 AND `ScriptName`='spell_eregos_planar_shift';
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(51162,'spell_eregos_planar_shift');
diff --git a/sql/old/3.3.5a/2011_01_26_0_world_scriptname.sql b/sql/old/3.3.5a/2011_01_26_0_world_scriptname.sql
deleted file mode 100644
index 810fe263f76..00000000000
--- a/sql/old/3.3.5a/2011_01_26_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='boss_eregos' WHERE `entry`=27656;
diff --git a/sql/old/3.3.5a/2011_01_26_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_26_0_world_spell_script_names.sql
deleted file mode 100644
index 1244adf63c8..00000000000
--- a/sql/old/3.3.5a/2011_01_26_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=51162 AND `ScriptName`='spell_eregos_planar_shift';
-INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
-(51162,'spell_eregos_planar_shift');
diff --git a/sql/old/3.3.5a/2011_01_28_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_28_00_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..2357ff914d3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_28_00_world_spell_linked_spell.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=71390;
diff --git a/sql/old/3.3.5a/2011_01_28_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_28_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..aa0a291f526
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_28_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=71340 AND `ScriptName`='spell_blood_queen_pact_of_the_darkfallen_dmg';
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(71340,'spell_blood_queen_pact_of_the_darkfallen_dmg');
diff --git a/sql/old/3.3.5a/2011_01_28_01_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_28_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..15d3c8da21f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_28_01_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=71341 AND `ScriptName`='spell_blood_queen_pact_of_the_darkfallen_dmg_target';
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(71341,'spell_blood_queen_pact_of_the_darkfallen_dmg_target');
diff --git a/sql/old/3.3.5a/2011_01_28_0_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_28_0_world_spell_linked_spell.sql
deleted file mode 100644
index 2357ff914d3..00000000000
--- a/sql/old/3.3.5a/2011_01_28_0_world_spell_linked_spell.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=71390;
diff --git a/sql/old/3.3.5a/2011_01_28_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_28_0_world_spell_script_names.sql
deleted file mode 100644
index aa0a291f526..00000000000
--- a/sql/old/3.3.5a/2011_01_28_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=71340 AND `ScriptName`='spell_blood_queen_pact_of_the_darkfallen_dmg';
-INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
-(71340,'spell_blood_queen_pact_of_the_darkfallen_dmg');
diff --git a/sql/old/3.3.5a/2011_01_28_1_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_28_1_world_spell_script_names.sql
deleted file mode 100644
index 15d3c8da21f..00000000000
--- a/sql/old/3.3.5a/2011_01_28_1_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=71341 AND `ScriptName`='spell_blood_queen_pact_of_the_darkfallen_dmg_target';
-INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
-(71341,'spell_blood_queen_pact_of_the_darkfallen_dmg_target');
diff --git a/sql/old/3.3.5a/2011_01_29_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_29_00_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..d3b08cee952
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_29_00_world_spell_linked_spell.sql
@@ -0,0 +1,9 @@
+-- Lunar Fireworks
+DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN (44430,44429);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(26286,44430,0,'Small Red Rocket - questcredit'),
+(26292,44430,0,'Small Green Rocket - questcredit'),
+(26291,44430,0,'Small Blue Rocket - questcredit'),
+(26327,44429,0,'Red Firework Cluster - questcredit'),
+(26325,44429,0,'Green Firework Cluster - questcredit'),
+(26304,44429,0,'Blue Firework Cluster - questcredit');
diff --git a/sql/old/3.3.5a/2011_01_29_0_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_01_29_0_world_spell_linked_spell.sql
deleted file mode 100644
index d3b08cee952..00000000000
--- a/sql/old/3.3.5a/2011_01_29_0_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Lunar Fireworks
-DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN (44430,44429);
-INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
-(26286,44430,0,'Small Red Rocket - questcredit'),
-(26292,44430,0,'Small Green Rocket - questcredit'),
-(26291,44430,0,'Small Blue Rocket - questcredit'),
-(26327,44429,0,'Red Firework Cluster - questcredit'),
-(26325,44429,0,'Green Firework Cluster - questcredit'),
-(26304,44429,0,'Blue Firework Cluster - questcredit');
diff --git a/sql/old/3.3.5a/2011_01_30_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_01_30_00_world_spell_proc_event.sql
new file mode 100644
index 00000000000..ba205cd48ef
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_30_00_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (53695,53696);
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+(53695,0x00,10,0x00800000,0x00000000,0x00000008,0x00000000,0x00000000,0,0,0), -- Judgements of the Just (Rank 1)
+(53696,0x00,10,0x00800000,0x00000000,0x00000008,0x00000000,0x00000000,0,0,0); -- Judgements of the Just (Rank 2)
diff --git a/sql/old/3.3.5a/2011_01_30_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_30_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..56f3a7a2186
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_30_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` = 54798 AND `ScriptName`='spell_q12851_going_bearback';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(54798,'spell_q12851_going_bearback');
diff --git a/sql/old/3.3.5a/2011_01_30_01_world_scriptnames.sql b/sql/old/3.3.5a/2011_01_30_01_world_scriptnames.sql
new file mode 100644
index 00000000000..55532c44f1f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_30_01_world_scriptnames.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_icefang' WHERE `entry`=29602;
diff --git a/sql/old/3.3.5a/2011_01_30_0_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_01_30_0_world_spell_proc_event.sql
deleted file mode 100644
index ba205cd48ef..00000000000
--- a/sql/old/3.3.5a/2011_01_30_0_world_spell_proc_event.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE `entry` IN (53695,53696);
-INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
-(53695,0x00,10,0x00800000,0x00000000,0x00000008,0x00000000,0x00000000,0,0,0), -- Judgements of the Just (Rank 1)
-(53696,0x00,10,0x00800000,0x00000000,0x00000008,0x00000000,0x00000000,0,0,0); -- Judgements of the Just (Rank 2)
diff --git a/sql/old/3.3.5a/2011_01_30_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_30_0_world_spell_script_names.sql
deleted file mode 100644
index 56f3a7a2186..00000000000
--- a/sql/old/3.3.5a/2011_01_30_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id` = 54798 AND `ScriptName`='spell_q12851_going_bearback';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(54798,'spell_q12851_going_bearback');
diff --git a/sql/old/3.3.5a/2011_01_30_1_world_scriptnames.sql b/sql/old/3.3.5a/2011_01_30_1_world_scriptnames.sql
deleted file mode 100644
index 55532c44f1f..00000000000
--- a/sql/old/3.3.5a/2011_01_30_1_world_scriptnames.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_icefang' WHERE `entry`=29602;
diff --git a/sql/old/3.3.5a/2011_01_31_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2011_01_31_00_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..a908e227a1d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_31_00_world_spell_bonus_data.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_bonus_data` WHERE `entry`=70691;
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(70691,0,0,0,0, 'Druid - Rejuvenation T10 4P proc');
diff --git a/sql/old/3.3.5a/2011_01_31_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_01_31_00_world_spell_proc_event.sql
new file mode 100644
index 00000000000..10d9309c907
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_31_00_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry`=71585;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+(71585,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,45); -- Purified Lunar Dust
diff --git a/sql/old/3.3.5a/2011_01_31_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_31_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..1055a1b7b38
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_31_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=70691 AND `ScriptName`='spell_dru_t10_restoration_4p_bonus';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70691,'spell_dru_t10_restoration_4p_bonus');
diff --git a/sql/old/3.3.5a/2011_01_31_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_01_31_01_world_spell_proc_event.sql
new file mode 100644
index 00000000000..b920e1de508
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_31_01_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry`=70664;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+(70664,0x00,7,0x00000010,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0); -- Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
diff --git a/sql/old/3.3.5a/2011_01_31_01_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_31_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..17385cb7383
--- /dev/null
+++ b/sql/old/3.3.5a/2011_01_31_01_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=70292 AND `ScriptName`='spell_trash_mob_glacial_strike';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70292,'spell_trash_mob_glacial_strike');
diff --git a/sql/old/3.3.5a/2011_01_31_0_world_spell_bonus_data.sql b/sql/old/3.3.5a/2011_01_31_0_world_spell_bonus_data.sql
deleted file mode 100644
index a908e227a1d..00000000000
--- a/sql/old/3.3.5a/2011_01_31_0_world_spell_bonus_data.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_bonus_data` WHERE `entry`=70691;
-INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
-(70691,0,0,0,0, 'Druid - Rejuvenation T10 4P proc');
diff --git a/sql/old/3.3.5a/2011_01_31_0_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_01_31_0_world_spell_proc_event.sql
deleted file mode 100644
index 10d9309c907..00000000000
--- a/sql/old/3.3.5a/2011_01_31_0_world_spell_proc_event.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE `entry`=71585;
-INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
-(71585,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,45); -- Purified Lunar Dust
diff --git a/sql/old/3.3.5a/2011_01_31_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_31_0_world_spell_script_names.sql
deleted file mode 100644
index 1055a1b7b38..00000000000
--- a/sql/old/3.3.5a/2011_01_31_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=70691 AND `ScriptName`='spell_dru_t10_restoration_4p_bonus';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(70691,'spell_dru_t10_restoration_4p_bonus');
diff --git a/sql/old/3.3.5a/2011_01_31_1_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_01_31_1_world_spell_proc_event.sql
deleted file mode 100644
index b920e1de508..00000000000
--- a/sql/old/3.3.5a/2011_01_31_1_world_spell_proc_event.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE `entry`=70664;
-INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
-(70664,0x00,7,0x00000010,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0); -- Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
diff --git a/sql/old/3.3.5a/2011_01_31_1_world_spell_script_names.sql b/sql/old/3.3.5a/2011_01_31_1_world_spell_script_names.sql
deleted file mode 100644
index 17385cb7383..00000000000
--- a/sql/old/3.3.5a/2011_01_31_1_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=70292 AND `ScriptName`='spell_trash_mob_glacial_strike';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(70292,'spell_trash_mob_glacial_strike');
diff --git a/sql/old/3.3.5a/2011_02_03_00_characters_instance.sql b/sql/old/3.3.5a/2011_02_03_00_characters_instance.sql
new file mode 100644
index 00000000000..5072fa69f0a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_03_00_characters_instance.sql
@@ -0,0 +1 @@
+ALTER TABLE `instance` ADD COLUMN `completedEncounters` int(10) unsigned NOT NULL DEFAULT '0' AFTER `difficulty`;
diff --git a/sql/old/3.3.5a/2011_02_03_00_world_instance_encounters.sql b/sql/old/3.3.5a/2011_02_03_00_world_instance_encounters.sql
new file mode 100644
index 00000000000..e35e09f1403
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_03_00_world_instance_encounters.sql
@@ -0,0 +1,638 @@
+--
+-- Table structure for table `instance_encounters`
+--
+
+DROP TABLE IF EXISTS `instance_encounters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `instance_encounters` (
+  `entry` int(10) unsigned NOT NULL COMMENT 'Unique entry from DungeonEncounter.dbc',
+  `creditType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `creditEntry` int(10) unsigned NOT NULL DEFAULT '0',
+  `lastEncounterDungeon` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'If not 0, LfgDungeon.dbc entry for the instance it is last encounter in',
+  `comment` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `instance_encounters`
+--
+
+LOCK TABLES `instance_encounters` WRITE;
+/*!40000 ALTER TABLE `instance_encounters` DISABLE KEYS */;
+INSERT INTO `instance_encounters` VALUES
+(161,0,644,0, 'Rhahk''zor'),
+(162,0,643,0, 'Sneed'),
+(163,0,1763,0, 'Gilnid'),
+(164,0,646,0, 'Mr. Smite'),
+(165,0,645,0, 'Cookie'),
+(166,0,647,0, 'Captain Greenskin'),
+(167,0,639,6, 'Edwin VanCleef'),
+(201,0,18371,0, 'Shirrak the Dead Watcher'),
+(202,0,18373,149, 'Exarch Maladaar'),
+(203,0,18341,0, 'Pandemonius'),
+(204,0,18343,0, 'Tavarok'),
+(205,0,18344,148, 'Nexus-Prince Shaffar'),
+(206,0,18472,0, 'Darkweaver Syth'),
+(207,0,18473,150, 'Talon King Ikiss'),
+(208,0,18731,0, 'Ambassador Hellmaw'),
+(209,0,18667,0, 'Blackheart the Inciter'),
+(210,0,18732,0, 'Grandmaster Vorpil'),
+(211,0,18708,151, 'Murmur'),
+(212,0,29309,0, 'Elder Nadox'),
+(213,0,29308,0, 'Prince Taldaram'),
+(214,0,29310,0, 'Jedoga Shadowseeker'),
+(215,0,29311,218, 'Herald Volazj'),
+(216,0,28684,0, 'Krik''thir the Gatewatcher'),
+(217,0,28921,0, 'Hadronox'),
+(218,0,29120,204, 'Anub''arak'),
+(219,0,4887,0, 'Ghamoo-ra'),
+(220,0,4831,0, 'Lady Sarevess'),
+(221,0,6243,0, 'Gelihast'),
+(222,0,12902,0, 'Lorgus Jett'),
+(224,0,4830,0, 'Old Serra''kis'),
+(225,0,4832,0, 'Twilight Lord Kelris'),
+(226,0,4829,10, 'Aku''mai'),
+(227,0,9018,30, 'High Interrogator Gerstahn'),
+(228,0,9025,0, 'Lord Roccor'),
+(229,0,9319,0, 'Houndmaster Grebmar'),
+(230,0,10096,0, 'Ring of Law'),
+(231,0,9024,0, 'Pyromancer Loregrain'),
+(232,0,9017,0, 'Lord Incendius'),
+(233,0,9041,0, 'Warder Stilgiss'),
+(234,0,9056,0, 'Fineous Darkvire'),
+(235,0,9016,0, 'Bael''Gar'),
+(236,0,9033,0, 'General Angerforge'),
+(237,0,8983,0, 'Golem Lord Argelmach'),
+(238,0,9537,0, 'Hurley Blackbreath'),
+(239,0,9502,0, 'Phalanx'),
+(240,0,9543,0, 'Ribbly Screwspigot'),
+(241,0,9499,0, 'Plugger Spazzring'),
+(242,0,9156,0, 'Ambassador Flamelash'),
+(243,0,9035,0, 'The Seven'),
+(244,0,9938,0, 'Magmus'),
+(245,0,9019,276, 'Emperor Dagran Thaurissan'),
+(246,0,18371,0, 'Shirrak the Dead Watcher'),
+(247,0,18373,178, 'Exarch Maladaar'),
+(248,0,18341,0, 'Pandemonius'),
+(249,0,18343,0, 'Tavarok'),
+(250,0,22930,0, 'Yor'),
+(251,0,18344,179, 'Nexus-Prince Shaffar'),
+(252,0,18472,0, 'Darkweaver Syth'),
+(253,0,23035,0, 'Anzu'),
+(254,0,18473,180, 'Talon King Ikiss'),
+(255,0,18731,0, 'Ambassador Hellmaw'),
+(256,0,18667,0, 'Blackheart the Inciter'),
+(257,0,18732,0, 'Grandmaster Vorpil'),
+(258,0,18708,181, 'Murmur'),
+(259,0,29309,0, 'Elder Nadox'),
+(260,0,29308,0, 'Prince Taldaram'),
+(261,0,29310,0, 'Jedoga Shadowseeker'),
+(262,0,30258,0, 'Amanitar'),
+(263,0,29311,219, 'Herald Volazj'),
+(264,0,28684,0, 'Krik''thir the Gatewatcher'),
+(265,0,28921,0, 'Hadronox'),
+(266,0,29120,241, 'Anub''arak'),
+(267,0,9196,0, 'Highlord Omokk'),
+(268,0,9236,0, 'Shadow Hunter Vosh''gajin'),
+(269,0,9237,0, 'War Master Voone'),
+(270,0,10596,0, 'Mother Smolderweb'),
+(271,0,10584,0, 'Urok Doomhowl'),
+(272,0,9736,0, 'Quartermaster Zigris'),
+(273,0,10268,0, 'Gizrul the Slavener'),
+(274,0,10220,0, 'Halycon'),
+(275,0,9568,32, 'Overlord Wyrmthalak'),
+(276,0,9816,0, 'Pyroguard Emberseer'),
+(277,0,10264,0, 'Solakar Flamewreath'),
+(278,0,10429,0, 'Warchief Rend Blackhand'),
+(279,0,10430,0, 'The Beast'),
+(280,0,10363,44, 'General Drakkisath'),
+(281,0,18096,170, 'Epoch Hunter'),
+(282,0,18096,183, 'Epoch Hunter'),
+(283,0,17862,0, 'Captain Skarloc'),
+(284,0,17862,0, 'Captain Skarloc'),
+(285,0,17848,0, 'Lieutenant Drake'),
+(286,0,17848,0, 'Lieutenant Drake'),
+(287,0,17879,0, 'Chrono Lord Deja'),
+(288,0,17879,0, 'Chrono Lord Deja'),
+(289,0,17880,0, 'Temporus'),
+(290,0,17880,0, 'Temporus'),
+(291,0,17881,171, 'Aeonus'),
+(292,0,17881,182, 'Aeonus'),
+(293,0,26529,0, 'Meathook'),
+(294,0,26530,0, 'Salram the Fleshcrafter'),
+(295,0,26532,0, 'Chrono-Lord Epoch'),
+(296,1,58630,209, 'Mal''ganis'),
+(297,0,26529,0, 'Meathook'),
+(298,0,26530,0, 'Salram the Fleshcrafter'),
+(299,0,26532,0, 'Chrono-Lord Epoch'),
+(300,1,58630,210, 'Mal''ganis'),
+(301,0,17941,0, 'Mennu the Betrayer'),
+(302,0,17991,0, 'Rokmar the Crackler'),
+(303,0,17942,140, 'Quagmirran'),
+(304,0,17941,0, 'Mennu the Betrayer'),
+(305,0,17991,0, 'Rokmar the Crackler'),
+(306,0,17942,184, 'Quagmirran'),
+(314,0,17797,0, 'Hydromancer Thespia'),
+(315,0,17797,0, 'Hydromancer Thespia'),
+(316,0,17796,0, 'Mekgineer Steamrigger'),
+(317,0,17796,0, 'Mekgineer Steamrigger'),
+(318,0,17798,147, 'Warlord Kalithresh'),
+(319,0,17798,185, 'Warlord Kalithresh'),
+(320,0,17770,0, 'Hungarfen'),
+(321,0,17770,0, 'Hungarfen'),
+(322,0,18105,0, 'Ghaz''an'),
+(323,0,18105,0, 'Ghaz''an'),
+(329,0,17826,0, 'Swamplord Musel''ek'),
+(330,0,17826,0, 'Swamplord Musel''ek'),
+(331,0,17882,146, 'The Black Stalker'),
+(332,0,17882,186, 'The Black Stalker'),
+(334,1,68572,0, 'Grand Champions'),
+(336,1,68572,0, 'Grand Champions'),
+(338,1,68574,0, 'Argent Champion'),
+(339,1,68574,0, 'Argent Champion'),
+(340,1,68663,245, 'The Black Knight'),
+(341,1,68663,249, 'The Black Knight'),
+(343,0,11490,0, 'Zevrim Thornhoof'),
+(344,0,13280,0, 'Hydrospawn'),
+(345,0,14327,0, 'Lethtendris'),
+(346,0,11492,34, 'Alzzin the Wildshaper'),
+(347,0,11488,0, 'Illyanna Ravenoak'),
+(348,0,11487,0, 'Magister Kalendris'),
+(349,0,11496,0, 'Immol''thar'),
+(350,0,11489,0, 'Tendris Warpwood'),
+(361,0,11486,36, 'Prince Tortheldrin'),
+(362,0,14326,0, 'Guard Mol''dar'),
+(363,0,14322,0, 'Stomper Kreeg'),
+(364,0,14321,0, 'Guard Fengus'),
+(365,0,14323,0, 'Guard Slip''kik'),
+(366,0,14325,0, 'Captain Kromcrush'),
+(367,0,14324,0, 'Cho''Rush the Observer'),
+(368,0,11501,38, 'King Gordok'),
+(369,0,26630,0, 'Trollgore'),
+(370,0,26630,0, 'Trollgore'),
+(371,0,26631,0, 'Novos the Summoner'),
+(372,0,26631,0, 'Novos the Summoner'),
+(373,0,27483,0, 'King Dred'),
+(374,0,27483,0, 'King Dred'),
+(375,1,61863,214, 'The Prophet Tharon''ja'),
+(376,1,61863,215, 'The Prophet Tharon''ja'),
+(378,0,7079,0, 'Viscous Fallout'),
+(379,0,7361,0, 'Grubbis'),
+(380,0,6235,0, 'Electrocutioner 6000'),
+(381,0,6229,0, 'Crowd Pummeler 9-60'),
+(382,0,7800,14, 'Mekgineer Thermaplugg'),
+(383,0,29304,0, 'Slad''ran'),
+(384,0,29304,0, 'Slad''ran'),
+(385,0,29573,0, 'Drakkari Colossus'),
+(386,0,29573,0, 'Drakkari Colossus'),
+(387,0,29305,0, 'Moorabi'),
+(388,0,29305,0, 'Moorabi'),
+(389,0,29932,0, 'Eck the Ferocious'),
+(390,0,29306,216, 'Gal''darah'),
+(391,0,29306,217, 'Gal''darah'),
+(392,0,17306,0, 'Watchkeeper Gargolmar'),
+(393,0,17306,0, 'Watchkeeper Gargolmar'),
+(394,0,17308,0, 'Omor the Unscarred'),
+(395,0,17308,0, 'Omor the Unscarred'),
+(396,0,17537,136, 'Vazruden the Herald'),
+(397,0,17537,188, 'Vazruden the Herald'),
+(401,0,17381,0, 'The Maker'),
+(402,0,17381,0, 'The Maker'),
+(403,0,17380,0, 'Broggok'),
+(404,0,17380,0, 'Broggok'),
+(405,0,17377,137, 'Keli''dan the Breaker'),
+(406,0,17377,187, 'Keli''dan the Breaker'),
+(407,0,16807,0, 'Grand Warlock Nethekurse'),
+(408,0,16807,0, 'Grand Warlock Nethekurse'),
+(409,0,20923,0, 'Blood Guard Porung'),
+(410,0,16809,0, 'Warbringer O''mrogg'),
+(411,0,16809,0, 'Warbringer O''mrogg'),
+(412,0,16808,138, 'Warchief Kargath Bladefist'),
+(413,0,16808,189, 'Warchief Kargath Bladefist'),
+(414,0,24723,0, 'Selin Fireheart'),
+(415,0,24723,0, 'Selin Fireheart'),
+(416,0,24744,0, 'Vexallus'),
+(417,0,24744,0, 'Vexallus'),
+(418,0,24560,0, 'Priestess Delrissa'),
+(419,0,24560,0, 'Priestess Delrissa'),
+(420,0,24664,198, 'Kael''thas Sunstrider'),
+(421,0,24664,201, 'Kael''thas Sunstrider'),
+(422,0,13282,0, 'Noxxion'),
+(423,0,12258,26, 'Razorlash'),
+(424,0,12236,272, 'Lord Vyletongue'),
+(425,0,12225,0, 'Celebras the Cursed'),
+(426,0,12203,0, 'Landslide'),
+(427,0,13601,0, 'Tinkerer Gizlock'),
+(428,0,13596,0, 'Rotgrip'),
+(429,0,12201,273, 'Princess Theradras'),
+(430,0,11517,0, 'Oggleflint'),
+(431,0,11520,4, 'Taragaman the Hungerer'),
+(432,0,11518,0, 'Jergosh the Invoker'),
+(433,0,11519,0, 'Bazzalan'),
+(434,0,7355,0, 'Tuten''kash'),
+(435,0,7357,0, 'Mordresh Fire Eye'),
+(436,0,8567,0, 'Glutton'),
+(437,0,7358,20, 'Amnennar the Coldbringer'),
+(438,0,6168,0, 'Roogug'),
+(439,0,4424,0, 'Aggem Thorncurse'),
+(440,0,4428,0, 'Death Speaker Jargba'),
+(441,0,4420,0, 'Overlord Ramtusk'),
+(443,0,4421,16, 'Charlga Razorflank'),
+(444,0,3983,0, 'Interrogator Vishas'),
+(445,0,4543,18, 'Bloodmage Thalnos'),
+(446,0,3974,0, 'Houndmaster Loksey'),
+(447,0,6487,165, 'Arcanist Doan'),
+(448,0,3975,163, 'Herod'),
+(449,0,4542,0, 'High Inquisitor Fairbanks'),
+(450,0,3977,164, 'High Inquisitor Whitemane'),
+(451,0,10506,0, 'Kirtonos the Herald'),
+(452,0,10503,0, 'Jandice Barov'),
+(453,0,11622,0, 'Rattlegore'),
+(454,0,10433,0, 'Marduk Blackpool'),
+(455,0,10432,0, 'Vectus'),
+(456,0,10508,0, 'Ras Frostwhisper'),
+(457,0,10505,0, 'Instructor Malicia'),
+(458,0,11261,0, 'Doctor Theolen Krastinov'),
+(459,0,10901,0, 'Lorekeeper Polkelt'),
+(460,0,10507,0, 'The Ravenian'),
+(461,0,10504,0, 'Lord Alexei Barov'),
+(462,0,10502,0, 'Lady Illucia Barov'),
+(463,0,1853,2, 'Darkmaster Gandling'),
+(464,0,3914,0, 'Rethilgore'),
+(465,0,3886,0, 'Razorclaw the Butcher'),
+(466,0,3887,0, 'Baron Silverlaine'),
+(467,0,4278,0, 'Commander Springvale'),
+(468,0,4279,0, 'Odo the Blindwatcher'),
+(469,0,4274,0, 'Fenrus the Devourer'),
+(470,0,3927,0, 'Wolf Master Nandos'),
+(471,0,4275,8, 'Archmage Arugal'),
+(472,0,10516,0, 'The Unforgiven'),
+(473,0,10558,0, 'Hearthsinger Forresten'),
+(474,0,10808,0, 'Timmy the Cruel'),
+(475,0,10997,0, 'Cannon Master Willey'),
+(476,0,11032,0, 'Malor the Zealous'),
+(477,0,10811,0, 'Archivist Galford'),
+(478,0,10813,40, 'Balnazzar'),
+(479,0,10436,0, 'Baroness Anastari'),
+(480,0,10437,0, 'Nerub''enkan'),
+(481,0,10438,0, 'Maleki the Pallid'),
+(482,0,10435,0, 'Magistrate Barthilas'),
+(483,0,10439,0, 'Ramnstein the Gorger'),
+(484,0,10440,274, 'Baron Rivendare'),
+(485,0,8580,0, 'Atal''alarion'),
+(486,0,5721,0, 'Dreamscythe'),
+(487,0,5720,0, 'Weaver'),
+(488,0,5710,0, 'Jammal''an the Prophet'),
+(490,0,5719,0, 'Morphaz'),
+(491,0,5722,0, 'Hazzas'),
+(492,0,8443,0, 'Avatar of Hakkar'),
+(493,0,5709,28, 'Shade of Eranikus'),
+(494,0,20870,0, 'Zereketh the Unbound'),
+(495,0,20870,0, 'Zereketh the Unbound'),
+(496,0,20885,0, 'Dalliah the Doomsayer'),
+(497,0,20885,0, 'Dalliah the Doomsayer'),
+(498,0,20886,0, 'Wrath-Scryer Soccothrates'),
+(499,0,20886,0, 'Wrath-Scryer Soccothrates'),
+(500,0,20912,174, 'Harbinger Skyriss'),
+(501,0,20912,190, 'Harbinger Skyriss'),
+(502,0,17976,0, 'Commander Sarannis'),
+(504,0,17976,0, 'Commander Sarannis'),
+(505,0,17975,0, 'High Botanist Freywinn'),
+(506,0,17975,0, 'High Botanist Freywinn'),
+(507,0,17978,0, 'Thorngrin the Tender'),
+(508,0,17978,0, 'Thorngrin the Tender'),
+(509,0,17980,0, 'Laj'),
+(510,0,17980,0, 'Laj'),
+(511,0,17977,173, 'Warp Splinter'),
+(512,0,17977,191, 'Warp Splinter'),
+(513,0,19219,0, 'Mechano-Lord Capacitus'),
+(514,0,19219,0, 'Mechano-Lord Capacitus'),
+(515,0,19221,0, 'Nethermancer Sepethrea'),
+(516,0,19221,0, 'Nethermancer Sepethrea'),
+(517,0,19220,172, 'Pathaleon the Calculator'),
+(518,0,19220,192, 'Pathaleon the Calculator'),
+(519,0,26796,0, 'Frozen Commander'),
+(520,0,26731,0, 'Grand Magus Telestra'),
+(521,0,26731,0, 'Grand Magus Telestra'),
+(522,0,26763,0, 'Anomalus'),
+(523,0,26763,0, 'Anomalus'),
+(524,0,26794,0, 'Ormorok the Tree-Shaper'),
+(525,0,26794,0, 'Ormrok the Tree-Shaper'),
+(526,0,26723,225, 'Keristrasza'),
+(527,0,26723,226, 'Keristrasza'),
+(528,0,27654,0, 'Drakos the Interrogator'),
+(529,0,27654,0, 'Drakos the Interrogator'),
+(530,0,27447,0, 'Varos Cloudstrider'),
+(531,0,27447,0, 'Varos Cloudstrider'),
+(532,0,27655,0, 'Mage-Lord Urom'),
+(533,0,27655,0, 'Mage-Lord Urom'),
+(534,0,27656,206, 'Ley-Guardian Eregos'),
+(535,0,27656,211, 'Ley-Guardian Eregos'),
+(536,0,1696,0, 'Targorr the Dread'),
+(537,0,1666,0, 'Kam Deepfury'),
+(538,0,1717,0, 'Hamhock'),
+(539,0,1716,0, 'Bazil Thredd'),
+(540,0,1663,12, 'Dextren Ward'),
+(541,0,29315,0, 'First Prisoner'),
+(542,0,29315,0, 'First Prisoner'),
+(543,0,29316,0, 'Second Prisoner'),
+(544,0,29316,0, 'Second Prisoner'),
+(545,0,31134,220, 'Cyanigosa'),
+(546,0,31134,221, 'Cyanigosa'),
+(547,0,6910,0, 'Revelosh'),
+(548,0,6906,0, 'The Lost Dwarves'),
+(549,0,7228,0, 'Ironaya'),
+(551,0,7206,0, 'Ancient Stone Keeper'),
+(552,0,7291,0, 'Galgann Firehammer'),
+(553,0,4854,0, 'Grimlok'),
+(554,0,2748,22, 'Archaedas'),
+(555,0,28586,0, 'General Bjarngrim'),
+(556,0,28586,0, 'General Bjarngrim'),
+(557,0,28587,0, 'Volkhan'),
+(558,0,28587,0, 'Volkhan'),
+(559,0,28546,0, 'Ionar'),
+(560,0,28546,0, 'Ionar'),
+(561,0,28923,207, 'Loken'),
+(562,0,28923,212, 'Loken'),
+(563,0,27977,0, 'Krystallus'),
+(564,0,27977,0, 'Krystallus'),
+(565,0,27975,0, 'Maiden of Grief'),
+(566,0,27975,0, 'Maiden of Grief'),
+(567,1,59046,0, 'Tribunal of Ages'),
+(568,1,59046,0, 'Tribunal of Ages'),
+(569,0,27978,208, 'Sjonnir the Ironshaper'),
+(570,0,27978,213, 'Sjonnir the Ironshaper'),
+(571,0,23953,0, 'Prince Keleseth'),
+(572,0,23953,0, 'Prince Keleseth'),
+(573,0,24201,0, 'Skarvold & Dalronn'),
+(574,0,24201,0, 'Skarvold & Dalronn'),
+(575,0,23954,202, 'Ingvar the Plunderer'),
+(576,0,23954,242, 'Ingvar the Plunderer'),
+(577,0,26668,0, 'Svala Sorrowgrave'),
+(578,0,26668,0, 'Svala Sorrowgrave'),
+(579,0,26687,0, 'Gortok Palehoof'),
+(580,0,26687,0, 'Gortok Palehoof'),
+(581,0,26693,0, 'Skadi the Ruthless'),
+(582,0,26693,0, 'Skadi the Ruthless'),
+(583,0,26861,203, 'King Ymiron'),
+(584,0,26861,205, 'King Ymiron'),
+(585,0,3671,0, 'Lady Anacondra'),
+(586,0,3669,0, 'Lord Cobrahn'),
+(587,0,3653,0, 'Kresh'),
+(588,0,3670,0, 'Lord Pythas'),
+(589,0,3674,0, 'Skum'),
+(590,0,3673,0, 'Lord Serpentis'),
+(591,0,5775,0, 'Verdan the Everliving'),
+(592,0,3654,1, 'Mutanus the Devourer'),
+(593,0,7795,0, 'Hydromancer Velratha'),
+(594,0,7273,0, 'Ghaz''rilla'),
+(595,0,8127,0, 'Antu''sul'),
+(596,0,7272,0, 'Theka the Martyr'),
+(597,0,7271,0, 'Witch Doctor Zum''rah'),
+(598,0,7796,0, 'Nekrum Gutchewer'),
+(599,0,7275,0, 'Shadowpriest Sezz''ziz'),
+(600,0,7267,24, 'Chief Ukorz Sandscalp'),
+(601,0,22887,0, 'High Warlord Naj''entus'),
+(602,0,22898,0, 'Supremus'),
+(603,0,22841,0, 'Shade of Akama'),
+(604,0,22871,0, 'Teron Gorefiend'),
+(605,0,22948,0, 'Gurtogg Bloodboil'),
+(606,0,23420,0, 'Reliquary of Souls'),
+(607,0,22947,0, 'Mother Shahraz'),
+(608,0,23426,0, 'The Illidari Council'),
+(609,0,22917,196, 'Illidan Stormrage'),
+(610,0,12435,0, 'Razorgore the Untamed'),
+(611,0,13020,0, 'Vaelastrasz the Corrupt'),
+(612,0,12017,0, 'Broodlord Lashlayer'),
+(613,0,11983,0, 'Firemaw'),
+(614,0,14601,0, 'Ebonroc'),
+(615,0,11981,0, 'Flamegor'),
+(616,0,14020,0, 'Chromaggus'),
+(617,0,11583,50, 'Nefarian'),
+(618,0,17767,0, 'Rage Winterchill'),
+(619,0,17808,0, 'Anetheron'),
+(620,0,17888,0, 'Kaz''rogal'),
+(621,0,17842,0, 'Azgalor'),
+(622,0,17968,195, 'Archimonde'),
+(623,0,21216,0, 'Hydross the Unstable'),
+(624,0,21217,0, 'The Lurker Below'),
+(625,0,21215,0, 'Leotheras the Blind'),
+(626,0,21214,0, 'Fathom-Lord Karathress'),
+(627,0,21213,0, 'Morogrim Tidewalker'),
+(628,0,21212,194, 'Lady Vashj'),
+(629,0,34797,0, 'Northrend Beasts'),
+(630,0,34797,0, 'Northrend Beasts'),
+(631,0,34797,0, 'Northrend Beasts'),
+(632,0,34797,0, 'Northrend Beasts'),
+(633,0,34780,0, 'Lord Jaraxxus'),
+(634,0,34780,0, 'Lord Jaraxxus'),
+(635,0,34780,0, 'Lord Jaraxxus'),
+(636,0,34780,0, 'Lord Jaraxxus'),
+(637,1,68184,0, 'Faction Champions'),
+(638,1,68184,0, 'Faction Champions'),
+(639,1,68184,0, 'Faction Champions'),
+(640,1,68184,0, 'Faction Champions'),
+(641,0,34496,0, 'Val''kyr Twins'),
+(642,0,34496,0, 'Val''kyr Twins'),
+(643,0,34496,0, 'Val''kyr Twins'),
+(644,0,34496,0, 'Val''kyr Twins'),
+(645,0,34564,246, 'Anub''arak'),
+(646,0,34564,248, 'Anub''arak'),
+(647,0,34564,247, 'Anub''arak'),
+(648,0,34564,250, 'Anub''arak'),
+(649,0,18831,0, 'High King Maulgar'),
+(650,0,19044,177, 'Gruul the Dragonkiller'),
+(651,0,17257,176, 'Magtheridon'),
+(652,0,15550,0, 'Attumen the Huntsman'),
+(653,0,15687,0, 'Moroes'),
+(654,0,16457,0, 'Maiden of the Virtue'),
+(655,0,16812,0, 'Opera Event'),
+(656,0,15691,0, 'The Curator'),
+(657,0,15688,0, 'Terestian Illhoof'),
+(658,0,16524,0, 'Shade of Aran'),
+(659,0,15689,0, 'Netherspite'),
+(660,0,22520,0, 'Chess Event'),
+(661,0,15690,175, 'Prince Malchezaar'),
+(662,0,17225,0, 'Nightbane'),
+(663,0,12118,0, 'Lucifron'),
+(664,0,11982,0, 'Magmadar'),
+(665,0,12259,0, 'Gehennas'),
+(666,0,12057,0, 'Garr'),
+(667,0,12264,0, 'Shazzrah'),
+(668,0,12056,0, 'Baron Geddon'),
+(669,0,12098,0, 'Sulfuron Harbinger'),
+(670,0,11988,0, 'Golemagg the Incinerator'),
+(671,0,12018,0, 'Majordomo Executus'),
+(672,0,11502,48, 'Ragnaros'),
+(673,0,15956,0, 'Anub''Rekhan'),
+(674,0,15956,0, 'Anub''Rekhan'),
+(677,0,15953,0, 'Grand Widow Faerlina'),
+(678,0,15953,0, 'Grand Widow Faerlina'),
+(679,0,15952,0, 'Maexxna'),
+(680,0,15952,0, 'Maexxna'),
+(681,0,15954,0, 'Noth the Plaguebringer'),
+(682,0,15954,0, 'Noth the Plaguebringer'),
+(683,0,15936,0, 'Heigan the Unclean'),
+(684,0,15936,0, 'Heigan the Unclean '),
+(685,0,16011,0, 'Loatheb'),
+(686,0,16011,0, 'Loatheb'),
+(687,0,16061,0, 'Instructor Razuvious'),
+(689,0,16061,0, 'Instructor Razuvious'),
+(690,0,16060,0, 'Gothik the Harvester'),
+(691,0,16060,0, 'Gothik the Harvester'),
+(692,1,59450,0, 'The Four Horsemen'),
+(693,1,59450,0, 'The Four Horsemen'),
+(694,0,16028,0, 'Patchwerk'),
+(695,0,16028,0, 'Patchwerk '),
+(696,0,15931,0, 'Grobbulus'),
+(697,0,15931,0, 'Grobbulus'),
+(698,0,15932,0, 'Gluth'),
+(699,0,15932,0, 'Gluth'),
+(700,0,15928,0, 'Thaddius'),
+(701,0,15928,0, 'Thaddius'),
+(702,0,15989,0, 'Sapphiron'),
+(703,0,15989,0, 'Sapphiron'),
+(704,0,15990,159, 'Kel''Thuzad'),
+(706,0,15990,227, 'Kel''Thuzad'),
+(707,0,10184,46, 'Onyxia'),
+(708,0,10184,257, 'Onyxia'),
+(709,0,15263,0, 'The Prophet Skeram'),
+(710,0,15544,0, 'Silithid Royalty'),
+(711,0,15516,0, 'Battleguard Sartura'),
+(712,0,15510,0, 'Fankriss the Unyielding'),
+(713,0,15299,0, 'Viscidus'),
+(714,0,15509,0, 'Princess Huhuran'),
+(715,0,15275,0, 'Twin Emperors'),
+(716,0,15517,0, 'Ouro'),
+(717,0,15727,161, 'C''thun'),
+(718,0,15348,0, 'Kurinnaxx'),
+(719,0,15341,0, 'General Rajaxx'),
+(720,0,15340,0, 'Moam'),
+(721,0,15370,0, 'Buru the Gorger'),
+(722,0,15369,0, 'Ayamiss the Hunter'),
+(723,0,15339,160, 'Ossirian the Unscarred'),
+(724,0,24892,0, 'Kalecgos'),
+(725,0,24882,0, 'Brutallus'),
+(726,0,25038,0, 'Felmyst'),
+(727,0,25165,0, 'Eredar Twins'),
+(728,0,25840,0, 'M''uru'),
+(729,0,25315,199, 'Kil''jaeden'),
+(730,0,19514,0, 'Al''ar'),
+(731,0,19516,0, 'Void Reaver'),
+(732,0,18805,0, 'High Astromancer Solarian'),
+(733,0,19622,193, 'Kael''thas Sunstrider'),
+(734,0,28859,223, 'Malygos'),
+(735,0,28859,237, 'Malygos'),
+(736,0,30452,0, 'Tenebron'),
+(737,0,30452,0, 'Tenebron'),
+(738,0,30451,0, 'Shadron'),
+(739,0,30451,0, 'Shadron'),
+(740,0,30449,0, 'Vesperon'),
+(741,0,30449,0, 'Vesperon'),
+(742,0,28860,224, 'Sartharion'),
+(743,0,28860,238, 'Sartharion'),
+(744,0,33113,0, 'Flame Leviathan'),
+(745,0,33118,0, 'Ignis the Furnace Master'),
+(746,0,33186,0, 'Razorscale'),
+(747,0,33293,0, 'XT-002 Deconstructor'),
+(748,1,65195,0, 'The Iron Council'),
+(749,0,32930,0, 'Kologarn'),
+(750,0,33515,0, 'Auriaya'),
+(751,1,64899,0, 'Hodir'),
+(752,1,64985,0, 'Thorim'),
+(753,1,65074,0, 'Freya'),
+(754,0,33432,0, 'Mimiron'),
+(755,0,33271,0, 'General Vezax'),
+(756,0,33288,0, 'Yogg-Saron'),
+(757,0,32871,243, 'Algalon the Observer'),
+(758,0,33113,0, 'Flame Leviathan'),
+(759,0,33118,0, 'Ignis the Furnace Master'),
+(760,0,33186,0, 'Razorscale'),
+(761,0,33293,0, 'XT-002 Deconstructor'),
+(762,1,65195,0, 'The Iron Council'),
+(763,0,32930,0, 'Kologarn'),
+(764,0,33515,0, 'Auriaya'),
+(765,1,64899,0, 'Hodir'),
+(766,1,64985,0, 'Thorim'),
+(767,1,65074,0, 'Freya'),
+(768,0,33432,0, 'Mimiron'),
+(769,0,33271,0, 'General Vezax'),
+(770,0,33288,0, 'Yogg-Saron'),
+(771,0,32871,244, 'Algalon the Observer'),
+(772,0,31125,0, 'Archavon the Stone Watcher'),
+(773,0,31125,0, 'Archavon the Stone Watcher'),
+(774,0,33993,0, 'Emalon the Storm Watcher'),
+(775,0,33993,0, 'Emalon the Storm Watcher'),
+(776,0,35013,0, 'Koralon the Flame Watcher'),
+(777,0,35013,0, 'Koralon the Flame Watcher'),
+(778,0,23574,0, 'Akil''zon'),
+(779,0,23576,0, 'Nalorakk'),
+(780,0,23578,0, 'Jan''alai'),
+(781,0,23577,0, 'Halazzi'),
+(782,0,24239,0, 'Hex Lord Malacrass'),
+(783,0,23863,197, 'Zul''jin'),
+(784,0,14507,0, 'High Priest Venoxis'),
+(785,0,14517,0, 'High Priestess Jeklik'),
+(786,0,14510,0, 'High Priestess Mar''li'),
+(787,0,11382,0, 'Bloodlord Mandokir'),
+(788,0,15083,0, 'Edge of Madness'),
+(789,0,14509,0, 'High Priest Thekal'),
+(790,0,15114,0, 'Gahz''ranka'),
+(791,0,14515,0, 'High Priestess Arlokk'),
+(792,0,11380,0, 'Jin''do the Hexxer'),
+(793,0,14834,42, 'Hakkar'),
+(829,0,36497,0, 'Bronjahm'),
+(830,0,36497,0, 'Bronjahm '),
+(831,0,36502,251, 'Devourer of Souls'),
+(832,0,36502,252, 'Devourer of Souls'),
+(833,0,36494,0, 'Forgemaster Garfrost'),
+(834,0,36494,0, 'Forgemaster Garfrost'),
+(835,0,36476,0, 'Krick'),
+(836,0,36476,0, 'Krick'),
+(837,0,36658,253, 'Overlord Tyrannus'),
+(838,0,36658,254, 'Overlord Tyrannus'),
+(839,0,38113,0, 'Marwyn'),
+(840,0,38113,0, 'Marwyn'),
+(841,0,38112,0, 'Falric'),
+(842,0,38112,0, 'Falric'),
+(843,1,72830,255, 'Escaped from Arthas'),
+(844,1,72830,256, 'Escaped from Arthas'),
+(845,0,36612,0, 'Lord Marrowgar'),
+(846,0,36855,0, 'Lady Deathwhisper'),
+(847,1,72959,0, 'Icecrown Gunship Battle'),
+(848,0,37813,0, 'Deathbringer Saurfang'),
+(849,0,36626,0, 'Festergut'),
+(850,0,36627,0, 'Rotface'),
+(851,0,36678,0, 'Professor Putricide'),
+(852,0,37970,0, 'Blood Council'),
+(853,0,37955,0, 'Queen Lana''thel'),
+(854,1,72706,0, 'Valithria Dreamwalker'),
+(855,0,36853,0, 'Sindragosa'),
+(856,0,36597,279, 'The Lich King'),
+(857,0,36612,0, 'Lord Marrowgar'),
+(858,0,36855,0, 'Lady Deathwhisper'),
+(859,1,72959,0, 'Icecrown Gunship Battle'),
+(860,0,37813,0, 'Deathbringer Saurfang'),
+(861,0,36626,0, 'Festergut'),
+(862,0,36627,0, 'Rotface'),
+(863,0,36678,0, 'Professor Putricide'),
+(864,0,37970,0, 'Blood Council'),
+(865,0,37955,0, 'Queen Lana''thel'),
+(866,1,72706,0, 'Valithria Dreamwalker'),
+(867,0,36853,0, 'Sindragosa'),
+(868,0,36597,280, 'The Lich King'),
+(883,0,4422,0, 'Agathelos the Raging'),
+(885,0,38433,239, 'Toravon the Ice Watcher'),
+(886,0,38433,240, 'Toravon the Ice Watcher'),
+(887,0,39863,293, 'Halion'),
+(888,0,39863,294, 'Halion'),
+(889,0,39751,0, 'Baltharus the Warborn'),
+(890,0,39751,0, 'Baltharus the Warborn'),
+(891,0,39747,0, 'Saviana Ragefire'),
+(892,0,39747,0, 'Saviana Ragefire'),
+(893,0,39746,0, 'General Zarithrian'),
+(894,0,39746,0, 'General Zarithrian');
+/*!40000 ALTER TABLE `instance_encounters` ENABLE KEYS */;
+UNLOCK TABLES;
diff --git a/sql/old/3.3.5a/2011_02_03_01_world_command.sql b/sql/old/3.3.5a/2011_02_03_01_world_command.sql
new file mode 100644
index 00000000000..8902097fb06
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_03_01_world_command.sql
@@ -0,0 +1 @@
+DELETE FROM `command` WHERE `name`='reload lfg_dungeon_encounters';
diff --git a/sql/old/3.3.5a/2011_02_03_02_world_lfg_dungeon_encounters.sql b/sql/old/3.3.5a/2011_02_03_02_world_lfg_dungeon_encounters.sql
new file mode 100644
index 00000000000..9820317ccf1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_03_02_world_lfg_dungeon_encounters.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `lfg_dungeon_encounters`;
diff --git a/sql/old/3.3.5a/2011_02_03_03_world_spell_dbc.sql b/sql/old/3.3.5a/2011_02_03_03_world_spell_dbc.sql
new file mode 100644
index 00000000000..0d26399cf42
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_03_03_world_spell_dbc.sql
@@ -0,0 +1,18 @@
+DELETE FROM `spell_dbc` WHERE `Id` IN (58630,68572,68574,59046,68184,59450,65195,64899,64985,65074);
+INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`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
+(58630,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Mal''ganis credit marker'),
+(68572,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Grand Champions credit marker'),
+(68574,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Argent Champion credit marker'),
+(59046,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Tribunal of Ages credit marker'),
+(68184,0,0,536870912,0,0,0,0,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,18,0,0,16,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'),
+(59450,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'The Four Horsemen credit marker'),
+(65195,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'The Iron Council credit marker'),
+(64899,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Hodir credit marker'),
+(64985,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Thorim credit marker'),
+(65074,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Freya credit marker');
diff --git a/sql/old/3.3.5a/2011_02_03_0_characters_instance.sql b/sql/old/3.3.5a/2011_02_03_0_characters_instance.sql
deleted file mode 100644
index 5072fa69f0a..00000000000
--- a/sql/old/3.3.5a/2011_02_03_0_characters_instance.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `instance` ADD COLUMN `completedEncounters` int(10) unsigned NOT NULL DEFAULT '0' AFTER `difficulty`;
diff --git a/sql/old/3.3.5a/2011_02_03_0_world_instance_encounters.sql b/sql/old/3.3.5a/2011_02_03_0_world_instance_encounters.sql
deleted file mode 100644
index e35e09f1403..00000000000
--- a/sql/old/3.3.5a/2011_02_03_0_world_instance_encounters.sql
+++ /dev/null
@@ -1,638 +0,0 @@
---
--- Table structure for table `instance_encounters`
---
-
-DROP TABLE IF EXISTS `instance_encounters`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `instance_encounters` (
-  `entry` int(10) unsigned NOT NULL COMMENT 'Unique entry from DungeonEncounter.dbc',
-  `creditType` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `creditEntry` int(10) unsigned NOT NULL DEFAULT '0',
-  `lastEncounterDungeon` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'If not 0, LfgDungeon.dbc entry for the instance it is last encounter in',
-  `comment` varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `instance_encounters`
---
-
-LOCK TABLES `instance_encounters` WRITE;
-/*!40000 ALTER TABLE `instance_encounters` DISABLE KEYS */;
-INSERT INTO `instance_encounters` VALUES
-(161,0,644,0, 'Rhahk''zor'),
-(162,0,643,0, 'Sneed'),
-(163,0,1763,0, 'Gilnid'),
-(164,0,646,0, 'Mr. Smite'),
-(165,0,645,0, 'Cookie'),
-(166,0,647,0, 'Captain Greenskin'),
-(167,0,639,6, 'Edwin VanCleef'),
-(201,0,18371,0, 'Shirrak the Dead Watcher'),
-(202,0,18373,149, 'Exarch Maladaar'),
-(203,0,18341,0, 'Pandemonius'),
-(204,0,18343,0, 'Tavarok'),
-(205,0,18344,148, 'Nexus-Prince Shaffar'),
-(206,0,18472,0, 'Darkweaver Syth'),
-(207,0,18473,150, 'Talon King Ikiss'),
-(208,0,18731,0, 'Ambassador Hellmaw'),
-(209,0,18667,0, 'Blackheart the Inciter'),
-(210,0,18732,0, 'Grandmaster Vorpil'),
-(211,0,18708,151, 'Murmur'),
-(212,0,29309,0, 'Elder Nadox'),
-(213,0,29308,0, 'Prince Taldaram'),
-(214,0,29310,0, 'Jedoga Shadowseeker'),
-(215,0,29311,218, 'Herald Volazj'),
-(216,0,28684,0, 'Krik''thir the Gatewatcher'),
-(217,0,28921,0, 'Hadronox'),
-(218,0,29120,204, 'Anub''arak'),
-(219,0,4887,0, 'Ghamoo-ra'),
-(220,0,4831,0, 'Lady Sarevess'),
-(221,0,6243,0, 'Gelihast'),
-(222,0,12902,0, 'Lorgus Jett'),
-(224,0,4830,0, 'Old Serra''kis'),
-(225,0,4832,0, 'Twilight Lord Kelris'),
-(226,0,4829,10, 'Aku''mai'),
-(227,0,9018,30, 'High Interrogator Gerstahn'),
-(228,0,9025,0, 'Lord Roccor'),
-(229,0,9319,0, 'Houndmaster Grebmar'),
-(230,0,10096,0, 'Ring of Law'),
-(231,0,9024,0, 'Pyromancer Loregrain'),
-(232,0,9017,0, 'Lord Incendius'),
-(233,0,9041,0, 'Warder Stilgiss'),
-(234,0,9056,0, 'Fineous Darkvire'),
-(235,0,9016,0, 'Bael''Gar'),
-(236,0,9033,0, 'General Angerforge'),
-(237,0,8983,0, 'Golem Lord Argelmach'),
-(238,0,9537,0, 'Hurley Blackbreath'),
-(239,0,9502,0, 'Phalanx'),
-(240,0,9543,0, 'Ribbly Screwspigot'),
-(241,0,9499,0, 'Plugger Spazzring'),
-(242,0,9156,0, 'Ambassador Flamelash'),
-(243,0,9035,0, 'The Seven'),
-(244,0,9938,0, 'Magmus'),
-(245,0,9019,276, 'Emperor Dagran Thaurissan'),
-(246,0,18371,0, 'Shirrak the Dead Watcher'),
-(247,0,18373,178, 'Exarch Maladaar'),
-(248,0,18341,0, 'Pandemonius'),
-(249,0,18343,0, 'Tavarok'),
-(250,0,22930,0, 'Yor'),
-(251,0,18344,179, 'Nexus-Prince Shaffar'),
-(252,0,18472,0, 'Darkweaver Syth'),
-(253,0,23035,0, 'Anzu'),
-(254,0,18473,180, 'Talon King Ikiss'),
-(255,0,18731,0, 'Ambassador Hellmaw'),
-(256,0,18667,0, 'Blackheart the Inciter'),
-(257,0,18732,0, 'Grandmaster Vorpil'),
-(258,0,18708,181, 'Murmur'),
-(259,0,29309,0, 'Elder Nadox'),
-(260,0,29308,0, 'Prince Taldaram'),
-(261,0,29310,0, 'Jedoga Shadowseeker'),
-(262,0,30258,0, 'Amanitar'),
-(263,0,29311,219, 'Herald Volazj'),
-(264,0,28684,0, 'Krik''thir the Gatewatcher'),
-(265,0,28921,0, 'Hadronox'),
-(266,0,29120,241, 'Anub''arak'),
-(267,0,9196,0, 'Highlord Omokk'),
-(268,0,9236,0, 'Shadow Hunter Vosh''gajin'),
-(269,0,9237,0, 'War Master Voone'),
-(270,0,10596,0, 'Mother Smolderweb'),
-(271,0,10584,0, 'Urok Doomhowl'),
-(272,0,9736,0, 'Quartermaster Zigris'),
-(273,0,10268,0, 'Gizrul the Slavener'),
-(274,0,10220,0, 'Halycon'),
-(275,0,9568,32, 'Overlord Wyrmthalak'),
-(276,0,9816,0, 'Pyroguard Emberseer'),
-(277,0,10264,0, 'Solakar Flamewreath'),
-(278,0,10429,0, 'Warchief Rend Blackhand'),
-(279,0,10430,0, 'The Beast'),
-(280,0,10363,44, 'General Drakkisath'),
-(281,0,18096,170, 'Epoch Hunter'),
-(282,0,18096,183, 'Epoch Hunter'),
-(283,0,17862,0, 'Captain Skarloc'),
-(284,0,17862,0, 'Captain Skarloc'),
-(285,0,17848,0, 'Lieutenant Drake'),
-(286,0,17848,0, 'Lieutenant Drake'),
-(287,0,17879,0, 'Chrono Lord Deja'),
-(288,0,17879,0, 'Chrono Lord Deja'),
-(289,0,17880,0, 'Temporus'),
-(290,0,17880,0, 'Temporus'),
-(291,0,17881,171, 'Aeonus'),
-(292,0,17881,182, 'Aeonus'),
-(293,0,26529,0, 'Meathook'),
-(294,0,26530,0, 'Salram the Fleshcrafter'),
-(295,0,26532,0, 'Chrono-Lord Epoch'),
-(296,1,58630,209, 'Mal''ganis'),
-(297,0,26529,0, 'Meathook'),
-(298,0,26530,0, 'Salram the Fleshcrafter'),
-(299,0,26532,0, 'Chrono-Lord Epoch'),
-(300,1,58630,210, 'Mal''ganis'),
-(301,0,17941,0, 'Mennu the Betrayer'),
-(302,0,17991,0, 'Rokmar the Crackler'),
-(303,0,17942,140, 'Quagmirran'),
-(304,0,17941,0, 'Mennu the Betrayer'),
-(305,0,17991,0, 'Rokmar the Crackler'),
-(306,0,17942,184, 'Quagmirran'),
-(314,0,17797,0, 'Hydromancer Thespia'),
-(315,0,17797,0, 'Hydromancer Thespia'),
-(316,0,17796,0, 'Mekgineer Steamrigger'),
-(317,0,17796,0, 'Mekgineer Steamrigger'),
-(318,0,17798,147, 'Warlord Kalithresh'),
-(319,0,17798,185, 'Warlord Kalithresh'),
-(320,0,17770,0, 'Hungarfen'),
-(321,0,17770,0, 'Hungarfen'),
-(322,0,18105,0, 'Ghaz''an'),
-(323,0,18105,0, 'Ghaz''an'),
-(329,0,17826,0, 'Swamplord Musel''ek'),
-(330,0,17826,0, 'Swamplord Musel''ek'),
-(331,0,17882,146, 'The Black Stalker'),
-(332,0,17882,186, 'The Black Stalker'),
-(334,1,68572,0, 'Grand Champions'),
-(336,1,68572,0, 'Grand Champions'),
-(338,1,68574,0, 'Argent Champion'),
-(339,1,68574,0, 'Argent Champion'),
-(340,1,68663,245, 'The Black Knight'),
-(341,1,68663,249, 'The Black Knight'),
-(343,0,11490,0, 'Zevrim Thornhoof'),
-(344,0,13280,0, 'Hydrospawn'),
-(345,0,14327,0, 'Lethtendris'),
-(346,0,11492,34, 'Alzzin the Wildshaper'),
-(347,0,11488,0, 'Illyanna Ravenoak'),
-(348,0,11487,0, 'Magister Kalendris'),
-(349,0,11496,0, 'Immol''thar'),
-(350,0,11489,0, 'Tendris Warpwood'),
-(361,0,11486,36, 'Prince Tortheldrin'),
-(362,0,14326,0, 'Guard Mol''dar'),
-(363,0,14322,0, 'Stomper Kreeg'),
-(364,0,14321,0, 'Guard Fengus'),
-(365,0,14323,0, 'Guard Slip''kik'),
-(366,0,14325,0, 'Captain Kromcrush'),
-(367,0,14324,0, 'Cho''Rush the Observer'),
-(368,0,11501,38, 'King Gordok'),
-(369,0,26630,0, 'Trollgore'),
-(370,0,26630,0, 'Trollgore'),
-(371,0,26631,0, 'Novos the Summoner'),
-(372,0,26631,0, 'Novos the Summoner'),
-(373,0,27483,0, 'King Dred'),
-(374,0,27483,0, 'King Dred'),
-(375,1,61863,214, 'The Prophet Tharon''ja'),
-(376,1,61863,215, 'The Prophet Tharon''ja'),
-(378,0,7079,0, 'Viscous Fallout'),
-(379,0,7361,0, 'Grubbis'),
-(380,0,6235,0, 'Electrocutioner 6000'),
-(381,0,6229,0, 'Crowd Pummeler 9-60'),
-(382,0,7800,14, 'Mekgineer Thermaplugg'),
-(383,0,29304,0, 'Slad''ran'),
-(384,0,29304,0, 'Slad''ran'),
-(385,0,29573,0, 'Drakkari Colossus'),
-(386,0,29573,0, 'Drakkari Colossus'),
-(387,0,29305,0, 'Moorabi'),
-(388,0,29305,0, 'Moorabi'),
-(389,0,29932,0, 'Eck the Ferocious'),
-(390,0,29306,216, 'Gal''darah'),
-(391,0,29306,217, 'Gal''darah'),
-(392,0,17306,0, 'Watchkeeper Gargolmar'),
-(393,0,17306,0, 'Watchkeeper Gargolmar'),
-(394,0,17308,0, 'Omor the Unscarred'),
-(395,0,17308,0, 'Omor the Unscarred'),
-(396,0,17537,136, 'Vazruden the Herald'),
-(397,0,17537,188, 'Vazruden the Herald'),
-(401,0,17381,0, 'The Maker'),
-(402,0,17381,0, 'The Maker'),
-(403,0,17380,0, 'Broggok'),
-(404,0,17380,0, 'Broggok'),
-(405,0,17377,137, 'Keli''dan the Breaker'),
-(406,0,17377,187, 'Keli''dan the Breaker'),
-(407,0,16807,0, 'Grand Warlock Nethekurse'),
-(408,0,16807,0, 'Grand Warlock Nethekurse'),
-(409,0,20923,0, 'Blood Guard Porung'),
-(410,0,16809,0, 'Warbringer O''mrogg'),
-(411,0,16809,0, 'Warbringer O''mrogg'),
-(412,0,16808,138, 'Warchief Kargath Bladefist'),
-(413,0,16808,189, 'Warchief Kargath Bladefist'),
-(414,0,24723,0, 'Selin Fireheart'),
-(415,0,24723,0, 'Selin Fireheart'),
-(416,0,24744,0, 'Vexallus'),
-(417,0,24744,0, 'Vexallus'),
-(418,0,24560,0, 'Priestess Delrissa'),
-(419,0,24560,0, 'Priestess Delrissa'),
-(420,0,24664,198, 'Kael''thas Sunstrider'),
-(421,0,24664,201, 'Kael''thas Sunstrider'),
-(422,0,13282,0, 'Noxxion'),
-(423,0,12258,26, 'Razorlash'),
-(424,0,12236,272, 'Lord Vyletongue'),
-(425,0,12225,0, 'Celebras the Cursed'),
-(426,0,12203,0, 'Landslide'),
-(427,0,13601,0, 'Tinkerer Gizlock'),
-(428,0,13596,0, 'Rotgrip'),
-(429,0,12201,273, 'Princess Theradras'),
-(430,0,11517,0, 'Oggleflint'),
-(431,0,11520,4, 'Taragaman the Hungerer'),
-(432,0,11518,0, 'Jergosh the Invoker'),
-(433,0,11519,0, 'Bazzalan'),
-(434,0,7355,0, 'Tuten''kash'),
-(435,0,7357,0, 'Mordresh Fire Eye'),
-(436,0,8567,0, 'Glutton'),
-(437,0,7358,20, 'Amnennar the Coldbringer'),
-(438,0,6168,0, 'Roogug'),
-(439,0,4424,0, 'Aggem Thorncurse'),
-(440,0,4428,0, 'Death Speaker Jargba'),
-(441,0,4420,0, 'Overlord Ramtusk'),
-(443,0,4421,16, 'Charlga Razorflank'),
-(444,0,3983,0, 'Interrogator Vishas'),
-(445,0,4543,18, 'Bloodmage Thalnos'),
-(446,0,3974,0, 'Houndmaster Loksey'),
-(447,0,6487,165, 'Arcanist Doan'),
-(448,0,3975,163, 'Herod'),
-(449,0,4542,0, 'High Inquisitor Fairbanks'),
-(450,0,3977,164, 'High Inquisitor Whitemane'),
-(451,0,10506,0, 'Kirtonos the Herald'),
-(452,0,10503,0, 'Jandice Barov'),
-(453,0,11622,0, 'Rattlegore'),
-(454,0,10433,0, 'Marduk Blackpool'),
-(455,0,10432,0, 'Vectus'),
-(456,0,10508,0, 'Ras Frostwhisper'),
-(457,0,10505,0, 'Instructor Malicia'),
-(458,0,11261,0, 'Doctor Theolen Krastinov'),
-(459,0,10901,0, 'Lorekeeper Polkelt'),
-(460,0,10507,0, 'The Ravenian'),
-(461,0,10504,0, 'Lord Alexei Barov'),
-(462,0,10502,0, 'Lady Illucia Barov'),
-(463,0,1853,2, 'Darkmaster Gandling'),
-(464,0,3914,0, 'Rethilgore'),
-(465,0,3886,0, 'Razorclaw the Butcher'),
-(466,0,3887,0, 'Baron Silverlaine'),
-(467,0,4278,0, 'Commander Springvale'),
-(468,0,4279,0, 'Odo the Blindwatcher'),
-(469,0,4274,0, 'Fenrus the Devourer'),
-(470,0,3927,0, 'Wolf Master Nandos'),
-(471,0,4275,8, 'Archmage Arugal'),
-(472,0,10516,0, 'The Unforgiven'),
-(473,0,10558,0, 'Hearthsinger Forresten'),
-(474,0,10808,0, 'Timmy the Cruel'),
-(475,0,10997,0, 'Cannon Master Willey'),
-(476,0,11032,0, 'Malor the Zealous'),
-(477,0,10811,0, 'Archivist Galford'),
-(478,0,10813,40, 'Balnazzar'),
-(479,0,10436,0, 'Baroness Anastari'),
-(480,0,10437,0, 'Nerub''enkan'),
-(481,0,10438,0, 'Maleki the Pallid'),
-(482,0,10435,0, 'Magistrate Barthilas'),
-(483,0,10439,0, 'Ramnstein the Gorger'),
-(484,0,10440,274, 'Baron Rivendare'),
-(485,0,8580,0, 'Atal''alarion'),
-(486,0,5721,0, 'Dreamscythe'),
-(487,0,5720,0, 'Weaver'),
-(488,0,5710,0, 'Jammal''an the Prophet'),
-(490,0,5719,0, 'Morphaz'),
-(491,0,5722,0, 'Hazzas'),
-(492,0,8443,0, 'Avatar of Hakkar'),
-(493,0,5709,28, 'Shade of Eranikus'),
-(494,0,20870,0, 'Zereketh the Unbound'),
-(495,0,20870,0, 'Zereketh the Unbound'),
-(496,0,20885,0, 'Dalliah the Doomsayer'),
-(497,0,20885,0, 'Dalliah the Doomsayer'),
-(498,0,20886,0, 'Wrath-Scryer Soccothrates'),
-(499,0,20886,0, 'Wrath-Scryer Soccothrates'),
-(500,0,20912,174, 'Harbinger Skyriss'),
-(501,0,20912,190, 'Harbinger Skyriss'),
-(502,0,17976,0, 'Commander Sarannis'),
-(504,0,17976,0, 'Commander Sarannis'),
-(505,0,17975,0, 'High Botanist Freywinn'),
-(506,0,17975,0, 'High Botanist Freywinn'),
-(507,0,17978,0, 'Thorngrin the Tender'),
-(508,0,17978,0, 'Thorngrin the Tender'),
-(509,0,17980,0, 'Laj'),
-(510,0,17980,0, 'Laj'),
-(511,0,17977,173, 'Warp Splinter'),
-(512,0,17977,191, 'Warp Splinter'),
-(513,0,19219,0, 'Mechano-Lord Capacitus'),
-(514,0,19219,0, 'Mechano-Lord Capacitus'),
-(515,0,19221,0, 'Nethermancer Sepethrea'),
-(516,0,19221,0, 'Nethermancer Sepethrea'),
-(517,0,19220,172, 'Pathaleon the Calculator'),
-(518,0,19220,192, 'Pathaleon the Calculator'),
-(519,0,26796,0, 'Frozen Commander'),
-(520,0,26731,0, 'Grand Magus Telestra'),
-(521,0,26731,0, 'Grand Magus Telestra'),
-(522,0,26763,0, 'Anomalus'),
-(523,0,26763,0, 'Anomalus'),
-(524,0,26794,0, 'Ormorok the Tree-Shaper'),
-(525,0,26794,0, 'Ormrok the Tree-Shaper'),
-(526,0,26723,225, 'Keristrasza'),
-(527,0,26723,226, 'Keristrasza'),
-(528,0,27654,0, 'Drakos the Interrogator'),
-(529,0,27654,0, 'Drakos the Interrogator'),
-(530,0,27447,0, 'Varos Cloudstrider'),
-(531,0,27447,0, 'Varos Cloudstrider'),
-(532,0,27655,0, 'Mage-Lord Urom'),
-(533,0,27655,0, 'Mage-Lord Urom'),
-(534,0,27656,206, 'Ley-Guardian Eregos'),
-(535,0,27656,211, 'Ley-Guardian Eregos'),
-(536,0,1696,0, 'Targorr the Dread'),
-(537,0,1666,0, 'Kam Deepfury'),
-(538,0,1717,0, 'Hamhock'),
-(539,0,1716,0, 'Bazil Thredd'),
-(540,0,1663,12, 'Dextren Ward'),
-(541,0,29315,0, 'First Prisoner'),
-(542,0,29315,0, 'First Prisoner'),
-(543,0,29316,0, 'Second Prisoner'),
-(544,0,29316,0, 'Second Prisoner'),
-(545,0,31134,220, 'Cyanigosa'),
-(546,0,31134,221, 'Cyanigosa'),
-(547,0,6910,0, 'Revelosh'),
-(548,0,6906,0, 'The Lost Dwarves'),
-(549,0,7228,0, 'Ironaya'),
-(551,0,7206,0, 'Ancient Stone Keeper'),
-(552,0,7291,0, 'Galgann Firehammer'),
-(553,0,4854,0, 'Grimlok'),
-(554,0,2748,22, 'Archaedas'),
-(555,0,28586,0, 'General Bjarngrim'),
-(556,0,28586,0, 'General Bjarngrim'),
-(557,0,28587,0, 'Volkhan'),
-(558,0,28587,0, 'Volkhan'),
-(559,0,28546,0, 'Ionar'),
-(560,0,28546,0, 'Ionar'),
-(561,0,28923,207, 'Loken'),
-(562,0,28923,212, 'Loken'),
-(563,0,27977,0, 'Krystallus'),
-(564,0,27977,0, 'Krystallus'),
-(565,0,27975,0, 'Maiden of Grief'),
-(566,0,27975,0, 'Maiden of Grief'),
-(567,1,59046,0, 'Tribunal of Ages'),
-(568,1,59046,0, 'Tribunal of Ages'),
-(569,0,27978,208, 'Sjonnir the Ironshaper'),
-(570,0,27978,213, 'Sjonnir the Ironshaper'),
-(571,0,23953,0, 'Prince Keleseth'),
-(572,0,23953,0, 'Prince Keleseth'),
-(573,0,24201,0, 'Skarvold & Dalronn'),
-(574,0,24201,0, 'Skarvold & Dalronn'),
-(575,0,23954,202, 'Ingvar the Plunderer'),
-(576,0,23954,242, 'Ingvar the Plunderer'),
-(577,0,26668,0, 'Svala Sorrowgrave'),
-(578,0,26668,0, 'Svala Sorrowgrave'),
-(579,0,26687,0, 'Gortok Palehoof'),
-(580,0,26687,0, 'Gortok Palehoof'),
-(581,0,26693,0, 'Skadi the Ruthless'),
-(582,0,26693,0, 'Skadi the Ruthless'),
-(583,0,26861,203, 'King Ymiron'),
-(584,0,26861,205, 'King Ymiron'),
-(585,0,3671,0, 'Lady Anacondra'),
-(586,0,3669,0, 'Lord Cobrahn'),
-(587,0,3653,0, 'Kresh'),
-(588,0,3670,0, 'Lord Pythas'),
-(589,0,3674,0, 'Skum'),
-(590,0,3673,0, 'Lord Serpentis'),
-(591,0,5775,0, 'Verdan the Everliving'),
-(592,0,3654,1, 'Mutanus the Devourer'),
-(593,0,7795,0, 'Hydromancer Velratha'),
-(594,0,7273,0, 'Ghaz''rilla'),
-(595,0,8127,0, 'Antu''sul'),
-(596,0,7272,0, 'Theka the Martyr'),
-(597,0,7271,0, 'Witch Doctor Zum''rah'),
-(598,0,7796,0, 'Nekrum Gutchewer'),
-(599,0,7275,0, 'Shadowpriest Sezz''ziz'),
-(600,0,7267,24, 'Chief Ukorz Sandscalp'),
-(601,0,22887,0, 'High Warlord Naj''entus'),
-(602,0,22898,0, 'Supremus'),
-(603,0,22841,0, 'Shade of Akama'),
-(604,0,22871,0, 'Teron Gorefiend'),
-(605,0,22948,0, 'Gurtogg Bloodboil'),
-(606,0,23420,0, 'Reliquary of Souls'),
-(607,0,22947,0, 'Mother Shahraz'),
-(608,0,23426,0, 'The Illidari Council'),
-(609,0,22917,196, 'Illidan Stormrage'),
-(610,0,12435,0, 'Razorgore the Untamed'),
-(611,0,13020,0, 'Vaelastrasz the Corrupt'),
-(612,0,12017,0, 'Broodlord Lashlayer'),
-(613,0,11983,0, 'Firemaw'),
-(614,0,14601,0, 'Ebonroc'),
-(615,0,11981,0, 'Flamegor'),
-(616,0,14020,0, 'Chromaggus'),
-(617,0,11583,50, 'Nefarian'),
-(618,0,17767,0, 'Rage Winterchill'),
-(619,0,17808,0, 'Anetheron'),
-(620,0,17888,0, 'Kaz''rogal'),
-(621,0,17842,0, 'Azgalor'),
-(622,0,17968,195, 'Archimonde'),
-(623,0,21216,0, 'Hydross the Unstable'),
-(624,0,21217,0, 'The Lurker Below'),
-(625,0,21215,0, 'Leotheras the Blind'),
-(626,0,21214,0, 'Fathom-Lord Karathress'),
-(627,0,21213,0, 'Morogrim Tidewalker'),
-(628,0,21212,194, 'Lady Vashj'),
-(629,0,34797,0, 'Northrend Beasts'),
-(630,0,34797,0, 'Northrend Beasts'),
-(631,0,34797,0, 'Northrend Beasts'),
-(632,0,34797,0, 'Northrend Beasts'),
-(633,0,34780,0, 'Lord Jaraxxus'),
-(634,0,34780,0, 'Lord Jaraxxus'),
-(635,0,34780,0, 'Lord Jaraxxus'),
-(636,0,34780,0, 'Lord Jaraxxus'),
-(637,1,68184,0, 'Faction Champions'),
-(638,1,68184,0, 'Faction Champions'),
-(639,1,68184,0, 'Faction Champions'),
-(640,1,68184,0, 'Faction Champions'),
-(641,0,34496,0, 'Val''kyr Twins'),
-(642,0,34496,0, 'Val''kyr Twins'),
-(643,0,34496,0, 'Val''kyr Twins'),
-(644,0,34496,0, 'Val''kyr Twins'),
-(645,0,34564,246, 'Anub''arak'),
-(646,0,34564,248, 'Anub''arak'),
-(647,0,34564,247, 'Anub''arak'),
-(648,0,34564,250, 'Anub''arak'),
-(649,0,18831,0, 'High King Maulgar'),
-(650,0,19044,177, 'Gruul the Dragonkiller'),
-(651,0,17257,176, 'Magtheridon'),
-(652,0,15550,0, 'Attumen the Huntsman'),
-(653,0,15687,0, 'Moroes'),
-(654,0,16457,0, 'Maiden of the Virtue'),
-(655,0,16812,0, 'Opera Event'),
-(656,0,15691,0, 'The Curator'),
-(657,0,15688,0, 'Terestian Illhoof'),
-(658,0,16524,0, 'Shade of Aran'),
-(659,0,15689,0, 'Netherspite'),
-(660,0,22520,0, 'Chess Event'),
-(661,0,15690,175, 'Prince Malchezaar'),
-(662,0,17225,0, 'Nightbane'),
-(663,0,12118,0, 'Lucifron'),
-(664,0,11982,0, 'Magmadar'),
-(665,0,12259,0, 'Gehennas'),
-(666,0,12057,0, 'Garr'),
-(667,0,12264,0, 'Shazzrah'),
-(668,0,12056,0, 'Baron Geddon'),
-(669,0,12098,0, 'Sulfuron Harbinger'),
-(670,0,11988,0, 'Golemagg the Incinerator'),
-(671,0,12018,0, 'Majordomo Executus'),
-(672,0,11502,48, 'Ragnaros'),
-(673,0,15956,0, 'Anub''Rekhan'),
-(674,0,15956,0, 'Anub''Rekhan'),
-(677,0,15953,0, 'Grand Widow Faerlina'),
-(678,0,15953,0, 'Grand Widow Faerlina'),
-(679,0,15952,0, 'Maexxna'),
-(680,0,15952,0, 'Maexxna'),
-(681,0,15954,0, 'Noth the Plaguebringer'),
-(682,0,15954,0, 'Noth the Plaguebringer'),
-(683,0,15936,0, 'Heigan the Unclean'),
-(684,0,15936,0, 'Heigan the Unclean '),
-(685,0,16011,0, 'Loatheb'),
-(686,0,16011,0, 'Loatheb'),
-(687,0,16061,0, 'Instructor Razuvious'),
-(689,0,16061,0, 'Instructor Razuvious'),
-(690,0,16060,0, 'Gothik the Harvester'),
-(691,0,16060,0, 'Gothik the Harvester'),
-(692,1,59450,0, 'The Four Horsemen'),
-(693,1,59450,0, 'The Four Horsemen'),
-(694,0,16028,0, 'Patchwerk'),
-(695,0,16028,0, 'Patchwerk '),
-(696,0,15931,0, 'Grobbulus'),
-(697,0,15931,0, 'Grobbulus'),
-(698,0,15932,0, 'Gluth'),
-(699,0,15932,0, 'Gluth'),
-(700,0,15928,0, 'Thaddius'),
-(701,0,15928,0, 'Thaddius'),
-(702,0,15989,0, 'Sapphiron'),
-(703,0,15989,0, 'Sapphiron'),
-(704,0,15990,159, 'Kel''Thuzad'),
-(706,0,15990,227, 'Kel''Thuzad'),
-(707,0,10184,46, 'Onyxia'),
-(708,0,10184,257, 'Onyxia'),
-(709,0,15263,0, 'The Prophet Skeram'),
-(710,0,15544,0, 'Silithid Royalty'),
-(711,0,15516,0, 'Battleguard Sartura'),
-(712,0,15510,0, 'Fankriss the Unyielding'),
-(713,0,15299,0, 'Viscidus'),
-(714,0,15509,0, 'Princess Huhuran'),
-(715,0,15275,0, 'Twin Emperors'),
-(716,0,15517,0, 'Ouro'),
-(717,0,15727,161, 'C''thun'),
-(718,0,15348,0, 'Kurinnaxx'),
-(719,0,15341,0, 'General Rajaxx'),
-(720,0,15340,0, 'Moam'),
-(721,0,15370,0, 'Buru the Gorger'),
-(722,0,15369,0, 'Ayamiss the Hunter'),
-(723,0,15339,160, 'Ossirian the Unscarred'),
-(724,0,24892,0, 'Kalecgos'),
-(725,0,24882,0, 'Brutallus'),
-(726,0,25038,0, 'Felmyst'),
-(727,0,25165,0, 'Eredar Twins'),
-(728,0,25840,0, 'M''uru'),
-(729,0,25315,199, 'Kil''jaeden'),
-(730,0,19514,0, 'Al''ar'),
-(731,0,19516,0, 'Void Reaver'),
-(732,0,18805,0, 'High Astromancer Solarian'),
-(733,0,19622,193, 'Kael''thas Sunstrider'),
-(734,0,28859,223, 'Malygos'),
-(735,0,28859,237, 'Malygos'),
-(736,0,30452,0, 'Tenebron'),
-(737,0,30452,0, 'Tenebron'),
-(738,0,30451,0, 'Shadron'),
-(739,0,30451,0, 'Shadron'),
-(740,0,30449,0, 'Vesperon'),
-(741,0,30449,0, 'Vesperon'),
-(742,0,28860,224, 'Sartharion'),
-(743,0,28860,238, 'Sartharion'),
-(744,0,33113,0, 'Flame Leviathan'),
-(745,0,33118,0, 'Ignis the Furnace Master'),
-(746,0,33186,0, 'Razorscale'),
-(747,0,33293,0, 'XT-002 Deconstructor'),
-(748,1,65195,0, 'The Iron Council'),
-(749,0,32930,0, 'Kologarn'),
-(750,0,33515,0, 'Auriaya'),
-(751,1,64899,0, 'Hodir'),
-(752,1,64985,0, 'Thorim'),
-(753,1,65074,0, 'Freya'),
-(754,0,33432,0, 'Mimiron'),
-(755,0,33271,0, 'General Vezax'),
-(756,0,33288,0, 'Yogg-Saron'),
-(757,0,32871,243, 'Algalon the Observer'),
-(758,0,33113,0, 'Flame Leviathan'),
-(759,0,33118,0, 'Ignis the Furnace Master'),
-(760,0,33186,0, 'Razorscale'),
-(761,0,33293,0, 'XT-002 Deconstructor'),
-(762,1,65195,0, 'The Iron Council'),
-(763,0,32930,0, 'Kologarn'),
-(764,0,33515,0, 'Auriaya'),
-(765,1,64899,0, 'Hodir'),
-(766,1,64985,0, 'Thorim'),
-(767,1,65074,0, 'Freya'),
-(768,0,33432,0, 'Mimiron'),
-(769,0,33271,0, 'General Vezax'),
-(770,0,33288,0, 'Yogg-Saron'),
-(771,0,32871,244, 'Algalon the Observer'),
-(772,0,31125,0, 'Archavon the Stone Watcher'),
-(773,0,31125,0, 'Archavon the Stone Watcher'),
-(774,0,33993,0, 'Emalon the Storm Watcher'),
-(775,0,33993,0, 'Emalon the Storm Watcher'),
-(776,0,35013,0, 'Koralon the Flame Watcher'),
-(777,0,35013,0, 'Koralon the Flame Watcher'),
-(778,0,23574,0, 'Akil''zon'),
-(779,0,23576,0, 'Nalorakk'),
-(780,0,23578,0, 'Jan''alai'),
-(781,0,23577,0, 'Halazzi'),
-(782,0,24239,0, 'Hex Lord Malacrass'),
-(783,0,23863,197, 'Zul''jin'),
-(784,0,14507,0, 'High Priest Venoxis'),
-(785,0,14517,0, 'High Priestess Jeklik'),
-(786,0,14510,0, 'High Priestess Mar''li'),
-(787,0,11382,0, 'Bloodlord Mandokir'),
-(788,0,15083,0, 'Edge of Madness'),
-(789,0,14509,0, 'High Priest Thekal'),
-(790,0,15114,0, 'Gahz''ranka'),
-(791,0,14515,0, 'High Priestess Arlokk'),
-(792,0,11380,0, 'Jin''do the Hexxer'),
-(793,0,14834,42, 'Hakkar'),
-(829,0,36497,0, 'Bronjahm'),
-(830,0,36497,0, 'Bronjahm '),
-(831,0,36502,251, 'Devourer of Souls'),
-(832,0,36502,252, 'Devourer of Souls'),
-(833,0,36494,0, 'Forgemaster Garfrost'),
-(834,0,36494,0, 'Forgemaster Garfrost'),
-(835,0,36476,0, 'Krick'),
-(836,0,36476,0, 'Krick'),
-(837,0,36658,253, 'Overlord Tyrannus'),
-(838,0,36658,254, 'Overlord Tyrannus'),
-(839,0,38113,0, 'Marwyn'),
-(840,0,38113,0, 'Marwyn'),
-(841,0,38112,0, 'Falric'),
-(842,0,38112,0, 'Falric'),
-(843,1,72830,255, 'Escaped from Arthas'),
-(844,1,72830,256, 'Escaped from Arthas'),
-(845,0,36612,0, 'Lord Marrowgar'),
-(846,0,36855,0, 'Lady Deathwhisper'),
-(847,1,72959,0, 'Icecrown Gunship Battle'),
-(848,0,37813,0, 'Deathbringer Saurfang'),
-(849,0,36626,0, 'Festergut'),
-(850,0,36627,0, 'Rotface'),
-(851,0,36678,0, 'Professor Putricide'),
-(852,0,37970,0, 'Blood Council'),
-(853,0,37955,0, 'Queen Lana''thel'),
-(854,1,72706,0, 'Valithria Dreamwalker'),
-(855,0,36853,0, 'Sindragosa'),
-(856,0,36597,279, 'The Lich King'),
-(857,0,36612,0, 'Lord Marrowgar'),
-(858,0,36855,0, 'Lady Deathwhisper'),
-(859,1,72959,0, 'Icecrown Gunship Battle'),
-(860,0,37813,0, 'Deathbringer Saurfang'),
-(861,0,36626,0, 'Festergut'),
-(862,0,36627,0, 'Rotface'),
-(863,0,36678,0, 'Professor Putricide'),
-(864,0,37970,0, 'Blood Council'),
-(865,0,37955,0, 'Queen Lana''thel'),
-(866,1,72706,0, 'Valithria Dreamwalker'),
-(867,0,36853,0, 'Sindragosa'),
-(868,0,36597,280, 'The Lich King'),
-(883,0,4422,0, 'Agathelos the Raging'),
-(885,0,38433,239, 'Toravon the Ice Watcher'),
-(886,0,38433,240, 'Toravon the Ice Watcher'),
-(887,0,39863,293, 'Halion'),
-(888,0,39863,294, 'Halion'),
-(889,0,39751,0, 'Baltharus the Warborn'),
-(890,0,39751,0, 'Baltharus the Warborn'),
-(891,0,39747,0, 'Saviana Ragefire'),
-(892,0,39747,0, 'Saviana Ragefire'),
-(893,0,39746,0, 'General Zarithrian'),
-(894,0,39746,0, 'General Zarithrian');
-/*!40000 ALTER TABLE `instance_encounters` ENABLE KEYS */;
-UNLOCK TABLES;
diff --git a/sql/old/3.3.5a/2011_02_03_1_world_command.sql b/sql/old/3.3.5a/2011_02_03_1_world_command.sql
deleted file mode 100644
index 8902097fb06..00000000000
--- a/sql/old/3.3.5a/2011_02_03_1_world_command.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `command` WHERE `name`='reload lfg_dungeon_encounters';
diff --git a/sql/old/3.3.5a/2011_02_03_2_world_lfg_dungeon_encounters.sql b/sql/old/3.3.5a/2011_02_03_2_world_lfg_dungeon_encounters.sql
deleted file mode 100644
index 9820317ccf1..00000000000
--- a/sql/old/3.3.5a/2011_02_03_2_world_lfg_dungeon_encounters.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS `lfg_dungeon_encounters`;
diff --git a/sql/old/3.3.5a/2011_02_03_3_world_spell_dbc.sql b/sql/old/3.3.5a/2011_02_03_3_world_spell_dbc.sql
deleted file mode 100644
index 0d26399cf42..00000000000
--- a/sql/old/3.3.5a/2011_02_03_3_world_spell_dbc.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-DELETE FROM `spell_dbc` WHERE `Id` IN (58630,68572,68574,59046,68184,59450,65195,64899,64985,65074);
-INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`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
-(58630,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Mal''ganis credit marker'),
-(68572,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Grand Champions credit marker'),
-(68574,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Argent Champion credit marker'),
-(59046,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Tribunal of Ages credit marker'),
-(68184,0,0,536870912,0,0,0,0,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,18,0,0,16,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'),
-(59450,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'The Four Horsemen credit marker'),
-(65195,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'The Iron Council credit marker'),
-(64899,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Hodir credit marker'),
-(64985,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Thorim credit marker'),
-(65074,0,0,536870912,0,0,0,0,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,18,0,0,16,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,'Freya credit marker');
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_battleground_isle_of_conquest.sql b/sql/old/3.3.5a/2011_02_04_00_world_battleground_isle_of_conquest.sql
new file mode 100644
index 00000000000..368f2db97c3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_battleground_isle_of_conquest.sql
@@ -0,0 +1,78 @@
+-- Alliance Gunship Cannon
+UPDATE `creature_template` SET `spell1`=69495,`VehicleId`=452 WHERE `entry`=34929;
+-- Horde Gunship Cannon
+UPDATE `creature_template` SET `spell1`=68825,`VehicleId`=453 WHERE `entry`=34935;
+-- Keep Cannon
+UPDATE `creature_template` SET `VehicleId`=160,`spell1`=67452,`spell2`=68169 WHERE `entry`=34944;
+-- Catapult
+UPDATE `creature_template` SET `VehicleId`=438,`spell1`=66218,`spell2`=66296 WHERE `entry`=34793;
+-- Demolisher
+UPDATE `creature_template` SET `VehicleId`=509,`spell1`=67442,`spell2`=68068 WHERE `entry`=34775;
+-- Siege Engine
+UPDATE `creature_template` SET `VehicleId`=447,`spell1`=67816,`spell2`=69502 WHERE `entry`=34776;
+-- Siege Engine
+UPDATE `creature_template` SET `VehicleId`=436,`spell1`=67816,`spell2`=69502 WHERE `entry`=35069;
+-- Glaive Thrower
+UPDATE `creature_template` SET `VehicleId`=447,`spell1`=68827,`spell2`=69515 WHERE `entry`=34802;
+-- Glaive Thrower
+UPDATE `creature_template` SET `VehicleId`=447,`spell1`=68827,`spell2`=69515 WHERE `entry`=35273;
+-- Flame Turret
+UPDATE `creature_template` SET `spell1`=68832 WHERE `entry`=34778;
+-- Flame Turret
+UPDATE `creature_template` SET `spell1`=68832 WHERE `entry`=36356;
+-- Siege Turret
+UPDATE `creature_template` SET `spell1`=67462,`spell2`=69505 WHERE `entry`=34777;
+-- Siege Turret
+UPDATE `creature_template` SET `spell1`=67462,`spell2`=69505 WHERE `entry`=36355;
+-- Catapult speed
+UPDATE `creature_template` SET `speed_run`=2.428571,`speed_walk`=2.8 WHERE `entry`=34793;
+
+-- Update alliance boss faction 
+UPDATE `creature_template` SET `faction_A`=84, `faction_H`=84 WHERE `entry`=34924;
+-- Update horde boss faction 
+UPDATE `creature_template` SET `faction_A`=83, `faction_H`=83 WHERE `entry`=34922;
+-- Update Kor Kron Guard faction 
+UPDATE `creature_template` SET `faction_A`=83, `faction_H`=83 WHERE `entry`=34918;
+-- Update Npc Seven TH Legion Infantry faction 
+UPDATE `creature_template` SET `faction_A`=84, `faction_H`=84 WHERE `entry`=34919;
+
+-- those doors are not selectables
+UPDATE `gameobject_template` SET `flags`=0x00000021 WHERE `entry` IN (195223,195703,195491,195451,195452,195437,195436);
+
+-- alliance bombs, they can be only used by the horde
+UPDATE `gameobject_template` SET `faction`=1995 WHERE `entry`=195332;
+-- horde bombs, they can be only used by the alliance
+UPDATE `gameobject_template` SET `faction`=1997 WHERE `entry`=195333;
+
+-- horde teleporters
+UPDATE `gameobject_template` SET `faction`=1995 WHERE `entry` IN  (195314,195313);
+-- alliance teleporters
+UPDATE `gameobject_template` SET `faction`=1997 WHERE `entry` IN (195315,195316);
+
+-- Achievement Glaive Grave
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry`=12183;
+
+-- Achievement Mowed Down
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (12068,12114);
+
+-- Refinery's and Quarry's spells.
+DELETE FROM `spell_area` WHERE `spell` IN (68719,68720);
+INSERT INTO `spell_area` (`spell`,`area`) VALUES 
+(68719,4741),
+(68719,4747),
+(68719,4748),
+(68719,4749),
+(68719,4750),
+(68719,4751),
+(68719,4752),
+(68719,4753),
+(68719,4710),
+(68720,4741),
+(68720,4747),
+(68720,4748),
+(68720,4749),
+(68720,4750),
+(68720,4751),
+(68720,4752),
+(68720,4710),
+(68720,4753);
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_conditions.sql b/sql/old/3.3.5a/2011_02_04_00_world_conditions.sql
new file mode 100644
index 00000000000..504835cd8b9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_conditions.sql
@@ -0,0 +1,5 @@
+DELETE FROM `conditions` WHERE `SourceEntry` IN (62521,62524,62525);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,62524,0,18,1,32906,0,0,'','Attuned to Nature 2 Dose Reduction'),
+(13,0,62525,0,18,1,32906,0,0,'','Attuned to Nature 10 Dose Reduction'),
+(13,0,62521,0,18,1,32906,0,0,'','Attuned to Nature 25 Dose Reduction');
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_creature_631.sql b/sql/old/3.3.5a/2011_02_04_00_world_creature_631.sql
new file mode 100644
index 00000000000..c9db3f6a929
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_creature_631.sql
@@ -0,0 +1,70 @@
+SET @GUID := 151761;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+64;
+INSERT INTO creature
+   (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`)
+VALUES
+(@GUID,37122,631,15,1,0,0,4365.98,2672.63,349.271,4.67748,604800,0,0,130330,4081,0,0,0,0,0), --  Captain Arnath
+(@GUID+1,37123,631,15,1,0,0,4361.32,2675.74,349.389,4.64258,604800,0,0,130330,61215,0,0,0,0,0), --  Captain Brandon
+(@GUID+2,37124,631,15,1,0,0,4349.95,2677.52,349.306,4.83962,604800,0,0,130330,0,0,0,0,0,0), --  Captain Grondel
+(@GUID+3,37125,631,15,1,0,0,4347.03,2673.68,349.37,4.85202,604800,0,0,130330,0,0,0,0,0,0), --  Captain Rupert
+(@GUID+4,37127,631,15,1,0,0,4346.72,2607.9,351.101,3.23426,7200,0,0,453600,8814,0,0,0,0,0), --  Ymirjar Frostbinder
+(@GUID+5,37127,631,15,1,0,0,4371.41,2570.52,351.101,0.0808906,7200,0,0,453600,8814,0,0,0,0,0), --  Ymirjar Frostbinder
+(@GUID+6,37129,631,15,1,0,0,4356.9,2673.27,349.47,4.76475,604800,0,0,278900,0,0,0,0,0,0), --  Crok Scourgebane
+(@GUID+7,37132,631,15,1,0,0,4347.2,2637.91,351.1,1.34068,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
+(@GUID+8,37132,631,15,1,0,0,4367.9,2638.14,351.1,1.77657,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
+(@GUID+9,37132,631,15,1,0,0,4345.88,2577.64,351.101,1.52995,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
+(@GUID+10,37132,631,15,1,0,0,4368.03,2578.97,351.101,1.69096,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
+(@GUID+11,37132,631,15,1,0,0,4369.26,2525.06,358.433,1.78913,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
+(@GUID+12,37132,631,15,1,0,0,4343.78,2525.43,358.433,1.26291,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
+(@GUID+13,37133,631,15,1,0,0,4356.85,2636.39,351.101,1.56922,7200,0,0,630000,0,0,0,0,0,0), --  Ymirjar Warlord
+(@GUID+14,37133,631,15,1,0,0,4346.98,2512.75,358.441,1.35716,7200,0,0,630000,0,0,0,0,0,0), --  Ymirjar Warlord
+(@GUID+15,37133,631,15,1,0,0,4356.77,2524.27,358.433,1.50246,7200,0,0,630000,0,0,0,0,0,0), --  Ymirjar Warlord
+(@GUID+16,37134,631,15,1,0,0,4351.66,2642.95,351.1,1.40351,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
+(@GUID+17,37134,631,15,1,0,0,4362.18,2642.97,351.1,1.5331,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
+(@GUID+18,37134,631,15,1,0,0,4363.48,2585.09,351.101,1.58493,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
+(@GUID+19,37134,631,15,1,0,0,4349.36,2584.54,351.101,1.60849,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
+(@GUID+20,37134,631,15,1,0,0,4350.65,2528.31,358.433,1.52995,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
+(@GUID+21,37134,631,15,1,0,0,4362.76,2527.67,358.433,1.48282,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
+(@GUID+22,37531,631,15,1,0,0,4362.85,2514.43,203.383,0.541144,7200,0,0,1134000,0,0,0,0,0,0), --  Frostwarden Handler
+(@GUID+23,37531,631,15,1,0,0,4360.96,2454.38,203.384,5.7719,7200,0,0,1134000,0,0,0,0,0,0), --  Frostwarden Handler
+(@GUID+24,37532,631,15,1,0,0,4389.66,2533.88,203.387,1.49305,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+25,37532,631,15,1,0,0,4379.52,2517.11,203.383,1.55823,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+26,37532,631,15,1,0,0,4379.45,2510.21,203.382,2.77324,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+27,37532,631,15,1,0,0,4377.98,2511.69,203.384,0.0361331,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+28,37532,631,15,1,0,0,4376.07,2508.98,203.384,0.95662,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+29,37532,631,15,1,0,0,4371.45,2514.37,203.383,3.35915,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+30,37532,631,15,1,0,0,4377.53,2519.25,203.384,5.76561,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+31,37532,631,15,1,0,0,4385.71,2530.45,203.387,3.85552,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+32,37532,631,15,1,0,0,4374.05,2457.47,203.382,4.73831,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+33,37532,631,15,1,0,0,4373.95,2461.52,203.382,3.47539,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+34,37532,631,15,1,0,0,4375.93,2455.54,203.383,4.69512,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+35,37532,631,15,1,0,0,4383.62,2529.27,203.386,5.19698,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+36,37532,631,15,1,0,0,4389.28,2528.94,203.386,6.22428,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+37,37532,631,15,1,0,0,4380.05,2456.41,203.382,0.00314776,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+38,37532,631,15,1,0,0,4376.26,2462.41,203.382,2.58318,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+39,37532,631,15,1,0,0,4378.17,2462.99,203.381,4.13827,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+40,37532,631,15,1,0,0,4383.05,2523.33,203.387,4.35504,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+41,37532,631,15,1,0,0,4372.52,2452.47,203.384,3.70002,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+42,37532,631,15,1,0,0,4381.59,2533.12,203.386,3.60734,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+43,37532,631,15,1,0,0,4386.49,2535.52,203.386,3.07248,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+44,37532,631,15,1,0,0,4385.64,2512.62,203.384,4.82235,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+45,37532,631,15,1,0,0,4373.77,2438.67,203.386,4.50819,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+46,37532,631,15,1,0,0,4370.54,2441.32,203.386,2.44731,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+47,37532,631,15,1,0,0,4376.09,2442.12,203.386,0.133524,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+48,37532,631,15,1,0,0,4379.22,2439.67,203.386,5.39491,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+49,37532,631,15,1,0,0,4380.51,2434.97,203.387,4.65585,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+50,37532,631,15,1,0,0,4382.9,2439.76,203.387,1.10506,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+51,37532,631,15,1,0,0,4381.45,2444.52,203.386,3.39057,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
+(@GUID+52,38125,631,15,1,0,0,4369.75,2606.94,351.101,6.24627,7200,0,0,567000,3994,0,0,0,0,0), --  Ymirjar Deathbringer
+(@GUID+53,38125,631,15,1,0,0,4340.83,2572.01,351.101,3.14394,7200,0,0,567000,3994,0,0,0,0,0), --  Ymirjar Deathbringer
+(@GUID+54,38154,631,15,1,0,0,4360.11,2644.49,351.1,1.58808,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
+(@GUID+55,38154,631,15,1,0,0,4355.22,2644.43,351.1,1.58415,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
+(@GUID+56,38154,631,15,1,0,0,4359.36,2587.74,351.101,1.64776,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
+(@GUID+57,38154,631,15,1,0,0,4354.53,2587.01,351.101,1.64383,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
+(@GUID+58,38229,631,15,1,2177,0,4358.06,2608.39,351.184,2.86266,604800,5,0,13,0,0,1,0,0,0), --  Frozen Insect
+(@GUID+59,38229,631,15,1,9829,0,4352.01,2664.59,350.18,6.12231,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
+(@GUID+60,38229,631,15,1,2177,0,4356.72,2408.48,358.432,4.04586,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
+(@GUID+61,38229,631,15,1,7511,0,4359.53,2656.51,351.101,0.198085,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
+(@GUID+62,38229,631,15,1,7511,0,4351.09,2488.49,358.441,1.93736,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
+(@GUID+63,38229,631,15,1,2177,0,4356.68,2525.39,358.432,1.69568,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
+(@GUID+64,38229,631,15,1,2177,0,4352.72,2610.13,351.101,2.82663,604800,5,0,13,0,0,1,0,0,0); -- Frozen Insect
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_creature_questrelation.sql b/sql/old/3.3.5a/2011_02_04_00_world_creature_questrelation.sql
new file mode 100644
index 00000000000..b00304dc6eb
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_creature_questrelation.sql
@@ -0,0 +1,2 @@
+-- Fix starting NPC for quest "Scrying Goggles? No Problem!"
+DELETE FROM `creature_questrelation` WHERE `quest`=8578;  -- Delete existing incorrect start point
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_creature_template.sql b/sql/old/3.3.5a/2011_02_04_00_world_creature_template.sql
new file mode 100644
index 00000000000..6a90ac98761
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Remove XP at kill from Flesh Eating Worm
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64 WHERE `entry`=2462;
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_game_event.sql b/sql/old/3.3.5a/2011_02_04_00_world_game_event.sql
new file mode 100644
index 00000000000..1e84cce9883
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_game_event.sql
@@ -0,0 +1,15 @@
+-- Update start date of game event for 2011
+-- Based on retail IG calendar
+UPDATE `game_event` SET `start_time` = '2011-06-21 00:01:00' WHERE `entry`=1; -- Midsummer Fire Festival
+UPDATE `game_event` SET `start_time` = '2011-12-15 06:00:00' WHERE `entry`=2; -- Winter Veil
+UPDATE `game_event` SET `start_time` = '2011-02-06 00:01:00' WHERE `entry`=3; -- Darkmoon Faire - Terrokkar Forest
+UPDATE `game_event` SET `start_time` = '2011-03-06 00:01:00' WHERE `entry`=4; -- Darkmoon Faire - Elwynn Forest
+UPDATE `game_event` SET `start_time` = '2011-01-02 00:01:00' WHERE `entry`=5; -- Darkmoon Faire - Mulgore
+UPDATE `game_event` SET `start_time` = '2011-01-23 00:01:00' WHERE `entry`=7; -- Lunar Festival
+UPDATE `game_event` SET `start_time` = '2011-02-06 00:01:00' WHERE `entry`=8; -- Love is in the Air
+UPDATE `game_event` SET `start_time` = '2011-04-24 00:01:00' WHERE `entry`=9; -- Noblegarden
+UPDATE `game_event` SET `start_time` = '2011-05-01 00:01:00' WHERE `entry`=10; -- Childrens Week
+UPDATE `game_event` SET `start_time` = '2011-09-06 00:01:00' WHERE `entry`=11; -- Harvest Festival
+UPDATE `game_event` SET `start_time` = '2011-10-18 01:00:00' WHERE `entry`=12; -- Hallow's End
+UPDATE `game_event` SET `start_time` = '2011-03-03 00:01:00' WHERE `entry`=23; -- Darkmoon Faire Building - Elwynn Forest
+UPDATE `game_event` SET `start_time` = '2011-09-19 00:01:00' WHERE `entry`=52; -- Pirates Day
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_gameobject_questrelation.sql b/sql/old/3.3.5a/2011_02_04_00_world_gameobject_questrelation.sql
new file mode 100644
index 00000000000..480d7f63295
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_gameobject_questrelation.sql
@@ -0,0 +1,3 @@
+-- Fix starting NPC for quest "Scrying Goggles? No Problem!"
+DELETE FROM `gameobject_questrelation` WHERE `quest`=8578;  -- Delete any existing values for this quest
+INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES (180642,8578); -- Insert correct values for start point of quest
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_instance_pit_of_saron.sql b/sql/old/3.3.5a/2011_02_04_00_world_instance_pit_of_saron.sql
new file mode 100644
index 00000000000..8e4584618ee
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_instance_pit_of_saron.sql
@@ -0,0 +1,129 @@
+DELETE FROM `creature` WHERE `id` IN (36610,36731,36477,36658,31260); -- Delete Temp Trigger Spawns
+
+-- DB Data (souce: SNIFF)
+UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`unit_flags`=0x02008000,`faction_A`=14,`faction_H`=14,`flags_extra`=`flags_extra`|0x80 WHERE `entry`=37670; -- Frostblade
+UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`flags_extra`=`flags_extra`|0x80 WHERE `entry`=36610; -- Exploding Orb
+UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`scale`=1.1,`flags_extra`=`flags_extra`|0x80 WHERE `entry`=36731; -- Icy Blast
+UPDATE `creature_template` SET `speed_run`=1.857143,`speed_walk`=3.2,`unit_flags`=0x00000040,`faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`equipment_id`=1872 WHERE `entry` IN (36658,36938); -- Scourgelord Tyrannus
+UPDATE `creature_template` SET `speed_run`=1.5873,`speed_walk`=2,`unit_flags`=0x00000040 WHERE `entry`=36661; -- Rimefang
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x80 WHERE `entry`=36495; -- Forgemaster Putridus Invisible Stalker
+UPDATE `creature_template` SET `VehicleId`=560 WHERE `entry`=37626; -- Iceborn Protodrake (1)
+
+-- SAI for Plagueborn Horror
+SET @ENTRY := 36879;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,5000,5000,10000,10000,11,69581,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Pustulant Flesh on Random Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,5000,5000,10000,10000,11,70273,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Pustulant Flesh on Random Target (Heroic)'),
+(@ENTRY,0,2,0,0,0,100,6,8000,8000,8000,8000,11,70274,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Toxic Waste on Random Target'),
+(@ENTRY,0,3,0,2,0,100,6,15,15,0,0,11,69582,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Blight Bomb self at 15pct Health');
+
+-- SAI for Hungering Ghoul
+SET @ENTRY := 37711;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,6,4000,6000,8000,12000,11,70393,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Devour Flesh on current Target');
+
+-- SAI for Deathwhisper Shadowcaster
+SET @ENTRY := 37712;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,100,100,3000,3000,11,70386,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,100,100,3000,3000,11,70387,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Heroic)');
+
+-- SAI for Deathwhisper Torturer
+SET @ENTRY := 37713;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,6,10000,10000,10000,10000,11,70392,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Black Brand on current Target'),
+(@ENTRY,0,1,0,0,0,100,6,6000,6000,13000,13000,11,70391,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Curse of Agony on Random Target');
+
+-- SAI for Ymirjar Wrathbringer
+SET @ENTRY := 36840;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,7000,7000,8000,8000,11,69603,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Blight on Random Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,7000,7000,8000,8000,11,70285,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Blight on Random Target (Heroic)');
+
+-- SAI for Stonespine Gargoyle
+SET @ENTRY := 36896;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,1000,1000,5000,5000,11,69520,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Gargoyle Strike on current Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,1000,1000,5000,5000,11,70275,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Gargoyle Strike on current Target (Heroic)'),
+(@ENTRY,0,2,0,2,0,100,6,10,10,0,0,11,69575,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Stoneform self at 10pct Health');
+
+-- SAI for Wrathbone Sorcerer
+SET @ENTRY := 37728;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,3000,3000,8000,8000,11,75330,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,3000,3000,8000,8000,11,75331,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Heroic)');
+
+-- SAI for Wrathbone Coldwraith
+SET @ENTRY := 36842;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,100,100,3000,3000,11,69573,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Frostbolt on current Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,100,100,3000,3000,11,70277,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Frostbolt on current Target (Heroic)'),
+(@ENTRY,0,2,0,0,0,100,2,9000,9000,15000,15000,11,69574,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Freezing Circle on current Target (Non-Heroic)'),
+(@ENTRY,0,3,0,0,0,100,4,9000,9000,15000,15000,11,70276,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Freezing Circle on current Target (Heroic)');
+
+-- SAI for Deathwhisper Necrolyte
+SET @ENTRY := 36788;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,100,100,3000,3000,11,69577,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,100,100,3000,3000,11,70270,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Heroic)'),
+(@ENTRY,0,2,0,0,0,100,2,9000,9000,24000,24000,11,69578,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Conversion Beam on Random Target (Non-Heroic)'),
+(@ENTRY,0,3,0,0,0,100,4,9000,9000,24000,24000,11,70269,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Conversion Beam on Random Target (Heroic)');
+
+-- SAI for Fallen Warrior
+SET @ENTRY := 36841;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,6,5000,5000,7000,8000,11,69579,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Arcing Slice to current Target'),
+(@ENTRY,0,1,0,0,0,100,6,15000,15000,22000,22000,11,61044,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Demoralizing Shout'),
+(@ENTRY,0,2,0,0,0,100,6,22000,22000,25000,25000,11,69580,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Shield Block');
+
+-- SAI for Fallen Warrior 2
+SET @ENTRY := 38487;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,6,5000,5000,7000,8000,11,69579,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Arcing Slice to current Target'),
+(@ENTRY,0,1,0,0,0,100,6,15000,15000,22000,22000,11,61044,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Demoralizing Shout'),
+(@ENTRY,0,2,0,0,0,100,6,22000,22000,25000,25000,11,69580,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Shield Block');
+
+-- SAI for Ymirjar Skycaller
+SET @ENTRY := 31260;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,6,4000,4000,8000,8000,11,70292,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Glacial Strike on current Target'),
+(@ENTRY,0,1,0,2,0,100,6,50,50,0,0,11,70291,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Frostblade on Random Target at 50pct Health');
+
+-- SAI for Frostblade
+SET @ENTRY := 37670;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,6,1000,1000,0,0,11,70306,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Frostblade self');
+
+-- SAI for Ymirjar Deathbringer
+SET @ENTRY := 36892;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,4000,4000,8000,8000,11,69528,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Empowered Shadow Bolt on Random Target (Non-Heroic)'),
+(@ENTRY,0,1,0,0,0,100,4,4000,4000,8000,8000,11,70281,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Empowered Shadow Bolt on Random Target (Heroic)');
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_item_loot_template.sql b/sql/old/3.3.5a/2011_02_04_00_world_item_loot_template.sql
new file mode 100644
index 00000000000..aac759b58ed
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_item_loot_template.sql
@@ -0,0 +1,7 @@
+-- Derrok's Wand Case
+DELETE FROM `item_loot_template` WHERE `entry`=30650;
+INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(30650,30651,100,1,1,1,1), -- Dertrok's First Wand
+(30650,30652,100,1,2,1,1), -- Dertrok's Second Wand
+(30650,30653,100,1,3,1,1), -- Dertrok's Third Wand
+(30650,30654,100,1,4,1,1); -- Dertrok's Fourth Wand
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_mail_loot_template.sql b/sql/old/3.3.5a/2011_02_04_00_world_mail_loot_template.sql
new file mode 100644
index 00000000000..2e07a483473
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_mail_loot_template.sql
@@ -0,0 +1,34 @@
+-- Reward from Treats for Greatfather Winter (horde)
+SET @MAIL:=118; -- Set in DBC
+UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (6962); -- Set mail delivery
+DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
+INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+(@MAIL,17685,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Treats for Greatfather Winter (alliance)
+SET @MAIL:=102; -- Set in DBC
+UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (7025); -- Set mail delivery
+DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
+INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+(@MAIL,17685,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Stolen Winter Veil Treats (alliance)
+SET @MAIL:=117; -- Set in DBC
+UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (7042); -- Set mail delivery
+DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
+INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+(@MAIL,17712,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Metzen the Reindeer (alliance)
+SET @MAIL:=161; -- Set in DBC
+UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (8762); -- Set mail delivery
+DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
+INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+(@MAIL,21216,100,1,0,1,1); -- Attach item to mail
+
+-- Reward from Metzen the Reindeer (horde)
+SET @MAIL:=122; -- Set in DBC
+UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (8746); -- Set mail delivery
+DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
+INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+(@MAIL,21216,100,1,0,1,1); -- Attach item to mail  }}}
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_00_world_quest_template.sql
new file mode 100644
index 00000000000..bff1b9a6f2a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Fix missing Previous Quest Requirement for They Grow Up So Fast
+UPDATE `quest_template` SET `prevquestid`=13887 WHERE `entry`=13906;
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_sai.sql b/sql/old/3.3.5a/2011_02_04_00_world_sai.sql
new file mode 100644
index 00000000000..559774e0a04
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_sai.sql
@@ -0,0 +1,5 @@
+-- Heldgarr Steelbeard "Valiance Keep" SAI (tested)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25281;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25281);
+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
+(25281,0,0,0,1,0,100,0,6000,6000,6000,6000,11,45425,2,0,0,0,0,10,103993,24921,0,0,0,0,0,'Fire at target every 6 sec');
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_04_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..645be0e6083
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_spell_script_names.sql
@@ -0,0 +1,17 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_dungeon_credit';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(58630,'spell_gen_dungeon_credit'),
+(59046,'spell_gen_dungeon_credit'),
+(59450,'spell_gen_dungeon_credit'),
+(61863,'spell_gen_dungeon_credit'),
+(64899,'spell_gen_dungeon_credit'),
+(64985,'spell_gen_dungeon_credit'),
+(65074,'spell_gen_dungeon_credit'),
+(65195,'spell_gen_dungeon_credit'),
+(68184,'spell_gen_dungeon_credit'),
+(68572,'spell_gen_dungeon_credit'),
+(68574,'spell_gen_dungeon_credit'),
+(68663,'spell_gen_dungeon_credit'),
+(72706,'spell_gen_dungeon_credit'),
+(72830,'spell_gen_dungeon_credit'),
+(72959,'spell_gen_dungeon_credit');
diff --git a/sql/old/3.3.5a/2011_02_04_00_world_spell_target_position.sql b/sql/old/3.3.5a/2011_02_04_00_world_spell_target_position.sql
new file mode 100644
index 00000000000..ba4e4160dfa
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_00_world_spell_target_position.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_target_position` WHERE `id`=49305;
+INSERT INTO `spell_target_position` VALUES
+(49305,578,983.108,1054.513,359.967,3.354);
diff --git a/sql/old/3.3.5a/2011_02_04_01_world_game_event.sql b/sql/old/3.3.5a/2011_02_04_01_world_game_event.sql
new file mode 100644
index 00000000000..0d668a4e429
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_01_world_game_event.sql
@@ -0,0 +1,2 @@
+-- Winter Veil: Gifts had wrong duration. It should be 8 days and 3 hours in minutes (25 Dec -> 2 Jan)
+UPDATE `game_event` SET `length`=11700 WHERE `entry`=54;
diff --git a/sql/old/3.3.5a/2011_02_04_01_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_01_world_quest_template.sql
new file mode 100644
index 00000000000..3ace7e379dc
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_01_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Update Return to Angrathar (A/H) prevquestid. Requires On Ruby Wings
+UPDATE `quest_template` SET `PrevQuestId`=12498 WHERE `entry` IN (12499,12500);
diff --git a/sql/old/3.3.5a/2011_02_04_01_world_sai.sql b/sql/old/3.3.5a/2011_02_04_01_world_sai.sql
new file mode 100644
index 00000000000..9e968dcedfa
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_01_world_sai.sql
@@ -0,0 +1,5 @@
+-- Ferlynn Windsong "Valiance Keep" SAI (tested)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25282;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25282);
+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
+(25282,0,0,0,1,0,100,0,6000,6000,6000,6000,11,42611,2,0,0,0,0,10,103994,24921,0,0,0,0,0,'Fire at target every 6 sec');
diff --git a/sql/old/3.3.5a/2011_02_04_02_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_02_world_quest_template.sql
new file mode 100644
index 00000000000..0d153bca7d0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_02_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Correct PreQuestId for the quest The Amphitheater of Anguish: Tuskarrmagedon
+UPDATE `quest_template` SET `PrevQuestId`=12934 WHERE `entry`=12935;
diff --git a/sql/old/3.3.5a/2011_02_04_02_world_sai.sql b/sql/old/3.3.5a/2011_02_04_02_world_sai.sql
new file mode 100644
index 00000000000..3bc95ce04e6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_02_world_sai.sql
@@ -0,0 +1,12 @@
+-- Argent Stand Defender "guid 107662 throwing mace at target" SAI (Tested)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=28801;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-107662);
+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
+(-107662,0,0,0,1,0,100,0,12000,18000,12000,18000,11,54423,2,0,0,0,0,10,117888,29416,0,0,0,0,0,'Fire at target every 12-18 sec');
+-- Spell condition for "Hammer of the Righteous"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=54423;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,54423,0,18,1,29416,0,0,'','Spell 54423 targets Argent Stand Dummy');
+-- Fix Argent Stand Dummy InhabitType and movement
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=29416;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=29416;
diff --git a/sql/old/3.3.5a/2011_02_04_03_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_03_world_quest_template.sql
new file mode 100644
index 00000000000..015633c1214
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_03_world_quest_template.sql
@@ -0,0 +1,3 @@
+-- Fix nonexisting required races for Hungry Hungry Hatching
+UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|512|2 WHERE `entry`=13889; -- Orc and Blood Elf (2+512)
+UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|128|32|16 WHERE `entry`=13915; -- Undead, Tauren, Troll (16+32+128)
diff --git a/sql/old/3.3.5a/2011_02_04_03_world_sai.sql b/sql/old/3.3.5a/2011_02_04_03_world_sai.sql
new file mode 100644
index 00000000000..be51bfd4c70
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_03_world_sai.sql
@@ -0,0 +1,28 @@
+-- Honor Hold Archer fixup (tested) 
+-- Console no longer spamming waypoint script errors in Honor Hold
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16896;
+-- Honor Hold Archer "guid 58449 shoot at Honor Hold Target Dummy Right" SAI "Tested"
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-58449);
+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
+(-58449,0,0,0,1,0,100,0,6000,6000,6000,6000,11,29120,2,0,0,0,0,10,58457,16898,0,0,0,0,0,'Fire at target every 6 sec');
+-- Honor Hold Archer "guid 58450 shoot at Honor Hold Target Dummy Left" SAI "Tested"
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-58450);
+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
+(-58450,0,0,0,1,0,100,0,4000,4000,6000,6000,11,29120,2,0,0,0,0,10,58461,16899,0,0,0,0,0,'Fire at target every 6 sec');
+-- Honor Hold Archer "guid 58451 shoot at Honor Hold Target Dummy Middle" SAI "Tested"
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-58451);
+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
+(-58451,0,0,0,1,0,100,0,2000,2000,6000,6000,11,29120,2,0,0,0,0,10,58455,16897,0,0,0,0,0,'Fire at target every 6 sec');
+-- Fix Honor Hold Target Dummies InhabitType
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (16897,16898,16899);
+-- Remove path data and scripts from Honor Hold Archers
+DELETE FROM `waypoint_data` WHERE `id` IN (584490,584500,584510);
+DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 52 AND 65;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid` IN (58449,58450,58451);
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (58449,58450,58451);
+-- Fix Spell condition for Spell 29120 to target either 16897,16898,16899
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=29120;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,29120,1,18,1,16897,0,0,'','Spell 29120 targets Honor Hold Target Dummy Middle'),
+(13,0,29120,1,18,1,16898,0,0,'','Spell 29120 targets Honor Hold Target Dummy Right'),
+(13,0,29120,1,18,1,16899,0,0,'','Spell 29120 targets Honor Hold Target Dummy Left');
diff --git a/sql/old/3.3.5a/2011_02_04_04_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_04_world_quest_template.sql
new file mode 100644
index 00000000000..240cb23c3c1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_04_world_quest_template.sql
@@ -0,0 +1,3 @@
+-- Fix nonexisting required races for Gorishi Grub
+UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|512|2 WHERE `entry`=13903; -- Orc and Blood Elf (2+512)
+UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|128|32|16 WHERE `entry`=13917; -- Undead, Tauren, Troll (16+32+128)
diff --git a/sql/old/3.3.5a/2011_02_04_04_world_sai.sql b/sql/old/3.3.5a/2011_02_04_04_world_sai.sql
new file mode 100644
index 00000000000..b6709bb4c52
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_04_04_world_sai.sql
@@ -0,0 +1,37 @@
+-- Conversation between Highlord Tirion Fordring & The Ebon Watcher
+-- SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30377;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (30377,3037700);
+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
+(30377,0,0,0,1,0,100,0,30000,60000,240000,240000,80,3037700,0,0,0,0,0,0,0,0,0,0,0,0,0,'Load script every 4 min ooc'),
+(3037700,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 0'),
+(3037700,9,1,0,0,0,100,0,6000,6000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 0'),
+(3037700,9,2,0,0,0,100,0,12000,12000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 1'),
+(3037700,9,3,0,0,0,100,0,12000,12000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 2'),
+(3037700,9,4,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 1'),
+(3037700,9,5,0,0,0,100,0,6000,6000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 3'),
+(3037700,9,6,0,0,0,100,0,9000,9000,0,0,1,2,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 2'),
+(3037700,9,7,0,0,0,100,0,9000,9000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 4'),
+(3037700,9,8,0,0,0,100,0,3000,3000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 5'),
+(3037700,9,9,0,0,0,100,0,9000,9000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 6'),
+(3037700,9,10,0,0,0,100,0,7000,7000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 7'),
+(3037700,9,11,0,0,0,100,0,11000,11000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 8'),
+(3037700,9,12,0,0,0,100,0,12000,12000,0,0,1,3,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 3'),
+(3037700,9,13,0,0,0,100,0,13000,13000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 9');
+-- TEXT
+DELETE FROM `creature_text` WHERE `entry` IN (28179,30377);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+(28179,0,0,'The Lich King reacted swiftly to the breach. Faster than I anticipated.',0,0,100,1,0,0,'Highlord Tirion Fordring'),
+(28179,1,0,'What would you have me do, Darion?',0,0,100,6,0,0,'Highlord Tirion Fordring'),
+(28179,2,0,'Choose your words wisely, death knight. You stand amidst the company of the devoted.',0,0,100,1,0,0,'Highlord Tirion Fordring'),
+(28179,3,0,'We will do this with honor, Darion. We will not sink to the levels of the Scourge to be victorious. To do so would make us no better than the monster that we fight to destroy!',0,0,100,1,0,0,'Highlord Tirion Fordring'),
+(30377,0,0,'You are dealing with a being that holds within it the consciousness of the most cunning, intelligent, and ruthless individuals to ever live.',0,0,100,1,0,0,'The Ebon Watcher'),
+(30377,1,0,'The Lich King is unlike any foe that you have ever faced, Highlord. Though you bested him upon the holy ground of Light\'s Hope Chapel, you tread now upon his domain.',0,0,100,1,0,0,'The Ebon Watcher'),
+(30377,2,0,'You cannot win. Not like this...',0,0,100,274,0,0,'The Ebon Watcher'),
+(30377,3,0,'Nothing. There is nothing that you can do while the Light binds you. It controls you wholly, shackling you to the ground with its virtues.',0,0,100,274,0,0,'The Ebon Watcher'),
+(30377,4,0,'%s shakes his head.','2',0,100,0,0,0,'The Ebon Watcher'),
+(30377,5,0,'Look upon the field, Highlord. The Lich King has halted your advance completely and won the upper hand!',0,0,100,25,0,0,'The Ebon Watcher'),
+(30377,6,0,'The breach you created was sealed with Nerubian webbing almost as quickly as it was opened.',0,0,100,1,0,0,'The Ebon Watcher'),
+(30377,7,0,'Your soldiers are being used as living shields to stave off artillery fire in the Valley of Echoes, allowing the forces of the Lich King to assault your base without impediment.',0,0,100,1,0,0,'The Ebon Watcher'),
+(30377,8,0,'The Lich King knows your boundaries, Highlord. He knows that you will not fire on your own men. Do you not understand? He has no boundaries. No rules to abide.',0,0,100,1,0,0,'The Ebon Watcher'),
+(30377,9,0,'Then you have lost, Highlord.',0,0,100,1,0,0,'The Ebon Watcher');
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_battleground_isle_of_conquest.sql b/sql/old/3.3.5a/2011_02_04_0_world_battleground_isle_of_conquest.sql
deleted file mode 100644
index 368f2db97c3..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_battleground_isle_of_conquest.sql
+++ /dev/null
@@ -1,78 +0,0 @@
--- Alliance Gunship Cannon
-UPDATE `creature_template` SET `spell1`=69495,`VehicleId`=452 WHERE `entry`=34929;
--- Horde Gunship Cannon
-UPDATE `creature_template` SET `spell1`=68825,`VehicleId`=453 WHERE `entry`=34935;
--- Keep Cannon
-UPDATE `creature_template` SET `VehicleId`=160,`spell1`=67452,`spell2`=68169 WHERE `entry`=34944;
--- Catapult
-UPDATE `creature_template` SET `VehicleId`=438,`spell1`=66218,`spell2`=66296 WHERE `entry`=34793;
--- Demolisher
-UPDATE `creature_template` SET `VehicleId`=509,`spell1`=67442,`spell2`=68068 WHERE `entry`=34775;
--- Siege Engine
-UPDATE `creature_template` SET `VehicleId`=447,`spell1`=67816,`spell2`=69502 WHERE `entry`=34776;
--- Siege Engine
-UPDATE `creature_template` SET `VehicleId`=436,`spell1`=67816,`spell2`=69502 WHERE `entry`=35069;
--- Glaive Thrower
-UPDATE `creature_template` SET `VehicleId`=447,`spell1`=68827,`spell2`=69515 WHERE `entry`=34802;
--- Glaive Thrower
-UPDATE `creature_template` SET `VehicleId`=447,`spell1`=68827,`spell2`=69515 WHERE `entry`=35273;
--- Flame Turret
-UPDATE `creature_template` SET `spell1`=68832 WHERE `entry`=34778;
--- Flame Turret
-UPDATE `creature_template` SET `spell1`=68832 WHERE `entry`=36356;
--- Siege Turret
-UPDATE `creature_template` SET `spell1`=67462,`spell2`=69505 WHERE `entry`=34777;
--- Siege Turret
-UPDATE `creature_template` SET `spell1`=67462,`spell2`=69505 WHERE `entry`=36355;
--- Catapult speed
-UPDATE `creature_template` SET `speed_run`=2.428571,`speed_walk`=2.8 WHERE `entry`=34793;
-
--- Update alliance boss faction 
-UPDATE `creature_template` SET `faction_A`=84, `faction_H`=84 WHERE `entry`=34924;
--- Update horde boss faction 
-UPDATE `creature_template` SET `faction_A`=83, `faction_H`=83 WHERE `entry`=34922;
--- Update Kor Kron Guard faction 
-UPDATE `creature_template` SET `faction_A`=83, `faction_H`=83 WHERE `entry`=34918;
--- Update Npc Seven TH Legion Infantry faction 
-UPDATE `creature_template` SET `faction_A`=84, `faction_H`=84 WHERE `entry`=34919;
-
--- those doors are not selectables
-UPDATE `gameobject_template` SET `flags`=0x00000021 WHERE `entry` IN (195223,195703,195491,195451,195452,195437,195436);
-
--- alliance bombs, they can be only used by the horde
-UPDATE `gameobject_template` SET `faction`=1995 WHERE `entry`=195332;
--- horde bombs, they can be only used by the alliance
-UPDATE `gameobject_template` SET `faction`=1997 WHERE `entry`=195333;
-
--- horde teleporters
-UPDATE `gameobject_template` SET `faction`=1995 WHERE `entry` IN  (195314,195313);
--- alliance teleporters
-UPDATE `gameobject_template` SET `faction`=1997 WHERE `entry` IN (195315,195316);
-
--- Achievement Glaive Grave
-DELETE FROM `disables` WHERE `sourceType`=4 AND `entry`=12183;
-
--- Achievement Mowed Down
-DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (12068,12114);
-
--- Refinery's and Quarry's spells.
-DELETE FROM `spell_area` WHERE `spell` IN (68719,68720);
-INSERT INTO `spell_area` (`spell`,`area`) VALUES 
-(68719,4741),
-(68719,4747),
-(68719,4748),
-(68719,4749),
-(68719,4750),
-(68719,4751),
-(68719,4752),
-(68719,4753),
-(68719,4710),
-(68720,4741),
-(68720,4747),
-(68720,4748),
-(68720,4749),
-(68720,4750),
-(68720,4751),
-(68720,4752),
-(68720,4710),
-(68720,4753);
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_conditions.sql b/sql/old/3.3.5a/2011_02_04_0_world_conditions.sql
deleted file mode 100644
index 504835cd8b9..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_conditions.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceEntry` IN (62521,62524,62525);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,62524,0,18,1,32906,0,0,'','Attuned to Nature 2 Dose Reduction'),
-(13,0,62525,0,18,1,32906,0,0,'','Attuned to Nature 10 Dose Reduction'),
-(13,0,62521,0,18,1,32906,0,0,'','Attuned to Nature 25 Dose Reduction');
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_creature_631.sql b/sql/old/3.3.5a/2011_02_04_0_world_creature_631.sql
deleted file mode 100644
index c9db3f6a929..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_creature_631.sql
+++ /dev/null
@@ -1,70 +0,0 @@
-SET @GUID := 151761;
-DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+64;
-INSERT INTO creature
-   (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`)
-VALUES
-(@GUID,37122,631,15,1,0,0,4365.98,2672.63,349.271,4.67748,604800,0,0,130330,4081,0,0,0,0,0), --  Captain Arnath
-(@GUID+1,37123,631,15,1,0,0,4361.32,2675.74,349.389,4.64258,604800,0,0,130330,61215,0,0,0,0,0), --  Captain Brandon
-(@GUID+2,37124,631,15,1,0,0,4349.95,2677.52,349.306,4.83962,604800,0,0,130330,0,0,0,0,0,0), --  Captain Grondel
-(@GUID+3,37125,631,15,1,0,0,4347.03,2673.68,349.37,4.85202,604800,0,0,130330,0,0,0,0,0,0), --  Captain Rupert
-(@GUID+4,37127,631,15,1,0,0,4346.72,2607.9,351.101,3.23426,7200,0,0,453600,8814,0,0,0,0,0), --  Ymirjar Frostbinder
-(@GUID+5,37127,631,15,1,0,0,4371.41,2570.52,351.101,0.0808906,7200,0,0,453600,8814,0,0,0,0,0), --  Ymirjar Frostbinder
-(@GUID+6,37129,631,15,1,0,0,4356.9,2673.27,349.47,4.76475,604800,0,0,278900,0,0,0,0,0,0), --  Crok Scourgebane
-(@GUID+7,37132,631,15,1,0,0,4347.2,2637.91,351.1,1.34068,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
-(@GUID+8,37132,631,15,1,0,0,4367.9,2638.14,351.1,1.77657,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
-(@GUID+9,37132,631,15,1,0,0,4345.88,2577.64,351.101,1.52995,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
-(@GUID+10,37132,631,15,1,0,0,4368.03,2578.97,351.101,1.69096,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
-(@GUID+11,37132,631,15,1,0,0,4369.26,2525.06,358.433,1.78913,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
-(@GUID+12,37132,631,15,1,0,0,4343.78,2525.43,358.433,1.26291,7200,0,0,567000,0,0,0,0,0,0), --  Ymirjar Battle-Maiden
-(@GUID+13,37133,631,15,1,0,0,4356.85,2636.39,351.101,1.56922,7200,0,0,630000,0,0,0,0,0,0), --  Ymirjar Warlord
-(@GUID+14,37133,631,15,1,0,0,4346.98,2512.75,358.441,1.35716,7200,0,0,630000,0,0,0,0,0,0), --  Ymirjar Warlord
-(@GUID+15,37133,631,15,1,0,0,4356.77,2524.27,358.433,1.50246,7200,0,0,630000,0,0,0,0,0,0), --  Ymirjar Warlord
-(@GUID+16,37134,631,15,1,0,0,4351.66,2642.95,351.1,1.40351,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
-(@GUID+17,37134,631,15,1,0,0,4362.18,2642.97,351.1,1.5331,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
-(@GUID+18,37134,631,15,1,0,0,4363.48,2585.09,351.101,1.58493,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
-(@GUID+19,37134,631,15,1,0,0,4349.36,2584.54,351.101,1.60849,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
-(@GUID+20,37134,631,15,1,0,0,4350.65,2528.31,358.433,1.52995,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
-(@GUID+21,37134,631,15,1,0,0,4362.76,2527.67,358.433,1.48282,7200,0,0,441000,3994,0,0,0,0,0), --  Ymirjar Huntress
-(@GUID+22,37531,631,15,1,0,0,4362.85,2514.43,203.383,0.541144,7200,0,0,1134000,0,0,0,0,0,0), --  Frostwarden Handler
-(@GUID+23,37531,631,15,1,0,0,4360.96,2454.38,203.384,5.7719,7200,0,0,1134000,0,0,0,0,0,0), --  Frostwarden Handler
-(@GUID+24,37532,631,15,1,0,0,4389.66,2533.88,203.387,1.49305,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+25,37532,631,15,1,0,0,4379.52,2517.11,203.383,1.55823,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+26,37532,631,15,1,0,0,4379.45,2510.21,203.382,2.77324,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+27,37532,631,15,1,0,0,4377.98,2511.69,203.384,0.0361331,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+28,37532,631,15,1,0,0,4376.07,2508.98,203.384,0.95662,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+29,37532,631,15,1,0,0,4371.45,2514.37,203.383,3.35915,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+30,37532,631,15,1,0,0,4377.53,2519.25,203.384,5.76561,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+31,37532,631,15,1,0,0,4385.71,2530.45,203.387,3.85552,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+32,37532,631,15,1,0,0,4374.05,2457.47,203.382,4.73831,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+33,37532,631,15,1,0,0,4373.95,2461.52,203.382,3.47539,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+34,37532,631,15,1,0,0,4375.93,2455.54,203.383,4.69512,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+35,37532,631,15,1,0,0,4383.62,2529.27,203.386,5.19698,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+36,37532,631,15,1,0,0,4389.28,2528.94,203.386,6.22428,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+37,37532,631,15,1,0,0,4380.05,2456.41,203.382,0.00314776,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+38,37532,631,15,1,0,0,4376.26,2462.41,203.382,2.58318,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+39,37532,631,15,1,0,0,4378.17,2462.99,203.381,4.13827,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+40,37532,631,15,1,0,0,4383.05,2523.33,203.387,4.35504,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+41,37532,631,15,1,0,0,4372.52,2452.47,203.384,3.70002,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+42,37532,631,15,1,0,0,4381.59,2533.12,203.386,3.60734,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+43,37532,631,15,1,0,0,4386.49,2535.52,203.386,3.07248,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+44,37532,631,15,1,0,0,4385.64,2512.62,203.384,4.82235,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+45,37532,631,15,1,0,0,4373.77,2438.67,203.386,4.50819,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+46,37532,631,15,1,0,0,4370.54,2441.32,203.386,2.44731,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+47,37532,631,15,1,0,0,4376.09,2442.12,203.386,0.133524,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+48,37532,631,15,1,0,0,4379.22,2439.67,203.386,5.39491,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+49,37532,631,15,1,0,0,4380.51,2434.97,203.387,4.65585,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+50,37532,631,15,1,0,0,4382.9,2439.76,203.387,1.10506,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+51,37532,631,15,1,0,0,4381.45,2444.52,203.386,3.39057,7200,0,0,126000,3994,0,0,0,0,0), --  Frostwing Whelp
-(@GUID+52,38125,631,15,1,0,0,4369.75,2606.94,351.101,6.24627,7200,0,0,567000,3994,0,0,0,0,0), --  Ymirjar Deathbringer
-(@GUID+53,38125,631,15,1,0,0,4340.83,2572.01,351.101,3.14394,7200,0,0,567000,3994,0,0,0,0,0), --  Ymirjar Deathbringer
-(@GUID+54,38154,631,15,1,0,0,4360.11,2644.49,351.1,1.58808,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
-(@GUID+55,38154,631,15,1,0,0,4355.22,2644.43,351.1,1.58415,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
-(@GUID+56,38154,631,15,1,0,0,4359.36,2587.74,351.101,1.64776,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
-(@GUID+57,38154,631,15,1,0,0,4354.53,2587.01,351.101,1.64383,7200,0,0,315000,0,0,0,0,0,0), --  Warhawk
-(@GUID+58,38229,631,15,1,2177,0,4358.06,2608.39,351.184,2.86266,604800,5,0,13,0,0,1,0,0,0), --  Frozen Insect
-(@GUID+59,38229,631,15,1,9829,0,4352.01,2664.59,350.18,6.12231,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
-(@GUID+60,38229,631,15,1,2177,0,4356.72,2408.48,358.432,4.04586,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
-(@GUID+61,38229,631,15,1,7511,0,4359.53,2656.51,351.101,0.198085,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
-(@GUID+62,38229,631,15,1,7511,0,4351.09,2488.49,358.441,1.93736,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
-(@GUID+63,38229,631,15,1,2177,0,4356.68,2525.39,358.432,1.69568,604800,0,0,13,0,0,0,0,0,0), --  Frozen Insect
-(@GUID+64,38229,631,15,1,2177,0,4352.72,2610.13,351.101,2.82663,604800,5,0,13,0,0,1,0,0,0); -- Frozen Insect
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_creature_questrelation.sql b/sql/old/3.3.5a/2011_02_04_0_world_creature_questrelation.sql
deleted file mode 100644
index b00304dc6eb..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_creature_questrelation.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fix starting NPC for quest "Scrying Goggles? No Problem!"
-DELETE FROM `creature_questrelation` WHERE `quest`=8578;  -- Delete existing incorrect start point
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_creature_template.sql b/sql/old/3.3.5a/2011_02_04_0_world_creature_template.sql
deleted file mode 100644
index 6a90ac98761..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Remove XP at kill from Flesh Eating Worm
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64 WHERE `entry`=2462;
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_game_event.sql b/sql/old/3.3.5a/2011_02_04_0_world_game_event.sql
deleted file mode 100644
index 1e84cce9883..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_game_event.sql
+++ /dev/null
@@ -1,15 +0,0 @@
--- Update start date of game event for 2011
--- Based on retail IG calendar
-UPDATE `game_event` SET `start_time` = '2011-06-21 00:01:00' WHERE `entry`=1; -- Midsummer Fire Festival
-UPDATE `game_event` SET `start_time` = '2011-12-15 06:00:00' WHERE `entry`=2; -- Winter Veil
-UPDATE `game_event` SET `start_time` = '2011-02-06 00:01:00' WHERE `entry`=3; -- Darkmoon Faire - Terrokkar Forest
-UPDATE `game_event` SET `start_time` = '2011-03-06 00:01:00' WHERE `entry`=4; -- Darkmoon Faire - Elwynn Forest
-UPDATE `game_event` SET `start_time` = '2011-01-02 00:01:00' WHERE `entry`=5; -- Darkmoon Faire - Mulgore
-UPDATE `game_event` SET `start_time` = '2011-01-23 00:01:00' WHERE `entry`=7; -- Lunar Festival
-UPDATE `game_event` SET `start_time` = '2011-02-06 00:01:00' WHERE `entry`=8; -- Love is in the Air
-UPDATE `game_event` SET `start_time` = '2011-04-24 00:01:00' WHERE `entry`=9; -- Noblegarden
-UPDATE `game_event` SET `start_time` = '2011-05-01 00:01:00' WHERE `entry`=10; -- Childrens Week
-UPDATE `game_event` SET `start_time` = '2011-09-06 00:01:00' WHERE `entry`=11; -- Harvest Festival
-UPDATE `game_event` SET `start_time` = '2011-10-18 01:00:00' WHERE `entry`=12; -- Hallow's End
-UPDATE `game_event` SET `start_time` = '2011-03-03 00:01:00' WHERE `entry`=23; -- Darkmoon Faire Building - Elwynn Forest
-UPDATE `game_event` SET `start_time` = '2011-09-19 00:01:00' WHERE `entry`=52; -- Pirates Day
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_gameobject_questrelation.sql b/sql/old/3.3.5a/2011_02_04_0_world_gameobject_questrelation.sql
deleted file mode 100644
index 480d7f63295..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_gameobject_questrelation.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Fix starting NPC for quest "Scrying Goggles? No Problem!"
-DELETE FROM `gameobject_questrelation` WHERE `quest`=8578;  -- Delete any existing values for this quest
-INSERT INTO `gameobject_questrelation` (`id`,`quest`) VALUES (180642,8578); -- Insert correct values for start point of quest
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_instance_pit_of_saron.sql b/sql/old/3.3.5a/2011_02_04_0_world_instance_pit_of_saron.sql
deleted file mode 100644
index 8e4584618ee..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_instance_pit_of_saron.sql
+++ /dev/null
@@ -1,129 +0,0 @@
-DELETE FROM `creature` WHERE `id` IN (36610,36731,36477,36658,31260); -- Delete Temp Trigger Spawns
-
--- DB Data (souce: SNIFF)
-UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`unit_flags`=0x02008000,`faction_A`=14,`faction_H`=14,`flags_extra`=`flags_extra`|0x80 WHERE `entry`=37670; -- Frostblade
-UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`flags_extra`=`flags_extra`|0x80 WHERE `entry`=36610; -- Exploding Orb
-UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`scale`=1.1,`flags_extra`=`flags_extra`|0x80 WHERE `entry`=36731; -- Icy Blast
-UPDATE `creature_template` SET `speed_run`=1.857143,`speed_walk`=3.2,`unit_flags`=0x00000040,`faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`equipment_id`=1872 WHERE `entry` IN (36658,36938); -- Scourgelord Tyrannus
-UPDATE `creature_template` SET `speed_run`=1.5873,`speed_walk`=2,`unit_flags`=0x00000040 WHERE `entry`=36661; -- Rimefang
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x80 WHERE `entry`=36495; -- Forgemaster Putridus Invisible Stalker
-UPDATE `creature_template` SET `VehicleId`=560 WHERE `entry`=37626; -- Iceborn Protodrake (1)
-
--- SAI for Plagueborn Horror
-SET @ENTRY := 36879;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,5000,5000,10000,10000,11,69581,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Pustulant Flesh on Random Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,5000,5000,10000,10000,11,70273,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Pustulant Flesh on Random Target (Heroic)'),
-(@ENTRY,0,2,0,0,0,100,6,8000,8000,8000,8000,11,70274,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Toxic Waste on Random Target'),
-(@ENTRY,0,3,0,2,0,100,6,15,15,0,0,11,69582,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Blight Bomb self at 15pct Health');
-
--- SAI for Hungering Ghoul
-SET @ENTRY := 37711;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,6,4000,6000,8000,12000,11,70393,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Devour Flesh on current Target');
-
--- SAI for Deathwhisper Shadowcaster
-SET @ENTRY := 37712;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,100,100,3000,3000,11,70386,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,100,100,3000,3000,11,70387,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Heroic)');
-
--- SAI for Deathwhisper Torturer
-SET @ENTRY := 37713;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,6,10000,10000,10000,10000,11,70392,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Black Brand on current Target'),
-(@ENTRY,0,1,0,0,0,100,6,6000,6000,13000,13000,11,70391,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Curse of Agony on Random Target');
-
--- SAI for Ymirjar Wrathbringer
-SET @ENTRY := 36840;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,7000,7000,8000,8000,11,69603,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Blight on Random Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,7000,7000,8000,8000,11,70285,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Blight on Random Target (Heroic)');
-
--- SAI for Stonespine Gargoyle
-SET @ENTRY := 36896;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,1000,1000,5000,5000,11,69520,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Gargoyle Strike on current Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,1000,1000,5000,5000,11,70275,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Gargoyle Strike on current Target (Heroic)'),
-(@ENTRY,0,2,0,2,0,100,6,10,10,0,0,11,69575,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Stoneform self at 10pct Health');
-
--- SAI for Wrathbone Sorcerer
-SET @ENTRY := 37728;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,3000,3000,8000,8000,11,75330,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,3000,3000,8000,8000,11,75331,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Heroic)');
-
--- SAI for Wrathbone Coldwraith
-SET @ENTRY := 36842;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,100,100,3000,3000,11,69573,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Frostbolt on current Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,100,100,3000,3000,11,70277,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Frostbolt on current Target (Heroic)'),
-(@ENTRY,0,2,0,0,0,100,2,9000,9000,15000,15000,11,69574,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Freezing Circle on current Target (Non-Heroic)'),
-(@ENTRY,0,3,0,0,0,100,4,9000,9000,15000,15000,11,70276,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Freezing Circle on current Target (Heroic)');
-
--- SAI for Deathwhisper Necrolyte
-SET @ENTRY := 36788;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,100,100,3000,3000,11,69577,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,100,100,3000,3000,11,70270,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Shadow Bolt on current Target (Heroic)'),
-(@ENTRY,0,2,0,0,0,100,2,9000,9000,24000,24000,11,69578,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Conversion Beam on Random Target (Non-Heroic)'),
-(@ENTRY,0,3,0,0,0,100,4,9000,9000,24000,24000,11,70269,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Conversion Beam on Random Target (Heroic)');
-
--- SAI for Fallen Warrior
-SET @ENTRY := 36841;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,6,5000,5000,7000,8000,11,69579,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Arcing Slice to current Target'),
-(@ENTRY,0,1,0,0,0,100,6,15000,15000,22000,22000,11,61044,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Demoralizing Shout'),
-(@ENTRY,0,2,0,0,0,100,6,22000,22000,25000,25000,11,69580,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Shield Block');
-
--- SAI for Fallen Warrior 2
-SET @ENTRY := 38487;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,6,5000,5000,7000,8000,11,69579,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Arcing Slice to current Target'),
-(@ENTRY,0,1,0,0,0,100,6,15000,15000,22000,22000,11,61044,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Demoralizing Shout'),
-(@ENTRY,0,2,0,0,0,100,6,22000,22000,25000,25000,11,69580,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Shield Block');
-
--- SAI for Ymirjar Skycaller
-SET @ENTRY := 31260;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,6,4000,4000,8000,8000,11,70292,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Glacial Strike on current Target'),
-(@ENTRY,0,1,0,2,0,100,6,50,50,0,0,11,70291,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Frostblade on Random Target at 50pct Health');
-
--- SAI for Frostblade
-SET @ENTRY := 37670;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,6,1000,1000,0,0,11,70306,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Cast Frostblade self');
-
--- SAI for Ymirjar Deathbringer
-SET @ENTRY := 36892;
-UPDATE `creature_template` SET `AIName`= 'SmartAI',`ScriptName`="" WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,0,0,100,2,4000,4000,8000,8000,11,69528,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Empowered Shadow Bolt on Random Target (Non-Heroic)'),
-(@ENTRY,0,1,0,0,0,100,4,4000,4000,8000,8000,11,70281,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Cast Empowered Shadow Bolt on Random Target (Heroic)');
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_item_loot_template.sql b/sql/old/3.3.5a/2011_02_04_0_world_item_loot_template.sql
deleted file mode 100644
index aac759b58ed..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_item_loot_template.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Derrok's Wand Case
-DELETE FROM `item_loot_template` WHERE `entry`=30650;
-INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(30650,30651,100,1,1,1,1), -- Dertrok's First Wand
-(30650,30652,100,1,2,1,1), -- Dertrok's Second Wand
-(30650,30653,100,1,3,1,1), -- Dertrok's Third Wand
-(30650,30654,100,1,4,1,1); -- Dertrok's Fourth Wand
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_mail_loot_template.sql b/sql/old/3.3.5a/2011_02_04_0_world_mail_loot_template.sql
deleted file mode 100644
index 2e07a483473..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_mail_loot_template.sql
+++ /dev/null
@@ -1,34 +0,0 @@
--- Reward from Treats for Greatfather Winter (horde)
-SET @MAIL:=118; -- Set in DBC
-UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (6962); -- Set mail delivery
-DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
-INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
-(@MAIL,17685,100,1,0,1,1); -- Attach item to mail
-
--- Reward from Treats for Greatfather Winter (alliance)
-SET @MAIL:=102; -- Set in DBC
-UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (7025); -- Set mail delivery
-DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
-INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
-(@MAIL,17685,100,1,0,1,1); -- Attach item to mail
-
--- Reward from Stolen Winter Veil Treats (alliance)
-SET @MAIL:=117; -- Set in DBC
-UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (7042); -- Set mail delivery
-DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
-INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
-(@MAIL,17712,100,1,0,1,1); -- Attach item to mail
-
--- Reward from Metzen the Reindeer (alliance)
-SET @MAIL:=161; -- Set in DBC
-UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (8762); -- Set mail delivery
-DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
-INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
-(@MAIL,21216,100,1,0,1,1); -- Attach item to mail
-
--- Reward from Metzen the Reindeer (horde)
-SET @MAIL:=122; -- Set in DBC
-UPDATE `quest_template` SET `RewMailTemplateId`=@MAIL, `RewMailDelaySecs`=86400 WHERE `entry` IN (8746); -- Set mail delivery
-DELETE FROM `mail_loot_template` WHERE `entry`=@MAIL;
-INSERT INTO `mail_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
-(@MAIL,21216,100,1,0,1,1); -- Attach item to mail  }}}
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_0_world_quest_template.sql
deleted file mode 100644
index bff1b9a6f2a..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_quest_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fix missing Previous Quest Requirement for They Grow Up So Fast
-UPDATE `quest_template` SET `prevquestid`=13887 WHERE `entry`=13906;
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_sai.sql b/sql/old/3.3.5a/2011_02_04_0_world_sai.sql
deleted file mode 100644
index 559774e0a04..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_sai.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Heldgarr Steelbeard "Valiance Keep" SAI (tested)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25281;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25281);
-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
-(25281,0,0,0,1,0,100,0,6000,6000,6000,6000,11,45425,2,0,0,0,0,10,103993,24921,0,0,0,0,0,'Fire at target every 6 sec');
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_04_0_world_spell_script_names.sql
deleted file mode 100644
index 645be0e6083..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_dungeon_credit';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(58630,'spell_gen_dungeon_credit'),
-(59046,'spell_gen_dungeon_credit'),
-(59450,'spell_gen_dungeon_credit'),
-(61863,'spell_gen_dungeon_credit'),
-(64899,'spell_gen_dungeon_credit'),
-(64985,'spell_gen_dungeon_credit'),
-(65074,'spell_gen_dungeon_credit'),
-(65195,'spell_gen_dungeon_credit'),
-(68184,'spell_gen_dungeon_credit'),
-(68572,'spell_gen_dungeon_credit'),
-(68574,'spell_gen_dungeon_credit'),
-(68663,'spell_gen_dungeon_credit'),
-(72706,'spell_gen_dungeon_credit'),
-(72830,'spell_gen_dungeon_credit'),
-(72959,'spell_gen_dungeon_credit');
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_spell_target_position.sql b/sql/old/3.3.5a/2011_02_04_0_world_spell_target_position.sql
deleted file mode 100644
index ba4e4160dfa..00000000000
--- a/sql/old/3.3.5a/2011_02_04_0_world_spell_target_position.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_target_position` WHERE `id`=49305;
-INSERT INTO `spell_target_position` VALUES
-(49305,578,983.108,1054.513,359.967,3.354);
diff --git a/sql/old/3.3.5a/2011_02_04_1_world_game_event.sql b/sql/old/3.3.5a/2011_02_04_1_world_game_event.sql
deleted file mode 100644
index 0d668a4e429..00000000000
--- a/sql/old/3.3.5a/2011_02_04_1_world_game_event.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Winter Veil: Gifts had wrong duration. It should be 8 days and 3 hours in minutes (25 Dec -> 2 Jan)
-UPDATE `game_event` SET `length`=11700 WHERE `entry`=54;
diff --git a/sql/old/3.3.5a/2011_02_04_1_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_1_world_quest_template.sql
deleted file mode 100644
index 3ace7e379dc..00000000000
--- a/sql/old/3.3.5a/2011_02_04_1_world_quest_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Update Return to Angrathar (A/H) prevquestid. Requires On Ruby Wings
-UPDATE `quest_template` SET `PrevQuestId`=12498 WHERE `entry` IN (12499,12500);
diff --git a/sql/old/3.3.5a/2011_02_04_1_world_sai.sql b/sql/old/3.3.5a/2011_02_04_1_world_sai.sql
deleted file mode 100644
index 9e968dcedfa..00000000000
--- a/sql/old/3.3.5a/2011_02_04_1_world_sai.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Ferlynn Windsong "Valiance Keep" SAI (tested)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25282;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25282);
-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
-(25282,0,0,0,1,0,100,0,6000,6000,6000,6000,11,42611,2,0,0,0,0,10,103994,24921,0,0,0,0,0,'Fire at target every 6 sec');
diff --git a/sql/old/3.3.5a/2011_02_04_2_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_2_world_quest_template.sql
deleted file mode 100644
index 0d153bca7d0..00000000000
--- a/sql/old/3.3.5a/2011_02_04_2_world_quest_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Correct PreQuestId for the quest The Amphitheater of Anguish: Tuskarrmagedon
-UPDATE `quest_template` SET `PrevQuestId`=12934 WHERE `entry`=12935;
diff --git a/sql/old/3.3.5a/2011_02_04_2_world_sai.sql b/sql/old/3.3.5a/2011_02_04_2_world_sai.sql
deleted file mode 100644
index 3bc95ce04e6..00000000000
--- a/sql/old/3.3.5a/2011_02_04_2_world_sai.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Argent Stand Defender "guid 107662 throwing mace at target" SAI (Tested)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=28801;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-107662);
-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
-(-107662,0,0,0,1,0,100,0,12000,18000,12000,18000,11,54423,2,0,0,0,0,10,117888,29416,0,0,0,0,0,'Fire at target every 12-18 sec');
--- Spell condition for "Hammer of the Righteous"
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=54423;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,54423,0,18,1,29416,0,0,'','Spell 54423 targets Argent Stand Dummy');
--- Fix Argent Stand Dummy InhabitType and movement
-UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=29416;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=29416;
diff --git a/sql/old/3.3.5a/2011_02_04_3_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_3_world_quest_template.sql
deleted file mode 100644
index 015633c1214..00000000000
--- a/sql/old/3.3.5a/2011_02_04_3_world_quest_template.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Fix nonexisting required races for Hungry Hungry Hatching
-UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|512|2 WHERE `entry`=13889; -- Orc and Blood Elf (2+512)
-UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|128|32|16 WHERE `entry`=13915; -- Undead, Tauren, Troll (16+32+128)
diff --git a/sql/old/3.3.5a/2011_02_04_3_world_sai.sql b/sql/old/3.3.5a/2011_02_04_3_world_sai.sql
deleted file mode 100644
index be51bfd4c70..00000000000
--- a/sql/old/3.3.5a/2011_02_04_3_world_sai.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- Honor Hold Archer fixup (tested) 
--- Console no longer spamming waypoint script errors in Honor Hold
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16896;
--- Honor Hold Archer "guid 58449 shoot at Honor Hold Target Dummy Right" SAI "Tested"
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-58449);
-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
-(-58449,0,0,0,1,0,100,0,6000,6000,6000,6000,11,29120,2,0,0,0,0,10,58457,16898,0,0,0,0,0,'Fire at target every 6 sec');
--- Honor Hold Archer "guid 58450 shoot at Honor Hold Target Dummy Left" SAI "Tested"
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-58450);
-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
-(-58450,0,0,0,1,0,100,0,4000,4000,6000,6000,11,29120,2,0,0,0,0,10,58461,16899,0,0,0,0,0,'Fire at target every 6 sec');
--- Honor Hold Archer "guid 58451 shoot at Honor Hold Target Dummy Middle" SAI "Tested"
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-58451);
-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
-(-58451,0,0,0,1,0,100,0,2000,2000,6000,6000,11,29120,2,0,0,0,0,10,58455,16897,0,0,0,0,0,'Fire at target every 6 sec');
--- Fix Honor Hold Target Dummies InhabitType
-UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (16897,16898,16899);
--- Remove path data and scripts from Honor Hold Archers
-DELETE FROM `waypoint_data` WHERE `id` IN (584490,584500,584510);
-DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 52 AND 65;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid` IN (58449,58450,58451);
-UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (58449,58450,58451);
--- Fix Spell condition for Spell 29120 to target either 16897,16898,16899
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=29120;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,29120,1,18,1,16897,0,0,'','Spell 29120 targets Honor Hold Target Dummy Middle'),
-(13,0,29120,1,18,1,16898,0,0,'','Spell 29120 targets Honor Hold Target Dummy Right'),
-(13,0,29120,1,18,1,16899,0,0,'','Spell 29120 targets Honor Hold Target Dummy Left');
diff --git a/sql/old/3.3.5a/2011_02_04_4_world_quest_template.sql b/sql/old/3.3.5a/2011_02_04_4_world_quest_template.sql
deleted file mode 100644
index 240cb23c3c1..00000000000
--- a/sql/old/3.3.5a/2011_02_04_4_world_quest_template.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Fix nonexisting required races for Gorishi Grub
-UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|512|2 WHERE `entry`=13903; -- Orc and Blood Elf (2+512)
-UPDATE `quest_template` SET `RequiredRaces`=`RequiredRaces`|128|32|16 WHERE `entry`=13917; -- Undead, Tauren, Troll (16+32+128)
diff --git a/sql/old/3.3.5a/2011_02_04_4_world_sai.sql b/sql/old/3.3.5a/2011_02_04_4_world_sai.sql
deleted file mode 100644
index b6709bb4c52..00000000000
--- a/sql/old/3.3.5a/2011_02_04_4_world_sai.sql
+++ /dev/null
@@ -1,37 +0,0 @@
--- Conversation between Highlord Tirion Fordring & The Ebon Watcher
--- SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30377;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (30377,3037700);
-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
-(30377,0,0,0,1,0,100,0,30000,60000,240000,240000,80,3037700,0,0,0,0,0,0,0,0,0,0,0,0,0,'Load script every 4 min ooc'),
-(3037700,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 0'),
-(3037700,9,1,0,0,0,100,0,6000,6000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 0'),
-(3037700,9,2,0,0,0,100,0,12000,12000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 1'),
-(3037700,9,3,0,0,0,100,0,12000,12000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 2'),
-(3037700,9,4,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 1'),
-(3037700,9,5,0,0,0,100,0,6000,6000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 3'),
-(3037700,9,6,0,0,0,100,0,9000,9000,0,0,1,2,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 2'),
-(3037700,9,7,0,0,0,100,0,9000,9000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 4'),
-(3037700,9,8,0,0,0,100,0,3000,3000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 5'),
-(3037700,9,9,0,0,0,100,0,9000,9000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 6'),
-(3037700,9,10,0,0,0,100,0,7000,7000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 7'),
-(3037700,9,11,0,0,0,100,0,11000,11000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 8'),
-(3037700,9,12,0,0,0,100,0,12000,12000,0,0,1,3,0,0,0,0,0,9,28179,0,10,0,0,0,0,'Highlord Tirion Fordring Say text 3'),
-(3037700,9,13,0,0,0,100,0,13000,13000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,'The Ebon Watcher Say text 9');
--- TEXT
-DELETE FROM `creature_text` WHERE `entry` IN (28179,30377);
-INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
-(28179,0,0,'The Lich King reacted swiftly to the breach. Faster than I anticipated.',0,0,100,1,0,0,'Highlord Tirion Fordring'),
-(28179,1,0,'What would you have me do, Darion?',0,0,100,6,0,0,'Highlord Tirion Fordring'),
-(28179,2,0,'Choose your words wisely, death knight. You stand amidst the company of the devoted.',0,0,100,1,0,0,'Highlord Tirion Fordring'),
-(28179,3,0,'We will do this with honor, Darion. We will not sink to the levels of the Scourge to be victorious. To do so would make us no better than the monster that we fight to destroy!',0,0,100,1,0,0,'Highlord Tirion Fordring'),
-(30377,0,0,'You are dealing with a being that holds within it the consciousness of the most cunning, intelligent, and ruthless individuals to ever live.',0,0,100,1,0,0,'The Ebon Watcher'),
-(30377,1,0,'The Lich King is unlike any foe that you have ever faced, Highlord. Though you bested him upon the holy ground of Light\'s Hope Chapel, you tread now upon his domain.',0,0,100,1,0,0,'The Ebon Watcher'),
-(30377,2,0,'You cannot win. Not like this...',0,0,100,274,0,0,'The Ebon Watcher'),
-(30377,3,0,'Nothing. There is nothing that you can do while the Light binds you. It controls you wholly, shackling you to the ground with its virtues.',0,0,100,274,0,0,'The Ebon Watcher'),
-(30377,4,0,'%s shakes his head.','2',0,100,0,0,0,'The Ebon Watcher'),
-(30377,5,0,'Look upon the field, Highlord. The Lich King has halted your advance completely and won the upper hand!',0,0,100,25,0,0,'The Ebon Watcher'),
-(30377,6,0,'The breach you created was sealed with Nerubian webbing almost as quickly as it was opened.',0,0,100,1,0,0,'The Ebon Watcher'),
-(30377,7,0,'Your soldiers are being used as living shields to stave off artillery fire in the Valley of Echoes, allowing the forces of the Lich King to assault your base without impediment.',0,0,100,1,0,0,'The Ebon Watcher'),
-(30377,8,0,'The Lich King knows your boundaries, Highlord. He knows that you will not fire on your own men. Do you not understand? He has no boundaries. No rules to abide.',0,0,100,1,0,0,'The Ebon Watcher'),
-(30377,9,0,'Then you have lost, Highlord.',0,0,100,1,0,0,'The Ebon Watcher');
diff --git a/sql/old/3.3.5a/2011_02_05_00_world_sai.sql b/sql/old/3.3.5a/2011_02_05_00_world_sai.sql
new file mode 100644
index 00000000000..f68f044e2f1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_00_world_sai.sql
@@ -0,0 +1,109 @@
+SET @GUID = 208787; -- creature.guid (need 2)
+
+SET @Diver=31689; -- Gnome Diver
+UPDATE `creature_template` SET `AIName`='SmartAI',`vehicleid`=0,`InhabitType`=4 WHERE `entry`=@Diver; -- Gnome Diver
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry` IN (31719,31768,31769); -- Cosmetic Frenzy, Stabled Hunter Pet -- flying
+-- Model data
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=27657; -- Gnome Diver
+UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=1,`gender`=2 WHERE `modelid`=23514; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.245,`combat_reach`=1,`gender`=2 WHERE `modelid`=23513; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=2955; -- Cosmetic Albino Snake
+UPDATE `creature_model_info` SET `bounding_radius`=0.374,`combat_reach`=0,`gender`=2 WHERE `modelid`=27718; -- Cosmetic Smolderweb Hatchling
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=2954; -- Cosmetic Ribbon Snake
+UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5555; -- Cosmetic Cat Set 2/2
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=1206; -- Cosmetic Black Kingsnake
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=25791; -- Breanni
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=2957; -- Cosmetic Brown Snake
+UPDATE `creature_model_info` SET `bounding_radius`=0.15,`combat_reach`=1,`gender`=2 WHERE `modelid`=3233; -- Cosmetic Cockroach
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=0,`gender`=2 WHERE `modelid`=27719; -- Cosmetic Worg Pup
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=1141; -- Cosmetic Rat
+UPDATE `creature_model_info` SET `bounding_radius`=0.6,`combat_reach`=0,`gender`=2 WHERE `modelid`=27682; -- Cosmetic Pig
+UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5586; -- Cosmetic Cat Set 1/2
+UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=27881; -- Cosmetic Turtle
+UPDATE `creature_model_info` SET `bounding_radius`=0.2749995,`combat_reach`=0,`gender`=2 WHERE `modelid`=23519; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.28,`combat_reach`=0,`gender`=2 WHERE `modelid`=27690; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.45,`combat_reach`=1,`gender`=2 WHERE `modelid`=4636; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=1.122,`combat_reach`=0,`gender`=2 WHERE `modelid`=2540; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25607; -- Tassia Whisperglen
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (@Diver,28951,28690,31719,31742,31709,31795,31714,31729,31710,31711,31733,31796,31732,31735,31728,31740,31741,31755,31756,31757,31758,31768,31769);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@Diver,0,33554432,1,0, '59562 0'), -- Gnome Diver
+(28951,0,0,257,0, '60913 0 61354 0'), -- Breanni
+(28690,0,0,257,0, NULL), -- Tassia Whisperglen
+(31719,0,0,1,0, NULL), -- Cosmetic Frenzy
+(31742,0,0,1,0, NULL), -- Cosmetic Prairie Dog
+(31709,0,0,1,0, NULL), -- Cosmetic Albino Snake
+(31795,0,0,1,0, NULL), -- Cosmetic Smolderweb Hatchling
+(31714,0,0,1,0, NULL), -- Cosmetic Ribbon Snake
+(31729,0,0,1,0, NULL), -- Cosmetic Cat Set 2/2
+(31710,0,0,1,0, NULL), -- Cosmetic Black Kingsnake
+(31711,0,0,1,0, NULL), -- Cosmetic Brown Snake
+(31733,0,0,1,0, NULL), -- Cosmetic Cockroach
+(31796,0,0,1,0, NULL), -- Cosmetic Worg Pup
+(31732,0,0,1,0, NULL), -- Cosmetic Rat
+(31735,0,0,1,0, NULL), -- Cosmetic Pig
+(31728,0,0,1,0, NULL), -- Cosmetic Cat Set 1/2
+(31740,0,0,1,0, NULL), -- Cosmetic Turtle
+(31741,0,0,1,0, NULL), -- Cosmetic Rabbit
+(31755,0,0,1,0, NULL), -- Stabled Hunter Pet
+(31756,0,0,1,0, NULL), -- Stabled Hunter Pet
+(31757,0,0,1,0, NULL), -- Stabled Hunter Pet
+(31758,0,0,1,0, NULL), -- Stabled Hunter Pet
+(31768,0,0,1,0, NULL), -- Stabled Hunter Pet
+(31769,0,0,1,0, NULL); -- Stabled Hunter Pet
+
+-- Random movement for two of the Stabled Hunter Pets
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid` IN (97556,97653);
+
+-- Aura used by all Cosmetic* npcs in Dalaran
+-- DELETE FROM `spell_dbc` WHERE `Id`=28782;
+-- INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES (28782, 'Dalaran Cosmetic Aura - Unknown effect');
+
+-- SAI/Gnome Diver: reply to emotes
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Diver 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
+(@Diver,0,0,0,22,0,100,0,78,5000,5000,0,5,66,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Salute - Salute'),
+(@Diver,0,1,0,22,0,100,0,21,5000,5000,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Cheer - Bow'),
+(@Diver,0,2,0,22,0,100,0,101,5000,5000,0,5,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Wave - Wave'),
+(@Diver,0,3,0,22,0,100,0,34,5000,5000,0,5,94,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Dance - Dance'),
+(@Diver,0,4,0,22,0,100,0,328,5000,5000,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Flirt - Laugh'),
+(@Diver,0,5,0,22,0,100,0,58,5000,5000,0,5,23,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Kiss - Flex'),
+(@Diver,0,6,0,22,0,100,0,77,5000,5000,0,5,14,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Rude - Rude');
+
+-- Waypoints for flying birds
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN (31768,31769));
+DELETE FROM `creature` WHERE `id` IN (31768,31769);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+0,31768,571,1,1,0,0,5864.76025,561.5035,656.350159,3.38593864,120,0,0,1,0,0,2,0,0,0),
+(@GUID+1,31769,571,1,1,0,0,5871.1377,556.659363,660.738953,1.44698894,120,0,0,1,0,0,2,0,0,0);
+INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES
+(@GUID+0,(@GUID+0)*10),
+(@GUID+1,(@GUID+1)*10);
+DELETE FROM `waypoint_data`  WHERE `id` IN ((@GUID+0)*10,(@GUID+1)*10);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES	
+((@GUID+0)*10,00,5865.73,561.7454,656.3502),
+((@GUID+0)*10,01,5864.76,561.5035,656.3502),
+((@GUID+0)*10,02,5865.858,545.6048,657.8221),
+((@GUID+0)*10,03,5856.59,546.2563,657.8221),
+((@GUID+0)*10,04,5851.967,553.7063,657.8221),
+((@GUID+0)*10,05,5848.848,559.3509,657.8221),
+((@GUID+0)*10,06,5855.463,567.5033,657.8221),
+((@GUID+0)*10,07,5861.43,566.0272,657.8221),
+((@GUID+0)*10,08,5870.177,562.2965,657.8221),
+((@GUID+0)*10,09,5872.478,553.6407,657.8221),
+((@GUID+0)*10,10,5864.64,545.9483,657.8221),
+((@GUID+0)*10,11,5856.267,546.3598,657.8221),
+((@GUID+0)*10,12,5851.878,553.7315,657.8221),
+((@GUID+0)*10,13,5848.888,559.2279,657.8221),
+((@GUID+0)*10,14,5848.888,559.2279,657.8221),
+((@GUID+1)*10,0,5856.941,550.4024,656.2946),
+((@GUID+1)*10,1,5856.993,551.4011,656.2946),
+((@GUID+1)*10,2,5852.679,558.0845,660.739),
+((@GUID+1)*10,3,5852.628,548.4319,660.739),
+((@GUID+1)*10,4,5862.95,547.2537,660.739),
+((@GUID+1)*10,5,5871.105,556.4464,660.739),
+((@GUID+1)*10,6,5866.302,565.8504,660.739),
+((@GUID+1)*10,7,5857.606,565.6177,660.739),
+((@GUID+1)*10,8,5857.606,565.6177,660.739);
diff --git a/sql/old/3.3.5a/2011_02_05_01_world_quest_template.sql b/sql/old/3.3.5a/2011_02_05_01_world_quest_template.sql
new file mode 100644
index 00000000000..64cdd977cb8
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_01_world_quest_template.sql
@@ -0,0 +1,9 @@
+-- Fix nonexisting required races for Hungry Hungry Hatching
+UPDATE `quest_template` SET `requiredraces`=514 WHERE `entry`=13889; -- Orc and Blood Elf (2+512)
+UPDATE `quest_template` SET `requiredraces`=176 WHERE `entry`=13915; -- Undead, Tauren, Troll (16+32+128)
+-- Fix nonexisting required races for Poached, Scrambled, Or Raw?
+UPDATE `quest_template` SET `requiredraces`=514 WHERE `entry`=13904; -- Orc and Blood Elf (2+512)
+UPDATE `quest_template` SET `requiredraces`=176 WHERE `entry`=13916; -- Undead, Tauren, Troll (16+32+128)
+-- Fix nonexisting required races for Searing Roc Feathers
+UPDATE `quest_template` SET `requiredraces`=514 WHERE `entry`=13905; -- Orc and Blood Elf (2+512)
+UPDATE `quest_template` SET `requiredraces`=176 WHERE `entry`=13914; -- Undead, Tauren, Troll (16+32+128)
diff --git a/sql/old/3.3.5a/2011_02_05_02_world_creature_template.sql b/sql/old/3.3.5a/2011_02_05_02_world_creature_template.sql
new file mode 100644
index 00000000000..d193a81eb79
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_02_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Update Trainertype where unit is NOT a trainer:
+UPDATE `creature_template` SET `trainer_type`=0 WHERE entry IN (1300,1703,2855,2870,5749,5750,5753,5815,6027,6328,6373,6374,6376,6382,11048,11050,11051,15494,12776,16639,16649,16703,16727,16746,23535);
diff --git a/sql/old/3.3.5a/2011_02_05_03_world_creature_template.sql b/sql/old/3.3.5a/2011_02_05_03_world_creature_template.sql
new file mode 100644
index 00000000000..b899286a090
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_03_world_creature_template.sql
@@ -0,0 +1,7 @@
+-- Saving to instance for difficulty entries
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|1 WHERE `entry` IN (
+34566,35615,35616, -- Anub arak
+35347,35348,35349, -- Eydis Darkbane
+35350,35351,35352, -- Fjola Lightbane
+35216,35268,35269, -- Lord Jaraxxus
+35447,35448,35449); -- Icehowl
diff --git a/sql/old/3.3.5a/2011_02_05_04_world_game_event.sql b/sql/old/3.3.5a/2011_02_05_04_world_game_event.sql
new file mode 100644
index 00000000000..eb8db804358
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_04_world_game_event.sql
@@ -0,0 +1,42 @@
+-- Update Quest_conditions for Quest: The Lunar Festival
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`IN(8870,8871,8872,8873,8874,8875);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES 
+-- Alliance
+(19,0,8871,0,4,1519,0,0,0,0,'The Lunar Festival: Stormwind'),
+(19,0,8872,0,4,1657,0,0,0,0,'The Lunar Festival: Darnassus'),
+(19,0,8870,0,4,1537,0,0,0,0,'The Lunar Festival: Ironforge'),
+-- Horde
+(19,0,8873,0,4,1637,0,0,0,0,'The Lunar Festival: Orgrimmar'),
+(19,0,8874,0,4,1497,0,0,0,0,'The Lunar Festival: Undercity'),
+(19,0,8875,0,4,1638,0,0,0,0,'The Lunar Festival: Thunder Bluff');
+-- Quest: Lunar Fireworks
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (15872,15873,15874,15879,15880,15882);
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (15872,15873,15874,15879,15880,15882); -- Cleanup
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (15872,15873,15874,15879,15880,15882);
+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 
+-- small fireworks
+-- blue firework
+(15879,0,0,0,1,0,100,1,0,0,0,0,11,26344,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
+-- green firework
+(15880,0,0,0,1,0,100,1,0,0,0,0,11,26345,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
+-- red firework
+(15882,0,0,0,1,0,100,1,0,0,0,0,11,26347,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
+-- big fireworks
+-- blue firework
+(15872,0,0,0,1,0,100,1,0,0,0,0,11,26344,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
+-- red firework
+(15873,0,0,0,1,0,100,1,0,0,0,0,11,26347,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
+-- green firework
+(15874,0,0,0,1,0,100,1,0,0,0,0,11,26345,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks');
+-- remove useless quests: (as of patch 3.0 they where removed)
+DELETE FROM `creature_questrelation` WHERE `quest` IN (8876,8877,8878,8879,8880,8881,8882,8862,8863,8864,8865);
+
+-- Elune's Blessing
+DELETE FROM `gameobject_template` WHERE `entry` IN (180876,180877);
+INSERT INTO `gameobject_template` (`entry`,`type`,`displayId`,`name`,`IconName`,`castBarCaption`,`unk1`,`faction`,`flags`,`size`,`questItem1`,`questItem2`,`questItem3`,`questItem4`,`questItem5`,`questItem6`,`data0`,`data1`,`data2`,`data3`,`data4`,`data5`,`data6`,`data7`,`data8`,`data9`,`data10`,`data11`,`data12`,`data13`,`data14`,`data15`,`data16`,`data17`,`data18`,`data19`,`data20`,`data21`,`data22`,`data23`,`AIName`,`ScriptName`,`WDBVerified`) VALUES
+(180876,6,327, 'Elune''s Blessing TRAP BUFF', '', '', '',14,0,0.01,0,0,0,0,0,0,0,255,8,26393,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,'','',1),
+(180877,6,327, 'Elune''s Blessing TRAP QUESTCREDIT', '', '', '',14,0,0.01,0,0,0,0,0,0,0,255,8,26394,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,'','',1);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=26393;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,26393,0,18,1,0,0,0, '', 'Elune''s Blessing');
diff --git a/sql/old/3.3.5a/2011_02_05_05_world_sai.sql b/sql/old/3.3.5a/2011_02_05_05_world_sai.sql
new file mode 100644
index 00000000000..24278716679
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_05_world_sai.sql
@@ -0,0 +1,17 @@
+-- Scourge Flamespitter SAI 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25582;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-118407,-118408,-118425,-118421,-118422,-118426,-118427,-118375,-118405,-118409,-118423,-118428,-118429);
+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
+(-118407,0,0,0,1,0,100,0,1000,1000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118408,0,0,0,1,0,100,0,1000,1000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118425,0,0,0,1,0,100,0,1000,1000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118421,0,0,0,1,0,100,0,7000,7000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118422,0,0,0,1,0,100,0,7000,7000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118426,0,0,0,1,0,100,0,4000,4000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118427,0,0,0,1,0,100,0,4000,4000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118375,0,0,0,1,0,100,0,2000,2000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118405,0,0,0,1,0,100,0,2000,2000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118409,0,0,0,1,0,100,0,2000,2000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118423,0,0,0,1,0,100,0,8000,8000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118428,0,0,0,1,0,100,0,8000,8000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
+(-118429,0,0,0,1,0,100,0,8000,8000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec');
diff --git a/sql/old/3.3.5a/2011_02_05_06_world_waypoint_data.sql b/sql/old/3.3.5a/2011_02_05_06_world_waypoint_data.sql
new file mode 100644
index 00000000000..61dbc81d9b4
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_06_world_waypoint_data.sql
@@ -0,0 +1,2 @@
+-- remove waypoint script spamming from 2 Dawnblade Blood Knight's
+UPDATE `waypoint_data` SET `action`=0 WHERE `id` IN (943090,943250) AND `point`=2;
diff --git a/sql/old/3.3.5a/2011_02_05_07_world_sai.sql b/sql/old/3.3.5a/2011_02_05_07_world_sai.sql
new file mode 100644
index 00000000000..b746893890b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_07_world_sai.sql
@@ -0,0 +1,80 @@
+-- Fix Quest 11460 "Trust is Earned"
+-- UPDATE Hidalgo the Master Falconer "Add Excelsior to vehicle and add gossip flag"
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry` IN (24750,24752);
+DELETE FROM `vehicle_accessory` WHERE `entry`=24750;
+INSERT INTO `vehicle_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`) VALUES
+(24750,24751,0,1, 'Excelsior rides Hidalgo the Master Falconer');
+DELETE FROM `creature` WHERE `guid`=88103;
+-- add missing text to Hidalgo the Master Falconer and Rock Falcon
+DELETE FROM `gossip_menu` WHERE `entry` IN (8998,9007) AND `text_id` IN (12153,12168);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(8998,12153),(9007,12168);
+-- Add gossip_menu condition for 8998 and 9007
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup` IN (8998,9007);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9007;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`) VALUES
+(14,8998,12185,8,11460,0), -- Must have Quest 11460 rewarded
+(14,9007,12168,9,11460,0), -- Must have quest 11460 taken not complete
+(15,9007,0,2,34102,1), -- Must have at least 1 count of item 34102
+(15,9007,0,9,11460,0); -- Must have quest 11460 taken not complete
+-- Creature Gossip_menu_option Update
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9007) AND `id` IN (0);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(9007,0,0, 'Feed the grub to the Rock Falcon.',1,1,0,0,0,0,0, '');
+SET @ENTRY := 24752; -- Rock Falcon SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,9007,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip option Close Gossip'), -- Player needs to cast this on self "not working"
+(@ENTRY,0,1,0,61,0,100,0,100,100,100,100,86,44363,0,7,0,0,0,7,0,0,0,0,0,0,0,'Player selfcast spell');
+
+-- Maiden of Winter's Breath Lake SAI For Quest "The Edge Of Winter"
+SET @ENTRY := 33303; -- NPC entry
+SET @ERROR1 := 1334; -- Error Message 1
+SET @ERROR2 := 1335; -- Error Message 2
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,75,45776,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Apply aura on spawn'),
+(@ENTRY,0,1,0,8,0,100,0,62767,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,28,45776,0,0,0,0,0,1,0,0,0,0,0,0,0,'Remove aura'),
+(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Face Player'),
+(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 0'),
+(@ENTRY*100,9,3,0,0,0,100,0,6000,6000,6000,6000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 1'),
+(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,5000,5000,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Reset Orientation'),
+(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,75,45776,0,0,0,0,0,1,0,0,0,0,0,0,0,'Replace Aura');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=33303;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(33303,0,0, 'Thank you, mortal, for freeing me from this curse. I beg you, take this blade.',0,0,100,1,0,0, 'Maiden of Winter''s Breath Lake'),
+(33303,1,0, 'It has brought me naught but ill. Mayhap you can find someone who will contain its power.',0,0,100,1,0,0, 'Maiden of Winter''s Breath Lake');
+-- Condition Target for Spell Break Curse of Ice must be npc 33303 with aura 45776
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=62767;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`COMMENT`) VALUES
+(17,62767,19,33303,0,0,@ERROR1, 'Break Curse of Ice Required Target Maiden of Winter''s Breath Lake'),
+(17,62767,1,45776,0,1,@ERROR2, 'Break Curse of Ice Required Target Needs Aura Ice Block');
+-- Add Error Strings
+DELETE FROM `trinity_string` WHERE `entry` IN (@ERROR1,@ERROR2);
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
+(@ERROR1, 'Requires Maiden of Winter''s Breath Lake'),
+(@ERROR2, 'You can''t use that right now');
+
+-- Conversation between Crusader Lord Dalfors & Crusader Sunborn, Argent Vangard "Crusader Lord Dalfors Envoker"
+SET @ENTRY := 30224;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+UPDATE `smart_scripts` SET `target_type`=1, `comment`=  'The Ebon Watcher: Load script every 4 min ooc' WHERE `entryorguid`=30377 AND `source_type` =0 AND `id`=0;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,0,30000,60000,150000,150000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 2.5 min ooc'),
+(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crusader Lord Dalfors text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,6000,6000,0,0,1,0,0,0,0,0,0,9,30225,0,10,0,0,0,0,'Crusader Sunborn Say text 0'),
+(@ENTRY*100,9,2,0,0,0,100,0,4000,4000,0,0,5,14,0,0,0,0,0,9,30225,0,10,0,0,0,0,'Crusader Sunborn emote');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (30224,30225);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(30224,0,0, 'What''s on yer mind, lad?',0,0,100,6,0,0, 'Crusader Lord Dalfors'),
+(30225,0,0, 'Eversong Woods, Dalfors. I''m thinking about how beautiful it was before Arthas cut a swathe of death through it...',0,0,100,1,0,0, 'Crusader Sunborn');
+
diff --git a/sql/old/3.3.5a/2011_02_05_08_world_sai.sql b/sql/old/3.3.5a/2011_02_05_08_world_sai.sql
new file mode 100644
index 00000000000..be2e11b4178
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_05_08_world_sai.sql
@@ -0,0 +1,75 @@
+-- Quest "The Denouncement" (12273) (Converted&tweaked to SAI by Nay)
+SET @Goodman := 27234; -- Blacksmith Goodman
+SET @Zierhut := 27235; -- Lead Cannoneer Zierhut (npc)
+SET @Mercer := 27236; -- Stable Master Mercer (npc)
+SET @Jordan := 27237; -- Commander Jordan (npc)
+SET @Rod := 37438; -- Rod of Compulsion (item)
+SET @Compelled := 48714; -- Compelled (spell)
+SET @DeathJordan := 48724; -- The Denouncement: Commander Jordan On Death
+SET @DeathZierhut := 48726; -- The Denouncement: Lead Cannoneer Zierhut On Death
+SET @DeathGoodman := 48728; -- The Denouncement: Blacksmith Goodman On Death
+SET @DeathMercer := 48730; -- The Denouncement: Stable Master Mercer On Death
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (@Goodman,@Zierhut,@Mercer,@Jordan);
+-- Spell scripts: Give kill credit through spell
+DELETE FROM `spell_scripts` WHERE `id` IN (@DeathJordan,@DeathZierhut,@DeathGoodman,@DeathMercer);
+INSERT INTO `spell_scripts`(`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(@DeathJordan,0,15,48723,1,0,0,0,0,0),  -- cast "The Denouncement: Commander Jordan Kill Credit" on player
+(@DeathZierhut,0,15,48725,1,0,0,0,0,0), -- cast "The Denouncement: Lead Cannoneer Zierhut Kill Credit" on player
+(@DeathGoodman,0,15,48727,1,0,0,0,0,0), -- cast "The Denouncement: Blacksmith Goodman Kill Credit" on player
+(@DeathMercer,0,15,48729,1,0,0,0,0,0);  -- cast "The Denouncement: Stable Master Mercer Kill Credit" on player
+-- Spell targets for spells that give quest credit through effect 77
+DELETE FROM `conditions` where `SourceEntry` IN (@DeathJordan,@DeathZierhut,@DeathGoodman,@DeathMercer) AND `SourceTypeOrReferenceId`=13;
+DELETE FROM `conditions` where `SourceEntry`=@Rod AND `SourceTypeOrReferenceId`=18;
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
+(13,0,@DeathJordan,0,18,1,@Jordan,0,0, 'The Denouncement: Jordan target'),
+(13,0,@DeathZierhut,0,18,1,@Zierhut,0,0, 'The Denouncement: Zierhut target'),
+(13,0,@DeathGoodman,0,18,1,0,0,0, 'The Denouncement: Goodman target'),
+(13,0,@DeathMercer,0,18,1,@Mercer,0,0, 'The Denouncement: Mercer'),
+(18,0,@Rod,0,24,1,@Goodman,0,0, 'The Denouncement: Rod - Goodman target'),
+(18,0,@Rod,0,24,1,@Zierhut,0,0, 'The Denouncement: Rod - Zierhut target'),
+(18,0,@Rod,0,24,1,@Mercer,0,0, 'The Denouncement: Rod - Mercer target'),
+(18,0,@Rod,0,24,1,@Jordan,0,0, 'The Denouncement: Rod - Jordan target');
+DELETE FROM `creature_text` WHERE `entry` IN (@Goodman,@Zierhut,@Mercer,@Jordan);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@Goodman,0,0, 'You are being misled! The Onslaught is all lies! The Scourge and the Forsaken are not our enemies! Wake up!',1,0,100,5,0,0, 'Blacksmith Goodman'),
+(@Jordan,0,0, 'High general Abbendis personally told me that it was a mistake to come north and that we''re doomed! I urge you all to lay down your weapons and leave before it''s too late!',1,0,100,5,0,0, 'Commander Jordan'),
+(@Zierhut,0,0, 'Renounce the Scarlet Onslaught! Don''t listen to the lies of the high general and the grand admiral any longer!',1,0,100,5,0,0, 'Lead Cannoneer Zierhut'),
+(@Mercer,0,0, 'Abbendis is nothing but a harlot and Grand Admiral Westwind is selling her cheap like he sold us out!',1,0,100,5,0,0, 'Stable Master Mercer');
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@Goodman,@Zierhut,@Mercer,@Jordan);
+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 
+(@Goodman,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On spellhit set phase 2'),
+(@Goodman,0,1,0,6,2,100,0,0,0,0,0,85,@DeathGoodman,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On death in phase 2 cast spell'),
+(@Goodman,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On reset remove Compelled aura'),
+(@Goodman,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On reset set phase 0'),
+(@Goodman,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On death in phase 2 yell'),
+(@Mercer,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On spellhit set phase 2'),
+(@Mercer,0,1,0,6,2,100,0,0,0,0,0,85,@DeathMercer,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On death in phase 2 cast spell'),
+(@Mercer,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On reset remove Compelled aura'),
+(@Mercer,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On reset set phase 0'),
+(@Mercer,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On death in phase 2 yell'),
+(@Zierhut,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On spellhit set phase 2'),
+(@Zierhut,0,1,0,6,2,100,0,0,0,0,0,85,@DeathZierhut,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On death in phase 2 cast spell'),
+(@Zierhut,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On reset remove Compelled aura'),
+(@Zierhut,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On reset set phase 0'),
+(@Zierhut,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On death in phase 2 yell'),
+(@Jordan,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On spellhit set phase 2'),
+(@Jordan,0,1,0,6,2,100,0,0,0,0,0,85,@DeathJordan,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On death in phase 2 cast spell'),
+(@Jordan,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On reset remove Compelled aura'),
+(@Jordan,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On reset set phase 0'),
+(@Jordan,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On death in phase 2 yell');
+
+-- Kill a unrelated console DB error 
+DELETE FROM `creature_addon` WHERE `guid`=88103;
+
+-- Valiance Keep Footman SAI (by Malcrom)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25253;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-111383,-111377,-111378,-111382,-111379,-111380);
+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
+(-111383,0,0,0,1,0,100,0,1000,2000,4000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 4-5 sec'),
+(-111377,0,0,0,1,0,100,0,3000,4000,4000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 4-5 sec'),
+(-111378,0,0,0,1,0,100,0,8000,8000,16000,16000,10,4,5,21,0,0,0,1,0,0,0,0,0,0,0,'Random cheer emote every 16 sec'),
+(-111382,0,0,0,1,0,100,0,16000,16000,16000,16000,10,4,5,21,0,0,0,1,0,0,0,0,0,0,0,'Random cheer emote every 16 sec'),
+(-111379,0,0,0,1,0,100,0,2000,2000,5000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 5 sec'),
+(-111379,0,1,0,1,0,100,0,4000,4000,7000,7000,5,36,0,0,0,0,0,10,111376,25253,0,0,0,0,0,'Attack emote dueler 2 sec later sec'),
+(-111380,0,0,0,1,0,100,0,5000,5000,5000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 5 sec'),
+(-111380,0,1,0,1,0,100,0,7000,7000,7000,7000,5,36,0,0,0,0,0,10,111381,25253,0,0,0,0,0,'Attack emote dueler 2 sec later sec');
diff --git a/sql/old/3.3.5a/2011_02_05_0_world_sai.sql b/sql/old/3.3.5a/2011_02_05_0_world_sai.sql
deleted file mode 100644
index f68f044e2f1..00000000000
--- a/sql/old/3.3.5a/2011_02_05_0_world_sai.sql
+++ /dev/null
@@ -1,109 +0,0 @@
-SET @GUID = 208787; -- creature.guid (need 2)
-
-SET @Diver=31689; -- Gnome Diver
-UPDATE `creature_template` SET `AIName`='SmartAI',`vehicleid`=0,`InhabitType`=4 WHERE `entry`=@Diver; -- Gnome Diver
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry` IN (31719,31768,31769); -- Cosmetic Frenzy, Stabled Hunter Pet -- flying
--- Model data
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=27657; -- Gnome Diver
-UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=1,`gender`=2 WHERE `modelid`=23514; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.245,`combat_reach`=1,`gender`=2 WHERE `modelid`=23513; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=2955; -- Cosmetic Albino Snake
-UPDATE `creature_model_info` SET `bounding_radius`=0.374,`combat_reach`=0,`gender`=2 WHERE `modelid`=27718; -- Cosmetic Smolderweb Hatchling
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=2954; -- Cosmetic Ribbon Snake
-UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5555; -- Cosmetic Cat Set 2/2
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=1206; -- Cosmetic Black Kingsnake
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=25791; -- Breanni
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=0,`gender`=2 WHERE `modelid`=2957; -- Cosmetic Brown Snake
-UPDATE `creature_model_info` SET `bounding_radius`=0.15,`combat_reach`=1,`gender`=2 WHERE `modelid`=3233; -- Cosmetic Cockroach
-UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=0,`gender`=2 WHERE `modelid`=27719; -- Cosmetic Worg Pup
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=1141; -- Cosmetic Rat
-UPDATE `creature_model_info` SET `bounding_radius`=0.6,`combat_reach`=0,`gender`=2 WHERE `modelid`=27682; -- Cosmetic Pig
-UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5586; -- Cosmetic Cat Set 1/2
-UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=27881; -- Cosmetic Turtle
-UPDATE `creature_model_info` SET `bounding_radius`=0.2749995,`combat_reach`=0,`gender`=2 WHERE `modelid`=23519; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.28,`combat_reach`=0,`gender`=2 WHERE `modelid`=27690; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.45,`combat_reach`=1,`gender`=2 WHERE `modelid`=4636; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=1.122,`combat_reach`=0,`gender`=2 WHERE `modelid`=2540; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25607; -- Tassia Whisperglen
-
--- Addon data
-DELETE FROM `creature_template_addon` WHERE `entry` IN (@Diver,28951,28690,31719,31742,31709,31795,31714,31729,31710,31711,31733,31796,31732,31735,31728,31740,31741,31755,31756,31757,31758,31768,31769);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(@Diver,0,33554432,1,0, '59562 0'), -- Gnome Diver
-(28951,0,0,257,0, '60913 0 61354 0'), -- Breanni
-(28690,0,0,257,0, NULL), -- Tassia Whisperglen
-(31719,0,0,1,0, NULL), -- Cosmetic Frenzy
-(31742,0,0,1,0, NULL), -- Cosmetic Prairie Dog
-(31709,0,0,1,0, NULL), -- Cosmetic Albino Snake
-(31795,0,0,1,0, NULL), -- Cosmetic Smolderweb Hatchling
-(31714,0,0,1,0, NULL), -- Cosmetic Ribbon Snake
-(31729,0,0,1,0, NULL), -- Cosmetic Cat Set 2/2
-(31710,0,0,1,0, NULL), -- Cosmetic Black Kingsnake
-(31711,0,0,1,0, NULL), -- Cosmetic Brown Snake
-(31733,0,0,1,0, NULL), -- Cosmetic Cockroach
-(31796,0,0,1,0, NULL), -- Cosmetic Worg Pup
-(31732,0,0,1,0, NULL), -- Cosmetic Rat
-(31735,0,0,1,0, NULL), -- Cosmetic Pig
-(31728,0,0,1,0, NULL), -- Cosmetic Cat Set 1/2
-(31740,0,0,1,0, NULL), -- Cosmetic Turtle
-(31741,0,0,1,0, NULL), -- Cosmetic Rabbit
-(31755,0,0,1,0, NULL), -- Stabled Hunter Pet
-(31756,0,0,1,0, NULL), -- Stabled Hunter Pet
-(31757,0,0,1,0, NULL), -- Stabled Hunter Pet
-(31758,0,0,1,0, NULL), -- Stabled Hunter Pet
-(31768,0,0,1,0, NULL), -- Stabled Hunter Pet
-(31769,0,0,1,0, NULL); -- Stabled Hunter Pet
-
--- Random movement for two of the Stabled Hunter Pets
-UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid` IN (97556,97653);
-
--- Aura used by all Cosmetic* npcs in Dalaran
--- DELETE FROM `spell_dbc` WHERE `Id`=28782;
--- INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES (28782, 'Dalaran Cosmetic Aura - Unknown effect');
-
--- SAI/Gnome Diver: reply to emotes
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@Diver 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
-(@Diver,0,0,0,22,0,100,0,78,5000,5000,0,5,66,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Salute - Salute'),
-(@Diver,0,1,0,22,0,100,0,21,5000,5000,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Cheer - Bow'),
-(@Diver,0,2,0,22,0,100,0,101,5000,5000,0,5,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Wave - Wave'),
-(@Diver,0,3,0,22,0,100,0,34,5000,5000,0,5,94,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Dance - Dance'),
-(@Diver,0,4,0,22,0,100,0,328,5000,5000,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Flirt - Laugh'),
-(@Diver,0,5,0,22,0,100,0,58,5000,5000,0,5,23,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Kiss - Flex'),
-(@Diver,0,6,0,22,0,100,0,77,5000,5000,0,5,14,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gnome Diver: Rude - Rude');
-
--- Waypoints for flying birds
-DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN (31768,31769));
-DELETE FROM `creature` WHERE `id` IN (31768,31769);
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
-(@GUID+0,31768,571,1,1,0,0,5864.76025,561.5035,656.350159,3.38593864,120,0,0,1,0,0,2,0,0,0),
-(@GUID+1,31769,571,1,1,0,0,5871.1377,556.659363,660.738953,1.44698894,120,0,0,1,0,0,2,0,0,0);
-INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES
-(@GUID+0,(@GUID+0)*10),
-(@GUID+1,(@GUID+1)*10);
-DELETE FROM `waypoint_data`  WHERE `id` IN ((@GUID+0)*10,(@GUID+1)*10);
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES	
-((@GUID+0)*10,00,5865.73,561.7454,656.3502),
-((@GUID+0)*10,01,5864.76,561.5035,656.3502),
-((@GUID+0)*10,02,5865.858,545.6048,657.8221),
-((@GUID+0)*10,03,5856.59,546.2563,657.8221),
-((@GUID+0)*10,04,5851.967,553.7063,657.8221),
-((@GUID+0)*10,05,5848.848,559.3509,657.8221),
-((@GUID+0)*10,06,5855.463,567.5033,657.8221),
-((@GUID+0)*10,07,5861.43,566.0272,657.8221),
-((@GUID+0)*10,08,5870.177,562.2965,657.8221),
-((@GUID+0)*10,09,5872.478,553.6407,657.8221),
-((@GUID+0)*10,10,5864.64,545.9483,657.8221),
-((@GUID+0)*10,11,5856.267,546.3598,657.8221),
-((@GUID+0)*10,12,5851.878,553.7315,657.8221),
-((@GUID+0)*10,13,5848.888,559.2279,657.8221),
-((@GUID+0)*10,14,5848.888,559.2279,657.8221),
-((@GUID+1)*10,0,5856.941,550.4024,656.2946),
-((@GUID+1)*10,1,5856.993,551.4011,656.2946),
-((@GUID+1)*10,2,5852.679,558.0845,660.739),
-((@GUID+1)*10,3,5852.628,548.4319,660.739),
-((@GUID+1)*10,4,5862.95,547.2537,660.739),
-((@GUID+1)*10,5,5871.105,556.4464,660.739),
-((@GUID+1)*10,6,5866.302,565.8504,660.739),
-((@GUID+1)*10,7,5857.606,565.6177,660.739),
-((@GUID+1)*10,8,5857.606,565.6177,660.739);
diff --git a/sql/old/3.3.5a/2011_02_05_1_world_quest_template.sql b/sql/old/3.3.5a/2011_02_05_1_world_quest_template.sql
deleted file mode 100644
index 64cdd977cb8..00000000000
--- a/sql/old/3.3.5a/2011_02_05_1_world_quest_template.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Fix nonexisting required races for Hungry Hungry Hatching
-UPDATE `quest_template` SET `requiredraces`=514 WHERE `entry`=13889; -- Orc and Blood Elf (2+512)
-UPDATE `quest_template` SET `requiredraces`=176 WHERE `entry`=13915; -- Undead, Tauren, Troll (16+32+128)
--- Fix nonexisting required races for Poached, Scrambled, Or Raw?
-UPDATE `quest_template` SET `requiredraces`=514 WHERE `entry`=13904; -- Orc and Blood Elf (2+512)
-UPDATE `quest_template` SET `requiredraces`=176 WHERE `entry`=13916; -- Undead, Tauren, Troll (16+32+128)
--- Fix nonexisting required races for Searing Roc Feathers
-UPDATE `quest_template` SET `requiredraces`=514 WHERE `entry`=13905; -- Orc and Blood Elf (2+512)
-UPDATE `quest_template` SET `requiredraces`=176 WHERE `entry`=13914; -- Undead, Tauren, Troll (16+32+128)
diff --git a/sql/old/3.3.5a/2011_02_05_2_world_creature_template.sql b/sql/old/3.3.5a/2011_02_05_2_world_creature_template.sql
deleted file mode 100644
index d193a81eb79..00000000000
--- a/sql/old/3.3.5a/2011_02_05_2_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Update Trainertype where unit is NOT a trainer:
-UPDATE `creature_template` SET `trainer_type`=0 WHERE entry IN (1300,1703,2855,2870,5749,5750,5753,5815,6027,6328,6373,6374,6376,6382,11048,11050,11051,15494,12776,16639,16649,16703,16727,16746,23535);
diff --git a/sql/old/3.3.5a/2011_02_05_3_world_creature_template.sql b/sql/old/3.3.5a/2011_02_05_3_world_creature_template.sql
deleted file mode 100644
index b899286a090..00000000000
--- a/sql/old/3.3.5a/2011_02_05_3_world_creature_template.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Saving to instance for difficulty entries
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|1 WHERE `entry` IN (
-34566,35615,35616, -- Anub arak
-35347,35348,35349, -- Eydis Darkbane
-35350,35351,35352, -- Fjola Lightbane
-35216,35268,35269, -- Lord Jaraxxus
-35447,35448,35449); -- Icehowl
diff --git a/sql/old/3.3.5a/2011_02_05_4_world_game_event.sql b/sql/old/3.3.5a/2011_02_05_4_world_game_event.sql
deleted file mode 100644
index eb8db804358..00000000000
--- a/sql/old/3.3.5a/2011_02_05_4_world_game_event.sql
+++ /dev/null
@@ -1,42 +0,0 @@
--- Update Quest_conditions for Quest: The Lunar Festival
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`IN(8870,8871,8872,8873,8874,8875);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES 
--- Alliance
-(19,0,8871,0,4,1519,0,0,0,0,'The Lunar Festival: Stormwind'),
-(19,0,8872,0,4,1657,0,0,0,0,'The Lunar Festival: Darnassus'),
-(19,0,8870,0,4,1537,0,0,0,0,'The Lunar Festival: Ironforge'),
--- Horde
-(19,0,8873,0,4,1637,0,0,0,0,'The Lunar Festival: Orgrimmar'),
-(19,0,8874,0,4,1497,0,0,0,0,'The Lunar Festival: Undercity'),
-(19,0,8875,0,4,1638,0,0,0,0,'The Lunar Festival: Thunder Bluff');
--- Quest: Lunar Fireworks
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (15872,15873,15874,15879,15880,15882);
-DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (15872,15873,15874,15879,15880,15882); -- Cleanup
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (15872,15873,15874,15879,15880,15882);
-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 
--- small fireworks
--- blue firework
-(15879,0,0,0,1,0,100,1,0,0,0,0,11,26344,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
--- green firework
-(15880,0,0,0,1,0,100,1,0,0,0,0,11,26345,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
--- red firework
-(15882,0,0,0,1,0,100,1,0,0,0,0,11,26347,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
--- big fireworks
--- blue firework
-(15872,0,0,0,1,0,100,1,0,0,0,0,11,26344,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
--- red firework
-(15873,0,0,0,1,0,100,1,0,0,0,0,11,26347,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks'),
--- green firework
-(15874,0,0,0,1,0,100,1,0,0,0,0,11,26345,2,0,0,0,0,1,0,0,0,0,0,0,0, 'cast fireworks');
--- remove useless quests: (as of patch 3.0 they where removed)
-DELETE FROM `creature_questrelation` WHERE `quest` IN (8876,8877,8878,8879,8880,8881,8882,8862,8863,8864,8865);
-
--- Elune's Blessing
-DELETE FROM `gameobject_template` WHERE `entry` IN (180876,180877);
-INSERT INTO `gameobject_template` (`entry`,`type`,`displayId`,`name`,`IconName`,`castBarCaption`,`unk1`,`faction`,`flags`,`size`,`questItem1`,`questItem2`,`questItem3`,`questItem4`,`questItem5`,`questItem6`,`data0`,`data1`,`data2`,`data3`,`data4`,`data5`,`data6`,`data7`,`data8`,`data9`,`data10`,`data11`,`data12`,`data13`,`data14`,`data15`,`data16`,`data17`,`data18`,`data19`,`data20`,`data21`,`data22`,`data23`,`AIName`,`ScriptName`,`WDBVerified`) VALUES
-(180876,6,327, 'Elune''s Blessing TRAP BUFF', '', '', '',14,0,0.01,0,0,0,0,0,0,0,255,8,26393,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,'','',1),
-(180877,6,327, 'Elune''s Blessing TRAP QUESTCREDIT', '', '', '',14,0,0.01,0,0,0,0,0,0,0,255,8,26394,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,'','',1);
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=26393;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,26393,0,18,1,0,0,0, '', 'Elune''s Blessing');
diff --git a/sql/old/3.3.5a/2011_02_05_5_world_sai.sql b/sql/old/3.3.5a/2011_02_05_5_world_sai.sql
deleted file mode 100644
index 24278716679..00000000000
--- a/sql/old/3.3.5a/2011_02_05_5_world_sai.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- Scourge Flamespitter SAI 
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25582;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-118407,-118408,-118425,-118421,-118422,-118426,-118427,-118375,-118405,-118409,-118423,-118428,-118429);
-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
-(-118407,0,0,0,1,0,100,0,1000,1000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118408,0,0,0,1,0,100,0,1000,1000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118425,0,0,0,1,0,100,0,1000,1000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118421,0,0,0,1,0,100,0,7000,7000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118422,0,0,0,1,0,100,0,7000,7000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118426,0,0,0,1,0,100,0,4000,4000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118427,0,0,0,1,0,100,0,4000,4000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118375,0,0,0,1,0,100,0,2000,2000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118405,0,0,0,1,0,100,0,2000,2000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118409,0,0,0,1,0,100,0,2000,2000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118423,0,0,0,1,0,100,0,8000,8000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118428,0,0,0,1,0,100,0,8000,8000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec'),
-(-118429,0,0,0,1,0,100,0,8000,8000,8000,8000,11,45863,2,0,0,0,0,1,0,0,0,0,0,0,0,'Fire at random target every 8 sec');
diff --git a/sql/old/3.3.5a/2011_02_05_6_world_waypoint_data.sql b/sql/old/3.3.5a/2011_02_05_6_world_waypoint_data.sql
deleted file mode 100644
index 61dbc81d9b4..00000000000
--- a/sql/old/3.3.5a/2011_02_05_6_world_waypoint_data.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- remove waypoint script spamming from 2 Dawnblade Blood Knight's
-UPDATE `waypoint_data` SET `action`=0 WHERE `id` IN (943090,943250) AND `point`=2;
diff --git a/sql/old/3.3.5a/2011_02_05_7_world_sai.sql b/sql/old/3.3.5a/2011_02_05_7_world_sai.sql
deleted file mode 100644
index b746893890b..00000000000
--- a/sql/old/3.3.5a/2011_02_05_7_world_sai.sql
+++ /dev/null
@@ -1,80 +0,0 @@
--- Fix Quest 11460 "Trust is Earned"
--- UPDATE Hidalgo the Master Falconer "Add Excelsior to vehicle and add gossip flag"
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry` IN (24750,24752);
-DELETE FROM `vehicle_accessory` WHERE `entry`=24750;
-INSERT INTO `vehicle_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`) VALUES
-(24750,24751,0,1, 'Excelsior rides Hidalgo the Master Falconer');
-DELETE FROM `creature` WHERE `guid`=88103;
--- add missing text to Hidalgo the Master Falconer and Rock Falcon
-DELETE FROM `gossip_menu` WHERE `entry` IN (8998,9007) AND `text_id` IN (12153,12168);
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(8998,12153),(9007,12168);
--- Add gossip_menu condition for 8998 and 9007
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup` IN (8998,9007);
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9007;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`) VALUES
-(14,8998,12185,8,11460,0), -- Must have Quest 11460 rewarded
-(14,9007,12168,9,11460,0), -- Must have quest 11460 taken not complete
-(15,9007,0,2,34102,1), -- Must have at least 1 count of item 34102
-(15,9007,0,9,11460,0); -- Must have quest 11460 taken not complete
--- Creature Gossip_menu_option Update
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9007) AND `id` IN (0);
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(9007,0,0, 'Feed the grub to the Rock Falcon.',1,1,0,0,0,0,0, '');
-SET @ENTRY := 24752; -- Rock Falcon SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,9007,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip option Close Gossip'), -- Player needs to cast this on self "not working"
-(@ENTRY,0,1,0,61,0,100,0,100,100,100,100,86,44363,0,7,0,0,0,7,0,0,0,0,0,0,0,'Player selfcast spell');
-
--- Maiden of Winter's Breath Lake SAI For Quest "The Edge Of Winter"
-SET @ENTRY := 33303; -- NPC entry
-SET @ERROR1 := 1334; -- Error Message 1
-SET @ERROR2 := 1335; -- Error Message 2
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,75,45776,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Apply aura on spawn'),
-(@ENTRY,0,1,0,8,0,100,0,62767,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
-(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,28,45776,0,0,0,0,0,1,0,0,0,0,0,0,0,'Remove aura'),
-(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Face Player'),
-(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 0'),
-(@ENTRY*100,9,3,0,0,0,100,0,6000,6000,6000,6000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 1'),
-(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,5000,5000,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Reset Orientation'),
-(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,75,45776,0,0,0,0,0,1,0,0,0,0,0,0,0,'Replace Aura');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry`=33303;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(33303,0,0, 'Thank you, mortal, for freeing me from this curse. I beg you, take this blade.',0,0,100,1,0,0, 'Maiden of Winter''s Breath Lake'),
-(33303,1,0, 'It has brought me naught but ill. Mayhap you can find someone who will contain its power.',0,0,100,1,0,0, 'Maiden of Winter''s Breath Lake');
--- Condition Target for Spell Break Curse of Ice must be npc 33303 with aura 45776
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=62767;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`COMMENT`) VALUES
-(17,62767,19,33303,0,0,@ERROR1, 'Break Curse of Ice Required Target Maiden of Winter''s Breath Lake'),
-(17,62767,1,45776,0,1,@ERROR2, 'Break Curse of Ice Required Target Needs Aura Ice Block');
--- Add Error Strings
-DELETE FROM `trinity_string` WHERE `entry` IN (@ERROR1,@ERROR2);
-INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
-(@ERROR1, 'Requires Maiden of Winter''s Breath Lake'),
-(@ERROR2, 'You can''t use that right now');
-
--- Conversation between Crusader Lord Dalfors & Crusader Sunborn, Argent Vangard "Crusader Lord Dalfors Envoker"
-SET @ENTRY := 30224;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-UPDATE `smart_scripts` SET `target_type`=1, `comment`=  'The Ebon Watcher: Load script every 4 min ooc' WHERE `entryorguid`=30377 AND `source_type` =0 AND `id`=0;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,0,30000,60000,150000,150000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 2.5 min ooc'),
-(@ENTRY*100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crusader Lord Dalfors text 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,6000,6000,0,0,1,0,0,0,0,0,0,9,30225,0,10,0,0,0,0,'Crusader Sunborn Say text 0'),
-(@ENTRY*100,9,2,0,0,0,100,0,4000,4000,0,0,5,14,0,0,0,0,0,9,30225,0,10,0,0,0,0,'Crusader Sunborn emote');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry` IN (30224,30225);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(30224,0,0, 'What''s on yer mind, lad?',0,0,100,6,0,0, 'Crusader Lord Dalfors'),
-(30225,0,0, 'Eversong Woods, Dalfors. I''m thinking about how beautiful it was before Arthas cut a swathe of death through it...',0,0,100,1,0,0, 'Crusader Sunborn');
-
diff --git a/sql/old/3.3.5a/2011_02_05_8_world_sai.sql b/sql/old/3.3.5a/2011_02_05_8_world_sai.sql
deleted file mode 100644
index be2e11b4178..00000000000
--- a/sql/old/3.3.5a/2011_02_05_8_world_sai.sql
+++ /dev/null
@@ -1,75 +0,0 @@
--- Quest "The Denouncement" (12273) (Converted&tweaked to SAI by Nay)
-SET @Goodman := 27234; -- Blacksmith Goodman
-SET @Zierhut := 27235; -- Lead Cannoneer Zierhut (npc)
-SET @Mercer := 27236; -- Stable Master Mercer (npc)
-SET @Jordan := 27237; -- Commander Jordan (npc)
-SET @Rod := 37438; -- Rod of Compulsion (item)
-SET @Compelled := 48714; -- Compelled (spell)
-SET @DeathJordan := 48724; -- The Denouncement: Commander Jordan On Death
-SET @DeathZierhut := 48726; -- The Denouncement: Lead Cannoneer Zierhut On Death
-SET @DeathGoodman := 48728; -- The Denouncement: Blacksmith Goodman On Death
-SET @DeathMercer := 48730; -- The Denouncement: Stable Master Mercer On Death
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (@Goodman,@Zierhut,@Mercer,@Jordan);
--- Spell scripts: Give kill credit through spell
-DELETE FROM `spell_scripts` WHERE `id` IN (@DeathJordan,@DeathZierhut,@DeathGoodman,@DeathMercer);
-INSERT INTO `spell_scripts`(`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
-(@DeathJordan,0,15,48723,1,0,0,0,0,0),  -- cast "The Denouncement: Commander Jordan Kill Credit" on player
-(@DeathZierhut,0,15,48725,1,0,0,0,0,0), -- cast "The Denouncement: Lead Cannoneer Zierhut Kill Credit" on player
-(@DeathGoodman,0,15,48727,1,0,0,0,0,0), -- cast "The Denouncement: Blacksmith Goodman Kill Credit" on player
-(@DeathMercer,0,15,48729,1,0,0,0,0,0);  -- cast "The Denouncement: Stable Master Mercer Kill Credit" on player
--- Spell targets for spells that give quest credit through effect 77
-DELETE FROM `conditions` where `SourceEntry` IN (@DeathJordan,@DeathZierhut,@DeathGoodman,@DeathMercer) AND `SourceTypeOrReferenceId`=13;
-DELETE FROM `conditions` where `SourceEntry`=@Rod AND `SourceTypeOrReferenceId`=18;
-INSERT INTO `conditions`(`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
-(13,0,@DeathJordan,0,18,1,@Jordan,0,0, 'The Denouncement: Jordan target'),
-(13,0,@DeathZierhut,0,18,1,@Zierhut,0,0, 'The Denouncement: Zierhut target'),
-(13,0,@DeathGoodman,0,18,1,0,0,0, 'The Denouncement: Goodman target'),
-(13,0,@DeathMercer,0,18,1,@Mercer,0,0, 'The Denouncement: Mercer'),
-(18,0,@Rod,0,24,1,@Goodman,0,0, 'The Denouncement: Rod - Goodman target'),
-(18,0,@Rod,0,24,1,@Zierhut,0,0, 'The Denouncement: Rod - Zierhut target'),
-(18,0,@Rod,0,24,1,@Mercer,0,0, 'The Denouncement: Rod - Mercer target'),
-(18,0,@Rod,0,24,1,@Jordan,0,0, 'The Denouncement: Rod - Jordan target');
-DELETE FROM `creature_text` WHERE `entry` IN (@Goodman,@Zierhut,@Mercer,@Jordan);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(@Goodman,0,0, 'You are being misled! The Onslaught is all lies! The Scourge and the Forsaken are not our enemies! Wake up!',1,0,100,5,0,0, 'Blacksmith Goodman'),
-(@Jordan,0,0, 'High general Abbendis personally told me that it was a mistake to come north and that we''re doomed! I urge you all to lay down your weapons and leave before it''s too late!',1,0,100,5,0,0, 'Commander Jordan'),
-(@Zierhut,0,0, 'Renounce the Scarlet Onslaught! Don''t listen to the lies of the high general and the grand admiral any longer!',1,0,100,5,0,0, 'Lead Cannoneer Zierhut'),
-(@Mercer,0,0, 'Abbendis is nothing but a harlot and Grand Admiral Westwind is selling her cheap like he sold us out!',1,0,100,5,0,0, 'Stable Master Mercer');
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@Goodman,@Zierhut,@Mercer,@Jordan);
-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 
-(@Goodman,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On spellhit set phase 2'),
-(@Goodman,0,1,0,6,2,100,0,0,0,0,0,85,@DeathGoodman,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On death in phase 2 cast spell'),
-(@Goodman,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On reset remove Compelled aura'),
-(@Goodman,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On reset set phase 0'),
-(@Goodman,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On death in phase 2 yell'),
-(@Mercer,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On spellhit set phase 2'),
-(@Mercer,0,1,0,6,2,100,0,0,0,0,0,85,@DeathMercer,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On death in phase 2 cast spell'),
-(@Mercer,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On reset remove Compelled aura'),
-(@Mercer,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On reset set phase 0'),
-(@Mercer,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Mercer: On death in phase 2 yell'),
-(@Zierhut,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Goodman: On spellhit set phase 2'),
-(@Zierhut,0,1,0,6,2,100,0,0,0,0,0,85,@DeathZierhut,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On death in phase 2 cast spell'),
-(@Zierhut,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On reset remove Compelled aura'),
-(@Zierhut,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On reset set phase 0'),
-(@Zierhut,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Zierhut: On death in phase 2 yell'),
-(@Jordan,0,0,0,8,0,100,0,@Compelled,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On spellhit set phase 2'),
-(@Jordan,0,1,0,6,2,100,0,0,0,0,0,85,@DeathJordan,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On death in phase 2 cast spell'),
-(@Jordan,0,2,0,25,0,100,0,0,0,0,0,28,@Compelled,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On reset remove Compelled aura'),
-(@Jordan,0,3,0,25,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On reset set phase 0'),
-(@Jordan,0,4,0,6,2,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Denouncement/Jordan: On death in phase 2 yell');
-
--- Kill a unrelated console DB error 
-DELETE FROM `creature_addon` WHERE `guid`=88103;
-
--- Valiance Keep Footman SAI (by Malcrom)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25253;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-111383,-111377,-111378,-111382,-111379,-111380);
-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
-(-111383,0,0,0,1,0,100,0,1000,2000,4000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 4-5 sec'),
-(-111377,0,0,0,1,0,100,0,3000,4000,4000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 4-5 sec'),
-(-111378,0,0,0,1,0,100,0,8000,8000,16000,16000,10,4,5,21,0,0,0,1,0,0,0,0,0,0,0,'Random cheer emote every 16 sec'),
-(-111382,0,0,0,1,0,100,0,16000,16000,16000,16000,10,4,5,21,0,0,0,1,0,0,0,0,0,0,0,'Random cheer emote every 16 sec'),
-(-111379,0,0,0,1,0,100,0,2000,2000,5000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 5 sec'),
-(-111379,0,1,0,1,0,100,0,4000,4000,7000,7000,5,36,0,0,0,0,0,10,111376,25253,0,0,0,0,0,'Attack emote dueler 2 sec later sec'),
-(-111380,0,0,0,1,0,100,0,5000,5000,5000,5000,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,'Attack emote every 5 sec'),
-(-111380,0,1,0,1,0,100,0,7000,7000,7000,7000,5,36,0,0,0,0,0,10,111381,25253,0,0,0,0,0,'Attack emote dueler 2 sec later sec');
diff --git a/sql/old/3.3.5a/2011_02_06_00_world_instance_sindragosa_lair.sql b/sql/old/3.3.5a/2011_02_06_00_world_instance_sindragosa_lair.sql
new file mode 100644
index 00000000000..a52ed4f9859
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_06_00_world_instance_sindragosa_lair.sql
@@ -0,0 +1,73 @@
+-- Creature templates
+UPDATE `creature_template` SET `difficulty_entry_1`=38139 WHERE `entry`=37531;
+UPDATE `creature_template` SET `difficulty_entry_1`=38151 WHERE `entry`=37532;
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37533;
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37534;
+UPDATE `creature_template` SET `difficulty_entry_1`=38320,`difficulty_entry_2`=38321,`difficulty_entry_3`=38322 WHERE `entry`=36980;
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=1,`faction_A`=14,`faction_H`=14,`unit_flags`=`unit_flags`|33554432,`baseattacktime`=2000,`flags_extra`=`flags_extra`|128 WHERE `entry`=38223; -- Icy Blast
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=523,`speed_walk`=1,`speed_run`=1.42857 WHERE `entry` IN (37531,38139); -- Frostwarden Handler
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=16,`faction_H`=16,`dynamicflags`=8,`baseattacktime`=2000,`speed_run`=1 WHERE `entry` IN (37532,38151); -- Frostwing Whelp
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=2,`faction_A`=21,`faction_H`=21,`unit_flags`=`unit_flags`|64,`baseattacktime`=2000,`speed_walk`=2,`speed_run`=1.5873,`MovementType`=2,`InhabitType`=5 WHERE `entry` IN (37533,38220); -- Rimefang
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=2,`faction_A`=21,`faction_H`=21,`unit_flags`=`unit_flags`|64,`baseattacktime`=2000,`speed_walk`=2,`speed_run`=1.5873,`MovementType`=2,`InhabitType`=5 WHERE `entry` IN (37534,38219); -- Spinestalker
+UPDATE `creature_template` SET `minlevel`=83,`maxlevel`=83,`unit_class`=1,`faction_A`=2068,`faction_H`=2068,`unit_flags`=0,`baseattacktime`=1500,`speed_walk`=4.8,`speed_run`=4.28571 WHERE `entry` IN (36853,38265,38266,38267); -- Sindragosa
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=14,`faction_H`=14,`unit_flags`=`unit_flags`|33554944,`baseattacktime`=2000,`flags_extra`=`flags_extra`|128 WHERE `entry`=37186; -- Frost Bomb
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`speed_run`=1 WHERE `entry` IN (36980,38320,38321,38322); -- Ice Tomb
+
+-- Linked respawns
+SET @GUID := 151761;
+SET @SPINESTALKER := 207211;
+SET @RIMEFANG := 207210;
+DELETE FROM `linked_respawn` WHERE guid IN (@SPINESTALKER,@RIMEFANG) OR `guid` BETWEEN @GUID+22 AND @GUID+51;
+INSERT INTO `linked_respawn` (`guid`,`linkedGuid`,`linkType`) VALUES
+(@SPINESTALKER,@SPINESTALKER,0), -- Spinestalker
+(@RIMEFANG,@RIMEFANG,0), -- Rimefang
+(@GUID+22,@SPINESTALKER,0), --  Frostwarden Handler
+(@GUID+23,@RIMEFANG,0), --  Frostwarden Handler
+(@GUID+24,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+25,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+26,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+27,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+28,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+29,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+30,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+31,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+32,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+33,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+34,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+35,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+36,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+37,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+38,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+39,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+40,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+41,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+42,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+43,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+44,@SPINESTALKER,0), --  Frostwing Whelp
+(@GUID+45,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+46,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+47,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+48,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+49,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+50,@RIMEFANG,0), --  Frostwing Whelp
+(@GUID+51,@RIMEFANG,0); --  Frostwing Whelp
+
+-- Creature addon
+UPDATE `creature_addon` SET `bytes1`=0 WHERE `guid` IN (@SPINESTALKER,@RIMEFANG);
+
+-- Creature model data
+UPDATE `creature_model_info` SET `gender`=1 WHERE `modelid`=30362;
+
+-- Gameobject templates
+UPDATE `gameobject_template` SET `flags`=33,`faction`=114 WHERE `entry`=202396; -- Ice Wall
+UPDATE `gameobject_template` SET `flags`=32,`faction`=114 WHERE `entry`=201722; -- Ice Block
+
+-- Gameobject spawns
+DELETE FROM `gameobject` WHERE `id`=202396;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(121712,202396,631,15,1,4309.686,2491.27441,211.170792,0.209439442,0,0,0,0,120,0,0); -- Ice Wall
+
+-- Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70598;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`Comment`) VALUES
+(13,70598,18,1, 'Sindragosa''s Fury - player targets');
diff --git a/sql/old/3.3.5a/2011_02_06_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2011_02_06_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..295bb76a261
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_06_01_world_creature_loot_template.sql
@@ -0,0 +1,2 @@
+-- Fragment of the Nightmare's Corruption drops 100% as of patch 3.0.2
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `item` IN (21146,21147,21148,21149);
diff --git a/sql/old/3.3.5a/2011_02_06_02_world_item_loot_template.sql b/sql/old/3.3.5a/2011_02_06_02_world_item_loot_template.sql
new file mode 100644
index 00000000000..e77a40def02
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_06_02_world_item_loot_template.sql
@@ -0,0 +1,4 @@
+-- Insert loot for Gently Shaken Gift
+DELETE FROM `item_loot_template` WHERE `entry`=21271;
+INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(21271,21241,100,1,0,5,5);
diff --git a/sql/old/3.3.5a/2011_02_06_0_world_instance_sindragosa_lair.sql b/sql/old/3.3.5a/2011_02_06_0_world_instance_sindragosa_lair.sql
deleted file mode 100644
index a52ed4f9859..00000000000
--- a/sql/old/3.3.5a/2011_02_06_0_world_instance_sindragosa_lair.sql
+++ /dev/null
@@ -1,73 +0,0 @@
--- Creature templates
-UPDATE `creature_template` SET `difficulty_entry_1`=38139 WHERE `entry`=37531;
-UPDATE `creature_template` SET `difficulty_entry_1`=38151 WHERE `entry`=37532;
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37533;
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37534;
-UPDATE `creature_template` SET `difficulty_entry_1`=38320,`difficulty_entry_2`=38321,`difficulty_entry_3`=38322 WHERE `entry`=36980;
-UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=1,`faction_A`=14,`faction_H`=14,`unit_flags`=`unit_flags`|33554432,`baseattacktime`=2000,`flags_extra`=`flags_extra`|128 WHERE `entry`=38223; -- Icy Blast
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=523,`speed_walk`=1,`speed_run`=1.42857 WHERE `entry` IN (37531,38139); -- Frostwarden Handler
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=16,`faction_H`=16,`dynamicflags`=8,`baseattacktime`=2000,`speed_run`=1 WHERE `entry` IN (37532,38151); -- Frostwing Whelp
-UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=2,`faction_A`=21,`faction_H`=21,`unit_flags`=`unit_flags`|64,`baseattacktime`=2000,`speed_walk`=2,`speed_run`=1.5873,`MovementType`=2,`InhabitType`=5 WHERE `entry` IN (37533,38220); -- Rimefang
-UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=2,`faction_A`=21,`faction_H`=21,`unit_flags`=`unit_flags`|64,`baseattacktime`=2000,`speed_walk`=2,`speed_run`=1.5873,`MovementType`=2,`InhabitType`=5 WHERE `entry` IN (37534,38219); -- Spinestalker
-UPDATE `creature_template` SET `minlevel`=83,`maxlevel`=83,`unit_class`=1,`faction_A`=2068,`faction_H`=2068,`unit_flags`=0,`baseattacktime`=1500,`speed_walk`=4.8,`speed_run`=4.28571 WHERE `entry` IN (36853,38265,38266,38267); -- Sindragosa
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=14,`faction_H`=14,`unit_flags`=`unit_flags`|33554944,`baseattacktime`=2000,`flags_extra`=`flags_extra`|128 WHERE `entry`=37186; -- Frost Bomb
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`speed_run`=1 WHERE `entry` IN (36980,38320,38321,38322); -- Ice Tomb
-
--- Linked respawns
-SET @GUID := 151761;
-SET @SPINESTALKER := 207211;
-SET @RIMEFANG := 207210;
-DELETE FROM `linked_respawn` WHERE guid IN (@SPINESTALKER,@RIMEFANG) OR `guid` BETWEEN @GUID+22 AND @GUID+51;
-INSERT INTO `linked_respawn` (`guid`,`linkedGuid`,`linkType`) VALUES
-(@SPINESTALKER,@SPINESTALKER,0), -- Spinestalker
-(@RIMEFANG,@RIMEFANG,0), -- Rimefang
-(@GUID+22,@SPINESTALKER,0), --  Frostwarden Handler
-(@GUID+23,@RIMEFANG,0), --  Frostwarden Handler
-(@GUID+24,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+25,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+26,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+27,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+28,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+29,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+30,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+31,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+32,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+33,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+34,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+35,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+36,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+37,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+38,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+39,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+40,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+41,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+42,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+43,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+44,@SPINESTALKER,0), --  Frostwing Whelp
-(@GUID+45,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+46,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+47,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+48,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+49,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+50,@RIMEFANG,0), --  Frostwing Whelp
-(@GUID+51,@RIMEFANG,0); --  Frostwing Whelp
-
--- Creature addon
-UPDATE `creature_addon` SET `bytes1`=0 WHERE `guid` IN (@SPINESTALKER,@RIMEFANG);
-
--- Creature model data
-UPDATE `creature_model_info` SET `gender`=1 WHERE `modelid`=30362;
-
--- Gameobject templates
-UPDATE `gameobject_template` SET `flags`=33,`faction`=114 WHERE `entry`=202396; -- Ice Wall
-UPDATE `gameobject_template` SET `flags`=32,`faction`=114 WHERE `entry`=201722; -- Ice Block
-
--- Gameobject spawns
-DELETE FROM `gameobject` WHERE `id`=202396;
-INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
-(121712,202396,631,15,1,4309.686,2491.27441,211.170792,0.209439442,0,0,0,0,120,0,0); -- Ice Wall
-
--- Conditions
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70598;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`Comment`) VALUES
-(13,70598,18,1, 'Sindragosa''s Fury - player targets');
diff --git a/sql/old/3.3.5a/2011_02_06_1_world_creature_loot_template.sql b/sql/old/3.3.5a/2011_02_06_1_world_creature_loot_template.sql
deleted file mode 100644
index 295bb76a261..00000000000
--- a/sql/old/3.3.5a/2011_02_06_1_world_creature_loot_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fragment of the Nightmare's Corruption drops 100% as of patch 3.0.2
-UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `item` IN (21146,21147,21148,21149);
diff --git a/sql/old/3.3.5a/2011_02_06_2_world_item_loot_template.sql b/sql/old/3.3.5a/2011_02_06_2_world_item_loot_template.sql
deleted file mode 100644
index e77a40def02..00000000000
--- a/sql/old/3.3.5a/2011_02_06_2_world_item_loot_template.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Insert loot for Gently Shaken Gift
-DELETE FROM `item_loot_template` WHERE `entry`=21271;
-INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(21271,21241,100,1,0,5,5);
diff --git a/sql/old/3.3.5a/2011_02_07_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_02_07_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..c73e90d161d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_00_world_achievement_criteria_data.sql
@@ -0,0 +1,18 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12822,12996,12972,12989,12758,12955,13049,13060,13102,13133,13134,13135);
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(12822,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (10 player)
+(12822,12,0,0, ''), -- All You Can Eat (10 player)
+(12996,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (10 player) Heroic
+(12996,12,2,0, ''), -- All You Can Eat (10 player) Heroic
+(12972,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (25 player)
+(12972,12,1,0, ''), -- All You Can Eat (25 player)
+(12989,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (25 player) Heroic
+(12989,12,3,0, ''), -- All You Can Eat (25 player) Heroic
+(12758,12,0,0, ''), -- The Frostwing Halls (10 player) Sindragosa
+(12955,12,1,0, ''), -- The Frostwing Halls (25 player) Sindragosa
+(13049,12,2,0, ''), -- Heroic: The Frostwing Halls (10 player) Sindragosa
+(13060,12,3,0, ''), -- Heroic: The Frostwing Halls (25 player) Sindragosa
+(13102,12,0,0, ''), -- Sindragosa kills (Icecrown 10 player)
+(13133,12,1,0, ''), -- Sindragosa kills (Icecrown 25 player)
+(13134,12,2,0, ''), -- Sindragosa kills (Heroic Icecrown 10 player)
+(13135,12,3,0, ''); -- Sindragosa kills (Heroic Icecrown 25 player)
diff --git a/sql/old/3.3.5a/2011_02_07_00_world_areatrigger_scripts.sql b/sql/old/3.3.5a/2011_02_07_00_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..6fba267fe1b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_00_world_areatrigger_scripts.sql
@@ -0,0 +1,3 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry`=5604;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(5604,'at_sindragosa_lair');
diff --git a/sql/old/3.3.5a/2011_02_07_00_world_creature_template.sql b/sql/old/3.3.5a/2011_02_07_00_world_creature_template.sql
new file mode 100644
index 00000000000..216adb1c52a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_00_world_creature_template.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`dynamicflags`=0,`VehicleId`=591,`minrangedmg`=345,`maxrangedmg`=509,`rangedattackpower`=103,`mindmg`=422,`maxdmg`=586,`attackpower`=642,`dmg_multiplier`=7.5,`spell3`=70542,`spell6`=71516 WHERE `entry` IN (37672,38285,38605,38786,38787,38788,38789,38790);
+UPDATE `creature_template` SET `spell1`=70360,`spell2`=70539 WHERE `entry` IN (38605,38786,38787);
+UPDATE `creature_template` SET `spell1`=72527,`spell2`=72457 WHERE `entry` IN (38788,38789,38790);
+UPDATE `creature_template` SET `difficulty_entry_1`=38605,`difficulty_entry_2`=38786,`difficulty_entry_3`=38787 WHERE `entry`=37672;
+UPDATE `creature_template` SET `difficulty_entry_1`=38788,`difficulty_entry_2`=38789,`difficulty_entry_3`=38790 WHERE `entry`=38285;
diff --git a/sql/old/3.3.5a/2011_02_07_00_world_creature_text.sql b/sql/old/3.3.5a/2011_02_07_00_world_creature_text.sql
new file mode 100644
index 00000000000..e4d570bb7fa
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_00_world_creature_text.sql
@@ -0,0 +1,14 @@
+DELETE FROM `creature_text` WHERE `entry`=36853;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(36853,0,0, 'You are fools to have come to this place! The icy winds of Northrend will consume your souls!',1,0,0,0,0,17007, 'Sindragosa - SAY_AGGRO'),
+(36853,1,0, 'Suffer, mortals, as your pathetic magic betrays you!',1,0,0,0,0,17014, 'Sindragosa - SAY_UNCHAINED_MAGIC'),
+(36853,2,0, '%s prepares to unleash a wave of blistering cold!',3,0,0,0,0,0, 'Sindragosa - EMOTE_WARN_BLISTERING_COLD'),
+(36853,3,0, 'Can you feel the cold hand of death upon your heart?',1,0,0,0,0,17013, 'Sindragosa - SAY_BLISTERING_COLD'),
+(36853,4,0, 'Aaah! It burns! What sorcery is this?!',1,0,0,0,0,17015, 'Sindragosa - SAY_RESPITE_FOR_A_TORMENTED_SOUL'),
+(36853,5,0, 'Your incursion ends here! None shall survive!',1,0,0,0,0,17012, 'Sindragosa - SAY_AIR_PHASE'),
+(36853,6,0, 'Now feel my master''s limitless power and despair!',1,0,0,0,0,17016, 'Sindragosa - SAY_PHASE_2'),
+(36853,7,0, '%s fires a frozen orb towards $N!',3,0,0,0,0,0, 'Sindragosa - EMOTE_WARN_FROZEN_ORB'),
+(36853,8,0, 'Perish!',1,0,0,0,0,17008, 'Sindragosa - SAY_KILL 1'),
+(36853,8,1, 'A flaw of mortality...',1,0,0,0,0,17009, 'Sindragosa - SAY_KILL 2'),
+(36853,9,0, 'Enough! I tire of these games!',1,0,0,0,0,17011, 'Sindragosa - SAY_BERSERK'),
+(36853,10,0, 'Free...at last...',1,0,0,0,0,17010, 'Sindragosa - SAY_DEATH');
diff --git a/sql/old/3.3.5a/2011_02_07_00_world_scriptname.sql b/sql/old/3.3.5a/2011_02_07_00_world_scriptname.sql
new file mode 100644
index 00000000000..d6b290c48ab
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_00_world_scriptname.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `ScriptName`='boss_sindragosa' WHERE `entry`=36853;
+UPDATE `creature_template` SET `ScriptName`='npc_ice_tomb' WHERE `entry`=36980;
+UPDATE `creature_template` SET `ScriptName`='npc_spinestalker' WHERE `entry`=37534;
+UPDATE `creature_template` SET `ScriptName`='npc_rimefang_icc' WHERE `entry`=37533;
+UPDATE `creature_template` SET `ScriptName`='npc_sindragosa_trash' WHERE `entry` IN (37531,37532);
diff --git a/sql/old/3.3.5a/2011_02_07_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_07_00_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..0839e256fb3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_00_world_spell_linked_spell.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (70117,70157);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(70117,70122,1, 'Sindragosa - Icy Grip'),
+(70157,69700,2, 'Sindragosa - Ice Tomb resistance');
diff --git a/sql/old/3.3.5a/2011_02_07_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_07_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..7fc30c64a07
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_00_world_spell_script_names.sql
@@ -0,0 +1,30 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_frostwarden_handler_order_whelp';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_frostwarden_handler_focus_fire';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rimefang_icy_blast';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_s_fury';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_unchained_magic';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_instability';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_frost_beacon';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb_dummy';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb_trap';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_collision_filter';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(71357,'spell_frostwarden_handler_order_whelp'),
+(71350,'spell_frostwarden_handler_focus_fire'),
+(71376,'spell_rimefang_icy_blast'),
+(70598,'spell_sindragosa_s_fury'),
+(69762,'spell_sindragosa_unchained_magic'),
+(69766,'spell_sindragosa_instability'),
+(70126,'spell_sindragosa_frost_beacon'),
+(69712,'spell_sindragosa_ice_tomb'),
+(69675,'spell_sindragosa_ice_tomb_dummy'),
+(70157,'spell_sindragosa_ice_tomb_trap'),
+(69845,'spell_sindragosa_collision_filter'),
+(71053,'spell_sindragosa_collision_filter'),
+(71054,'spell_sindragosa_collision_filter'),
+(71055,'spell_sindragosa_collision_filter'),
+(70127,'spell_sindragosa_collision_filter'),
+(72528,'spell_sindragosa_collision_filter'),
+(72529,'spell_sindragosa_collision_filter'),
+(72530,'spell_sindragosa_collision_filter');
diff --git a/sql/old/3.3.5a/2011_02_07_01_world_creature_questrelation.sql b/sql/old/3.3.5a/2011_02_07_01_world_creature_questrelation.sql
new file mode 100644
index 00000000000..4aeb7a70775
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_01_world_creature_questrelation.sql
@@ -0,0 +1,12 @@
+-- Missing relation for quest You've Been Served
+DELETE FROM `creature_questrelation` WHERE `id`=38208 AND `quest`=14488;
+DELETE FROM `creature_involvedrelation` WHERE `id`=36296 AND `quest`=14488;
+INSERT INTO `creature_questrelation`(`id`,`quest`) VALUES (38208,14488);
+INSERT INTO `creature_involvedrelation`(`id`,`quest`) VALUES (36296,14488);
+
+-- Missing loot form Standard Apothecary Serving Kit request for quest You've Been Served
+DELETE FROM `item_loot_template` WHERE `entry`=49631 AND `item` IN (49352,49351,49635);
+INSERT INTO `item_loot_template`(`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+(49631,49352,100,1,0,1,1),
+(49631,49351,100,1,0,1,1),
+(49631,49635,100,1,0,1,1);
diff --git a/sql/old/3.3.5a/2011_02_07_02_world_sai.sql b/sql/old/3.3.5a/2011_02_07_02_world_sai.sql
new file mode 100644
index 00000000000..1af21f5d048
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_07_02_world_sai.sql
@@ -0,0 +1,58 @@
+-- SAI for quest 10345 "The Flesh Lies..."
+-- Spell script target for Protectorate Igniter (quest The Flesh Lies...) 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=35372;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,35372,1,18,1,20561,0,0,'', 'Protectorate Igniter');
+-- Withered Corpse SAI.
+SET @ENTRY:=20561;
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~2 WHERE `entry`=@ENTRY;
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|256 WHERE `entry`=@ENTRY;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'On spawn set phase 1'),
+(@ENTRY,0,1,0,8,1,100,0,35372,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 'set phase 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,0,0,33,20561,0,0,0,0,0,7,0,0,0,0,0,0,0,'give quest credit'),
+(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'despawn');
+
+-- SAI for quest 11607 "The Lost Spirits"
+-- Kaskala Craftman SAI.
+SET @ENTRY:=25321;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'On spawn set phase 1'),
+(@ENTRY,0,1,0,8,1,100,0,45504,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 'set phase 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,1000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say Text 0 random'),
+(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,0,0,33,25321,0,0,0,0,0,7,0,0,0,0,0,0,0,'give quest credit'),
+(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'despawn');
+-- Add texts for this NPC.
+DELETE FROM `creature_text` WHERE `entry`=25321;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
+(25321,0,0, 'Thank you for freeing me! May the tides always favor you.',0,0,100,1,0,0, 'Kaskala Craftman'),
+(25321,0,1, 'Do not allow Kaskala to forget what has happened here.',0,0,100,1,0,0, 'Kaskala Craftman');
+-- Kaskala Shaman SAI.
+SET @ENTRY:=25322;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0, 'On spawn set phase 1'),
+(@ENTRY,0,1,0,8,1,100,0,45504,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 'set phase 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,1000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say Text 0 random'),
+(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,0,0,33,25322,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
+(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'despawn');
+-- Add texts for this NPC.
+DELETE FROM `creature_text` WHERE `entry`=25322;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
+(25322,0,0, 'May the ancestors always aid you, $n, as you have aided me.',0,0,100,1,0,0, 'Kaskala Shaman'),
+(25322,0,1, 'Thank you, $n. May the winds and seas always deliver you safely.',0,0,100,1,0,0, 'Kaskala Shaman');
+-- Delete the old EAI script.
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (25321,25322);
+-- Delete the EAI texts.
+DELETE FROM `creature_ai_texts` WHERE entry IN (-899,-898,-900,-901);
diff --git a/sql/old/3.3.5a/2011_02_07_0_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_02_07_0_world_achievement_criteria_data.sql
deleted file mode 100644
index c73e90d161d..00000000000
--- a/sql/old/3.3.5a/2011_02_07_0_world_achievement_criteria_data.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12822,12996,12972,12989,12758,12955,13049,13060,13102,13133,13134,13135);
-INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
-(12822,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (10 player)
-(12822,12,0,0, ''), -- All You Can Eat (10 player)
-(12996,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (10 player) Heroic
-(12996,12,2,0, ''), -- All You Can Eat (10 player) Heroic
-(12972,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (25 player)
-(12972,12,1,0, ''), -- All You Can Eat (25 player)
-(12989,11,0,0, 'achievement_all_you_can_eat'), -- All You Can Eat (25 player) Heroic
-(12989,12,3,0, ''), -- All You Can Eat (25 player) Heroic
-(12758,12,0,0, ''), -- The Frostwing Halls (10 player) Sindragosa
-(12955,12,1,0, ''), -- The Frostwing Halls (25 player) Sindragosa
-(13049,12,2,0, ''), -- Heroic: The Frostwing Halls (10 player) Sindragosa
-(13060,12,3,0, ''), -- Heroic: The Frostwing Halls (25 player) Sindragosa
-(13102,12,0,0, ''), -- Sindragosa kills (Icecrown 10 player)
-(13133,12,1,0, ''), -- Sindragosa kills (Icecrown 25 player)
-(13134,12,2,0, ''), -- Sindragosa kills (Heroic Icecrown 10 player)
-(13135,12,3,0, ''); -- Sindragosa kills (Heroic Icecrown 25 player)
diff --git a/sql/old/3.3.5a/2011_02_07_0_world_areatrigger_scripts.sql b/sql/old/3.3.5a/2011_02_07_0_world_areatrigger_scripts.sql
deleted file mode 100644
index 6fba267fe1b..00000000000
--- a/sql/old/3.3.5a/2011_02_07_0_world_areatrigger_scripts.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `areatrigger_scripts` WHERE `entry`=5604;
-INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
-(5604,'at_sindragosa_lair');
diff --git a/sql/old/3.3.5a/2011_02_07_0_world_creature_template.sql b/sql/old/3.3.5a/2011_02_07_0_world_creature_template.sql
deleted file mode 100644
index 216adb1c52a..00000000000
--- a/sql/old/3.3.5a/2011_02_07_0_world_creature_template.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`dynamicflags`=0,`VehicleId`=591,`minrangedmg`=345,`maxrangedmg`=509,`rangedattackpower`=103,`mindmg`=422,`maxdmg`=586,`attackpower`=642,`dmg_multiplier`=7.5,`spell3`=70542,`spell6`=71516 WHERE `entry` IN (37672,38285,38605,38786,38787,38788,38789,38790);
-UPDATE `creature_template` SET `spell1`=70360,`spell2`=70539 WHERE `entry` IN (38605,38786,38787);
-UPDATE `creature_template` SET `spell1`=72527,`spell2`=72457 WHERE `entry` IN (38788,38789,38790);
-UPDATE `creature_template` SET `difficulty_entry_1`=38605,`difficulty_entry_2`=38786,`difficulty_entry_3`=38787 WHERE `entry`=37672;
-UPDATE `creature_template` SET `difficulty_entry_1`=38788,`difficulty_entry_2`=38789,`difficulty_entry_3`=38790 WHERE `entry`=38285;
diff --git a/sql/old/3.3.5a/2011_02_07_0_world_creature_text.sql b/sql/old/3.3.5a/2011_02_07_0_world_creature_text.sql
deleted file mode 100644
index e4d570bb7fa..00000000000
--- a/sql/old/3.3.5a/2011_02_07_0_world_creature_text.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-DELETE FROM `creature_text` WHERE `entry`=36853;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(36853,0,0, 'You are fools to have come to this place! The icy winds of Northrend will consume your souls!',1,0,0,0,0,17007, 'Sindragosa - SAY_AGGRO'),
-(36853,1,0, 'Suffer, mortals, as your pathetic magic betrays you!',1,0,0,0,0,17014, 'Sindragosa - SAY_UNCHAINED_MAGIC'),
-(36853,2,0, '%s prepares to unleash a wave of blistering cold!',3,0,0,0,0,0, 'Sindragosa - EMOTE_WARN_BLISTERING_COLD'),
-(36853,3,0, 'Can you feel the cold hand of death upon your heart?',1,0,0,0,0,17013, 'Sindragosa - SAY_BLISTERING_COLD'),
-(36853,4,0, 'Aaah! It burns! What sorcery is this?!',1,0,0,0,0,17015, 'Sindragosa - SAY_RESPITE_FOR_A_TORMENTED_SOUL'),
-(36853,5,0, 'Your incursion ends here! None shall survive!',1,0,0,0,0,17012, 'Sindragosa - SAY_AIR_PHASE'),
-(36853,6,0, 'Now feel my master''s limitless power and despair!',1,0,0,0,0,17016, 'Sindragosa - SAY_PHASE_2'),
-(36853,7,0, '%s fires a frozen orb towards $N!',3,0,0,0,0,0, 'Sindragosa - EMOTE_WARN_FROZEN_ORB'),
-(36853,8,0, 'Perish!',1,0,0,0,0,17008, 'Sindragosa - SAY_KILL 1'),
-(36853,8,1, 'A flaw of mortality...',1,0,0,0,0,17009, 'Sindragosa - SAY_KILL 2'),
-(36853,9,0, 'Enough! I tire of these games!',1,0,0,0,0,17011, 'Sindragosa - SAY_BERSERK'),
-(36853,10,0, 'Free...at last...',1,0,0,0,0,17010, 'Sindragosa - SAY_DEATH');
diff --git a/sql/old/3.3.5a/2011_02_07_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_07_0_world_scriptname.sql
deleted file mode 100644
index d6b290c48ab..00000000000
--- a/sql/old/3.3.5a/2011_02_07_0_world_scriptname.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='boss_sindragosa' WHERE `entry`=36853;
-UPDATE `creature_template` SET `ScriptName`='npc_ice_tomb' WHERE `entry`=36980;
-UPDATE `creature_template` SET `ScriptName`='npc_spinestalker' WHERE `entry`=37534;
-UPDATE `creature_template` SET `ScriptName`='npc_rimefang_icc' WHERE `entry`=37533;
-UPDATE `creature_template` SET `ScriptName`='npc_sindragosa_trash' WHERE `entry` IN (37531,37532);
diff --git a/sql/old/3.3.5a/2011_02_07_0_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_07_0_world_spell_linked_spell.sql
deleted file mode 100644
index 0839e256fb3..00000000000
--- a/sql/old/3.3.5a/2011_02_07_0_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (70117,70157);
-INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
-(70117,70122,1, 'Sindragosa - Icy Grip'),
-(70157,69700,2, 'Sindragosa - Ice Tomb resistance');
diff --git a/sql/old/3.3.5a/2011_02_07_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_07_0_world_spell_script_names.sql
deleted file mode 100644
index 7fc30c64a07..00000000000
--- a/sql/old/3.3.5a/2011_02_07_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_frostwarden_handler_order_whelp';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_frostwarden_handler_focus_fire';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rimefang_icy_blast';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_s_fury';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_unchained_magic';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_instability';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_frost_beacon';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb_dummy';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_ice_tomb_trap';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_collision_filter';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(71357,'spell_frostwarden_handler_order_whelp'),
-(71350,'spell_frostwarden_handler_focus_fire'),
-(71376,'spell_rimefang_icy_blast'),
-(70598,'spell_sindragosa_s_fury'),
-(69762,'spell_sindragosa_unchained_magic'),
-(69766,'spell_sindragosa_instability'),
-(70126,'spell_sindragosa_frost_beacon'),
-(69712,'spell_sindragosa_ice_tomb'),
-(69675,'spell_sindragosa_ice_tomb_dummy'),
-(70157,'spell_sindragosa_ice_tomb_trap'),
-(69845,'spell_sindragosa_collision_filter'),
-(71053,'spell_sindragosa_collision_filter'),
-(71054,'spell_sindragosa_collision_filter'),
-(71055,'spell_sindragosa_collision_filter'),
-(70127,'spell_sindragosa_collision_filter'),
-(72528,'spell_sindragosa_collision_filter'),
-(72529,'spell_sindragosa_collision_filter'),
-(72530,'spell_sindragosa_collision_filter');
diff --git a/sql/old/3.3.5a/2011_02_07_1_world_creature_questrelation.sql b/sql/old/3.3.5a/2011_02_07_1_world_creature_questrelation.sql
deleted file mode 100644
index 4aeb7a70775..00000000000
--- a/sql/old/3.3.5a/2011_02_07_1_world_creature_questrelation.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Missing relation for quest You've Been Served
-DELETE FROM `creature_questrelation` WHERE `id`=38208 AND `quest`=14488;
-DELETE FROM `creature_involvedrelation` WHERE `id`=36296 AND `quest`=14488;
-INSERT INTO `creature_questrelation`(`id`,`quest`) VALUES (38208,14488);
-INSERT INTO `creature_involvedrelation`(`id`,`quest`) VALUES (36296,14488);
-
--- Missing loot form Standard Apothecary Serving Kit request for quest You've Been Served
-DELETE FROM `item_loot_template` WHERE `entry`=49631 AND `item` IN (49352,49351,49635);
-INSERT INTO `item_loot_template`(`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
-(49631,49352,100,1,0,1,1),
-(49631,49351,100,1,0,1,1),
-(49631,49635,100,1,0,1,1);
diff --git a/sql/old/3.3.5a/2011_02_07_2_world_sai.sql b/sql/old/3.3.5a/2011_02_07_2_world_sai.sql
deleted file mode 100644
index 1af21f5d048..00000000000
--- a/sql/old/3.3.5a/2011_02_07_2_world_sai.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- SAI for quest 10345 "The Flesh Lies..."
--- Spell script target for Protectorate Igniter (quest The Flesh Lies...) 
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=35372;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,35372,1,18,1,20561,0,0,'', 'Protectorate Igniter');
--- Withered Corpse SAI.
-SET @ENTRY:=20561;
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~2 WHERE `entry`=@ENTRY;
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|256 WHERE `entry`=@ENTRY;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'On spawn set phase 1'),
-(@ENTRY,0,1,0,8,1,100,0,35372,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
-(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 'set phase 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,0,0,33,20561,0,0,0,0,0,7,0,0,0,0,0,0,0,'give quest credit'),
-(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'despawn');
-
--- SAI for quest 11607 "The Lost Spirits"
--- Kaskala Craftman SAI.
-SET @ENTRY:=25321;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'On spawn set phase 1'),
-(@ENTRY,0,1,0,8,1,100,0,45504,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
-(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 'set phase 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,1000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say Text 0 random'),
-(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,0,0,33,25321,0,0,0,0,0,7,0,0,0,0,0,0,0,'give quest credit'),
-(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'despawn');
--- Add texts for this NPC.
-DELETE FROM `creature_text` WHERE `entry`=25321;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
-(25321,0,0, 'Thank you for freeing me! May the tides always favor you.',0,0,100,1,0,0, 'Kaskala Craftman'),
-(25321,0,1, 'Do not allow Kaskala to forget what has happened here.',0,0,100,1,0,0, 'Kaskala Craftman');
--- Kaskala Shaman SAI.
-SET @ENTRY:=25322;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0, 'On spawn set phase 1'),
-(@ENTRY,0,1,0,8,1,100,0,45504,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On spell hit run script'),
-(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 'set phase 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,1000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say Text 0 random'),
-(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,0,0,33,25322,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
-(@ENTRY*100,9,3,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'despawn');
--- Add texts for this NPC.
-DELETE FROM `creature_text` WHERE `entry`=25322;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
-(25322,0,0, 'May the ancestors always aid you, $n, as you have aided me.',0,0,100,1,0,0, 'Kaskala Shaman'),
-(25322,0,1, 'Thank you, $n. May the winds and seas always deliver you safely.',0,0,100,1,0,0, 'Kaskala Shaman');
--- Delete the old EAI script.
-DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (25321,25322);
--- Delete the EAI texts.
-DELETE FROM `creature_ai_texts` WHERE entry IN (-899,-898,-900,-901);
diff --git a/sql/old/3.3.5a/2011_02_080_0_world_instance_saurfang_traps.sql b/sql/old/3.3.5a/2011_02_080_0_world_instance_saurfang_traps.sql
new file mode 100644
index 00000000000..2f3450e61d4
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_080_0_world_instance_saurfang_traps.sql
@@ -0,0 +1,18 @@
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`unit_flags`=0x02000000,`flags_extra`=128,`InhabitType`=7 WHERE `entry`=37744;
+UPDATE `creature_template` SET `RegenHealth`=0 WHERE `entry` IN (36980,38320,38321,38322); -- Ice Tomb health regen
+
+SET @GUID := 137731;
+DELETE FROM `creature` WHERE `id`=37744;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+00,37744,631,15,1,0,0,4135.74658,2781.60156,353.163574,4.729,120,0,0,1,0,0,0,0,0,0),
+(@GUID+01,37744,631,15,1,0,0,4156.65100,2781.51831,353.001343,4.729,120,0,0,1,0,0,0,0,0,0),
+(@GUID+02,37744,631,15,1,0,0,4159.71300,2735.11279,355.224200,6.248,120,0,0,1,0,0,0,0,0,0),
+(@GUID+03,37744,631,15,1,0,0,4159.79900,2804.18848,355.288116,0.017,120,0,0,1,0,0,0,0,0,0),
+(@GUID+04,37744,631,15,1,0,0,4160.11200,2788.29419,352.943756,6.260,120,0,0,1,0,0,0,0,0,0),
+(@GUID+05,37744,631,15,1,0,0,4183.78467,2751.65723,353.090027,3.124,120,0,0,1,0,0,0,0,0,0),
+(@GUID+06,37744,631,15,1,0,0,4192.59700,2733.27954,355.288116,4.712,120,0,0,1,0,0,0,0,0,0),
+(@GUID+07,37744,631,15,1,0,0,4193.00700,2829.08423,355.361328,4.694,120,0,0,1,0,0,0,0,0,0),
+(@GUID+08,37744,631,15,1,0,0,4201.84900,2750.52612,353.001343,0.017,120,0,0,1,0,0,0,0,0,0),
+(@GUID+09,37744,631,15,1,0,0,4224.70557,2804.10864,355.288100,3.140,120,0,0,1,0,0,0,0,0,0),
+(@GUID+10,37744,631,15,1,0,0,4224.83500,2735.23600,355.288116,3.140,120,0,0,1,0,0,0,0,0,0),
+(@GUID+11,37744,631,15,1,0,0,4225.13800,2788.18848,353.032745,3.141,120,0,0,1,0,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2011_02_08_00_world_areatrigger_scripts.sql b/sql/old/3.3.5a/2011_02_08_00_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..c7a29e0428d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_08_00_world_areatrigger_scripts.sql
@@ -0,0 +1,4 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5698,5649);
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(5698,'at_icc_saurfang_portal'),
+(5649,'at_icc_shutdown_traps');
diff --git a/sql/old/3.3.5a/2011_02_08_00_world_scriptname.sql b/sql/old/3.3.5a/2011_02_08_00_world_scriptname.sql
new file mode 100644
index 00000000000..79dff902f24
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_08_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_frost_freeze_trap' WHERE `entry`=37744;
diff --git a/sql/old/3.3.5a/2011_02_08_01_world_creature_template.sql b/sql/old/3.3.5a/2011_02_08_01_world_creature_template.sql
new file mode 100644
index 00000000000..3663532ac0c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_08_01_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Add quest relations flag to npc 36296 "Apothecary Hummel <Crown Chemical Co.>"
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=36296;
diff --git a/sql/old/3.3.5a/2011_02_08_02_world_waypoint_scripts.sql b/sql/old/3.3.5a/2011_02_08_02_world_waypoint_scripts.sql
new file mode 100644
index 00000000000..485380af928
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_08_02_world_waypoint_scripts.sql
@@ -0,0 +1,2 @@
+-- Remove obsolete waypoint scripts
+DELETE FROM `waypoint_scripts` WHERE `id` IN (448,450);
diff --git a/sql/old/3.3.5a/2011_02_08_0_world_areatrigger_scripts.sql b/sql/old/3.3.5a/2011_02_08_0_world_areatrigger_scripts.sql
deleted file mode 100644
index c7a29e0428d..00000000000
--- a/sql/old/3.3.5a/2011_02_08_0_world_areatrigger_scripts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5698,5649);
-INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
-(5698,'at_icc_saurfang_portal'),
-(5649,'at_icc_shutdown_traps');
diff --git a/sql/old/3.3.5a/2011_02_08_0_world_instance_saurfang_traps.sql b/sql/old/3.3.5a/2011_02_08_0_world_instance_saurfang_traps.sql
deleted file mode 100644
index 2f3450e61d4..00000000000
--- a/sql/old/3.3.5a/2011_02_08_0_world_instance_saurfang_traps.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`unit_flags`=0x02000000,`flags_extra`=128,`InhabitType`=7 WHERE `entry`=37744;
-UPDATE `creature_template` SET `RegenHealth`=0 WHERE `entry` IN (36980,38320,38321,38322); -- Ice Tomb health regen
-
-SET @GUID := 137731;
-DELETE FROM `creature` WHERE `id`=37744;
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
-(@GUID+00,37744,631,15,1,0,0,4135.74658,2781.60156,353.163574,4.729,120,0,0,1,0,0,0,0,0,0),
-(@GUID+01,37744,631,15,1,0,0,4156.65100,2781.51831,353.001343,4.729,120,0,0,1,0,0,0,0,0,0),
-(@GUID+02,37744,631,15,1,0,0,4159.71300,2735.11279,355.224200,6.248,120,0,0,1,0,0,0,0,0,0),
-(@GUID+03,37744,631,15,1,0,0,4159.79900,2804.18848,355.288116,0.017,120,0,0,1,0,0,0,0,0,0),
-(@GUID+04,37744,631,15,1,0,0,4160.11200,2788.29419,352.943756,6.260,120,0,0,1,0,0,0,0,0,0),
-(@GUID+05,37744,631,15,1,0,0,4183.78467,2751.65723,353.090027,3.124,120,0,0,1,0,0,0,0,0,0),
-(@GUID+06,37744,631,15,1,0,0,4192.59700,2733.27954,355.288116,4.712,120,0,0,1,0,0,0,0,0,0),
-(@GUID+07,37744,631,15,1,0,0,4193.00700,2829.08423,355.361328,4.694,120,0,0,1,0,0,0,0,0,0),
-(@GUID+08,37744,631,15,1,0,0,4201.84900,2750.52612,353.001343,0.017,120,0,0,1,0,0,0,0,0,0),
-(@GUID+09,37744,631,15,1,0,0,4224.70557,2804.10864,355.288100,3.140,120,0,0,1,0,0,0,0,0,0),
-(@GUID+10,37744,631,15,1,0,0,4224.83500,2735.23600,355.288116,3.140,120,0,0,1,0,0,0,0,0,0),
-(@GUID+11,37744,631,15,1,0,0,4225.13800,2788.18848,353.032745,3.141,120,0,0,1,0,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2011_02_08_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_08_0_world_scriptname.sql
deleted file mode 100644
index 79dff902f24..00000000000
--- a/sql/old/3.3.5a/2011_02_08_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_frost_freeze_trap' WHERE `entry`=37744;
diff --git a/sql/old/3.3.5a/2011_02_08_1_world_creature_template.sql b/sql/old/3.3.5a/2011_02_08_1_world_creature_template.sql
deleted file mode 100644
index 3663532ac0c..00000000000
--- a/sql/old/3.3.5a/2011_02_08_1_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Add quest relations flag to npc 36296 "Apothecary Hummel <Crown Chemical Co.>"
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=36296;
diff --git a/sql/old/3.3.5a/2011_02_08_2_world_waypoint_scripts.sql b/sql/old/3.3.5a/2011_02_08_2_world_waypoint_scripts.sql
deleted file mode 100644
index 485380af928..00000000000
--- a/sql/old/3.3.5a/2011_02_08_2_world_waypoint_scripts.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Remove obsolete waypoint scripts
-DELETE FROM `waypoint_scripts` WHERE `id` IN (448,450);
diff --git a/sql/old/3.3.5a/2011_02_10_00_world_sai.sql b/sql/old/3.3.5a/2011_02_10_00_world_sai.sql
new file mode 100644
index 00000000000..a83124d7631
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_10_00_world_sai.sql
@@ -0,0 +1,131 @@
+-- QUEST 9663 "The Kessel Run"
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (17116,17240,17440);
+UPDATE `creature_template` SET `gossip_menu_id`=7983 WHERE `entry`=17440;
+-- Smart AI
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (17116,17240,17440);
+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
+(17116,0,0,0,64,0,100,0,0,0,0,0,33,17116,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip hello credit for quest 9663'),
+(17240,0,0,0,64,0,100,0,0,0,0,0,33,17240,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip hello credit for quest 9663'),
+(17440,0,0,0,64,0,100,0,0,0,0,0,33,17440,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip hello credit for quest 9663');
+-- Add Gossip menu items
+DELETE FROM `gossip_menu` WHERE `entry`=7399 AND `text_id`=9038;
+DELETE FROM `gossip_menu` WHERE `entry`=7983 AND `text_id`=8994;
+DELETE FROM `gossip_menu` WHERE `entry`=7983 AND `text_id`=9039;
+DELETE FROM `gossip_menu` WHERE `entry`=7370 AND `text_id`=9040;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7399,9038),(7983,8994),(7983,9039),(7370,9040);
+-- Gossip conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup` IN (7399,7983,7370);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7399,9038,0,9,9663,0,0,0,'','Show gossip text 9038 if player has quest 9663'),
+(14,7983,9039,0,9,9663,0,0,0,'','Show gossip text 9039 if player has quest 9663'),
+(14,7370,9040,0,9,9663,0,0,0,'','Show gossip text 9040 if player has quest 9663');
+
+-- QUEST What The Dragons Know (horde & alliance)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=27990;
+UPDATE `creature_template` SET `gossip_menu_id`=10192 WHERE `entry`=26917;
+UPDATE `creature_template` SET `gossip_menu_id`=10199 WHERE `entry`=27990;
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=10199;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(10199,0,0,'What do you know of ancient swords?',1,1,0,0,0,0,0,''),
+(10199,1,0,'What do you know of ancient swords?',1,1,0,0,0,0,0,'');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10199;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,10199,0,0,9,14444,0,0,0,'','Show gossip option 0 if player has quest 14444 (Alliance)'),
+(15,10199,1,0,9,24555,0,0,0,'','Show gossip option 1 if player has quest 24555 (Horde)');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (27990,2799000,2799001);
+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
+(27990,0,0,0,62,0,100,0,10199,0,0,0,80,2799001,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+(27990,0,1,0,62,0,100,0,10199,1,0,0,80,2799000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+-- horde quest script
+(2799000,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip & Questgiver flags'),
+(2799000,9,1,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn of Gossip & Questgiver flags for Alexstrasza'),
+(2799000,9,2,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(2799000,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 1'),
+(2799000,9,4,0,0,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos start path'),
+(2799000,9,5,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 2'),
+(2799000,9,6,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 3'),
+(2799000,9,7,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 0'),
+(2799000,9,8,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 1'),
+(2799000,9,9,0,0,0,100,0,4000,4000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 4'),
+(2799000,9,10,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 2'),
+(2799000,9,11,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza'),
+(2799000,9,12,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Alexstrasza Say text 0'),
+(2799000,9,13,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 3'),
+(2799000,9,14,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos resume path'),
+(2799000,9,15,0,0,0,100,0,0,0,0,0,45,0,2,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza back'),
+(2799000,9,16,0,0,0,100,0,1000,1000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 5'),
+(2799000,9,17,0,0,0,100,0,4000,4000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 6'),
+(2799000,9,18,0,0,0,100,0,4000,4000,0,0,33,36715,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Give quest credit'),
+(2799000,9,19,0,0,0,100,0,4000,4000,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn on Gossip & Questgiver flags'),
+(2799000,9,20,0,0,0,100,0,0,0,0,0,81,3,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn on Gossip & Questgiver flags for Alexstrasza'),
+-- alliance quest script
+(2799001,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip & Questgiver flags'),
+(2799001,9,1,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn of Gossip & Questgiver flags for Alexstrasza'),
+(2799001,9,2,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(2799001,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 1'),
+(2799001,9,4,0,0,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos start path'),
+(2799001,9,5,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 2'),
+(2799001,9,6,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 3'),
+(2799001,9,7,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 0'),
+(2799001,9,8,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 1'),
+(2799001,9,9,0,0,0,100,0,4000,4000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 4'),
+(2799001,9,10,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 2'),
+(2799001,9,11,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza'),
+(2799001,9,12,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Alexstrasza Say text 0'),
+(2799001,9,13,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 3'),
+(2799001,9,14,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos resume path'),
+(2799001,9,15,0,0,0,100,0,0,0,0,0,45,0,2,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza back'),
+(2799001,9,16,0,0,0,100,0,1000,1000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 5'),
+(2799001,9,17,0,0,0,100,0,4000,4000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 7'),
+(2799001,9,18,0,0,0,100,0,4000,4000,0,0,33,36715,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Give quest credit'),
+(2799001,9,19,0,0,0,100,0,4000,4000,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn on Gossip & Questgiver flags'),
+(2799001,9,20,0,0,0,100,0,0,0,0,0,81,3,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn on Gossip & Questgiver flags for Alexstrasza');
+
+DELETE FROM `creature_text` WHERE `entry` IN (26917,27990,38017);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(26917,0,0,'Mortal champions have long used these weapons to combat evil. I see no reason to keep the swords from them in this battle.',0,0,100,1,0,0,'Alexstrasza the Life-Binder'),
+(27990,0,0,'You''re too late, $n. Another visitor from Dalaran came asking after information about the same prismatic dragon blades.',0,0,100,1,0,0,'Krasus'),
+(27990,1,0,'From your description, I''m certain the book I loaned our visitor could allow you to easily identify the weapon.',0,0,100,25,0,0,'Krasus'),
+(27990,2,0,'I''m afraid you''ll have to ask the -- Well, perhaps Kalecgos can help.',0,0,100,1,0,0,'Krasus'),
+(27990,3,0,'$n may have found the remains of a prismatic blade, Kalecgos. Will you offer your help to our visitor?',0,0,100,1,0,0,'Krasus'),
+(27990,4,0,'You believe our allies will not be able to control the power of the swords?',0,0,100,1,0,0,'Krasus'),
+(27990,5,0,'As will we all.',0,0,100,25,0,0,'Krasus'),
+(27990,6,0,'Please, mortal, speak with Arcanist Tybalin in Dalaran. He may be able to negotiate with the Sunreavers for access to the book.',0,0,100,1,0,0,'Krasus'),
+(27990,7,0,'Please, mortal, seek out Magister Hathorel in Dalaran. He might be able to negotiate with the Silver Covenant for access to the book.',0,0,100,1,0,0,'Krasus'),
+(38017,0,0,'Are you certain you should be helping these mortals in their quest for the sword?',0,0,100,1,0,0,'Kalecgos'),
+(38017,1,0,'These blades, Krasus... They were made long ago, when things were... different.',0,0,100,1,0,0,'Kalecgos'),
+(38017,2,0,'Our enemies once turned our strongest weapon against us. What makes you think the prismatic blades will be any different?',0,0,100,1,0,0,'Kalecgos'),
+(38017,3,0,'As you wish, my queen. I will not stand in their way, but I will keep a close watch.',0,0,100,16,0,0,'Kalecgos');
+
+-- waypoints for Kalecgos
+DELETE FROM `waypoints` WHERE `entry`=38017;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(38017,1,3541.156,276.041,342.721,'talk point'),
+(38017,2,3545.989,287.278,342.721,'home point');
+
+-- SAI for Kalecgos
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=38017;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=38017;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3801700,3801701);
+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
+(38017,0,0,1,38,0,100,0,0,1,0,0,80,3801700,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On dataset 0 1 run script'),
+(38017,0,1,1,38,0,100,0,0,2,0,0,80,3801701,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On dataset 0 2 run script'),
+(38017,0,2,3,40,0,100,0,1,38017,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Pause at wp 1'),
+(38017,0,3,0,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,9,27990,0,15,0,0,0,0, 'turn to Krasus'),
+(38017,0,4,5,40,0,100,0,2,38017,0,0,55,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stop at wp 2'),
+(38017,0,5,0,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'turn to pos'),
+(3801700,9,0,0,0,0,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'dataset 0 0'),
+(3801700,9,1,0,0,0,100,0,0,0,0,0,53,0,38017,0,0,0,0,1,0,0,0,0,0,0,0, 'wp start'),
+(3801701,9,0,0,0,0,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'dataset 0 0'),
+(3801701,9,1,0,0,0,100,0,0,0,0,0,65,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'wp resume');
+
+-- SAI for Alexstrasza
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26917;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=26917;
+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
+(26917,0,0,1,38,0,100,0,0,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.6049, 'On dataset 0 1 turn'),
+(26917,0,1,1,38,0,100,0,0,2,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On dataset 0 2 turn');
diff --git a/sql/old/3.3.5a/2011_02_10_01_world_sai.sql b/sql/old/3.3.5a/2011_02_10_01_world_sai.sql
new file mode 100644
index 00000000000..b8149880d08
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_10_01_world_sai.sql
@@ -0,0 +1,50 @@
+-- Conversation between Sabetta Ward & Gavin Ward, Fort Wildervar "Sabetta Ward Envoker"
+SET @ENTRY := 24532;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,0,10000,30000,150000,150000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 2.5 min ooc'),
+(@ENTRY*100,9,0,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sabetta Ward Say text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,9,24531,0,10,0,0,0,0,'Gavin Ward Say text 0'),
+(@ENTRY*100,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sabetta Ward Say text 1'),
+(@ENTRY*100,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,9,24531,0,10,0,0,0,0,'Gavin Ward Say text 1'),
+(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sabetta Ward Say text 2'),
+(@ENTRY*100,9,5,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,9,24531,0,10,0,0,0,0,'Gavin Ward Say text 2');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (24531,24532);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24532,0,0, 'And I don''t want our land to have any of those horrible wolves, or giants, or ugly rams!',0,7,100,1,0,0, 'Sabetta Ward'),
+(24531,0,0, 'Yes, darling. You realize you''ll be eating dire ram mutton for dinner until the crops are planted...',0,7,100,1,0,0, 'Gavin Ward'),
+(24532,1,0, 'I''d sooner butcher that mule of yours! Why did you bring that beast in here, anyway?',0,7,100,5,0,0, 'Sabetta Ward'),
+(24531,1,0, 'I''d rather listen to his braying than yours, dear.',0,7,100,0,0,0, 'Gavin Ward'),
+(24532,2,0, 'Remember, honey, we need to get a plot of land with a nice hot spring.',0,7,100,1,0,0, 'Sabetta Ward'),
+(24531,2,0, 'Of course, darling.',0,7,100,1,0,0, 'Gavin Ward');
+
+-- Conversation between Brune Grayblade & Eldrim Mounder <Blacksmith>, Fort Wildervar "Brune Grayblade Envoker"
+SET @ENTRY := 24528;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,0,30000,60000,150000,150000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 2.5 min ooc'),
+(@ENTRY*100,9,0,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Brune Grayblade Say text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,9,24052,0,10,0,0,0,0,'Eldrim Mounder Say text 0'),
+(@ENTRY*100,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Brune Grayblade Say text 1'),
+(@ENTRY*100,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,9,24052,0,10,0,0,0,0,'Eldrim Mounder Say text 1'),
+(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,9,24052,0,10,0,0,0,0,'Eldrim Mounder Say text 2'),
+(@ENTRY*100,9,5,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Brune Grayblade Say text 2');
+-- NPC talk text insert from sniff "5 sec between text 2 min between restart"
+DELETE FROM `creature_text` WHERE `entry` IN (24528,24052);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24528,0,0, 'How much''ll it cost me to get my mules shod?',0,7,100,6,0,0, 'Brune Grayblade'),
+(24052,0,0, 'We don''t shoe no mules here. ''Sides, it''s strictly expedition business right now.',0,7,100,1,0,0, 'Eldrim Mounder'),
+(24528,1,0, 'You don''t understand! If I''m not ready to go soon, all the good homesteading land will be taken!',0,7,100,1,0,0, 'Brune Grayblade'),
+(24052,1,0, 'Not my problem! If yer so antsy to get yerself a house built, do it ''ere in the fort and quit yer whinin''!',0,7,100,274,0,0, 'Eldrim Mounder'),
+(24052,2,0, 'Now, if you''d be so kind as to get your ass away from my forge...',0,7,100,25,0,0, 'Eldrim Mounder'),
+(24528,2,0, 'That, sir, is a mule!',0,7,100,25,0,0, 'Brune Grayblade');
+-- Creature Template Addon info
+DELETE FROM `creature_template_addon` WHERE `entry` IN (24528,24052);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(24528,0,0,256,0, ''),
+(24052,0,0,257,0, '');
diff --git a/sql/old/3.3.5a/2011_02_10_02_world_instance_oculus.sql b/sql/old/3.3.5a/2011_02_10_02_world_instance_oculus.sql
new file mode 100644
index 00000000000..db52b3310fa
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_10_02_world_instance_oculus.sql
@@ -0,0 +1,33 @@
+-- planar anomaly
+DELETE FROM creature_template_addon WHERE entry=30879;
+INSERT INTO creature_template_addon (`entry`,`auras`) VALUES (30879,'57971 0');
+UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=30879;
+
+-- spell script target
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=57963;
+INSERT INTO `conditions` (SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, COMMENT) VALUES 
+(13,0,57963,0,18,1,27656,0,0,'',NULL);
+
+-- not sure about this, execute at your own risk
+-- DELETE FROM `creature_addon` WHERE `guid` IN (SELECT guid FROM creature WHERE `id`=28276);
+-- DELETE FROM `creature` WHERE `id`=28276;
+
+-- here we handle which spells are usable depending on Urom's event state.
+DELETE FROM `conditions` WHERE SourceTypeOrReferenceId=21 AND `SourceGroup` IN (27756,27755,27692);
+INSERT INTO `conditions` (SourceTypeOrReferenceId,SourceGroup,SourceEntry,ConditionTypeOrReference,ConditionValue1,ConditionValue2) VALUES
+(21,27756,50253,13,2,3), -- Ruby Drake
+(21,27755,49592,13,2,3), -- Amber Drake
+(21,27692,50344,13,2,3); -- Esmerald Drake
+
+-- correcting vehicles
+UPDATE `creature_template` SET `spell1`=50232,`spell2`=50248,`spell3`=50240,`spell4`=50253,`spell5`=0 WHERE `entry`=27756;
+UPDATE `creature_template` SET `spell1`=49840,`spell2`=49838,`spell3`=49592,`spell4`=0 WHERE `entry`=27755;
+UPDATE `creature_template` SET `spell1`=50328,`spell2`=50341,`spell3`=50344 WHERE `entry`=27692;
+UPDATE `creature_template` SET `InhabitType`=5,`speed_run`=1,`speed_walk`=1.2 WHERE `entry` IN (27756,27755,27692);
+
+-- eregos texts
+DELETE FROM `creature_text` WHERE `entry`=27656;
+INSERT INTO `creature_text` (entry,groupid,id,text,type,comment) VALUES
+(27656,0,0,'You brash interlopers are out of your element! I will ground you!',1,'Boss Eregos - Aggro'),
+(27656,1,0,'Such insolence... such arrogance... must be PUNISHED!',1,'Boss Eregos - Enrage'),
+(27656,2,0,'Savor this small victory, foolish little creatures. You and your dragon allies have won this battle. But we will win... the Nexus War.',1,'Boss Eregos - Death');
diff --git a/sql/old/3.3.5a/2011_02_10_03_world_creature_template.sql b/sql/old/3.3.5a/2011_02_10_03_world_creature_template.sql
new file mode 100644
index 00000000000..1bcf6d69dc3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_10_03_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00008000,`npcflag`=`npcflag`&~0x10000000 WHERE `npcflag` & 0x10000000;
+UPDATE `creature_template` SET `npcflag`=`npcflag`&~0x20000000 WHERE `npcflag` & 0x20000000;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_10_04_world_scriptname.sql b/sql/old/3.3.5a/2011_02_10_04_world_scriptname.sql
new file mode 100644
index 00000000000..9745c5a3b0a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_10_04_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `ScriptName` LIKE 'guard_generic' AND (`spell1`=0 AND `spell2`=0);
+UPDATE `creature_template` SET `ScriptName`='guard_generic' WHERE `ScriptName`='guard_stormwind' OR `ScriptName`='guard_orgrimmar';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_10_0_world_sai.sql b/sql/old/3.3.5a/2011_02_10_0_world_sai.sql
deleted file mode 100644
index a83124d7631..00000000000
--- a/sql/old/3.3.5a/2011_02_10_0_world_sai.sql
+++ /dev/null
@@ -1,131 +0,0 @@
--- QUEST 9663 "The Kessel Run"
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (17116,17240,17440);
-UPDATE `creature_template` SET `gossip_menu_id`=7983 WHERE `entry`=17440;
--- Smart AI
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (17116,17240,17440);
-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
-(17116,0,0,0,64,0,100,0,0,0,0,0,33,17116,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip hello credit for quest 9663'),
-(17240,0,0,0,64,0,100,0,0,0,0,0,33,17240,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip hello credit for quest 9663'),
-(17440,0,0,0,64,0,100,0,0,0,0,0,33,17440,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip hello credit for quest 9663');
--- Add Gossip menu items
-DELETE FROM `gossip_menu` WHERE `entry`=7399 AND `text_id`=9038;
-DELETE FROM `gossip_menu` WHERE `entry`=7983 AND `text_id`=8994;
-DELETE FROM `gossip_menu` WHERE `entry`=7983 AND `text_id`=9039;
-DELETE FROM `gossip_menu` WHERE `entry`=7370 AND `text_id`=9040;
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(7399,9038),(7983,8994),(7983,9039),(7370,9040);
--- Gossip conditions
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup` IN (7399,7983,7370);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(14,7399,9038,0,9,9663,0,0,0,'','Show gossip text 9038 if player has quest 9663'),
-(14,7983,9039,0,9,9663,0,0,0,'','Show gossip text 9039 if player has quest 9663'),
-(14,7370,9040,0,9,9663,0,0,0,'','Show gossip text 9040 if player has quest 9663');
-
--- QUEST What The Dragons Know (horde & alliance)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=27990;
-UPDATE `creature_template` SET `gossip_menu_id`=10192 WHERE `entry`=26917;
-UPDATE `creature_template` SET `gossip_menu_id`=10199 WHERE `entry`=27990;
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id`=10199;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(10199,0,0,'What do you know of ancient swords?',1,1,0,0,0,0,0,''),
-(10199,1,0,'What do you know of ancient swords?',1,1,0,0,0,0,0,'');
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10199;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,10199,0,0,9,14444,0,0,0,'','Show gossip option 0 if player has quest 14444 (Alliance)'),
-(15,10199,1,0,9,24555,0,0,0,'','Show gossip option 1 if player has quest 24555 (Horde)');
-
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (27990,2799000,2799001);
-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
-(27990,0,0,0,62,0,100,0,10199,0,0,0,80,2799001,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
-(27990,0,1,0,62,0,100,0,10199,1,0,0,80,2799000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
--- horde quest script
-(2799000,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip & Questgiver flags'),
-(2799000,9,1,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn of Gossip & Questgiver flags for Alexstrasza'),
-(2799000,9,2,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
-(2799000,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 1'),
-(2799000,9,4,0,0,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos start path'),
-(2799000,9,5,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 2'),
-(2799000,9,6,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 3'),
-(2799000,9,7,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 0'),
-(2799000,9,8,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 1'),
-(2799000,9,9,0,0,0,100,0,4000,4000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 4'),
-(2799000,9,10,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 2'),
-(2799000,9,11,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza'),
-(2799000,9,12,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Alexstrasza Say text 0'),
-(2799000,9,13,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 3'),
-(2799000,9,14,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos resume path'),
-(2799000,9,15,0,0,0,100,0,0,0,0,0,45,0,2,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza back'),
-(2799000,9,16,0,0,0,100,0,1000,1000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 5'),
-(2799000,9,17,0,0,0,100,0,4000,4000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 6'),
-(2799000,9,18,0,0,0,100,0,4000,4000,0,0,33,36715,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Give quest credit'),
-(2799000,9,19,0,0,0,100,0,4000,4000,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn on Gossip & Questgiver flags'),
-(2799000,9,20,0,0,0,100,0,0,0,0,0,81,3,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn on Gossip & Questgiver flags for Alexstrasza'),
--- alliance quest script
-(2799001,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip & Questgiver flags'),
-(2799001,9,1,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn of Gossip & Questgiver flags for Alexstrasza'),
-(2799001,9,2,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
-(2799001,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 1'),
-(2799001,9,4,0,0,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos start path'),
-(2799001,9,5,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 2'),
-(2799001,9,6,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 3'),
-(2799001,9,7,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 0'),
-(2799001,9,8,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 1'),
-(2799001,9,9,0,0,0,100,0,4000,4000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 4'),
-(2799001,9,10,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 2'),
-(2799001,9,11,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza'),
-(2799001,9,12,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Alexstrasza Say text 0'),
-(2799001,9,13,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos Say text 3'),
-(2799001,9,14,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,9,38017,0,30,0,0,0,0, 'Kalecgos resume path'),
-(2799001,9,15,0,0,0,100,0,0,0,0,0,45,0,2,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn Alexstrasza back'),
-(2799001,9,16,0,0,0,100,0,1000,1000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 5'),
-(2799001,9,17,0,0,0,100,0,4000,4000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 7'),
-(2799001,9,18,0,0,0,100,0,4000,4000,0,0,33,36715,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Give quest credit'),
-(2799001,9,19,0,0,0,100,0,4000,4000,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn on Gossip & Questgiver flags'),
-(2799001,9,20,0,0,0,100,0,0,0,0,0,81,3,0,0,0,0,0,9,26917,0,10,0,0,0,0, 'Turn on Gossip & Questgiver flags for Alexstrasza');
-
-DELETE FROM `creature_text` WHERE `entry` IN (26917,27990,38017);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(26917,0,0,'Mortal champions have long used these weapons to combat evil. I see no reason to keep the swords from them in this battle.',0,0,100,1,0,0,'Alexstrasza the Life-Binder'),
-(27990,0,0,'You''re too late, $n. Another visitor from Dalaran came asking after information about the same prismatic dragon blades.',0,0,100,1,0,0,'Krasus'),
-(27990,1,0,'From your description, I''m certain the book I loaned our visitor could allow you to easily identify the weapon.',0,0,100,25,0,0,'Krasus'),
-(27990,2,0,'I''m afraid you''ll have to ask the -- Well, perhaps Kalecgos can help.',0,0,100,1,0,0,'Krasus'),
-(27990,3,0,'$n may have found the remains of a prismatic blade, Kalecgos. Will you offer your help to our visitor?',0,0,100,1,0,0,'Krasus'),
-(27990,4,0,'You believe our allies will not be able to control the power of the swords?',0,0,100,1,0,0,'Krasus'),
-(27990,5,0,'As will we all.',0,0,100,25,0,0,'Krasus'),
-(27990,6,0,'Please, mortal, speak with Arcanist Tybalin in Dalaran. He may be able to negotiate with the Sunreavers for access to the book.',0,0,100,1,0,0,'Krasus'),
-(27990,7,0,'Please, mortal, seek out Magister Hathorel in Dalaran. He might be able to negotiate with the Silver Covenant for access to the book.',0,0,100,1,0,0,'Krasus'),
-(38017,0,0,'Are you certain you should be helping these mortals in their quest for the sword?',0,0,100,1,0,0,'Kalecgos'),
-(38017,1,0,'These blades, Krasus... They were made long ago, when things were... different.',0,0,100,1,0,0,'Kalecgos'),
-(38017,2,0,'Our enemies once turned our strongest weapon against us. What makes you think the prismatic blades will be any different?',0,0,100,1,0,0,'Kalecgos'),
-(38017,3,0,'As you wish, my queen. I will not stand in their way, but I will keep a close watch.',0,0,100,16,0,0,'Kalecgos');
-
--- waypoints for Kalecgos
-DELETE FROM `waypoints` WHERE `entry`=38017;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(38017,1,3541.156,276.041,342.721,'talk point'),
-(38017,2,3545.989,287.278,342.721,'home point');
-
--- SAI for Kalecgos
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=38017;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=38017;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3801700,3801701);
-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
-(38017,0,0,1,38,0,100,0,0,1,0,0,80,3801700,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On dataset 0 1 run script'),
-(38017,0,1,1,38,0,100,0,0,2,0,0,80,3801701,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On dataset 0 2 run script'),
-(38017,0,2,3,40,0,100,0,1,38017,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Pause at wp 1'),
-(38017,0,3,0,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,9,27990,0,15,0,0,0,0, 'turn to Krasus'),
-(38017,0,4,5,40,0,100,0,2,38017,0,0,55,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stop at wp 2'),
-(38017,0,5,0,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'turn to pos'),
-(3801700,9,0,0,0,0,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'dataset 0 0'),
-(3801700,9,1,0,0,0,100,0,0,0,0,0,53,0,38017,0,0,0,0,1,0,0,0,0,0,0,0, 'wp start'),
-(3801701,9,0,0,0,0,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'dataset 0 0'),
-(3801701,9,1,0,0,0,100,0,0,0,0,0,65,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'wp resume');
-
--- SAI for Alexstrasza
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26917;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=26917;
-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
-(26917,0,0,1,38,0,100,0,0,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.6049, 'On dataset 0 1 turn'),
-(26917,0,1,1,38,0,100,0,0,2,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On dataset 0 2 turn');
diff --git a/sql/old/3.3.5a/2011_02_10_1_world_sai.sql b/sql/old/3.3.5a/2011_02_10_1_world_sai.sql
deleted file mode 100644
index b8149880d08..00000000000
--- a/sql/old/3.3.5a/2011_02_10_1_world_sai.sql
+++ /dev/null
@@ -1,50 +0,0 @@
--- Conversation between Sabetta Ward & Gavin Ward, Fort Wildervar "Sabetta Ward Envoker"
-SET @ENTRY := 24532;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,0,10000,30000,150000,150000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 2.5 min ooc'),
-(@ENTRY*100,9,0,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sabetta Ward Say text 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,9,24531,0,10,0,0,0,0,'Gavin Ward Say text 0'),
-(@ENTRY*100,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sabetta Ward Say text 1'),
-(@ENTRY*100,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,9,24531,0,10,0,0,0,0,'Gavin Ward Say text 1'),
-(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sabetta Ward Say text 2'),
-(@ENTRY*100,9,5,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,9,24531,0,10,0,0,0,0,'Gavin Ward Say text 2');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry` IN (24531,24532);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(24532,0,0, 'And I don''t want our land to have any of those horrible wolves, or giants, or ugly rams!',0,7,100,1,0,0, 'Sabetta Ward'),
-(24531,0,0, 'Yes, darling. You realize you''ll be eating dire ram mutton for dinner until the crops are planted...',0,7,100,1,0,0, 'Gavin Ward'),
-(24532,1,0, 'I''d sooner butcher that mule of yours! Why did you bring that beast in here, anyway?',0,7,100,5,0,0, 'Sabetta Ward'),
-(24531,1,0, 'I''d rather listen to his braying than yours, dear.',0,7,100,0,0,0, 'Gavin Ward'),
-(24532,2,0, 'Remember, honey, we need to get a plot of land with a nice hot spring.',0,7,100,1,0,0, 'Sabetta Ward'),
-(24531,2,0, 'Of course, darling.',0,7,100,1,0,0, 'Gavin Ward');
-
--- Conversation between Brune Grayblade & Eldrim Mounder <Blacksmith>, Fort Wildervar "Brune Grayblade Envoker"
-SET @ENTRY := 24528;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,0,30000,60000,150000,150000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 2.5 min ooc'),
-(@ENTRY*100,9,0,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Brune Grayblade Say text 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,9,24052,0,10,0,0,0,0,'Eldrim Mounder Say text 0'),
-(@ENTRY*100,9,2,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Brune Grayblade Say text 1'),
-(@ENTRY*100,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,9,24052,0,10,0,0,0,0,'Eldrim Mounder Say text 1'),
-(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,9,24052,0,10,0,0,0,0,'Eldrim Mounder Say text 2'),
-(@ENTRY*100,9,5,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Brune Grayblade Say text 2');
--- NPC talk text insert from sniff "5 sec between text 2 min between restart"
-DELETE FROM `creature_text` WHERE `entry` IN (24528,24052);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(24528,0,0, 'How much''ll it cost me to get my mules shod?',0,7,100,6,0,0, 'Brune Grayblade'),
-(24052,0,0, 'We don''t shoe no mules here. ''Sides, it''s strictly expedition business right now.',0,7,100,1,0,0, 'Eldrim Mounder'),
-(24528,1,0, 'You don''t understand! If I''m not ready to go soon, all the good homesteading land will be taken!',0,7,100,1,0,0, 'Brune Grayblade'),
-(24052,1,0, 'Not my problem! If yer so antsy to get yerself a house built, do it ''ere in the fort and quit yer whinin''!',0,7,100,274,0,0, 'Eldrim Mounder'),
-(24052,2,0, 'Now, if you''d be so kind as to get your ass away from my forge...',0,7,100,25,0,0, 'Eldrim Mounder'),
-(24528,2,0, 'That, sir, is a mule!',0,7,100,25,0,0, 'Brune Grayblade');
--- Creature Template Addon info
-DELETE FROM `creature_template_addon` WHERE `entry` IN (24528,24052);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(24528,0,0,256,0, ''),
-(24052,0,0,257,0, '');
diff --git a/sql/old/3.3.5a/2011_02_10_2_world_instance_oculus.sql b/sql/old/3.3.5a/2011_02_10_2_world_instance_oculus.sql
deleted file mode 100644
index db52b3310fa..00000000000
--- a/sql/old/3.3.5a/2011_02_10_2_world_instance_oculus.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- planar anomaly
-DELETE FROM creature_template_addon WHERE entry=30879;
-INSERT INTO creature_template_addon (`entry`,`auras`) VALUES (30879,'57971 0');
-UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=30879;
-
--- spell script target
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=57963;
-INSERT INTO `conditions` (SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, COMMENT) VALUES 
-(13,0,57963,0,18,1,27656,0,0,'',NULL);
-
--- not sure about this, execute at your own risk
--- DELETE FROM `creature_addon` WHERE `guid` IN (SELECT guid FROM creature WHERE `id`=28276);
--- DELETE FROM `creature` WHERE `id`=28276;
-
--- here we handle which spells are usable depending on Urom's event state.
-DELETE FROM `conditions` WHERE SourceTypeOrReferenceId=21 AND `SourceGroup` IN (27756,27755,27692);
-INSERT INTO `conditions` (SourceTypeOrReferenceId,SourceGroup,SourceEntry,ConditionTypeOrReference,ConditionValue1,ConditionValue2) VALUES
-(21,27756,50253,13,2,3), -- Ruby Drake
-(21,27755,49592,13,2,3), -- Amber Drake
-(21,27692,50344,13,2,3); -- Esmerald Drake
-
--- correcting vehicles
-UPDATE `creature_template` SET `spell1`=50232,`spell2`=50248,`spell3`=50240,`spell4`=50253,`spell5`=0 WHERE `entry`=27756;
-UPDATE `creature_template` SET `spell1`=49840,`spell2`=49838,`spell3`=49592,`spell4`=0 WHERE `entry`=27755;
-UPDATE `creature_template` SET `spell1`=50328,`spell2`=50341,`spell3`=50344 WHERE `entry`=27692;
-UPDATE `creature_template` SET `InhabitType`=5,`speed_run`=1,`speed_walk`=1.2 WHERE `entry` IN (27756,27755,27692);
-
--- eregos texts
-DELETE FROM `creature_text` WHERE `entry`=27656;
-INSERT INTO `creature_text` (entry,groupid,id,text,type,comment) VALUES
-(27656,0,0,'You brash interlopers are out of your element! I will ground you!',1,'Boss Eregos - Aggro'),
-(27656,1,0,'Such insolence... such arrogance... must be PUNISHED!',1,'Boss Eregos - Enrage'),
-(27656,2,0,'Savor this small victory, foolish little creatures. You and your dragon allies have won this battle. But we will win... the Nexus War.',1,'Boss Eregos - Death');
diff --git a/sql/old/3.3.5a/2011_02_10_3_world_creature_template.sql b/sql/old/3.3.5a/2011_02_10_3_world_creature_template.sql
deleted file mode 100644
index 1bcf6d69dc3..00000000000
--- a/sql/old/3.3.5a/2011_02_10_3_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00008000,`npcflag`=`npcflag`&~0x10000000 WHERE `npcflag` & 0x10000000;
-UPDATE `creature_template` SET `npcflag`=`npcflag`&~0x20000000 WHERE `npcflag` & 0x20000000;
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_10_4_world_scriptname.sql b/sql/old/3.3.5a/2011_02_10_4_world_scriptname.sql
deleted file mode 100644
index 9745c5a3b0a..00000000000
--- a/sql/old/3.3.5a/2011_02_10_4_world_scriptname.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='' WHERE `ScriptName` LIKE 'guard_generic' AND (`spell1`=0 AND `spell2`=0);
-UPDATE `creature_template` SET `ScriptName`='guard_generic' WHERE `ScriptName`='guard_stormwind' OR `ScriptName`='guard_orgrimmar';
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_11_00_world_coredevdata.sql b/sql/old/3.3.5a/2011_02_11_00_world_coredevdata.sql
new file mode 100644
index 00000000000..70d360c1689
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_11_00_world_coredevdata.sql
@@ -0,0 +1,45 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=29598;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`) VALUES
+(29598,54768,0,1,12856,1);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=54798;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
+(13,54798,18,1,29351,1,'FLAMING Arrow Triggered Effect'),
+(13,54798,18,1,29358,1,'FLAMING Arrow Triggered Effect');
+
+-- Not the Blizzlike waypoints, Malcrom has those, but these are temporary
+DELETE FROM `script_waypoint` WHERE `entry`=29602;
+INSERT INTO `script_waypoint` (entry,pointid,location_x,location_y,location_z,waittime) VALUES 
+(29602,1,7085.374,-1938.052,773.318,0),
+(29602,2,7085.374,-1938.052,773.318,0),
+(29602,3,7065.382,-1988.499,768.9483,0),
+(29602,4,7079.698,-2033.11,764.2703,0),
+(29602,5,7068.746,-2081.637,758.4695,0),
+(29602,6,7065.993,-2130.804,756.0863,0),
+(29602,7,7088.311,-2173.474,759.4193,0),
+(29602,8,7124.069,-2207.86,758.3796,0),
+(29602,9,7152.243,-2248.376,759.6431,0),
+(29602,10,7196.352,-2265.138,756.9138,0),
+(29602,11,7234.013,-2297.475,752.4849,0),
+(29602,12,7255.404,-2341.076,751.6851,0),
+(29602,13,7297.881,-2368.091,751.6649,0),
+(29602,14,7304.306,-2416.368,752.8918,0),
+(29602,15,7320.821,-2463.647,750.8485,0),
+(29602,16,7362.996,-2490.504,749.8151,0),
+(29602,17,7409.486,-2475.066,751.9595,0),
+(29602,18,7422.454,-2427.556,752.5062,0),
+(29602,19,7407.287,-2380.342,753.0123,0),
+(29602,20,7366.268,-2303.298,756.0569,0),
+(29602,21,7318.561,-2301.531,754.494,0),
+(29602,22,7280.997,-2270.392,756.3792,0),
+(29602,23,7237.944,-2246.72,756.4333,0),
+(29602,24,7193.829,-2231.046,757.992,0),
+(29602,25,7159.348,-2195.307,760.6475,0),
+(29602,26,7122.389,-2164.836,760.5703,0),
+(29602,27,7112.455,-2116.784,759.8074,0),
+(29602,28,7117.603,-2040.713,767.7001,0),
+(29602,29,7107.043,-2011.189,770.1815,0),
+(29602,30,7103.942,-1985.653,771.1707,0),
+(29602,31,7079.7,-1966.68,769.305,0),
+(29602,32,7080.018,-1948.492,771.6097,0),
+(29602,33,7087.928,-1931.903,773.8726,0);
diff --git a/sql/old/3.3.5a/2011_02_11_01_world_command.sql b/sql/old/3.3.5a/2011_02_11_01_world_command.sql
new file mode 100644
index 00000000000..407699d6d7d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_11_01_world_command.sql
@@ -0,0 +1,3 @@
+UPDATE `command` SET `help` = 'Syntax: .reload all gossips\nReload gossip_menu, gossip_menu_option, gossip_scripts, points_of_interest tables.' WHERE `name` = 'reload all gossips';
+UPDATE `command` SET `help` = 'Syntax: .reload all npc\nReload npc_option, npc_trainer, npc vendor, points of interest tables.' WHERE `name` = 'reload all npc';
+DELETE FROM `command` WHERE `name` = 'reload npc_gossip';
diff --git a/sql/old/3.3.5a/2011_02_11_01_world_coredevdata.sql b/sql/old/3.3.5a/2011_02_11_01_world_coredevdata.sql
new file mode 100644
index 00000000000..4f225d8c984
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_11_01_world_coredevdata.sql
@@ -0,0 +1,36 @@
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=28239);
+DELETE FROM `creature` WHERE `id`=28239;
+
+UPDATE `creature` SET `position_x`=1357.86,`position_y`=1055.26,`position_z`=463.02 WHERE `guid`=101498;
+UPDATE `creature` SET `position_x`=1210.38,`position_y`=1118.57,`position_z`=471.41 WHERE `guid`=100931;
+
+UPDATE `creature_template` SET `flags_extra`=130 WHERE `entry`=28183;
+UPDATE `creature_template` SET `scale`=1 WHERE `entry`=28183;
+
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=28183);
+DELETE FROM `creature` WHERE `id`=28183;
+-- this guids were used by the old spawns.
+INSERT INTO `creature` (guid, id, map, spawnMask, phaseMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, spawndist, currentwaypoint, curhealth, curmana, DeathState, MovementType) VALUES
+(100227, 28183, 578, 3, 1, 0, 0, 1242.73267, 1079.592, 439.232849, 6.108652, 120, 0, 0, 1, 0, 0, 0),
+(100228, 28183, 578, 3, 1, 0, 0, 1246.566, 1051.25171, 439.232849, 0.5061455, 120, 0, 0, 1, 0, 0, 0),
+(100229, 28183, 578, 3, 1, 0, 0, 1265.30212, 1109.22742, 439.232849, 5.18362761, 120, 0, 0, 1, 0, 0, 0),
+(100230, 28183, 578, 3, 1, 0, 0, 1277.07471, 1027.78992, 439.232849, 1.37881, 120, 0, 0, 1, 0, 0, 0),
+(100231, 28183, 578, 3, 1, 0, 0, 1293.79858, 1113.18054, 439.232849, 4.485496, 120, 0, 0, 1, 0, 0, 0),
+(100232, 28183, 578, 3, 1, 0, 0, 1305.63025, 1031.75171, 439.232849, 2.042035, 120, 0, 0, 1, 0, 0, 0),
+(100233, 28183, 578, 3, 1, 0, 0, 1324.38538, 1089.79688, 439.232849, 3.59537816, 120, 0, 0, 1, 0, 0, 0),
+(100234, 28183, 578, 3, 1, 0, 0, 1328.00171, 1061.15283, 439.232849, 2.8972466, 120, 0, 0, 1, 0, 0, 0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (54069,56251);
+INSERT INTO `conditions` (SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, COMMENT) VALUES 
+(13,0,54069,0,18,1,28183,0,0,'',NULL),
+(13,0,56251,0,18,1,28183,0,0,'',NULL);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=28183;
+INSERT INTO `creature_template_addon` (entry,auras) VALUE (28183,'50798 0');
+
+DELETE FROM `creature_text` WHERE `entry`=27447;
+INSERT INTO `creature_text` (entry,groupid,id,TEXT,TYPE,LANGUAGE,sound) VALUES 
+(27447,0,0,'There will be no mercy!',1,0,13649),
+(27447,1,1,'Blast them! Destroy them!',1,0,13650),
+(27447,2,2,'%s calls an Azure Ring Captain!',3,0,0),
+(27447,3,3,'They are... too strong! Underestimated their... fortitude.',1,0,13655);
diff --git a/sql/old/3.3.5a/2011_02_11_02_world_npc_gossip.sql b/sql/old/3.3.5a/2011_02_11_02_world_npc_gossip.sql
new file mode 100644
index 00000000000..18739ed1be6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_11_02_world_npc_gossip.sql
@@ -0,0 +1 @@
+DROP TABLE `npc_gossip`;
diff --git a/sql/old/3.3.5a/2011_02_11_03_world_creature_involvedrelation.sql b/sql/old/3.3.5a/2011_02_11_03_world_creature_involvedrelation.sql
new file mode 100644
index 00000000000..c98af05803d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_11_03_world_creature_involvedrelation.sql
@@ -0,0 +1,2 @@
+-- Update quest-link turn in for quest The Call to Command (Bragor Bloodfist, not Varimathras)
+UPDATE `creature_involvedrelation` SET `id`=36273 WHERE `quest`=6144;
diff --git a/sql/old/3.3.5a/2011_02_11_04_world_game_event_npc_gossip.sql b/sql/old/3.3.5a/2011_02_11_04_world_game_event_npc_gossip.sql
new file mode 100644
index 00000000000..83f7613d6c9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_11_04_world_game_event_npc_gossip.sql
@@ -0,0 +1 @@
+DROP TABLE `game_event_npc_gossip`;
diff --git a/sql/old/3.3.5a/2011_02_11_0_world_coredevdata.sql b/sql/old/3.3.5a/2011_02_11_0_world_coredevdata.sql
deleted file mode 100644
index 70d360c1689..00000000000
--- a/sql/old/3.3.5a/2011_02_11_0_world_coredevdata.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=29598;
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`) VALUES
-(29598,54768,0,1,12856,1);
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=54798;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
-(13,54798,18,1,29351,1,'FLAMING Arrow Triggered Effect'),
-(13,54798,18,1,29358,1,'FLAMING Arrow Triggered Effect');
-
--- Not the Blizzlike waypoints, Malcrom has those, but these are temporary
-DELETE FROM `script_waypoint` WHERE `entry`=29602;
-INSERT INTO `script_waypoint` (entry,pointid,location_x,location_y,location_z,waittime) VALUES 
-(29602,1,7085.374,-1938.052,773.318,0),
-(29602,2,7085.374,-1938.052,773.318,0),
-(29602,3,7065.382,-1988.499,768.9483,0),
-(29602,4,7079.698,-2033.11,764.2703,0),
-(29602,5,7068.746,-2081.637,758.4695,0),
-(29602,6,7065.993,-2130.804,756.0863,0),
-(29602,7,7088.311,-2173.474,759.4193,0),
-(29602,8,7124.069,-2207.86,758.3796,0),
-(29602,9,7152.243,-2248.376,759.6431,0),
-(29602,10,7196.352,-2265.138,756.9138,0),
-(29602,11,7234.013,-2297.475,752.4849,0),
-(29602,12,7255.404,-2341.076,751.6851,0),
-(29602,13,7297.881,-2368.091,751.6649,0),
-(29602,14,7304.306,-2416.368,752.8918,0),
-(29602,15,7320.821,-2463.647,750.8485,0),
-(29602,16,7362.996,-2490.504,749.8151,0),
-(29602,17,7409.486,-2475.066,751.9595,0),
-(29602,18,7422.454,-2427.556,752.5062,0),
-(29602,19,7407.287,-2380.342,753.0123,0),
-(29602,20,7366.268,-2303.298,756.0569,0),
-(29602,21,7318.561,-2301.531,754.494,0),
-(29602,22,7280.997,-2270.392,756.3792,0),
-(29602,23,7237.944,-2246.72,756.4333,0),
-(29602,24,7193.829,-2231.046,757.992,0),
-(29602,25,7159.348,-2195.307,760.6475,0),
-(29602,26,7122.389,-2164.836,760.5703,0),
-(29602,27,7112.455,-2116.784,759.8074,0),
-(29602,28,7117.603,-2040.713,767.7001,0),
-(29602,29,7107.043,-2011.189,770.1815,0),
-(29602,30,7103.942,-1985.653,771.1707,0),
-(29602,31,7079.7,-1966.68,769.305,0),
-(29602,32,7080.018,-1948.492,771.6097,0),
-(29602,33,7087.928,-1931.903,773.8726,0);
diff --git a/sql/old/3.3.5a/2011_02_11_1_world_command.sql b/sql/old/3.3.5a/2011_02_11_1_world_command.sql
deleted file mode 100644
index 407699d6d7d..00000000000
--- a/sql/old/3.3.5a/2011_02_11_1_world_command.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `command` SET `help` = 'Syntax: .reload all gossips\nReload gossip_menu, gossip_menu_option, gossip_scripts, points_of_interest tables.' WHERE `name` = 'reload all gossips';
-UPDATE `command` SET `help` = 'Syntax: .reload all npc\nReload npc_option, npc_trainer, npc vendor, points of interest tables.' WHERE `name` = 'reload all npc';
-DELETE FROM `command` WHERE `name` = 'reload npc_gossip';
diff --git a/sql/old/3.3.5a/2011_02_11_1_world_coredevdata.sql b/sql/old/3.3.5a/2011_02_11_1_world_coredevdata.sql
deleted file mode 100644
index 4f225d8c984..00000000000
--- a/sql/old/3.3.5a/2011_02_11_1_world_coredevdata.sql
+++ /dev/null
@@ -1,36 +0,0 @@
-DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=28239);
-DELETE FROM `creature` WHERE `id`=28239;
-
-UPDATE `creature` SET `position_x`=1357.86,`position_y`=1055.26,`position_z`=463.02 WHERE `guid`=101498;
-UPDATE `creature` SET `position_x`=1210.38,`position_y`=1118.57,`position_z`=471.41 WHERE `guid`=100931;
-
-UPDATE `creature_template` SET `flags_extra`=130 WHERE `entry`=28183;
-UPDATE `creature_template` SET `scale`=1 WHERE `entry`=28183;
-
-DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=28183);
-DELETE FROM `creature` WHERE `id`=28183;
--- this guids were used by the old spawns.
-INSERT INTO `creature` (guid, id, map, spawnMask, phaseMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, spawndist, currentwaypoint, curhealth, curmana, DeathState, MovementType) VALUES
-(100227, 28183, 578, 3, 1, 0, 0, 1242.73267, 1079.592, 439.232849, 6.108652, 120, 0, 0, 1, 0, 0, 0),
-(100228, 28183, 578, 3, 1, 0, 0, 1246.566, 1051.25171, 439.232849, 0.5061455, 120, 0, 0, 1, 0, 0, 0),
-(100229, 28183, 578, 3, 1, 0, 0, 1265.30212, 1109.22742, 439.232849, 5.18362761, 120, 0, 0, 1, 0, 0, 0),
-(100230, 28183, 578, 3, 1, 0, 0, 1277.07471, 1027.78992, 439.232849, 1.37881, 120, 0, 0, 1, 0, 0, 0),
-(100231, 28183, 578, 3, 1, 0, 0, 1293.79858, 1113.18054, 439.232849, 4.485496, 120, 0, 0, 1, 0, 0, 0),
-(100232, 28183, 578, 3, 1, 0, 0, 1305.63025, 1031.75171, 439.232849, 2.042035, 120, 0, 0, 1, 0, 0, 0),
-(100233, 28183, 578, 3, 1, 0, 0, 1324.38538, 1089.79688, 439.232849, 3.59537816, 120, 0, 0, 1, 0, 0, 0),
-(100234, 28183, 578, 3, 1, 0, 0, 1328.00171, 1061.15283, 439.232849, 2.8972466, 120, 0, 0, 1, 0, 0, 0);
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (54069,56251);
-INSERT INTO `conditions` (SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, COMMENT) VALUES 
-(13,0,54069,0,18,1,28183,0,0,'',NULL),
-(13,0,56251,0,18,1,28183,0,0,'',NULL);
-
-DELETE FROM `creature_template_addon` WHERE `entry`=28183;
-INSERT INTO `creature_template_addon` (entry,auras) VALUE (28183,'50798 0');
-
-DELETE FROM `creature_text` WHERE `entry`=27447;
-INSERT INTO `creature_text` (entry,groupid,id,TEXT,TYPE,LANGUAGE,sound) VALUES 
-(27447,0,0,'There will be no mercy!',1,0,13649),
-(27447,1,1,'Blast them! Destroy them!',1,0,13650),
-(27447,2,2,'%s calls an Azure Ring Captain!',3,0,0),
-(27447,3,3,'They are... too strong! Underestimated their... fortitude.',1,0,13655);
diff --git a/sql/old/3.3.5a/2011_02_11_2_world_npc_gossip.sql b/sql/old/3.3.5a/2011_02_11_2_world_npc_gossip.sql
deleted file mode 100644
index 18739ed1be6..00000000000
--- a/sql/old/3.3.5a/2011_02_11_2_world_npc_gossip.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE `npc_gossip`;
diff --git a/sql/old/3.3.5a/2011_02_11_3_world_creature_involvedrelation.sql b/sql/old/3.3.5a/2011_02_11_3_world_creature_involvedrelation.sql
deleted file mode 100644
index c98af05803d..00000000000
--- a/sql/old/3.3.5a/2011_02_11_3_world_creature_involvedrelation.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Update quest-link turn in for quest The Call to Command (Bragor Bloodfist, not Varimathras)
-UPDATE `creature_involvedrelation` SET `id`=36273 WHERE `quest`=6144;
diff --git a/sql/old/3.3.5a/2011_02_11_4_world_game_event_npc_gossip.sql b/sql/old/3.3.5a/2011_02_11_4_world_game_event_npc_gossip.sql
deleted file mode 100644
index 83f7613d6c9..00000000000
--- a/sql/old/3.3.5a/2011_02_11_4_world_game_event_npc_gossip.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE `game_event_npc_gossip`;
diff --git a/sql/old/3.3.5a/2011_02_12_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_12_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..39098e1c3de
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_12_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=26678;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(26678,'spell_item_create_heart_candy');
diff --git a/sql/old/3.3.5a/2011_02_12_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_12_0_world_spell_script_names.sql
deleted file mode 100644
index 39098e1c3de..00000000000
--- a/sql/old/3.3.5a/2011_02_12_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=26678;
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(26678,'spell_item_create_heart_candy');
diff --git a/sql/old/3.3.5a/2011_02_15_00_world_sai.sql b/sql/old/3.3.5a/2011_02_15_00_world_sai.sql
new file mode 100644
index 00000000000..e23f3d31f61
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_00_world_sai.sql
@@ -0,0 +1,139 @@
+-- Conditions for Writhing Choker and Unliving Choker
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry` IN (38673,38660);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES 
+(1,28519,38660,0,14,12238,0,0,0,'',NULL),
+(1,28519,38673,0,8,12238,0,0,0,'',NULL);
+
+-- Mission: Plague This (11332)
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=9546 AND `id`=1;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(9546,1,0, 'I need to Borrow a Gryphon',1,1,0,0,954601,0,0, ''); -- Text Unsure
+
+DELETE FROM `gossip_scripts` WHERE `id`=954601;
+INSERT INTO `gossip_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(954601,0,17,33634,10,0,0,0,0,0); -- Give Player Bombs
+
+-- SmartAI
+SET @ENTRY := 23859;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0, 'Greer Orehammer - Script on Aggro'),
+(@ENTRY,0,1,0,62,0,100,0,9546,1,0,0,52,745,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Plague This Taxi Start'),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,12,9526,4,30000,0,0,0,7,0,0,0,0,0,0,0,'Summon Enraged Gryphon'),
+(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,12,9526,4,30000,0,0,0,7,0,0,0,0,0,0,0,'Summon Enraged Gryphon');
+DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
+(@ENTRY,0,0,'Guards!',0,0,100,0,0,0,'Greer Orehammer');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9546 AND `SourceEntry`=1;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9546,1,0,9,11332,0,0,0,'', 'Mission Plague This is Active');
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; -- Text Entry Not Touched as its Shared by All Flight Masters
+
+-- Quest: Scourge Tactics (13008)
+-- Webed Crusader (Crusader Verion)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30273;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30273;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(30273,0,0,0,6,0,100,0,0,0,0,0,85,56515,0x02,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Summon Freed Crusader on Death'),
+(30273,0,1,0,6,0,100,0,0,0,0,0,33,30274,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Summon Freed Crusader Quest Credit');
+DELETE FROM `spell_scripts` WHERE `id`=56515;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(56515,0,0,15,56516,2,0,0,0,0,0);
+-- Webed Crusader (Ambusher Version)
+UPDATE `creature_template` SET `AIName`= 'SmartAI', `minlevel`=1, `maxlevel`=1 WHERE `entry`=30268;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30268;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(30268,0,0,0,6,0,100,0,0,0,0,0,12,30204,1,30000,0,0,0,1,0,0,0,0,0,0,0, 'Summon Forgotten Depths Ambusher');
+-- Freeed Crusader
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30274;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30274;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=3027400;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(30274,0,0,0,54,0,100,0,0,0,0,0,80,3027400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Start Script on Spawn'),
+(3027400,9,0,0,0,0,100,0,0,0,0,0,11,58054,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Freed Crusader Blessing of Kings'),
+(3027400,9,1,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Speach'),
+(3027400,9,2,0,0,0,100,0,0,0,0,0,11,58053,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Freed Crusader Holy Light'),
+(3027400,9,3,0,0,0,100,0,4000,4000,0,0,53,1,30274,0,13008,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader paths to Argeant Vanguard'),
+(3027400,9,4,0,0,0,100,0,0,0,0,0,41,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Despawn');
+-- create path point location to send Freed Crusaders to
+DELETE FROM `waypoints` WHERE `entry`=30274;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES 
+(30274,1,6296.25,92.9397,390.701, 'send Freed Crusader here');
+DELETE FROM `creature_text` WHERE `entry`=30274;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(30274,0,0, 'Thank you and farewell, friend. I must return to the Argent Vanguard.',0,0,100,0,0,0, 'Freed Crusader Speach');
+-- Forgotten Depths Ambusher
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30204;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30204;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(30204,0,0,0,54,0,100,0,0,0,0,0,11,56418,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Forgotten Depths Ambusher - Emerge From Snow');
+-- Spawns for Ambusher Verion
+SET @GUID :=151826;
+DELETE FROM `creature` WHERE `id`=30268;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES 
+(@GUID+0,30268,571,1,2,0,0,6244.78,190.194,383.08,1.50098,0,0,0,0,0,0,0,0,0,0),
+(@GUID+1,30268,571,1,2,0,0,6249.75,126.806,382.534,2.47837,0,0,0,0,0,0,0,0,0,0),
+(@GUID+2,30268,571,1,2,0,0,6277.33,155.167,383.491,0.43643,0,0,0,0,0,0,0,0,0,0),
+(@GUID+3,30268,571,1,2,0,0,6303.7,193.736,387.669,-1.17247,0,0,0,0,0,0,0,0,0,0),
+(@GUID+4,30268,571,1,2,0,0,6321.27,152.463,387.239,4.10152,0,0,0,0,0,0,0,0,0,0),
+(@GUID+5,30268,571,1,2,0,0,6333.02,57.5423,389.173,4.62512,0,0,0,0,0,0,0,0,0,0),
+(@GUID+6,30268,571,1,2,0,0,6335.22,110.147,391.309,6.05629,0,0,0,0,0,0,0,0,0,0),
+(@GUID+7,30268,571,1,2,0,0,6339.98,186.907,389.644,-2.29057,0,0,0,0,0,0,0,0,0,0),
+(@GUID+8,30268,571,1,2,0,0,6347.77,225.483,393.712,-1.99599,0,0,0,0,0,0,0,0,0,0),
+(@GUID+9,30268,571,1,2,0,0,6363.71,126.463,391.424,3.89208,0,0,0,0,0,0,0,0,0,0),
+(@GUID+10,30268,571,1,2,0,0,6389.44,226.344,395.383,6.16101,0,0,0,0,0,0,0,0,0,0),
+(@GUID+11,30268,571,1,2,0,0,6405.67,158.456,394.692,0.85521,0,0,0,0,0,0,0,0,0,0),
+(@GUID+12,30268,571,1,2,0,0,6421.84,258.293,397.279,-2.2004,0,0,0,0,0,0,0,0,0,0),
+(@GUID+13,30268,571,1,2,0,0,6434.63,198.273,396.762,5.93412,0,0,0,0,0,0,0,0,0,0);
+-- Pool creature
+SET @Pool=7001;
+DELETE FROM `pool_creature` WHERE `pool_entry` BETWEEN @Pool+0 AND @Pool+13;
+INSERT INTO `pool_creature` (`guid`,`pool_entry`,`chance`,`description`) VALUES
+(207266,@Pool+0,0, 'Webbed Crusader Spawn 1'),
+(@GUID+0,@Pool+0,0, 'Webbed Crusader Spawn 1'),
+(207267,@Pool+1,0, 'Webbed Crusader Spawn 2'),
+(@GUID+1,@Pool+1,0, 'Webbed Crusader Spawn 2'),
+(207268,@Pool+2,0, 'Webbed Crusader Spawn 3'),
+(@GUID+2,@Pool+2,0, 'Webbed Crusader Spawn 3'),
+(207269,@Pool+3,0, 'Webbed Crusader Spawn 4'),
+(@GUID+3,@Pool+3,0, 'Webbed Crusader Spawn 4'),
+(207270,@Pool+4,0, 'Webbed Crusader Spawn 5'),
+(@GUID+4,@Pool+4,0, 'Webbed Crusader Spawn 5'),
+(207271,@Pool+5,0, 'Webbed Crusader Spawn 6'),
+(@GUID+5,@Pool+5,0, 'Webbed Crusader Spawn 6'),
+(207272,@Pool+6,0, 'Webbed Crusader Spawn 7'),
+(@GUID+6,@Pool+6,0, 'Webbed Crusader Spawn 7'),
+(207273,@Pool+7,0, 'Webbed Crusader Spawn 8'),
+(@GUID+7,@Pool+7,0, 'Webbed Crusader Spawn 8'),
+(207274,@Pool+8,0, 'Webbed Crusader Spawn 9'),
+(@GUID+8,@Pool+8,0, 'Webbed Crusader Spawn 9'),
+(207275,@Pool+9,0, 'Webbed Crusader Spawn 10'),
+(@GUID+9,@Pool+9,0, 'Webbed Crusader Spawn 10'),
+(207276,@Pool+10,0, 'Webbed Crusader Spawn 11'),
+(@GUID+10,@Pool+10,0, 'Webbed Crusader Spawn 11'),
+(207277,@Pool+11,0, 'Webbed Crusader Spawn 12'),
+(@GUID+11,@Pool+11,0, 'Webbed Crusader Spawn 12'),
+(207278,@Pool+12,0, 'Webbed Crusader Spawn 13'),
+(@GUID+12,@Pool+12,0, 'Webbed Crusader Spawn 13'),
+(207279,@Pool+13,0, 'Webbed Crusader Spawn 14'),
+(@GUID+13,@Pool+13,0, 'Webbed Crusader Spawn 14');
+-- Pools
+DELETE FROM `pool_template` WHERE `entry` BETWEEN @Pool+0 AND @Pool+13;
+INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
+(@Pool+0,1, 'Webbed Crusader Spawn 1'),
+(@Pool+1,1, 'Webbed Crusader Spawn 2'),
+(@Pool+2,1, 'Webbed Crusader Spawn 3'),
+(@Pool+3,1, 'Webbed Crusader Spawn 4'),
+(@Pool+4,1, 'Webbed Crusader Spawn 5'),
+(@Pool+5,1, 'Webbed Crusader Spawn 6'),
+(@Pool+6,1, 'Webbed Crusader Spawn 7'),
+(@Pool+7,1, 'Webbed Crusader Spawn 8'),
+(@Pool+8,1, 'Webbed Crusader Spawn 9'),
+(@Pool+9,1, 'Webbed Crusader Spawn 10'),
+(@Pool+10,1, 'Webbed Crusader Spawn 11'),
+(@Pool+11,1, 'Webbed Crusader Spawn 12'),
+(@Pool+12,1, 'Webbed Crusader Spawn 13'),
+(@Pool+13,1, 'Webbed Crusader Spawn 14');
diff --git a/sql/old/3.3.5a/2011_02_15_01_world_sai.sql b/sql/old/3.3.5a/2011_02_15_01_world_sai.sql
new file mode 100644
index 00000000000..64473eaf30d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_01_world_sai.sql
@@ -0,0 +1,74 @@
+-- Cult Plaguebringer <Cult of the Damned> SAI (tested) 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=24957;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=24957;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=24957;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(24957,0,0,0,1,0,100,0,1000,900000,500000,700000,11,45850,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Ghoul Summons OOC'),
+(24957,0,2,0,0,0,30,0,1100,6300,8800,13800,11,50356,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Inject Plague on victim');
+
+-- Cultist Necrolyte SAI (tested) 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25651;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25651);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(25651,0,0,0,11,0,100,0,0,0,0,0,11,45104,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shadow Channelling on self when spawned'),
+(25651,0,1,0,21,0,100,0,0,0,0,0,11,45104,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shadow Channelling on self when reach home home'),
+(25651,0,2,0,0,0,30,0,1000,2000,6000,8000,11,18266,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Curse of Agony on victim'),
+(25651,0,3,0,0,0,70,0,3000,4000,3000,4000,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Shadow Bolt on victim');
+
+-- Azure Front Channel Stalker SAI (tested working)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=31400;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-203457,-111746,-111726,-111742);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(-203457,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111746,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
+(-111746,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111726,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
+(-111726,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111742,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
+(-111742,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,203520,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned');
+
+-- Wildhammer Scout SAI (tested)
+-- Removes waypoint script error spamming at Wildhammer Stronghold
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=19384;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-69122,-69123,-69124,-69125,-69126,-69127);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(-69122,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
+(-69123,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
+(-69124,0,0,0,1,0,100,0,3000,5000,3000,5000,11,33805,2,0,0,0,0,9,19388,0,25,0,0,0,0,'Cast Throw Hammer every 3-5 sec'),
+(-69125,0,0,0,1,0,100,0,3000,5000,3000,5000,11,33806,2,0,0,0,0,9,19388,0,25,0,0,0,0,'Cast Throw Hammer every 3-5 sec'),
+(-69126,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
+(-69127,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec');
+DELETE FROM `waypoint_data` WHERE `id` IN (691220,691230,691240,691250,691260,691270);
+DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 190 AND 214;
+-- Wildhammer Stronghold Target Dummy Left & Wildhammer Stronghold Target Dummy Right are Triggers
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128,`InhabitType`=7 WHERE `entry` IN (19387,19388);
+
+-- Speech by Marrod Silvertongue, Fort Wildervar (Tested working)
+SET @ENTRY := 24534;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,0,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 6 min ooc'),
+(@ENTRY*100,9,0,0,0,0,100,0,8000,8000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,2,0,0,0,100,0,8000,8000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 1'),
+(@ENTRY*100,9,3,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,4,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 2'),
+(@ENTRY*100,9,5,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,6,0,0,0,100,0,8000,8000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 3'),
+(@ENTRY*100,9,7,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,8,0,0,0,100,0,8000,8000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 4'),
+(@ENTRY*100,9,9,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,10,0,0,0,100,0,8000,8000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 5'),
+(@ENTRY*100,9,11,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,12,0,0,0,100,0,8000,8000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 6'),
+(@ENTRY*100,9,13,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
+(@ENTRY*100,9,14,0,0,0,100,0,3000,3000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (24534);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24534,0,0, 'Welcome to Fort Wildervar, brave homesteaders! There''s a whole continent out there just waiting to be claimed!',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,1,0, 'True, Northrend is a hard land, but our people are strong, hardy, and equal to the task!',0,7,100,0,0,0, 'Marrod Silvertongue'),
+(24534,2,0, 'We will win this land with the sword, and break it with the plow! You are the men and women who will be remembered for taming the wild continent!',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,3,0, 'But, you will not be alone out there. My men and I have prepared pack mules carrying the supplies you''ll need most.',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,4,0, 'Axes, picks, seed, nails, food, blankets, water... it''s all there, waiting for you. I think you''ll find my prices quite reasonable, too.',0,7,100,25,0,0, 'Marrod Silvertongue'),
+(24534,5,0, 'There are more than enough to go around. Should you need other goods, don''t hesitate to ask!',0,7,100,1,0,0, 'Marrod Silvertongue'),
+(24534,6,0, 'Now, my loyal custo... err, friends, go forth and conquer this land for our people!',0,7,100,274,0,0, 'Marrod Silvertongue');
diff --git a/sql/old/3.3.5a/2011_02_15_02_world_game_event_liita.sql b/sql/old/3.3.5a/2011_02_15_02_world_game_event_liita.sql
new file mode 100644
index 00000000000..4ca381b59d7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_02_world_game_event_liita.sql
@@ -0,0 +1,270 @@
+SET @GUID := 208789; -- creature.guid
+DELETE FROM `creature` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954);
+DELETE FROM `creature_addon` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954);
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+111 AND `id` IN (36272,36296,36565,36885,37172,37674,37675,37715,38035,38042,38043,38044,38045,38208,38295,38328,38340,38341,38342,38065,37917,37984,38006,38016,38023,38030,38032,37214);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`) VALUES
+-- (@GUID,36272,33,1,1,0,0,-205.449,2219.56,79.7633,3.85724,86400,0,0,269000,0,0,0), -- Apothecary Frye
+-- (@GUID+1,36296,33,1,1,0,0,-208.723,2218.5,79.7633,5.16886,86400,0,0,269000,0,0,0), -- Apothecary Hummel
+-- (@GUID+2,36565,33,1,1,0,0,-209.602,2215.42,79.7633,0.723503,86400,0,0,269000,0,0,0), -- Apothecary Baxter -- commented out because they shouldn't be able to be killed more than once (also missing scripts)
+(@GUID+3,36885,33,1,1,0,0,-207.869,2174.97,79.7664,0.661457,300,0,0,1,0,0,0), -- Crown Apothecary
+(@GUID+4,36885,33,1,1,0,0,-200.286,2201.67,79.765,0.537364,300,0,0,1,0,0,0), -- Crown Apothecary
+(@GUID+5,36885,33,1,1,0,0,-220.323,2207.68,79.7636,3.0687,300,0,0,1,0,0,0), -- Crown Apothecary
+(@GUID+6,37172,1,1,1,0,0,1658.82,-4392.51,23.3589,4.6346,300,0,0,955,0,0,0), -- Detective Snap Snagglebolt
+(@GUID+7,37674,530,1,1,0,0,-4005.55,-11844.8,1.43003,4.79643,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+8,37674,0,1,1,0,0,-4918.13,-982.624,502.699,2.499,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+9,37674,0,1,1,0,0,-8868.67,636.356,97.0308,0.908268,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+10,37674,1,1,1,0,0,9868.93,2492.6,1317.12,6.214,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+11,37674,530,1,1,0,0,9613.2,-7184.04,15.5297,1.871,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+12,37674,0,1,1,0,0,1629.43,239.687,65.095,0.0213735,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+13,37674,1,1,1,0,0,-1224.64,68.9846,130.974,3.13043,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+14,37674,1,1,1,0,0,1654.56,-4435.7,19.1524,1.54799,600,0,0,1524,0,0,0), -- Lovely Merchant
+(@GUID+15,37675,1,1,1,0,0,-1224.81,67.5514,130.815,3.13043,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+16,37675,1,1,1,0,0,1651.95,-4436.06,19.1667,1.5205,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+17,37675,0,1,1,0,0,-8869.92,637.543,97.0305,0.751188,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+18,37675,1,1,1,0,0,9869.15,2493.99,1317.12,6.2572,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+19,37675,530,1,1,0,0,9611.19,-7184.62,15.5277,1.84743,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+20,37675,0,1,1,0,0,1629.41,241.08,65.0948,6.18282,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+21,37675,0,1,1,0,0,-4919.62,-983.631,502.699,2.24375,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+22,37675,530,1,1,0,0,-4003.71,-11844.7,1.44597,4.73753,300,0,0,1716,0,0,0), -- Public Relations Agent
+(@GUID+23,37715,1,1,1,0,0,1349.47,-4641.45,53.5287,3.1282,300,0,0,1003,0,0,0), -- Snivel Rustrocket
+(@GUID+24,37715,0,1,1,0,0,-8401.37,1246.34,5.2303,5.97131,300,0,0,1003,0,0,0), -- Snivel Rustrocket
+(@GUID+25,38035,571,1,1,0,0,5525.21,35.5649,148.918,0.00558376,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+26,38035,571,1,1,0,0,5586.44,36.157,148.304,2.49451,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+27,38035,571,1,1,0,0,5610.19,67.2452,149.648,1.10907,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+28,38035,0,1,1,0,0,-51.7072,1147.06,66.2442,6.0002,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+29,38035,0,1,1,0,0,-9462.46,525.975,55.3952,4.44641,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+30,38035,1,1,1,0,0,1269.73,-4095.83,27.2461,0.383236,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+31,38035,530,1,1,0,0,-1800.57,4849.58,3.67941,0.732729,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+32,38035,1,1,1,0,0,6767.76,-4880.77,776.832,0.473977,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+33,38035,1,1,1,0,0,4851.07,137.164,52.3573,3.32611,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+34,38035,0,1,1,0,0,121.643,-2401.57,123.532,1.69738,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+35,38035,1,1,1,0,0,-3418.81,-4212.7,10.3292,0.932394,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+36,38035,0,1,1,0,0,-402.274,163.143,75.6627,3.65071,60,0,0,1,0,0,0), -- Chemical Wagon
+(@GUID+37,38042,1,1,1,0,0,1648.48,-4434.6,17.6364,1.10031,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+38,38043,530,1,1,0,0,9617.42,-7181.72,14.2958,2.39329,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+39,38044,1,1,1,0,0,-1223.83,62.5435,129.123,3.29929,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+40,38045,0,1,1,0,0,1630.48,236.085,63.2574,0.382657,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
+(@GUID+41,38208,33,1,1,0,0,-234.669,2154.3,90.6247,4.46749,300,0,0,1,0,0,0), -- Investigator Fezzen Brasstacks
+(@GUID+42,38295,1,1,1,0,0,-1239.7,55.8489,127.02,0.969017,300,0,0,1,0,0,0), -- Junior Detective
+(@GUID+43,38295,0,1,1,0,0,1637.74,256.223,62.5927,4.55312,300,0,0,1,0,0,0), -- Junior Detective
+(@GUID+44,38295,530,1,1,0,0,9585.78,-7182.34,14.2411,0.268784,300,0,0,1,0,0,0), -- Junior Detective
+(@GUID+45,38328,1,1,1,0,0,1776.14,-4507.72,27.7458,0.701323,300,0,0,1,0,0,0), -- Roka
+(@GUID+46,38340,1,1,1,0,0,1619.91,-4376.93,12.2511,0.575657,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Bank Bunny
+(@GUID+47,38340,0,1,1,0,0,-8911.16,625.834,99.5227,3.65088,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Bank Bunny
+(@GUID+48,38341,0,1,1,0,0,-8806.15,664.605,96.2,1.56172,300,0,0,1,0,0,0), -- [DND] Holiday - Love - AH Bunny
+(@GUID+49,38341,1,1,1,0,0,1674.65,-4440.01,19.1696,5.34538,300,0,0,1,0,0,0), -- [DND] Holiday - Love - AH Bunny
+(@GUID+50,38342,0,1,1,0,0,-8754.09,657.778,105.091,0.199051,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Barber Bunny
+(@GUID+51,38342,1,1,1,0,0,1762.65,-4345.06,-7.83994,3.73924,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Barber Bunny
+(@GUID+52,38065,0,1,1,0,0,-9028.75,351.111,93.004,4.99164,180,0,0,12600,0,0,0), -- Crown Supply Sentry
+(@GUID+53,38065,0,1,1,0,0,-9033.74,358.078,93.4561,3.12414,180,0,0,12600,0,0,0), -- Crown Supply Sentry
+(@GUID+54,38065,0,1,1,0,0,-9033.66,352.778,93.0811,4.03171,180,0,0,12600,0,0,0), -- Crown Supply Sentry
+(@GUID+55,37917,0,1,1,0,0,-78.1933,1155.44,64.1348,3.65579,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+56,37917,0,1,1,0,0,-99.1899,1143.58,61.9249,3.65579,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+57,37917,0,1,1,0,0,-70.0067,1126.23,65.5446,5.87061,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+58,37917,0,1,1,0,0,-40.5129,1132.35,66.9879,0.2236,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+59,37917,1,1,1,0,0,4861.5,143.397,53.5891,1.77494,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+60,37917,1,1,1,0,0,4867.09,123.556,54.625,1.10736,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+61,37917,1,1,1,0,0,4860,109.204,53.8496,0.467256,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+62,37917,1,1,1,0,0,4844.9,102.68,50.0936,3.43999,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+63,37917,1,1,1,0,0,4845.3,115.292,51.258,3.43999,30,0,0,356,0,0,0), -- Crown Thug
+(@GUID+64,37984,0,1,1,0,0,-396.98,152.02,72.7445,0.0802893,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+65,37984,0,1,1,0,0,-414.333,151.165,72.7544,5.28748,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+66,37984,0,1,1,0,0,-421.118,161.632,73.0552,3.81093,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+67,37984,0,1,1,0,0,-407.15,172.323,76.8851,3.50463,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+68,37984,0,1,1,0,0,-382.121,161.213,77.0395,0.982712,30,0,0,356,0,0,0), -- Crown Duster
+(@GUID+69,38006,1,1,1,0,0,-3408.24,-4205.45,11.7024,5.33848,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+70,38006,1,1,1,0,0,-3415.67,-4199.13,10.9447,0.380259,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+71,38006,1,1,1,0,0,-3425.3,-4205.48,11.087,0.747825,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+72,38006,1,1,1,0,0,-3407.75,-4217.59,11.4111,4.59863,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+73,38006,1,1,1,0,0,-3423.44,-4223.1,10.3878,3.34749,30,0,0,356,0,0,0), -- Crown Hoodlum
+(@GUID+74,38016,0,1,1,0,0,107.836,-2394.64,123.766,1.71859,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+75,38016,0,1,1,0,0,112.257,-2406.06,125.159,2.12857,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+76,38016,0,1,1,0,0,117.312,-2415.86,124.574,1.81912,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+77,38016,0,1,1,0,0,112.321,-2385.37,121.337,0.933974,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+78,38016,0,1,1,0,0,122.685,-2379.58,120.969,0.401474,30,0,0,356,0,0,0), -- Crown Agent
+(@GUID+79,38023,1,1,1,0,0,6777.68,-4889.84,776.667,0.746511,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+80,38023,1,1,1,0,0,6767.71,-4899.06,775.43,5.72986,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+81,38023,1,1,1,0,0,6754.64,-4890.56,774.717,4.87221,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+82,38023,1,1,1,0,0,6754.5,-4875.5,773.386,6.14062,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+83,38023,1,1,1,0,0,6763.25,-4871.99,775.183,0.473977,30,0,0,356,0,0,0), -- Crown Sprinkler
+(@GUID+84,38030,530,1,1,0,0,-1792,4835.44,5.75526,4.05103,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+85,38030,530,1,1,0,0,-1786.21,4846.14,3.9133,4.90948,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+86,38030,530,1,1,0,0,-1789.11,4860.69,1.08418,5.7255,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+87,38030,530,1,1,0,0,-1800.26,4865.74,1.76724,0.246567,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+88,38030,530,1,1,0,0,-1809.55,4858.05,1.6643,0.850539,30,0,0,356,0,0,0), -- Crown Underling
+(@GUID+89,38032,571,1,1,0,0,5562.6,52.7611,148.023,2.35235,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+90,38032,571,1,1,0,0,5577.75,75.6327,148.413,1.00147,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+91,38032,571,1,1,0,0,5578.91,93.6562,151.453,0.907219,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+92,38032,571,1,1,0,0,5604.51,73.2304,149.666,5.6039,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+93,38032,571,1,1,0,0,5576.47,21.2221,147.859,3.57051,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+94,38032,571,1,1,0,0,5545.75,7.1756,146.18,3.57051,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+95,38032,571,1,1,0,0,5517.56,0.325575,148.243,3.29483,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+96,38032,571,1,1,0,0,5493.37,1.40435,148.043,2.9414,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+97,38032,571,1,1,0,0,5483.65,-24.6906,148.632,4.41402,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+98,38032,571,1,1,0,0,5480.42,-46.4207,150.948,4.71797,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+99,38032,571,1,1,0,0,5490.42,25.9105,148.037,1.53711,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+100,38032,571,1,1,0,0,5517.81,39.9906,150.179,0.35901,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+101,38032,571,1,1,0,0,5560.51,26.0842,147.293,0.621334,30,0,0,9940,0,0,0), -- Crown Sprayer
+(@GUID+102,37214,0,1,1,0,0,-9447.59,521.985,56.1219,4.45034,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+103,37214,0,1,1,0,0,-9461.04,512.112,55.8756,3.59818,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+104,37214,0,1,1,0,0,-9479.33,525.887,55.2184,2.14127,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+105,37214,0,1,1,0,0,-9471.57,536.639,54.108,0.793523,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+106,37214,0,1,1,0,0,-9459.73,534.487,54.9696,5.97165,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+107,37214,1,1,1,0,0,1278.46,-4095.97,28.5179,6.00276,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+108,37214,1,1,1,0,0,1273.4,-4103.99,27.8146,4.13351,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+109,37214,1,1,1,0,0,1263.1,-4104.66,26.5895,3.20674,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+110,37214,1,1,1,0,0,1252.12,-4093.07,24.2136,1.55034,30,0,0,356,0,0,0), -- Crown Lackey
+(@GUID+111,37214,1,1,1,0,0,1261.55,-4082.01,24.5336,0.679332,30,0,0,356,0,0,0); -- Crown Lackey
+
+-- Game_event_linking
+DELETE FROM `game_event_creature` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954) AND `event`=8;
+DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+111 AND `event`=8;
+INSERT INTO `game_event_creature` (`guid`,`event`) VALUES
+/*(@GUID+0,8),(@GUID+1,8),(@GUID+2,8),*/(@GUID+3,8),(@GUID+4,8),
+(@GUID+5,8),(@GUID+6,8),(@GUID+7,8),(@GUID+8,8),(@GUID+9,8),
+(@GUID+10,8),(@GUID+11,8),(@GUID+12,8),(@GUID+13,8),(@GUID+14,8),
+(@GUID+15,8),(@GUID+16,8),(@GUID+17,8),(@GUID+18,8),(@GUID+19,8),
+(@GUID+20,8),(@GUID+21,8),(@GUID+22,8),(@GUID+23,8),(@GUID+24,8),
+(@GUID+25,8),(@GUID+26,8),(@GUID+27,8),(@GUID+28,8),(@GUID+29,8),
+(@GUID+30,8),(@GUID+31,8),(@GUID+32,8),(@GUID+33,8),(@GUID+34,8),
+(@GUID+35,8),(@GUID+36,8),(@GUID+37,8),(@GUID+38,8),(@GUID+39,8),
+(@GUID+40,8),(@GUID+41,8),(@GUID+42,8),(@GUID+43,8),(@GUID+44,8),
+(@GUID+45,8),(@GUID+46,8),(@GUID+47,8),(@GUID+48,8),(@GUID+49,8),
+(@GUID+50,8),(@GUID+51,8),(@GUID+52,8),(@GUID+53,8),(@GUID+54,8),
+(@GUID+55,8),(@GUID+56,8),(@GUID+57,8),(@GUID+58,8),(@GUID+59,8),
+(@GUID+60,8),(@GUID+61,8),(@GUID+62,8),(@GUID+63,8),(@GUID+64,8),
+(@GUID+65,8),(@GUID+66,8),(@GUID+67,8),(@GUID+68,8),(@GUID+69,8),
+(@GUID+70,8),(@GUID+71,8),(@GUID+72,8),(@GUID+73,8),(@GUID+74,8),
+(@GUID+75,8),(@GUID+76,8),(@GUID+77,8),(@GUID+78,8),(@GUID+79,8),
+(@GUID+80,8),(@GUID+81,8),(@GUID+82,8),(@GUID+83,8),(@GUID+84,8),
+(@GUID+85,8),(@GUID+86,8),(@GUID+87,8),(@GUID+88,8),(@GUID+89,8),
+(@GUID+90,8),(@GUID+91,8),(@GUID+92,8),(@GUID+93,8),(@GUID+94,8),
+(@GUID+95,8),(@GUID+96,8),(@GUID+97,8),(@GUID+98,8),(@GUID+99,8),
+(@GUID+100,8),(@GUID+101,8),(@GUID+102,8),(@GUID+103,8),
+(@GUID+104,8),(@GUID+105,8),(@GUID+106,8),(@GUID+107,8),
+(@GUID+108,8),(@GUID+109,8),(@GUID+110,8),(@GUID+111,8);
+
+DELETE FROM `creature_addon` WHERE `guid` IN (@GUID+56,@GUID+57);
+INSERT INTO `creature_addon`(`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(@GUID+56,0,0,0,0,0, '68946 0'),
+(@GUID+57,0,0,0,0,0, '68589 0');
+
+SET @GUID:= 151771; -- gameobject.guid
+DELETE FROM `gameobject` WHERE `id`=201716;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`animprogress`,`state`) VALUES
+(@GUID+00,201716,571,1,1,5525.21,35.5649,148.918,0.00558376,180,0,0,0,1,100,1),
+(@GUID+01,201716,571,1,1,5586.44,36.157,148.304,2.49451,180,0,0,0,1,100,1),
+(@GUID+02,201716,571,1,1,5610.19,67.2452,149.648,1.10907,180,0,0,0,1,100,1),
+(@GUID+03,201716,0,1,1,-51.7072,1147.06,66.2442,6.0002,180,0,0,0,1,100,1),
+(@GUID+04,201716,0,1,1,-9462.46,525.975,55.3952,4.44641,180,0,0,0,1,100,1),
+(@GUID+05,201716,1,1,1,1269.73,-4095.83,27.2461,0.383236,180,0,0,0,1,100,1),
+(@GUID+06,201716,530,1,1,-1800.57,4849.58,3.67941,0.732729,180,0,0,0,1,100,1),
+(@GUID+07,201716,1,1,1,4851.07,137.164,52.3573,3.32611,180,0,0,0,1,100,1),
+(@GUID+08,201716,0,1,1,121.643,-2401.57,123.532,1.69738,180,0,0,0,1,100,1),
+(@GUID+09,201716,1,1,1,-3418.81,-4212.7,10.3292,0.932394,180,0,0,0,1,100,1),
+(@GUID+10,201716,0,1,1,-402.274,163.143,75.6627,3.65071,180,0,0,0,1,100,1),
+(@GUID+11,201716,1,1,1,6767.76,-4880.77,776.832,0.473977,180,0,0,0,1,100,1);
+
+-- Game_event_linking
+DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+11 AND `event`=8;
+INSERT INTO `game_event_gameobject` (`guid`,`event`) VALUES
+(@GUID+0,8),(@GUID+1,8),(@GUID+2,8),(@GUID+3,8),(@GUID+4,8),
+(@GUID+5,8),(@GUID+6,8),(@GUID+7,8),(@GUID+8,8),(@GUID+9,8),
+(@GUID+10,8),(@GUID+11,8);
+
+-- remove Love Tokens from innkeepers
+DELETE FROM `npc_vendor` WHERE `item`=21815;
+
+-- Update Quests
+UPDATE `quest_template` SET `MaxLevel`=13 WHERE `entry` IN (24638,24658);
+UPDATE `quest_template` SET `MaxLevel`=22 WHERE `entry` IN (24659,24645);
+UPDATE `quest_template` SET `MaxLevel`=31 WHERE `entry` IN (24660,24647);
+UPDATE `quest_template` SET `MaxLevel`=40 WHERE `entry` IN (24662,24648);
+UPDATE `quest_template` SET `MaxLevel`=50 WHERE `entry` IN (24663,24649);
+UPDATE `quest_template` SET `MaxLevel`=60 WHERE `entry` IN (24664,24650);
+UPDATE `quest_template` SET `MaxLevel`=70 WHERE `entry` IN (24665,24651);
+UPDATE `quest_template` SET `MaxLevel`=80 WHERE `entry` IN (24666,24652);
+
+-- Other Data
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14 WHERE `entry` IN (38032,37214,37917,37984,38006,38016,38023,38030);
+UPDATE `creature_template` SET `faction_A`=16,`faction_H`=16 WHERE `entry` IN (36296,36272,36568);
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|1 WHERE `entry` IN (36272,36296,36565); -- Shadowfang Keep bosses
+-- Missing questrelations
+DELETE FROM `creature_questrelation` WHERE `id` IN (38066,37887,38041,38043,38066,38208) AND `quest` IN (24666,24597,24609,24615,24792,14488);
+INSERT INTO `creature_questrelation`(`id`,`quest`) VALUES
+(38066,24666),
+(37887,24597),
+(38041,24609),
+(38043,24615),
+(38066,24792),
+(38208,14488);
+DELETE FROM `creature_involvedrelation` WHERE `id` IN (38066,29611,2784,38208,36296) AND `quest` IN (24666,24597,24609,24792,14488);
+INSERT INTO `creature_involvedrelation`(`id`,`quest`) VALUES
+(38066,24666),
+(29611,24597),
+(2784,24609),
+(38208,24792),
+(36296,14488);
+
+UPDATE `creature_template` SET `npcflag`=npcflag|2 WHERE `name`='Kwee Q. Peddlefeet'; -- 9 entries that should be questgivers
+-- Set correct thrall id for quest A Gift for the Warchief
+UPDATE `creature_involvedrelation` SET `id`=4949 WHERE `quest`=24612;
+
+-- Loots
+UPDATE `creature_template` SET `lootid`=36296 WHERE `entry`=36296;
+DELETE FROM `creature_loot_template` WHERE `entry`=36296;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) values
+-- Apothecary Hummel
+(36296,1,100,1,0,-50010,1),  -- 1 from reference_epics
+(36296,2,15,1,0,-50011,1), -- 1 from reference_blues
+(36296,50320,10,1,0,1,1), -- Faded Lovely Greeting Card Ally
+(36296,49641,10,1,0,1,1), -- Faded Lovely Greeting Card Horde
+(36296,50250,0.1,1,0,1,1); -- Big Love Rocket 
+DELETE FROM `reference_loot_template` WHERE `entry` IN (50010,50011,50012);
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(50010,51806,0,1,1,1,1), -- Shard of Pirouetting Happiness
+(50010,51808,0,1,1,1,1), -- Choker of the Pure Heart
+(50010,51805,0,1,1,1,1), -- Heartbreak Charm
+(50010,51807,0,1,1,1,1), -- Sweet Perfume Broach
+(50010,51804,0,1,1,1,1), -- Winking Eye of Love
+(50011,50471,0,1,1,1,1), -- The Heartbreaker 
+(50011,50741,0,1,1,1,1), -- Vile Fumigator's Mask
+(50011,50446,0,1,1,1,1), -- Toxic Wasteling
+(50011,49715,0,1,1,1,1), -- Forever-Lovely Rose
+-- Box of Chocolates_Reference
+(50012,22237,0,1,1,1,1), -- Dark Desire
+(50012,22239,0,1,1,1,1), -- Sweet Surprise
+(50012,22238,0,1,1,1,1), -- Very Berry Cream
+(50012,22236,0,1,1,1,1); -- Buttermilk Delight
+
+DELETE FROM `item_loot_template` WHERE `entry` IN (49631,49909,50160,50161); 
+INSERT INTO `item_loot_template`(`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+-- Standard Apothecary Serving Kit
+(49631,49352,100,1,0,1,1), 
+(49631,49351,100,1,0,1,1),
+(49631,49635,100,1,0,1,1),
+-- Box of Chocolates
+(49909,1,100,1,0,-50012,6), -- always 6 chocolates inside the box (out of 4 kinds)
+-- Lovely Dress Box
+(50160,22276,0,1,1,1,1), -- Lovely Red Dress
+(50160,22278,0,1,1,1,1), -- Lovely Blue Dress
+(50160,22279,0,1,1,1,1), -- Lovely Black Dress
+(50160,22280,0,1,1,1,1), -- Lovely Purple Dress
+-- Loot for Dinner Suit Box
+(50161,22281,0,1,1,1,1), -- Blue Dinner Suit
+(50161,22282,0,1,1,1,1), -- Purple Dinner Suit
+(50161,22277,0,1,1,1,1); -- Red Dinner Suit
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup`=36296 AND `SourceEntry` IN (49641,50320);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
+(1,36296,49641,0,6,67,0,0,0, 'Faded Lovely Greeting Card Horde'),
+(1,36296,50320,0,6,469,0,0,0, 'Faded Lovely Greeting Card Ally');
+
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12846 AND `type` in (16,18);
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12859 AND `type` in (5,15,18);
+INSERT INTO `achievement_criteria_data`(`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES 
+-- Set correct data for achievement Charming
+(12846,16,335,0, ''),
+-- Set correct data for achievement Flirt With Disaster (alliance)
+(12859,5,26682,0, ''),
+(12859,15,3,0, '');
diff --git a/sql/old/3.3.5a/2011_02_15_03_world_creature_template.sql b/sql/old/3.3.5a/2011_02_15_03_world_creature_template.sql
new file mode 100644
index 00000000000..cc892b30bf9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_03_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`exp`=2,`unit_class`=1,`faction_A`=16,`faction_H`=16,`baseattacktime`=2000,`unit_flags`=33280,`speed_run`=0.9920629 WHERE `entry`=38494; -- Rotting Frost Giant
diff --git a/sql/old/3.3.5a/2011_02_15_03_world_creature_text.sql b/sql/old/3.3.5a/2011_02_15_03_world_creature_text.sql
new file mode 100644
index 00000000000..6642afba9b7
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_03_world_creature_text.sql
@@ -0,0 +1,4 @@
+DELETE FROM `creature_text` WHERE `entry` IN (38490,38494);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(38490,0,0, '$n is infected with the Death Plague!',3,0,100,25,0,0, 'Rotting Frost Giant - Death Plague'),
+(38494,0,0, '$n is infected with the Death Plague!',3,0,100,25,0,0, 'Rotting Frost Giant - Death Plague');
diff --git a/sql/old/3.3.5a/2011_02_15_03_world_scriptname.sql b/sql/old/3.3.5a/2011_02_15_03_world_scriptname.sql
new file mode 100644
index 00000000000..ec7c4f3d483
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_03_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_rotting_frost_giant' WHERE `entry` IN (38490,38494);
diff --git a/sql/old/3.3.5a/2011_02_15_03_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_15_03_world_spell_script_names.sql
new file mode 100644
index 00000000000..85c9a11fd50
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_03_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_frost_giant_death_plague';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(72864,'spell_frost_giant_death_plague');
diff --git a/sql/old/3.3.5a/2011_02_15_04_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_15_04_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..41cfff3fab9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_04_world_spell_linked_spell.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=70117;
diff --git a/sql/old/3.3.5a/2011_02_15_04_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_15_04_world_spell_script_names.sql
new file mode 100644
index 00000000000..c066aad3b8b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_15_04_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_icy_grip';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70117,'spell_sindragosa_icy_grip');
diff --git a/sql/old/3.3.5a/2011_02_15_0_world_sai.sql b/sql/old/3.3.5a/2011_02_15_0_world_sai.sql
deleted file mode 100644
index e23f3d31f61..00000000000
--- a/sql/old/3.3.5a/2011_02_15_0_world_sai.sql
+++ /dev/null
@@ -1,139 +0,0 @@
--- Conditions for Writhing Choker and Unliving Choker
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry` IN (38673,38660);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES 
-(1,28519,38660,0,14,12238,0,0,0,'',NULL),
-(1,28519,38673,0,8,12238,0,0,0,'',NULL);
-
--- Mission: Plague This (11332)
-DELETE FROM `gossip_menu_option` WHERE `menu_id`=9546 AND `id`=1;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(9546,1,0, 'I need to Borrow a Gryphon',1,1,0,0,954601,0,0, ''); -- Text Unsure
-
-DELETE FROM `gossip_scripts` WHERE `id`=954601;
-INSERT INTO `gossip_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
-(954601,0,17,33634,10,0,0,0,0,0); -- Give Player Bombs
-
--- SmartAI
-SET @ENTRY := 23859;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0, 'Greer Orehammer - Script on Aggro'),
-(@ENTRY,0,1,0,62,0,100,0,9546,1,0,0,52,745,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Plague This Taxi Start'),
-(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,12,9526,4,30000,0,0,0,7,0,0,0,0,0,0,0,'Summon Enraged Gryphon'),
-(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,12,9526,4,30000,0,0,0,7,0,0,0,0,0,0,0,'Summon Enraged Gryphon');
-DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
-(@ENTRY,0,0,'Guards!',0,0,100,0,0,0,'Greer Orehammer');
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9546 AND `SourceEntry`=1;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,9546,1,0,9,11332,0,0,0,'', 'Mission Plague This is Active');
-DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY; -- Text Entry Not Touched as its Shared by All Flight Masters
-
--- Quest: Scourge Tactics (13008)
--- Webed Crusader (Crusader Verion)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30273;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=30273;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(30273,0,0,0,6,0,100,0,0,0,0,0,85,56515,0x02,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Summon Freed Crusader on Death'),
-(30273,0,1,0,6,0,100,0,0,0,0,0,33,30274,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Summon Freed Crusader Quest Credit');
-DELETE FROM `spell_scripts` WHERE `id`=56515;
-INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
-(56515,0,0,15,56516,2,0,0,0,0,0);
--- Webed Crusader (Ambusher Version)
-UPDATE `creature_template` SET `AIName`= 'SmartAI', `minlevel`=1, `maxlevel`=1 WHERE `entry`=30268;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=30268;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(30268,0,0,0,6,0,100,0,0,0,0,0,12,30204,1,30000,0,0,0,1,0,0,0,0,0,0,0, 'Summon Forgotten Depths Ambusher');
--- Freeed Crusader
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30274;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=30274;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=3027400;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(30274,0,0,0,54,0,100,0,0,0,0,0,80,3027400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Start Script on Spawn'),
-(3027400,9,0,0,0,0,100,0,0,0,0,0,11,58054,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Freed Crusader Blessing of Kings'),
-(3027400,9,1,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Speach'),
-(3027400,9,2,0,0,0,100,0,0,0,0,0,11,58053,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Freed Crusader Holy Light'),
-(3027400,9,3,0,0,0,100,0,4000,4000,0,0,53,1,30274,0,13008,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader paths to Argeant Vanguard'),
-(3027400,9,4,0,0,0,100,0,0,0,0,0,41,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Freed Crusader Despawn');
--- create path point location to send Freed Crusaders to
-DELETE FROM `waypoints` WHERE `entry`=30274;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES 
-(30274,1,6296.25,92.9397,390.701, 'send Freed Crusader here');
-DELETE FROM `creature_text` WHERE `entry`=30274;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(30274,0,0, 'Thank you and farewell, friend. I must return to the Argent Vanguard.',0,0,100,0,0,0, 'Freed Crusader Speach');
--- Forgotten Depths Ambusher
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=30204;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=30204;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(30204,0,0,0,54,0,100,0,0,0,0,0,11,56418,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Forgotten Depths Ambusher - Emerge From Snow');
--- Spawns for Ambusher Verion
-SET @GUID :=151826;
-DELETE FROM `creature` WHERE `id`=30268;
-INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES 
-(@GUID+0,30268,571,1,2,0,0,6244.78,190.194,383.08,1.50098,0,0,0,0,0,0,0,0,0,0),
-(@GUID+1,30268,571,1,2,0,0,6249.75,126.806,382.534,2.47837,0,0,0,0,0,0,0,0,0,0),
-(@GUID+2,30268,571,1,2,0,0,6277.33,155.167,383.491,0.43643,0,0,0,0,0,0,0,0,0,0),
-(@GUID+3,30268,571,1,2,0,0,6303.7,193.736,387.669,-1.17247,0,0,0,0,0,0,0,0,0,0),
-(@GUID+4,30268,571,1,2,0,0,6321.27,152.463,387.239,4.10152,0,0,0,0,0,0,0,0,0,0),
-(@GUID+5,30268,571,1,2,0,0,6333.02,57.5423,389.173,4.62512,0,0,0,0,0,0,0,0,0,0),
-(@GUID+6,30268,571,1,2,0,0,6335.22,110.147,391.309,6.05629,0,0,0,0,0,0,0,0,0,0),
-(@GUID+7,30268,571,1,2,0,0,6339.98,186.907,389.644,-2.29057,0,0,0,0,0,0,0,0,0,0),
-(@GUID+8,30268,571,1,2,0,0,6347.77,225.483,393.712,-1.99599,0,0,0,0,0,0,0,0,0,0),
-(@GUID+9,30268,571,1,2,0,0,6363.71,126.463,391.424,3.89208,0,0,0,0,0,0,0,0,0,0),
-(@GUID+10,30268,571,1,2,0,0,6389.44,226.344,395.383,6.16101,0,0,0,0,0,0,0,0,0,0),
-(@GUID+11,30268,571,1,2,0,0,6405.67,158.456,394.692,0.85521,0,0,0,0,0,0,0,0,0,0),
-(@GUID+12,30268,571,1,2,0,0,6421.84,258.293,397.279,-2.2004,0,0,0,0,0,0,0,0,0,0),
-(@GUID+13,30268,571,1,2,0,0,6434.63,198.273,396.762,5.93412,0,0,0,0,0,0,0,0,0,0);
--- Pool creature
-SET @Pool=7001;
-DELETE FROM `pool_creature` WHERE `pool_entry` BETWEEN @Pool+0 AND @Pool+13;
-INSERT INTO `pool_creature` (`guid`,`pool_entry`,`chance`,`description`) VALUES
-(207266,@Pool+0,0, 'Webbed Crusader Spawn 1'),
-(@GUID+0,@Pool+0,0, 'Webbed Crusader Spawn 1'),
-(207267,@Pool+1,0, 'Webbed Crusader Spawn 2'),
-(@GUID+1,@Pool+1,0, 'Webbed Crusader Spawn 2'),
-(207268,@Pool+2,0, 'Webbed Crusader Spawn 3'),
-(@GUID+2,@Pool+2,0, 'Webbed Crusader Spawn 3'),
-(207269,@Pool+3,0, 'Webbed Crusader Spawn 4'),
-(@GUID+3,@Pool+3,0, 'Webbed Crusader Spawn 4'),
-(207270,@Pool+4,0, 'Webbed Crusader Spawn 5'),
-(@GUID+4,@Pool+4,0, 'Webbed Crusader Spawn 5'),
-(207271,@Pool+5,0, 'Webbed Crusader Spawn 6'),
-(@GUID+5,@Pool+5,0, 'Webbed Crusader Spawn 6'),
-(207272,@Pool+6,0, 'Webbed Crusader Spawn 7'),
-(@GUID+6,@Pool+6,0, 'Webbed Crusader Spawn 7'),
-(207273,@Pool+7,0, 'Webbed Crusader Spawn 8'),
-(@GUID+7,@Pool+7,0, 'Webbed Crusader Spawn 8'),
-(207274,@Pool+8,0, 'Webbed Crusader Spawn 9'),
-(@GUID+8,@Pool+8,0, 'Webbed Crusader Spawn 9'),
-(207275,@Pool+9,0, 'Webbed Crusader Spawn 10'),
-(@GUID+9,@Pool+9,0, 'Webbed Crusader Spawn 10'),
-(207276,@Pool+10,0, 'Webbed Crusader Spawn 11'),
-(@GUID+10,@Pool+10,0, 'Webbed Crusader Spawn 11'),
-(207277,@Pool+11,0, 'Webbed Crusader Spawn 12'),
-(@GUID+11,@Pool+11,0, 'Webbed Crusader Spawn 12'),
-(207278,@Pool+12,0, 'Webbed Crusader Spawn 13'),
-(@GUID+12,@Pool+12,0, 'Webbed Crusader Spawn 13'),
-(207279,@Pool+13,0, 'Webbed Crusader Spawn 14'),
-(@GUID+13,@Pool+13,0, 'Webbed Crusader Spawn 14');
--- Pools
-DELETE FROM `pool_template` WHERE `entry` BETWEEN @Pool+0 AND @Pool+13;
-INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
-(@Pool+0,1, 'Webbed Crusader Spawn 1'),
-(@Pool+1,1, 'Webbed Crusader Spawn 2'),
-(@Pool+2,1, 'Webbed Crusader Spawn 3'),
-(@Pool+3,1, 'Webbed Crusader Spawn 4'),
-(@Pool+4,1, 'Webbed Crusader Spawn 5'),
-(@Pool+5,1, 'Webbed Crusader Spawn 6'),
-(@Pool+6,1, 'Webbed Crusader Spawn 7'),
-(@Pool+7,1, 'Webbed Crusader Spawn 8'),
-(@Pool+8,1, 'Webbed Crusader Spawn 9'),
-(@Pool+9,1, 'Webbed Crusader Spawn 10'),
-(@Pool+10,1, 'Webbed Crusader Spawn 11'),
-(@Pool+11,1, 'Webbed Crusader Spawn 12'),
-(@Pool+12,1, 'Webbed Crusader Spawn 13'),
-(@Pool+13,1, 'Webbed Crusader Spawn 14');
diff --git a/sql/old/3.3.5a/2011_02_15_1_world_sai.sql b/sql/old/3.3.5a/2011_02_15_1_world_sai.sql
deleted file mode 100644
index 64473eaf30d..00000000000
--- a/sql/old/3.3.5a/2011_02_15_1_world_sai.sql
+++ /dev/null
@@ -1,74 +0,0 @@
--- Cult Plaguebringer <Cult of the Damned> SAI (tested) 
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=24957;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=24957;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=24957;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(24957,0,0,0,1,0,100,0,1000,900000,500000,700000,11,45850,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Ghoul Summons OOC'),
-(24957,0,2,0,0,0,30,0,1100,6300,8800,13800,11,50356,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Inject Plague on victim');
-
--- Cultist Necrolyte SAI (tested) 
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25651;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25651);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(25651,0,0,0,11,0,100,0,0,0,0,0,11,45104,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shadow Channelling on self when spawned'),
-(25651,0,1,0,21,0,100,0,0,0,0,0,11,45104,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shadow Channelling on self when reach home home'),
-(25651,0,2,0,0,0,30,0,1000,2000,6000,8000,11,18266,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Curse of Agony on victim'),
-(25651,0,3,0,0,0,70,0,3000,4000,3000,4000,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Shadow Bolt on victim');
-
--- Azure Front Channel Stalker SAI (tested working)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=31400;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-203457,-111746,-111726,-111742);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(-203457,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111746,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
-(-111746,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111726,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
-(-111726,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,111742,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned'),
-(-111742,0,0,0,1,0,100,1,1000,1000,1000,1000,11,59044,2,0,0,0,0,10,203520,31400,0,0,0,0,0,'Cast Cosmetic - Crystalsong Tree Beam when spawned');
-
--- Wildhammer Scout SAI (tested)
--- Removes waypoint script error spamming at Wildhammer Stronghold
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=19384;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-69122,-69123,-69124,-69125,-69126,-69127);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(-69122,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
-(-69123,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
-(-69124,0,0,0,1,0,100,0,3000,5000,3000,5000,11,33805,2,0,0,0,0,9,19388,0,25,0,0,0,0,'Cast Throw Hammer every 3-5 sec'),
-(-69125,0,0,0,1,0,100,0,3000,5000,3000,5000,11,33806,2,0,0,0,0,9,19388,0,25,0,0,0,0,'Cast Throw Hammer every 3-5 sec'),
-(-69126,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec'),
-(-69127,0,0,0,1,0,100,0,1000,2000,3000,6000,11,33808,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Shoot Gun every 3-6 sec');
-DELETE FROM `waypoint_data` WHERE `id` IN (691220,691230,691240,691250,691260,691270);
-DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 190 AND 214;
--- Wildhammer Stronghold Target Dummy Left & Wildhammer Stronghold Target Dummy Right are Triggers
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128,`InhabitType`=7 WHERE `entry` IN (19387,19388);
-
--- Speech by Marrod Silvertongue, Fort Wildervar (Tested working)
-SET @ENTRY := 24534;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,0,30000,50000,360000,360000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Load script every 6 min ooc'),
-(@ENTRY*100,9,0,0,0,0,100,0,8000,8000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
-(@ENTRY*100,9,2,0,0,0,100,0,8000,8000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 1'),
-(@ENTRY*100,9,3,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
-(@ENTRY*100,9,4,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 2'),
-(@ENTRY*100,9,5,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
-(@ENTRY*100,9,6,0,0,0,100,0,8000,8000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 3'),
-(@ENTRY*100,9,7,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
-(@ENTRY*100,9,8,0,0,0,100,0,8000,8000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 4'),
-(@ENTRY*100,9,9,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
-(@ENTRY*100,9,10,0,0,0,100,0,8000,8000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 5'),
-(@ENTRY*100,9,11,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
-(@ENTRY*100,9,12,0,0,0,100,0,8000,8000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Marrod Silvertongue Say text 6'),
-(@ENTRY*100,9,13,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote'),
-(@ENTRY*100,9,14,0,0,0,100,0,3000,3000,0,0,5,4,0,0,0,0,0,9,24535,0,20,0,0,0,0,'Northrend Homesteader emote');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry` IN (24534);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(24534,0,0, 'Welcome to Fort Wildervar, brave homesteaders! There''s a whole continent out there just waiting to be claimed!',0,7,100,1,0,0, 'Marrod Silvertongue'),
-(24534,1,0, 'True, Northrend is a hard land, but our people are strong, hardy, and equal to the task!',0,7,100,0,0,0, 'Marrod Silvertongue'),
-(24534,2,0, 'We will win this land with the sword, and break it with the plow! You are the men and women who will be remembered for taming the wild continent!',0,7,100,1,0,0, 'Marrod Silvertongue'),
-(24534,3,0, 'But, you will not be alone out there. My men and I have prepared pack mules carrying the supplies you''ll need most.',0,7,100,1,0,0, 'Marrod Silvertongue'),
-(24534,4,0, 'Axes, picks, seed, nails, food, blankets, water... it''s all there, waiting for you. I think you''ll find my prices quite reasonable, too.',0,7,100,25,0,0, 'Marrod Silvertongue'),
-(24534,5,0, 'There are more than enough to go around. Should you need other goods, don''t hesitate to ask!',0,7,100,1,0,0, 'Marrod Silvertongue'),
-(24534,6,0, 'Now, my loyal custo... err, friends, go forth and conquer this land for our people!',0,7,100,274,0,0, 'Marrod Silvertongue');
diff --git a/sql/old/3.3.5a/2011_02_15_2_world_game_event_liita.sql b/sql/old/3.3.5a/2011_02_15_2_world_game_event_liita.sql
deleted file mode 100644
index 4ca381b59d7..00000000000
--- a/sql/old/3.3.5a/2011_02_15_2_world_game_event_liita.sql
+++ /dev/null
@@ -1,270 +0,0 @@
-SET @GUID := 208789; -- creature.guid
-DELETE FROM `creature` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954);
-DELETE FROM `creature_addon` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954);
-DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+111 AND `id` IN (36272,36296,36565,36885,37172,37674,37675,37715,38035,38042,38043,38044,38045,38208,38295,38328,38340,38341,38342,38065,37917,37984,38006,38016,38023,38030,38032,37214);
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`) VALUES
--- (@GUID,36272,33,1,1,0,0,-205.449,2219.56,79.7633,3.85724,86400,0,0,269000,0,0,0), -- Apothecary Frye
--- (@GUID+1,36296,33,1,1,0,0,-208.723,2218.5,79.7633,5.16886,86400,0,0,269000,0,0,0), -- Apothecary Hummel
--- (@GUID+2,36565,33,1,1,0,0,-209.602,2215.42,79.7633,0.723503,86400,0,0,269000,0,0,0), -- Apothecary Baxter -- commented out because they shouldn't be able to be killed more than once (also missing scripts)
-(@GUID+3,36885,33,1,1,0,0,-207.869,2174.97,79.7664,0.661457,300,0,0,1,0,0,0), -- Crown Apothecary
-(@GUID+4,36885,33,1,1,0,0,-200.286,2201.67,79.765,0.537364,300,0,0,1,0,0,0), -- Crown Apothecary
-(@GUID+5,36885,33,1,1,0,0,-220.323,2207.68,79.7636,3.0687,300,0,0,1,0,0,0), -- Crown Apothecary
-(@GUID+6,37172,1,1,1,0,0,1658.82,-4392.51,23.3589,4.6346,300,0,0,955,0,0,0), -- Detective Snap Snagglebolt
-(@GUID+7,37674,530,1,1,0,0,-4005.55,-11844.8,1.43003,4.79643,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+8,37674,0,1,1,0,0,-4918.13,-982.624,502.699,2.499,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+9,37674,0,1,1,0,0,-8868.67,636.356,97.0308,0.908268,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+10,37674,1,1,1,0,0,9868.93,2492.6,1317.12,6.214,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+11,37674,530,1,1,0,0,9613.2,-7184.04,15.5297,1.871,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+12,37674,0,1,1,0,0,1629.43,239.687,65.095,0.0213735,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+13,37674,1,1,1,0,0,-1224.64,68.9846,130.974,3.13043,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+14,37674,1,1,1,0,0,1654.56,-4435.7,19.1524,1.54799,600,0,0,1524,0,0,0), -- Lovely Merchant
-(@GUID+15,37675,1,1,1,0,0,-1224.81,67.5514,130.815,3.13043,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+16,37675,1,1,1,0,0,1651.95,-4436.06,19.1667,1.5205,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+17,37675,0,1,1,0,0,-8869.92,637.543,97.0305,0.751188,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+18,37675,1,1,1,0,0,9869.15,2493.99,1317.12,6.2572,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+19,37675,530,1,1,0,0,9611.19,-7184.62,15.5277,1.84743,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+20,37675,0,1,1,0,0,1629.41,241.08,65.0948,6.18282,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+21,37675,0,1,1,0,0,-4919.62,-983.631,502.699,2.24375,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+22,37675,530,1,1,0,0,-4003.71,-11844.7,1.44597,4.73753,300,0,0,1716,0,0,0), -- Public Relations Agent
-(@GUID+23,37715,1,1,1,0,0,1349.47,-4641.45,53.5287,3.1282,300,0,0,1003,0,0,0), -- Snivel Rustrocket
-(@GUID+24,37715,0,1,1,0,0,-8401.37,1246.34,5.2303,5.97131,300,0,0,1003,0,0,0), -- Snivel Rustrocket
-(@GUID+25,38035,571,1,1,0,0,5525.21,35.5649,148.918,0.00558376,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+26,38035,571,1,1,0,0,5586.44,36.157,148.304,2.49451,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+27,38035,571,1,1,0,0,5610.19,67.2452,149.648,1.10907,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+28,38035,0,1,1,0,0,-51.7072,1147.06,66.2442,6.0002,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+29,38035,0,1,1,0,0,-9462.46,525.975,55.3952,4.44641,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+30,38035,1,1,1,0,0,1269.73,-4095.83,27.2461,0.383236,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+31,38035,530,1,1,0,0,-1800.57,4849.58,3.67941,0.732729,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+32,38035,1,1,1,0,0,6767.76,-4880.77,776.832,0.473977,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+33,38035,1,1,1,0,0,4851.07,137.164,52.3573,3.32611,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+34,38035,0,1,1,0,0,121.643,-2401.57,123.532,1.69738,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+35,38035,1,1,1,0,0,-3418.81,-4212.7,10.3292,0.932394,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+36,38035,0,1,1,0,0,-402.274,163.143,75.6627,3.65071,60,0,0,1,0,0,0), -- Chemical Wagon
-(@GUID+37,38042,1,1,1,0,0,1648.48,-4434.6,17.6364,1.10031,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
-(@GUID+38,38043,530,1,1,0,0,9617.42,-7181.72,14.2958,2.39329,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
-(@GUID+39,38044,1,1,1,0,0,-1223.83,62.5435,129.123,3.29929,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
-(@GUID+40,38045,0,1,1,0,0,1630.48,236.085,63.2574,0.382657,300,0,0,42,0,0,0), -- Kwee Q. Peddlefeet
-(@GUID+41,38208,33,1,1,0,0,-234.669,2154.3,90.6247,4.46749,300,0,0,1,0,0,0), -- Investigator Fezzen Brasstacks
-(@GUID+42,38295,1,1,1,0,0,-1239.7,55.8489,127.02,0.969017,300,0,0,1,0,0,0), -- Junior Detective
-(@GUID+43,38295,0,1,1,0,0,1637.74,256.223,62.5927,4.55312,300,0,0,1,0,0,0), -- Junior Detective
-(@GUID+44,38295,530,1,1,0,0,9585.78,-7182.34,14.2411,0.268784,300,0,0,1,0,0,0), -- Junior Detective
-(@GUID+45,38328,1,1,1,0,0,1776.14,-4507.72,27.7458,0.701323,300,0,0,1,0,0,0), -- Roka
-(@GUID+46,38340,1,1,1,0,0,1619.91,-4376.93,12.2511,0.575657,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Bank Bunny
-(@GUID+47,38340,0,1,1,0,0,-8911.16,625.834,99.5227,3.65088,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Bank Bunny
-(@GUID+48,38341,0,1,1,0,0,-8806.15,664.605,96.2,1.56172,300,0,0,1,0,0,0), -- [DND] Holiday - Love - AH Bunny
-(@GUID+49,38341,1,1,1,0,0,1674.65,-4440.01,19.1696,5.34538,300,0,0,1,0,0,0), -- [DND] Holiday - Love - AH Bunny
-(@GUID+50,38342,0,1,1,0,0,-8754.09,657.778,105.091,0.199051,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Barber Bunny
-(@GUID+51,38342,1,1,1,0,0,1762.65,-4345.06,-7.83994,3.73924,300,0,0,1,0,0,0), -- [DND] Holiday - Love - Barber Bunny
-(@GUID+52,38065,0,1,1,0,0,-9028.75,351.111,93.004,4.99164,180,0,0,12600,0,0,0), -- Crown Supply Sentry
-(@GUID+53,38065,0,1,1,0,0,-9033.74,358.078,93.4561,3.12414,180,0,0,12600,0,0,0), -- Crown Supply Sentry
-(@GUID+54,38065,0,1,1,0,0,-9033.66,352.778,93.0811,4.03171,180,0,0,12600,0,0,0), -- Crown Supply Sentry
-(@GUID+55,37917,0,1,1,0,0,-78.1933,1155.44,64.1348,3.65579,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+56,37917,0,1,1,0,0,-99.1899,1143.58,61.9249,3.65579,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+57,37917,0,1,1,0,0,-70.0067,1126.23,65.5446,5.87061,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+58,37917,0,1,1,0,0,-40.5129,1132.35,66.9879,0.2236,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+59,37917,1,1,1,0,0,4861.5,143.397,53.5891,1.77494,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+60,37917,1,1,1,0,0,4867.09,123.556,54.625,1.10736,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+61,37917,1,1,1,0,0,4860,109.204,53.8496,0.467256,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+62,37917,1,1,1,0,0,4844.9,102.68,50.0936,3.43999,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+63,37917,1,1,1,0,0,4845.3,115.292,51.258,3.43999,30,0,0,356,0,0,0), -- Crown Thug
-(@GUID+64,37984,0,1,1,0,0,-396.98,152.02,72.7445,0.0802893,30,0,0,356,0,0,0), -- Crown Duster
-(@GUID+65,37984,0,1,1,0,0,-414.333,151.165,72.7544,5.28748,30,0,0,356,0,0,0), -- Crown Duster
-(@GUID+66,37984,0,1,1,0,0,-421.118,161.632,73.0552,3.81093,30,0,0,356,0,0,0), -- Crown Duster
-(@GUID+67,37984,0,1,1,0,0,-407.15,172.323,76.8851,3.50463,30,0,0,356,0,0,0), -- Crown Duster
-(@GUID+68,37984,0,1,1,0,0,-382.121,161.213,77.0395,0.982712,30,0,0,356,0,0,0), -- Crown Duster
-(@GUID+69,38006,1,1,1,0,0,-3408.24,-4205.45,11.7024,5.33848,30,0,0,356,0,0,0), -- Crown Hoodlum
-(@GUID+70,38006,1,1,1,0,0,-3415.67,-4199.13,10.9447,0.380259,30,0,0,356,0,0,0), -- Crown Hoodlum
-(@GUID+71,38006,1,1,1,0,0,-3425.3,-4205.48,11.087,0.747825,30,0,0,356,0,0,0), -- Crown Hoodlum
-(@GUID+72,38006,1,1,1,0,0,-3407.75,-4217.59,11.4111,4.59863,30,0,0,356,0,0,0), -- Crown Hoodlum
-(@GUID+73,38006,1,1,1,0,0,-3423.44,-4223.1,10.3878,3.34749,30,0,0,356,0,0,0), -- Crown Hoodlum
-(@GUID+74,38016,0,1,1,0,0,107.836,-2394.64,123.766,1.71859,30,0,0,356,0,0,0), -- Crown Agent
-(@GUID+75,38016,0,1,1,0,0,112.257,-2406.06,125.159,2.12857,30,0,0,356,0,0,0), -- Crown Agent
-(@GUID+76,38016,0,1,1,0,0,117.312,-2415.86,124.574,1.81912,30,0,0,356,0,0,0), -- Crown Agent
-(@GUID+77,38016,0,1,1,0,0,112.321,-2385.37,121.337,0.933974,30,0,0,356,0,0,0), -- Crown Agent
-(@GUID+78,38016,0,1,1,0,0,122.685,-2379.58,120.969,0.401474,30,0,0,356,0,0,0), -- Crown Agent
-(@GUID+79,38023,1,1,1,0,0,6777.68,-4889.84,776.667,0.746511,30,0,0,356,0,0,0), -- Crown Sprinkler
-(@GUID+80,38023,1,1,1,0,0,6767.71,-4899.06,775.43,5.72986,30,0,0,356,0,0,0), -- Crown Sprinkler
-(@GUID+81,38023,1,1,1,0,0,6754.64,-4890.56,774.717,4.87221,30,0,0,356,0,0,0), -- Crown Sprinkler
-(@GUID+82,38023,1,1,1,0,0,6754.5,-4875.5,773.386,6.14062,30,0,0,356,0,0,0), -- Crown Sprinkler
-(@GUID+83,38023,1,1,1,0,0,6763.25,-4871.99,775.183,0.473977,30,0,0,356,0,0,0), -- Crown Sprinkler
-(@GUID+84,38030,530,1,1,0,0,-1792,4835.44,5.75526,4.05103,30,0,0,356,0,0,0), -- Crown Underling
-(@GUID+85,38030,530,1,1,0,0,-1786.21,4846.14,3.9133,4.90948,30,0,0,356,0,0,0), -- Crown Underling
-(@GUID+86,38030,530,1,1,0,0,-1789.11,4860.69,1.08418,5.7255,30,0,0,356,0,0,0), -- Crown Underling
-(@GUID+87,38030,530,1,1,0,0,-1800.26,4865.74,1.76724,0.246567,30,0,0,356,0,0,0), -- Crown Underling
-(@GUID+88,38030,530,1,1,0,0,-1809.55,4858.05,1.6643,0.850539,30,0,0,356,0,0,0), -- Crown Underling
-(@GUID+89,38032,571,1,1,0,0,5562.6,52.7611,148.023,2.35235,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+90,38032,571,1,1,0,0,5577.75,75.6327,148.413,1.00147,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+91,38032,571,1,1,0,0,5578.91,93.6562,151.453,0.907219,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+92,38032,571,1,1,0,0,5604.51,73.2304,149.666,5.6039,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+93,38032,571,1,1,0,0,5576.47,21.2221,147.859,3.57051,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+94,38032,571,1,1,0,0,5545.75,7.1756,146.18,3.57051,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+95,38032,571,1,1,0,0,5517.56,0.325575,148.243,3.29483,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+96,38032,571,1,1,0,0,5493.37,1.40435,148.043,2.9414,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+97,38032,571,1,1,0,0,5483.65,-24.6906,148.632,4.41402,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+98,38032,571,1,1,0,0,5480.42,-46.4207,150.948,4.71797,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+99,38032,571,1,1,0,0,5490.42,25.9105,148.037,1.53711,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+100,38032,571,1,1,0,0,5517.81,39.9906,150.179,0.35901,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+101,38032,571,1,1,0,0,5560.51,26.0842,147.293,0.621334,30,0,0,9940,0,0,0), -- Crown Sprayer
-(@GUID+102,37214,0,1,1,0,0,-9447.59,521.985,56.1219,4.45034,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+103,37214,0,1,1,0,0,-9461.04,512.112,55.8756,3.59818,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+104,37214,0,1,1,0,0,-9479.33,525.887,55.2184,2.14127,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+105,37214,0,1,1,0,0,-9471.57,536.639,54.108,0.793523,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+106,37214,0,1,1,0,0,-9459.73,534.487,54.9696,5.97165,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+107,37214,1,1,1,0,0,1278.46,-4095.97,28.5179,6.00276,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+108,37214,1,1,1,0,0,1273.4,-4103.99,27.8146,4.13351,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+109,37214,1,1,1,0,0,1263.1,-4104.66,26.5895,3.20674,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+110,37214,1,1,1,0,0,1252.12,-4093.07,24.2136,1.55034,30,0,0,356,0,0,0), -- Crown Lackey
-(@GUID+111,37214,1,1,1,0,0,1261.55,-4082.01,24.5336,0.679332,30,0,0,356,0,0,0); -- Crown Lackey
-
--- Game_event_linking
-DELETE FROM `game_event_creature` WHERE `guid` IN (86593,91690,91691,91692,91693,91694,91695,91696,91697,91698,91699,91700,91701,91702,79559,79560,12954) AND `event`=8;
-DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+111 AND `event`=8;
-INSERT INTO `game_event_creature` (`guid`,`event`) VALUES
-/*(@GUID+0,8),(@GUID+1,8),(@GUID+2,8),*/(@GUID+3,8),(@GUID+4,8),
-(@GUID+5,8),(@GUID+6,8),(@GUID+7,8),(@GUID+8,8),(@GUID+9,8),
-(@GUID+10,8),(@GUID+11,8),(@GUID+12,8),(@GUID+13,8),(@GUID+14,8),
-(@GUID+15,8),(@GUID+16,8),(@GUID+17,8),(@GUID+18,8),(@GUID+19,8),
-(@GUID+20,8),(@GUID+21,8),(@GUID+22,8),(@GUID+23,8),(@GUID+24,8),
-(@GUID+25,8),(@GUID+26,8),(@GUID+27,8),(@GUID+28,8),(@GUID+29,8),
-(@GUID+30,8),(@GUID+31,8),(@GUID+32,8),(@GUID+33,8),(@GUID+34,8),
-(@GUID+35,8),(@GUID+36,8),(@GUID+37,8),(@GUID+38,8),(@GUID+39,8),
-(@GUID+40,8),(@GUID+41,8),(@GUID+42,8),(@GUID+43,8),(@GUID+44,8),
-(@GUID+45,8),(@GUID+46,8),(@GUID+47,8),(@GUID+48,8),(@GUID+49,8),
-(@GUID+50,8),(@GUID+51,8),(@GUID+52,8),(@GUID+53,8),(@GUID+54,8),
-(@GUID+55,8),(@GUID+56,8),(@GUID+57,8),(@GUID+58,8),(@GUID+59,8),
-(@GUID+60,8),(@GUID+61,8),(@GUID+62,8),(@GUID+63,8),(@GUID+64,8),
-(@GUID+65,8),(@GUID+66,8),(@GUID+67,8),(@GUID+68,8),(@GUID+69,8),
-(@GUID+70,8),(@GUID+71,8),(@GUID+72,8),(@GUID+73,8),(@GUID+74,8),
-(@GUID+75,8),(@GUID+76,8),(@GUID+77,8),(@GUID+78,8),(@GUID+79,8),
-(@GUID+80,8),(@GUID+81,8),(@GUID+82,8),(@GUID+83,8),(@GUID+84,8),
-(@GUID+85,8),(@GUID+86,8),(@GUID+87,8),(@GUID+88,8),(@GUID+89,8),
-(@GUID+90,8),(@GUID+91,8),(@GUID+92,8),(@GUID+93,8),(@GUID+94,8),
-(@GUID+95,8),(@GUID+96,8),(@GUID+97,8),(@GUID+98,8),(@GUID+99,8),
-(@GUID+100,8),(@GUID+101,8),(@GUID+102,8),(@GUID+103,8),
-(@GUID+104,8),(@GUID+105,8),(@GUID+106,8),(@GUID+107,8),
-(@GUID+108,8),(@GUID+109,8),(@GUID+110,8),(@GUID+111,8);
-
-DELETE FROM `creature_addon` WHERE `guid` IN (@GUID+56,@GUID+57);
-INSERT INTO `creature_addon`(`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
-(@GUID+56,0,0,0,0,0, '68946 0'),
-(@GUID+57,0,0,0,0,0, '68589 0');
-
-SET @GUID:= 151771; -- gameobject.guid
-DELETE FROM `gameobject` WHERE `id`=201716;
-INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`animprogress`,`state`) VALUES
-(@GUID+00,201716,571,1,1,5525.21,35.5649,148.918,0.00558376,180,0,0,0,1,100,1),
-(@GUID+01,201716,571,1,1,5586.44,36.157,148.304,2.49451,180,0,0,0,1,100,1),
-(@GUID+02,201716,571,1,1,5610.19,67.2452,149.648,1.10907,180,0,0,0,1,100,1),
-(@GUID+03,201716,0,1,1,-51.7072,1147.06,66.2442,6.0002,180,0,0,0,1,100,1),
-(@GUID+04,201716,0,1,1,-9462.46,525.975,55.3952,4.44641,180,0,0,0,1,100,1),
-(@GUID+05,201716,1,1,1,1269.73,-4095.83,27.2461,0.383236,180,0,0,0,1,100,1),
-(@GUID+06,201716,530,1,1,-1800.57,4849.58,3.67941,0.732729,180,0,0,0,1,100,1),
-(@GUID+07,201716,1,1,1,4851.07,137.164,52.3573,3.32611,180,0,0,0,1,100,1),
-(@GUID+08,201716,0,1,1,121.643,-2401.57,123.532,1.69738,180,0,0,0,1,100,1),
-(@GUID+09,201716,1,1,1,-3418.81,-4212.7,10.3292,0.932394,180,0,0,0,1,100,1),
-(@GUID+10,201716,0,1,1,-402.274,163.143,75.6627,3.65071,180,0,0,0,1,100,1),
-(@GUID+11,201716,1,1,1,6767.76,-4880.77,776.832,0.473977,180,0,0,0,1,100,1);
-
--- Game_event_linking
-DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+11 AND `event`=8;
-INSERT INTO `game_event_gameobject` (`guid`,`event`) VALUES
-(@GUID+0,8),(@GUID+1,8),(@GUID+2,8),(@GUID+3,8),(@GUID+4,8),
-(@GUID+5,8),(@GUID+6,8),(@GUID+7,8),(@GUID+8,8),(@GUID+9,8),
-(@GUID+10,8),(@GUID+11,8);
-
--- remove Love Tokens from innkeepers
-DELETE FROM `npc_vendor` WHERE `item`=21815;
-
--- Update Quests
-UPDATE `quest_template` SET `MaxLevel`=13 WHERE `entry` IN (24638,24658);
-UPDATE `quest_template` SET `MaxLevel`=22 WHERE `entry` IN (24659,24645);
-UPDATE `quest_template` SET `MaxLevel`=31 WHERE `entry` IN (24660,24647);
-UPDATE `quest_template` SET `MaxLevel`=40 WHERE `entry` IN (24662,24648);
-UPDATE `quest_template` SET `MaxLevel`=50 WHERE `entry` IN (24663,24649);
-UPDATE `quest_template` SET `MaxLevel`=60 WHERE `entry` IN (24664,24650);
-UPDATE `quest_template` SET `MaxLevel`=70 WHERE `entry` IN (24665,24651);
-UPDATE `quest_template` SET `MaxLevel`=80 WHERE `entry` IN (24666,24652);
-
--- Other Data
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14 WHERE `entry` IN (38032,37214,37917,37984,38006,38016,38023,38030);
-UPDATE `creature_template` SET `faction_A`=16,`faction_H`=16 WHERE `entry` IN (36296,36272,36568);
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|1 WHERE `entry` IN (36272,36296,36565); -- Shadowfang Keep bosses
--- Missing questrelations
-DELETE FROM `creature_questrelation` WHERE `id` IN (38066,37887,38041,38043,38066,38208) AND `quest` IN (24666,24597,24609,24615,24792,14488);
-INSERT INTO `creature_questrelation`(`id`,`quest`) VALUES
-(38066,24666),
-(37887,24597),
-(38041,24609),
-(38043,24615),
-(38066,24792),
-(38208,14488);
-DELETE FROM `creature_involvedrelation` WHERE `id` IN (38066,29611,2784,38208,36296) AND `quest` IN (24666,24597,24609,24792,14488);
-INSERT INTO `creature_involvedrelation`(`id`,`quest`) VALUES
-(38066,24666),
-(29611,24597),
-(2784,24609),
-(38208,24792),
-(36296,14488);
-
-UPDATE `creature_template` SET `npcflag`=npcflag|2 WHERE `name`='Kwee Q. Peddlefeet'; -- 9 entries that should be questgivers
--- Set correct thrall id for quest A Gift for the Warchief
-UPDATE `creature_involvedrelation` SET `id`=4949 WHERE `quest`=24612;
-
--- Loots
-UPDATE `creature_template` SET `lootid`=36296 WHERE `entry`=36296;
-DELETE FROM `creature_loot_template` WHERE `entry`=36296;
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) values
--- Apothecary Hummel
-(36296,1,100,1,0,-50010,1),  -- 1 from reference_epics
-(36296,2,15,1,0,-50011,1), -- 1 from reference_blues
-(36296,50320,10,1,0,1,1), -- Faded Lovely Greeting Card Ally
-(36296,49641,10,1,0,1,1), -- Faded Lovely Greeting Card Horde
-(36296,50250,0.1,1,0,1,1); -- Big Love Rocket 
-DELETE FROM `reference_loot_template` WHERE `entry` IN (50010,50011,50012);
-INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(50010,51806,0,1,1,1,1), -- Shard of Pirouetting Happiness
-(50010,51808,0,1,1,1,1), -- Choker of the Pure Heart
-(50010,51805,0,1,1,1,1), -- Heartbreak Charm
-(50010,51807,0,1,1,1,1), -- Sweet Perfume Broach
-(50010,51804,0,1,1,1,1), -- Winking Eye of Love
-(50011,50471,0,1,1,1,1), -- The Heartbreaker 
-(50011,50741,0,1,1,1,1), -- Vile Fumigator's Mask
-(50011,50446,0,1,1,1,1), -- Toxic Wasteling
-(50011,49715,0,1,1,1,1), -- Forever-Lovely Rose
--- Box of Chocolates_Reference
-(50012,22237,0,1,1,1,1), -- Dark Desire
-(50012,22239,0,1,1,1,1), -- Sweet Surprise
-(50012,22238,0,1,1,1,1), -- Very Berry Cream
-(50012,22236,0,1,1,1,1); -- Buttermilk Delight
-
-DELETE FROM `item_loot_template` WHERE `entry` IN (49631,49909,50160,50161); 
-INSERT INTO `item_loot_template`(`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
--- Standard Apothecary Serving Kit
-(49631,49352,100,1,0,1,1), 
-(49631,49351,100,1,0,1,1),
-(49631,49635,100,1,0,1,1),
--- Box of Chocolates
-(49909,1,100,1,0,-50012,6), -- always 6 chocolates inside the box (out of 4 kinds)
--- Lovely Dress Box
-(50160,22276,0,1,1,1,1), -- Lovely Red Dress
-(50160,22278,0,1,1,1,1), -- Lovely Blue Dress
-(50160,22279,0,1,1,1,1), -- Lovely Black Dress
-(50160,22280,0,1,1,1,1), -- Lovely Purple Dress
--- Loot for Dinner Suit Box
-(50161,22281,0,1,1,1,1), -- Blue Dinner Suit
-(50161,22282,0,1,1,1,1), -- Purple Dinner Suit
-(50161,22277,0,1,1,1,1); -- Red Dinner Suit
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceGroup`=36296 AND `SourceEntry` IN (49641,50320);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
-(1,36296,49641,0,6,67,0,0,0, 'Faded Lovely Greeting Card Horde'),
-(1,36296,50320,0,6,469,0,0,0, 'Faded Lovely Greeting Card Ally');
-
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12846 AND `type` in (16,18);
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=12859 AND `type` in (5,15,18);
-INSERT INTO `achievement_criteria_data`(`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES 
--- Set correct data for achievement Charming
-(12846,16,335,0, ''),
--- Set correct data for achievement Flirt With Disaster (alliance)
-(12859,5,26682,0, ''),
-(12859,15,3,0, '');
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_creature_template.sql b/sql/old/3.3.5a/2011_02_15_3_world_creature_template.sql
deleted file mode 100644
index cc892b30bf9..00000000000
--- a/sql/old/3.3.5a/2011_02_15_3_world_creature_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`exp`=2,`unit_class`=1,`faction_A`=16,`faction_H`=16,`baseattacktime`=2000,`unit_flags`=33280,`speed_run`=0.9920629 WHERE `entry`=38494; -- Rotting Frost Giant
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_creature_text.sql b/sql/old/3.3.5a/2011_02_15_3_world_creature_text.sql
deleted file mode 100644
index 6642afba9b7..00000000000
--- a/sql/old/3.3.5a/2011_02_15_3_world_creature_text.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `creature_text` WHERE `entry` IN (38490,38494);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(38490,0,0, '$n is infected with the Death Plague!',3,0,100,25,0,0, 'Rotting Frost Giant - Death Plague'),
-(38494,0,0, '$n is infected with the Death Plague!',3,0,100,25,0,0, 'Rotting Frost Giant - Death Plague');
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql b/sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql
deleted file mode 100644
index ec7c4f3d483..00000000000
--- a/sql/old/3.3.5a/2011_02_15_3_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_rotting_frost_giant' WHERE `entry` IN (38490,38494);
diff --git a/sql/old/3.3.5a/2011_02_15_3_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_15_3_world_spell_script_names.sql
deleted file mode 100644
index 85c9a11fd50..00000000000
--- a/sql/old/3.3.5a/2011_02_15_3_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_frost_giant_death_plague';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(72864,'spell_frost_giant_death_plague');
diff --git a/sql/old/3.3.5a/2011_02_15_4_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_15_4_world_spell_linked_spell.sql
deleted file mode 100644
index 41cfff3fab9..00000000000
--- a/sql/old/3.3.5a/2011_02_15_4_world_spell_linked_spell.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=70117;
diff --git a/sql/old/3.3.5a/2011_02_15_4_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_15_4_world_spell_script_names.sql
deleted file mode 100644
index c066aad3b8b..00000000000
--- a/sql/old/3.3.5a/2011_02_15_4_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_icy_grip';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(70117,'spell_sindragosa_icy_grip');
diff --git a/sql/old/3.3.5a/2011_02_16_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_16_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..e41542c3316
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_16_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=70117 AND `ScriptName`='spell_sindragosa_collision_filter';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70117,'spell_sindragosa_collision_filter');
diff --git a/sql/old/3.3.5a/2011_02_16_01_world_conditions.sql b/sql/old/3.3.5a/2011_02_16_01_world_conditions.sql
new file mode 100644
index 00000000000..e42fd4006e4
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_16_01_world_conditions.sql
@@ -0,0 +1,4 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (70360,72527);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,70360,0,18,1,37690,0,0, '', 'Mutated Abomination - Eat Ooze target'),
+(13,0,72527,0,18,1,37690,0,0, '', 'Mutated Abomination - Eat Ooze target');
diff --git a/sql/old/3.3.5a/2011_02_16_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_16_0_world_spell_script_names.sql
deleted file mode 100644
index e41542c3316..00000000000
--- a/sql/old/3.3.5a/2011_02_16_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=70117 AND `ScriptName`='spell_sindragosa_collision_filter';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(70117,'spell_sindragosa_collision_filter');
diff --git a/sql/old/3.3.5a/2011_02_16_1_world_conditions.sql b/sql/old/3.3.5a/2011_02_16_1_world_conditions.sql
deleted file mode 100644
index e42fd4006e4..00000000000
--- a/sql/old/3.3.5a/2011_02_16_1_world_conditions.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (70360,72527);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,70360,0,18,1,37690,0,0, '', 'Mutated Abomination - Eat Ooze target'),
-(13,0,72527,0,18,1,37690,0,0, '', 'Mutated Abomination - Eat Ooze target');
diff --git a/sql/old/3.3.5a/2011_02_18_00_world_creature.sql b/sql/old/3.3.5a/2011_02_18_00_world_creature.sql
new file mode 100644
index 00000000000..4f07781a267
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_00_world_creature.sql
@@ -0,0 +1,6 @@
+SET @GUID := 137743;
+DELETE FROM `creature` WHERE `id` IN (38471,38501,38551);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+0,38471,631,15,1,0,0,-504.949,2184.24,62.3048,0.450047,86400,0,0,0,0,0,0,0,0,0),
+(@GUID+1,38501,631,15,1,0,0,4247.040,2753.25,348.996,0.227759,86400,0,0,0,0,0,0,0,0,0),
+(@GUID+2,38551,631,15,1,0,0,4466.260,2787.99,348.954,3.349720,86400,0,0,0,0,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2011_02_18_00_world_creature_text.sql b/sql/old/3.3.5a/2011_02_18_00_world_creature_text.sql
new file mode 100644
index 00000000000..39d46f15fef
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_00_world_creature_text.sql
@@ -0,0 +1,6 @@
+DELETE FROM `creature_text` WHERE `entry` IN (38472,38485);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(38472,0,0, 'Die, intruders! None shall interfere with the Cult''s plans!',1,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_AGGRO'),
+(38472,1,0, 'Wh- where am I...? What a nightmare I have had... But this is no time to reflect, I have much information to report!',0,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_RESCUED'),
+(38485,0,0, 'Die, intruders! None shall interfere with the Cult''s plans!',1,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_AGGRO'),
+(38485,1,0, 'Wh- where am I...? What a nightmare I have had... But this is no time to reflect, I have much information to report!',0,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_RESCUED');
diff --git a/sql/old/3.3.5a/2011_02_18_00_world_pool_quest.sql b/sql/old/3.3.5a/2011_02_18_00_world_pool_quest.sql
new file mode 100644
index 00000000000..6c386e8b77b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_00_world_pool_quest.sql
@@ -0,0 +1,28 @@
+-- ICC Quest pools (also deletes old pool data)
+SET @pool := 5662;
+DELETE FROM `pool_quest` WHERE `pool_entry` BETWEEN @pool+17 AND @pool+22;
+INSERT INTO `pool_quest` (`entry`,`pool_entry`,`description`) VALUES
+(24874,@pool+17, 'Blood Quickening (10)'),
+(24869,@pool+17, 'Deprogramming (10)'),
+(24873,@pool+17, 'Residue Rendezvous (10)'),
+(24872,@pool+17, 'Respite for a Tormented Soul (10)'),
+(24870,@pool+19, 'Securing the Ramparts HORDE (10)'),
+(24871,@pool+19, 'Securing the Ramparts ALLY (10)'),
+(24879,@pool+18, 'Blood Quickening (25)'),
+(24875,@pool+18, 'Deprogramming (25)'),
+(24878,@pool+18, 'Residue Rendezvous (25)'),
+(24880,@pool+18, 'Respite for a Tormented Soul (25)'),
+(24876,@pool+20, 'Securing the Ramparts ALLY (25)'),
+(24877,@pool+20, 'Securing the Ramparts HORDE (25)');
+
+DELETE FROM `pool_template` WHERE `entry` BETWEEN @pool+17 AND @pool+22;
+INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
+(@pool+17,1, 'ICC weeklies (10)'),
+(@pool+18,1, 'ICC weeklies (25)'),
+(@pool+19,2, 'Securing the Ramparts (10)'),
+(@pool+20,2, 'Securing the Ramparts (25)');
+
+DELETE FROM `pool_pool` WHERE `mother_pool` IN (@pool+17,@pool+18);
+INSERT INTO `pool_pool` (`pool_id`,`mother_pool`,`chance`,`description`) VALUES
+(@pool+19,@pool+17,0, 'Securing the Ramparts (10)'),
+(@pool+20,@pool+18,0, 'Securing the Ramparts (25)');
diff --git a/sql/old/3.3.5a/2011_02_18_00_world_scriptname.sql b/sql/old/3.3.5a/2011_02_18_00_world_scriptname.sql
new file mode 100644
index 00000000000..3588fe7ae3b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_darnavan' WHERE `entry` IN (38472,38485);
diff --git a/sql/old/3.3.5a/2011_02_18_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_18_00_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..66ceb1b593c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_00_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=65940;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(65940,65941,0, 'Trial of the Crusader: Shattering Throw');
diff --git a/sql/old/3.3.5a/2011_02_18_01_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_18_01_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..5f5fbadfd21
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_01_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-11129;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(-11129,-28682,0, 'Combustion');
diff --git a/sql/old/3.3.5a/2011_02_18_02_world_misc.sql b/sql/old/3.3.5a/2011_02_18_02_world_misc.sql
new file mode 100644
index 00000000000..8e2bc235861
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_02_world_misc.sql
@@ -0,0 +1,36 @@
+-- Jeeves should be a vendor and a banker (to Engineers).
+SET @Jeeves = 35642;
+UPDATE `creature_template` SET `faction_A`=35,`faction_H`=35,`npcflag`=`npcflag`|4225|131072,`unit_flags`=`unit_flags`|768,`gossip_menu_id`=10667,`AIName`='' WHERE `entry`=@Jeeves; -- template updates
+-- Jeeves gets the (player) faction of its summoner, 35 by default
+UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=0,`gender`=2 WHERE `modelid`=30076; -- addon data
+DELETE FROM `creature_template_addon` WHERE `entry`=@Jeeves;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@Jeeves,0,33554432,1,0, '68054 0'); -- Aura: Pressing Engagement, bytes1: hover mode
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10667 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,10667,0,0,7,202,350,0,0, '', 'Jeeves: Bank requires Engineering 350');
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=10667 AND `id` IN (0,1);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`) VALUES
+(10667,0,6,'I would like to check my deposit box.',9,131072), -- banker
+(10667,1,1,'Let me browse your goods.',3,128); -- vendor
+
+DELETE FROM `npc_vendor` WHERE `entry`=@Jeeves;
+INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES
+(@Jeeves,1,41584,0,0,0), -- Frostbite Bullets
+(@Jeeves,2,41586,0,0,0), -- Terrorshaft Arrow
+(@Jeeves,3,44605,0,0,0), -- Wild Spineleaf
+(@Jeeves,4,44614,0,0,0), -- Starleaf Seed
+(@Jeeves,5,44615,0,0,0), -- Devout Candle
+(@Jeeves,6,16583,0,0,0), -- Demonic Figurine
+(@Jeeves,7,21177,0,0,0), -- Symbol of Kings
+(@Jeeves,8,17020,0,0,0), -- Arcane Powder
+(@Jeeves,9,37201,0,0,0), -- Corpse Dust
+(@Jeeves,10,5565,0,0,0), -- Infernal Stone
+(@Jeeves,11,17032,0,0,0), -- Rune of Portals
+(@Jeeves,12,17030,0,0,0), -- Ankh
+(@Jeeves,13,17033,0,0,0), -- Symbol of Divinity
+(@Jeeves,14,17031,0,0,0); -- Rune of Teleportation
+
+DELETE FROM `creature_ai_scripts` WHERE `id`=3564201; -- remove unneed EventAI script
diff --git a/sql/old/3.3.5a/2011_02_18_03_world_loot_template.sql b/sql/old/3.3.5a/2011_02_18_03_world_loot_template.sql
new file mode 100644
index 00000000000..4e9523fa758
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_03_world_loot_template.sql
@@ -0,0 +1,2 @@
+-- Fix wrong loot being dropped by ICC trash
+UPDATE `reference_loot_template` SET `item`=50450 WHERE `item`=50775 AND `entry`=35071;
diff --git a/sql/old/3.3.5a/2011_02_18_04_world_eai.sql b/sql/old/3.3.5a/2011_02_18_04_world_eai.sql
new file mode 100644
index 00000000000..3dd091465ed
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_04_world_eai.sql
@@ -0,0 +1,2 @@
+-- Correction for Obsidian Eradicator EAI
+UPDATE `creature_ai_scripts` SET `action1_param1`=23 WHERE `id`=1526201 AND `creature_id`=15262;
diff --git a/sql/old/3.3.5a/2011_02_18_05_world_sai.sql b/sql/old/3.3.5a/2011_02_18_05_world_sai.sql
new file mode 100644
index 00000000000..e06f5a067c0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_18_05_world_sai.sql
@@ -0,0 +1,80 @@
+-- Bonesunder SAI (Converted from EAI)
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=27006;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=27006;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27006; 
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(27006,0,0,0,0,0,100,0,5000,11000,16000,25000,11,52080,1,0,0,0,0,2,0,0,0,0,0,0,0,'Bonesunder - Cast Bonecrack');
+
+-- Surge Needle Sorcerer SAI
+SET @ELMGUID := 113473;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26257;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26257,-109558,-109559,-109560,-109561,-109563,-109564,-109565,-109569,-109570,-109571,-109572,-109578);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(26257,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109558,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109558,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109558,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109559,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109559,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109559,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109560,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109560,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109560,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109561,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109561,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109561,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109563,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109563,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109563,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109564,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109564,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109564,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109565,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109565,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109565,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109569,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109569,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109569,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109570,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109570,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109570,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109571,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109571,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109571,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109572,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109572,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109572,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
+(-109578,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(-109578,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(-109578,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim');
+
+-- Goramosh SAI
+SET @ELMGUID := 113473;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26349;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26349);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(26349,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
+(26349,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
+(26349,0,2,0,2,0,100,1,0,50,0,0,11,20828,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Cone of Cold on victim at 50% health'),
+(26349,0,3,0,0,0,100,0,3500,3500,3500,3500,11,9672,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Frost Bolt on victim');
+
+-- Arcanimus SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26370;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26370);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(26370,0,0,0,1,0,100,1,2000,2000,2000,2000,45,0,1,0,0,0,0,10,113473,26298,0,0,0,0,0, 'Set data 0 = 1 on bunny 2 sec after reset'),
+(26370,0,1,0,1,0,100,1,0,0,0,0,11,46934,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Add Cosmetic - Arcane Force Shield (Blue x2) Aura on spawn & reset'),
+(26370,0,2,3,4,0,100,0,0,0,0,0,28,46934,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Remove Cosmetic - Arcane Force Shield (Blue x2) Aura on aggro'),
+(26370,0,3,0,61,0,100,0,0,0,0,0,28,46906,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Remove Cosmetic - Surge Needle Beam on aggro'),
+(26370,0,4,0,2,0,100,1,71,80,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 80% health cast Arcane Explosion on self'),
+(26370,0,5,0,2,0,100,1,41,60,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 60% health cast Arcane Explosion on self'),
+(26370,0,6,0,2,0,100,1,21,40,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 40% health cast Arcane Explosion on self'),
+(26370,0,7,0,2,0,100,1,1,20,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 20% health cast Arcane Explosion on self');
+
+-- ELM General Purpose Bunny (scale x0.01) Large SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26298;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-113473);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(-113473,0,0,0,11,0,100,0,0,0,0,0,11,32566,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Purple Banish State aura on self when spawned'),
+(-113473,0,1,2,38,0,100,0,0,1,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'reset data 0 = 0'),
+(-113473,0,2,0,61,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,96298,26370,0,0,0,0,0, 'cast Surge Needle Beam on Arcanimus');
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_creature.sql b/sql/old/3.3.5a/2011_02_18_0_world_creature.sql
deleted file mode 100644
index 4f07781a267..00000000000
--- a/sql/old/3.3.5a/2011_02_18_0_world_creature.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SET @GUID := 137743;
-DELETE FROM `creature` WHERE `id` IN (38471,38501,38551);
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
-(@GUID+0,38471,631,15,1,0,0,-504.949,2184.24,62.3048,0.450047,86400,0,0,0,0,0,0,0,0,0),
-(@GUID+1,38501,631,15,1,0,0,4247.040,2753.25,348.996,0.227759,86400,0,0,0,0,0,0,0,0,0),
-(@GUID+2,38551,631,15,1,0,0,4466.260,2787.99,348.954,3.349720,86400,0,0,0,0,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_creature_text.sql b/sql/old/3.3.5a/2011_02_18_0_world_creature_text.sql
deleted file mode 100644
index 39d46f15fef..00000000000
--- a/sql/old/3.3.5a/2011_02_18_0_world_creature_text.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM `creature_text` WHERE `entry` IN (38472,38485);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(38472,0,0, 'Die, intruders! None shall interfere with the Cult''s plans!',1,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_AGGRO'),
-(38472,1,0, 'Wh- where am I...? What a nightmare I have had... But this is no time to reflect, I have much information to report!',0,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_RESCUED'),
-(38485,0,0, 'Die, intruders! None shall interfere with the Cult''s plans!',1,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_AGGRO'),
-(38485,1,0, 'Wh- where am I...? What a nightmare I have had... But this is no time to reflect, I have much information to report!',0,0,0,0,0,0, 'Darnavan - SAY_DARNAVAN_RESCUED');
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql b/sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql
deleted file mode 100644
index 6c386e8b77b..00000000000
--- a/sql/old/3.3.5a/2011_02_18_0_world_pool_quest.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- ICC Quest pools (also deletes old pool data)
-SET @pool := 5662;
-DELETE FROM `pool_quest` WHERE `pool_entry` BETWEEN @pool+17 AND @pool+22;
-INSERT INTO `pool_quest` (`entry`,`pool_entry`,`description`) VALUES
-(24874,@pool+17, 'Blood Quickening (10)'),
-(24869,@pool+17, 'Deprogramming (10)'),
-(24873,@pool+17, 'Residue Rendezvous (10)'),
-(24872,@pool+17, 'Respite for a Tormented Soul (10)'),
-(24870,@pool+19, 'Securing the Ramparts HORDE (10)'),
-(24871,@pool+19, 'Securing the Ramparts ALLY (10)'),
-(24879,@pool+18, 'Blood Quickening (25)'),
-(24875,@pool+18, 'Deprogramming (25)'),
-(24878,@pool+18, 'Residue Rendezvous (25)'),
-(24880,@pool+18, 'Respite for a Tormented Soul (25)'),
-(24876,@pool+20, 'Securing the Ramparts ALLY (25)'),
-(24877,@pool+20, 'Securing the Ramparts HORDE (25)');
-
-DELETE FROM `pool_template` WHERE `entry` BETWEEN @pool+17 AND @pool+22;
-INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
-(@pool+17,1, 'ICC weeklies (10)'),
-(@pool+18,1, 'ICC weeklies (25)'),
-(@pool+19,2, 'Securing the Ramparts (10)'),
-(@pool+20,2, 'Securing the Ramparts (25)');
-
-DELETE FROM `pool_pool` WHERE `mother_pool` IN (@pool+17,@pool+18);
-INSERT INTO `pool_pool` (`pool_id`,`mother_pool`,`chance`,`description`) VALUES
-(@pool+19,@pool+17,0, 'Securing the Ramparts (10)'),
-(@pool+20,@pool+18,0, 'Securing the Ramparts (25)');
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql
deleted file mode 100644
index 3588fe7ae3b..00000000000
--- a/sql/old/3.3.5a/2011_02_18_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_darnavan' WHERE `entry` IN (38472,38485);
diff --git a/sql/old/3.3.5a/2011_02_18_0_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_18_0_world_spell_linked_spell.sql
deleted file mode 100644
index 66ceb1b593c..00000000000
--- a/sql/old/3.3.5a/2011_02_18_0_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=65940;
-INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
-(65940,65941,0, 'Trial of the Crusader: Shattering Throw');
diff --git a/sql/old/3.3.5a/2011_02_18_1_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_18_1_world_spell_linked_spell.sql
deleted file mode 100644
index 5f5fbadfd21..00000000000
--- a/sql/old/3.3.5a/2011_02_18_1_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-11129;
-INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
-(-11129,-28682,0, 'Combustion');
diff --git a/sql/old/3.3.5a/2011_02_18_2_world_misc.sql b/sql/old/3.3.5a/2011_02_18_2_world_misc.sql
deleted file mode 100644
index 8e2bc235861..00000000000
--- a/sql/old/3.3.5a/2011_02_18_2_world_misc.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Jeeves should be a vendor and a banker (to Engineers).
-SET @Jeeves = 35642;
-UPDATE `creature_template` SET `faction_A`=35,`faction_H`=35,`npcflag`=`npcflag`|4225|131072,`unit_flags`=`unit_flags`|768,`gossip_menu_id`=10667,`AIName`='' WHERE `entry`=@Jeeves; -- template updates
--- Jeeves gets the (player) faction of its summoner, 35 by default
-UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=0,`gender`=2 WHERE `modelid`=30076; -- addon data
-DELETE FROM `creature_template_addon` WHERE `entry`=@Jeeves;
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(@Jeeves,0,33554432,1,0, '68054 0'); -- Aura: Pressing Engagement, bytes1: hover mode
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10667 AND `SourceEntry`=0;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,10667,0,0,7,202,350,0,0, '', 'Jeeves: Bank requires Engineering 350');
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id`=10667 AND `id` IN (0,1);
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`) VALUES
-(10667,0,6,'I would like to check my deposit box.',9,131072), -- banker
-(10667,1,1,'Let me browse your goods.',3,128); -- vendor
-
-DELETE FROM `npc_vendor` WHERE `entry`=@Jeeves;
-INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES
-(@Jeeves,1,41584,0,0,0), -- Frostbite Bullets
-(@Jeeves,2,41586,0,0,0), -- Terrorshaft Arrow
-(@Jeeves,3,44605,0,0,0), -- Wild Spineleaf
-(@Jeeves,4,44614,0,0,0), -- Starleaf Seed
-(@Jeeves,5,44615,0,0,0), -- Devout Candle
-(@Jeeves,6,16583,0,0,0), -- Demonic Figurine
-(@Jeeves,7,21177,0,0,0), -- Symbol of Kings
-(@Jeeves,8,17020,0,0,0), -- Arcane Powder
-(@Jeeves,9,37201,0,0,0), -- Corpse Dust
-(@Jeeves,10,5565,0,0,0), -- Infernal Stone
-(@Jeeves,11,17032,0,0,0), -- Rune of Portals
-(@Jeeves,12,17030,0,0,0), -- Ankh
-(@Jeeves,13,17033,0,0,0), -- Symbol of Divinity
-(@Jeeves,14,17031,0,0,0); -- Rune of Teleportation
-
-DELETE FROM `creature_ai_scripts` WHERE `id`=3564201; -- remove unneed EventAI script
diff --git a/sql/old/3.3.5a/2011_02_18_3_world_loot_template.sql b/sql/old/3.3.5a/2011_02_18_3_world_loot_template.sql
deleted file mode 100644
index 4e9523fa758..00000000000
--- a/sql/old/3.3.5a/2011_02_18_3_world_loot_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fix wrong loot being dropped by ICC trash
-UPDATE `reference_loot_template` SET `item`=50450 WHERE `item`=50775 AND `entry`=35071;
diff --git a/sql/old/3.3.5a/2011_02_18_4_world_eai.sql b/sql/old/3.3.5a/2011_02_18_4_world_eai.sql
deleted file mode 100644
index 3dd091465ed..00000000000
--- a/sql/old/3.3.5a/2011_02_18_4_world_eai.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Correction for Obsidian Eradicator EAI
-UPDATE `creature_ai_scripts` SET `action1_param1`=23 WHERE `id`=1526201 AND `creature_id`=15262;
diff --git a/sql/old/3.3.5a/2011_02_18_5_world_sai.sql b/sql/old/3.3.5a/2011_02_18_5_world_sai.sql
deleted file mode 100644
index e06f5a067c0..00000000000
--- a/sql/old/3.3.5a/2011_02_18_5_world_sai.sql
+++ /dev/null
@@ -1,80 +0,0 @@
--- Bonesunder SAI (Converted from EAI)
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=27006;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=27006;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27006; 
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(27006,0,0,0,0,0,100,0,5000,11000,16000,25000,11,52080,1,0,0,0,0,2,0,0,0,0,0,0,0,'Bonesunder - Cast Bonecrack');
-
--- Surge Needle Sorcerer SAI
-SET @ELMGUID := 113473;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26257;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26257,-109558,-109559,-109560,-109561,-109563,-109564,-109565,-109569,-109570,-109571,-109572,-109578);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(26257,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109558,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109558,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109558,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109559,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109559,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109559,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109560,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109560,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109560,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109561,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109561,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109561,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109563,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109563,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109563,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109564,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109564,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109564,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109565,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109565,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109565,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109569,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109569,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109569,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109570,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109570,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109570,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109571,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109571,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109571,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109572,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109572,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109572,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim'),
-(-109578,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(-109578,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(-109578,0,2,0,0,0,100,0,3000,4000,3000,5000,11,51797,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcane Blast on victim');
-
--- Goramosh SAI
-SET @ELMGUID := 113473;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26349;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26349);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(26349,0,0,0,1,0,100,1,1000,1000,1000,1000,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when spawned'),
-(26349,0,1,0,21,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,@ELMGUID,26298,0,0,0,0,0,'Cast Surge Needle Beam when reach home'),
-(26349,0,2,0,2,0,100,1,0,50,0,0,11,20828,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Cone of Cold on victim at 50% health'),
-(26349,0,3,0,0,0,100,0,3500,3500,3500,3500,11,9672,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Frost Bolt on victim');
-
--- Arcanimus SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26370;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26370);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(26370,0,0,0,1,0,100,1,2000,2000,2000,2000,45,0,1,0,0,0,0,10,113473,26298,0,0,0,0,0, 'Set data 0 = 1 on bunny 2 sec after reset'),
-(26370,0,1,0,1,0,100,1,0,0,0,0,11,46934,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Add Cosmetic - Arcane Force Shield (Blue x2) Aura on spawn & reset'),
-(26370,0,2,3,4,0,100,0,0,0,0,0,28,46934,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Remove Cosmetic - Arcane Force Shield (Blue x2) Aura on aggro'),
-(26370,0,3,0,61,0,100,0,0,0,0,0,28,46906,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - Remove Cosmetic - Surge Needle Beam on aggro'),
-(26370,0,4,0,2,0,100,1,71,80,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 80% health cast Arcane Explosion on self'),
-(26370,0,5,0,2,0,100,1,41,60,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 60% health cast Arcane Explosion on self'),
-(26370,0,6,0,2,0,100,1,21,40,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 40% health cast Arcane Explosion on self'),
-(26370,0,7,0,2,0,100,1,1,20,0,0,11,51820,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Arcanimus - at 20% health cast Arcane Explosion on self');
-
--- ELM General Purpose Bunny (scale x0.01) Large SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=26298;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-113473);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(-113473,0,0,0,11,0,100,0,0,0,0,0,11,32566,2,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Purple Banish State aura on self when spawned'),
-(-113473,0,1,2,38,0,100,0,0,1,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'reset data 0 = 0'),
-(-113473,0,2,0,61,0,100,0,0,0,0,0,11,46906,2,0,0,0,0,10,96298,26370,0,0,0,0,0, 'cast Surge Needle Beam on Arcanimus');
diff --git a/sql/old/3.3.5a/2011_02_19_00_world_conditions.sql b/sql/old/3.3.5a/2011_02_19_00_world_conditions.sql
new file mode 100644
index 00000000000..23ca7bb5766
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_00_world_conditions.sql
@@ -0,0 +1,4 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (72155,72162);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,72155,0,18,1,0,0,0, '', 'Harvest Blight Specimen - player target'),
+(13,0,72162,0,18,1,0,0,0, '', 'Harvest Blight Specimen - player target');
diff --git a/sql/old/3.3.5a/2011_02_19_00_world_creature_template.sql b/sql/old/3.3.5a/2011_02_19_00_world_creature_template.sql
new file mode 100644
index 00000000000..edfa570115a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_00_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `difficulty_entry_1`=38717 WHERE `entry`=38501;
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`exp`=2,`unit_class`=1,`faction_A`=2070,`faction_H`=2070,`npcflag`=2,`dynamicflags`=8,`unit_flags`=33280,`unit_class`=8 WHERE `entry`=38717; -- Alchemist Adrianna (1)
diff --git a/sql/old/3.3.5a/2011_02_19_00_world_scriptname.sql b/sql/old/3.3.5a/2011_02_19_00_world_scriptname.sql
new file mode 100644
index 00000000000..4901cb763ae
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_alchemist_adrianna' WHERE `entry`=38501;
diff --git a/sql/old/3.3.5a/2011_02_19_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_19_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..709344ae76d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_00_world_spell_script_names.sql
@@ -0,0 +1,22 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_icc_harvest_blight_specimen';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_festergut_gaseous_blight';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rotface_slime_spray';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(72155,'spell_icc_harvest_blight_specimen'),
+(72162,'spell_icc_harvest_blight_specimen'),
+(69159,'spell_festergut_gaseous_blight'),
+(70135,'spell_festergut_gaseous_blight'),
+(70136,'spell_festergut_gaseous_blight'),
+(70137,'spell_festergut_gaseous_blight'),
+(69161,'spell_festergut_gaseous_blight'),
+(70138,'spell_festergut_gaseous_blight'),
+(70139,'spell_festergut_gaseous_blight'),
+(70140,'spell_festergut_gaseous_blight'),
+(69163,'spell_festergut_gaseous_blight'),
+(70468,'spell_festergut_gaseous_blight'),
+(70469,'spell_festergut_gaseous_blight'),
+(70470,'spell_festergut_gaseous_blight'),
+(69507,'spell_rotface_slime_spray'),
+(71213,'spell_rotface_slime_spray'),
+(73189,'spell_rotface_slime_spray'),
+(73190,'spell_rotface_slime_spray');
diff --git a/sql/old/3.3.5a/2011_02_19_01_world_instance_icecrown_citadel.sql b/sql/old/3.3.5a/2011_02_19_01_world_instance_icecrown_citadel.sql
new file mode 100644
index 00000000000..1c42bfdb544
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_19_01_world_instance_icecrown_citadel.sql
@@ -0,0 +1,109 @@
+-- delete custom templates
+DELETE FROM `creature_template` WHERE `entry` IN (3678902,3678903,3712602,3712603,3712702,3712703,3713202,3713203,3713302,3713303,3713402,3713403,3812501,3812502,3812503);
+DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (3678902,3678903,3712602,3712603);
+DELETE FROM `creature_loot_template` WHERE `entry` IN (3712602,3712603);
+
+-- Spire Frostwyrm
+UPDATE `creature` SET `spawnMask`=15 WHERE `id`=37528;
+
+-- equip templates
+SET @EQUIP := 2422;
+DELETE FROM `creature_equip_template` WHERE `entry`=@EQUIP;
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EQUIP,39381,0,45872);
+
+-- creature template updates
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36789; -- Valithria Dreamwalker
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37126; -- Sister Svalna
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37127; -- Ymirjar Frostbinder
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37132; -- Ymirjar Battle-Maiden
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37133; -- Ymirjar Warlord
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37134; -- Ymirjar Huntress
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38125; -- Ymirjar Deathbringer
+UPDATE `creature_template` SET `minlevel`=83,`maxlevel`=83,`unit_class`=1,`faction_A`=1665,`faction_H`=1665,`unit_flags`=0x20000000,`baseattacktime`=2000,`scale`=1,`RegenHealth`=0 WHERE `entry` IN (36789,38174); -- Valithria Dreamwalker
+UPDATE `creature_template` SET `minlevel`=81,`maxlevel`=81,`unit_class`=2,`faction_A`=16,`faction_H`=16,`unit_flags`=0,`baseattacktime`=2000,`scale`=1 WHERE `entry` IN (37868,38167,38725,38735); -- Risen Archmage
+UPDATE `creature_template` SET `minlevel`=60,`maxlevel`=60,`unit_class`=1,`faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`baseattacktime`=2000,`scale`=1 WHERE `entry`=38752; -- Green Dragon Combat Trigger
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x0040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=10084,`scale`=1,`speed_run`=2.285714,`speed_walk`=1.6,`InhabitType`=7 WHERE `entry` IN (37126,38258); -- Sister Svalna
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=8,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=93,`scale`=1 WHERE `entry` IN (37127,38126); -- Ymirjar Frostbinder
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=10128,`scale`=1,`speed_walk`=1.2 WHERE `entry` IN (37132,38132); -- Ymirjar Battle-Maiden
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=358,`scale`=1,`speed_run`=1.428571 WHERE `entry` IN (37133,38133); -- Ymirjar Warlord
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=@EQUIP,`scale`=1,`speed_run`=1.285714 WHERE `entry` IN (37134,38131); -- Ymirjar Huntress
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8000,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=93,`scale`=1 WHERE `entry` IN (38125,38130); -- Ymirjar Deathbringer
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`baseattacktime`=2000,`scale`=1 WHERE `entry`=38154; -- Warhawk
+
+-- model updates
+UPDATE `creature_model_info` SET `bounding_radius`=2,`combat_reach`=20,`gender`=2 WHERE `modelid`=30318; -- Valithria Dreamwalker
+UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=7919; -- Risen Archmage
+UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=12,`gender`=1 WHERE `modelid`=30521; -- Sister Svalna
+UPDATE `creature_model_info` SET `bounding_radius`=0.403,`combat_reach`=1.3,`gender`=1 WHERE `modelid`=27548; -- Ymirjar Frostbinder
+UPDATE `creature_model_info` SET `bounding_radius`=0.403,`gender`=1 WHERE `modelid`=27549; -- Ymirjar Battle-Maiden
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1.5, `gender`=0 WHERE `modelid`=26623; -- Ymirjar Warlord
+UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=1,`gender`=1 WHERE `modelid`=25771; -- Ymirjar Warlord
+UPDATE `creature_model_info` SET `bounding_radius`=0.403,`combat_reach`=1.3, `gender`=1 WHERE `modelid`=27548; -- Ymirjar Deathbringer
+
+-- Gunship Armory (delete wrong spawn)
+DELETE FROM `gameobject` WHERE `id`=202178;
+
+-- Mode specific objects (instance portal) reused deleted guids
+DELETE FROM `gameobject` WHERE `id` IN (202315,202316,202317,202318);
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES 
+(150308,202318,631,5,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
+(150310,202316,631,10,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
+(150321,202317,631,5,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
+(150326,202315,631,10,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1);
+
+UPDATE `gameobject_template` SET `faction`=114,`flags`=0x00000020 WHERE entry IN (202181,202182,202183,201919,201920);
+UPDATE `gameobject` SET `state`=0,animprogress=255 WHERE `id` IN (202181,202182,202183,201919,201920);
+UPDATE `gameobject` SET `spawnMask`=15 WHERE `id` IN (201825,201583,201374,201911,201880,202211,201777,201772,201774,201771,201814,201816,202220,201811,201812,202079,202223,202235,202242,202243,202244,202245,202246);
+
+SET @GUID := 137746;
+DELETE FROM `creature` WHERE (`position_x` BETWEEN 4330 AND 4380) AND (`position_y` BETWEEN 2470 AND 2650) AND `position_z` > 350;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+37;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+00,36789,631,05,1,0,0,4203.65,2483.89,364.961,5.5152400,604800,0,0,06000003,0,0,0,0,0,0), -- Valithria Dreamwalker
+(@GUID+01,36789,631,10,1,0,0,4203.65,2483.89,364.961,5.5152400,604800,0,0,17999997,0,0,0,0,0,0), -- Valithria Dreamwalker
+(@GUID+02,37868,631,15,1,0,0,4222.86,2504.58,364.960,3.9095400,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+03,37868,631,15,1,0,0,4223.40,2465.11,364.952,2.3911000,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+04,37868,631,15,1,0,0,4230.44,2478.56,364.953,2.9321500,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+05,37868,631,15,1,0,0,4230.53,2490.22,364.957,3.3684900,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
+(@GUID+06,38752,631,15,1,0,0,4203.89,2484.23,364.956,0.0000000,604800,0,0,0,0,0,0,0,0,0), -- Green Dragon Combat Trigger
+(@GUID+07,37126,631,15,1,0,0,4356.71,2484.33,371.531,1.5708000,604800,0,0,0,0,0,0,0,0,0), -- Sister Svalna
+(@GUID+08,37127,631,15,1,0,0,4346.72,2607.90,351.101,3.2342600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Frostbinder
+(@GUID+09,37127,631,15,1,0,0,4371.41,2570.52,351.101,0.0808906,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Frostbinder
+(@GUID+10,37132,631,15,1,0,0,4349.24,2624.60,351.101,1.5592400,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+11,37132,631,15,1,0,0,4365.26,2624.06,351.101,1.6023200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+12,37132,631,15,1,0,0,4347.20,2637.91,351.100,1.3406800,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+13,37132,631,15,1,0,0,4367.90,2638.14,351.100,1.7765700,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+14,37132,631,15,1,0,0,4345.88,2577.64,351.101,1.5299500,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+15,37132,631,15,1,0,0,4368.03,2578.97,351.101,1.6909600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+16,37132,631,15,1,0,0,4369.26,2525.06,358.433,1.7891300,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+17,37132,631,15,1,0,0,4343.78,2525.43,358.433,1.2629100,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
+(@GUID+18,37133,631,15,1,0,0,4366.83,2510.30,358.518,1.6231600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+19,37133,631,15,1,0,0,4356.85,2636.39,351.101,1.5692200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+20,37133,631,15,1,0,0,4346.98,2512.75,358.441,1.3571600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+21,37133,631,15,1,0,0,4356.77,2524.27,358.433,1.5024600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
+(@GUID+22,37134,631,15,1,0,0,4351.66,2642.95,351.100,1.4035100,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+23,37134,631,15,1,0,0,4362.18,2642.97,351.100,1.5331000,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+24,37134,631,15,1,0,0,4363.48,2585.09,351.101,1.5849300,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+25,37134,631,15,1,0,0,4349.36,2584.54,351.101,1.6084900,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+26,37134,631,15,1,0,0,4350.65,2528.31,358.433,1.5299500,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+27,37134,631,15,1,0,0,4362.76,2527.67,358.433,1.4828200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
+(@GUID+28,38125,631,15,1,0,0,4369.75,2606.94,351.101,6.2462700,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Deathbringer
+(@GUID+29,38125,631,15,1,0,0,4340.83,2572.01,351.101,3.1439400,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Deathbringer
+(@GUID+30,38154,631,15,1,0,0,4360.11,2644.49,351.100,1.5880800,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+31,38154,631,15,1,0,0,4355.22,2644.43,351.100,1.5841500,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+32,38154,631,15,1,0,0,4359.36,2587.74,351.101,1.6477600,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+33,38154,631,15,1,0,0,4354.53,2587.01,351.101,1.6438300,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
+(@GUID+34,38229,631,15,1,0,0,4358.06,2608.39,351.184,2.8626600,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
+(@GUID+35,38229,631,15,1,0,0,4351.09,2488.49,358.441,1.9373600,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
+(@GUID+36,38229,631,15,1,0,0,4356.68,2525.39,358.432,1.6956800,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
+(@GUID+37,38229,631,15,1,0,0,4352.72,2610.13,351.101,2.8266300,3600,5,0,0,0,0,1,0,0,0); -- Frozen Insect
+
+-- creature addon
+DELETE FROM `creature_addon` WHERE `guid` IN (131604,@GUID+7,@GUID+18,@GUID+19,@GUID+20,@GUID+21);
+INSERT INTO `creature_addon` (`guid`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@GUID+07,0x3000000,0x0000001,0, '70203 0'), -- Sister Svalna
+(@GUID+18,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
+(@GUID+19,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
+(@GUID+20,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
+(@GUID+21,0x0000000,0x0000001,0, '71244 0'); -- Ymirjar Warlord
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_conditions.sql b/sql/old/3.3.5a/2011_02_19_0_world_conditions.sql
deleted file mode 100644
index 23ca7bb5766..00000000000
--- a/sql/old/3.3.5a/2011_02_19_0_world_conditions.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (72155,72162);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,72155,0,18,1,0,0,0, '', 'Harvest Blight Specimen - player target'),
-(13,0,72162,0,18,1,0,0,0, '', 'Harvest Blight Specimen - player target');
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_creature_template.sql b/sql/old/3.3.5a/2011_02_19_0_world_creature_template.sql
deleted file mode 100644
index edfa570115a..00000000000
--- a/sql/old/3.3.5a/2011_02_19_0_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature_template` SET `difficulty_entry_1`=38717 WHERE `entry`=38501;
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`exp`=2,`unit_class`=1,`faction_A`=2070,`faction_H`=2070,`npcflag`=2,`dynamicflags`=8,`unit_flags`=33280,`unit_class`=8 WHERE `entry`=38717; -- Alchemist Adrianna (1)
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql
deleted file mode 100644
index 4901cb763ae..00000000000
--- a/sql/old/3.3.5a/2011_02_19_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_alchemist_adrianna' WHERE `entry`=38501;
diff --git a/sql/old/3.3.5a/2011_02_19_0_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_19_0_world_spell_script_names.sql
deleted file mode 100644
index 709344ae76d..00000000000
--- a/sql/old/3.3.5a/2011_02_19_0_world_spell_script_names.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_icc_harvest_blight_specimen';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_festergut_gaseous_blight';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rotface_slime_spray';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(72155,'spell_icc_harvest_blight_specimen'),
-(72162,'spell_icc_harvest_blight_specimen'),
-(69159,'spell_festergut_gaseous_blight'),
-(70135,'spell_festergut_gaseous_blight'),
-(70136,'spell_festergut_gaseous_blight'),
-(70137,'spell_festergut_gaseous_blight'),
-(69161,'spell_festergut_gaseous_blight'),
-(70138,'spell_festergut_gaseous_blight'),
-(70139,'spell_festergut_gaseous_blight'),
-(70140,'spell_festergut_gaseous_blight'),
-(69163,'spell_festergut_gaseous_blight'),
-(70468,'spell_festergut_gaseous_blight'),
-(70469,'spell_festergut_gaseous_blight'),
-(70470,'spell_festergut_gaseous_blight'),
-(69507,'spell_rotface_slime_spray'),
-(71213,'spell_rotface_slime_spray'),
-(73189,'spell_rotface_slime_spray'),
-(73190,'spell_rotface_slime_spray');
diff --git a/sql/old/3.3.5a/2011_02_19_1_world_instance_icecrown_citadel.sql b/sql/old/3.3.5a/2011_02_19_1_world_instance_icecrown_citadel.sql
deleted file mode 100644
index 1c42bfdb544..00000000000
--- a/sql/old/3.3.5a/2011_02_19_1_world_instance_icecrown_citadel.sql
+++ /dev/null
@@ -1,109 +0,0 @@
--- delete custom templates
-DELETE FROM `creature_template` WHERE `entry` IN (3678902,3678903,3712602,3712603,3712702,3712703,3713202,3713203,3713302,3713303,3713402,3713403,3812501,3812502,3812503);
-DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (3678902,3678903,3712602,3712603);
-DELETE FROM `creature_loot_template` WHERE `entry` IN (3712602,3712603);
-
--- Spire Frostwyrm
-UPDATE `creature` SET `spawnMask`=15 WHERE `id`=37528;
-
--- equip templates
-SET @EQUIP := 2422;
-DELETE FROM `creature_equip_template` WHERE `entry`=@EQUIP;
-INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
-(@EQUIP,39381,0,45872);
-
--- creature template updates
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36789; -- Valithria Dreamwalker
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37126; -- Sister Svalna
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37127; -- Ymirjar Frostbinder
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37132; -- Ymirjar Battle-Maiden
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37133; -- Ymirjar Warlord
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37134; -- Ymirjar Huntress
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38125; -- Ymirjar Deathbringer
-UPDATE `creature_template` SET `minlevel`=83,`maxlevel`=83,`unit_class`=1,`faction_A`=1665,`faction_H`=1665,`unit_flags`=0x20000000,`baseattacktime`=2000,`scale`=1,`RegenHealth`=0 WHERE `entry` IN (36789,38174); -- Valithria Dreamwalker
-UPDATE `creature_template` SET `minlevel`=81,`maxlevel`=81,`unit_class`=2,`faction_A`=16,`faction_H`=16,`unit_flags`=0,`baseattacktime`=2000,`scale`=1 WHERE `entry` IN (37868,38167,38725,38735); -- Risen Archmage
-UPDATE `creature_template` SET `minlevel`=60,`maxlevel`=60,`unit_class`=1,`faction_A`=14,`faction_H`=14,`unit_flags`=0x2000000,`baseattacktime`=2000,`scale`=1 WHERE `entry`=38752; -- Green Dragon Combat Trigger
-UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x0040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=10084,`scale`=1,`speed_run`=2.285714,`speed_walk`=1.6,`InhabitType`=7 WHERE `entry` IN (37126,38258); -- Sister Svalna
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=8,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=93,`scale`=1 WHERE `entry` IN (37127,38126); -- Ymirjar Frostbinder
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=10128,`scale`=1,`speed_walk`=1.2 WHERE `entry` IN (37132,38132); -- Ymirjar Battle-Maiden
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=358,`scale`=1,`speed_run`=1.428571 WHERE `entry` IN (37133,38133); -- Ymirjar Warlord
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8040,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=@EQUIP,`scale`=1,`speed_run`=1.285714 WHERE `entry` IN (37134,38131); -- Ymirjar Huntress
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=2,`faction_A`=2209,`faction_H`=2209,`unit_flags`=0x8000,`dynamicflags`=8,`baseattacktime`=2000,`equipment_id`=93,`scale`=1 WHERE `entry` IN (38125,38130); -- Ymirjar Deathbringer
-UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`unit_class`=1,`faction_A`=2209,`faction_H`=2209,`baseattacktime`=2000,`scale`=1 WHERE `entry`=38154; -- Warhawk
-
--- model updates
-UPDATE `creature_model_info` SET `bounding_radius`=2,`combat_reach`=20,`gender`=2 WHERE `modelid`=30318; -- Valithria Dreamwalker
-UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=7919; -- Risen Archmage
-UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=12,`gender`=1 WHERE `modelid`=30521; -- Sister Svalna
-UPDATE `creature_model_info` SET `bounding_radius`=0.403,`combat_reach`=1.3,`gender`=1 WHERE `modelid`=27548; -- Ymirjar Frostbinder
-UPDATE `creature_model_info` SET `bounding_radius`=0.403,`gender`=1 WHERE `modelid`=27549; -- Ymirjar Battle-Maiden
-UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1.5, `gender`=0 WHERE `modelid`=26623; -- Ymirjar Warlord
-UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=1,`gender`=1 WHERE `modelid`=25771; -- Ymirjar Warlord
-UPDATE `creature_model_info` SET `bounding_radius`=0.403,`combat_reach`=1.3, `gender`=1 WHERE `modelid`=27548; -- Ymirjar Deathbringer
-
--- Gunship Armory (delete wrong spawn)
-DELETE FROM `gameobject` WHERE `id`=202178;
-
--- Mode specific objects (instance portal) reused deleted guids
-DELETE FROM `gameobject` WHERE `id` IN (202315,202316,202317,202318);
-INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES 
-(150308,202318,631,5,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
-(150310,202316,631,10,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
-(150321,202317,631,5,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1),
-(150326,202315,631,10,1,82.1685,2211.82,33.0959,3.14159,0,0,1,0,6000,100,1);
-
-UPDATE `gameobject_template` SET `faction`=114,`flags`=0x00000020 WHERE entry IN (202181,202182,202183,201919,201920);
-UPDATE `gameobject` SET `state`=0,animprogress=255 WHERE `id` IN (202181,202182,202183,201919,201920);
-UPDATE `gameobject` SET `spawnMask`=15 WHERE `id` IN (201825,201583,201374,201911,201880,202211,201777,201772,201774,201771,201814,201816,202220,201811,201812,202079,202223,202235,202242,202243,202244,202245,202246);
-
-SET @GUID := 137746;
-DELETE FROM `creature` WHERE (`position_x` BETWEEN 4330 AND 4380) AND (`position_y` BETWEEN 2470 AND 2650) AND `position_z` > 350;
-DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+37;
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
-(@GUID+00,36789,631,05,1,0,0,4203.65,2483.89,364.961,5.5152400,604800,0,0,06000003,0,0,0,0,0,0), -- Valithria Dreamwalker
-(@GUID+01,36789,631,10,1,0,0,4203.65,2483.89,364.961,5.5152400,604800,0,0,17999997,0,0,0,0,0,0), -- Valithria Dreamwalker
-(@GUID+02,37868,631,15,1,0,0,4222.86,2504.58,364.960,3.9095400,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
-(@GUID+03,37868,631,15,1,0,0,4223.40,2465.11,364.952,2.3911000,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
-(@GUID+04,37868,631,15,1,0,0,4230.44,2478.56,364.953,2.9321500,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
-(@GUID+05,37868,631,15,1,0,0,4230.53,2490.22,364.957,3.3684900,604800,0,0,0,0,0,0,0,0,0), -- Risen Archmage
-(@GUID+06,38752,631,15,1,0,0,4203.89,2484.23,364.956,0.0000000,604800,0,0,0,0,0,0,0,0,0), -- Green Dragon Combat Trigger
-(@GUID+07,37126,631,15,1,0,0,4356.71,2484.33,371.531,1.5708000,604800,0,0,0,0,0,0,0,0,0), -- Sister Svalna
-(@GUID+08,37127,631,15,1,0,0,4346.72,2607.90,351.101,3.2342600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Frostbinder
-(@GUID+09,37127,631,15,1,0,0,4371.41,2570.52,351.101,0.0808906,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Frostbinder
-(@GUID+10,37132,631,15,1,0,0,4349.24,2624.60,351.101,1.5592400,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+11,37132,631,15,1,0,0,4365.26,2624.06,351.101,1.6023200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+12,37132,631,15,1,0,0,4347.20,2637.91,351.100,1.3406800,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+13,37132,631,15,1,0,0,4367.90,2638.14,351.100,1.7765700,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+14,37132,631,15,1,0,0,4345.88,2577.64,351.101,1.5299500,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+15,37132,631,15,1,0,0,4368.03,2578.97,351.101,1.6909600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+16,37132,631,15,1,0,0,4369.26,2525.06,358.433,1.7891300,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+17,37132,631,15,1,0,0,4343.78,2525.43,358.433,1.2629100,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Battle-Maiden
-(@GUID+18,37133,631,15,1,0,0,4366.83,2510.30,358.518,1.6231600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
-(@GUID+19,37133,631,15,1,0,0,4356.85,2636.39,351.101,1.5692200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
-(@GUID+20,37133,631,15,1,0,0,4346.98,2512.75,358.441,1.3571600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
-(@GUID+21,37133,631,15,1,0,0,4356.77,2524.27,358.433,1.5024600,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Warlord
-(@GUID+22,37134,631,15,1,0,0,4351.66,2642.95,351.100,1.4035100,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
-(@GUID+23,37134,631,15,1,0,0,4362.18,2642.97,351.100,1.5331000,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
-(@GUID+24,37134,631,15,1,0,0,4363.48,2585.09,351.101,1.5849300,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
-(@GUID+25,37134,631,15,1,0,0,4349.36,2584.54,351.101,1.6084900,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
-(@GUID+26,37134,631,15,1,0,0,4350.65,2528.31,358.433,1.5299500,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
-(@GUID+27,37134,631,15,1,0,0,4362.76,2527.67,358.433,1.4828200,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Huntress
-(@GUID+28,38125,631,15,1,0,0,4369.75,2606.94,351.101,6.2462700,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Deathbringer
-(@GUID+29,38125,631,15,1,0,0,4340.83,2572.01,351.101,3.1439400,7200,0,0,0,0,0,0,0,0,0), -- Ymirjar Deathbringer
-(@GUID+30,38154,631,15,1,0,0,4360.11,2644.49,351.100,1.5880800,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
-(@GUID+31,38154,631,15,1,0,0,4355.22,2644.43,351.100,1.5841500,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
-(@GUID+32,38154,631,15,1,0,0,4359.36,2587.74,351.101,1.6477600,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
-(@GUID+33,38154,631,15,1,0,0,4354.53,2587.01,351.101,1.6438300,7200,0,0,0,0,0,0,0,0,0), -- Warhawk
-(@GUID+34,38229,631,15,1,0,0,4358.06,2608.39,351.184,2.8626600,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
-(@GUID+35,38229,631,15,1,0,0,4351.09,2488.49,358.441,1.9373600,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
-(@GUID+36,38229,631,15,1,0,0,4356.68,2525.39,358.432,1.6956800,3600,5,0,0,0,0,1,0,0,0), -- Frozen Insect
-(@GUID+37,38229,631,15,1,0,0,4352.72,2610.13,351.101,2.8266300,3600,5,0,0,0,0,1,0,0,0); -- Frozen Insect
-
--- creature addon
-DELETE FROM `creature_addon` WHERE `guid` IN (131604,@GUID+7,@GUID+18,@GUID+19,@GUID+20,@GUID+21);
-INSERT INTO `creature_addon` (`guid`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(@GUID+07,0x3000000,0x0000001,0, '70203 0'), -- Sister Svalna
-(@GUID+18,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
-(@GUID+19,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
-(@GUID+20,0x0000000,0x0000001,0, '71244 0'), -- Ymirjar Warlord
-(@GUID+21,0x0000000,0x0000001,0, '71244 0'); -- Ymirjar Warlord
diff --git a/sql/old/3.3.5a/2011_02_20_00_world_smart_scripts.sql b/sql/old/3.3.5a/2011_02_20_00_world_smart_scripts.sql
new file mode 100644
index 00000000000..48388632202
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_20_00_world_smart_scripts.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `smart_scripts` CHANGE `entryorguid` `entryorguid` INT(32) NOT NULL;
+ALTER TABLE `smart_scripts` MODIFY `action_param1` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param2` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param3` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param4` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param5` INT(32) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param6` INT(32) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/old/3.3.5a/2011_02_20_01_world_smart_scripts.sql b/sql/old/3.3.5a/2011_02_20_01_world_smart_scripts.sql
new file mode 100644
index 00000000000..236c66cdb1e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_20_01_world_smart_scripts.sql
@@ -0,0 +1,24 @@
+ALTER TABLE `smart_scripts` CHANGE `entryorguid` `entryorguid` INT(11) NOT NULL;
+ALTER TABLE `smart_scripts` MODIFY `source_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `id` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `link` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_phase_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_chance` TINYINT(3) UNSIGNED NOT NULL DEFAULT 100;
+ALTER TABLE `smart_scripts` MODIFY `event_flags` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `event_param4` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param4` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param5` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `action_param6` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `target_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `smart_scripts` MODIFY `comment` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'Event Comment';
diff --git a/sql/old/3.3.5a/2011_02_20_02_world_instance_icecrown_citadel.sql b/sql/old/3.3.5a/2011_02_20_02_world_instance_icecrown_citadel.sql
new file mode 100644
index 00000000000..b41ab10d6f5
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_20_02_world_instance_icecrown_citadel.sql
@@ -0,0 +1,61 @@
+SET @GUID := 137746;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+30 AND @GUID+33;
+DELETE FROM `linked_respawn` WHERE `linkedGuid` IN (@GUID+06,@GUID+07) AND `linkType`=0;
+INSERT INTO `linked_respawn` (`guid`,`linkedGuid`,`linkType`) VALUES
+(@GUID+00,@GUID+06,0), -- Valithria Dreamwalker
+(@GUID+01,@GUID+06,0), -- Valithria Dreamwalker
+(@GUID+02,@GUID+06,0), -- Risen Archmage
+(@GUID+03,@GUID+06,0), -- Risen Archmage
+(@GUID+04,@GUID+06,0), -- Risen Archmage
+(@GUID+05,@GUID+06,0), -- Risen Archmage
+(@GUID+06,@GUID+06,0), -- Green Dragon Combat Trigger
+(@GUID+07,@GUID+07,0), -- Sister Svalna
+(@GUID+08,@GUID+07,0), -- Ymirjar Frostbinder
+(@GUID+09,@GUID+07,0), -- Ymirjar Frostbinder
+(@GUID+10,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+11,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+12,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+13,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+14,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+15,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+16,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+17,@GUID+07,0), -- Ymirjar Battle-Maiden
+(@GUID+18,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+19,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+20,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+21,@GUID+07,0), -- Ymirjar Warlord
+(@GUID+22,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+23,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+24,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+25,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+26,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+27,@GUID+07,0), -- Ymirjar Huntress
+(@GUID+28,@GUID+07,0), -- Ymirjar Deathbringer
+(@GUID+29,@GUID+07,0), -- Ymirjar Deathbringer
+(151761,@GUID+07,0), -- Captain Arnath
+(151762,@GUID+07,0), -- Captain Brandon
+(151763,@GUID+07,0), -- Captain Grondel
+(151764,@GUID+07,0), -- Captain Rupert
+(151767,@GUID+07,0); -- Crok Scourgebane
+
+SET @EQUIP := 2423;
+DELETE FROM `creature_equip_template` WHERE `entry` BETWEEN @EQUIP AND @EQUIP+3;
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EQUIP+0,45128,0,0),
+(@EQUIP+1,47519,0,0),
+(@EQUIP+2,45075,0,0),
+(@EQUIP+3,48025,0,47521);
+
+DELETE FROM `creature_template` WHERE `entry` IN (3712202,3712203,3712302,3712303,3712402,3712403,3712502,3712503,3712902,3712903);
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37122; -- Captain Arnath
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37123; -- Captain Brandon
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37124; -- Captain Grondel
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37125; -- Captain Rupert
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37129; -- Crok Scourgebane
+
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+0 WHERE `entry` IN (37122,38298); -- Captain Arnath
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+1 WHERE `entry` IN (37123,38299); -- Captain Brandon
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+2 WHERE `entry` IN (37124,38303); -- Captain Grondel
+UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+3 WHERE `entry` IN (37125,38304); -- Captain Rupert
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=2050 WHERE `entry` IN (37129,38000); -- Crok Scourgebane
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=38752; -- Green Dragon Combat Trigger
diff --git a/sql/old/3.3.5a/2011_02_20_0_world_smart_scripts.sql b/sql/old/3.3.5a/2011_02_20_0_world_smart_scripts.sql
deleted file mode 100644
index 48388632202..00000000000
--- a/sql/old/3.3.5a/2011_02_20_0_world_smart_scripts.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `smart_scripts` CHANGE `entryorguid` `entryorguid` INT(32) NOT NULL;
-ALTER TABLE `smart_scripts` MODIFY `action_param1` INT(32) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param2` INT(32) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param3` INT(32) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param4` INT(32) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param5` INT(32) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param6` INT(32) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/old/3.3.5a/2011_02_20_1_world_smart_scripts.sql b/sql/old/3.3.5a/2011_02_20_1_world_smart_scripts.sql
deleted file mode 100644
index 236c66cdb1e..00000000000
--- a/sql/old/3.3.5a/2011_02_20_1_world_smart_scripts.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-ALTER TABLE `smart_scripts` CHANGE `entryorguid` `entryorguid` INT(11) NOT NULL;
-ALTER TABLE `smart_scripts` MODIFY `source_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `id` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `link` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `event_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `event_phase_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `event_chance` TINYINT(3) UNSIGNED NOT NULL DEFAULT 100;
-ALTER TABLE `smart_scripts` MODIFY `event_flags` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `event_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `event_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `event_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `event_param4` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param4` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param5` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `action_param6` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `target_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `target_param1` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `target_param2` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `target_param3` INT(10) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `smart_scripts` MODIFY `comment` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'Event Comment';
diff --git a/sql/old/3.3.5a/2011_02_20_2_world_instance_icecrown_citadel.sql b/sql/old/3.3.5a/2011_02_20_2_world_instance_icecrown_citadel.sql
deleted file mode 100644
index b41ab10d6f5..00000000000
--- a/sql/old/3.3.5a/2011_02_20_2_world_instance_icecrown_citadel.sql
+++ /dev/null
@@ -1,61 +0,0 @@
-SET @GUID := 137746;
-DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+30 AND @GUID+33;
-DELETE FROM `linked_respawn` WHERE `linkedGuid` IN (@GUID+06,@GUID+07) AND `linkType`=0;
-INSERT INTO `linked_respawn` (`guid`,`linkedGuid`,`linkType`) VALUES
-(@GUID+00,@GUID+06,0), -- Valithria Dreamwalker
-(@GUID+01,@GUID+06,0), -- Valithria Dreamwalker
-(@GUID+02,@GUID+06,0), -- Risen Archmage
-(@GUID+03,@GUID+06,0), -- Risen Archmage
-(@GUID+04,@GUID+06,0), -- Risen Archmage
-(@GUID+05,@GUID+06,0), -- Risen Archmage
-(@GUID+06,@GUID+06,0), -- Green Dragon Combat Trigger
-(@GUID+07,@GUID+07,0), -- Sister Svalna
-(@GUID+08,@GUID+07,0), -- Ymirjar Frostbinder
-(@GUID+09,@GUID+07,0), -- Ymirjar Frostbinder
-(@GUID+10,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+11,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+12,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+13,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+14,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+15,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+16,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+17,@GUID+07,0), -- Ymirjar Battle-Maiden
-(@GUID+18,@GUID+07,0), -- Ymirjar Warlord
-(@GUID+19,@GUID+07,0), -- Ymirjar Warlord
-(@GUID+20,@GUID+07,0), -- Ymirjar Warlord
-(@GUID+21,@GUID+07,0), -- Ymirjar Warlord
-(@GUID+22,@GUID+07,0), -- Ymirjar Huntress
-(@GUID+23,@GUID+07,0), -- Ymirjar Huntress
-(@GUID+24,@GUID+07,0), -- Ymirjar Huntress
-(@GUID+25,@GUID+07,0), -- Ymirjar Huntress
-(@GUID+26,@GUID+07,0), -- Ymirjar Huntress
-(@GUID+27,@GUID+07,0), -- Ymirjar Huntress
-(@GUID+28,@GUID+07,0), -- Ymirjar Deathbringer
-(@GUID+29,@GUID+07,0), -- Ymirjar Deathbringer
-(151761,@GUID+07,0), -- Captain Arnath
-(151762,@GUID+07,0), -- Captain Brandon
-(151763,@GUID+07,0), -- Captain Grondel
-(151764,@GUID+07,0), -- Captain Rupert
-(151767,@GUID+07,0); -- Crok Scourgebane
-
-SET @EQUIP := 2423;
-DELETE FROM `creature_equip_template` WHERE `entry` BETWEEN @EQUIP AND @EQUIP+3;
-INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
-(@EQUIP+0,45128,0,0),
-(@EQUIP+1,47519,0,0),
-(@EQUIP+2,45075,0,0),
-(@EQUIP+3,48025,0,47521);
-
-DELETE FROM `creature_template` WHERE `entry` IN (3712202,3712203,3712302,3712303,3712402,3712403,3712502,3712503,3712902,3712903);
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37122; -- Captain Arnath
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37123; -- Captain Brandon
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37124; -- Captain Grondel
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37125; -- Captain Rupert
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37129; -- Crok Scourgebane
-
-UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+0 WHERE `entry` IN (37122,38298); -- Captain Arnath
-UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+1 WHERE `entry` IN (37123,38299); -- Captain Brandon
-UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+2 WHERE `entry` IN (37124,38303); -- Captain Grondel
-UPDATE `creature_template` SET `baseattacktime`=1500,`equipment_id`=@EQUIP+3 WHERE `entry` IN (37125,38304); -- Captain Rupert
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=2050 WHERE `entry` IN (37129,38000); -- Crok Scourgebane
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=38752; -- Green Dragon Combat Trigger
diff --git a/sql/old/3.3.5a/2011_02_22_00_world_scriptname.sql b/sql/old/3.3.5a/2011_02_22_00_world_scriptname.sql
new file mode 100644
index 00000000000..0199d796ece
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN(32933,32934);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_22_01_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_22_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..d0b20794f96
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_01_world_spell_script_names.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN(63633,65594,62056,63985,64224,64225);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES 
+(63633,'spell_ulduar_rubble_summon'),
+(65594,'spell_ulduar_cancel_stone_grip'),
+(62056,'spell_ulduar_stone_grip'),
+(63985,'spell_ulduar_stone_grip'),
+(64224,'spell_ulduar_stone_grip_absorb'),
+(64225,'spell_ulduar_stone_grip_absorb');
diff --git a/sql/old/3.3.5a/2011_02_22_02_world_conditions.sql b/sql/old/3.3.5a/2011_02_22_02_world_conditions.sql
new file mode 100644
index 00000000000..93328d671cc
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_02_world_conditions.sql
@@ -0,0 +1,3 @@
+DELETE FROM `conditions` WHERE `SourceEntry`=65594 AND `ConditionTypeOrReference`=18;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
+(13,0,65594,18,1,0,'Cancel Stone Grip Target');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_22_03_world_creature_template.sql b/sql/old/3.3.5a/2011_02_22_03_world_creature_template.sql
new file mode 100644
index 00000000000..38064813aa1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_03_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `flags_extra`= `flags_extra`&~1 WHERE `entry` IN(32933,32934); 
diff --git a/sql/old/3.3.5a/2011_02_22_04_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_02_22_04_world_vehicle_accessory.sql
new file mode 100644
index 00000000000..3d23f85c76a
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_22_04_world_vehicle_accessory.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vehicle_accessory`
+ADD `summontype` TINYINT(3) UNSIGNED NOT NULL DEFAULT 6 COMMENT "see enum TempSummonType",
+ADD `summontimer` INT(10) UNSIGNED NOT NULL DEFAULT 30000 COMMENT "timer, only relevant for certain summontypes";
diff --git a/sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql b/sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql
deleted file mode 100644
index 0199d796ece..00000000000
--- a/sql/old/3.3.5a/2011_02_22_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN(32933,32934);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_22_1_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_22_1_world_spell_script_names.sql
deleted file mode 100644
index d0b20794f96..00000000000
--- a/sql/old/3.3.5a/2011_02_22_1_world_spell_script_names.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id` IN(63633,65594,62056,63985,64224,64225);
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES 
-(63633,'spell_ulduar_rubble_summon'),
-(65594,'spell_ulduar_cancel_stone_grip'),
-(62056,'spell_ulduar_stone_grip'),
-(63985,'spell_ulduar_stone_grip'),
-(64224,'spell_ulduar_stone_grip_absorb'),
-(64225,'spell_ulduar_stone_grip_absorb');
diff --git a/sql/old/3.3.5a/2011_02_22_2_world_conditions.sql b/sql/old/3.3.5a/2011_02_22_2_world_conditions.sql
deleted file mode 100644
index 93328d671cc..00000000000
--- a/sql/old/3.3.5a/2011_02_22_2_world_conditions.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceEntry`=65594 AND `ConditionTypeOrReference`=18;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
-(13,0,65594,18,1,0,'Cancel Stone Grip Target');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_22_3_world_creature_template.sql b/sql/old/3.3.5a/2011_02_22_3_world_creature_template.sql
deleted file mode 100644
index 38064813aa1..00000000000
--- a/sql/old/3.3.5a/2011_02_22_3_world_creature_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `flags_extra`= `flags_extra`&~1 WHERE `entry` IN(32933,32934); 
diff --git a/sql/old/3.3.5a/2011_02_22_4_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_02_22_4_world_vehicle_accessory.sql
deleted file mode 100644
index 3d23f85c76a..00000000000
--- a/sql/old/3.3.5a/2011_02_22_4_world_vehicle_accessory.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `vehicle_accessory`
-ADD `summontype` TINYINT(3) UNSIGNED NOT NULL DEFAULT 6 COMMENT "see enum TempSummonType",
-ADD `summontimer` INT(10) UNSIGNED NOT NULL DEFAULT 30000 COMMENT "timer, only relevant for certain summontypes";
diff --git a/sql/old/3.3.5a/2011_02_23_01_world_creature_template.sql b/sql/old/3.3.5a/2011_02_23_01_world_creature_template.sql
new file mode 100644
index 00000000000..95e366cc962
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_01_world_creature_template.sql
@@ -0,0 +1,5 @@
+-- Correct run speed, models, and trigger flag
+UPDATE `creature_template` SET `speed_run`=5.5/7, `modelid1`=1126, `modelid2`=11686, `flags_extra`= `flags_extra`|128 WHERE `entry` IN(33632,33802);
+
+-- NullAI for semi-triggers (flags_extra|128 would make them unattackable by certain spells needed for the encounter)
+UPDATE `creature_template` SET `AIName`='NullAI' WHERE `entry` IN(33742,33809,33942);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_23_02_world_conditions.sql b/sql/old/3.3.5a/2011_02_23_02_world_conditions.sql
new file mode 100644
index 00000000000..1819855eced
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_02_world_conditions.sql
@@ -0,0 +1,8 @@
+DELETE FROM `conditions` WHERE `SourceEntry` IN(63676,63702,63629,63979,63766,63983) AND `ConditionTypeOrReference`=18;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
+(13,0,63676,18,1,32930,'Focused Eyebeam Visual (Left) Target'),
+(13,0,63702,18,1,32930,'Focused Eyebeam Visual (Right) Target'),
+(13,0,63629,18,1,32930,'Arm Dead Damage Kologarn (10m) Target'),
+(13,0,63979,18,1,32930,'Arm Dead Damage Kologarn (25m) Target'),
+(13,0,63766,18,1,33661,'Arm Sweep (10m) Target'),
+(13,0,63983,18,1,33661,'Arm Sweep (25m) Target');
diff --git a/sql/old/3.3.5a/2011_02_23_03_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_02_23_03_world_vehicle_accessory.sql
new file mode 100644
index 00000000000..5d56e0c4fab
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_03_world_vehicle_accessory.sql
@@ -0,0 +1 @@
+UPDATE `vehicle_accessory` SET `summontype`=8, `summontimer`=0 WHERE `entry`=32930;
diff --git a/sql/old/3.3.5a/2011_02_23_04_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_23_04_world_spell_script_names.sql
new file mode 100644
index 00000000000..2812c89024d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_04_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN(62166,63981);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(62166, 'spell_ulduar_stone_grip_cast_target'),
+(63981, 'spell_ulduar_stone_grip_cast_target');
diff --git a/sql/old/3.3.5a/2011_02_23_05_world_creature_template.sql b/sql/old/3.3.5a/2011_02_23_05_world_creature_template.sql
new file mode 100644
index 00000000000..8066d1da438
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_05_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `AIName`='', `flags_extra`=`flags_extra`|2 WHERE `entry` IN(33742,33809,33942);
diff --git a/sql/old/3.3.5a/2011_02_23_06_world_creatures.sql b/sql/old/3.3.5a/2011_02_23_06_world_creatures.sql
new file mode 100644
index 00000000000..16a9947afe6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_06_world_creatures.sql
@@ -0,0 +1,40 @@
+-- Fixup Enslaved Netherwing drake in Shadowmoon Valley
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=21722;
+UPDATE `creature_template` SET `InhabitType`=1 WHERE `entry`=21722;
+
+-- Fixup Dragonmaw Drake-Riders in Shadowmoon Valley
+UPDATE `creature` SET `position_x`=-4155.54932,`position_y`=386.6152,`position_z`=141.4012,`orientation`=1.20427716 WHERE `guid`=75786;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=21719;
+UPDATE `creature_template` SET `InhabitType`=1 WHERE `entry`=21719;
+
+-- fix walk speed for several npc's
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry` IN 
+(19449, -- Thunderlord Grunt
+17855); -- Expedition Warden
+
+-- Inquisitor Salrand shouldn't have random movement & fix inhabit type
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=25584;
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=25584;
+-- Beryl Point InvisMan shouldn't have random movement, set as a trigger & fix inhabit type
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=25594;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128,`InhabitType`=7 WHERE `entry`=25594;
+
+-- Surristrasz proper state
+DELETE FROM `creature_template_addon` WHERE `entry`=24795;
+INSERT INTO `creature_template_addon` (`entry`,`bytes1`) VALUES (24795,3);
+
+-- Grand Magus Telestra shouldn't have random movement
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=26832;
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=26832;
+
+-- Remove spawned Savannah Cubs
+-- Savannah Cubs are spawned in EAI
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=5766);
+DELETE FROM `creature` WHERE `id`=5766;
+
+-- Set ELM General Purpose Bunny (scale x0.01) as a trigger
+UPDATE `creature` SET `modelid`=0 WHERE `id`=24021;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=24021;
+-- Set ELM General Purpose Bunny (scale x0.01) Large as a trigger
+UPDATE `creature` SET `modelid`=0 WHERE `id`=26298;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=26298;
diff --git a/sql/old/3.3.5a/2011_02_23_07_world_misc.sql b/sql/old/3.3.5a/2011_02_23_07_world_misc.sql
new file mode 100644
index 00000000000..a2ca5207b33
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_07_world_misc.sql
@@ -0,0 +1,76 @@
+-- SAI for Neltharaku
+SET @ENTRY := 21657;
+UPDATE `creature_template` SET `speed_run`=2.5,`ScriptName`='',`AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,8396,0,0,0,26,10814,0,1,0,0,0,7,0,0,0,0,0,0,0,'Neltharaku - On Gossip option - Quest credit'),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Neltharaku - On Gossip option - Close gossip');
+-- Waypoints for Neltharaku from sniff
+SET @NPC := 75654;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4147.188,`position_y`=852.9213,`position_z`=112.449 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`bytes2`) VALUES (@ENTRY,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4149.083,816.8467,102.0771,0,0,0,100,0),
+(@PATH,2,-4148.741,817.7864,102.0771,0,0,0,100,0),
+(@PATH,3,-4150.894,819.7193,112.4489,0,0,0,100,0),
+(@PATH,4,-4147.188,852.9213,112.449,0,0,0,100,0),
+(@PATH,5,-4126.215,897.6987,112.449,0,0,0,100,0),
+(@PATH,6,-4113.534,926.0124,112.449,0,0,0,100,0),
+(@PATH,7,-4098.13,963.6712,112.449,0,0,0,100,0),
+(@PATH,8,-4063.067,1046.515,112.449,0,0,0,100,0),
+(@PATH,9,-4008.534,1081.363,112.449,0,0,0,100,0),
+(@PATH,10,-3926.171,1057.316,112.449,0,0,0,100,0),
+(@PATH,11,-3914.31,958.3683,114.7823,0,0,0,100,0),
+(@PATH,12,-3930.769,894.2169,114.2545,0,0,0,100,0),
+(@PATH,13,-3991.642,763.9112,112.449,0,0,0,100,0),
+(@PATH,14,-4060.605,579.9987,112.449,0,0,0,100,0),
+(@PATH,15,-4085.638,468.8222,173.4489,0,0,0,100,0),
+(@PATH,16,-4097.893,416.0321,177.8378,0,0,0,100,0),
+(@PATH,17,-4110.39,374.4871,174.2545,0,0,0,100,0),
+(@PATH,18,-4135.225,331.1968,174.7545,0,0,0,100,0),
+(@PATH,19,-4203.078,269.2113,172.4767,0,0,0,100,0),
+(@PATH,20,-4239.532,280.7727,169.0878,0,0,0,100,0),
+(@PATH,21,-4278.137,304.6405,169.1989,0,0,0,100,0),
+(@PATH,22,-4295.682,340.7838,173.9212,0,0,0,100,0),
+(@PATH,23,-4297.044,383.0331,169.0878,0,0,0,100,0),
+(@PATH,24,-4267.532,404.9037,169.0878,0,0,0,100,0),
+(@PATH,25,-4225.749,416.8825,169.0878,0,0,0,100,0),
+(@PATH,26,-4193.994,418.2155,169.0878,0,0,0,100,0),
+(@PATH,27,-4176.15,444.5788,158.2545,0,0,0,100,0),
+(@PATH,28,-4163.389,480.9925,149.6712,0,0,0,100,0),
+(@PATH,29,-4157.379,548.4786,145.2823,0,0,0,100,0),
+(@PATH,30,-4178.163,628.6951,101.0601,0,0,0,100,0),
+(@PATH,31,-4182.795,656.5566,97.31005,0,0,0,100,0),
+(@PATH,32,-4184.389,678.5916,98.50452,0,0,0,100,0),
+(@PATH,33,-4182.358,726.181,102.5323,0,0,0,100,0),
+(@PATH,34,-4175.015,753.1885,103.2545,0,0,0,100,0),
+(@PATH,35,-4160.292,781.7564,107.8656,0,0,0,100,0),
+(@PATH,36,-4150.894,819.7193,112.4489,0,0,0,100,0),
+(@PATH,37,-4147.188,852.9213,112.449,0,0,0,100,0);
+
+-- Gossip Menu insert from sniff
+DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10614;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8394,10614);
+DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10615;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8395,10615);
+DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10616;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8396,10616);
+-- Creature Gossip_menu_id Update from sniff
+UPDATE `creature_template` SET `gossip_menu_id`=6944 WHERE `entry`=19352;
+UPDATE `creature_template` SET `gossip_menu_id`=9563 WHERE `entry`=27575;
+-- Creature Gossip_menu_option Update from sniff
+DELETE FROM `gossip_menu_option` WHERE `id`=0 AND `menu_id` IN (8013,8397,8394,8395,8396);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(8013,0,0, 'I see.',1,1,8014,0,0,0,0, ''),
+(8397,0,0, 'I am listening, dragon.',1,1,8394,0,0,0,0, ''),
+(8394,0,0, 'But you are dragons! How could orcs do this to you?',1,1,8395,0,0,0,0, ''),
+(8395,0,0, 'Your mate?',1,1,8396,0,0,0,0, ''),
+(8396,0,0, 'I have battled many beasts, dragon. I will help you.',1,1,0,0,0,0,0, '');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8397;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,8397,0,0,9,10814,0,0,0,'','Show gossip option 0 if player has quest 10814');
diff --git a/sql/old/3.3.5a/2011_02_23_07_world_scriptname.sql b/sql/old/3.3.5a/2011_02_23_07_world_scriptname.sql
new file mode 100644
index 00000000000..87b90aaf5dd
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_07_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=21657; -- Neltharaku
diff --git a/sql/old/3.3.5a/2011_02_23_08_world_sai.sql b/sql/old/3.3.5a/2011_02_23_08_world_sai.sql
new file mode 100644
index 00000000000..3633d2b334c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_08_world_sai.sql
@@ -0,0 +1,106 @@
+ /* Quest/Barrens Horde - Counterattack! */
+SET @Counterattack = 4021;
+
+-- Vars
+SET @Gossip = 21253;
+-- NPCs
+SET @Deathgate = 3389; -- Regthar Deathgate (quest giver)
+SET @Kromzar = 9456; -- Warlord Krom'zar (abilities: 11976 Strike)
+SET @Stormseer = 9523; -- Kolkar Stormseer (abilities: 9532 Lighting Bolt; 6535 Lightning Cloud)
+SET @Invader = 9524; -- Kolkar Invader (abilities: 8014 Tetatuns, 11976 Strike, 6268 Rushing Charge)
+SET @Thrower = 9458; -- Horde Axe Thrower
+SET @Defender = 9457; -- Horde Defender (abilities: 10277 Throw)
+-- Spells
+SET @CreateBanner = 13965; -- Create Krom'zar's Banner
+
+DELETE FROM `gossip_menu` WHERE `entry` IN (@Gossip,@Gossip+1);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(@Gossip+0,2533),
+(@Gossip+1,2534);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=@Gossip AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(@Gossip,0,0, 'Where is Warlord Krom''zar?',1,1,@Gossip+1,0,0,0,0,NULL);
+
+DELETE FROM `creature_text` WHERE `entry` IN (@Deathgate,@Invader,@Thrower,@Kromzar);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@Deathgate,0,0,'Beware, $N! Look to the west!',0,0,100,1,0,0,'Regthar Deathgate: quest start'),
+(@Deathgate,1,0,'A defender has fallen!',0,0,100,1,0,0,'Regthar Deathgate: Horde Defender death'),
+(@Invader,0,0,'Kolkar Invader charges!',2,0,100,0,0,0,'Kolkar Invader: aggro'),
+(@Thrower,0,0,'Defend the bunkers!',0,0,100,0,0,0,'Kolkar Axe Thrower'),
+(@Thrower,0,1,'Our foes will fail!',0,0,100,0,0,0,'Kolkar Axe Thrower'),
+(@Thrower,0,2,'For the Horde',0,0,100,0,0,0,'Kolkar Axe Thrower'),
+(@Kromzar,0,0,'The Kolkar are the strongest!',1,0,100,0,0,0,'Warlord Krom''zar: spawn');
+
+UPDATE `creature_template` SET `AIName`='SmartAI', `MovementType`=1 WHERE `entry` IN (@Kromzar,@Invader,@Stormseer,@Thrower,@Defender);
+UPDATE `creature_template` SET `AIName`='SmartAI', `gossip_menu_id`=@Gossip WHERE `entry`=@Deathgate;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@Gossip;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
+(15,@Gossip,0,0,9,@Counterattack,0,0,0, 'Regthar Deathgate: Counterattack!: gossip: has quest'),
+(15,@Gossip,0,0,26,11227,0,0,0, 'Regthar Deathgate: Counterattack!: gossip: does not have item Piece Banner');
+
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Kromzar AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Deathgate AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Invader AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Stormseer AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Thrower AND `source_type`=0);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Deathgate*100 AND `source_type`=9);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Defender AND `source_type`=0);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@Kromzar,0,0,0,0,0,100,0,0,1000,4000,6000,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,'Warlord Krom''Zar: In combat cast Strike every 4 to 6 seconds'),
+(@Kromzar,0,1,0,6,0,100,1,0,1000,5000,8000,11,@CreateBanner,2,0,0,0,0,0,0,0,0,0,0,0,0,'Warlord Krom''Zar: On death cast Create Krom''zar''s Banner'),
+(@Kromzar,0,4,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Warlord Krom''Zar: On spawn set random movement'),
+(@Kromzar,0,5,0,11,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Warlord Krom''Zar: On spawn say text 0'),
+(@Invader,0,0,0,4,0,100,0,0,0,0,0,11,6268,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: On aggro cast Rushing Charge'),
+(@Invader,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Invader: On aggro say text 0'),
+(@Invader,0,2,0,0,0,100,0,0,1000,4000,6000,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: In combat cast Strike every 4 to 6 seconds'),
+(@Invader,0,3,0,0,0,100,0,1000,2000,20000,20000,11,8014,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: In combat cast Tetanus every 20 seconds'),
+(@Invader,0,4,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Invader: On spawn set random movement'),
+(@Stormseer,0,0,0,11,0,100,0,0,0,0,0,58,1,9532,3500,6000,30,15,1,0,0,0,0,0,0,0,'Kolkar Stormseer: On respawn install AI template caster for Lighting Bolt'),
+(@Stormseer,0,1,0,0,0,100,0,3000,4000,10000,10000,11,6535,1,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Stormseer: In combat cast Lightning Cloud every 10 seconds'),
+(@Stormseer,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Stormseer: On spawn set random movement'),
+(@Thrower,0,0,0,11,0,100,0,0,0,0,0,58,2,10277,35,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thrower: On respawn install AI template turret for Throw'),
+(@Thrower,0,1,0,6,0,100,0,0,0,0,0,12,@Thrower,1,450000,0,0,0,8,0,0,0,-293.212,-1912.51,91.6673,1.42794,'Horde Axe Thrower: On death summon Horde Axe Thrower'),
+(@Thrower,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thower: On spawn set random movement'),
+(@Thrower,0,3,0,60,0,100,0,20000,25000,30000,40000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thower: Say text 0 every 30 to 40 seconds'),
+(@Defender,0,0,0,6,0,100,0,0,0,0,0,1,1,0,0,0,0,0,9,@Deathgate,0,300,0,0,0,0,'Horde Axe Thrower: On death Regthar Deathgate say text 1'),
+(@Defender,0,1,0,6,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-280.703,-1908.01,91.6668,1.77351,'Horde Defender: On death summon Horde Defender'),
+(@Defender,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Defender: On spawn set random movement'),
+(@Deathgate,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On respawn set phase 1 (p0)'),
+(@Deathgate,0,1,0,19,1,100,0,@Counterattack,0,0,0,1,0,0,0,0,0,0,18,15,0,0,0,0,0,0,'Regthar Deathgate: On quest accept say text 0 (p1)'),
+(@Deathgate,0,2,0,19,1,100,0,@Counterattack,0,0,0,22,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Regthar Deathgate: On quest accept set event phase 2 (p1)'),
+(@Deathgate,0,3,0,19,2,100,0,@Counterattack,0,0,0,80,@Deathgate*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On quest accept call main script (p2)'),
+(@Deathgate,0,4,0,62,1,100,0,@Gossip,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Regthar Deathgate: On gossip select say text 0 (p1)'),
+(@Deathgate,0,5,0,62,4,100,0,@Gossip,0,0,0,80,@Deathgate*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On gossip select call main script (p4)'),
+(@Deathgate*100,9,0,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-280.703,-1908.01,91.6668,1.77351,'Counterattack!: Summon Horde Axe Thrower 1'),
+(@Deathgate*100,9,1,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-286.384,-1910.99,91.6668,1.59444,'Counterattack!: Summon Horde Defender 2'),
+(@Deathgate*100,9,2,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-297.373,-1917.11,91.6746,1.81435,'Counterattack!: Summon Horde Defender 3'),
+(@Deathgate*100,9,3,0,0,0,100,0,0,0,0,0,12,@Thrower,1,450000,0,0,0,8,0,0,0,-293.212,-1912.51,91.6673,1.42794,'Counterattack!: Summon Horde Axe Thrower 1'),
+(@Deathgate*100,9,4,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-280.037,-1888.35,92.2549,2.28087,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,5,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-292.107,-1899.54,91.667,4.78158,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,6,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-305.57,-1869.88,92.7754,2.45131,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,7,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-289.972,-1882.76,92.5714,3.43148,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,8,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-277.454,-1873.39,92.7773,4.75724,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,9,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-271.581,-1847.51,93.4329,4.39124,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,10,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-269.982,-1828.6,92.4754,4.68655,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,11,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-279.267,-1827.92,92.3128,1.35332,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,12,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-297.42,-1847.41,93.2295,5.80967,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,13,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-310.607,-1831.89,95.9363,0.371571,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,14,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-329.177,-1842.43,95.3891,0.516085,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,15,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-324.448,-1860.63,94.3221,4.97793,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,16,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-290.588,-1858,92.5026,4.14698,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,17,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-286.103,-1846.18,92.544,6.11047,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,18,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-304.978,-1844.7,94.4432,1.61721,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,19,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-308.105,-1859.08,93.8039,2.80709,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,20,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-297.089,-1867.68,92.5601,2.21804,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,21,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-286.988,-1876.47,92.7447,1.39494,'Counterattack!: Summon Kolkar Stormseer'),
+(@Deathgate*100,9,22,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-291.86,-1893.04,92.0213,1.96121,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,23,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-298.297,-1846.85,93.3672,4.97792,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,24,0,0,0,100,0,0,0,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-294.942,-1845.88,93.0999,4.86797,'Counterattack!: Summon Kolkar Invader'),
+(@Deathgate*100,9,25,0,0,0,100,0,0,0,0,0,12,@Kromzar,1,250000,0,0,0,8,0,0,0,-296.718,-1846.38,93.2334,5.02897,'Counterattack!: Summon Warlord Kromzar'),
+(@Deathgate*100,9,26,0,0,0,100,0,20000,20000,0,0,22,4,1,450000,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: set phase 4'), -- if player does not finish this quest this time s/he can come back later'
+(@Deathgate*100,9,27,0,0,0,100,0,2*3600*1000,2*3600*1000,0,0,22,1,1,450000,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: set phase 1'), -- after 2 hours reset everything (event start on quest accept)'
+(@Deathgate,0,7,0,20,10,100,0,@Counterattack,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On quest reward set phase 1');
+
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (@Deathgate,@Kromzar,@Stormseer,@Invader,@Thrower,@Defender ); -- 16 EAI scripts
diff --git a/sql/old/3.3.5a/2011_02_23_09_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_23_09_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..8a636b3b589
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_23_09_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 55814 AND `spell_effect` = 55817 ;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(55814, 55817, 1, 'Eck Residue');
diff --git a/sql/old/3.3.5a/2011_02_23_1_world_creature_template.sql b/sql/old/3.3.5a/2011_02_23_1_world_creature_template.sql
deleted file mode 100644
index 95e366cc962..00000000000
--- a/sql/old/3.3.5a/2011_02_23_1_world_creature_template.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Correct run speed, models, and trigger flag
-UPDATE `creature_template` SET `speed_run`=5.5/7, `modelid1`=1126, `modelid2`=11686, `flags_extra`= `flags_extra`|128 WHERE `entry` IN(33632,33802);
-
--- NullAI for semi-triggers (flags_extra|128 would make them unattackable by certain spells needed for the encounter)
-UPDATE `creature_template` SET `AIName`='NullAI' WHERE `entry` IN(33742,33809,33942);
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_23_2_world_conditions.sql b/sql/old/3.3.5a/2011_02_23_2_world_conditions.sql
deleted file mode 100644
index 1819855eced..00000000000
--- a/sql/old/3.3.5a/2011_02_23_2_world_conditions.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceEntry` IN(63676,63702,63629,63979,63766,63983) AND `ConditionTypeOrReference`=18;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
-(13,0,63676,18,1,32930,'Focused Eyebeam Visual (Left) Target'),
-(13,0,63702,18,1,32930,'Focused Eyebeam Visual (Right) Target'),
-(13,0,63629,18,1,32930,'Arm Dead Damage Kologarn (10m) Target'),
-(13,0,63979,18,1,32930,'Arm Dead Damage Kologarn (25m) Target'),
-(13,0,63766,18,1,33661,'Arm Sweep (10m) Target'),
-(13,0,63983,18,1,33661,'Arm Sweep (25m) Target');
diff --git a/sql/old/3.3.5a/2011_02_23_3_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_02_23_3_world_vehicle_accessory.sql
deleted file mode 100644
index 5d56e0c4fab..00000000000
--- a/sql/old/3.3.5a/2011_02_23_3_world_vehicle_accessory.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `vehicle_accessory` SET `summontype`=8, `summontimer`=0 WHERE `entry`=32930;
diff --git a/sql/old/3.3.5a/2011_02_23_4_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_23_4_world_spell_script_names.sql
deleted file mode 100644
index 2812c89024d..00000000000
--- a/sql/old/3.3.5a/2011_02_23_4_world_spell_script_names.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id` IN(62166,63981);
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(62166, 'spell_ulduar_stone_grip_cast_target'),
-(63981, 'spell_ulduar_stone_grip_cast_target');
diff --git a/sql/old/3.3.5a/2011_02_23_5_world_creature_template.sql b/sql/old/3.3.5a/2011_02_23_5_world_creature_template.sql
deleted file mode 100644
index 8066d1da438..00000000000
--- a/sql/old/3.3.5a/2011_02_23_5_world_creature_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `AIName`='', `flags_extra`=`flags_extra`|2 WHERE `entry` IN(33742,33809,33942);
diff --git a/sql/old/3.3.5a/2011_02_23_6_world_creatures.sql b/sql/old/3.3.5a/2011_02_23_6_world_creatures.sql
deleted file mode 100644
index 16a9947afe6..00000000000
--- a/sql/old/3.3.5a/2011_02_23_6_world_creatures.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- Fixup Enslaved Netherwing drake in Shadowmoon Valley
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=21722;
-UPDATE `creature_template` SET `InhabitType`=1 WHERE `entry`=21722;
-
--- Fixup Dragonmaw Drake-Riders in Shadowmoon Valley
-UPDATE `creature` SET `position_x`=-4155.54932,`position_y`=386.6152,`position_z`=141.4012,`orientation`=1.20427716 WHERE `guid`=75786;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=21719;
-UPDATE `creature_template` SET `InhabitType`=1 WHERE `entry`=21719;
-
--- fix walk speed for several npc's
-UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry` IN 
-(19449, -- Thunderlord Grunt
-17855); -- Expedition Warden
-
--- Inquisitor Salrand shouldn't have random movement & fix inhabit type
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=25584;
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=25584;
--- Beryl Point InvisMan shouldn't have random movement, set as a trigger & fix inhabit type
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=25594;
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128,`InhabitType`=7 WHERE `entry`=25594;
-
--- Surristrasz proper state
-DELETE FROM `creature_template_addon` WHERE `entry`=24795;
-INSERT INTO `creature_template_addon` (`entry`,`bytes1`) VALUES (24795,3);
-
--- Grand Magus Telestra shouldn't have random movement
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `id`=26832;
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=26832;
-
--- Remove spawned Savannah Cubs
--- Savannah Cubs are spawned in EAI
-DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id`=5766);
-DELETE FROM `creature` WHERE `id`=5766;
-
--- Set ELM General Purpose Bunny (scale x0.01) as a trigger
-UPDATE `creature` SET `modelid`=0 WHERE `id`=24021;
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=24021;
--- Set ELM General Purpose Bunny (scale x0.01) Large as a trigger
-UPDATE `creature` SET `modelid`=0 WHERE `id`=26298;
-UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=26298;
diff --git a/sql/old/3.3.5a/2011_02_23_7_world_misc.sql b/sql/old/3.3.5a/2011_02_23_7_world_misc.sql
deleted file mode 100644
index a2ca5207b33..00000000000
--- a/sql/old/3.3.5a/2011_02_23_7_world_misc.sql
+++ /dev/null
@@ -1,76 +0,0 @@
--- SAI for Neltharaku
-SET @ENTRY := 21657;
-UPDATE `creature_template` SET `speed_run`=2.5,`ScriptName`='',`AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,8396,0,0,0,26,10814,0,1,0,0,0,7,0,0,0,0,0,0,0,'Neltharaku - On Gossip option - Quest credit'),
-(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Neltharaku - On Gossip option - Close gossip');
--- Waypoints for Neltharaku from sniff
-SET @NPC := 75654;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4147.188,`position_y`=852.9213,`position_z`=112.449 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY;
-INSERT INTO `creature_template_addon` (`entry`,`path_id`,`bytes2`) VALUES (@ENTRY,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4149.083,816.8467,102.0771,0,0,0,100,0),
-(@PATH,2,-4148.741,817.7864,102.0771,0,0,0,100,0),
-(@PATH,3,-4150.894,819.7193,112.4489,0,0,0,100,0),
-(@PATH,4,-4147.188,852.9213,112.449,0,0,0,100,0),
-(@PATH,5,-4126.215,897.6987,112.449,0,0,0,100,0),
-(@PATH,6,-4113.534,926.0124,112.449,0,0,0,100,0),
-(@PATH,7,-4098.13,963.6712,112.449,0,0,0,100,0),
-(@PATH,8,-4063.067,1046.515,112.449,0,0,0,100,0),
-(@PATH,9,-4008.534,1081.363,112.449,0,0,0,100,0),
-(@PATH,10,-3926.171,1057.316,112.449,0,0,0,100,0),
-(@PATH,11,-3914.31,958.3683,114.7823,0,0,0,100,0),
-(@PATH,12,-3930.769,894.2169,114.2545,0,0,0,100,0),
-(@PATH,13,-3991.642,763.9112,112.449,0,0,0,100,0),
-(@PATH,14,-4060.605,579.9987,112.449,0,0,0,100,0),
-(@PATH,15,-4085.638,468.8222,173.4489,0,0,0,100,0),
-(@PATH,16,-4097.893,416.0321,177.8378,0,0,0,100,0),
-(@PATH,17,-4110.39,374.4871,174.2545,0,0,0,100,0),
-(@PATH,18,-4135.225,331.1968,174.7545,0,0,0,100,0),
-(@PATH,19,-4203.078,269.2113,172.4767,0,0,0,100,0),
-(@PATH,20,-4239.532,280.7727,169.0878,0,0,0,100,0),
-(@PATH,21,-4278.137,304.6405,169.1989,0,0,0,100,0),
-(@PATH,22,-4295.682,340.7838,173.9212,0,0,0,100,0),
-(@PATH,23,-4297.044,383.0331,169.0878,0,0,0,100,0),
-(@PATH,24,-4267.532,404.9037,169.0878,0,0,0,100,0),
-(@PATH,25,-4225.749,416.8825,169.0878,0,0,0,100,0),
-(@PATH,26,-4193.994,418.2155,169.0878,0,0,0,100,0),
-(@PATH,27,-4176.15,444.5788,158.2545,0,0,0,100,0),
-(@PATH,28,-4163.389,480.9925,149.6712,0,0,0,100,0),
-(@PATH,29,-4157.379,548.4786,145.2823,0,0,0,100,0),
-(@PATH,30,-4178.163,628.6951,101.0601,0,0,0,100,0),
-(@PATH,31,-4182.795,656.5566,97.31005,0,0,0,100,0),
-(@PATH,32,-4184.389,678.5916,98.50452,0,0,0,100,0),
-(@PATH,33,-4182.358,726.181,102.5323,0,0,0,100,0),
-(@PATH,34,-4175.015,753.1885,103.2545,0,0,0,100,0),
-(@PATH,35,-4160.292,781.7564,107.8656,0,0,0,100,0),
-(@PATH,36,-4150.894,819.7193,112.4489,0,0,0,100,0),
-(@PATH,37,-4147.188,852.9213,112.449,0,0,0,100,0);
-
--- Gossip Menu insert from sniff
-DELETE FROM `gossip_menu` WHERE `entry`=8394 AND `text_id`=10614;
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8394,10614);
-DELETE FROM `gossip_menu` WHERE `entry`=8395 AND `text_id`=10615;
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8395,10615);
-DELETE FROM `gossip_menu` WHERE `entry`=8396 AND `text_id`=10616;
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8396,10616);
--- Creature Gossip_menu_id Update from sniff
-UPDATE `creature_template` SET `gossip_menu_id`=6944 WHERE `entry`=19352;
-UPDATE `creature_template` SET `gossip_menu_id`=9563 WHERE `entry`=27575;
--- Creature Gossip_menu_option Update from sniff
-DELETE FROM `gossip_menu_option` WHERE `id`=0 AND `menu_id` IN (8013,8397,8394,8395,8396);
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(8013,0,0, 'I see.',1,1,8014,0,0,0,0, ''),
-(8397,0,0, 'I am listening, dragon.',1,1,8394,0,0,0,0, ''),
-(8394,0,0, 'But you are dragons! How could orcs do this to you?',1,1,8395,0,0,0,0, ''),
-(8395,0,0, 'Your mate?',1,1,8396,0,0,0,0, ''),
-(8396,0,0, 'I have battled many beasts, dragon. I will help you.',1,1,0,0,0,0,0, '');
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8397;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,8397,0,0,9,10814,0,0,0,'','Show gossip option 0 if player has quest 10814');
diff --git a/sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql b/sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql
deleted file mode 100644
index 87b90aaf5dd..00000000000
--- a/sql/old/3.3.5a/2011_02_23_7_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=21657; -- Neltharaku
diff --git a/sql/old/3.3.5a/2011_02_23_8_world_sai.sql b/sql/old/3.3.5a/2011_02_23_8_world_sai.sql
deleted file mode 100644
index 3633d2b334c..00000000000
--- a/sql/old/3.3.5a/2011_02_23_8_world_sai.sql
+++ /dev/null
@@ -1,106 +0,0 @@
- /* Quest/Barrens Horde - Counterattack! */
-SET @Counterattack = 4021;
-
--- Vars
-SET @Gossip = 21253;
--- NPCs
-SET @Deathgate = 3389; -- Regthar Deathgate (quest giver)
-SET @Kromzar = 9456; -- Warlord Krom'zar (abilities: 11976 Strike)
-SET @Stormseer = 9523; -- Kolkar Stormseer (abilities: 9532 Lighting Bolt; 6535 Lightning Cloud)
-SET @Invader = 9524; -- Kolkar Invader (abilities: 8014 Tetatuns, 11976 Strike, 6268 Rushing Charge)
-SET @Thrower = 9458; -- Horde Axe Thrower
-SET @Defender = 9457; -- Horde Defender (abilities: 10277 Throw)
--- Spells
-SET @CreateBanner = 13965; -- Create Krom'zar's Banner
-
-DELETE FROM `gossip_menu` WHERE `entry` IN (@Gossip,@Gossip+1);
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(@Gossip+0,2533),
-(@Gossip+1,2534);
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id`=@Gossip AND `id`=0;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(@Gossip,0,0, 'Where is Warlord Krom''zar?',1,1,@Gossip+1,0,0,0,0,NULL);
-
-DELETE FROM `creature_text` WHERE `entry` IN (@Deathgate,@Invader,@Thrower,@Kromzar);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(@Deathgate,0,0,'Beware, $N! Look to the west!',0,0,100,1,0,0,'Regthar Deathgate: quest start'),
-(@Deathgate,1,0,'A defender has fallen!',0,0,100,1,0,0,'Regthar Deathgate: Horde Defender death'),
-(@Invader,0,0,'Kolkar Invader charges!',2,0,100,0,0,0,'Kolkar Invader: aggro'),
-(@Thrower,0,0,'Defend the bunkers!',0,0,100,0,0,0,'Kolkar Axe Thrower'),
-(@Thrower,0,1,'Our foes will fail!',0,0,100,0,0,0,'Kolkar Axe Thrower'),
-(@Thrower,0,2,'For the Horde',0,0,100,0,0,0,'Kolkar Axe Thrower'),
-(@Kromzar,0,0,'The Kolkar are the strongest!',1,0,100,0,0,0,'Warlord Krom''zar: spawn');
-
-UPDATE `creature_template` SET `AIName`='SmartAI', `MovementType`=1 WHERE `entry` IN (@Kromzar,@Invader,@Stormseer,@Thrower,@Defender);
-UPDATE `creature_template` SET `AIName`='SmartAI', `gossip_menu_id`=@Gossip WHERE `entry`=@Deathgate;
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@Gossip;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
-(15,@Gossip,0,0,9,@Counterattack,0,0,0, 'Regthar Deathgate: Counterattack!: gossip: has quest'),
-(15,@Gossip,0,0,26,11227,0,0,0, 'Regthar Deathgate: Counterattack!: gossip: does not have item Piece Banner');
-
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Kromzar AND `source_type`=0);
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Deathgate AND `source_type`=0);
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Invader AND `source_type`=0);
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Stormseer AND `source_type`=0);
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Thrower AND `source_type`=0);
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Deathgate*100 AND `source_type`=9);
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Defender AND `source_type`=0);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@Kromzar,0,0,0,0,0,100,0,0,1000,4000,6000,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,'Warlord Krom''Zar: In combat cast Strike every 4 to 6 seconds'),
-(@Kromzar,0,1,0,6,0,100,1,0,1000,5000,8000,11,@CreateBanner,2,0,0,0,0,0,0,0,0,0,0,0,0,'Warlord Krom''Zar: On death cast Create Krom''zar''s Banner'),
-(@Kromzar,0,4,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Warlord Krom''Zar: On spawn set random movement'),
-(@Kromzar,0,5,0,11,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Warlord Krom''Zar: On spawn say text 0'),
-(@Invader,0,0,0,4,0,100,0,0,0,0,0,11,6268,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: On aggro cast Rushing Charge'),
-(@Invader,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Invader: On aggro say text 0'),
-(@Invader,0,2,0,0,0,100,0,0,1000,4000,6000,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: In combat cast Strike every 4 to 6 seconds'),
-(@Invader,0,3,0,0,0,100,0,1000,2000,20000,20000,11,8014,0,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Invader: In combat cast Tetanus every 20 seconds'),
-(@Invader,0,4,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Invader: On spawn set random movement'),
-(@Stormseer,0,0,0,11,0,100,0,0,0,0,0,58,1,9532,3500,6000,30,15,1,0,0,0,0,0,0,0,'Kolkar Stormseer: On respawn install AI template caster for Lighting Bolt'),
-(@Stormseer,0,1,0,0,0,100,0,3000,4000,10000,10000,11,6535,1,0,0,0,0,2,0,0,0,0,0,0,0,'Kolkar Stormseer: In combat cast Lightning Cloud every 10 seconds'),
-(@Stormseer,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kolkar Stormseer: On spawn set random movement'),
-(@Thrower,0,0,0,11,0,100,0,0,0,0,0,58,2,10277,35,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thrower: On respawn install AI template turret for Throw'),
-(@Thrower,0,1,0,6,0,100,0,0,0,0,0,12,@Thrower,1,450000,0,0,0,8,0,0,0,-293.212,-1912.51,91.6673,1.42794,'Horde Axe Thrower: On death summon Horde Axe Thrower'),
-(@Thrower,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thower: On spawn set random movement'),
-(@Thrower,0,3,0,60,0,100,0,20000,25000,30000,40000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Axe Thower: Say text 0 every 30 to 40 seconds'),
-(@Defender,0,0,0,6,0,100,0,0,0,0,0,1,1,0,0,0,0,0,9,@Deathgate,0,300,0,0,0,0,'Horde Axe Thrower: On death Regthar Deathgate say text 1'),
-(@Defender,0,1,0,6,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-280.703,-1908.01,91.6668,1.77351,'Horde Defender: On death summon Horde Defender'),
-(@Defender,0,2,0,11,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Horde Defender: On spawn set random movement'),
-(@Deathgate,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On respawn set phase 1 (p0)'),
-(@Deathgate,0,1,0,19,1,100,0,@Counterattack,0,0,0,1,0,0,0,0,0,0,18,15,0,0,0,0,0,0,'Regthar Deathgate: On quest accept say text 0 (p1)'),
-(@Deathgate,0,2,0,19,1,100,0,@Counterattack,0,0,0,22,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Regthar Deathgate: On quest accept set event phase 2 (p1)'),
-(@Deathgate,0,3,0,19,2,100,0,@Counterattack,0,0,0,80,@Deathgate*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On quest accept call main script (p2)'),
-(@Deathgate,0,4,0,62,1,100,0,@Gossip,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Regthar Deathgate: On gossip select say text 0 (p1)'),
-(@Deathgate,0,5,0,62,4,100,0,@Gossip,0,0,0,80,@Deathgate*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On gossip select call main script (p4)'),
-(@Deathgate*100,9,0,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-280.703,-1908.01,91.6668,1.77351,'Counterattack!: Summon Horde Axe Thrower 1'),
-(@Deathgate*100,9,1,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-286.384,-1910.99,91.6668,1.59444,'Counterattack!: Summon Horde Defender 2'),
-(@Deathgate*100,9,2,0,0,0,100,0,0,0,0,0,12,@Defender,1,450000,0,0,0,8,0,0,0,-297.373,-1917.11,91.6746,1.81435,'Counterattack!: Summon Horde Defender 3'),
-(@Deathgate*100,9,3,0,0,0,100,0,0,0,0,0,12,@Thrower,1,450000,0,0,0,8,0,0,0,-293.212,-1912.51,91.6673,1.42794,'Counterattack!: Summon Horde Axe Thrower 1'),
-(@Deathgate*100,9,4,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-280.037,-1888.35,92.2549,2.28087,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,5,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-292.107,-1899.54,91.667,4.78158,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,6,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-305.57,-1869.88,92.7754,2.45131,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,7,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-289.972,-1882.76,92.5714,3.43148,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,8,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-277.454,-1873.39,92.7773,4.75724,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,9,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-271.581,-1847.51,93.4329,4.39124,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,10,0,0,0,100,0,0,0,0,0,12,@Invader,1,450000,0,0,0,8,0,0,0,-269.982,-1828.6,92.4754,4.68655,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,11,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-279.267,-1827.92,92.3128,1.35332,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,12,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-297.42,-1847.41,93.2295,5.80967,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,13,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-310.607,-1831.89,95.9363,0.371571,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,14,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-329.177,-1842.43,95.3891,0.516085,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,15,0,0,0,100,0,0,0,0,0,12,@Stormseer,1,450000,0,0,0,8,0,0,0,-324.448,-1860.63,94.3221,4.97793,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,16,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-290.588,-1858,92.5026,4.14698,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,17,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-286.103,-1846.18,92.544,6.11047,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,18,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-304.978,-1844.7,94.4432,1.61721,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,19,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-308.105,-1859.08,93.8039,2.80709,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,20,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-297.089,-1867.68,92.5601,2.21804,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,21,0,0,0,100,0,20000,30000,0,0,12,@Stormseer,1,250000,0,0,0,8,0,0,0,-286.988,-1876.47,92.7447,1.39494,'Counterattack!: Summon Kolkar Stormseer'),
-(@Deathgate*100,9,22,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-291.86,-1893.04,92.0213,1.96121,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,23,0,0,0,100,0,20000,30000,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-298.297,-1846.85,93.3672,4.97792,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,24,0,0,0,100,0,0,0,0,0,12,@Invader,1,250000,0,0,0,8,0,0,0,-294.942,-1845.88,93.0999,4.86797,'Counterattack!: Summon Kolkar Invader'),
-(@Deathgate*100,9,25,0,0,0,100,0,0,0,0,0,12,@Kromzar,1,250000,0,0,0,8,0,0,0,-296.718,-1846.38,93.2334,5.02897,'Counterattack!: Summon Warlord Kromzar'),
-(@Deathgate*100,9,26,0,0,0,100,0,20000,20000,0,0,22,4,1,450000,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: set phase 4'), -- if player does not finish this quest this time s/he can come back later'
-(@Deathgate*100,9,27,0,0,0,100,0,2*3600*1000,2*3600*1000,0,0,22,1,1,450000,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: set phase 1'), -- after 2 hours reset everything (event start on quest accept)'
-(@Deathgate,0,7,0,20,10,100,0,@Counterattack,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Regthar Deathgate: On quest reward set phase 1');
-
-DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (@Deathgate,@Kromzar,@Stormseer,@Invader,@Thrower,@Defender ); -- 16 EAI scripts
diff --git a/sql/old/3.3.5a/2011_02_23_9_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_23_9_world_spell_linked_spell.sql
deleted file mode 100644
index 8a636b3b589..00000000000
--- a/sql/old/3.3.5a/2011_02_23_9_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 55814 AND `spell_effect` = 55817 ;
-INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
-(55814, 55817, 1, 'Eck Residue');
diff --git a/sql/old/3.3.5a/2011_02_24_00_characters_account_data.sql b/sql/old/3.3.5a/2011_02_24_00_characters_account_data.sql
new file mode 100644
index 00000000000..b4a8ed25e8d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_24_00_characters_account_data.sql
@@ -0,0 +1 @@
+ALTER TABLE `account_data` CHANGE COLUMN `account` `accountId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier';
diff --git a/sql/old/3.3.5a/2011_02_24_01_characters_character_tutorial.sql b/sql/old/3.3.5a/2011_02_24_01_characters_character_tutorial.sql
new file mode 100644
index 00000000000..b5e3594f5b0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_24_01_characters_character_tutorial.sql
@@ -0,0 +1,2 @@
+RENAME TABLE `character_tutorial` TO `account_tutorial`;
+ALTER TABLE `account_tutorial` CHANGE COLUMN `account` `accountId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier';
diff --git a/sql/old/3.3.5a/2011_02_24_0_characters_account_data.sql b/sql/old/3.3.5a/2011_02_24_0_characters_account_data.sql
deleted file mode 100644
index b4a8ed25e8d..00000000000
--- a/sql/old/3.3.5a/2011_02_24_0_characters_account_data.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `account_data` CHANGE COLUMN `account` `accountId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier';
diff --git a/sql/old/3.3.5a/2011_02_24_1_characters_character_tutorial.sql b/sql/old/3.3.5a/2011_02_24_1_characters_character_tutorial.sql
deleted file mode 100644
index b5e3594f5b0..00000000000
--- a/sql/old/3.3.5a/2011_02_24_1_characters_character_tutorial.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-RENAME TABLE `character_tutorial` TO `account_tutorial`;
-ALTER TABLE `account_tutorial` CHANGE COLUMN `account` `accountId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier';
diff --git a/sql/old/3.3.5a/2011_02_25_00_world_creatures.sql b/sql/old/3.3.5a/2011_02_25_00_world_creatures.sql
new file mode 100644
index 00000000000..d2e49048865
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_25_00_world_creatures.sql
@@ -0,0 +1,8 @@
+-- Correct bounding radius and combat reach for Right Arm and Left Arm
+UPDATE `creature_model_info` SET `bounding_radius`=0.31, `combat_reach`=25 WHERE `modelid` IN(28821,28822);
+
+-- Remove static spawns that are spawned by the encounter script and vehicle_accessory table
+DELETE FROM `creature` WHERE `id` IN(32933,32934);
+
+-- Update spawn data
+UPDATE `creature` SET `unit_flags`=33554432, `deathstate`= 1, `MovementType`=0 WHERE `id`=34297;
diff --git a/sql/old/3.3.5a/2011_02_25_01_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_25_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..ae57aad0e93
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_25_01_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=64702;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(64702, 'spell_ulduar_squeezed_lifeless');
diff --git a/sql/old/3.3.5a/2011_02_25_02_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_02_25_02_world_spell_proc_event.sql
new file mode 100644
index 00000000000..aad58f50e30
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_25_02_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE entry = 54646;
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(54646, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0);
diff --git a/sql/old/3.3.5a/2011_02_25_0_world_creatures.sql b/sql/old/3.3.5a/2011_02_25_0_world_creatures.sql
deleted file mode 100644
index d2e49048865..00000000000
--- a/sql/old/3.3.5a/2011_02_25_0_world_creatures.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- Correct bounding radius and combat reach for Right Arm and Left Arm
-UPDATE `creature_model_info` SET `bounding_radius`=0.31, `combat_reach`=25 WHERE `modelid` IN(28821,28822);
-
--- Remove static spawns that are spawned by the encounter script and vehicle_accessory table
-DELETE FROM `creature` WHERE `id` IN(32933,32934);
-
--- Update spawn data
-UPDATE `creature` SET `unit_flags`=33554432, `deathstate`= 1, `MovementType`=0 WHERE `id`=34297;
diff --git a/sql/old/3.3.5a/2011_02_25_1_world_spell_script_names.sql b/sql/old/3.3.5a/2011_02_25_1_world_spell_script_names.sql
deleted file mode 100644
index ae57aad0e93..00000000000
--- a/sql/old/3.3.5a/2011_02_25_1_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=64702;
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(64702, 'spell_ulduar_squeezed_lifeless');
diff --git a/sql/old/3.3.5a/2011_02_25_2_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_02_25_2_world_spell_proc_event.sql
deleted file mode 100644
index aad58f50e30..00000000000
--- a/sql/old/3.3.5a/2011_02_25_2_world_spell_proc_event.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE entry = 54646;
-INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-(54646, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0);
diff --git a/sql/old/3.3.5a/2011_02_26_00_world_sai.sql b/sql/old/3.3.5a/2011_02_26_00_world_sai.sql
new file mode 100644
index 00000000000..5aa62b4d2c6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_00_world_sai.sql
@@ -0,0 +1,35 @@
+-- SAI for Gor'drek
+-- This will remove 2 waypoint scripts that were spamming errors
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=21117;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=21117;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2111700,2111701);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- AI
+(21117,0,0,0,23,0,100,0,12550,0,2000,2000,11,12550,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Add Lightning Shield Aura'),
+(21117,0,1,0,11,0,100,0,0,0,0,0,53,0,21117,1,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Start WP movement'),
+(21117,0,2,0,40,0,100,0,2,21117,0,0,80,2111700,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Load script at WP 2'),
+(21117,0,3,0,40,0,100,0,4,21117,0,0,80,2111701,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Load script at WP 4'),
+-- Script 1
+(2111700,9,0,0,0,0,100,0,0,0,0,0,54,128000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Pause at WP 2'),
+(2111700,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.654867, 'Gor''drek - Turn to 5.654867'),
+(2111700,9,2,0,0,0,100,0,2000,2000,0,0,11,28892,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Cast 42837'),
+(2111700,9,3,0,0,0,100,0,120000,120000,0,0,92,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Stop Casting 42837'),
+-- Script 2
+(2111701,9,0,0,0,0,100,0,0,0,0,0,54,128000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Pause at WP 2'),
+(2111701,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.677482, 'Gor''drek - Turn to 4.677482'),
+(2111701,9,2,0,0,0,100,0,2000,2000,0,0,11,28892,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Cast 42837'),
+(2111701,9,3,0,0,0,100,0,120000,120000,0,0,92,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Stop Casting 42837');
+-- Update position and remove path for Gor'drek
+UPDATE `creature` SET `position_x`=2313.006,`position_y`=6004.879,`position_z`=142.8264,`orientation`=4.677482,`MovementType`=0 WHERE `guid`=74168;
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=74168;
+DELETE FROM `waypoint_data` WHERE `id`=741680;
+DELETE FROM `waypoint_scripts` WHERE `id` IN (224,225);
+-- Remove EAI
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=21117;
+-- Proper waypoints for Gor'drek from sniff
+DELETE FROM `waypoints` WHERE `entry`=21117;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(21117,1,2319.757,6007.015,142.7014,'Gor''drek WP 1'),
+(21117,2,2325.909,6010.899,142.5764,'Gor''drek WP 2'),
+(21117,3,2319.757,6007.015,142.7014,'Gor''drek WP 3'),
+(21117,4,2313.006,6004.879,142.8264,'Gor''drek WP 4');
diff --git a/sql/old/3.3.5a/2011_02_26_01_world_sai.sql b/sql/old/3.3.5a/2011_02_26_01_world_sai.sql
new file mode 100644
index 00000000000..6735f217dd1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_01_world_sai.sql
@@ -0,0 +1,9 @@
+SET @Fairmount = 3393; -- Captain Fairmount
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Fairmount; -- three scripts
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Fairmount AND `source_type`=0);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@Fairmount,0,0,0,4,0,100,0,0,0,0,0,11,9128,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captain Fairmount: On aggro cast Battle Shout self'),
+(@Fairmount,0,1,0,2,0,100,1,0,30,0,0,11,19134,0,0,0,0,0,2,0,0,0,0,0,0,0,'Captain Fairmount: At 30% hp cast Frightening Shout'),
+(@Fairmount,0,2,0,13,0,100,0,5000,5000,0,0,11,12555,0,0,0,0,0,2,0,0,0,0,0,0,0,'Captain Fairmount: On enemy casting cast Pummel');
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@Fairmount;
+UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid`=1855; -- correct wrong model data, thanks Kaelima
diff --git a/sql/old/3.3.5a/2011_02_26_02_world_sai.sql b/sql/old/3.3.5a/2011_02_26_02_world_sai.sql
new file mode 100644
index 00000000000..89ac05757c4
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_02_world_sai.sql
@@ -0,0 +1,117 @@
+-- Quest 11344 "Anguish of Nifflevar"
+-- Spawn King Ymiron & Ancient Citizens of Nifflevar (24322,24323)
+SET @GUID := 151840; -- 53 required
+DELETE FROM `creature` WHERE `id` IN (24321,24322,24323);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID,24321,571,1,2,0,0,913.322571,-5580.623535,201.560135,1.169371,300,0,0,1,0,0,0,0,0,0),
+(@GUID+1,24322,571,1,2,0,0,911.649536,-5561.338867,193.473511,4.799655,300,0,0,1,0,0,0,0,0,0),
+(@GUID+2,24322,571,1,2,0,0,907.117493,-5537.400879,192.382034,4.869469,300,0,0,1,0,0,0,0,0,0),
+(@GUID+3,24322,571,1,2,0,0,918.257690,-5544.248535,189.321060,4.572762,300,0,0,1,0,0,0,0,0,0),
+(@GUID+4,24322,571,1,2,0,0,914.562317,-5522.900391,194.128143,4.677482,300,0,0,1,0,0,0,0,0,0),
+(@GUID+5,24322,571,1,2,0,0,918.760193,-5563.743652,190.615295,4.398230,300,0,0,1,0,0,0,0,0,0),
+(@GUID+6,24322,571,1,2,0,0,907.657227,-5558.532715,194.031952,4.974188,300,0,0,1,0,0,0,0,0,0),
+(@GUID+7,24322,571,1,2,0,0,919.950439,-5557.877441,190.155640,4.433136,300,0,0,1,0,0,0,0,0,0),
+(@GUID+8,24322,571,1,2,0,0,901.456604,-5555.405762,194.423370,5.148721,300,0,0,1,0,0,0,0,0,0),
+(@GUID+9,24322,571,1,2,0,0,917.626770,-5553.712402,190.210724,4.555309,300,0,0,1,0,0,0,0,0,0),
+(@GUID+10,24322,571,1,2,0,0,917.515747,-5529.253418,192.039810,4.625123,300,0,0,1,0,0,0,0,0,0),
+(@GUID+11,24322,571,1,2,0,0,929.798828,-5579.141113,184.931671,3.263766,300,0,0,1,0,0,0,0,0,0),
+(@GUID+12,24322,571,1,2,0,0,925.442383,-5571.049316,187.266571,3.839724,300,0,0,1,0,0,0,0,0,0),
+(@GUID+13,24322,571,1,2,0,0,922.322693,-5531.354492,189.792633,4.520403,300,0,0,1,0,0,0,0,0,0),
+(@GUID+14,24322,571,1,2,0,0,914.473938,-5533.336426,192.314362,4.677482,300,0,0,1,0,0,0,0,0,0),
+(@GUID+15,24322,571,1,2,0,0,898.829895,-5539.486816,193.249542,5.061455,300,0,0,1,0,0,0,0,0,0),
+(@GUID+16,24322,571,1,2,0,0,934.146912,-5528.458496,187.373657,4.328416,300,0,0,1,0,0,0,0,0,0),
+(@GUID+17,24322,571,1,2,0,0,951.450745,-5546.908691,185.516861,3.857178,300,0,0,1,0,0,0,0,0,0),
+(@GUID+18,24322,571,1,2,0,0,937.627197,-5573.079590,186.163086,3.455752,300,0,0,1,0,0,0,0,0,0),
+(@GUID+19,24322,571,1,2,0,0,951.077820,-5562.566895,184.759872,3.595378,300,0,0,1,0,0,0,0,0,0),
+(@GUID+20,24322,571,1,2,0,0,933.675659,-5544.941895,186.067123,4.188790,300,0,0,1,0,0,0,0,0,0),
+(@GUID+21,24322,571,1,2,0,0,937.109619,-5553.085938,185.877472,3.996804,300,0,0,1,0,0,0,0,0,0),
+(@GUID+22,24322,571,1,2,0,0,949.577271,-5571.852539,185.366730,3.385939,300,0,0,1,0,0,0,0,0,0),
+(@GUID+23,24322,571,1,2,0,0,936.470398,-5562.455566,186.809601,3.822271,300,0,0,1,0,0,0,0,0,0),
+(@GUID+24,24322,571,1,2,0,0,938.413879,-5547.399902,185.824203,4.066617,300,0,0,1,0,0,0,0,0,0),
+(@GUID+25,24322,571,1,2,0,0,955.932312,-5541.443848,185.481186,3.892084,300,0,0,1,0,0,0,0,0,0),
+(@GUID+26,24322,571,1,2,0,0,943.289490,-5552.288086,185.451431,3.909538,300,0,0,1,0,0,0,0,0,0),
+(@GUID+27,24322,571,1,2,0,0,945.767151,-5536.810547,187.226501,4.066617,300,0,0,1,0,0,0,0,0,0),
+(@GUID+28,24322,571,1,2,0,0,936.005432,-5533.506348,187.474640,4.258604,300,0,0,1,0,0,0,0,0,0),
+(@GUID+29,24322,571,1,2,0,0,940.907532,-5562.951660,186.208282,3.717551,300,0,0,1,0,0,0,0,0,0),
+(@GUID+30,24323,571,1,2,0,0,913.934875,-5540.195801,190.576599,4.694936,300,0,0,1,0,0,0,0,0,0),
+(@GUID+31,24323,571,1,2,0,0,911.285278,-5528.675293,193.913025,4.764749,300,0,0,1,0,0,0,0,0,0),
+(@GUID+32,24323,571,1,2,0,0,908.860596,-5550.749512,192.935822,4.869469,300,0,0,1,0,0,0,0,0,0),
+(@GUID+33,24323,571,1,2,0,0,926.252625,-5554.952637,188.244858,4.241150,300,0,0,1,0,0,0,0,0,0),
+(@GUID+34,24323,571,1,2,0,0,927.767273,-5549.813477,187.309235,4.276057,300,0,0,1,0,0,0,0,0,0),
+(@GUID+35,24323,571,1,2,0,0,924.092590,-5543.457520,187.883835,4.433136,300,0,0,1,0,0,0,0,0,0),
+(@GUID+36,24323,571,1,2,0,0,926.421143,-5563.162598,188.220581,4.084070,300,0,0,1,0,0,0,0,0,0),
+(@GUID+37,24323,571,1,2,0,0,931.465698,-5537.858887,187.133362,4.310963,300,0,0,1,0,0,0,0,0,0),
+(@GUID+38,24323,571,1,2,0,0,903.491638,-5545.229004,192.859741,4.991642,300,0,0,1,0,0,0,0,0,0),
+(@GUID+39,24323,571,1,2,0,0,914.416138,-5547.484375,190.819977,4.677482,300,0,0,1,0,0,0,0,0,0),
+(@GUID+40,24323,571,1,2,0,0,932.521729,-5568.607910,187.107620,3.717551,300,0,0,1,0,0,0,0,0,0),
+(@GUID+41,24323,571,1,2,0,0,932.666260,-5559.350098,187.348434,3.979351,300,0,0,1,0,0,0,0,0,0),
+(@GUID+42,24323,571,1,2,0,0,913.796448,-5555.000488,192.018814,4.694936,300,0,0,1,0,0,0,0,0,0),
+(@GUID+43,24323,571,1,2,0,0,932.566406,-5549.750977,186.291962,4.153883,300,0,0,1,0,0,0,0,0,0),
+(@GUID+44,24323,571,1,2,0,0,921.767151,-5549.706543,188.552811,4.450590,300,0,0,1,0,0,0,0,0,0),
+(@GUID+45,24323,571,1,2,0,0,910.815247,-5543.295410,191.321259,4.782202,300,0,0,1,0,0,0,0,0,0),
+(@GUID+46,24323,571,1,2,0,0,927.373047,-5532.523926,188.151520,4.415683,300,0,0,1,0,0,0,0,0,0),
+(@GUID+47,24323,571,1,2,0,0,945.812073,-5543.786621,186.478867,3.996804,300,0,0,1,0,0,0,0,0,0),
+(@GUID+48,24323,571,1,2,0,0,941.300110,-5580.629395,186.328186,3.159046,300,0,0,1,0,0,0,0,0,0),
+(@GUID+49,24323,571,1,2,0,0,944.829895,-5566.057617,185.812531,3.577925,300,0,0,1,0,0,0,0,0,0),
+(@GUID+50,24323,571,1,2,0,0,950.293091,-5554.961914,184.850952,3.752458,300,0,0,1,0,0,0,0,0,0),
+(@GUID+51,24323,571,1,2,0,0,940.116882,-5538.732910,187.230682,4.136430,300,0,0,1,0,0,0,0,0,0),
+(@GUID+52,24323,571,1,2,0,0,944.395813,-5558.648438,185.427444,3.752458,300,0,0,1,0,0,0,0,0,0);
+
+-- SAI for King Ymiron & Ancient Citizen of Nifflevar (24322,24323)
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768,`AIName`= 'SmartAI' WHERE `entry` IN (24321,24322,24323);
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (24321,24322,24323);
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2432100);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(24321,0,0,0,1,0,100,0,15000,15000,120000,120000,80,2432100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'King Ymiron - Run script every 2 min'),
+(24321,0,1,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'King Ymiron - Set React State civilian'),
+(2432100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,10,@GUID+34,24323,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 0'),
+(2432100,9,1,0,0,0,100,0,8000,8000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(2432100,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,10,@GUID+8,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 0'),
+(2432100,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 1'),
+(2432100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 2'),
+(2432100,9,5,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 3'),
+(2432100,9,6,0,0,0,100,0,5000,5000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 4'),
+(2432100,9,7,0,0,0,100,0,4000,4000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote say'),
+(2432100,9,8,0,0,0,100,0,4000,4000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 5'),
+(2432100,9,9,0,0,0,100,0,4000,4000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote say'),
+(2432100,9,10,0,0,0,100,0,4000,4000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 6'),
+(2432100,9,11,0,0,0,100,0,4000,4000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote question'),
+(2432100,9,12,0,0,0,100,0,4000,4000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 7'),
+(2432100,9,13,0,0,0,100,0,3000,3000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 8'),
+(2432100,9,14,0,0,0,100,0,2000,2000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 9'),
+(2432100,9,15,0,0,0,100,0,3000,3000,0,0,5,53,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote battleroar'),
+(2432100,9,16,0,0,0,100,0,9000,9000,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 10'),
+(2432100,9,17,0,0,0,100,0,3000,3000,0,0,5,53,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote battleroar'),
+(2432100,9,18,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,10,@GUID+26,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 1'),
+(2432100,9,19,0,0,0,100,0,0,0,0,0,11,43468,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Secrets of Nifflevar'),
+(2432100,9,20,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,10,@GUID+5,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 2'),
+(2432100,9,21,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,10,@GUID+41,24323,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 1'),
+(24322,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24322) - Set React State civilian'),
+(24322,0,1,0,1,0,100,0,1000,10000,8000,10000,10,4,53,113,397,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24322) - Play random emote'),
+(24323,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24323) - Set React State civilian'),
+(24323,0,1,0,1,0,100,0,1000,10000,8000,10000,10,4,53,113,397,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24323) - Play random emote');
+
+-- Spell Condition for 43468
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (43468);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,43468,0,18,1,0,0,0, '', 'Spell 43468 target player');
+
+-- NPC talk text insert from sniff for King Ymiron & Ancient Citizens of Nifflevar
+DELETE FROM `creature_text` WHERE `entry` IN (24321,24322,24323);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24321,0,0,'%s motions for silence.',2,0,100,397,0,0, 'King Ymiron emote'),
+(24321,1,0,'Vrykul, your king implores you to listen!',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,2,0,'The crowd gasps in horror.',2,0,100,53,0,0, 'King Ymiron emote'),
+(24321,3,0,'Even now, in our darkest hour, they mock us!',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,4,0,'Where are the titans in our time of greatest need? Our women birth abberations - disfigured runts unable to even stand on their own! Weak and ugly... Useless...',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,5,0,'Ymiron has toiled. Long have I sat upon my throne and thought hard of our plight. There is only one answer... one reason...',1,0,100,22,0,0, 'King Ymiron yell'),
+(24321,6,0,'For who but the titans themselves could bestow such a curse? What could have such power?',1,0,100,1,0,0, 'King Ymiron yell'),
+(24321,7,0,'And the answer is nothing... For it is the titans that have cursed us!',1,0,100,53,0,0, 'King Ymiron yell'),
+(24321,8,0,'The crowd cheers.',2,0,100,0,0,0, 'King Ymiron'),
+(24321,9,0,'On this day all Vrykul will shed their old beliefs! We denounce our old gods! All Vrykul will pledge their allegiance to Ymiron! Ymiron will protect our noble race!',1,0,100,53,0,0, 'King Ymiron yell'),
+(24321,10,0,'And now my first decree upon the Vrykul! All malformed infants born of Vrykul mother and father are to be destroyed upon birth! Our blood must remain pure always! Those found in violation of Ymiron''s decree will be taken to Gjalerbron for execution!',1,0,100,1,0,0, 'King Ymiron yell'),
+(24322,0,0,'Silence!',1,0,100,1,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24322,1,0,'Show them mercy, my king! They are of our flesh and blood!',1,0,100,53,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24322,2,0,'All hail our glorious king, Ymiron!',1,0,100,53,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24323,0,0,'Show the abberations no mercy, Ymiron!',1,0,100,1,0,0, 'Ancient Citizen of Nifflevar yell'),
+(24323,1,0,'They weaken us! Our strength is dilluted by their very existence! Destroy them all!',1,0,100,113,0,0, 'Ancient Citizen of Nifflevar yell');
diff --git a/sql/old/3.3.5a/2011_02_26_03_world_creatures.sql b/sql/old/3.3.5a/2011_02_26_03_world_creatures.sql
new file mode 100644
index 00000000000..b8dc70fea7d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_03_world_creatures.sql
@@ -0,0 +1,2 @@
+UPDATE `creature` SET `spawndist`=0 WHERE `guid`=137582;
+DELETE FROM `creature_addon` WHERE `guid` IN (136768,136769);
diff --git a/sql/old/3.3.5a/2011_02_26_04_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_26_04_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..fe15af01a64
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_04_world_spell_linked_spell.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_effect`=55475;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(55428,55475,0, 'Lifeblood (Rank 1)'),
+(55480,55475,0, 'Lifeblood (Rank 2)'),
+(55500,55475,0, 'Lifeblood (Rank 3)'),
+(55501,55475,0, 'Lifeblood (Rank 4)'),
+(55502,55475,0, 'Lifeblood (Rank 5)'),
+(55503,55475,0, 'Lifeblood (Rank 6)');
diff --git a/sql/old/3.3.5a/2011_02_26_05_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_26_05_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..f19aca71b24
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_26_05_world_npc_spellclick_spells.sql
@@ -0,0 +1,68 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (SELECT `npc_entry` FROM `npc_spellclick_spells`); 
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (32640,32633,31861,31862,25743,27661,27258,27755,27756,27692,40725,32286,29929,29602,29709,27626,28851,
+34120,30403,26813,26523,27496,27714,27996,28605,28606,28607,28833,30066,32930,28312,32627,33060,33067,33062,33109,34994,30234,27629,27924,28061,28192,28669,
+28670,28817,28864,2914,29460,29679,29918,30468,30470,35064,30585,30645,33217,33319,33321,33519,33844,33845,39714);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(32640,61424,0,0,0,1,0,0,0),  -- Traveler's Tundra Mammoth
+(32633,61424,0,0,0,1,0,0,0),  -- Traveler's Tundra Mammoth
+(31861,61466,0,0,0,1,0,0,0),  -- Grand Black War Mammoth
+(31862,61466,0,0,0,1,0,0,0),  -- Grand Black War Mammoth
+(25743,46260,0,0,0,1,0,0,0),  -- Wooly Mammoth Bull
+(27661,48365,0,0,0,1,0,0,0),  -- Wintergarde Gryphon
+(27258,48365,0,0,0,1,0,0,0),  -- Wintergarde Gryphoworldn
+(27755,49460,0,0,0,1,0,0,0),  -- Amber Drake
+(27756,49464,0,0,0,1,0,0,0),  -- Ruby Drake
+(27692,49346,0,0,0,1,0,0,0),  -- Emerald Drake
+(40725,75953,0,0,0,1,0,0,0),  -- X-53 Touring Rocket
+(32286,61666,0,0,0,1,0,0,0),  -- Mekgineer's Chopper
+(29929,58961,0,0,0,1,0,0,0),  -- Mechano-hog
+(29602,54908,0,0,0,1,0,0,0),  -- Icefang
+(29709,55029,0,0,0,1,0,0,0),  -- Freed Proto-Drake
+(27626,49138,0,0,0,1,0,0,0),  -- Tatjana's Horse
+(28851,52600,0,0,0,1,0,0,0),  -- Enraged Mammoth
+(34120,55089,0,0,0,1,0,0,0),  -- Brann's Flying Machine
+(30403,56699,0,0,0,1,0,0,0),  -- Nergeld
+(26813,47424,0,0,0,1,0,0,0),  -- Kor'kron War Rider
+(26523,48296,0,0,0,1,0,0,0),  -- Forsaken Blight Spreader
+(27496,48881,0,0,0,1,0,0,0),  -- Refurbished Shredder
+(27714,49584,0,0,0,1,0,0,0),  -- 7th Legion Chain Gun
+(27996,50343,0,0,0,1,0,0,0),  -- Wyrmrest Vanquisher
+(28605,52263,0,0,0,1,0,0,0),  -- Havenshire Stallion
+(28606,52263,0,0,0,1,0,0,0),  -- Havenshire Mare
+(28607,52263,0,0,0,1,0,0,0),  -- Havenshire Colt
+(28833,52447,0,0,0,1,0,0,0),  -- Scarlet Cannon
+(30066,56678,0,0,0,1,0,0,0),  -- Argent Skytalon
+(28312,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(32627,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(33060,65031,0,0,0,1,0,0,0),  -- Salvaged Siege Engine
+(33067,65031,0,0,0,1,0,0,0),  -- Salvaged Siege Turret
+(33062,65030,0,0,0,1,0,0,0),  -- Salvaged Chopper
+(33109,62309,0,0,0,1,0,0,0),  -- Salvaged Demolisher
+(34944,68458,0,0,0,1,0,0,0),  -- Keep Cannon
+-- These use a 'proxy' cast. They summon a similar creature with SummonProperties.category = 4
+(30234,56378,0,0,0,1,0,0,0),  -- Hover Disk
+(27629,49207,0,0,0,1,0,0,0),  -- Wyrmrest Defender
+(27924,50007,0,0,0,1,0,0,0),  -- Dragonflayer Harpoon
+(28061,50557,0,0,0,1,0,0,0),  -- Wintergarde Gryphon
+(28192,50860,0,0,0,1,0,0,0),  -- Archmage Pentarus' Flying Machine
+(28669,52190,0,0,0,1,0,0,0),  -- Flying Fiend
+(28670,53173,0,0,0,1,0,0,0),  -- Frostblood Vanquisher
+(28817,52462,0,0,0,1,0,0,0),  -- Mine Car
+(28864,52589,0,0,0,1,0,0,0),  -- Scourge Gryphon
+(29414,18277,0,0,0,1,0,0,0),  -- Bone Gryphon
+(29460,54513,0,0,0,1,0,0,0),  -- Frigit Proto-Drake
+(29679,54952,0,0,0,1,0,0,0),  -- Hyldsmeet Proto-Drake
+(29918,54301,0,0,0,1,0,0,0),  -- Warbear Matriarch
+(30468,56795,0,0,0,1,0,0,0),  -- Harnessed Icemaw Matriarch
+(30470,56839,0,0,0,1,0,0,0),  -- Skybreaker Cloudbuster
+(30564,57401,0,0,0,1,0,0,0),  -- Njorndar Proto-Drake
+(30585,57418,0,0,0,1,0,0,0),  -- Hammerhead
+(30645,57612,0,0,0,1,0,0,0),  -- Water Terror
+(33217,62774,0,0,0,1,0,0,0),  -- Stormwind Steed
+(33319,62782,0,0,0,1,0,0,0),  -- Darnassian Nightsaber
+(33321,62784,0,0,0,1,0,0,0),  -- Darkspear Raptor
+(33519,63163,0,0,0,1,0,0,0),  -- Black Knight's Gryphon
+(33844,63791,0,0,0,1,0,0,0),  -- Sunreaver Hawkstrider
+(33845,63792,0,0,0,1,0,0,0),  -- Quel'dorei Steed
+(39714,74205,0,0,0,1,0,0,0);  -- Shooting Mechano-Tank
diff --git a/sql/old/3.3.5a/2011_02_26_0_world_sai.sql b/sql/old/3.3.5a/2011_02_26_0_world_sai.sql
deleted file mode 100644
index 5aa62b4d2c6..00000000000
--- a/sql/old/3.3.5a/2011_02_26_0_world_sai.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- SAI for Gor'drek
--- This will remove 2 waypoint scripts that were spamming errors
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=21117;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=21117;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2111700,2111701);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
--- AI
-(21117,0,0,0,23,0,100,0,12550,0,2000,2000,11,12550,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Add Lightning Shield Aura'),
-(21117,0,1,0,11,0,100,0,0,0,0,0,53,0,21117,1,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Start WP movement'),
-(21117,0,2,0,40,0,100,0,2,21117,0,0,80,2111700,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Load script at WP 2'),
-(21117,0,3,0,40,0,100,0,4,21117,0,0,80,2111701,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Load script at WP 4'),
--- Script 1
-(2111700,9,0,0,0,0,100,0,0,0,0,0,54,128000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Pause at WP 2'),
-(2111700,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.654867, 'Gor''drek - Turn to 5.654867'),
-(2111700,9,2,0,0,0,100,0,2000,2000,0,0,11,28892,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Cast 42837'),
-(2111700,9,3,0,0,0,100,0,120000,120000,0,0,92,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Stop Casting 42837'),
--- Script 2
-(2111701,9,0,0,0,0,100,0,0,0,0,0,54,128000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Pause at WP 2'),
-(2111701,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.677482, 'Gor''drek - Turn to 4.677482'),
-(2111701,9,2,0,0,0,100,0,2000,2000,0,0,11,28892,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Cast 42837'),
-(2111701,9,3,0,0,0,100,0,120000,120000,0,0,92,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Gor''drek - Stop Casting 42837');
--- Update position and remove path for Gor'drek
-UPDATE `creature` SET `position_x`=2313.006,`position_y`=6004.879,`position_z`=142.8264,`orientation`=4.677482,`MovementType`=0 WHERE `guid`=74168;
-UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=74168;
-DELETE FROM `waypoint_data` WHERE `id`=741680;
-DELETE FROM `waypoint_scripts` WHERE `id` IN (224,225);
--- Remove EAI
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=21117;
--- Proper waypoints for Gor'drek from sniff
-DELETE FROM `waypoints` WHERE `entry`=21117;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(21117,1,2319.757,6007.015,142.7014,'Gor''drek WP 1'),
-(21117,2,2325.909,6010.899,142.5764,'Gor''drek WP 2'),
-(21117,3,2319.757,6007.015,142.7014,'Gor''drek WP 3'),
-(21117,4,2313.006,6004.879,142.8264,'Gor''drek WP 4');
diff --git a/sql/old/3.3.5a/2011_02_26_1_world_sai.sql b/sql/old/3.3.5a/2011_02_26_1_world_sai.sql
deleted file mode 100644
index 6735f217dd1..00000000000
--- a/sql/old/3.3.5a/2011_02_26_1_world_sai.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-SET @Fairmount = 3393; -- Captain Fairmount
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Fairmount; -- three scripts
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=@Fairmount AND `source_type`=0);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@Fairmount,0,0,0,4,0,100,0,0,0,0,0,11,9128,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captain Fairmount: On aggro cast Battle Shout self'),
-(@Fairmount,0,1,0,2,0,100,1,0,30,0,0,11,19134,0,0,0,0,0,2,0,0,0,0,0,0,0,'Captain Fairmount: At 30% hp cast Frightening Shout'),
-(@Fairmount,0,2,0,13,0,100,0,5000,5000,0,0,11,12555,0,0,0,0,0,2,0,0,0,0,0,0,0,'Captain Fairmount: On enemy casting cast Pummel');
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@Fairmount;
-UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid`=1855; -- correct wrong model data, thanks Kaelima
diff --git a/sql/old/3.3.5a/2011_02_26_2_world_sai.sql b/sql/old/3.3.5a/2011_02_26_2_world_sai.sql
deleted file mode 100644
index 89ac05757c4..00000000000
--- a/sql/old/3.3.5a/2011_02_26_2_world_sai.sql
+++ /dev/null
@@ -1,117 +0,0 @@
--- Quest 11344 "Anguish of Nifflevar"
--- Spawn King Ymiron & Ancient Citizens of Nifflevar (24322,24323)
-SET @GUID := 151840; -- 53 required
-DELETE FROM `creature` WHERE `id` IN (24321,24322,24323);
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
-(@GUID,24321,571,1,2,0,0,913.322571,-5580.623535,201.560135,1.169371,300,0,0,1,0,0,0,0,0,0),
-(@GUID+1,24322,571,1,2,0,0,911.649536,-5561.338867,193.473511,4.799655,300,0,0,1,0,0,0,0,0,0),
-(@GUID+2,24322,571,1,2,0,0,907.117493,-5537.400879,192.382034,4.869469,300,0,0,1,0,0,0,0,0,0),
-(@GUID+3,24322,571,1,2,0,0,918.257690,-5544.248535,189.321060,4.572762,300,0,0,1,0,0,0,0,0,0),
-(@GUID+4,24322,571,1,2,0,0,914.562317,-5522.900391,194.128143,4.677482,300,0,0,1,0,0,0,0,0,0),
-(@GUID+5,24322,571,1,2,0,0,918.760193,-5563.743652,190.615295,4.398230,300,0,0,1,0,0,0,0,0,0),
-(@GUID+6,24322,571,1,2,0,0,907.657227,-5558.532715,194.031952,4.974188,300,0,0,1,0,0,0,0,0,0),
-(@GUID+7,24322,571,1,2,0,0,919.950439,-5557.877441,190.155640,4.433136,300,0,0,1,0,0,0,0,0,0),
-(@GUID+8,24322,571,1,2,0,0,901.456604,-5555.405762,194.423370,5.148721,300,0,0,1,0,0,0,0,0,0),
-(@GUID+9,24322,571,1,2,0,0,917.626770,-5553.712402,190.210724,4.555309,300,0,0,1,0,0,0,0,0,0),
-(@GUID+10,24322,571,1,2,0,0,917.515747,-5529.253418,192.039810,4.625123,300,0,0,1,0,0,0,0,0,0),
-(@GUID+11,24322,571,1,2,0,0,929.798828,-5579.141113,184.931671,3.263766,300,0,0,1,0,0,0,0,0,0),
-(@GUID+12,24322,571,1,2,0,0,925.442383,-5571.049316,187.266571,3.839724,300,0,0,1,0,0,0,0,0,0),
-(@GUID+13,24322,571,1,2,0,0,922.322693,-5531.354492,189.792633,4.520403,300,0,0,1,0,0,0,0,0,0),
-(@GUID+14,24322,571,1,2,0,0,914.473938,-5533.336426,192.314362,4.677482,300,0,0,1,0,0,0,0,0,0),
-(@GUID+15,24322,571,1,2,0,0,898.829895,-5539.486816,193.249542,5.061455,300,0,0,1,0,0,0,0,0,0),
-(@GUID+16,24322,571,1,2,0,0,934.146912,-5528.458496,187.373657,4.328416,300,0,0,1,0,0,0,0,0,0),
-(@GUID+17,24322,571,1,2,0,0,951.450745,-5546.908691,185.516861,3.857178,300,0,0,1,0,0,0,0,0,0),
-(@GUID+18,24322,571,1,2,0,0,937.627197,-5573.079590,186.163086,3.455752,300,0,0,1,0,0,0,0,0,0),
-(@GUID+19,24322,571,1,2,0,0,951.077820,-5562.566895,184.759872,3.595378,300,0,0,1,0,0,0,0,0,0),
-(@GUID+20,24322,571,1,2,0,0,933.675659,-5544.941895,186.067123,4.188790,300,0,0,1,0,0,0,0,0,0),
-(@GUID+21,24322,571,1,2,0,0,937.109619,-5553.085938,185.877472,3.996804,300,0,0,1,0,0,0,0,0,0),
-(@GUID+22,24322,571,1,2,0,0,949.577271,-5571.852539,185.366730,3.385939,300,0,0,1,0,0,0,0,0,0),
-(@GUID+23,24322,571,1,2,0,0,936.470398,-5562.455566,186.809601,3.822271,300,0,0,1,0,0,0,0,0,0),
-(@GUID+24,24322,571,1,2,0,0,938.413879,-5547.399902,185.824203,4.066617,300,0,0,1,0,0,0,0,0,0),
-(@GUID+25,24322,571,1,2,0,0,955.932312,-5541.443848,185.481186,3.892084,300,0,0,1,0,0,0,0,0,0),
-(@GUID+26,24322,571,1,2,0,0,943.289490,-5552.288086,185.451431,3.909538,300,0,0,1,0,0,0,0,0,0),
-(@GUID+27,24322,571,1,2,0,0,945.767151,-5536.810547,187.226501,4.066617,300,0,0,1,0,0,0,0,0,0),
-(@GUID+28,24322,571,1,2,0,0,936.005432,-5533.506348,187.474640,4.258604,300,0,0,1,0,0,0,0,0,0),
-(@GUID+29,24322,571,1,2,0,0,940.907532,-5562.951660,186.208282,3.717551,300,0,0,1,0,0,0,0,0,0),
-(@GUID+30,24323,571,1,2,0,0,913.934875,-5540.195801,190.576599,4.694936,300,0,0,1,0,0,0,0,0,0),
-(@GUID+31,24323,571,1,2,0,0,911.285278,-5528.675293,193.913025,4.764749,300,0,0,1,0,0,0,0,0,0),
-(@GUID+32,24323,571,1,2,0,0,908.860596,-5550.749512,192.935822,4.869469,300,0,0,1,0,0,0,0,0,0),
-(@GUID+33,24323,571,1,2,0,0,926.252625,-5554.952637,188.244858,4.241150,300,0,0,1,0,0,0,0,0,0),
-(@GUID+34,24323,571,1,2,0,0,927.767273,-5549.813477,187.309235,4.276057,300,0,0,1,0,0,0,0,0,0),
-(@GUID+35,24323,571,1,2,0,0,924.092590,-5543.457520,187.883835,4.433136,300,0,0,1,0,0,0,0,0,0),
-(@GUID+36,24323,571,1,2,0,0,926.421143,-5563.162598,188.220581,4.084070,300,0,0,1,0,0,0,0,0,0),
-(@GUID+37,24323,571,1,2,0,0,931.465698,-5537.858887,187.133362,4.310963,300,0,0,1,0,0,0,0,0,0),
-(@GUID+38,24323,571,1,2,0,0,903.491638,-5545.229004,192.859741,4.991642,300,0,0,1,0,0,0,0,0,0),
-(@GUID+39,24323,571,1,2,0,0,914.416138,-5547.484375,190.819977,4.677482,300,0,0,1,0,0,0,0,0,0),
-(@GUID+40,24323,571,1,2,0,0,932.521729,-5568.607910,187.107620,3.717551,300,0,0,1,0,0,0,0,0,0),
-(@GUID+41,24323,571,1,2,0,0,932.666260,-5559.350098,187.348434,3.979351,300,0,0,1,0,0,0,0,0,0),
-(@GUID+42,24323,571,1,2,0,0,913.796448,-5555.000488,192.018814,4.694936,300,0,0,1,0,0,0,0,0,0),
-(@GUID+43,24323,571,1,2,0,0,932.566406,-5549.750977,186.291962,4.153883,300,0,0,1,0,0,0,0,0,0),
-(@GUID+44,24323,571,1,2,0,0,921.767151,-5549.706543,188.552811,4.450590,300,0,0,1,0,0,0,0,0,0),
-(@GUID+45,24323,571,1,2,0,0,910.815247,-5543.295410,191.321259,4.782202,300,0,0,1,0,0,0,0,0,0),
-(@GUID+46,24323,571,1,2,0,0,927.373047,-5532.523926,188.151520,4.415683,300,0,0,1,0,0,0,0,0,0),
-(@GUID+47,24323,571,1,2,0,0,945.812073,-5543.786621,186.478867,3.996804,300,0,0,1,0,0,0,0,0,0),
-(@GUID+48,24323,571,1,2,0,0,941.300110,-5580.629395,186.328186,3.159046,300,0,0,1,0,0,0,0,0,0),
-(@GUID+49,24323,571,1,2,0,0,944.829895,-5566.057617,185.812531,3.577925,300,0,0,1,0,0,0,0,0,0),
-(@GUID+50,24323,571,1,2,0,0,950.293091,-5554.961914,184.850952,3.752458,300,0,0,1,0,0,0,0,0,0),
-(@GUID+51,24323,571,1,2,0,0,940.116882,-5538.732910,187.230682,4.136430,300,0,0,1,0,0,0,0,0,0),
-(@GUID+52,24323,571,1,2,0,0,944.395813,-5558.648438,185.427444,3.752458,300,0,0,1,0,0,0,0,0,0);
-
--- SAI for King Ymiron & Ancient Citizen of Nifflevar (24322,24323)
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768,`AIName`= 'SmartAI' WHERE `entry` IN (24321,24322,24323);
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (24321,24322,24323);
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2432100);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(24321,0,0,0,1,0,100,0,15000,15000,120000,120000,80,2432100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'King Ymiron - Run script every 2 min'),
-(24321,0,1,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'King Ymiron - Set React State civilian'),
-(2432100,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,10,@GUID+34,24323,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 0'),
-(2432100,9,1,0,0,0,100,0,8000,8000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
-(2432100,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,10,@GUID+8,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 0'),
-(2432100,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 1'),
-(2432100,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 2'),
-(2432100,9,5,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 3'),
-(2432100,9,6,0,0,0,100,0,5000,5000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 4'),
-(2432100,9,7,0,0,0,100,0,4000,4000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote say'),
-(2432100,9,8,0,0,0,100,0,4000,4000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 5'),
-(2432100,9,9,0,0,0,100,0,4000,4000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote say'),
-(2432100,9,10,0,0,0,100,0,4000,4000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 6'),
-(2432100,9,11,0,0,0,100,0,4000,4000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote question'),
-(2432100,9,12,0,0,0,100,0,4000,4000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 7'),
-(2432100,9,13,0,0,0,100,0,3000,3000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 8'),
-(2432100,9,14,0,0,0,100,0,2000,2000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 9'),
-(2432100,9,15,0,0,0,100,0,3000,3000,0,0,5,53,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote battleroar'),
-(2432100,9,16,0,0,0,100,0,9000,9000,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 10'),
-(2432100,9,17,0,0,0,100,0,3000,3000,0,0,5,53,0,0,0,0,0,1,0,0,0,0,0,0,0, 'emote battleroar'),
-(2432100,9,18,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,10,@GUID+26,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 1'),
-(2432100,9,19,0,0,0,100,0,0,0,0,0,11,43468,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Cast Secrets of Nifflevar'),
-(2432100,9,20,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,10,@GUID+5,24322,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 2'),
-(2432100,9,21,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,10,@GUID+41,24323,0,0,0,0,0, 'Ancient Citizen of Nifflevar Say text 1'),
-(24322,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24322) - Set React State civilian'),
-(24322,0,1,0,1,0,100,0,1000,10000,8000,10000,10,4,53,113,397,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24322) - Play random emote'),
-(24323,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24323) - Set React State civilian'),
-(24323,0,1,0,1,0,100,0,1000,10000,8000,10000,10,4,53,113,397,0,0,1,0,0,0,0,0,0,0, 'Ancient Citizen of Nifflevar (24323) - Play random emote');
-
--- Spell Condition for 43468
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (43468);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,43468,0,18,1,0,0,0, '', 'Spell 43468 target player');
-
--- NPC talk text insert from sniff for King Ymiron & Ancient Citizens of Nifflevar
-DELETE FROM `creature_text` WHERE `entry` IN (24321,24322,24323);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(24321,0,0,'%s motions for silence.',2,0,100,397,0,0, 'King Ymiron emote'),
-(24321,1,0,'Vrykul, your king implores you to listen!',1,0,100,22,0,0, 'King Ymiron yell'),
-(24321,2,0,'The crowd gasps in horror.',2,0,100,53,0,0, 'King Ymiron emote'),
-(24321,3,0,'Even now, in our darkest hour, they mock us!',1,0,100,22,0,0, 'King Ymiron yell'),
-(24321,4,0,'Where are the titans in our time of greatest need? Our women birth abberations - disfigured runts unable to even stand on their own! Weak and ugly... Useless...',1,0,100,22,0,0, 'King Ymiron yell'),
-(24321,5,0,'Ymiron has toiled. Long have I sat upon my throne and thought hard of our plight. There is only one answer... one reason...',1,0,100,22,0,0, 'King Ymiron yell'),
-(24321,6,0,'For who but the titans themselves could bestow such a curse? What could have such power?',1,0,100,1,0,0, 'King Ymiron yell'),
-(24321,7,0,'And the answer is nothing... For it is the titans that have cursed us!',1,0,100,53,0,0, 'King Ymiron yell'),
-(24321,8,0,'The crowd cheers.',2,0,100,0,0,0, 'King Ymiron'),
-(24321,9,0,'On this day all Vrykul will shed their old beliefs! We denounce our old gods! All Vrykul will pledge their allegiance to Ymiron! Ymiron will protect our noble race!',1,0,100,53,0,0, 'King Ymiron yell'),
-(24321,10,0,'And now my first decree upon the Vrykul! All malformed infants born of Vrykul mother and father are to be destroyed upon birth! Our blood must remain pure always! Those found in violation of Ymiron''s decree will be taken to Gjalerbron for execution!',1,0,100,1,0,0, 'King Ymiron yell'),
-(24322,0,0,'Silence!',1,0,100,1,0,0, 'Ancient Citizen of Nifflevar yell'),
-(24322,1,0,'Show them mercy, my king! They are of our flesh and blood!',1,0,100,53,0,0, 'Ancient Citizen of Nifflevar yell'),
-(24322,2,0,'All hail our glorious king, Ymiron!',1,0,100,53,0,0, 'Ancient Citizen of Nifflevar yell'),
-(24323,0,0,'Show the abberations no mercy, Ymiron!',1,0,100,1,0,0, 'Ancient Citizen of Nifflevar yell'),
-(24323,1,0,'They weaken us! Our strength is dilluted by their very existence! Destroy them all!',1,0,100,113,0,0, 'Ancient Citizen of Nifflevar yell');
diff --git a/sql/old/3.3.5a/2011_02_26_3_world_creatures.sql b/sql/old/3.3.5a/2011_02_26_3_world_creatures.sql
deleted file mode 100644
index b8dc70fea7d..00000000000
--- a/sql/old/3.3.5a/2011_02_26_3_world_creatures.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature` SET `spawndist`=0 WHERE `guid`=137582;
-DELETE FROM `creature_addon` WHERE `guid` IN (136768,136769);
diff --git a/sql/old/3.3.5a/2011_02_26_4_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_02_26_4_world_spell_linked_spell.sql
deleted file mode 100644
index fe15af01a64..00000000000
--- a/sql/old/3.3.5a/2011_02_26_4_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_effect`=55475;
-INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
-(55428,55475,0, 'Lifeblood (Rank 1)'),
-(55480,55475,0, 'Lifeblood (Rank 2)'),
-(55500,55475,0, 'Lifeblood (Rank 3)'),
-(55501,55475,0, 'Lifeblood (Rank 4)'),
-(55502,55475,0, 'Lifeblood (Rank 5)'),
-(55503,55475,0, 'Lifeblood (Rank 6)');
diff --git a/sql/old/3.3.5a/2011_02_26_5_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_26_5_world_npc_spellclick_spells.sql
deleted file mode 100644
index f19aca71b24..00000000000
--- a/sql/old/3.3.5a/2011_02_26_5_world_npc_spellclick_spells.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (SELECT `npc_entry` FROM `npc_spellclick_spells`); 
-
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (32640,32633,31861,31862,25743,27661,27258,27755,27756,27692,40725,32286,29929,29602,29709,27626,28851,
-34120,30403,26813,26523,27496,27714,27996,28605,28606,28607,28833,30066,32930,28312,32627,33060,33067,33062,33109,34994,30234,27629,27924,28061,28192,28669,
-28670,28817,28864,2914,29460,29679,29918,30468,30470,35064,30585,30645,33217,33319,33321,33519,33844,33845,39714);
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
-(32640,61424,0,0,0,1,0,0,0),  -- Traveler's Tundra Mammoth
-(32633,61424,0,0,0,1,0,0,0),  -- Traveler's Tundra Mammoth
-(31861,61466,0,0,0,1,0,0,0),  -- Grand Black War Mammoth
-(31862,61466,0,0,0,1,0,0,0),  -- Grand Black War Mammoth
-(25743,46260,0,0,0,1,0,0,0),  -- Wooly Mammoth Bull
-(27661,48365,0,0,0,1,0,0,0),  -- Wintergarde Gryphon
-(27258,48365,0,0,0,1,0,0,0),  -- Wintergarde Gryphoworldn
-(27755,49460,0,0,0,1,0,0,0),  -- Amber Drake
-(27756,49464,0,0,0,1,0,0,0),  -- Ruby Drake
-(27692,49346,0,0,0,1,0,0,0),  -- Emerald Drake
-(40725,75953,0,0,0,1,0,0,0),  -- X-53 Touring Rocket
-(32286,61666,0,0,0,1,0,0,0),  -- Mekgineer's Chopper
-(29929,58961,0,0,0,1,0,0,0),  -- Mechano-hog
-(29602,54908,0,0,0,1,0,0,0),  -- Icefang
-(29709,55029,0,0,0,1,0,0,0),  -- Freed Proto-Drake
-(27626,49138,0,0,0,1,0,0,0),  -- Tatjana's Horse
-(28851,52600,0,0,0,1,0,0,0),  -- Enraged Mammoth
-(34120,55089,0,0,0,1,0,0,0),  -- Brann's Flying Machine
-(30403,56699,0,0,0,1,0,0,0),  -- Nergeld
-(26813,47424,0,0,0,1,0,0,0),  -- Kor'kron War Rider
-(26523,48296,0,0,0,1,0,0,0),  -- Forsaken Blight Spreader
-(27496,48881,0,0,0,1,0,0,0),  -- Refurbished Shredder
-(27714,49584,0,0,0,1,0,0,0),  -- 7th Legion Chain Gun
-(27996,50343,0,0,0,1,0,0,0),  -- Wyrmrest Vanquisher
-(28605,52263,0,0,0,1,0,0,0),  -- Havenshire Stallion
-(28606,52263,0,0,0,1,0,0,0),  -- Havenshire Mare
-(28607,52263,0,0,0,1,0,0,0),  -- Havenshire Colt
-(28833,52447,0,0,0,1,0,0,0),  -- Scarlet Cannon
-(30066,56678,0,0,0,1,0,0,0),  -- Argent Skytalon
-(28312,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
-(32627,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
-(33060,65031,0,0,0,1,0,0,0),  -- Salvaged Siege Engine
-(33067,65031,0,0,0,1,0,0,0),  -- Salvaged Siege Turret
-(33062,65030,0,0,0,1,0,0,0),  -- Salvaged Chopper
-(33109,62309,0,0,0,1,0,0,0),  -- Salvaged Demolisher
-(34944,68458,0,0,0,1,0,0,0),  -- Keep Cannon
--- These use a 'proxy' cast. They summon a similar creature with SummonProperties.category = 4
-(30234,56378,0,0,0,1,0,0,0),  -- Hover Disk
-(27629,49207,0,0,0,1,0,0,0),  -- Wyrmrest Defender
-(27924,50007,0,0,0,1,0,0,0),  -- Dragonflayer Harpoon
-(28061,50557,0,0,0,1,0,0,0),  -- Wintergarde Gryphon
-(28192,50860,0,0,0,1,0,0,0),  -- Archmage Pentarus' Flying Machine
-(28669,52190,0,0,0,1,0,0,0),  -- Flying Fiend
-(28670,53173,0,0,0,1,0,0,0),  -- Frostblood Vanquisher
-(28817,52462,0,0,0,1,0,0,0),  -- Mine Car
-(28864,52589,0,0,0,1,0,0,0),  -- Scourge Gryphon
-(29414,18277,0,0,0,1,0,0,0),  -- Bone Gryphon
-(29460,54513,0,0,0,1,0,0,0),  -- Frigit Proto-Drake
-(29679,54952,0,0,0,1,0,0,0),  -- Hyldsmeet Proto-Drake
-(29918,54301,0,0,0,1,0,0,0),  -- Warbear Matriarch
-(30468,56795,0,0,0,1,0,0,0),  -- Harnessed Icemaw Matriarch
-(30470,56839,0,0,0,1,0,0,0),  -- Skybreaker Cloudbuster
-(30564,57401,0,0,0,1,0,0,0),  -- Njorndar Proto-Drake
-(30585,57418,0,0,0,1,0,0,0),  -- Hammerhead
-(30645,57612,0,0,0,1,0,0,0),  -- Water Terror
-(33217,62774,0,0,0,1,0,0,0),  -- Stormwind Steed
-(33319,62782,0,0,0,1,0,0,0),  -- Darnassian Nightsaber
-(33321,62784,0,0,0,1,0,0,0),  -- Darkspear Raptor
-(33519,63163,0,0,0,1,0,0,0),  -- Black Knight's Gryphon
-(33844,63791,0,0,0,1,0,0,0),  -- Sunreaver Hawkstrider
-(33845,63792,0,0,0,1,0,0,0),  -- Quel'dorei Steed
-(39714,74205,0,0,0,1,0,0,0);  -- Shooting Mechano-Tank
diff --git a/sql/old/3.3.5a/2011_02_27_00_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_00_world_creature_template.sql
new file mode 100644
index 00000000000..76871b9d534
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_00_world_creature_template.sql
@@ -0,0 +1,29 @@
+-- Some vehicle updates
+UPDATE `creature_template` SET `vehicleid`=25 WHERE `entry`=29144; -- Refurbished Steam Tank
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|264,`vehicleid`=51 WHERE `entry`=27409; -- Ducal's Horse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=`unit_flags`|33600,`vehicleid`=212 WHERE `entry`=30021; -- Enormos
+UPDATE `creature_template` SET `npcflag`=`npcflag`|55957,`unit_flags`=`unit_flags`|8,`speed_walk`=2.8,`vehicleid`=217 WHERE `entry`=30124; -- Snorri
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1,`vehicleid`=354 WHERE `entry`=33357; -- "Spectral Tiger"
+UPDATE `creature_template` SET `vehicleid`=291 WHERE `entry`=32227; -- Skybreaker Suppression Turret
+UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33570816,`speed_walk`=1.6,`speed_run`=2.4285714285714,`vehicleid`=471 WHERE `entry`=35336; -- Horde Boat
+UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33570816,`speed_walk`=1.6,`speed_run`=2.4285714285714,`vehicleid`=472 WHERE `entry`=35335; -- Alliance Boat
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (29144,27409,30021,30124,32227,33357,35336,35335);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(29144,0,0,1,0, NULL), -- Refurbished Steam Tank
+(27409,0,0,1,0, NULL), -- Ducal's Horse
+(30021,0,0,1,0, NULL), -- Enormos
+(30124,0,0,257,0, NULL), -- Snorri
+(32227,0,0,1,0, NULL), -- Skybreaker Suppression Turret
+(33357,0,0,1,0, NULL), -- "Spectral Tiger"
+(35336,0,50331648,257,0, NULL), -- Horde Boat
+(35335,0,50331648,257,0, NULL); -- Alliance Boat
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.248,`combat_reach`=4.8,`gender`=0 WHERE `modelid`=26772; -- Snorri
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=0,`gender`=2 WHERE `modelid`=28811; -- "Spectral Tiger"
+UPDATE `creature_model_info` SET `bounding_radius`=4,`combat_reach`=0,`gender`=2 WHERE `modelid`=29771; -- Horde Boat
+UPDATE `creature_model_info` SET `bounding_radius`=5,`combat_reach`=0,`gender`=2 WHERE `modelid`=29766; -- Alliance Boat
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=33357 AND `spell_id`=75648;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(33357,75648,0,0,0,1,0,0,0); -- "Spectral Tiger"
diff --git a/sql/old/3.3.5a/2011_02_27_01_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_01_world_creature_template.sql
new file mode 100644
index 00000000000..6813dd8d014
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_01_world_creature_template.sql
@@ -0,0 +1,66 @@
+-- Template updates 
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|32 WHERE `entry`=33063; -- Wrecked Siege Engine
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|32 WHERE `entry`=33059; -- Wrecked Demolisher
+UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33662; -- Kirin Tor Battle-Mage
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=33377; -- Mortar Targetting Device
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33686; -- Lore Keeper of Norgannon
+UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33626; -- Hired Engineer
+UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33627; -- Hired Demolitionist
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33624; -- Archmage Pentarus
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=33571; -- Ulduar Gauntlet Generator
+
+-- Model data 
+UPDATE `creature_model_info` SET `bounding_radius`=3,`combat_reach`=2.25,`gender`=2 WHERE `modelid`=27658; -- Wrecked Demolisher
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
+UPDATE `creature_model_info` SET `bounding_radius`=1.4288,`combat_reach`=2.4,`gender`=0 WHERE `modelid`=28781; -- Demolisher Engineer Blastwrench
+UPDATE `creature_model_info` SET `bounding_radius`=0.2625,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=6589; -- Lore Keeper of Norgannon
+UPDATE `creature_model_info` SET `bounding_radius`=0.434,`combat_reach`=1.4,`gender`=0 WHERE `modelid`=28739; -- Goran Steelbreaker
+UPDATE `creature_model_info` SET `bounding_radius`=0.434,`combat_reach`=1.4,`gender`=0 WHERE `modelid`=28739; -- Goran Steelbreaker
+UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1.2,`gender`=0 WHERE `modelid`=26662; -- Earthen Stoneshaper
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=1,`gender`=0 WHERE `modelid`=28581; -- Steelforged Defender
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=1,`gender`=0 WHERE `modelid`=28580; -- Steelforged Defender
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=5233; -- Spirit Healer
+ 
+-- Addon data 
+DELETE FROM `creature_template_addon` WHERE `entry` IN 
+(33059,33063,33662,33672,33167,33626,33060,33377,33062,33067,33579,33669,33214,33109,33666,33701,33686,33696,33622,33627,33779,33620
+,32780,33624,33218,33629,33721,34234,33236,33571);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33059,0,0,257,0, '29266 0 29266 1'), -- Wrecked Demolisher; Auras: Permanent Feign Death
+(33063,0,0,257,0, '29266 0 29266 1'), -- Wrecked Siege Engine; Aura: Permanent Feign Death
+(33060,0,0,257,0, NULL), -- Salvaged Siege Engine
+(33662,0,0,1,0, NULL), -- Kirin Tor Battle-Mage
+(33672,0,0,1,0, NULL), -- Kirin Tor Mage
+(33167,0,0,257,0, NULL), -- Salvaged Demolisher Mechanic Seat
+(33626,0,0,1,0, NULL), -- Hired Engineer
+(33627,0,0,1,0, NULL), -- Hired Demolitionist
+(33377,0,0,1,0, NULL), -- Mortar Targetting Device
+(33062,0,0,257,0, NULL), -- Salvaged Chopper
+(33067,0,0,257,0, NULL), -- Salvaged Siege Turret
+(33579,0,0,1,0, NULL), -- Brann Bronzebeard
+(33669,0,0,257,0, NULL), -- Demolisher Engineer Blastwrench
+(33214,0,50331648,1,0, NULL), -- Mechanolift 304-A
+(33109,0,0,257,0, NULL), -- Salvaged Demolisher
+(33666,0,0,257,0, NULL), -- Demolisher Engineer Blastwrench
+(33701,0,0,1,0, NULL), -- High Explorer Dellorah
+(33686,0,0,1,0, NULL), -- Lore Keeper of Norgannon
+(33696,0,0,1,0, NULL), -- Archmage Rhydian
+(33622,0,0,1,0, NULL), -- Goran Steelbreaker
+(33779,0,0,1,0, NULL), -- Ulduar Shield Bunny
+(33620,0,0,1,0, NULL), -- Earthen Stoneshaper
+(32780,0,0,1,0, NULL), -- Invisible Stalker (All Phases)
+(33624,0,0,1,0, NULL), -- Archmage Pentarus
+(33218,0,0,1,0, NULL), -- Pyrite Safety Container
+(33629,14374,0,257,0, NULL), -- Weslex Quickwrench
+(33721,0,50331648,1,0, NULL), -- Lore Keeper Projection Unit
+(34234,0,0,1,0, NULL), -- Runeforged Sentry
+(33236,0,0,1,27, NULL), -- Steelforged Defender
+(33571,0,0,1,0, NULL); -- Ulduar Gauntlet Generator
+
+-- Addon data for creature 6491 (Spirit Healer)
+UPDATE `creature_template_addon` SET `bytes1`=65536,`bytes2`=1,`mount`=0,`emote`=0,`auras`='10848  0' WHERE `entry`=6491; -- Spirit Healer
+
+DELETE FROM `creature_addon` WHERE `guid` IN (136245,136246,136247,136248,136249); -- Wrecked Siege Engine
+DELETE FROM `creature_addon` WHERE `guid` IN (136073,136074,136087,136088,136089,136090); -- Wrecked Siege Engine
diff --git a/sql/old/3.3.5a/2011_02_27_02_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_27_02_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..dd08b5c1821
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_02_world_npc_spellclick_spells.sql
@@ -0,0 +1,11 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN(28781,27894,32627,32629,28366,28312,28319,28094,27881);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(28781,60683,0,0,0,1,0,0,0),  -- Battleground Demolisher
+(27894,60682,0,0,0,1,0,0,0),  -- Antipersonnel Cannon
+(32627,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(32629,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Turret
+(28366,60962,0,0,0,1,0,0,0),  -- Wintergrasp Tower Cannon
+(28312,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
+(28319,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Turret
+(28094,60968,0,0,0,1,0,0,0),  -- Wintergrasp Demolisher
+(27881,60968,0,0,0,1,0,0,0);  -- Wintergrasp Catapult
diff --git a/sql/old/3.3.5a/2011_02_27_03_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_27_03_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..e4f2c51ea01
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_03_world_npc_spellclick_spells.sql
@@ -0,0 +1,3 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=28366 AND `spell_id`=60962;  -- Wintergrasp Tower Cannon, duplicate from previous rev
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(28366,60962,0,0,0,1,0,0,0);  -- Wintergrasp Tower Cannon'
diff --git a/sql/old/3.3.5a/2011_02_27_04_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_04_world_creature_template.sql
new file mode 100644
index 00000000000..61f568a156e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_27_04_world_creature_template.sql
@@ -0,0 +1,75 @@
+SET @EQUIP := 2427;
+
+UPDATE `creature_template` SET `baseattacktime`=2000,`speed_run`=1.7142857142857 WHERE `entry`=36808; -- Deathspeaker Zealot
+UPDATE `creature_template` SET `baseattacktime`=2000,`speed_run`=1.1428571428571 WHERE `entry`=37012; -- Ancient Skeletal Soldier
+UPDATE `creature_template` SET `baseattacktime`=1000,`unit_flags`=`unit_flags`|33587520,`speed_walk`=2,`speed_run`=1.4285714285714 WHERE `entry`=37007; -- Deathbound Ward
+UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`baseattacktime`=2000,`unit_class`=2,`speed_walk`=2,`speed_run`=1.5873 WHERE `entry`=37528; -- Spire Frostwyrm (Ambient)
+UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`baseattacktime`=2000,`speed_run`=0.99206285714286 WHERE `entry`=37947; -- Deathwhisper Spawn Stalker
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=@EQUIP,`speed_run`=1.1428571428571 WHERE `entry`=37149; -- Kor'kron Necrolyte
+UPDATE `creature_template` SET `faction_A`=83,`faction_H`=83,`baseattacktime`=2000,`unit_flags`=`unit_flags`|32832,`equipment_id`=@EQUIP+1,`speed_run`=1.1428571428571 WHERE `entry`=37034; -- Kor'kron Templar
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10065,`speed_run`=1.1428571428571 WHERE `entry`=37031; -- Kor'kron Oracle
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10064,`speed_run`=1.1428571428571 WHERE `entry`=37033; -- Kor'kron Invoker
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10057,`speed_run`=1.1428571428571 WHERE `entry`=37030; -- Kor'kron Primalist
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10058,`speed_run`=1.1428571428571 WHERE `entry`=37016; -- Skybreaker Luminary
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10069,`speed_run`=1.1428571428571 WHERE `entry`=37148; -- Skybreaker Summoner
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10057,`speed_run`=1.1428571428571 WHERE `entry`=37027; -- Skybreaker Hierophant
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10060,`speed_run`=1.1428571428571 WHERE `entry`=37026; -- Skybreaker Sorcerer
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10062,`speed_run`=1.1428571428571 WHERE `entry`=37003; -- Skybreaker Vindicator
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10068,`speed_run`=1.1428571428571 WHERE `entry`=37035; -- Kor'kron Vanquisher
+UPDATE `creature_template` SET `baseattacktime`=1000,`equipment_id`=@EQUIP+2,`speed_run`=1.1428571428571 WHERE `entry`=37146; -- Kor'kron Sniper
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10063,`speed_run`=1.1428571428571 WHERE `entry`=37032; -- Kor'kron Defender
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10067,`unit_class`=4,`speed_run`=1.1428571428571 WHERE `entry`=37028; -- Kor'kron Stalker
+UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=@EQUIP+3,`speed_run`=1.1428571428571 WHERE `entry`=37029; -- Kor'kron Reaver
+UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|559168,`speed_walk`=0.8,`speed_run`=0.99205714285714 WHERE `entry`=37545; -- Spire Minion
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (37012,36808,37528,37007,37947,37030,37146,37032,37029,37027,37149,37031,37034,37016,37148,37026,37028,37003,37033,37035,37545);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(37012,0,0,1,333, NULL), -- Ancient Skeletal Soldier
+(36808,0,8,1,0, NULL), -- Deathspeaker Zealot
+(37528,0,50331648,1,0, NULL), -- Spire Frostwyrm (Ambient)
+(37007,0,0,0,417, NULL), -- Deathbound Ward
+(37947,0,0,1,0, NULL), -- Deathwhisper Spawn Stalker
+(37030,0,0,1,0, NULL), -- Kor'kron Primalist
+(37146,0,0,1,0, NULL), -- Kor'kron Sniper
+(37032,0,0,1,0, NULL), -- Kor'kron Defender
+(37029,0,0,1,0, NULL), -- Kor'kron Reaver
+(37027,0,0,1,0, NULL), -- Skybreaker Hierophant
+(37149,0,0,1,0, NULL), -- Kor'kron Necrolyte
+(37031,0,0,1,0, NULL), -- Kor'kron Oracle
+(37034,0,0,1,0, NULL), -- Kor'kron Templar
+(37016,0,0,1,0, NULL), -- Skybreaker Luminary
+(37148,0,0,1,0, NULL), -- Skybreaker Summoner
+(37026,0,0,1,0, NULL), -- Skybreaker Sorcerer
+(37028,0,0,1,0, NULL), -- Kor'kron Stalker
+(37003,0,0,1,0, NULL), -- Skybreaker Vindicator
+(37033,0,0,1,0, NULL), -- Kor'kron Invoker
+(37035,0,0,1,0, NULL), -- Kor'kron Vanquisher
+(37545,0,0,1,0, NULL); -- Spire Minion
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.45,`combat_reach`=0.45,`gender`=0 WHERE `modelid`=31124; -- Bone Spike
+UPDATE `creature_model_info` SET `bounding_radius`=0.347222,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30616; -- Ancient Skeletal Soldier
+UPDATE `creature_model_info` SET `bounding_radius`=1.388888,`combat_reach`=6,`gender`=0 WHERE `modelid`=30459; -- Deathbound Ward
+UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30463; -- Skybreaker Luminary
+UPDATE `creature_model_info` SET `bounding_radius`=1.46205,`combat_reach`=6.075,`gender`=0 WHERE `modelid`=30481; -- Kor'kron Primalist
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30531; -- Kor'kron Sniper
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30482; -- Kor'kron Reaver
+UPDATE `creature_model_info` SET `bounding_radius`=0.558,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30475; -- Kor'kron Defender
+UPDATE `creature_model_info` SET `bounding_radius`=0.354,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30486; -- Kor'kron Stalker
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30453; -- Skybreaker Vindicator
+UPDATE `creature_model_info` SET `bounding_radius`=0.5835,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30472; -- Skybreaker Hierophant
+UPDATE `creature_model_info` SET `bounding_radius`=0.52785,`combat_reach`=2.5875,`gender`=1 WHERE `modelid`=30470; -- Skybreaker Sorcerer
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30476; -- Kor'kron Invoker
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30534; -- Kor'kron Necrolyte
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30478; -- Kor'kron Oracle
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30487; -- Kor'kron Templar
+UPDATE `creature_model_info` SET `bounding_radius`=0.312,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30536; -- Skybreaker Summoner
+UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30489; -- Kor'kron Vanquisher
+UPDATE `creature_model_info` SET `bounding_radius`=0.62,`combat_reach`=2,`gender`=2 WHERE `modelid`=30656; -- Spire Minion
+
+
+DELETE FROM `creature_equip_template` WHERE `entry` IN (@EQUIP,@EQUIP+1,@EQUIP+2,@EQUIP+3);
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EQUIP,49764,0,0),
+(@EQUIP+1,49736,0,0),
+(@EQUIP+2,0,0,49762),
+(@EQUIP+3,49733,0,0);
diff --git a/sql/old/3.3.5a/2011_02_27_0_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_0_world_creature_template.sql
deleted file mode 100644
index 76871b9d534..00000000000
--- a/sql/old/3.3.5a/2011_02_27_0_world_creature_template.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- Some vehicle updates
-UPDATE `creature_template` SET `vehicleid`=25 WHERE `entry`=29144; -- Refurbished Steam Tank
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|264,`vehicleid`=51 WHERE `entry`=27409; -- Ducal's Horse
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=`unit_flags`|33600,`vehicleid`=212 WHERE `entry`=30021; -- Enormos
-UPDATE `creature_template` SET `npcflag`=`npcflag`|55957,`unit_flags`=`unit_flags`|8,`speed_walk`=2.8,`vehicleid`=217 WHERE `entry`=30124; -- Snorri
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1,`vehicleid`=354 WHERE `entry`=33357; -- "Spectral Tiger"
-UPDATE `creature_template` SET `vehicleid`=291 WHERE `entry`=32227; -- Skybreaker Suppression Turret
-UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33570816,`speed_walk`=1.6,`speed_run`=2.4285714285714,`vehicleid`=471 WHERE `entry`=35336; -- Horde Boat
-UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33570816,`speed_walk`=1.6,`speed_run`=2.4285714285714,`vehicleid`=472 WHERE `entry`=35335; -- Alliance Boat
-
-DELETE FROM `creature_template_addon` WHERE `entry` IN (29144,27409,30021,30124,32227,33357,35336,35335);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(29144,0,0,1,0, NULL), -- Refurbished Steam Tank
-(27409,0,0,1,0, NULL), -- Ducal's Horse
-(30021,0,0,1,0, NULL), -- Enormos
-(30124,0,0,257,0, NULL), -- Snorri
-(32227,0,0,1,0, NULL), -- Skybreaker Suppression Turret
-(33357,0,0,1,0, NULL), -- "Spectral Tiger"
-(35336,0,50331648,257,0, NULL), -- Horde Boat
-(35335,0,50331648,257,0, NULL); -- Alliance Boat
-
-UPDATE `creature_model_info` SET `bounding_radius`=0.248,`combat_reach`=4.8,`gender`=0 WHERE `modelid`=26772; -- Snorri
-UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=0,`gender`=2 WHERE `modelid`=28811; -- "Spectral Tiger"
-UPDATE `creature_model_info` SET `bounding_radius`=4,`combat_reach`=0,`gender`=2 WHERE `modelid`=29771; -- Horde Boat
-UPDATE `creature_model_info` SET `bounding_radius`=5,`combat_reach`=0,`gender`=2 WHERE `modelid`=29766; -- Alliance Boat
-
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=33357 AND `spell_id`=75648;
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
-(33357,75648,0,0,0,1,0,0,0); -- "Spectral Tiger"
diff --git a/sql/old/3.3.5a/2011_02_27_1_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_1_world_creature_template.sql
deleted file mode 100644
index 6813dd8d014..00000000000
--- a/sql/old/3.3.5a/2011_02_27_1_world_creature_template.sql
+++ /dev/null
@@ -1,66 +0,0 @@
--- Template updates 
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|32 WHERE `entry`=33063; -- Wrecked Siege Engine
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|32 WHERE `entry`=33059; -- Wrecked Demolisher
-UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33662; -- Kirin Tor Battle-Mage
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=33377; -- Mortar Targetting Device
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33686; -- Lore Keeper of Norgannon
-UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33626; -- Hired Engineer
-UPDATE `creature_template` SET `exp`=1 WHERE `entry`=33627; -- Hired Demolitionist
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33624; -- Archmage Pentarus
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=33571; -- Ulduar Gauntlet Generator
-
--- Model data 
-UPDATE `creature_model_info` SET `bounding_radius`=3,`combat_reach`=2.25,`gender`=2 WHERE `modelid`=27658; -- Wrecked Demolisher
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Mortar Targetting Device
-UPDATE `creature_model_info` SET `bounding_radius`=1.4288,`combat_reach`=2.4,`gender`=0 WHERE `modelid`=28781; -- Demolisher Engineer Blastwrench
-UPDATE `creature_model_info` SET `bounding_radius`=0.2625,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=6589; -- Lore Keeper of Norgannon
-UPDATE `creature_model_info` SET `bounding_radius`=0.434,`combat_reach`=1.4,`gender`=0 WHERE `modelid`=28739; -- Goran Steelbreaker
-UPDATE `creature_model_info` SET `bounding_radius`=0.434,`combat_reach`=1.4,`gender`=0 WHERE `modelid`=28739; -- Goran Steelbreaker
-UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1.2,`gender`=0 WHERE `modelid`=26662; -- Earthen Stoneshaper
-UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=1,`gender`=0 WHERE `modelid`=28581; -- Steelforged Defender
-UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=1,`gender`=0 WHERE `modelid`=28580; -- Steelforged Defender
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=5233; -- Spirit Healer
- 
--- Addon data 
-DELETE FROM `creature_template_addon` WHERE `entry` IN 
-(33059,33063,33662,33672,33167,33626,33060,33377,33062,33067,33579,33669,33214,33109,33666,33701,33686,33696,33622,33627,33779,33620
-,32780,33624,33218,33629,33721,34234,33236,33571);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(33059,0,0,257,0, '29266 0 29266 1'), -- Wrecked Demolisher; Auras: Permanent Feign Death
-(33063,0,0,257,0, '29266 0 29266 1'), -- Wrecked Siege Engine; Aura: Permanent Feign Death
-(33060,0,0,257,0, NULL), -- Salvaged Siege Engine
-(33662,0,0,1,0, NULL), -- Kirin Tor Battle-Mage
-(33672,0,0,1,0, NULL), -- Kirin Tor Mage
-(33167,0,0,257,0, NULL), -- Salvaged Demolisher Mechanic Seat
-(33626,0,0,1,0, NULL), -- Hired Engineer
-(33627,0,0,1,0, NULL), -- Hired Demolitionist
-(33377,0,0,1,0, NULL), -- Mortar Targetting Device
-(33062,0,0,257,0, NULL), -- Salvaged Chopper
-(33067,0,0,257,0, NULL), -- Salvaged Siege Turret
-(33579,0,0,1,0, NULL), -- Brann Bronzebeard
-(33669,0,0,257,0, NULL), -- Demolisher Engineer Blastwrench
-(33214,0,50331648,1,0, NULL), -- Mechanolift 304-A
-(33109,0,0,257,0, NULL), -- Salvaged Demolisher
-(33666,0,0,257,0, NULL), -- Demolisher Engineer Blastwrench
-(33701,0,0,1,0, NULL), -- High Explorer Dellorah
-(33686,0,0,1,0, NULL), -- Lore Keeper of Norgannon
-(33696,0,0,1,0, NULL), -- Archmage Rhydian
-(33622,0,0,1,0, NULL), -- Goran Steelbreaker
-(33779,0,0,1,0, NULL), -- Ulduar Shield Bunny
-(33620,0,0,1,0, NULL), -- Earthen Stoneshaper
-(32780,0,0,1,0, NULL), -- Invisible Stalker (All Phases)
-(33624,0,0,1,0, NULL), -- Archmage Pentarus
-(33218,0,0,1,0, NULL), -- Pyrite Safety Container
-(33629,14374,0,257,0, NULL), -- Weslex Quickwrench
-(33721,0,50331648,1,0, NULL), -- Lore Keeper Projection Unit
-(34234,0,0,1,0, NULL), -- Runeforged Sentry
-(33236,0,0,1,27, NULL), -- Steelforged Defender
-(33571,0,0,1,0, NULL); -- Ulduar Gauntlet Generator
-
--- Addon data for creature 6491 (Spirit Healer)
-UPDATE `creature_template_addon` SET `bytes1`=65536,`bytes2`=1,`mount`=0,`emote`=0,`auras`='10848  0' WHERE `entry`=6491; -- Spirit Healer
-
-DELETE FROM `creature_addon` WHERE `guid` IN (136245,136246,136247,136248,136249); -- Wrecked Siege Engine
-DELETE FROM `creature_addon` WHERE `guid` IN (136073,136074,136087,136088,136089,136090); -- Wrecked Siege Engine
diff --git a/sql/old/3.3.5a/2011_02_27_2_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_27_2_world_npc_spellclick_spells.sql
deleted file mode 100644
index dd08b5c1821..00000000000
--- a/sql/old/3.3.5a/2011_02_27_2_world_npc_spellclick_spells.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN(28781,27894,32627,32629,28366,28312,28319,28094,27881);
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
-(28781,60683,0,0,0,1,0,0,0),  -- Battleground Demolisher
-(27894,60682,0,0,0,1,0,0,0),  -- Antipersonnel Cannon
-(32627,60968,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
-(32629,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Turret
-(28366,60962,0,0,0,1,0,0,0),  -- Wintergrasp Tower Cannon
-(28312,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Engine
-(28319,46598,0,0,0,1,0,0,0),  -- Wintergrasp Siege Turret
-(28094,60968,0,0,0,1,0,0,0),  -- Wintergrasp Demolisher
-(27881,60968,0,0,0,1,0,0,0);  -- Wintergrasp Catapult
diff --git a/sql/old/3.3.5a/2011_02_27_3_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_27_3_world_npc_spellclick_spells.sql
deleted file mode 100644
index e4f2c51ea01..00000000000
--- a/sql/old/3.3.5a/2011_02_27_3_world_npc_spellclick_spells.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=28366 AND `spell_id`=60962;  -- Wintergrasp Tower Cannon, duplicate from previous rev
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
-(28366,60962,0,0,0,1,0,0,0);  -- Wintergrasp Tower Cannon'
diff --git a/sql/old/3.3.5a/2011_02_27_4_world_creature_template.sql b/sql/old/3.3.5a/2011_02_27_4_world_creature_template.sql
deleted file mode 100644
index 61f568a156e..00000000000
--- a/sql/old/3.3.5a/2011_02_27_4_world_creature_template.sql
+++ /dev/null
@@ -1,75 +0,0 @@
-SET @EQUIP := 2427;
-
-UPDATE `creature_template` SET `baseattacktime`=2000,`speed_run`=1.7142857142857 WHERE `entry`=36808; -- Deathspeaker Zealot
-UPDATE `creature_template` SET `baseattacktime`=2000,`speed_run`=1.1428571428571 WHERE `entry`=37012; -- Ancient Skeletal Soldier
-UPDATE `creature_template` SET `baseattacktime`=1000,`unit_flags`=`unit_flags`|33587520,`speed_walk`=2,`speed_run`=1.4285714285714 WHERE `entry`=37007; -- Deathbound Ward
-UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`baseattacktime`=2000,`unit_class`=2,`speed_walk`=2,`speed_run`=1.5873 WHERE `entry`=37528; -- Spire Frostwyrm (Ambient)
-UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`baseattacktime`=2000,`speed_run`=0.99206285714286 WHERE `entry`=37947; -- Deathwhisper Spawn Stalker
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=@EQUIP,`speed_run`=1.1428571428571 WHERE `entry`=37149; -- Kor'kron Necrolyte
-UPDATE `creature_template` SET `faction_A`=83,`faction_H`=83,`baseattacktime`=2000,`unit_flags`=`unit_flags`|32832,`equipment_id`=@EQUIP+1,`speed_run`=1.1428571428571 WHERE `entry`=37034; -- Kor'kron Templar
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10065,`speed_run`=1.1428571428571 WHERE `entry`=37031; -- Kor'kron Oracle
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10064,`speed_run`=1.1428571428571 WHERE `entry`=37033; -- Kor'kron Invoker
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10057,`speed_run`=1.1428571428571 WHERE `entry`=37030; -- Kor'kron Primalist
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10058,`speed_run`=1.1428571428571 WHERE `entry`=37016; -- Skybreaker Luminary
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10069,`speed_run`=1.1428571428571 WHERE `entry`=37148; -- Skybreaker Summoner
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10057,`speed_run`=1.1428571428571 WHERE `entry`=37027; -- Skybreaker Hierophant
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10060,`speed_run`=1.1428571428571 WHERE `entry`=37026; -- Skybreaker Sorcerer
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10062,`speed_run`=1.1428571428571 WHERE `entry`=37003; -- Skybreaker Vindicator
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10068,`speed_run`=1.1428571428571 WHERE `entry`=37035; -- Kor'kron Vanquisher
-UPDATE `creature_template` SET `baseattacktime`=1000,`equipment_id`=@EQUIP+2,`speed_run`=1.1428571428571 WHERE `entry`=37146; -- Kor'kron Sniper
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10063,`speed_run`=1.1428571428571 WHERE `entry`=37032; -- Kor'kron Defender
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=10067,`unit_class`=4,`speed_run`=1.1428571428571 WHERE `entry`=37028; -- Kor'kron Stalker
-UPDATE `creature_template` SET `baseattacktime`=2000,`equipment_id`=@EQUIP+3,`speed_run`=1.1428571428571 WHERE `entry`=37029; -- Kor'kron Reaver
-UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|559168,`speed_walk`=0.8,`speed_run`=0.99205714285714 WHERE `entry`=37545; -- Spire Minion
-
-DELETE FROM `creature_template_addon` WHERE `entry` IN (37012,36808,37528,37007,37947,37030,37146,37032,37029,37027,37149,37031,37034,37016,37148,37026,37028,37003,37033,37035,37545);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(37012,0,0,1,333, NULL), -- Ancient Skeletal Soldier
-(36808,0,8,1,0, NULL), -- Deathspeaker Zealot
-(37528,0,50331648,1,0, NULL), -- Spire Frostwyrm (Ambient)
-(37007,0,0,0,417, NULL), -- Deathbound Ward
-(37947,0,0,1,0, NULL), -- Deathwhisper Spawn Stalker
-(37030,0,0,1,0, NULL), -- Kor'kron Primalist
-(37146,0,0,1,0, NULL), -- Kor'kron Sniper
-(37032,0,0,1,0, NULL), -- Kor'kron Defender
-(37029,0,0,1,0, NULL), -- Kor'kron Reaver
-(37027,0,0,1,0, NULL), -- Skybreaker Hierophant
-(37149,0,0,1,0, NULL), -- Kor'kron Necrolyte
-(37031,0,0,1,0, NULL), -- Kor'kron Oracle
-(37034,0,0,1,0, NULL), -- Kor'kron Templar
-(37016,0,0,1,0, NULL), -- Skybreaker Luminary
-(37148,0,0,1,0, NULL), -- Skybreaker Summoner
-(37026,0,0,1,0, NULL), -- Skybreaker Sorcerer
-(37028,0,0,1,0, NULL), -- Kor'kron Stalker
-(37003,0,0,1,0, NULL), -- Skybreaker Vindicator
-(37033,0,0,1,0, NULL), -- Kor'kron Invoker
-(37035,0,0,1,0, NULL), -- Kor'kron Vanquisher
-(37545,0,0,1,0, NULL); -- Spire Minion
-
-UPDATE `creature_model_info` SET `bounding_radius`=0.45,`combat_reach`=0.45,`gender`=0 WHERE `modelid`=31124; -- Bone Spike
-UPDATE `creature_model_info` SET `bounding_radius`=0.347222,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30616; -- Ancient Skeletal Soldier
-UPDATE `creature_model_info` SET `bounding_radius`=1.388888,`combat_reach`=6,`gender`=0 WHERE `modelid`=30459; -- Deathbound Ward
-UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30463; -- Skybreaker Luminary
-UPDATE `creature_model_info` SET `bounding_radius`=1.46205,`combat_reach`=6.075,`gender`=0 WHERE `modelid`=30481; -- Kor'kron Primalist
-UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30531; -- Kor'kron Sniper
-UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30482; -- Kor'kron Reaver
-UPDATE `creature_model_info` SET `bounding_radius`=0.558,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30475; -- Kor'kron Defender
-UPDATE `creature_model_info` SET `bounding_radius`=0.354,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30486; -- Kor'kron Stalker
-UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30453; -- Skybreaker Vindicator
-UPDATE `creature_model_info` SET `bounding_radius`=0.5835,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30472; -- Skybreaker Hierophant
-UPDATE `creature_model_info` SET `bounding_radius`=0.52785,`combat_reach`=2.5875,`gender`=1 WHERE `modelid`=30470; -- Skybreaker Sorcerer
-UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30476; -- Kor'kron Invoker
-UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30534; -- Kor'kron Necrolyte
-UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30478; -- Kor'kron Oracle
-UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30487; -- Kor'kron Templar
-UPDATE `creature_model_info` SET `bounding_radius`=0.312,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30536; -- Skybreaker Summoner
-UPDATE `creature_model_info` SET `bounding_radius`=0.5745,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=30489; -- Kor'kron Vanquisher
-UPDATE `creature_model_info` SET `bounding_radius`=0.62,`combat_reach`=2,`gender`=2 WHERE `modelid`=30656; -- Spire Minion
-
-
-DELETE FROM `creature_equip_template` WHERE `entry` IN (@EQUIP,@EQUIP+1,@EQUIP+2,@EQUIP+3);
-INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
-(@EQUIP,49764,0,0),
-(@EQUIP+1,49736,0,0),
-(@EQUIP+2,0,0,49762),
-(@EQUIP+3,49733,0,0);
diff --git a/sql/old/3.3.5a/2011_02_28_00_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_28_00_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..753ebf6cd5d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_00_world_npc_spellclick_spells.sql
@@ -0,0 +1,13 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (29625,29433,29555,25460,33778,28614,33687,30330,32189,30895,30337);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(29625,46598,0,0,0,1,0,0,0), -- Hyldsmeet Proto-Drake
+(29433,47020,0,0,0,1,0,0,0), -- Goblin Sapper
+(29555,47020,0,0,0,1,0,0,0), -- Goblin Sapper
+(25460,46598,0,0,0,1,0,0,0), -- Amazing Flying Carpet
+(33778,43671,0,0,0,1,0,0,0), -- Tournament Hippogryph
+(28614,46598,0,0,0,1,0,0,0), -- Scarlet Gryphon
+(33687,46598,0,0,0,1,0,0,0), -- Chillmaw
+(30330,46598,0,0,0,1,0,0,0), -- Jotunheim Proto-Drake
+(32189,46598,0,0,0,1,0,0,0), -- Skybreaker Recon Fighter
+(30895,46598,0,0,0,1,0,0,0), -- Lithe Stalker
+(30337,43671,13069,1,13069,1,0,0,0); -- Jotunheim Rapid-Fire Harpoon
diff --git a/sql/old/3.3.5a/2011_02_28_01_world_quest_start_scripts.sql b/sql/old/3.3.5a/2011_02_28_01_world_quest_start_scripts.sql
new file mode 100644
index 00000000000..760312edd6f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_01_world_quest_start_scripts.sql
@@ -0,0 +1,2 @@
+-- Fix spawn position for Zuluhed The Whacked
+UPDATE `quest_start_scripts` SET `x`=-4204.937,`y`=316.3974,`z`=122.5078,`o`=1.308997 WHERE id=10866;
diff --git a/sql/old/3.3.5a/2011_02_28_02_world_sai.sql b/sql/old/3.3.5a/2011_02_28_02_world_sai.sql
new file mode 100644
index 00000000000..7da507367d0
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_02_world_sai.sql
@@ -0,0 +1,31 @@
+-- Quest 11314 "The Fallen Sisters"
+-- Chill Nymph SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=23678;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23678,2367800);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(23678,0,0,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Do text emote on health 30%'),
+(23678,0,1,0,0,0,75,0,2000,3000,2000,2000,11,9739,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Wrath on victim'),
+(23678,0,2,3,8,0,100,0,43340,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'On Spell hit 43340 face player'),
+(23678,0,3,4,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'stop combat movement'),
+(23678,0,4,5,61,0,100,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'evade'),
+(23678,0,5,6,61,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'set faction 35'),
+(23678,0,6,7,61,0,100,0,0,0,0,0,33,24117,0,0,0,0,0,7,0,0,0,0,0,0,0,'quest credit'),
+(23678,0,7,0,61,0,100,0,0,0,0,0,80,2367800,0,0,0,0,0,1,0,0,0,0,0,0,0,'load script'),
+(23678,0,8,0,40,0,100,0,1,23678,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 1 despawn'),
+(2367800,9,0,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 1'),
+(2367800,9,1,0,0,0,100,0,1000,1000,0,0,53,1,23678,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry`=23678;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23678,0,0, 'Chill Nymph appears weak!',2,0,100,0,0,0, 'Chill Nymph'),
+(23678,1,0, 'I knew Lurielle would send help! Thank you friend, and give Lurielle my thanks as well!',0,7,100,1,0,0, 'Chill Nymph'),
+(23678,1,1, 'Where am I? What happened to me? You... you freed me?',0,7,100,1,0,0, 'Chill Nymph'),
+(23678,1,2, 'Thank you. I thought I would die without seeing my sisters again!',0,7,100,1,0,0, 'Chill Nymph');
+-- Chill Nymph Path
+DELETE FROM `waypoints` WHERE `entry`=23678;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(23678,1,2063,-4666,217,'Chill Nymph point 1');
+-- Add condition for Item 33606 "Lurielle''s Pendant" to only target Chill Nymph 23678
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=33606;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(18,0,33606,0,24,1,23678,0,63,'','Item 33606 Lurielle''s Pendant targets Chill Nymph 23678');
diff --git a/sql/old/3.3.5a/2011_02_28_03_world_sai.sql b/sql/old/3.3.5a/2011_02_28_03_world_sai.sql
new file mode 100644
index 00000000000..5ecf98abfda
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_03_world_sai.sql
@@ -0,0 +1,65 @@
+-- SAI for Thoralius the Wise
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=23975;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=23975;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2397500,2397501,2397502,2397503);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- AI Section
+(23975,0,0,1,1,0,100,0,60000,120000,300000,300000,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - every 5 min Stand'),
+(23975,0,1,0,61,0,100,0,0,0,0,0,53,0,23975,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Start WP'),
+(23975,0,2,0,40,0,100,0,2,23975,0,0,80,2397500,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 1 at WP 2'),
+(23975,0,3,0,40,0,100,0,4,23975,0,0,80,2397501,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 2 at WP 4'),
+(23975,0,4,0,40,0,100,0,7,23975,0,0,80,2397502,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 3 at WP 7'),
+(23975,0,5,0,40,0,100,0,8,23975,0,0,80,2397503,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 4 at WP 8'),
+-- Script 1
+(2397500,9,0,0,0,0,100,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 2'),
+(2397500,9,1,0,0,0,100,0,0,0,0,0,11,42837,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Cast 42837'),
+(2397500,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,24046,0,0,0,0,0,0, 'Thoralius the Wise - Turn to face spirit Totem (Fire)'),
+(2397500,9,3,0,0,0,100,0,500,500,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - say text 0'),
+-- Script 2
+(2397501,9,0,0,0,0,100,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 4'),
+(2397501,9,1,0,0,0,100,0,0,0,0,0,11,42838,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Cast 42838'),
+(2397501,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,24045,0,0,0,0,0,0, 'Thoralius the Wise - Turn to face spirit Totem (Water)'),
+(2397501,9,3,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Say text 1'),
+-- Script 3
+(2397502,9,0,0,0,0,100,0,0,0,0,0,54,53000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 7'),
+(2397502,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Do text 2'),
+(2397502,9,2,0,0,0,100,0,1000,1000,0,0,17,64,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - do emote state STATE_STUN'),
+(2397502,9,3,0,0,0,100,0,45000,45000,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - do emote state STATE_STAND'),
+(2397502,9,4,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Do text 3'),
+-- Script 4
+(2397503,9,0,0,0,0,100,0,8,23975,0,0,55,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Stop at WP 8'),
+(2397503,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Reset heading at WP 8'),
+(2397503,9,2,0,0,0,100,0,500,500,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - sit at WP 8');
+
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry`=23975;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23975,0,0, 'Fire grant me vision...',0,7,100,20,0,0, 'Thoralius the Wise'),
+(23975,1,0, 'Water grant me serenity...',0,7,100,20,0,0, 'Thoralius the Wise'),
+(23975,2,0, '%s inhales the wispy smoke tendrils emanating from the burner.',2,7,100,0,0,0, 'Thoralius the Wise'),
+(23975,3,0, 'Thank you, spirits.',0,7,100,2,0,0, 'Thoralius the Wise');
+
+-- Waypoints for Thoralius the Wise from sniff
+DELETE FROM `waypoints` WHERE `entry`=23975;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(23975,1,637.177,-5011.109,4.653919,'Thoralius the Wise WP 1'),
+(23975,2,634.8372,-5010.296,4.528919,'Thoralius the Wise WP 2'),
+(23975,3,637.9232,-5015.031,4.528919,'Thoralius the Wise WP 3'),
+(23975,4,636.0419,-5016.675,4.153919,'Thoralius the Wise WP 4'),
+(23975,5,638.2552,-5013.186,4.653919,'Thoralius the Wise WP 5'),
+(23975,6,637.7585,-5013.268,4.653919,'Thoralius the Wise WP 6'),
+(23975,7,636.8245,-5013.386,4.528919,'Thoralius the Wise WP 7'),
+(23975,8,638.2552,-5013.186,4.653919,'Thoralius the Wise WP 8');
+
+-- Add spell target positions
+DELETE FROM `spell_target_position` WHERE `id` IN (42837,42838);
+INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
+(42837,571,634.094,-5010.67,4.419494,2.807002),
+(42838,571,635.081,-5016.87,4.138474,3.859472);
+
+-- Ascented Mage Hunter SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25724;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25724);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(25724,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ascented Mage Hunter - On reset - Set react state passive'),
+(25724,0,1,0,1,0,100,1,1000,1000,1000,1000,11,45940,0,0,0,0,0,9,25594,0,10,0,0,0,0,'Ascented Mage Hunter - On reset - Cast Evanor''s Prison Chains');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_28_04_world_sai.sql b/sql/old/3.3.5a/2011_02_28_04_world_sai.sql
new file mode 100644
index 00000000000..fda69483394
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_04_world_sai.sql
@@ -0,0 +1,55 @@
+-- c27842 Fenrick Barlowe
+-- ================================
+SET @ENTRY := 27842;
+SET @SCRIPT1 := 2784201;
+SET @SCRIPT2 := 2784202;
+-- ================================
+-- take random movement off of npc (smartAI will control pathing)
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid`=114186;
+-- * create text into the DB
+DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
+(@ENTRY,0,0, 'Bat gizzards again for the gnomes tonight...',0,0,100,1,0,0, 'Fenrick Barlowe text'),
+(@ENTRY,0,1, 'What do they expect, making the bats come in at that angle? Broken necks and gamey bat stew, that''s what they get.',0,0,100,1,0,0, 'Fenrick Barlowe text'),
+(@ENTRY,0,2, '''We like trees, Fenrick. They provide cover.'' They won''t let me chop them down, either.',0,0,100,1,0,0, 'Fenrick Barlowe text'),
+(@ENTRY,0,3, 'I wonder how many reinforcements need to suffer injury before they allows us to chop down these idiotic trees. They''re costing us a fortune in bats. Maybe I''ll rig a harness or two...',0,0,100,1,0,0, 'Fenrick Barlowe text');
+-- create path
+-- point 8 reposition to face bat, do text - kneel for 10 seconds
+-- point 5 do text - kneel for 10 seconds
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,3246.2,-642.609,165.239, 'Fenrick Barlowe path'),
+(@ENTRY,2,3240.42,-645.154,165.399, 'Fenrick Barlowe path'),
+(@ENTRY,3,3245.75,-664.935,166.789, 'Fenrick Barlowe path'),
+(@ENTRY,4,3250.1,-663.819,166.789, 'Fenrick Barlowe path'),
+(@ENTRY,5,3254.69,-661.435,167.188, 'Fenrick Barlowe path - kneel here - do text'),
+(@ENTRY,6,3252.36,-659.146,167.118, 'Fenrick Barlowe path'),
+(@ENTRY,7,3252.63,-648.746,165.904, 'Fenrick Barlowe path'),
+(@ENTRY,8,3249.21,-647.163,165.7, 'Fenrick Barlowe path - kneel here - do text');
+-- set SAI to npc
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+-- create scripts for random text, emotes, and pathing
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@SCRIPT1,@SCRIPT2);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+-- AI
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'on spawn start path'),
+(@ENTRY,0,1,0,40,0,100,0,5,@ENTRY,0,0,80,@SCRIPT1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'at wp 5 run script1'),
+(@ENTRY,0,2,0,40,0,100,0,8,@ENTRY,0,0,80,@SCRIPT2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'at wp 8 run script2'),
+-- script 1
+(@SCRIPT1,9,0,0,0,0,100,0,0,0,0,0,54,13000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'pause pathing'),
+(@SCRIPT1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'say random text'),
+(@SCRIPT1,9,2,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=8 kneel'),
+(@SCRIPT1,9,3,0,0,0,100,0,11000,11000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=0 stand up'),
+-- script 2
+(@SCRIPT2,9,0,0,0,0,100,0,0,0,0,0,54,14000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'pause pathing'),
+(@SCRIPT2,9,1,0,40,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'say random text'),
+(@SCRIPT2,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,10,108509,27787,0,0,0,0,0, 'face bat'),
+(@SCRIPT2,9,3,0,0,0,100,0,1000,1000,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=8 kneel'),
+(@SCRIPT2,9,4,0,0,0,100,0,11000,11000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=0 stand up');
+-- need the following fix also
+-- c27787 Venomspite Riding Bat
+UPDATE `creature` SET `unit_flags`=`unit_flags`|570688256,`dynamicflags`=`dynamicflags`|32 WHERE `guid` IN (108508,108509);
+DELETE FROM `creature_addon` WHERE `guid` IN (108508,108509);
+INSERT INTO `creature_addon` (`guid`,`bytes2`,`auras`) VALUES
+(108508,1, '29266 0 29266 1'),(108509,1, '29266 0 29266 1');
diff --git a/sql/old/3.3.5a/2011_02_28_05_world_vehicles.sql b/sql/old/3.3.5a/2011_02_28_05_world_vehicles.sql
new file mode 100644
index 00000000000..9ef6e21cb3b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_05_world_vehicles.sql
@@ -0,0 +1,129 @@
+-- Argent Tournament mounts implementation
+SET @GUID = 151783;
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33870; -- Stabled Argent Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33790; -- Stabled Exodar Elekk
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33791; -- Stabled Silvermoon Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33792; -- Stabled Thunder Bluff Kodo
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33793; -- Stabled Gnomeregan Mechanostrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33794; -- Stabled Darnassian Nightsaber
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33795; -- Stabled Ironforge Ram
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33796; -- Stabled Darkspear Raptor
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33798; -- Stabled Forsaken Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33799; -- Stabled Orgrimmar Wolf
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33800; -- Stabled Stormwind Steed
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33842; -- Stabled Sunreaver Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33843; -- Stabled Quel'dorei Steed
+
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Stabled Exodar Elekk
+UPDATE `creature_model_info` SET `bounding_radius`=1.185,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=29256; -- Stabled Darnassian Nightsaber
+UPDATE `creature_model_info` SET `bounding_radius`=0.818,`combat_reach`=2,`gender`=0 WHERE `modelid`=29258; -- Stabled Ironforge Ram
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29261; -- Stabled Darkspear Raptor
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=28918; -- Stabled Argent Warhorse
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33870,0,0,1,0, NULL), -- Stabled Argent Warhorse
+(33790,0,0,1,0, NULL), -- Stabled Exodar Elekk
+(33791,0,0,1,0, NULL), -- Stabled Silvermoon Hawkstrider
+(33792,0,0,1,0, NULL), -- Stabled Thunder Bluff Kodo
+(33793,0,0,1,0, NULL), -- Stabled Gnomeregan Mechanostrider
+(33794,0,0,1,0, NULL), -- Stabled Darnassian Nightsaber
+(33795,0,0,1,0, NULL), -- Stabled Ironforge Ram
+(33796,0,0,1,0, NULL), -- Stabled Darkspear Raptor
+(33798,0,0,1,0, NULL), -- Stabled Forsaken Warhorse
+(33799,0,0,1,0, NULL), -- Stabled Orgrimmar Wolf
+(33800,0,0,1,0, NULL), -- Stabled Stormwind Steed
+(33842,0,0,1,0, NULL), -- Stabled Sunreaver Hawkstrider
+(33843,0,0,1,0, NULL); -- Stabled Quel'dorei Steed
+
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33782; -- Argent Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33318; -- Exodar Elekk
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33323; -- Silvermoon Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33322; -- Thunder Bluff Kodo
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33317; -- Gnomeregan Mechanostrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33319; -- Darnassian Nightsaber
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33316; -- Ironforge Ram
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33321; -- Darkspear Raptor
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33324; -- Forsaken Warhorse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33320; -- Orgrimmar Wolf
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33845; -- Quel'dorei Steed
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33844; -- Sunreaver Hawkstrider
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33217; -- Stormwind Steed
+
+UPDATE `creature_template` SET
+`spell1`=62544, -- Thurst
+`spell2`=62575, -- Shield-Breaker
+`spell3`=62960, -- Charge
+`spell4`=62552, -- Defend
+`spell5`=64077, -- Refresh Mount
+`spell6`=62863, -- Duel
+`spell7`=63034  -- Player On Tournament Mount (aura)
+WHERE `vehicleid`=349;
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(33870,63663,13664,1,1,1,62853,0,0), -- Stabled Argent Warhorse           - Summon Tournament Argent Charger         - requires quest The Black Knight's Fall (shall not be completed nor rewarded)
+(33790,62781,13690,0,0,1,62853,0,0), -- Stabled Exodar Elekk              - Summon Tournament Elekk                  - requires quest A Valiant Of The Exodar
+(33791,62786,13696,0,0,1,62853,0,0), -- Stabled Silvermoon Hawkstrider    - Summon Tournament Hawkstrider            - requires quest A Valiant Of Silvermoon
+(33792,62785,13694,0,0,1,62853,0,0), -- Stabled Thunder Bluff Kodo        - Summon Tournament Kodo                   - requires quest A Valiant Of Thunder Bluff
+(33793,62780,13688,0,0,1,62853,0,0), -- Stabled Gnomeregan Mechanostrider - Summon Tournament Mechanostrider         - requires quest A Valiant Of Gnomeregan
+(33794,62782,13689,0,0,1,62853,0,0), -- Stabled Darnassian Nightsaber     - Summon Tournament Nightsaber             - requires quest A Valiant Of Darnassus
+(33795,62779,13685,0,0,1,62853,0,0), -- Stabled Ironforge Ram             - Summon Tournament Ram                    - requires quest A Valiant Of Ironforge
+(33796,62784,13693,0,0,1,62853,0,0), -- Stabled Darkspear Raptor          - Summon Tournament Raptor                 - requires quest A Valiant Of Sen'jin
+(33798,62787,13695,0,0,1,62853,0,0), -- Stabled Forsaken Warhorse         - Summon Tournament Warhorse               - requires quest A Valiant Of Undercity
+(33799,62783,13691,0,0,1,62853,0,0), -- Stabled Orgrimmar Wolf            - Summon Tournament Wolf                   - requires quest A Valiant Of Orgrimmar
+(33800,62774,13684,0,0,1,62853,0,0), -- Stabled Stormwind Steed           - Summon Tournament Charger                - requires quest A Valiant Of Stormwind
+(33842,63791,13668,0,0,1,62853,0,0), -- Stabled Sunreaver Hawkstrider     - Summon Tournament Hawkstrider (Aspirant) - requires quest The Argent Tournament (H/Argent Aspiration)
+(33843,63792,13667,0,0,1,62853,0,0); -- Stabled Quel'dorei Steed          - Summon Tournament Steed (Aspirant)       - requires quest The Argent Tournament (A/Argent Aspiration)
+-- Note: spell 62853 (Lance Equipped) is required for all vehicles.
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=16 AND `ConditionTypeOrReference`=1 AND `ConditionValue1`=64373;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- dismount in wrong zones condition
+(16,0,33782,0,1,64373,0,0,0,'', 'Vehicle Argent Warhorse requires aura Armistice'),
+(16,0,33318,0,1,64373,0,0,0,'', 'Vehicle Exodar Elekk requires aura Armistice'),
+(16,0,33323,0,1,64373,0,0,0,'', 'Vehicle Silvermoon Hawkstrider requires aura Armistice'),
+(16,0,33322,0,1,64373,0,0,0,'', 'Vehicle Thunder Bluff Kodo requires aura Armistice'),
+(16,0,33317,0,1,64373,0,0,0,'', 'Vehicle Gnomeregan Mechanostrider requires aura Armistice'),
+(16,0,33319,0,1,64373,0,0,0,'', 'Vehicle Darnassian Nightsaber requires aura Armistice'),
+(16,0,33316,0,1,64373,0,0,0,'', 'Vehicle Ironforge Ram requires aura Armistice'),
+(16,0,33321,0,1,64373,0,0,0,'', 'Vehicle Darkspear Raptor requires aura Armistice'),
+(16,0,33324,0,1,64373,0,0,0,'', 'Vehicle Forsaken Warhorse requires aura Armistice'),
+(16,0,33320,0,1,64373,0,0,0,'', 'Vehicle Orgrimmar Wolf requires aura Armistice'),
+(16,0,33845,0,1,64373,0,0,0,'', 'Vehicle Quel''dorei Steed requires aura Armistice'),
+(16,0,33844,0,1,64373,0,0,0,'', 'Vehicle Sunreaver Hawkstrider requires aura Armistice'),
+(16,0,33217,0,1,64373,0,0,0,'', 'Vehicle Stormwind Steed requires aura Armistice');
+-- race conditions 
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (33782,33318,33323,33322,33317,33319,33316,33321,33324,33320,33845,33844,33217);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33782,0,0,2305,0, NULL), -- Argent Warhorse
+(33318,0,0,2305,0, NULL), -- Exodar Elekk
+(33323,0,0,2305,0, NULL), -- Silvermoon Hawkstrider
+(33322,0,0,2305,0, NULL), -- Thunder Bluff Kodo
+(33317,0,0,2305,0, NULL), -- Gnomeregan Mechanostrider
+(33319,0,0,2305,0, NULL), -- Darnassian Nightsaber
+(33316,0,0,2305,0, NULL), -- Ironforge Ram
+(33321,0,0,2305,0, NULL), -- Darkspear Raptor
+(33324,0,0,2305,0, NULL), -- Forsaken Warhorse
+(33320,0,0,2305,0, NULL), -- Orgrimmar Wolf
+(33845,0,0,2305,0, NULL), -- Quel''dorei Steed
+(33844,0,0,2305,0, NULL), -- Sunreaver Hawkstrider
+(33217,0,0,2305,0, NULL); -- Stormwind Steed
+
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Exodar Elekk
+UPDATE `creature_model_info` SET `bounding_radius`=1.185,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=29256; -- Darnassian Nightsaber
+UPDATE `creature_model_info` SET `bounding_radius`=2,`combat_reach`=0,`gender`=0 WHERE `modelid`=29258; -- Ironforge Ram
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29261; -- Darkspear Raptor
+
+-- Add more Tournament Stables to enable the use of all spawned vehicles
+UPDATE `gameobject` SET `rotation0`=0,`rotation1`=0,`rotation2`=0,`rotation3`=0,`spawntimesecs`=300,`animprogress`=0 WHERE `id`=300008; -- equal field values for all the entries
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+6 AND `id`=300008; -- TEMP Tournament Stables
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@GUID+0,300008,571,1,1,8569.54,670.423,547.397,5.96851,0,0,0.156691,-0.987648,300,0,1),
+(@GUID+1,300008,571,1,1,8569.74,658.995,547.453,6.07846,0,0,0.102183,-0.994766,300,0,1),
+(@GUID+2,300008,571,1,1,8409.89,707.879,547.314,3.5212,0,0,0.982041,-0.188668,300,0,1),
+(@GUID+3,300008,571,1,1,8421.63,707.685,547.37,4.31917,0,0,0.831614,-0.555354,300,0,1),
+(@GUID+4,300008,571,1,1,8488.82,920.117,547.293,5.78943,0,0,0.244376,-0.969681,300,0,1),
+(@GUID+5,300008,571,1,1,8486.61,935.808,547.293,5.73289,0,0,0.271691,-0.962385,300,0,1),
+(@GUID+6,300008,571,1,1,8490.55,953.448,547.293,4.61212,0,0,0.741653,-0.670784,300,0,1);
diff --git a/sql/old/3.3.5a/2011_02_28_06_world_gameobject.sql b/sql/old/3.3.5a/2011_02_28_06_world_gameobject.sql
new file mode 100644
index 00000000000..37fddc83ce6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_06_world_gameobject.sql
@@ -0,0 +1 @@
+DELETE FROM `gameobject` WHERE `guid` BETWEEN 200000 AND 200000+6 AND `id`=300008; -- Wrong GUIDs for Tournament Stables
diff --git a/sql/old/3.3.5a/2011_02_28_07_world_creature_template.sql b/sql/old/3.3.5a/2011_02_28_07_world_creature_template.sql
new file mode 100644
index 00000000000..03d89220052
--- /dev/null
+++ b/sql/old/3.3.5a/2011_02_28_07_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (31748,32795,32796,34045); -- Dificully entries
diff --git a/sql/old/3.3.5a/2011_02_28_0_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_02_28_0_world_npc_spellclick_spells.sql
deleted file mode 100644
index 753ebf6cd5d..00000000000
--- a/sql/old/3.3.5a/2011_02_28_0_world_npc_spellclick_spells.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (29625,29433,29555,25460,33778,28614,33687,30330,32189,30895,30337);
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
-(29625,46598,0,0,0,1,0,0,0), -- Hyldsmeet Proto-Drake
-(29433,47020,0,0,0,1,0,0,0), -- Goblin Sapper
-(29555,47020,0,0,0,1,0,0,0), -- Goblin Sapper
-(25460,46598,0,0,0,1,0,0,0), -- Amazing Flying Carpet
-(33778,43671,0,0,0,1,0,0,0), -- Tournament Hippogryph
-(28614,46598,0,0,0,1,0,0,0), -- Scarlet Gryphon
-(33687,46598,0,0,0,1,0,0,0), -- Chillmaw
-(30330,46598,0,0,0,1,0,0,0), -- Jotunheim Proto-Drake
-(32189,46598,0,0,0,1,0,0,0), -- Skybreaker Recon Fighter
-(30895,46598,0,0,0,1,0,0,0), -- Lithe Stalker
-(30337,43671,13069,1,13069,1,0,0,0); -- Jotunheim Rapid-Fire Harpoon
diff --git a/sql/old/3.3.5a/2011_02_28_1_world_quest_start_scripts.sql b/sql/old/3.3.5a/2011_02_28_1_world_quest_start_scripts.sql
deleted file mode 100644
index 760312edd6f..00000000000
--- a/sql/old/3.3.5a/2011_02_28_1_world_quest_start_scripts.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fix spawn position for Zuluhed The Whacked
-UPDATE `quest_start_scripts` SET `x`=-4204.937,`y`=316.3974,`z`=122.5078,`o`=1.308997 WHERE id=10866;
diff --git a/sql/old/3.3.5a/2011_02_28_2_world_sai.sql b/sql/old/3.3.5a/2011_02_28_2_world_sai.sql
deleted file mode 100644
index 7da507367d0..00000000000
--- a/sql/old/3.3.5a/2011_02_28_2_world_sai.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- Quest 11314 "The Fallen Sisters"
--- Chill Nymph SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=23678;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23678,2367800);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(23678,0,0,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Do text emote on health 30%'),
-(23678,0,1,0,0,0,75,0,2000,3000,2000,2000,11,9739,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Wrath on victim'),
-(23678,0,2,3,8,0,100,0,43340,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'On Spell hit 43340 face player'),
-(23678,0,3,4,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'stop combat movement'),
-(23678,0,4,5,61,0,100,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'evade'),
-(23678,0,5,6,61,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'set faction 35'),
-(23678,0,6,7,61,0,100,0,0,0,0,0,33,24117,0,0,0,0,0,7,0,0,0,0,0,0,0,'quest credit'),
-(23678,0,7,0,61,0,100,0,0,0,0,0,80,2367800,0,0,0,0,0,1,0,0,0,0,0,0,0,'load script'),
-(23678,0,8,0,40,0,100,0,1,23678,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 1 despawn'),
-(2367800,9,0,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say text 1'),
-(2367800,9,1,0,0,0,100,0,1000,1000,0,0,53,1,23678,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
--- NPC talk text insert
-DELETE FROM `creature_text` WHERE `entry`=23678;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(23678,0,0, 'Chill Nymph appears weak!',2,0,100,0,0,0, 'Chill Nymph'),
-(23678,1,0, 'I knew Lurielle would send help! Thank you friend, and give Lurielle my thanks as well!',0,7,100,1,0,0, 'Chill Nymph'),
-(23678,1,1, 'Where am I? What happened to me? You... you freed me?',0,7,100,1,0,0, 'Chill Nymph'),
-(23678,1,2, 'Thank you. I thought I would die without seeing my sisters again!',0,7,100,1,0,0, 'Chill Nymph');
--- Chill Nymph Path
-DELETE FROM `waypoints` WHERE `entry`=23678;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(23678,1,2063,-4666,217,'Chill Nymph point 1');
--- Add condition for Item 33606 "Lurielle''s Pendant" to only target Chill Nymph 23678
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=33606;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(18,0,33606,0,24,1,23678,0,63,'','Item 33606 Lurielle''s Pendant targets Chill Nymph 23678');
diff --git a/sql/old/3.3.5a/2011_02_28_3_world_sai.sql b/sql/old/3.3.5a/2011_02_28_3_world_sai.sql
deleted file mode 100644
index 5ecf98abfda..00000000000
--- a/sql/old/3.3.5a/2011_02_28_3_world_sai.sql
+++ /dev/null
@@ -1,65 +0,0 @@
--- SAI for Thoralius the Wise
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=23975;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=23975;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2397500,2397501,2397502,2397503);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
--- AI Section
-(23975,0,0,1,1,0,100,0,60000,120000,300000,300000,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - every 5 min Stand'),
-(23975,0,1,0,61,0,100,0,0,0,0,0,53,0,23975,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Start WP'),
-(23975,0,2,0,40,0,100,0,2,23975,0,0,80,2397500,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 1 at WP 2'),
-(23975,0,3,0,40,0,100,0,4,23975,0,0,80,2397501,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 2 at WP 4'),
-(23975,0,4,0,40,0,100,0,7,23975,0,0,80,2397502,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 3 at WP 7'),
-(23975,0,5,0,40,0,100,0,8,23975,0,0,80,2397503,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Load script 4 at WP 8'),
--- Script 1
-(2397500,9,0,0,0,0,100,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 2'),
-(2397500,9,1,0,0,0,100,0,0,0,0,0,11,42837,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Cast 42837'),
-(2397500,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,24046,0,0,0,0,0,0, 'Thoralius the Wise - Turn to face spirit Totem (Fire)'),
-(2397500,9,3,0,0,0,100,0,500,500,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - say text 0'),
--- Script 2
-(2397501,9,0,0,0,0,100,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 4'),
-(2397501,9,1,0,0,0,100,0,0,0,0,0,11,42838,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Cast 42838'),
-(2397501,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,24045,0,0,0,0,0,0, 'Thoralius the Wise - Turn to face spirit Totem (Water)'),
-(2397501,9,3,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Say text 1'),
--- Script 3
-(2397502,9,0,0,0,0,100,0,0,0,0,0,54,53000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Pause at WP 7'),
-(2397502,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Do text 2'),
-(2397502,9,2,0,0,0,100,0,1000,1000,0,0,17,64,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - do emote state STATE_STUN'),
-(2397502,9,3,0,0,0,100,0,45000,45000,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - do emote state STATE_STAND'),
-(2397502,9,4,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Do text 3'),
--- Script 4
-(2397503,9,0,0,0,0,100,0,8,23975,0,0,55,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Stop at WP 8'),
-(2397503,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - Reset heading at WP 8'),
-(2397503,9,2,0,0,0,100,0,500,500,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thoralius the Wise - sit at WP 8');
-
--- NPC talk text insert
-DELETE FROM `creature_text` WHERE `entry`=23975;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(23975,0,0, 'Fire grant me vision...',0,7,100,20,0,0, 'Thoralius the Wise'),
-(23975,1,0, 'Water grant me serenity...',0,7,100,20,0,0, 'Thoralius the Wise'),
-(23975,2,0, '%s inhales the wispy smoke tendrils emanating from the burner.',2,7,100,0,0,0, 'Thoralius the Wise'),
-(23975,3,0, 'Thank you, spirits.',0,7,100,2,0,0, 'Thoralius the Wise');
-
--- Waypoints for Thoralius the Wise from sniff
-DELETE FROM `waypoints` WHERE `entry`=23975;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(23975,1,637.177,-5011.109,4.653919,'Thoralius the Wise WP 1'),
-(23975,2,634.8372,-5010.296,4.528919,'Thoralius the Wise WP 2'),
-(23975,3,637.9232,-5015.031,4.528919,'Thoralius the Wise WP 3'),
-(23975,4,636.0419,-5016.675,4.153919,'Thoralius the Wise WP 4'),
-(23975,5,638.2552,-5013.186,4.653919,'Thoralius the Wise WP 5'),
-(23975,6,637.7585,-5013.268,4.653919,'Thoralius the Wise WP 6'),
-(23975,7,636.8245,-5013.386,4.528919,'Thoralius the Wise WP 7'),
-(23975,8,638.2552,-5013.186,4.653919,'Thoralius the Wise WP 8');
-
--- Add spell target positions
-DELETE FROM `spell_target_position` WHERE `id` IN (42837,42838);
-INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
-(42837,571,634.094,-5010.67,4.419494,2.807002),
-(42838,571,635.081,-5016.87,4.138474,3.859472);
-
--- Ascented Mage Hunter SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=25724;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25724);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(25724,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ascented Mage Hunter - On reset - Set react state passive'),
-(25724,0,1,0,1,0,100,1,1000,1000,1000,1000,11,45940,0,0,0,0,0,9,25594,0,10,0,0,0,0,'Ascented Mage Hunter - On reset - Cast Evanor''s Prison Chains');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_02_28_4_world_sai.sql b/sql/old/3.3.5a/2011_02_28_4_world_sai.sql
deleted file mode 100644
index fda69483394..00000000000
--- a/sql/old/3.3.5a/2011_02_28_4_world_sai.sql
+++ /dev/null
@@ -1,55 +0,0 @@
--- c27842 Fenrick Barlowe
--- ================================
-SET @ENTRY := 27842;
-SET @SCRIPT1 := 2784201;
-SET @SCRIPT2 := 2784202;
--- ================================
--- take random movement off of npc (smartAI will control pathing)
-UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid`=114186;
--- * create text into the DB
-DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
-(@ENTRY,0,0, 'Bat gizzards again for the gnomes tonight...',0,0,100,1,0,0, 'Fenrick Barlowe text'),
-(@ENTRY,0,1, 'What do they expect, making the bats come in at that angle? Broken necks and gamey bat stew, that''s what they get.',0,0,100,1,0,0, 'Fenrick Barlowe text'),
-(@ENTRY,0,2, '''We like trees, Fenrick. They provide cover.'' They won''t let me chop them down, either.',0,0,100,1,0,0, 'Fenrick Barlowe text'),
-(@ENTRY,0,3, 'I wonder how many reinforcements need to suffer injury before they allows us to chop down these idiotic trees. They''re costing us a fortune in bats. Maybe I''ll rig a harness or two...',0,0,100,1,0,0, 'Fenrick Barlowe text');
--- create path
--- point 8 reposition to face bat, do text - kneel for 10 seconds
--- point 5 do text - kneel for 10 seconds
-DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(@ENTRY,1,3246.2,-642.609,165.239, 'Fenrick Barlowe path'),
-(@ENTRY,2,3240.42,-645.154,165.399, 'Fenrick Barlowe path'),
-(@ENTRY,3,3245.75,-664.935,166.789, 'Fenrick Barlowe path'),
-(@ENTRY,4,3250.1,-663.819,166.789, 'Fenrick Barlowe path'),
-(@ENTRY,5,3254.69,-661.435,167.188, 'Fenrick Barlowe path - kneel here - do text'),
-(@ENTRY,6,3252.36,-659.146,167.118, 'Fenrick Barlowe path'),
-(@ENTRY,7,3252.63,-648.746,165.904, 'Fenrick Barlowe path'),
-(@ENTRY,8,3249.21,-647.163,165.7, 'Fenrick Barlowe path - kneel here - do text');
--- set SAI to npc
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
--- create scripts for random text, emotes, and pathing
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@SCRIPT1,@SCRIPT2);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
--- AI
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'on spawn start path'),
-(@ENTRY,0,1,0,40,0,100,0,5,@ENTRY,0,0,80,@SCRIPT1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'at wp 5 run script1'),
-(@ENTRY,0,2,0,40,0,100,0,8,@ENTRY,0,0,80,@SCRIPT2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'at wp 8 run script2'),
--- script 1
-(@SCRIPT1,9,0,0,0,0,100,0,0,0,0,0,54,13000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'pause pathing'),
-(@SCRIPT1,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'say random text'),
-(@SCRIPT1,9,2,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=8 kneel'),
-(@SCRIPT1,9,3,0,0,0,100,0,11000,11000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=0 stand up'),
--- script 2
-(@SCRIPT2,9,0,0,0,0,100,0,0,0,0,0,54,14000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'pause pathing'),
-(@SCRIPT2,9,1,0,40,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'say random text'),
-(@SCRIPT2,9,2,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,10,108509,27787,0,0,0,0,0, 'face bat'),
-(@SCRIPT2,9,3,0,0,0,100,0,1000,1000,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=8 kneel'),
-(@SCRIPT2,9,4,0,0,0,100,0,11000,11000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1=0 stand up');
--- need the following fix also
--- c27787 Venomspite Riding Bat
-UPDATE `creature` SET `unit_flags`=`unit_flags`|570688256,`dynamicflags`=`dynamicflags`|32 WHERE `guid` IN (108508,108509);
-DELETE FROM `creature_addon` WHERE `guid` IN (108508,108509);
-INSERT INTO `creature_addon` (`guid`,`bytes2`,`auras`) VALUES
-(108508,1, '29266 0 29266 1'),(108509,1, '29266 0 29266 1');
diff --git a/sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql b/sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql
deleted file mode 100644
index 9ef6e21cb3b..00000000000
--- a/sql/old/3.3.5a/2011_02_28_5_world_vehicles.sql
+++ /dev/null
@@ -1,129 +0,0 @@
--- Argent Tournament mounts implementation
-SET @GUID = 151783;
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33870; -- Stabled Argent Warhorse
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33790; -- Stabled Exodar Elekk
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33791; -- Stabled Silvermoon Hawkstrider
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33792; -- Stabled Thunder Bluff Kodo
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33793; -- Stabled Gnomeregan Mechanostrider
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33794; -- Stabled Darnassian Nightsaber
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33795; -- Stabled Ironforge Ram
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33796; -- Stabled Darkspear Raptor
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33798; -- Stabled Forsaken Warhorse
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33799; -- Stabled Orgrimmar Wolf
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33800; -- Stabled Stormwind Steed
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33842; -- Stabled Sunreaver Hawkstrider
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`speed_run`=1.5714285714286 WHERE `entry`=33843; -- Stabled Quel'dorei Steed
-
-UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Stabled Exodar Elekk
-UPDATE `creature_model_info` SET `bounding_radius`=1.185,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=29256; -- Stabled Darnassian Nightsaber
-UPDATE `creature_model_info` SET `bounding_radius`=0.818,`combat_reach`=2,`gender`=0 WHERE `modelid`=29258; -- Stabled Ironforge Ram
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29261; -- Stabled Darkspear Raptor
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=28918; -- Stabled Argent Warhorse
-
-DELETE FROM `creature_template_addon` WHERE `entry` IN (33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(33870,0,0,1,0, NULL), -- Stabled Argent Warhorse
-(33790,0,0,1,0, NULL), -- Stabled Exodar Elekk
-(33791,0,0,1,0, NULL), -- Stabled Silvermoon Hawkstrider
-(33792,0,0,1,0, NULL), -- Stabled Thunder Bluff Kodo
-(33793,0,0,1,0, NULL), -- Stabled Gnomeregan Mechanostrider
-(33794,0,0,1,0, NULL), -- Stabled Darnassian Nightsaber
-(33795,0,0,1,0, NULL), -- Stabled Ironforge Ram
-(33796,0,0,1,0, NULL), -- Stabled Darkspear Raptor
-(33798,0,0,1,0, NULL), -- Stabled Forsaken Warhorse
-(33799,0,0,1,0, NULL), -- Stabled Orgrimmar Wolf
-(33800,0,0,1,0, NULL), -- Stabled Stormwind Steed
-(33842,0,0,1,0, NULL), -- Stabled Sunreaver Hawkstrider
-(33843,0,0,1,0, NULL); -- Stabled Quel'dorei Steed
-
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33782; -- Argent Warhorse
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33318; -- Exodar Elekk
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33323; -- Silvermoon Hawkstrider
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33322; -- Thunder Bluff Kodo
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33317; -- Gnomeregan Mechanostrider
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33319; -- Darnassian Nightsaber
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33316; -- Ironforge Ram
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33321; -- Darkspear Raptor
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33324; -- Forsaken Warhorse
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33320; -- Orgrimmar Wolf
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`faction_A`=35,`faction_H`=35,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33845; -- Quel'dorei Steed
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33844; -- Sunreaver Hawkstrider
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`unit_flags`=0,`speed_run`=1.5714285714286,`vehicleid`=349 WHERE `entry`=33217; -- Stormwind Steed
-
-UPDATE `creature_template` SET
-`spell1`=62544, -- Thurst
-`spell2`=62575, -- Shield-Breaker
-`spell3`=62960, -- Charge
-`spell4`=62552, -- Defend
-`spell5`=64077, -- Refresh Mount
-`spell6`=62863, -- Duel
-`spell7`=63034  -- Player On Tournament Mount (aura)
-WHERE `vehicleid`=349;
-
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843);
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
-(33870,63663,13664,1,1,1,62853,0,0), -- Stabled Argent Warhorse           - Summon Tournament Argent Charger         - requires quest The Black Knight's Fall (shall not be completed nor rewarded)
-(33790,62781,13690,0,0,1,62853,0,0), -- Stabled Exodar Elekk              - Summon Tournament Elekk                  - requires quest A Valiant Of The Exodar
-(33791,62786,13696,0,0,1,62853,0,0), -- Stabled Silvermoon Hawkstrider    - Summon Tournament Hawkstrider            - requires quest A Valiant Of Silvermoon
-(33792,62785,13694,0,0,1,62853,0,0), -- Stabled Thunder Bluff Kodo        - Summon Tournament Kodo                   - requires quest A Valiant Of Thunder Bluff
-(33793,62780,13688,0,0,1,62853,0,0), -- Stabled Gnomeregan Mechanostrider - Summon Tournament Mechanostrider         - requires quest A Valiant Of Gnomeregan
-(33794,62782,13689,0,0,1,62853,0,0), -- Stabled Darnassian Nightsaber     - Summon Tournament Nightsaber             - requires quest A Valiant Of Darnassus
-(33795,62779,13685,0,0,1,62853,0,0), -- Stabled Ironforge Ram             - Summon Tournament Ram                    - requires quest A Valiant Of Ironforge
-(33796,62784,13693,0,0,1,62853,0,0), -- Stabled Darkspear Raptor          - Summon Tournament Raptor                 - requires quest A Valiant Of Sen'jin
-(33798,62787,13695,0,0,1,62853,0,0), -- Stabled Forsaken Warhorse         - Summon Tournament Warhorse               - requires quest A Valiant Of Undercity
-(33799,62783,13691,0,0,1,62853,0,0), -- Stabled Orgrimmar Wolf            - Summon Tournament Wolf                   - requires quest A Valiant Of Orgrimmar
-(33800,62774,13684,0,0,1,62853,0,0), -- Stabled Stormwind Steed           - Summon Tournament Charger                - requires quest A Valiant Of Stormwind
-(33842,63791,13668,0,0,1,62853,0,0), -- Stabled Sunreaver Hawkstrider     - Summon Tournament Hawkstrider (Aspirant) - requires quest The Argent Tournament (H/Argent Aspiration)
-(33843,63792,13667,0,0,1,62853,0,0); -- Stabled Quel'dorei Steed          - Summon Tournament Steed (Aspirant)       - requires quest The Argent Tournament (A/Argent Aspiration)
--- Note: spell 62853 (Lance Equipped) is required for all vehicles.
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=16 AND `ConditionTypeOrReference`=1 AND `ConditionValue1`=64373;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
--- dismount in wrong zones condition
-(16,0,33782,0,1,64373,0,0,0,'', 'Vehicle Argent Warhorse requires aura Armistice'),
-(16,0,33318,0,1,64373,0,0,0,'', 'Vehicle Exodar Elekk requires aura Armistice'),
-(16,0,33323,0,1,64373,0,0,0,'', 'Vehicle Silvermoon Hawkstrider requires aura Armistice'),
-(16,0,33322,0,1,64373,0,0,0,'', 'Vehicle Thunder Bluff Kodo requires aura Armistice'),
-(16,0,33317,0,1,64373,0,0,0,'', 'Vehicle Gnomeregan Mechanostrider requires aura Armistice'),
-(16,0,33319,0,1,64373,0,0,0,'', 'Vehicle Darnassian Nightsaber requires aura Armistice'),
-(16,0,33316,0,1,64373,0,0,0,'', 'Vehicle Ironforge Ram requires aura Armistice'),
-(16,0,33321,0,1,64373,0,0,0,'', 'Vehicle Darkspear Raptor requires aura Armistice'),
-(16,0,33324,0,1,64373,0,0,0,'', 'Vehicle Forsaken Warhorse requires aura Armistice'),
-(16,0,33320,0,1,64373,0,0,0,'', 'Vehicle Orgrimmar Wolf requires aura Armistice'),
-(16,0,33845,0,1,64373,0,0,0,'', 'Vehicle Quel''dorei Steed requires aura Armistice'),
-(16,0,33844,0,1,64373,0,0,0,'', 'Vehicle Sunreaver Hawkstrider requires aura Armistice'),
-(16,0,33217,0,1,64373,0,0,0,'', 'Vehicle Stormwind Steed requires aura Armistice');
--- race conditions 
-
-DELETE FROM `creature_template_addon` WHERE `entry` IN (33782,33318,33323,33322,33317,33319,33316,33321,33324,33320,33845,33844,33217);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(33782,0,0,2305,0, NULL), -- Argent Warhorse
-(33318,0,0,2305,0, NULL), -- Exodar Elekk
-(33323,0,0,2305,0, NULL), -- Silvermoon Hawkstrider
-(33322,0,0,2305,0, NULL), -- Thunder Bluff Kodo
-(33317,0,0,2305,0, NULL), -- Gnomeregan Mechanostrider
-(33319,0,0,2305,0, NULL), -- Darnassian Nightsaber
-(33316,0,0,2305,0, NULL), -- Ironforge Ram
-(33321,0,0,2305,0, NULL), -- Darkspear Raptor
-(33324,0,0,2305,0, NULL), -- Forsaken Warhorse
-(33320,0,0,2305,0, NULL), -- Orgrimmar Wolf
-(33845,0,0,2305,0, NULL), -- Quel''dorei Steed
-(33844,0,0,2305,0, NULL), -- Sunreaver Hawkstrider
-(33217,0,0,2305,0, NULL); -- Stormwind Steed
-
-UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Exodar Elekk
-UPDATE `creature_model_info` SET `bounding_radius`=1.185,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=29256; -- Darnassian Nightsaber
-UPDATE `creature_model_info` SET `bounding_radius`=2,`combat_reach`=0,`gender`=0 WHERE `modelid`=29258; -- Ironforge Ram
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29261; -- Darkspear Raptor
-
--- Add more Tournament Stables to enable the use of all spawned vehicles
-UPDATE `gameobject` SET `rotation0`=0,`rotation1`=0,`rotation2`=0,`rotation3`=0,`spawntimesecs`=300,`animprogress`=0 WHERE `id`=300008; -- equal field values for all the entries
-DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+6 AND `id`=300008; -- TEMP Tournament Stables
-INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
-(@GUID+0,300008,571,1,1,8569.54,670.423,547.397,5.96851,0,0,0.156691,-0.987648,300,0,1),
-(@GUID+1,300008,571,1,1,8569.74,658.995,547.453,6.07846,0,0,0.102183,-0.994766,300,0,1),
-(@GUID+2,300008,571,1,1,8409.89,707.879,547.314,3.5212,0,0,0.982041,-0.188668,300,0,1),
-(@GUID+3,300008,571,1,1,8421.63,707.685,547.37,4.31917,0,0,0.831614,-0.555354,300,0,1),
-(@GUID+4,300008,571,1,1,8488.82,920.117,547.293,5.78943,0,0,0.244376,-0.969681,300,0,1),
-(@GUID+5,300008,571,1,1,8486.61,935.808,547.293,5.73289,0,0,0.271691,-0.962385,300,0,1),
-(@GUID+6,300008,571,1,1,8490.55,953.448,547.293,4.61212,0,0,0.741653,-0.670784,300,0,1);
diff --git a/sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql b/sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql
deleted file mode 100644
index 37fddc83ce6..00000000000
--- a/sql/old/3.3.5a/2011_02_28_6_world_gameobject.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `gameobject` WHERE `guid` BETWEEN 200000 AND 200000+6 AND `id`=300008; -- Wrong GUIDs for Tournament Stables
diff --git a/sql/old/3.3.5a/2011_02_28_7_world_creature_template.sql b/sql/old/3.3.5a/2011_02_28_7_world_creature_template.sql
deleted file mode 100644
index 03d89220052..00000000000
--- a/sql/old/3.3.5a/2011_02_28_7_world_creature_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (31748,32795,32796,34045); -- Dificully entries
diff --git a/sql/old/3.3.5a/2011_03_01_01_world_conditions.sql b/sql/old/3.3.5a/2011_03_01_01_world_conditions.sql
new file mode 100644
index 00000000000..c1137400040
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_01_world_conditions.sql
@@ -0,0 +1,6 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=36325;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,36325,0,18,1,21182,0,0,'','Spell 36325 target creature 21182'),
+(13,0,36325,0,18,1,22401,0,0,'','Spell 36325 target creature 22401'),
+(13,0,36325,0,18,1,22402,0,0,'','Spell 36325 target creature 22402'),
+(13,0,36325,0,18,1,22403,0,0,'','Spell 36325 target creature 22403');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_03_01_02_world_creature_template.sql b/sql/old/3.3.5a/2011_03_01_02_world_creature_template.sql
new file mode 100644
index 00000000000..b799e54617e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_02_world_creature_template.sql
@@ -0,0 +1,3 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (27894,28781,30234,33062); -- match npcflag with diffentries (that got updated on 2011_02_28_7)
+UPDATE `creature_template` SET `VehicleId`=335 WHERE `entry`=34045; -- Salvaged Chopper (1)
+UPDATE `creature_template` SET `VehicleId`=335 WHERE `entry`=31748; -- Hover Disk (1)
diff --git a/sql/old/3.3.5a/2011_03_01_03_world_sai.sql b/sql/old/3.3.5a/2011_03_01_03_world_sai.sql
new file mode 100644
index 00000000000..37a4afdf06c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_03_world_sai.sql
@@ -0,0 +1,31 @@
+-- Quest 9303 "Inoculation"
+SET @OWL := 16518; -- Nestlewood Owlkin
+SET @IOWL := 16534; -- Inoculated Nestlewood Owlkin
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@OWL;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OWL;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND`entryorguid`=@OWL;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND`entryorguid`=@OWL*100;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@OWL,0,0,0,8,0,100,0,29528,0,3000,3000,80,@OWL*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'on spellhit run script'),
+(@OWL*100,9,0,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'face player'),
+(@OWL*100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'say random text from groupid 0'),
+(@OWL*100,9,2,0,0,0,100,0,0,0,0,0,36,@IOWL,0,0,0,0,0,1,0,0,0,0,0,0,0,'morph to entry'),
+(@OWL*100,9,3,0,0,0,100,0,0,0,0,0,18,33024,0,0,0,0,0,1,0,0,0,0,0,0,0,'change unitflags'),
+(@OWL*100,9,4,0,0,0,100,0,300,300,0,0,33,@IOWL,0,0,0,0,0,7,0,0,0,0,0,0,0,'give quest credit'),
+(@OWL*100,9,5,0,0,0,100,0,500,500,0,0,89,15,0,0,0,0,0,1,0,0,0,0,0,0,0,'random movement'),
+(@OWL*100,9,6,0,0,0,100,0,9000,9000,0,0,36,@OWL,0,0,0,0,0,1,0,0,0,0,0,0,0,'change entry back'),
+(@OWL*100,9,7,0,0,0,100,0,0,0,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,'change unitflags back'),
+(@OWL*100,9,8,0,0,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'despawn');
+
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16518;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16518,0,0, 'The %s seems overjoyed.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,1, 'The %s seems disoriented.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,2, 'The %s doesn''t look like it minds the crystal''s effects.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,3, 'The %s didn''t like what just happened.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,4, 'The %s looks confused.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
+(16518,0,5, 'The %s nods appreciatively.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin');
+
+-- spell does not target the innoculated owlkin and it is not spawned, so take spell requirement out of equation
+UPDATE `quest_template` SET `ReqSpellCast1`=0 WHERE `entry`=9303;
diff --git a/sql/old/3.3.5a/2011_03_01_03_world_scriptname.sql b/sql/old/3.3.5a/2011_03_01_03_world_scriptname.sql
new file mode 100644
index 00000000000..3bd54857744
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_03_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16518;
diff --git a/sql/old/3.3.5a/2011_03_01_04_world_sai.sql b/sql/old/3.3.5a/2011_03_01_04_world_sai.sql
new file mode 100644
index 00000000000..05772307157
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_04_world_sai.sql
@@ -0,0 +1,159 @@
+-- Apothecary Enith Fixup for quest 9164 "Captives at Deatholme"
+-- add gossip_id to npc and fix stand state
+UPDATE `creature_template` SET `gossip_menu_id`=7182,`unit_flags`=33024 WHERE `entry`=16208;
+DELETE FROM `creature_template_addon` WHERE `entry`=16208;
+INSERT INTO `creature_template_addon` (`entry`,`bytes1`) VALUES (16208,7);
+-- add gossip menu items
+DELETE FROM `gossip_menu` WHERE `entry` IN (7182,7179);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7182,8459),
+(7179,8460);
+-- add gossip menu options
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7182,7179);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7182,0,0,'<Administer the restorative draught.>',1,1,7179,0,0,0,0,''),
+(7179,0,0,'A bit ungrateful, aren''t we? The way out is clear, flee quickly!',1,1,0,0,0,0,0,'');
+-- add condition for gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7182;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7182,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
+-- Apothecary Enith SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16208;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16208,1620800);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(16208,0,0,0,62,0,100,0,7179,0,0,0,80,1620800,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+(16208,0,1,0,40,0,100,0,5,16208,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 5 despawn'),
+(1620800,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
+(1620800,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
+(1620800,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
+(1620800,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(1620800,9,4,0,0,0,100,0,2000,2000,0,0,33,16208,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
+(1620800,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16208,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16208;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16208,0,0, 'Thanks, I should''ve never left Silverpine Forest.',0,0,100,6,0,0, 'Apothecary Enith');
+-- Apothecary Enith Path
+DELETE FROM `waypoints` WHERE `entry`=16208;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(16208,1,6647.83,-6344.92,9.13345,'Apothecary Enith point 1'),
+(16208,2,6657.92,-6345.96,15.3468,'Apothecary Enith point 2'),
+(16208,3,6661.58,-6342.65,15.4309,'Apothecary Enith point 3'),
+(16208,4,6662.35,-6334.64,20.8803,'Apothecary Enith point 4'),
+(16208,5,6662.63,-6331.85,20.8924,'Apothecary Enith point 5');
+
+-- Ranger Vedoran <Farstriders> Fixup for quest 9164 "Captives at Deatholme"
+-- add gossip_id to npc and fix stand state
+UPDATE `creature_template` SET `gossip_menu_id`=7177 WHERE `entry`=16209;
+-- add gossip menu items
+DELETE FROM `gossip_menu` WHERE `entry` IN (7177,7176);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7177,8457),
+(7176,8456);
+-- add gossip menu options
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7177,7176);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7177,0,0,'<Administer the restorative draught.>',1,1,7176,0,0,0,0,''),
+(7176,0,0,'You''re free to go now. The way out is safe.',1,1,0,0,0,0,0,'');
+-- add condition for gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7177;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7177,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
+-- Ranger Vedoran SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16209;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16209,1620900);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(16209,0,0,0,62,0,100,0,7176,0,0,0,80,1620900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+(16209,0,1,0,40,0,100,0,7,16209,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 7 despawn'),
+(1620900,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
+(1620900,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
+(1620900,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
+(1620900,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(1620900,9,4,0,0,0,100,0,2000,2000,0,0,33,16209,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
+(1620900,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16209,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16209;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16209,0,0, 'You have my thanks!',0,0,100,0,0,0, 'Ranger Vedoran');
+-- Ranger Vedoran Path
+DELETE FROM `waypoints` WHERE `entry`=16209;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(16209,1,6290.21,-6366.1,78.0195,'Ranger Vedoran point 1'),
+(16209,2,6301.65,-6364.06,78.0238,'Ranger Vedoran point 2'),
+(16209,3,6305.82,-6360.2,78.0782,'Ranger Vedoran point 3'),
+(16209,4,6310.5,-6356.76,80.6154,'Ranger Vedoran point 4'),
+(16209,5,6314.06,-6360.67,82.6096,'Ranger Vedoran point 5'),
+(16209,6,6317.35,-6365.34,82.7124,'Ranger Vedoran point 6'),
+(16209,7,6326.85,-6366.82,82.7090,'Ranger Vedoran point 7');
+
+-- Apprentice Varnis Fixup for quest 9164 "Captives at Deatholme"
+-- add gossip_id to npc and fix stand state
+UPDATE `creature_template` SET `gossip_menu_id`=7185 WHERE `entry`=16206;
+-- add gossip menu items
+DELETE FROM `gossip_menu` WHERE `entry` IN (7185,7186);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7185,8461),
+(7186,8463);
+-- add gossip menu options
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7185,7186);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7185,0,0,'<Administer the restorative draught.>',1,1,7186,0,0,0,0,''),
+(7186,0,0,'You''re free to go now. The way out is safe.',1,1,0,0,0,0,0,'');
+-- add condition for gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7185;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7185,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
+-- Apprentice Varnis SAI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16206;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16206,1620600);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(16206,0,0,0,62,0,100,0,7186,0,0,0,80,1620600,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
+(16206,0,1,0,40,0,100,0,7,16206,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 7 despawn'),
+(1620600,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
+(1620600,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
+(1620600,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
+(1620600,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
+(1620600,9,4,0,0,0,100,0,2000,2000,0,0,33,16206,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
+(1620600,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16206,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=16206;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(16206,0,0, 'Thank you. I thought I was going to die.',0,0,100,0,0,0, 'Apprentice Varnis');
+-- Apprentice Varnis Path
+DELETE FROM `waypoints` WHERE `entry`=16206;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(16206,1,6436.87,-6633.02,107.432,'Apprentice Varnis point 1'),
+(16206,2,6435.63,-6620.86,107.436,'Apprentice Varnis point 2'),
+(16206,3,6429.88,-6618.29,108.128,'Apprentice Varnis point 3'),
+(16206,4,6426.7,-6614.82,110.159,'Apprentice Varnis point 4'),
+(16206,5,6428.75,-6611.21,111.905,'Apprentice Varnis point 5'),
+(16206,6,6432.83,-6606.89,112.126,'Apprentice Varnis point 6'),
+(16206,7,6431.51,-6597.97,112.113,'Apprentice Varnis point 7');
+
+-- Gossip update Ghostlands
+UPDATE `creature_template` SET `gossip_menu_id`=7242, `npcflag`=`npcflag`|1 WHERE `entry`=16204; -- Magister Idonis
+UPDATE `creature_template` SET `gossip_menu_id`=7397, `npcflag`=`npcflag`|1 WHERE `entry`=16239; -- Magister Kaendris
+UPDATE `creature_template` SET `gossip_menu_id`=7194, `npcflag`=`npcflag`|1 WHERE `entry`=16291; -- Magister Quallestis
+UPDATE `creature_template` SET `gossip_menu_id`=7190, `npcflag`=`npcflag`|1 WHERE `entry`=16240; -- Arcanist Janeda
+UPDATE `creature_template` SET `gossip_menu_id`=7187 WHERE `entry`=16198; -- Apothecary Renzithen
+DELETE FROM `gossip_menu` WHERE `entry`=7242 AND `text_id`=8548;
+DELETE FROM `gossip_menu` WHERE `entry`=7397 AND `text_id`=8860;
+DELETE FROM `gossip_menu` WHERE `entry`=7194 AND `text_id`=8474;
+DELETE FROM `gossip_menu` WHERE `entry`=7190 AND `text_id`=8470;
+DELETE FROM `gossip_menu` WHERE `entry`=7187 AND `text_id`=8464;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7242,8548),(7397,8860),(7194,8474),(7190,8470),(7187,8464);
+-- Gossip menu option
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=7187;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7187,0,0,'I seek a sample of your restorative draught, apothecary.',1,1,0,0,0,0,0,'');
+-- Gossip menu option condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7187;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7187,0,0,9,9164,0,0,0,'','Show gossip option 0 if player has quest 9164');
+-- Smart AI
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16198;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=16198;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(16198,0,0,1,62,0,100,0,7187,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip option select close gossip'),
+(16198,0,1,0,61,0,100,0,0,0,0,0,11,28149,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Create Restorative Draught on player ');
diff --git a/sql/old/3.3.5a/2011_03_01_05_world_npc_trainer.sql b/sql/old/3.3.5a/2011_03_01_05_world_npc_trainer.sql
new file mode 100644
index 00000000000..ae9a533b620
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_01_05_world_npc_trainer.sql
@@ -0,0 +1,2 @@
+-- Set new tailoring requirement to learn crafting of Flying Carpet (based on 3.3.0 patch)
+UPDATE `npc_trainer` SET `spellcost`=105000,`reqskillvalue`=300 WHERE `spell`=60969;
diff --git a/sql/old/3.3.5a/2011_03_01_1_world_conditions.sql b/sql/old/3.3.5a/2011_03_01_1_world_conditions.sql
deleted file mode 100644
index c1137400040..00000000000
--- a/sql/old/3.3.5a/2011_03_01_1_world_conditions.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=36325;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,36325,0,18,1,21182,0,0,'','Spell 36325 target creature 21182'),
-(13,0,36325,0,18,1,22401,0,0,'','Spell 36325 target creature 22401'),
-(13,0,36325,0,18,1,22402,0,0,'','Spell 36325 target creature 22402'),
-(13,0,36325,0,18,1,22403,0,0,'','Spell 36325 target creature 22403');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_03_01_2_world_creature_template.sql b/sql/old/3.3.5a/2011_03_01_2_world_creature_template.sql
deleted file mode 100644
index b799e54617e..00000000000
--- a/sql/old/3.3.5a/2011_03_01_2_world_creature_template.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry` IN (27894,28781,30234,33062); -- match npcflag with diffentries (that got updated on 2011_02_28_7)
-UPDATE `creature_template` SET `VehicleId`=335 WHERE `entry`=34045; -- Salvaged Chopper (1)
-UPDATE `creature_template` SET `VehicleId`=335 WHERE `entry`=31748; -- Hover Disk (1)
diff --git a/sql/old/3.3.5a/2011_03_01_3_world_sai.sql b/sql/old/3.3.5a/2011_03_01_3_world_sai.sql
deleted file mode 100644
index 37a4afdf06c..00000000000
--- a/sql/old/3.3.5a/2011_03_01_3_world_sai.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- Quest 9303 "Inoculation"
-SET @OWL := 16518; -- Nestlewood Owlkin
-SET @IOWL := 16534; -- Inoculated Nestlewood Owlkin
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@OWL;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OWL;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND`entryorguid`=@OWL;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND`entryorguid`=@OWL*100;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@OWL,0,0,0,8,0,100,0,29528,0,3000,3000,80,@OWL*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'on spellhit run script'),
-(@OWL*100,9,0,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'face player'),
-(@OWL*100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'say random text from groupid 0'),
-(@OWL*100,9,2,0,0,0,100,0,0,0,0,0,36,@IOWL,0,0,0,0,0,1,0,0,0,0,0,0,0,'morph to entry'),
-(@OWL*100,9,3,0,0,0,100,0,0,0,0,0,18,33024,0,0,0,0,0,1,0,0,0,0,0,0,0,'change unitflags'),
-(@OWL*100,9,4,0,0,0,100,0,300,300,0,0,33,@IOWL,0,0,0,0,0,7,0,0,0,0,0,0,0,'give quest credit'),
-(@OWL*100,9,5,0,0,0,100,0,500,500,0,0,89,15,0,0,0,0,0,1,0,0,0,0,0,0,0,'random movement'),
-(@OWL*100,9,6,0,0,0,100,0,9000,9000,0,0,36,@OWL,0,0,0,0,0,1,0,0,0,0,0,0,0,'change entry back'),
-(@OWL*100,9,7,0,0,0,100,0,0,0,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,'change unitflags back'),
-(@OWL*100,9,8,0,0,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'despawn');
-
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry`=16518;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(16518,0,0, 'The %s seems overjoyed.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
-(16518,0,1, 'The %s seems disoriented.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
-(16518,0,2, 'The %s doesn''t look like it minds the crystal''s effects.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
-(16518,0,3, 'The %s didn''t like what just happened.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
-(16518,0,4, 'The %s looks confused.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin'),
-(16518,0,5, 'The %s nods appreciatively.',2,0,100,0,0,0, 'Inoculated Nestlewood Owlkin');
-
--- spell does not target the innoculated owlkin and it is not spawned, so take spell requirement out of equation
-UPDATE `quest_template` SET `ReqSpellCast1`=0 WHERE `entry`=9303;
diff --git a/sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql b/sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql
deleted file mode 100644
index 3bd54857744..00000000000
--- a/sql/old/3.3.5a/2011_03_01_3_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16518;
diff --git a/sql/old/3.3.5a/2011_03_01_4_world_sai.sql b/sql/old/3.3.5a/2011_03_01_4_world_sai.sql
deleted file mode 100644
index 05772307157..00000000000
--- a/sql/old/3.3.5a/2011_03_01_4_world_sai.sql
+++ /dev/null
@@ -1,159 +0,0 @@
--- Apothecary Enith Fixup for quest 9164 "Captives at Deatholme"
--- add gossip_id to npc and fix stand state
-UPDATE `creature_template` SET `gossip_menu_id`=7182,`unit_flags`=33024 WHERE `entry`=16208;
-DELETE FROM `creature_template_addon` WHERE `entry`=16208;
-INSERT INTO `creature_template_addon` (`entry`,`bytes1`) VALUES (16208,7);
--- add gossip menu items
-DELETE FROM `gossip_menu` WHERE `entry` IN (7182,7179);
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(7182,8459),
-(7179,8460);
--- add gossip menu options
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7182,7179);
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(7182,0,0,'<Administer the restorative draught.>',1,1,7179,0,0,0,0,''),
-(7179,0,0,'A bit ungrateful, aren''t we? The way out is clear, flee quickly!',1,1,0,0,0,0,0,'');
--- add condition for gossip option
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7182;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,7182,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
--- Apothecary Enith SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16208;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16208,1620800);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(16208,0,0,0,62,0,100,0,7179,0,0,0,80,1620800,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
-(16208,0,1,0,40,0,100,0,5,16208,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 5 despawn'),
-(1620800,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
-(1620800,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
-(1620800,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
-(1620800,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
-(1620800,9,4,0,0,0,100,0,2000,2000,0,0,33,16208,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
-(1620800,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16208,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry`=16208;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(16208,0,0, 'Thanks, I should''ve never left Silverpine Forest.',0,0,100,6,0,0, 'Apothecary Enith');
--- Apothecary Enith Path
-DELETE FROM `waypoints` WHERE `entry`=16208;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(16208,1,6647.83,-6344.92,9.13345,'Apothecary Enith point 1'),
-(16208,2,6657.92,-6345.96,15.3468,'Apothecary Enith point 2'),
-(16208,3,6661.58,-6342.65,15.4309,'Apothecary Enith point 3'),
-(16208,4,6662.35,-6334.64,20.8803,'Apothecary Enith point 4'),
-(16208,5,6662.63,-6331.85,20.8924,'Apothecary Enith point 5');
-
--- Ranger Vedoran <Farstriders> Fixup for quest 9164 "Captives at Deatholme"
--- add gossip_id to npc and fix stand state
-UPDATE `creature_template` SET `gossip_menu_id`=7177 WHERE `entry`=16209;
--- add gossip menu items
-DELETE FROM `gossip_menu` WHERE `entry` IN (7177,7176);
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(7177,8457),
-(7176,8456);
--- add gossip menu options
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7177,7176);
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(7177,0,0,'<Administer the restorative draught.>',1,1,7176,0,0,0,0,''),
-(7176,0,0,'You''re free to go now. The way out is safe.',1,1,0,0,0,0,0,'');
--- add condition for gossip option
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7177;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,7177,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
--- Ranger Vedoran SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16209;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16209,1620900);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(16209,0,0,0,62,0,100,0,7176,0,0,0,80,1620900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
-(16209,0,1,0,40,0,100,0,7,16209,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 7 despawn'),
-(1620900,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
-(1620900,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
-(1620900,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
-(1620900,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
-(1620900,9,4,0,0,0,100,0,2000,2000,0,0,33,16209,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
-(1620900,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16209,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry`=16209;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(16209,0,0, 'You have my thanks!',0,0,100,0,0,0, 'Ranger Vedoran');
--- Ranger Vedoran Path
-DELETE FROM `waypoints` WHERE `entry`=16209;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(16209,1,6290.21,-6366.1,78.0195,'Ranger Vedoran point 1'),
-(16209,2,6301.65,-6364.06,78.0238,'Ranger Vedoran point 2'),
-(16209,3,6305.82,-6360.2,78.0782,'Ranger Vedoran point 3'),
-(16209,4,6310.5,-6356.76,80.6154,'Ranger Vedoran point 4'),
-(16209,5,6314.06,-6360.67,82.6096,'Ranger Vedoran point 5'),
-(16209,6,6317.35,-6365.34,82.7124,'Ranger Vedoran point 6'),
-(16209,7,6326.85,-6366.82,82.7090,'Ranger Vedoran point 7');
-
--- Apprentice Varnis Fixup for quest 9164 "Captives at Deatholme"
--- add gossip_id to npc and fix stand state
-UPDATE `creature_template` SET `gossip_menu_id`=7185 WHERE `entry`=16206;
--- add gossip menu items
-DELETE FROM `gossip_menu` WHERE `entry` IN (7185,7186);
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(7185,8461),
-(7186,8463);
--- add gossip menu options
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7185,7186);
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(7185,0,0,'<Administer the restorative draught.>',1,1,7186,0,0,0,0,''),
-(7186,0,0,'You''re free to go now. The way out is safe.',1,1,0,0,0,0,0,'');
--- add condition for gossip option
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7185;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,7185,0,0,2,22628,1,0,0,'','Show gossip option 0 if player has Renzithen''s Restorative Draught');
--- Apprentice Varnis SAI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16206;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16206,1620600);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(16206,0,0,0,62,0,100,0,7186,0,0,0,80,1620600,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On gossip option select run script'),
-(16206,0,1,0,40,0,100,0,7,16206,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'On reach waypoint 7 despawn'),
-(1620600,9,0,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Turn off Gossip flag'),
-(1620600,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Set bytes1 stand'),
-(1620600,9,2,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'turn to envoker'),
-(1620600,9,3,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Say text 0'),
-(1620600,9,4,0,0,0,100,0,2000,2000,0,0,33,16206,0,0,0,0,0,7,0,0,0,0,0,0,0, 'give quest credit'),
-(1620600,9,5,0,0,0,100,0,1000,1000,0,0,53,1,16206,0,0,0,0,1,0,0,0,0,0,0,0, 'start waypoint movement');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry`=16206;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(16206,0,0, 'Thank you. I thought I was going to die.',0,0,100,0,0,0, 'Apprentice Varnis');
--- Apprentice Varnis Path
-DELETE FROM `waypoints` WHERE `entry`=16206;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(16206,1,6436.87,-6633.02,107.432,'Apprentice Varnis point 1'),
-(16206,2,6435.63,-6620.86,107.436,'Apprentice Varnis point 2'),
-(16206,3,6429.88,-6618.29,108.128,'Apprentice Varnis point 3'),
-(16206,4,6426.7,-6614.82,110.159,'Apprentice Varnis point 4'),
-(16206,5,6428.75,-6611.21,111.905,'Apprentice Varnis point 5'),
-(16206,6,6432.83,-6606.89,112.126,'Apprentice Varnis point 6'),
-(16206,7,6431.51,-6597.97,112.113,'Apprentice Varnis point 7');
-
--- Gossip update Ghostlands
-UPDATE `creature_template` SET `gossip_menu_id`=7242, `npcflag`=`npcflag`|1 WHERE `entry`=16204; -- Magister Idonis
-UPDATE `creature_template` SET `gossip_menu_id`=7397, `npcflag`=`npcflag`|1 WHERE `entry`=16239; -- Magister Kaendris
-UPDATE `creature_template` SET `gossip_menu_id`=7194, `npcflag`=`npcflag`|1 WHERE `entry`=16291; -- Magister Quallestis
-UPDATE `creature_template` SET `gossip_menu_id`=7190, `npcflag`=`npcflag`|1 WHERE `entry`=16240; -- Arcanist Janeda
-UPDATE `creature_template` SET `gossip_menu_id`=7187 WHERE `entry`=16198; -- Apothecary Renzithen
-DELETE FROM `gossip_menu` WHERE `entry`=7242 AND `text_id`=8548;
-DELETE FROM `gossip_menu` WHERE `entry`=7397 AND `text_id`=8860;
-DELETE FROM `gossip_menu` WHERE `entry`=7194 AND `text_id`=8474;
-DELETE FROM `gossip_menu` WHERE `entry`=7190 AND `text_id`=8470;
-DELETE FROM `gossip_menu` WHERE `entry`=7187 AND `text_id`=8464;
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(7242,8548),(7397,8860),(7194,8474),(7190,8470),(7187,8464);
--- Gossip menu option
-DELETE FROM `gossip_menu_option` WHERE `menu_id`=7187;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(7187,0,0,'I seek a sample of your restorative draught, apothecary.',1,1,0,0,0,0,0,'');
--- Gossip menu option condition
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7187;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,7187,0,0,9,9164,0,0,0,'','Show gossip option 0 if player has quest 9164');
--- Smart AI
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=16198;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=16198;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(16198,0,0,1,62,0,100,0,7187,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On gossip option select close gossip'),
-(16198,0,1,0,61,0,100,0,0,0,0,0,11,28149,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Cast Create Restorative Draught on player ');
diff --git a/sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql b/sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql
deleted file mode 100644
index ae9a533b620..00000000000
--- a/sql/old/3.3.5a/2011_03_01_5_world_npc_trainer.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Set new tailoring requirement to learn crafting of Flying Carpet (based on 3.3.0 patch)
-UPDATE `npc_trainer` SET `spellcost`=105000,`reqskillvalue`=300 WHERE `spell`=60969;
diff --git a/sql/old/3.3.5a/2011_03_02_00_world_creature_template.sql b/sql/old/3.3.5a/2011_03_02_00_world_creature_template.sql
new file mode 100644
index 00000000000..b7ae2e1da4e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_00_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `VehicleId`=283 WHERE `entry`=31748; -- Hover Disk (1)
+UPDATE `creature_template` SET `VehicleId`=223 WHERE `entry`=31749; -- Hover Disk (1)
diff --git a/sql/old/3.3.5a/2011_03_02_01_world_achievement_reward.sql b/sql/old/3.3.5a/2011_03_02_01_world_achievement_reward.sql
new file mode 100644
index 00000000000..2afcce64f7b
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_01_world_achievement_reward.sql
@@ -0,0 +1,5 @@
+-- Send in-game mail when player completes achievements Emblematic
+DELETE FROM `achievement_reward` WHERE `entry` IN (4784,4785);
+INSERT INTO `achievement_reward` (`entry`,`title_A`,`title_H`,`item`,`sender`,`subject`,`text`) VALUES
+(4784,0,0,0,37942, 'Emblem Quartermasters in Dalaran''s Silver Enclave', 'Your achievements in Northrend have not gone unnoticed, friend.$B$BThe Emblems you have earned may be used to purchase equipment from the various Emblem Quartermasters in Dalaran.$B$BYou may find us there, in the Silver Enclave, where each variety of Emblem has its own quartermaster.$B$BWe look forward to your arrival!'),
+(4785,0,0,0,37941, 'Emblem Quartermasters in Dalaran''s Sunreaver Sanctuary', 'Your achievements in Northrend have not gone unnoticed, friend.$B$BThe Emblems you have earned may be used to purchase equipment from the various Emblem Quartermasters in Dalaran.$B$BYou may find us there, in the Sunreaver Sanctuary, where each variety of Emblem has its own quartermaster.$B$BWe look forward to your arrival!');
diff --git a/sql/old/3.3.5a/2011_03_02_02_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_02_02_world_waypoint_data.sql
new file mode 100644
index 00000000000..baccd34f0ee
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_02_world_waypoint_data.sql
@@ -0,0 +1,312 @@
+-- Remove some waypoint errors
+UPDATE `creature` SET `MovementType`=0 WHERE `guid` IN (57763,57764,57765,57766);
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (57763,57764,57765,57766);
+DELETE FROM `waypoint_data` WHERE `id` IN (577630,577640,577650,577660);
+DELETE FROM `waypoint_scripts` WHERE `id` IN (48,49,50,51);
+
+-- Mature Netherwing Drake Pathing From sniff 1 added.
+SET @NPC := 75541;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4134.369,`position_y`=850.2852,`position_z`=61.26378 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4120.351,883.5854,61.26378,0,0,0,100,0),
+(@PATH,2,-4085.13,900.4695,61.26378,0,0,0,100,0),
+(@PATH,3,-4048.586,884.7811,61.26378,0,0,0,100,0),
+(@PATH,4,-4033.683,852.1551,61.26378,0,0,0,100,0),
+(@PATH,5,-4050.652,818.6749,61.26378,0,0,0,100,0),
+(@PATH,6,-4085.118,799.5022,61.26378,0,0,0,100,0),
+(@PATH,7,-4117.451,815.256,61.26378,0,0,0,100,0),
+(@PATH,8,-4134.369,850.2852,61.26378,0,0,0,100,0);
+
+SET @NPC := 75542;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4066.473,`position_y`=752.3994,`position_z`=43.04424 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4083.436,721.6484,43.04424,0,0,0,100,0),
+(@PATH,2,-4109.103,700.2794,43.04424,0,0,0,100,0),
+(@PATH,3,-4114.49,699.9313,43.04424,0,0,0,100,0),
+(@PATH,4,-4149.18,716.9812,43.04424,0,0,0,100,0),
+(@PATH,5,-4164.394,749.7984,44.87757,0,0,0,100,0),
+(@PATH,6,-4147.782,783.0017,46.62758,0,0,0,100,0),
+(@PATH,7,-4117.128,799.6888,51.93314,0,0,0,100,0),
+(@PATH,8,-4082.698,785.6704,50.3498,0,0,0,100,0),
+(@PATH,9,-4066.473,752.3994,43.04424,0,0,0,100,0);
+
+SET @NPC := 75543;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4148.391,`position_y`=766.8653,`position_z`=66.01289 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4183.416,753.0403,72.09624,0,0,0,100,0),
+(@PATH,2,-4199.977,716.2882,82.67956,0,0,0,100,0),
+(@PATH,3,-4183.724,684.1388,70.56844,0,0,0,100,0),
+(@PATH,4,-4148.917,666.9986,63.51288,0,0,0,100,0),
+(@PATH,5,-4116.004,684.5375,61.51288,0,0,0,100,0),
+(@PATH,6,-4099.94,716.4078,62.09623,0,0,0,100,0),
+(@PATH,7,-4116.647,749.6686,61.59621,0,0,0,100,0),
+(@PATH,8,-4148.391,766.8653,66.01289,0,0,0,100,0);
+
+SET @NPC := 75544;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4084.089,`position_y`=683.0483,`position_z`=59.55887 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4067.996,652.302,59.55887,0,0,0,100,0),
+(@PATH,2,-4084.038,618.9259,59.55887,0,0,0,100,0),
+(@PATH,3,-4117.386,599.9404,59.55887,0,0,0,100,0),
+(@PATH,4,-4149.88,616.7292,59.55887,0,0,0,100,0),
+(@PATH,5,-4165.804,652.2473,59.55887,0,0,0,100,0),
+(@PATH,6,-4150.054,685.6966,59.55887,0,0,0,100,0),
+(@PATH,7,-4118.107,699.7501,59.55887,0,0,0,100,0),
+(@PATH,8,-4084.089,683.0483,59.55887,0,0,0,100,0);
+
+SET @NPC := 75545;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4083.681,`position_y`=848.0616,`position_z`=58.43416 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4117.843,866.6574,58.43417,0,0,0,100,0),
+(@PATH,2,-4149.746,851.1995,68.6286,0,0,0,100,0),
+(@PATH,3,-4167.114,815.8797,74.48971,0,0,0,100,0),
+(@PATH,4,-4150.918,786.3128,65.07306,0,0,0,100,0),
+(@PATH,5,-4116.956,766.7995,70.51749,0,0,0,100,0),
+(@PATH,6,-4085.521,784.5572,76.90639,0,0,0,100,0),
+(@PATH,7,-4067.243,818.4576,64.35083,0,0,0,100,0),
+(@PATH,8,-4083.681,848.0616,58.43416,0,0,0,100,0);
+
+SET @NPC := 75546;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4133.319,`position_y`=918.6325,`position_z`=70.3725 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4117.341,884.8878,62.09472,0,0,0,100,0),
+(@PATH,2,-4084.125,867.1631,52.70584,0,0,0,100,0),
+(@PATH,3,-4050.462,883.2648,46.84472,0,0,0,100,0),
+(@PATH,4,-4033.427,917.2786,54.8725,0,0,0,100,0),
+(@PATH,5,-4049.515,951.7986,62.20583,0,0,0,100,0),
+(@PATH,6,-4082.625,966.6864,69.48361,0,0,0,100,0),
+(@PATH,7,-4116.243,949.7843,72.2614,0,0,0,100,0),
+(@PATH,8,-4133.319,918.6325,70.3725,0,0,0,100,0);
+
+SET @NPC := 75547;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4000.944,`position_y`=650.089,`position_z`=84.74791 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4015.128,680.8443,72.16458,0,0,0,100,0),
+(@PATH,2,-4047.654,700.2465,60.27572,0,0,0,100,0),
+(@PATH,3,-4082.378,686.9391,58.8868,0,0,0,100,0),
+(@PATH,4,-4099.23,649.127,67.30346,0,0,0,100,0),
+(@PATH,5,-4083.47,615.1847,74.74792,0,0,0,100,0),
+(@PATH,6,-4047.911,600.5391,92.52572,0,0,0,100,0),
+(@PATH,7,-4016.922,616.1044,98.47014,0,0,0,100,0),
+(@PATH,8,-4000.944,650.089,84.74791,0,0,0,100,0);
+
+SET @NPC := 75548;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4052.34,`position_y`=716.3079,`position_z`=48.66938 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4019.384,700.1765,47.08604,0,0,0,100,0),
+(@PATH,2,-3983.657,716.8768,52.75271,0,0,0,100,0),
+(@PATH,3,-3967.16,750.4713,65.47495,0,0,0,100,0),
+(@PATH,4,-3982.856,783.4985,67.83604,0,0,0,100,0),
+(@PATH,5,-4017.322,800.1605,65.75271,0,0,0,100,0),
+(@PATH,6,-4048.333,784.6697,60.58604,0,0,0,100,0),
+(@PATH,7,-4067.148,750.3481,53.25271,0,0,0,100,0),
+(@PATH,8,-4052.34,716.3079,48.66938,0,0,0,100,0);
+
+SET @NPC := 75549;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3949.365,`position_y`=819.178,`position_z`=51.50261 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3933.805,784.3923,51.50261,0,0,0,100,0),
+(@PATH,2,-3951.698,751.0433,51.50261,0,0,0,100,0),
+(@PATH,3,-3980.543,733.1439,58.86372,0,0,0,100,0),
+(@PATH,4,-4016.032,747.1483,64.55817,0,0,0,100,0),
+(@PATH,5,-4032.366,782.211,60.08595,0,0,0,100,0),
+(@PATH,6,-4017.203,816.9814,53.30817,0,0,0,100,0),
+(@PATH,7,-3985.723,832.2205,51.50261,0,0,0,100,0),
+(@PATH,8,-3949.365,819.178,51.50261,0,0,0,100,0);
+
+SET @NPC := 75550;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3916.397,`position_y`=883.2978,`position_z`=81.9971 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3948.779,899.8286,68.13598,0,0,0,100,0),
+(@PATH,2,-3982.235,885.5906,61.1082,0,0,0,100,0),
+(@PATH,3,-3999.414,851.4448,62.69153,0,0,0,100,0),
+(@PATH,4,-3983.74,817.0834,58.96931,0,0,0,100,0),
+(@PATH,5,-3950.159,800.5572,63.10819,0,0,0,100,0),
+(@PATH,6,-3918.94,815.5467,72.46931,0,0,0,100,0),
+(@PATH,7,-3900.264,851.1897,81.30264,0,0,0,100,0),
+(@PATH,8,-3916.397,883.2978,81.9971,0,0,0,100,0);
+
+SET @NPC := 75551;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4084.883,`position_y`=914.0491,`position_z`=72.2939 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4099.644,950.2539,69.2939,0,0,0,100,0),
+(@PATH,2,-4086.421,983.3143,71.12724,0,0,0,100,0),
+(@PATH,3,-4050.086,1000.082,74.32168,0,0,0,100,0),
+(@PATH,4,-4018.68,983.5675,74.32168,0,0,0,100,0),
+(@PATH,5,-4001.11,950.1692,74.32168,0,0,0,100,0),
+(@PATH,6,-4016.584,917.4998,74.32168,0,0,0,100,0),
+(@PATH,7,-4048.498,899.8286,74.32168,0,0,0,100,0),
+(@PATH,8,-4084.883,914.0491,72.2939,0,0,0,100,0);
+
+SET @NPC := 75552;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3915.657,`position_y`=833.4163,`position_z`=47.38418 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3948.898,849.9359,47.38418,0,0,0,100,0),
+(@PATH,2,-3964.938,879.6131,47.38418,0,0,0,100,0),
+(@PATH,3,-3948.945,916.1858,47.38418,0,0,0,100,0),
+(@PATH,4,-3916.809,932.6107,48.16196,0,0,0,100,0),
+(@PATH,5,-3886.793,916.5725,53.96752,0,0,0,100,0),
+(@PATH,6,-3866.807,883.3404,60.02308,0,0,0,100,0),
+(@PATH,7,-3884.739,849.9593,54.30085,0,0,0,100,0),
+(@PATH,8,-3915.657,833.4163,47.38418,0,0,0,100,0);
+
+SET @NPC := 75553;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4047.742,`position_y`=1066.566,`position_z`=106.1299 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4082.141,1050.517,104.5466,0,0,0,100,0),
+(@PATH,2,-4099.718,1017.106,98.4355,0,0,0,100,0),
+(@PATH,3,-4082.201,985.4608,87.46328,0,0,0,100,0),
+(@PATH,4,-4048.188,966.8837,78.15773,0,0,0,100,0),
+(@PATH,5,-4017.819,980.5856,72.37994,0,0,0,100,0),
+(@PATH,6,-4000.326,1016.784,86.21326,0,0,0,100,0),
+(@PATH,7,-4014.791,1050.645,97.40771,0,0,0,100,0),
+(@PATH,8,-4047.742,1066.566,106.1299,0,0,0,100,0);
+
+SET @NPC := 75554;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3900.323,`position_y`=984.7424,`position_z`=60.60864 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3918.999,953.8466,58.96975,0,0,0,100,0),
+(@PATH,2,-3950.793,934.2088,58.96975,0,0,0,100,0),
+(@PATH,3,-3982.866,950.2649,58.96975,0,0,0,100,0),
+(@PATH,4,-4000.046,985.8019,61.02531,0,0,0,100,0),
+(@PATH,5,-3981.982,1017.846,58.96975,0,0,0,100,0),
+(@PATH,6,-3949.962,1033.053,56.85864,0,0,0,100,0),
+(@PATH,7,-3918.825,1014.746,58.33086,0,0,0,100,0),
+(@PATH,8,-3900.323,984.7424,60.60864,0,0,0,100,0);
+
+SET @NPC := 75555;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3950.083,`position_y`=985.4277,`position_z`=83.53654 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3965.832,952.775,76.7032,0,0,0,100,0),
+(@PATH,2,-3951.587,918.8143,71.53653,0,0,0,100,0),
+(@PATH,3,-3916.848,899.7321,72.39764,0,0,0,100,0),
+(@PATH,4,-3885.93,916.5598,83.34209,0,0,0,100,0),
+(@PATH,5,-3867.241,951.6891,90.39765,0,0,0,100,0),
+(@PATH,6,-3882.38,983.3097,81.48098,0,0,0,100,0),
+(@PATH,7,-3915.022,1000.09,72.17542,0,0,0,100,0),
+(@PATH,8,-3950.083,985.4277,83.53654,0,0,0,100,0);
+
+SET @NPC := 75556;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3966.719,`position_y`=1048.378,`position_z`=69.52766 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3983.504,1016.722,67.94434,0,0,0,100,0),
+(@PATH,2,-4015.046,1002.573,69.52766,0,0,0,100,0),
+(@PATH,3,-4049.708,1017.723,72.13878,0,0,0,100,0),
+(@PATH,4,-4066.48,1048.968,72.66656,0,0,0,100,0),
+(@PATH,5,-4048.204,1083.848,71.19434,0,0,0,100,0),
+(@PATH,6,-4016.47,1100.259,72.47211,0,0,0,100,0),
+(@PATH,7,-3985.822,1082.684,70.97211,0,0,0,100,0),
+(@PATH,8,-3966.719,1048.378,69.52766,0,0,0,100,0);
+
+SET @NPC := 75557;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3950.767,`position_y`=1000.512,`position_z`=87.49402 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3918.137,1015.368,90.16069,0,0,0,100,0),
+(@PATH,2,-3900.402,1050.901,91.7718,0,0,0,100,0),
+(@PATH,3,-3917.262,1083.885,99.32737,0,0,0,100,0),
+(@PATH,4,-3949.68,1100.575,106.7718,0,0,0,100,0),
+(@PATH,5,-3981.045,1082.341,107.8829,0,0,0,100,0),
+(@PATH,6,-3999.798,1048.804,99.57736,0,0,0,100,0),
+(@PATH,7,-3985.399,1018.346,91.7718,0,0,0,100,0),
+(@PATH,8,-3950.767,1000.512,87.49402,0,0,0,100,0);
+
+SET @NPC := 75558;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4066.473,`position_y`=752.3994,`position_z`=43.04424 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4083.436,721.6484,43.04424,0,0,0,100,0),
+(@PATH,2,-4109.103,700.2794,43.04424,0,0,0,100,0),
+(@PATH,3,-4114.49,699.9313,43.04424,0,0,0,100,0),
+(@PATH,4,-4149.18,716.9812,43.04424,0,0,0,100,0),
+(@PATH,5,-4164.394,749.7984,44.87757,0,0,0,100,0),
+(@PATH,6,-4147.782,783.0017,46.62758,0,0,0,100,0),
+(@PATH,7,-4117.128,799.6888,51.93314,0,0,0,100,0),
+(@PATH,8,-4082.698,785.6704,50.3498,0,0,0,100,0),
+(@PATH,9,-4066.473,752.3994,43.04424,0,0,0,100,0);
+
+SET @NPC := 86103;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `id`=21648,`spawndist`=0,`MovementType`=2,`position_x`=-3981.939,`position_y`=1200.395,`position_z`=108.2629 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4015.405,1186.572,107.8463,0,0,0,100,0),
+(@PATH,2,-4032.093,1150.835,100.8185,0,0,0,100,0),
+(@PATH,3,-4016.442,1117.503,95.84628,0,0,0,100,0),
+(@PATH,4,-3982.193,1100.35,95.62405,0,0,0,100,0),
+(@PATH,5,-3950.59,1116.853,99.12405,0,0,0,100,0),
+(@PATH,6,-3933.569,1150.704,103.263,0,0,0,100,0),
+(@PATH,7,-3949.776,1184.953,106.8185,0,0,0,100,0),
+(@PATH,8,-3981.939,1200.395,108.2629,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2011_03_02_03_world_gossip_menu.sql b/sql/old/3.3.5a/2011_03_02_03_world_gossip_menu.sql
new file mode 100644
index 00000000000..6669edd4929
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_03_world_gossip_menu.sql
@@ -0,0 +1,31 @@
+-- Gossip Menu insert
+DELETE FROM `gossip_menu` WHERE `entry`=3067 AND `text_id`=3801;
+DELETE FROM `gossip_menu` WHERE `entry`=3481 AND `text_id`=4953;
+DELETE FROM `gossip_menu` WHERE `entry`=4061 AND `text_id`=4954;
+DELETE FROM `gossip_menu` WHERE `entry`=4062 AND `text_id`=4955;
+DELETE FROM `gossip_menu` WHERE `entry`=4063 AND `text_id`=4956;
+DELETE FROM `gossip_menu` WHERE `entry`=4064 AND `text_id`=4957;
+DELETE FROM `gossip_menu` WHERE `entry`=4065 AND `text_id`=4958;
+DELETE FROM `gossip_menu` WHERE `entry`=6627 AND `text_id`=7881;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(3067,3801),
+(3481,4953),
+(4061,4954),
+(4062,4955),
+(4063,4956),
+(4064,4957),
+(4065,4958),
+(6627,7881);
+-- Creature Gossip_menu_id Update
+UPDATE `creature_template` SET `gossip_menu_id`=4573 WHERE `entry`=4091;
+UPDATE `creature_template` SET `gossip_menu_id`=3067 WHERE `entry`=7866;
+UPDATE `creature_template` SET `gossip_menu_id`=3481 WHERE `entry`=11548;
+UPDATE `creature_template` SET `gossip_menu_id`=6944 WHERE `entry`=12577;
+-- Creature Gossip_menu_option Update
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=3481;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(3481,0,0, 'The land of Azshara.',1,1,4061,0,0,0,0, ''),
+(3481,1,0, 'The Ruins of Eldarath.',1,1,4062,0,0,0,0, ''),
+(3481,2,0, 'The mage tower to the north.',1,1,4063,0,0,0,0, ''),
+(3481,3,0, 'The Timbermaw furbolgs.',1,1,4064,0,0,0,0, ''),
+(3481,4,0, 'The presence of blue dragons.',1,1,4065,0,0,0,0, '');
diff --git a/sql/old/3.3.5a/2011_03_02_04_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_02_04_world_waypoint_data.sql
new file mode 100644
index 00000000000..e2413c0f6ff
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_04_world_waypoint_data.sql
@@ -0,0 +1,164 @@
+-- Waypoints for Vilewing Chimaera
+SET @NPC := 84613;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3495.376,`position_y`=2654.514,`position_z`=85.14965 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84611,84490);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3513.771,2667.212,85.87186,0,0,0,100,0),
+(@PATH,2,-3527.99,2668.341,87.39961,0,0,0,100,0),
+(@PATH,3,-3568.938,2660.981,87.3718,0,0,0,100,0),
+(@PATH,4,-3605.726,2631.423,89.09409,0,0,0,100,0),
+(@PATH,5,-3606.994,2590.197,89.01077,0,0,0,100,0),
+(@PATH,6,-3624.849,2552.972,89.84412,0,0,0,100,0),
+(@PATH,7,-3632.875,2523.194,90.78855,0,0,0,100,0),
+(@PATH,8,-3623.275,2498.775,93.42754,0,0,0,100,0),
+(@PATH,9,-3594.59,2497.109,91.81643,0,0,0,100,0),
+(@PATH,10,-3571.224,2522.083,89.76082,0,0,0,100,0),
+(@PATH,11,-3555.303,2550.05,88.20523,0,0,0,100,0),
+(@PATH,12,-3546.012,2576.069,86.67743,0,0,0,100,0),
+(@PATH,13,-3533.117,2604.753,86.59406,0,0,0,100,0),
+(@PATH,14,-3505.657,2622.679,86.03844,0,0,0,100,0),
+(@PATH,15,-3495.376,2654.514,85.14965,0,0,0,100,0);
+
+SET @NPC := 84632;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3051.686,`position_y`=1036.492,`position_z`=18.42691 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84629,84630);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3078.817,1034.035,19.28807,0,0,0,100,0),
+(@PATH,2,-3088.495,1066.141,25.0936,0,0,0,100,0),
+(@PATH,3,-3087.413,1099.35,30.84361,0,0,0,100,0),
+(@PATH,4,-3067.319,1113.823,27.62129,0,0,0,100,0),
+(@PATH,5,-3035.007,1131.8,22.48246,0,0,0,100,0),
+(@PATH,6,-3022.366,1165.862,21.28805,0,0,0,100,0),
+(@PATH,7,-3028.652,1200.958,24.2047,0,0,0,100,0),
+(@PATH,8,-3053.869,1219.137,31.12142,0,0,0,100,0),
+(@PATH,9,-3098.912,1230.556,38.8714,0,0,0,100,0),
+(@PATH,10,-3120.39,1233.38,42.48251,0,0,0,100,0),
+(@PATH,11,-3155.853,1240.664,47.03807,0,0,0,100,0),
+(@PATH,12,-3184.486,1256.954,49.17699,0,0,0,100,0),
+(@PATH,13,-3200.051,1273.893,49.17699,0,0,0,100,0),
+(@PATH,14,-3198.467,1300.309,47.56586,0,0,0,100,0),
+(@PATH,15,-3180.189,1312.811,46.51028,0,0,0,100,0),
+(@PATH,16,-3166.775,1318.915,44.56582,0,0,0,100,0),
+(@PATH,17,-3133.76,1306.827,33.8992,0,0,0,100,0),
+(@PATH,18,-3107.957,1267.029,29.7603,0,0,0,100,0),
+(@PATH,19,-3102.756,1234.923,31.56591,0,0,0,100,0),
+(@PATH,20,-3081.735,1200.232,34.76027,0,0,0,100,0),
+(@PATH,21,-3064.895,1171.269,31.59359,0,0,0,100,0),
+(@PATH,22,-3032.818,1161.913,24.92694,0,0,0,100,0),
+(@PATH,23,-2998.293,1162.476,17.28803,0,0,0,100,0),
+(@PATH,24,-2989.174,1125.52,23.26031,0,0,0,100,0),
+(@PATH,25,-3019.696,1108.528,28.37141,0,0,0,100,0),
+(@PATH,26,-3030.191,1069.277,24.06586,0,0,0,100,0),
+(@PATH,27,-3051.686,1036.492,18.42691,0,0,0,100,0);
+
+SET @NPC := 84594;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3306.025,`position_y`=2329.368,`position_z`=83.54176 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84609,84610);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3306.578,2358.007,83.95837,0,0,0,100,0),
+(@PATH,2,-3312.279,2366.838,84.12508,0,0,0,100,0),
+(@PATH,3,-3339.576,2384.215,85.01395,0,0,0,100,0),
+(@PATH,4,-3375.194,2400.308,84.79176,0,0,0,100,0),
+(@PATH,5,-3413.535,2413.8,83.40285,0,0,0,100,0),
+(@PATH,6,-3449.745,2447.95,84.59732,0,0,0,100,0),
+(@PATH,7,-3484.88,2475.859,87.48625,0,0,0,100,0),
+(@PATH,8,-3516.799,2470.339,88.65293,0,0,0,100,0),
+(@PATH,9,-3551.302,2449.093,88.65293,0,0,0,100,0),
+(@PATH,10,-3577.611,2417.917,88.65293,0,0,0,100,0),
+(@PATH,11,-3587.224,2394.964,88.65293,0,0,0,100,0),
+(@PATH,12,-3578.091,2358.175,91.01408,0,0,0,100,0),
+(@PATH,13,-3542.674,2341.767,90.73628,0,0,0,100,0),
+(@PATH,14,-3508.299,2338.776,88.65293,0,0,0,100,0),
+(@PATH,15,-3480.534,2321.327,85.20841,0,0,0,100,0),
+(@PATH,16,-3438.703,2328.433,84.01396,0,0,0,100,0),
+(@PATH,17,-3402.306,2319.822,84.06959,0,0,0,100,0),
+(@PATH,18,-3367.927,2320.204,83.40282,0,0,0,100,0),
+(@PATH,19,-3336.193,2315.693,83.7084,0,0,0,100,0),
+(@PATH,20,-3306.025,2329.368,83.54176,0,0,0,100,0);
+
+SET @NPC := 84597;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3679.033,`position_y`=1980.171,`position_z`=95.40069 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3694.715,1971.449,97.03951,0,0,0,100,0),
+(@PATH,2,-3698.604,1961.438,97.51176,0,0,0,100,0),
+(@PATH,3,-3703.094,1932.741,93.09521,0,0,0,100,0),
+(@PATH,4,-3710.8,1898.883,95.06728,0,0,0,100,0),
+(@PATH,5,-3706.167,1855.215,94.65068,0,0,0,100,0),
+(@PATH,6,-3730.437,1822.595,97.15064,0,0,0,100,0),
+(@PATH,7,-3764.347,1786.201,103.5396,0,0,0,100,0),
+(@PATH,8,-3806.215,1765.616,104.6232,0,0,0,100,0),
+(@PATH,9,-3831.599,1734.274,106.4841,0,0,0,100,0),
+(@PATH,10,-3845.836,1700.599,104.7896,0,0,0,100,0),
+(@PATH,11,-3860.267,1667.299,102.9841,0,0,0,100,0),
+(@PATH,12,-3878.303,1634.768,97.234,0,0,0,100,0),
+(@PATH,13,-3905.483,1624.397,96.40066,0,0,0,100,0),
+(@PATH,14,-3934.358,1629.903,95.78949,0,0,0,100,0),
+(@PATH,15,-3941.387,1653.258,102.4008,0,0,0,100,0),
+(@PATH,16,-3933.618,1681.023,107.5399,0,0,0,100,0),
+(@PATH,17,-3911.209,1703.6,110.7342,0,0,0,100,0),
+(@PATH,18,-3870.417,1717.617,111.4286,0,0,0,100,0),
+(@PATH,19,-3851.412,1733.487,109.7619,0,0,0,100,0),
+(@PATH,20,-3832.467,1767.414,108.4843,0,0,0,100,0),
+(@PATH,21,-3821.692,1801.011,106.7619,0,0,0,100,0),
+(@PATH,22,-3804.742,1833.069,104.3174,0,0,0,100,0),
+(@PATH,23,-3771.966,1852.2,103.0675,0,0,0,100,0),
+(@PATH,24,-3733.195,1857.556,99.8175,0,0,0,100,0),
+(@PATH,25,-3700.392,1874.681,91.92853,0,0,0,100,0),
+(@PATH,26,-3669.671,1899.899,86.984,0,0,0,100,0),
+(@PATH,27,-3657.474,1933.845,83.78937,0,0,0,100,0),
+(@PATH,28,-3665.441,1967.769,90.26167,0,0,0,100,0),
+(@PATH,29,-3679.033,1980.171,95.40069,0,0,0,100,0);
+
+SET @NPC := 84488;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3642.398,`position_y`=2282.843,`position_z`=101.388 WHERE `guid`=@NPC;
+DELETE FROM `creature` WHERE `guid` IN (84604);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-3669.035,2270.016,101.6381,0,0,0,100,0),
+(@PATH,2,-3678.18,2255.654,102.6103,0,0,0,100,0),
+(@PATH,3,-3670.328,2221.352,101.9714,0,0,0,100,0),
+(@PATH,4,-3643.312,2194.72,101.7492,0,0,0,100,0),
+(@PATH,5,-3616.062,2171.167,100.7214,0,0,0,100,0),
+(@PATH,6,-3592.527,2149.246,97.38798,0,0,0,100,0),
+(@PATH,7,-3565.214,2111.288,91.72128,0,0,0,100,0),
+(@PATH,8,-3539.711,2073.035,90.72137,0,0,0,100,0),
+(@PATH,9,-3525.445,2044.541,86.11011,0,0,0,100,0),
+(@PATH,10,-3525.761,2011.65,86.47135,0,0,0,100,0),
+(@PATH,11,-3542.677,1995.357,88.47128,0,0,0,100,0),
+(@PATH,12,-3561.439,2002.938,85.02679,0,0,0,100,0),
+(@PATH,13,-3575.933,2019.746,82.88785,0,0,0,100,0),
+(@PATH,14,-3575.169,2047.138,81.36017,0,0,0,100,0),
+(@PATH,15,-3573.451,2072.323,84.91569,0,0,0,100,0),
+(@PATH,16,-3564.493,2102.465,90.33241,0,0,0,100,0),
+(@PATH,17,-3536.419,2134.583,97.94351,0,0,0,100,0),
+(@PATH,18,-3500.938,2154.613,104.3325,0,0,0,100,0),
+(@PATH,19,-3468.633,2165.143,101.9992,0,0,0,100,0),
+(@PATH,20,-3451.676,2176.575,102.9714,0,0,0,100,0),
+(@PATH,21,-3440.866,2214.563,102.4992,0,0,0,100,0),
+(@PATH,22,-3464.083,2240.168,96.19363,0,0,0,100,0),
+(@PATH,23,-3503.83,2238.953,96.88795,0,0,0,100,0),
+(@PATH,24,-3532.543,2227.365,98.52686,0,0,0,100,0),
+(@PATH,25,-3557.896,2223.087,99.74914,0,0,0,100,0),
+(@PATH,26,-3585.39,2233.091,100.4992,0,0,0,100,0),
+(@PATH,27,-3605.955,2248.527,99.88802,0,0,0,100,0),
+(@PATH,28,-3615.812,2270.33,99.72134,0,0,0,100,0),
+(@PATH,29,-3642.398,2282.843,101.388,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2011_03_02_05_world_sai.sql b/sql/old/3.3.5a/2011_03_02_05_world_sai.sql
new file mode 100644
index 00000000000..d318dc466a3
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_05_world_sai.sql
@@ -0,0 +1,37 @@
+-- Pathing for Thulrin SAI
+-- Remove old waypoint data and scripts
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2352.691,`position_y`=5268.956,`position_z`=7.668962 WHERE `guid`=110115;
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=110115;
+DELETE FROM `waypoint_data` WHERE `id`=1101150;
+DELETE FROM waypoint_scripts WHERE `id` BETWEEN 1117 AND 1119;
+-- SAI for Thulrin
+UPDATE `creature_template` SET `AIName`='SmartAI',`equipment_id`=0 WHERE `entry`=25239;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=25239;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2523900,2523901);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- AI
+(25239,0,0,0,11,0,100,0,0,0,0,0,53,0,25239,1,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Start WP movement'),
+(25239,0,1,0,40,0,100,0,4,25239,0,0,80,2523900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Load script 1 at WP 4'),
+(25239,0,2,0,40,0,100,0,9,25239,0,0,80,2523901,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Load script 2 at WP 9'),
+-- Script 1
+(2523900,9,0,0,0,0,100,0,0,0,0,0,54,1500,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Pause at WP 4'),
+(2523900,9,1,0,0,0,100,0,0,0,0,0,5,16,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote ONESHOT_KNEEL'),
+(2523900,9,2,0,0,0,100,0,1000,1000,0,0,71,344,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Equip sword'),
+-- Script 2
+(2523901,9,0,0,0,0,100,0,0,0,0,0,54,51000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Pause at WP 9'),
+(2523901,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.984513, 'Thulrin - Turn to pos'),
+(2523901,9,2,0,0,0,100,0,1000,1000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote STATE_USESTANDING_NOSHEATHE'),
+(2523901,9,3,0,0,0,100,0,48000,48000,0,0,71,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Equip nothing'),
+(2523901,9,4,0,0,0,100,0,0,0,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote STATE_STAND');
+-- Waypoints for Thulrin from sniff
+DELETE FROM `waypoints` WHERE `entry`=25239;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(25239,1,2347.805,5265.343,7.630844, 'Thulrin WP 1'),
+(25239,2,2344.542,5267.178,7.668962, 'Thulrin WP 2'),
+(25239,3,2340.221,5270.315,7.668962, 'Thulrin WP 3'),
+(25239,4,2336.553,5273.868,7.793962, 'Thulrin WP 4'),
+(25239,5,2339.075,5271.176,7.668962, 'Thulrin WP 5'),
+(25239,6,2346.919,5265.093,7.630844, 'Thulrin WP 6'),
+(25239,7,2351.8,5266.425,7.630844, 'Thulrin WP 7'),
+(25239,8,2352.691,5268.956,7.668962, 'Thulrin WP 8'),
+(25239,9,2352.691,5268.956,7.668962, 'Thulrin WP 9');
diff --git a/sql/old/3.3.5a/2011_03_02_06_world_sai.sql b/sql/old/3.3.5a/2011_03_02_06_world_sai.sql
new file mode 100644
index 00000000000..ed81ade61a9
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_02_06_world_sai.sql
@@ -0,0 +1,47 @@
+-- SAI for Crust Burster 
+SET @ENTRY := 16844; 
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; 
+UPDATE `creature` SET `spawndist`=20,`MovementType`=1 WHERE `id`=@ENTRY; 
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; 
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; 
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,1,1,0,100,1,0,0,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Cast Submerge Visual'), 
+(@ENTRY,0,1,0,61,0,100,1,0,0,0,0,18,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Set Unselectable and Unattackable Flags'), 
+(@ENTRY,0,2,3,0,0,100,1,0,0,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Submerge Visual'), 
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Unselectable and Unattackable Flags'), 
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Prevent Combat Movement'), 
+(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Set Phase 1'), 
+(@ENTRY,0,6,7,0,1,100,0,1000,1000,2100,4500,11,31747,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Poison (Phase 1)'), 
+(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 1)'), 
+(@ENTRY,0,8,0,0,1,100,0,20400,20400,45000,50000,11,32738,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Bore (Phase 1)'), 
+(@ENTRY,0,9,10,9,1,100,0,20,60,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Cast Submerge Visual (Phase 1)'),
+(@ENTRY,0,10,11,61,1,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Allow Combat Movement (Phase 1)'), 
+(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 2 (Phase 1)'), 
+(@ENTRY,0,12,13,9,2,100,0,0,8,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Submerge Visual (Phase 2)'), 
+(@ENTRY,0,13,14,61,2,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 2)'), 
+(@ENTRY,0,14,15,61,2,100,0,0,8,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Unselectable and Unattackable Flags (Phase 2)'), 
+(@ENTRY,0,15,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 1 (Phase 2)'); 
+ 
+-- SAI for Marading Crust Burster 
+SET @ENTRY := 16857; 
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; 
+UPDATE `creature` SET `spawndist`=20,`MovementType`=1 WHERE `id`=@ENTRY; 
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; 
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; 
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,1,1,0,100,1,0,0,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Cast Submerge Visual'), 
+(@ENTRY,0,1,0,61,0,100,1,0,0,0,0,18,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Set Unselectable and Unattackable Flags'), 
+(@ENTRY,0,2,3,0,0,100,1,0,0,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Submerge Visual'), 
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Unselectable and Unattackable Flags'), 
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Prevent Combat Movement'), 
+(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Set Phase 1'), 
+(@ENTRY,0,6,7,0,1,100,0,1000,1000,2100,4500,11,31747,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Poison (Phase 1)'), 
+(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 1)'), 
+(@ENTRY,0,8,0,0,1,100,0,20400,20400,45000,50000,11,32738,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Bore (Phase 1)'), 
+(@ENTRY,0,9,10,9,1,100,0,20,60,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Cast Submerge Visual (Phase 1)'),
+(@ENTRY,0,10,11,61,1,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Allow Combat Movement (Phase 1)'), 
+(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 2 (Phase 1)'), 
+(@ENTRY,0,12,13,9,2,100,0,0,8,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Submerge Visual (Phase 2)'), 
+(@ENTRY,0,13,14,61,2,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 2)'), 
+(@ENTRY,0,14,15,61,2,100,0,0,8,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Unselectable and Unattackable Flags (Phase 2)'), 
+(@ENTRY,0,15,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 1 (Phase 2)');
diff --git a/sql/old/3.3.5a/2011_03_02_0_world_creature_template.sql b/sql/old/3.3.5a/2011_03_02_0_world_creature_template.sql
deleted file mode 100644
index b7ae2e1da4e..00000000000
--- a/sql/old/3.3.5a/2011_03_02_0_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature_template` SET `VehicleId`=283 WHERE `entry`=31748; -- Hover Disk (1)
-UPDATE `creature_template` SET `VehicleId`=223 WHERE `entry`=31749; -- Hover Disk (1)
diff --git a/sql/old/3.3.5a/2011_03_02_1_world_achievement_reward.sql b/sql/old/3.3.5a/2011_03_02_1_world_achievement_reward.sql
deleted file mode 100644
index 2afcce64f7b..00000000000
--- a/sql/old/3.3.5a/2011_03_02_1_world_achievement_reward.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Send in-game mail when player completes achievements Emblematic
-DELETE FROM `achievement_reward` WHERE `entry` IN (4784,4785);
-INSERT INTO `achievement_reward` (`entry`,`title_A`,`title_H`,`item`,`sender`,`subject`,`text`) VALUES
-(4784,0,0,0,37942, 'Emblem Quartermasters in Dalaran''s Silver Enclave', 'Your achievements in Northrend have not gone unnoticed, friend.$B$BThe Emblems you have earned may be used to purchase equipment from the various Emblem Quartermasters in Dalaran.$B$BYou may find us there, in the Silver Enclave, where each variety of Emblem has its own quartermaster.$B$BWe look forward to your arrival!'),
-(4785,0,0,0,37941, 'Emblem Quartermasters in Dalaran''s Sunreaver Sanctuary', 'Your achievements in Northrend have not gone unnoticed, friend.$B$BThe Emblems you have earned may be used to purchase equipment from the various Emblem Quartermasters in Dalaran.$B$BYou may find us there, in the Sunreaver Sanctuary, where each variety of Emblem has its own quartermaster.$B$BWe look forward to your arrival!');
diff --git a/sql/old/3.3.5a/2011_03_02_2_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_02_2_world_waypoint_data.sql
deleted file mode 100644
index baccd34f0ee..00000000000
--- a/sql/old/3.3.5a/2011_03_02_2_world_waypoint_data.sql
+++ /dev/null
@@ -1,312 +0,0 @@
--- Remove some waypoint errors
-UPDATE `creature` SET `MovementType`=0 WHERE `guid` IN (57763,57764,57765,57766);
-UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (57763,57764,57765,57766);
-DELETE FROM `waypoint_data` WHERE `id` IN (577630,577640,577650,577660);
-DELETE FROM `waypoint_scripts` WHERE `id` IN (48,49,50,51);
-
--- Mature Netherwing Drake Pathing From sniff 1 added.
-SET @NPC := 75541;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4134.369,`position_y`=850.2852,`position_z`=61.26378 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4120.351,883.5854,61.26378,0,0,0,100,0),
-(@PATH,2,-4085.13,900.4695,61.26378,0,0,0,100,0),
-(@PATH,3,-4048.586,884.7811,61.26378,0,0,0,100,0),
-(@PATH,4,-4033.683,852.1551,61.26378,0,0,0,100,0),
-(@PATH,5,-4050.652,818.6749,61.26378,0,0,0,100,0),
-(@PATH,6,-4085.118,799.5022,61.26378,0,0,0,100,0),
-(@PATH,7,-4117.451,815.256,61.26378,0,0,0,100,0),
-(@PATH,8,-4134.369,850.2852,61.26378,0,0,0,100,0);
-
-SET @NPC := 75542;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4066.473,`position_y`=752.3994,`position_z`=43.04424 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4083.436,721.6484,43.04424,0,0,0,100,0),
-(@PATH,2,-4109.103,700.2794,43.04424,0,0,0,100,0),
-(@PATH,3,-4114.49,699.9313,43.04424,0,0,0,100,0),
-(@PATH,4,-4149.18,716.9812,43.04424,0,0,0,100,0),
-(@PATH,5,-4164.394,749.7984,44.87757,0,0,0,100,0),
-(@PATH,6,-4147.782,783.0017,46.62758,0,0,0,100,0),
-(@PATH,7,-4117.128,799.6888,51.93314,0,0,0,100,0),
-(@PATH,8,-4082.698,785.6704,50.3498,0,0,0,100,0),
-(@PATH,9,-4066.473,752.3994,43.04424,0,0,0,100,0);
-
-SET @NPC := 75543;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4148.391,`position_y`=766.8653,`position_z`=66.01289 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4183.416,753.0403,72.09624,0,0,0,100,0),
-(@PATH,2,-4199.977,716.2882,82.67956,0,0,0,100,0),
-(@PATH,3,-4183.724,684.1388,70.56844,0,0,0,100,0),
-(@PATH,4,-4148.917,666.9986,63.51288,0,0,0,100,0),
-(@PATH,5,-4116.004,684.5375,61.51288,0,0,0,100,0),
-(@PATH,6,-4099.94,716.4078,62.09623,0,0,0,100,0),
-(@PATH,7,-4116.647,749.6686,61.59621,0,0,0,100,0),
-(@PATH,8,-4148.391,766.8653,66.01289,0,0,0,100,0);
-
-SET @NPC := 75544;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4084.089,`position_y`=683.0483,`position_z`=59.55887 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4067.996,652.302,59.55887,0,0,0,100,0),
-(@PATH,2,-4084.038,618.9259,59.55887,0,0,0,100,0),
-(@PATH,3,-4117.386,599.9404,59.55887,0,0,0,100,0),
-(@PATH,4,-4149.88,616.7292,59.55887,0,0,0,100,0),
-(@PATH,5,-4165.804,652.2473,59.55887,0,0,0,100,0),
-(@PATH,6,-4150.054,685.6966,59.55887,0,0,0,100,0),
-(@PATH,7,-4118.107,699.7501,59.55887,0,0,0,100,0),
-(@PATH,8,-4084.089,683.0483,59.55887,0,0,0,100,0);
-
-SET @NPC := 75545;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4083.681,`position_y`=848.0616,`position_z`=58.43416 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4117.843,866.6574,58.43417,0,0,0,100,0),
-(@PATH,2,-4149.746,851.1995,68.6286,0,0,0,100,0),
-(@PATH,3,-4167.114,815.8797,74.48971,0,0,0,100,0),
-(@PATH,4,-4150.918,786.3128,65.07306,0,0,0,100,0),
-(@PATH,5,-4116.956,766.7995,70.51749,0,0,0,100,0),
-(@PATH,6,-4085.521,784.5572,76.90639,0,0,0,100,0),
-(@PATH,7,-4067.243,818.4576,64.35083,0,0,0,100,0),
-(@PATH,8,-4083.681,848.0616,58.43416,0,0,0,100,0);
-
-SET @NPC := 75546;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4133.319,`position_y`=918.6325,`position_z`=70.3725 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4117.341,884.8878,62.09472,0,0,0,100,0),
-(@PATH,2,-4084.125,867.1631,52.70584,0,0,0,100,0),
-(@PATH,3,-4050.462,883.2648,46.84472,0,0,0,100,0),
-(@PATH,4,-4033.427,917.2786,54.8725,0,0,0,100,0),
-(@PATH,5,-4049.515,951.7986,62.20583,0,0,0,100,0),
-(@PATH,6,-4082.625,966.6864,69.48361,0,0,0,100,0),
-(@PATH,7,-4116.243,949.7843,72.2614,0,0,0,100,0),
-(@PATH,8,-4133.319,918.6325,70.3725,0,0,0,100,0);
-
-SET @NPC := 75547;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4000.944,`position_y`=650.089,`position_z`=84.74791 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4015.128,680.8443,72.16458,0,0,0,100,0),
-(@PATH,2,-4047.654,700.2465,60.27572,0,0,0,100,0),
-(@PATH,3,-4082.378,686.9391,58.8868,0,0,0,100,0),
-(@PATH,4,-4099.23,649.127,67.30346,0,0,0,100,0),
-(@PATH,5,-4083.47,615.1847,74.74792,0,0,0,100,0),
-(@PATH,6,-4047.911,600.5391,92.52572,0,0,0,100,0),
-(@PATH,7,-4016.922,616.1044,98.47014,0,0,0,100,0),
-(@PATH,8,-4000.944,650.089,84.74791,0,0,0,100,0);
-
-SET @NPC := 75548;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4052.34,`position_y`=716.3079,`position_z`=48.66938 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4019.384,700.1765,47.08604,0,0,0,100,0),
-(@PATH,2,-3983.657,716.8768,52.75271,0,0,0,100,0),
-(@PATH,3,-3967.16,750.4713,65.47495,0,0,0,100,0),
-(@PATH,4,-3982.856,783.4985,67.83604,0,0,0,100,0),
-(@PATH,5,-4017.322,800.1605,65.75271,0,0,0,100,0),
-(@PATH,6,-4048.333,784.6697,60.58604,0,0,0,100,0),
-(@PATH,7,-4067.148,750.3481,53.25271,0,0,0,100,0),
-(@PATH,8,-4052.34,716.3079,48.66938,0,0,0,100,0);
-
-SET @NPC := 75549;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3949.365,`position_y`=819.178,`position_z`=51.50261 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3933.805,784.3923,51.50261,0,0,0,100,0),
-(@PATH,2,-3951.698,751.0433,51.50261,0,0,0,100,0),
-(@PATH,3,-3980.543,733.1439,58.86372,0,0,0,100,0),
-(@PATH,4,-4016.032,747.1483,64.55817,0,0,0,100,0),
-(@PATH,5,-4032.366,782.211,60.08595,0,0,0,100,0),
-(@PATH,6,-4017.203,816.9814,53.30817,0,0,0,100,0),
-(@PATH,7,-3985.723,832.2205,51.50261,0,0,0,100,0),
-(@PATH,8,-3949.365,819.178,51.50261,0,0,0,100,0);
-
-SET @NPC := 75550;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3916.397,`position_y`=883.2978,`position_z`=81.9971 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3948.779,899.8286,68.13598,0,0,0,100,0),
-(@PATH,2,-3982.235,885.5906,61.1082,0,0,0,100,0),
-(@PATH,3,-3999.414,851.4448,62.69153,0,0,0,100,0),
-(@PATH,4,-3983.74,817.0834,58.96931,0,0,0,100,0),
-(@PATH,5,-3950.159,800.5572,63.10819,0,0,0,100,0),
-(@PATH,6,-3918.94,815.5467,72.46931,0,0,0,100,0),
-(@PATH,7,-3900.264,851.1897,81.30264,0,0,0,100,0),
-(@PATH,8,-3916.397,883.2978,81.9971,0,0,0,100,0);
-
-SET @NPC := 75551;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4084.883,`position_y`=914.0491,`position_z`=72.2939 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4099.644,950.2539,69.2939,0,0,0,100,0),
-(@PATH,2,-4086.421,983.3143,71.12724,0,0,0,100,0),
-(@PATH,3,-4050.086,1000.082,74.32168,0,0,0,100,0),
-(@PATH,4,-4018.68,983.5675,74.32168,0,0,0,100,0),
-(@PATH,5,-4001.11,950.1692,74.32168,0,0,0,100,0),
-(@PATH,6,-4016.584,917.4998,74.32168,0,0,0,100,0),
-(@PATH,7,-4048.498,899.8286,74.32168,0,0,0,100,0),
-(@PATH,8,-4084.883,914.0491,72.2939,0,0,0,100,0);
-
-SET @NPC := 75552;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3915.657,`position_y`=833.4163,`position_z`=47.38418 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3948.898,849.9359,47.38418,0,0,0,100,0),
-(@PATH,2,-3964.938,879.6131,47.38418,0,0,0,100,0),
-(@PATH,3,-3948.945,916.1858,47.38418,0,0,0,100,0),
-(@PATH,4,-3916.809,932.6107,48.16196,0,0,0,100,0),
-(@PATH,5,-3886.793,916.5725,53.96752,0,0,0,100,0),
-(@PATH,6,-3866.807,883.3404,60.02308,0,0,0,100,0),
-(@PATH,7,-3884.739,849.9593,54.30085,0,0,0,100,0),
-(@PATH,8,-3915.657,833.4163,47.38418,0,0,0,100,0);
-
-SET @NPC := 75553;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4047.742,`position_y`=1066.566,`position_z`=106.1299 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4082.141,1050.517,104.5466,0,0,0,100,0),
-(@PATH,2,-4099.718,1017.106,98.4355,0,0,0,100,0),
-(@PATH,3,-4082.201,985.4608,87.46328,0,0,0,100,0),
-(@PATH,4,-4048.188,966.8837,78.15773,0,0,0,100,0),
-(@PATH,5,-4017.819,980.5856,72.37994,0,0,0,100,0),
-(@PATH,6,-4000.326,1016.784,86.21326,0,0,0,100,0),
-(@PATH,7,-4014.791,1050.645,97.40771,0,0,0,100,0),
-(@PATH,8,-4047.742,1066.566,106.1299,0,0,0,100,0);
-
-SET @NPC := 75554;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3900.323,`position_y`=984.7424,`position_z`=60.60864 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3918.999,953.8466,58.96975,0,0,0,100,0),
-(@PATH,2,-3950.793,934.2088,58.96975,0,0,0,100,0),
-(@PATH,3,-3982.866,950.2649,58.96975,0,0,0,100,0),
-(@PATH,4,-4000.046,985.8019,61.02531,0,0,0,100,0),
-(@PATH,5,-3981.982,1017.846,58.96975,0,0,0,100,0),
-(@PATH,6,-3949.962,1033.053,56.85864,0,0,0,100,0),
-(@PATH,7,-3918.825,1014.746,58.33086,0,0,0,100,0),
-(@PATH,8,-3900.323,984.7424,60.60864,0,0,0,100,0);
-
-SET @NPC := 75555;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3950.083,`position_y`=985.4277,`position_z`=83.53654 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3965.832,952.775,76.7032,0,0,0,100,0),
-(@PATH,2,-3951.587,918.8143,71.53653,0,0,0,100,0),
-(@PATH,3,-3916.848,899.7321,72.39764,0,0,0,100,0),
-(@PATH,4,-3885.93,916.5598,83.34209,0,0,0,100,0),
-(@PATH,5,-3867.241,951.6891,90.39765,0,0,0,100,0),
-(@PATH,6,-3882.38,983.3097,81.48098,0,0,0,100,0),
-(@PATH,7,-3915.022,1000.09,72.17542,0,0,0,100,0),
-(@PATH,8,-3950.083,985.4277,83.53654,0,0,0,100,0);
-
-SET @NPC := 75556;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3966.719,`position_y`=1048.378,`position_z`=69.52766 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3983.504,1016.722,67.94434,0,0,0,100,0),
-(@PATH,2,-4015.046,1002.573,69.52766,0,0,0,100,0),
-(@PATH,3,-4049.708,1017.723,72.13878,0,0,0,100,0),
-(@PATH,4,-4066.48,1048.968,72.66656,0,0,0,100,0),
-(@PATH,5,-4048.204,1083.848,71.19434,0,0,0,100,0),
-(@PATH,6,-4016.47,1100.259,72.47211,0,0,0,100,0),
-(@PATH,7,-3985.822,1082.684,70.97211,0,0,0,100,0),
-(@PATH,8,-3966.719,1048.378,69.52766,0,0,0,100,0);
-
-SET @NPC := 75557;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3950.767,`position_y`=1000.512,`position_z`=87.49402 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3918.137,1015.368,90.16069,0,0,0,100,0),
-(@PATH,2,-3900.402,1050.901,91.7718,0,0,0,100,0),
-(@PATH,3,-3917.262,1083.885,99.32737,0,0,0,100,0),
-(@PATH,4,-3949.68,1100.575,106.7718,0,0,0,100,0),
-(@PATH,5,-3981.045,1082.341,107.8829,0,0,0,100,0),
-(@PATH,6,-3999.798,1048.804,99.57736,0,0,0,100,0),
-(@PATH,7,-3985.399,1018.346,91.7718,0,0,0,100,0),
-(@PATH,8,-3950.767,1000.512,87.49402,0,0,0,100,0);
-
-SET @NPC := 75558;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4066.473,`position_y`=752.3994,`position_z`=43.04424 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4083.436,721.6484,43.04424,0,0,0,100,0),
-(@PATH,2,-4109.103,700.2794,43.04424,0,0,0,100,0),
-(@PATH,3,-4114.49,699.9313,43.04424,0,0,0,100,0),
-(@PATH,4,-4149.18,716.9812,43.04424,0,0,0,100,0),
-(@PATH,5,-4164.394,749.7984,44.87757,0,0,0,100,0),
-(@PATH,6,-4147.782,783.0017,46.62758,0,0,0,100,0),
-(@PATH,7,-4117.128,799.6888,51.93314,0,0,0,100,0),
-(@PATH,8,-4082.698,785.6704,50.3498,0,0,0,100,0),
-(@PATH,9,-4066.473,752.3994,43.04424,0,0,0,100,0);
-
-SET @NPC := 86103;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `id`=21648,`spawndist`=0,`MovementType`=2,`position_x`=-3981.939,`position_y`=1200.395,`position_z`=108.2629 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4015.405,1186.572,107.8463,0,0,0,100,0),
-(@PATH,2,-4032.093,1150.835,100.8185,0,0,0,100,0),
-(@PATH,3,-4016.442,1117.503,95.84628,0,0,0,100,0),
-(@PATH,4,-3982.193,1100.35,95.62405,0,0,0,100,0),
-(@PATH,5,-3950.59,1116.853,99.12405,0,0,0,100,0),
-(@PATH,6,-3933.569,1150.704,103.263,0,0,0,100,0),
-(@PATH,7,-3949.776,1184.953,106.8185,0,0,0,100,0),
-(@PATH,8,-3981.939,1200.395,108.2629,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql b/sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql
deleted file mode 100644
index 6669edd4929..00000000000
--- a/sql/old/3.3.5a/2011_03_02_3_world_gossip_menu.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- Gossip Menu insert
-DELETE FROM `gossip_menu` WHERE `entry`=3067 AND `text_id`=3801;
-DELETE FROM `gossip_menu` WHERE `entry`=3481 AND `text_id`=4953;
-DELETE FROM `gossip_menu` WHERE `entry`=4061 AND `text_id`=4954;
-DELETE FROM `gossip_menu` WHERE `entry`=4062 AND `text_id`=4955;
-DELETE FROM `gossip_menu` WHERE `entry`=4063 AND `text_id`=4956;
-DELETE FROM `gossip_menu` WHERE `entry`=4064 AND `text_id`=4957;
-DELETE FROM `gossip_menu` WHERE `entry`=4065 AND `text_id`=4958;
-DELETE FROM `gossip_menu` WHERE `entry`=6627 AND `text_id`=7881;
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(3067,3801),
-(3481,4953),
-(4061,4954),
-(4062,4955),
-(4063,4956),
-(4064,4957),
-(4065,4958),
-(6627,7881);
--- Creature Gossip_menu_id Update
-UPDATE `creature_template` SET `gossip_menu_id`=4573 WHERE `entry`=4091;
-UPDATE `creature_template` SET `gossip_menu_id`=3067 WHERE `entry`=7866;
-UPDATE `creature_template` SET `gossip_menu_id`=3481 WHERE `entry`=11548;
-UPDATE `creature_template` SET `gossip_menu_id`=6944 WHERE `entry`=12577;
--- Creature Gossip_menu_option Update
-DELETE FROM `gossip_menu_option` WHERE `menu_id`=3481;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(3481,0,0, 'The land of Azshara.',1,1,4061,0,0,0,0, ''),
-(3481,1,0, 'The Ruins of Eldarath.',1,1,4062,0,0,0,0, ''),
-(3481,2,0, 'The mage tower to the north.',1,1,4063,0,0,0,0, ''),
-(3481,3,0, 'The Timbermaw furbolgs.',1,1,4064,0,0,0,0, ''),
-(3481,4,0, 'The presence of blue dragons.',1,1,4065,0,0,0,0, '');
diff --git a/sql/old/3.3.5a/2011_03_02_4_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_02_4_world_waypoint_data.sql
deleted file mode 100644
index e2413c0f6ff..00000000000
--- a/sql/old/3.3.5a/2011_03_02_4_world_waypoint_data.sql
+++ /dev/null
@@ -1,164 +0,0 @@
--- Waypoints for Vilewing Chimaera
-SET @NPC := 84613;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3495.376,`position_y`=2654.514,`position_z`=85.14965 WHERE `guid`=@NPC;
-DELETE FROM `creature` WHERE `guid` IN (84611,84490);
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3513.771,2667.212,85.87186,0,0,0,100,0),
-(@PATH,2,-3527.99,2668.341,87.39961,0,0,0,100,0),
-(@PATH,3,-3568.938,2660.981,87.3718,0,0,0,100,0),
-(@PATH,4,-3605.726,2631.423,89.09409,0,0,0,100,0),
-(@PATH,5,-3606.994,2590.197,89.01077,0,0,0,100,0),
-(@PATH,6,-3624.849,2552.972,89.84412,0,0,0,100,0),
-(@PATH,7,-3632.875,2523.194,90.78855,0,0,0,100,0),
-(@PATH,8,-3623.275,2498.775,93.42754,0,0,0,100,0),
-(@PATH,9,-3594.59,2497.109,91.81643,0,0,0,100,0),
-(@PATH,10,-3571.224,2522.083,89.76082,0,0,0,100,0),
-(@PATH,11,-3555.303,2550.05,88.20523,0,0,0,100,0),
-(@PATH,12,-3546.012,2576.069,86.67743,0,0,0,100,0),
-(@PATH,13,-3533.117,2604.753,86.59406,0,0,0,100,0),
-(@PATH,14,-3505.657,2622.679,86.03844,0,0,0,100,0),
-(@PATH,15,-3495.376,2654.514,85.14965,0,0,0,100,0);
-
-SET @NPC := 84632;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3051.686,`position_y`=1036.492,`position_z`=18.42691 WHERE `guid`=@NPC;
-DELETE FROM `creature` WHERE `guid` IN (84629,84630);
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3078.817,1034.035,19.28807,0,0,0,100,0),
-(@PATH,2,-3088.495,1066.141,25.0936,0,0,0,100,0),
-(@PATH,3,-3087.413,1099.35,30.84361,0,0,0,100,0),
-(@PATH,4,-3067.319,1113.823,27.62129,0,0,0,100,0),
-(@PATH,5,-3035.007,1131.8,22.48246,0,0,0,100,0),
-(@PATH,6,-3022.366,1165.862,21.28805,0,0,0,100,0),
-(@PATH,7,-3028.652,1200.958,24.2047,0,0,0,100,0),
-(@PATH,8,-3053.869,1219.137,31.12142,0,0,0,100,0),
-(@PATH,9,-3098.912,1230.556,38.8714,0,0,0,100,0),
-(@PATH,10,-3120.39,1233.38,42.48251,0,0,0,100,0),
-(@PATH,11,-3155.853,1240.664,47.03807,0,0,0,100,0),
-(@PATH,12,-3184.486,1256.954,49.17699,0,0,0,100,0),
-(@PATH,13,-3200.051,1273.893,49.17699,0,0,0,100,0),
-(@PATH,14,-3198.467,1300.309,47.56586,0,0,0,100,0),
-(@PATH,15,-3180.189,1312.811,46.51028,0,0,0,100,0),
-(@PATH,16,-3166.775,1318.915,44.56582,0,0,0,100,0),
-(@PATH,17,-3133.76,1306.827,33.8992,0,0,0,100,0),
-(@PATH,18,-3107.957,1267.029,29.7603,0,0,0,100,0),
-(@PATH,19,-3102.756,1234.923,31.56591,0,0,0,100,0),
-(@PATH,20,-3081.735,1200.232,34.76027,0,0,0,100,0),
-(@PATH,21,-3064.895,1171.269,31.59359,0,0,0,100,0),
-(@PATH,22,-3032.818,1161.913,24.92694,0,0,0,100,0),
-(@PATH,23,-2998.293,1162.476,17.28803,0,0,0,100,0),
-(@PATH,24,-2989.174,1125.52,23.26031,0,0,0,100,0),
-(@PATH,25,-3019.696,1108.528,28.37141,0,0,0,100,0),
-(@PATH,26,-3030.191,1069.277,24.06586,0,0,0,100,0),
-(@PATH,27,-3051.686,1036.492,18.42691,0,0,0,100,0);
-
-SET @NPC := 84594;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3306.025,`position_y`=2329.368,`position_z`=83.54176 WHERE `guid`=@NPC;
-DELETE FROM `creature` WHERE `guid` IN (84609,84610);
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3306.578,2358.007,83.95837,0,0,0,100,0),
-(@PATH,2,-3312.279,2366.838,84.12508,0,0,0,100,0),
-(@PATH,3,-3339.576,2384.215,85.01395,0,0,0,100,0),
-(@PATH,4,-3375.194,2400.308,84.79176,0,0,0,100,0),
-(@PATH,5,-3413.535,2413.8,83.40285,0,0,0,100,0),
-(@PATH,6,-3449.745,2447.95,84.59732,0,0,0,100,0),
-(@PATH,7,-3484.88,2475.859,87.48625,0,0,0,100,0),
-(@PATH,8,-3516.799,2470.339,88.65293,0,0,0,100,0),
-(@PATH,9,-3551.302,2449.093,88.65293,0,0,0,100,0),
-(@PATH,10,-3577.611,2417.917,88.65293,0,0,0,100,0),
-(@PATH,11,-3587.224,2394.964,88.65293,0,0,0,100,0),
-(@PATH,12,-3578.091,2358.175,91.01408,0,0,0,100,0),
-(@PATH,13,-3542.674,2341.767,90.73628,0,0,0,100,0),
-(@PATH,14,-3508.299,2338.776,88.65293,0,0,0,100,0),
-(@PATH,15,-3480.534,2321.327,85.20841,0,0,0,100,0),
-(@PATH,16,-3438.703,2328.433,84.01396,0,0,0,100,0),
-(@PATH,17,-3402.306,2319.822,84.06959,0,0,0,100,0),
-(@PATH,18,-3367.927,2320.204,83.40282,0,0,0,100,0),
-(@PATH,19,-3336.193,2315.693,83.7084,0,0,0,100,0),
-(@PATH,20,-3306.025,2329.368,83.54176,0,0,0,100,0);
-
-SET @NPC := 84597;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3679.033,`position_y`=1980.171,`position_z`=95.40069 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3694.715,1971.449,97.03951,0,0,0,100,0),
-(@PATH,2,-3698.604,1961.438,97.51176,0,0,0,100,0),
-(@PATH,3,-3703.094,1932.741,93.09521,0,0,0,100,0),
-(@PATH,4,-3710.8,1898.883,95.06728,0,0,0,100,0),
-(@PATH,5,-3706.167,1855.215,94.65068,0,0,0,100,0),
-(@PATH,6,-3730.437,1822.595,97.15064,0,0,0,100,0),
-(@PATH,7,-3764.347,1786.201,103.5396,0,0,0,100,0),
-(@PATH,8,-3806.215,1765.616,104.6232,0,0,0,100,0),
-(@PATH,9,-3831.599,1734.274,106.4841,0,0,0,100,0),
-(@PATH,10,-3845.836,1700.599,104.7896,0,0,0,100,0),
-(@PATH,11,-3860.267,1667.299,102.9841,0,0,0,100,0),
-(@PATH,12,-3878.303,1634.768,97.234,0,0,0,100,0),
-(@PATH,13,-3905.483,1624.397,96.40066,0,0,0,100,0),
-(@PATH,14,-3934.358,1629.903,95.78949,0,0,0,100,0),
-(@PATH,15,-3941.387,1653.258,102.4008,0,0,0,100,0),
-(@PATH,16,-3933.618,1681.023,107.5399,0,0,0,100,0),
-(@PATH,17,-3911.209,1703.6,110.7342,0,0,0,100,0),
-(@PATH,18,-3870.417,1717.617,111.4286,0,0,0,100,0),
-(@PATH,19,-3851.412,1733.487,109.7619,0,0,0,100,0),
-(@PATH,20,-3832.467,1767.414,108.4843,0,0,0,100,0),
-(@PATH,21,-3821.692,1801.011,106.7619,0,0,0,100,0),
-(@PATH,22,-3804.742,1833.069,104.3174,0,0,0,100,0),
-(@PATH,23,-3771.966,1852.2,103.0675,0,0,0,100,0),
-(@PATH,24,-3733.195,1857.556,99.8175,0,0,0,100,0),
-(@PATH,25,-3700.392,1874.681,91.92853,0,0,0,100,0),
-(@PATH,26,-3669.671,1899.899,86.984,0,0,0,100,0),
-(@PATH,27,-3657.474,1933.845,83.78937,0,0,0,100,0),
-(@PATH,28,-3665.441,1967.769,90.26167,0,0,0,100,0),
-(@PATH,29,-3679.033,1980.171,95.40069,0,0,0,100,0);
-
-SET @NPC := 84488;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-3642.398,`position_y`=2282.843,`position_z`=101.388 WHERE `guid`=@NPC;
-DELETE FROM `creature` WHERE `guid` IN (84604);
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-3669.035,2270.016,101.6381,0,0,0,100,0),
-(@PATH,2,-3678.18,2255.654,102.6103,0,0,0,100,0),
-(@PATH,3,-3670.328,2221.352,101.9714,0,0,0,100,0),
-(@PATH,4,-3643.312,2194.72,101.7492,0,0,0,100,0),
-(@PATH,5,-3616.062,2171.167,100.7214,0,0,0,100,0),
-(@PATH,6,-3592.527,2149.246,97.38798,0,0,0,100,0),
-(@PATH,7,-3565.214,2111.288,91.72128,0,0,0,100,0),
-(@PATH,8,-3539.711,2073.035,90.72137,0,0,0,100,0),
-(@PATH,9,-3525.445,2044.541,86.11011,0,0,0,100,0),
-(@PATH,10,-3525.761,2011.65,86.47135,0,0,0,100,0),
-(@PATH,11,-3542.677,1995.357,88.47128,0,0,0,100,0),
-(@PATH,12,-3561.439,2002.938,85.02679,0,0,0,100,0),
-(@PATH,13,-3575.933,2019.746,82.88785,0,0,0,100,0),
-(@PATH,14,-3575.169,2047.138,81.36017,0,0,0,100,0),
-(@PATH,15,-3573.451,2072.323,84.91569,0,0,0,100,0),
-(@PATH,16,-3564.493,2102.465,90.33241,0,0,0,100,0),
-(@PATH,17,-3536.419,2134.583,97.94351,0,0,0,100,0),
-(@PATH,18,-3500.938,2154.613,104.3325,0,0,0,100,0),
-(@PATH,19,-3468.633,2165.143,101.9992,0,0,0,100,0),
-(@PATH,20,-3451.676,2176.575,102.9714,0,0,0,100,0),
-(@PATH,21,-3440.866,2214.563,102.4992,0,0,0,100,0),
-(@PATH,22,-3464.083,2240.168,96.19363,0,0,0,100,0),
-(@PATH,23,-3503.83,2238.953,96.88795,0,0,0,100,0),
-(@PATH,24,-3532.543,2227.365,98.52686,0,0,0,100,0),
-(@PATH,25,-3557.896,2223.087,99.74914,0,0,0,100,0),
-(@PATH,26,-3585.39,2233.091,100.4992,0,0,0,100,0),
-(@PATH,27,-3605.955,2248.527,99.88802,0,0,0,100,0),
-(@PATH,28,-3615.812,2270.33,99.72134,0,0,0,100,0),
-(@PATH,29,-3642.398,2282.843,101.388,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2011_03_02_5_world_sai.sql b/sql/old/3.3.5a/2011_03_02_5_world_sai.sql
deleted file mode 100644
index d318dc466a3..00000000000
--- a/sql/old/3.3.5a/2011_03_02_5_world_sai.sql
+++ /dev/null
@@ -1,37 +0,0 @@
--- Pathing for Thulrin SAI
--- Remove old waypoint data and scripts
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2352.691,`position_y`=5268.956,`position_z`=7.668962 WHERE `guid`=110115;
-UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=110115;
-DELETE FROM `waypoint_data` WHERE `id`=1101150;
-DELETE FROM waypoint_scripts WHERE `id` BETWEEN 1117 AND 1119;
--- SAI for Thulrin
-UPDATE `creature_template` SET `AIName`='SmartAI',`equipment_id`=0 WHERE `entry`=25239;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=25239;
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2523900,2523901);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
--- AI
-(25239,0,0,0,11,0,100,0,0,0,0,0,53,0,25239,1,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Start WP movement'),
-(25239,0,1,0,40,0,100,0,4,25239,0,0,80,2523900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Load script 1 at WP 4'),
-(25239,0,2,0,40,0,100,0,9,25239,0,0,80,2523901,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Load script 2 at WP 9'),
--- Script 1
-(2523900,9,0,0,0,0,100,0,0,0,0,0,54,1500,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Pause at WP 4'),
-(2523900,9,1,0,0,0,100,0,0,0,0,0,5,16,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote ONESHOT_KNEEL'),
-(2523900,9,2,0,0,0,100,0,1000,1000,0,0,71,344,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Equip sword'),
--- Script 2
-(2523901,9,0,0,0,0,100,0,0,0,0,0,54,51000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Pause at WP 9'),
-(2523901,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.984513, 'Thulrin - Turn to pos'),
-(2523901,9,2,0,0,0,100,0,1000,1000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote STATE_USESTANDING_NOSHEATHE'),
-(2523901,9,3,0,0,0,100,0,48000,48000,0,0,71,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Equip nothing'),
-(2523901,9,4,0,0,0,100,0,0,0,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thulrin - Emote STATE_STAND');
--- Waypoints for Thulrin from sniff
-DELETE FROM `waypoints` WHERE `entry`=25239;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(25239,1,2347.805,5265.343,7.630844, 'Thulrin WP 1'),
-(25239,2,2344.542,5267.178,7.668962, 'Thulrin WP 2'),
-(25239,3,2340.221,5270.315,7.668962, 'Thulrin WP 3'),
-(25239,4,2336.553,5273.868,7.793962, 'Thulrin WP 4'),
-(25239,5,2339.075,5271.176,7.668962, 'Thulrin WP 5'),
-(25239,6,2346.919,5265.093,7.630844, 'Thulrin WP 6'),
-(25239,7,2351.8,5266.425,7.630844, 'Thulrin WP 7'),
-(25239,8,2352.691,5268.956,7.668962, 'Thulrin WP 8'),
-(25239,9,2352.691,5268.956,7.668962, 'Thulrin WP 9');
diff --git a/sql/old/3.3.5a/2011_03_02_6_world_sai.sql b/sql/old/3.3.5a/2011_03_02_6_world_sai.sql
deleted file mode 100644
index ed81ade61a9..00000000000
--- a/sql/old/3.3.5a/2011_03_02_6_world_sai.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- SAI for Crust Burster 
-SET @ENTRY := 16844; 
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; 
-UPDATE `creature` SET `spawndist`=20,`MovementType`=1 WHERE `id`=@ENTRY; 
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; 
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; 
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@ENTRY,0,0,1,1,0,100,1,0,0,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Cast Submerge Visual'), 
-(@ENTRY,0,1,0,61,0,100,1,0,0,0,0,18,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Set Unselectable and Unattackable Flags'), 
-(@ENTRY,0,2,3,0,0,100,1,0,0,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Submerge Visual'), 
-(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Unselectable and Unattackable Flags'), 
-(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Prevent Combat Movement'), 
-(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Set Phase 1'), 
-(@ENTRY,0,6,7,0,1,100,0,1000,1000,2100,4500,11,31747,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Poison (Phase 1)'), 
-(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 1)'), 
-(@ENTRY,0,8,0,0,1,100,0,20400,20400,45000,50000,11,32738,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Bore (Phase 1)'), 
-(@ENTRY,0,9,10,9,1,100,0,20,60,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Cast Submerge Visual (Phase 1)'),
-(@ENTRY,0,10,11,61,1,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Allow Combat Movement (Phase 1)'), 
-(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 2 (Phase 1)'), 
-(@ENTRY,0,12,13,9,2,100,0,0,8,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Submerge Visual (Phase 2)'), 
-(@ENTRY,0,13,14,61,2,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 2)'), 
-(@ENTRY,0,14,15,61,2,100,0,0,8,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Unselectable and Unattackable Flags (Phase 2)'), 
-(@ENTRY,0,15,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 1 (Phase 2)'); 
- 
--- SAI for Marading Crust Burster 
-SET @ENTRY := 16857; 
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; 
-UPDATE `creature` SET `spawndist`=20,`MovementType`=1 WHERE `id`=@ENTRY; 
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; 
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; 
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
-(@ENTRY,0,0,1,1,0,100,1,0,0,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Cast Submerge Visual'), 
-(@ENTRY,0,1,0,61,0,100,1,0,0,0,0,18,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - OOC - Set Unselectable and Unattackable Flags'), 
-(@ENTRY,0,2,3,0,0,100,1,0,0,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Submerge Visual'), 
-(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Remove Unselectable and Unattackable Flags'), 
-(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Prevent Combat Movement'), 
-(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - On Aggro - Set Phase 1'), 
-(@ENTRY,0,6,7,0,1,100,0,1000,1000,2100,4500,11,31747,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Poison (Phase 1)'), 
-(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 1)'), 
-(@ENTRY,0,8,0,0,1,100,0,20400,20400,45000,50000,11,32738,1,0,0,0,0,2,0,0,0,0,0,0,0,'Crust Burster - Combat - Cast Bore (Phase 1)'), 
-(@ENTRY,0,9,10,9,1,100,0,20,60,0,0,11,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Cast Submerge Visual (Phase 1)'),
-(@ENTRY,0,10,11,61,1,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Allow Combat Movement (Phase 1)'), 
-(@ENTRY,0,11,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 2 (Phase 1)'), 
-(@ENTRY,0,12,13,9,2,100,0,0,8,0,0,28,34038,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Submerge Visual (Phase 2)'), 
-(@ENTRY,0,13,14,61,2,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - Combat - Prevent Combat Movement (Phase 2)'), 
-(@ENTRY,0,14,15,61,2,100,0,0,8,0,0,19,33554434,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 0 - 8 Yards - Remove Unselectable and Unattackable Flags (Phase 2)'), 
-(@ENTRY,0,15,0,61,2,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Crust Burster - At 20 - 60 Yards Range - Set Phase 1 (Phase 2)');
diff --git a/sql/old/3.3.5a/2011_03_04_00_world_skill_discovery_template.sql b/sql/old/3.3.5a/2011_03_04_00_world_skill_discovery_template.sql
new file mode 100644
index 00000000000..f1840b0db8f
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_00_world_skill_discovery_template.sql
@@ -0,0 +1,2 @@
+-- Debug spell, set reqSkillValue because it does not belong to any skilline
+UPDATE `skill_discovery_template` SET `reqSkillValue`=0 WHERE `reqSpell`=61756;
diff --git a/sql/old/3.3.5a/2011_03_04_01_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_03_04_01_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..f4a5825225c
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_01_world_npc_spellclick_spells.sql
@@ -0,0 +1,3 @@
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=32930;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(32930,65343,0,0,0,0,0,0,0);  -- Ride Vehicle Kologarn Arms
diff --git a/sql/old/3.3.5a/2011_03_04_01_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_03_04_01_world_vehicle_accessory.sql
new file mode 100644
index 00000000000..53cb37d43f1
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_01_world_vehicle_accessory.sql
@@ -0,0 +1 @@
+UPDATE `vehicle_accessory` SET `minion`=1 WHERE `entry` IN(32640,32633);
diff --git a/sql/old/3.3.5a/2011_03_04_02_world_spell_script_names.sql b/sql/old/3.3.5a/2011_03_04_02_world_spell_script_names.sql
new file mode 100644
index 00000000000..db399ebd042
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_02_world_spell_script_names.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_profession_research';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_book_of_glyph_mastery';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(60893, 'spell_gen_profession_research'),
+(61177, 'spell_gen_profession_research'),
+(61288, 'spell_gen_profession_research'),
+(61756, 'spell_gen_profession_research'),
+(64323, 'spell_item_book_of_glyph_mastery');
diff --git a/sql/old/3.3.5a/2011_03_04_03_world_gameobject.sql b/sql/old/3.3.5a/2011_03_04_03_world_gameobject.sql
new file mode 100644
index 00000000000..68cef6a1b53
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_03_world_gameobject.sql
@@ -0,0 +1,2 @@
+-- Delete MO_TRANSPORT spawns
+DELETE FROM `gameobject` WHERE `guid` IN (150163,150171);
diff --git a/sql/old/3.3.5a/2011_03_04_04_world_scriptname.sql b/sql/old/3.3.5a/2011_03_04_04_world_scriptname.sql
new file mode 100644
index 00000000000..01ee9d252c6
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_04_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `item_template` SET `ScriptName`='' WHERE `ScriptName`='item_harvesters_gift';
+UPDATE `item_template` SET `ScriptName`='' WHERE `ScriptName`='item_flying_machine';
diff --git a/sql/old/3.3.5a/2011_03_04_04_world_spell_script_names.sql b/sql/old/3.3.5a/2011_03_04_04_world_spell_script_names.sql
new file mode 100644
index 00000000000..140d4eb8e1d
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_04_04_world_spell_script_names.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_gift_of_the_harvester';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_death_gate';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(52481, 'spell_item_gift_of_the_harvester'),
+(52751, 'spell_dk_death_gate');
diff --git a/sql/old/3.3.5a/2011_03_04_0_world_skill_discovery_template.sql b/sql/old/3.3.5a/2011_03_04_0_world_skill_discovery_template.sql
deleted file mode 100644
index f1840b0db8f..00000000000
--- a/sql/old/3.3.5a/2011_03_04_0_world_skill_discovery_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Debug spell, set reqSkillValue because it does not belong to any skilline
-UPDATE `skill_discovery_template` SET `reqSkillValue`=0 WHERE `reqSpell`=61756;
diff --git a/sql/old/3.3.5a/2011_03_04_1_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2011_03_04_1_world_npc_spellclick_spells.sql
deleted file mode 100644
index f4a5825225c..00000000000
--- a/sql/old/3.3.5a/2011_03_04_1_world_npc_spellclick_spells.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=32930;
-INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
-(32930,65343,0,0,0,0,0,0,0);  -- Ride Vehicle Kologarn Arms
diff --git a/sql/old/3.3.5a/2011_03_04_1_world_vehicle_accessory.sql b/sql/old/3.3.5a/2011_03_04_1_world_vehicle_accessory.sql
deleted file mode 100644
index 53cb37d43f1..00000000000
--- a/sql/old/3.3.5a/2011_03_04_1_world_vehicle_accessory.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `vehicle_accessory` SET `minion`=1 WHERE `entry` IN(32640,32633);
diff --git a/sql/old/3.3.5a/2011_03_04_2_world_spell_script_names.sql b/sql/old/3.3.5a/2011_03_04_2_world_spell_script_names.sql
deleted file mode 100644
index db399ebd042..00000000000
--- a/sql/old/3.3.5a/2011_03_04_2_world_spell_script_names.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_profession_research';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_book_of_glyph_mastery';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(60893, 'spell_gen_profession_research'),
-(61177, 'spell_gen_profession_research'),
-(61288, 'spell_gen_profession_research'),
-(61756, 'spell_gen_profession_research'),
-(64323, 'spell_item_book_of_glyph_mastery');
diff --git a/sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql b/sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql
deleted file mode 100644
index 68cef6a1b53..00000000000
--- a/sql/old/3.3.5a/2011_03_04_3_world_gameobject.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Delete MO_TRANSPORT spawns
-DELETE FROM `gameobject` WHERE `guid` IN (150163,150171);
diff --git a/sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql b/sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql
deleted file mode 100644
index 01ee9d252c6..00000000000
--- a/sql/old/3.3.5a/2011_03_04_4_world_scriptname.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `item_template` SET `ScriptName`='' WHERE `ScriptName`='item_harvesters_gift';
-UPDATE `item_template` SET `ScriptName`='' WHERE `ScriptName`='item_flying_machine';
diff --git a/sql/old/3.3.5a/2011_03_04_4_world_spell_script_names.sql b/sql/old/3.3.5a/2011_03_04_4_world_spell_script_names.sql
deleted file mode 100644
index 140d4eb8e1d..00000000000
--- a/sql/old/3.3.5a/2011_03_04_4_world_spell_script_names.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_gift_of_the_harvester';
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_death_gate';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(52481, 'spell_item_gift_of_the_harvester'),
-(52751, 'spell_dk_death_gate');
diff --git a/sql/old/3.3.5a/2011_03_05_00_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_05_00_world_waypoint_data.sql
new file mode 100644
index 00000000000..f340c55304e
--- /dev/null
+++ b/sql/old/3.3.5a/2011_03_05_00_world_waypoint_data.sql
@@ -0,0 +1,208 @@
+-- Dragonmaw Skybreaker Pathing From sniff
+UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1.2125 WHERE `entry`=22274;
+DELETE FROM `creature` WHERE `guid`=132538;
+DELETE FROM `creature_addon` WHERE `guid`=132538;
+
+SET @NPC := 78291;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4919.375,`position_y`=764.9185,`position_z`=115.8213 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4899.598,731.2864,115.8213,0,0,0,100,0),
+(@PATH,2,-4897.536,699.804,115.8213,0,0,0,100,0),
+(@PATH,3,-4907.958,682.649,115.8213,0,0,0,100,0),
+(@PATH,4,-4928.547,677.3654,115.8213,0,0,0,100,0),
+(@PATH,5,-4957.558,679.2119,115.8213,0,0,0,100,0),
+(@PATH,6,-4979.058,694.0054,115.8213,0,0,0,100,0),
+(@PATH,7,-5001.202,695.435,115.8213,0,0,0,100,0),
+(@PATH,8,-5045.799,679.8455,115.8213,0,0,0,100,0),
+(@PATH,9,-5082.077,674.1318,115.8213,0,0,0,100,0),
+(@PATH,10,-5105.458,688.3859,126.0714,0,0,0,100,0),
+(@PATH,11,-5124.419,708.7602,115.8213,0,0,0,100,0),
+(@PATH,12,-5131.542,743.6093,115.8213,0,0,0,100,0),
+(@PATH,13,-5122.893,762.6793,115.8213,0,0,0,100,0),
+(@PATH,14,-5109.942,776.4905,127.7102,0,0,0,100,0),
+(@PATH,15,-5082.581,787.4044,140.2658,0,0,0,100,0),
+(@PATH,16,-5048.687,787.3963,129.2936,0,0,0,100,0),
+(@PATH,17,-5029.247,794.6903,105.6824,0,0,0,100,0),
+(@PATH,18,-5004.71,788.2552,111.238,0,0,0,100,0),
+(@PATH,19,-4974.424,775.7346,115.8213,0,0,0,100,0),
+(@PATH,20,-4944.215,765.6434,115.8213,0,0,0,100,0),
+(@PATH,21,-4919.375,764.9185,115.8213,0,0,0,100,0);
+
+SET @NPC := 78292;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4914.272,`position_y`=182.6655,`position_z`=105.3898 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4927.019,212.1301,105.3898,0,0,0,100,0),
+(@PATH,2,-4948.965,230.0244,105.3898,0,0,0,100,0),
+(@PATH,3,-4975.733,226.1698,105.3898,0,0,0,100,0),
+(@PATH,4,-4991.351,199.1344,103.001,0,0,0,100,0),
+(@PATH,5,-5005.696,153.1891,116.7409,0,0,0,100,0),
+(@PATH,6,-4998.949,135.7159,116.7409,0,0,0,100,0),
+(@PATH,7,-4970.921,115.2041,116.7409,0,0,0,100,0),
+(@PATH,8,-4920.846,153.8924,105.3898,0,0,0,100,0),
+(@PATH,9,-4914.272,182.6655,105.3898,0,0,0,100,0);
+
+SET @NPC := 78293;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5001.053,`position_y`=507.8676,`position_z`=125.1893 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4976.919,535.0216,125.1893,0,0,0,100,0),
+(@PATH,2,-4945.772,544.8293,125.1893,0,0,0,100,0),
+(@PATH,3,-4916.477,541.136,125.1893,0,0,0,100,0),
+(@PATH,4,-4894.755,534.1898,125.1893,0,0,0,100,0),
+(@PATH,5,-4878.672,517.9357,125.1893,0,0,0,100,0),
+(@PATH,6,-4867.688,472.2867,125.1893,0,0,0,100,0),
+(@PATH,7,-4866.018,440.9231,125.1893,0,0,0,100,0),
+(@PATH,8,-4884.331,411.0111,125.1893,0,0,0,100,0),
+(@PATH,9,-4909.612,389.5723,125.1893,0,0,0,100,0),
+(@PATH,10,-4945.339,386.204,125.1893,0,0,0,100,0),
+(@PATH,11,-4967.832,409.3968,125.1893,0,0,0,100,0),
+(@PATH,12,-4986.726,443.7907,125.1893,0,0,0,100,0),
+(@PATH,13,-4997.688,466.8292,125.1893,0,0,0,100,0),
+(@PATH,14,-5001.053,507.8676,125.1893,0,0,0,100,0);
+
+SET @NPC := 78294;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4957.768,`position_y`=-85.91428,`position_z`=117.7407 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4979.801,-54.69292,117.2962,0,0,0,100,0),
+(@PATH,2,-4973.231,-17.18837,111.824,0,0,0,100,0),
+(@PATH,3,-4911.041,4.472439,118.324,0,0,0,100,0),
+(@PATH,4,-4873.144,-22.93349,119.0185,0,0,0,100,0),
+(@PATH,5,-4870.32,-65.83746,122.9629,0,0,0,100,0),
+(@PATH,6,-4885.412,-99.36697,120.2129,0,0,0,100,0),
+(@PATH,7,-4918.261,-108.4286,117.824,0,0,0,100,0),
+(@PATH,8,-4957.768,-85.91428,117.7407,0,0,0,100,0);
+
+SET @NPC := 78295;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4989.571,`position_y`=277.2158,`position_z`=129.4455 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-4981.606,252.022,129.4455,0,0,0,100,0),
+(@PATH,2,-4961.62,234.8766,129.4455,0,0,0,100,0),
+(@PATH,3,-4923.01,242.2214,129.4455,0,0,0,100,0),
+(@PATH,4,-4900.703,257.2026,129.4455,0,0,0,100,0),
+(@PATH,5,-4879.407,279.7445,129.4455,0,0,0,100,0),
+(@PATH,6,-4865.226,310.3156,129.4455,0,0,0,100,0),
+(@PATH,7,-4859.635,335.26,129.4455,0,0,0,100,0),
+(@PATH,8,-4863.772,361.1568,129.4455,0,0,0,100,0),
+(@PATH,9,-4897.918,374.3784,129.4455,0,0,0,100,0),
+(@PATH,10,-4935.554,362.9577,129.4455,0,0,0,100,0),
+(@PATH,11,-4956.634,339.5631,129.4455,0,0,0,100,0),
+(@PATH,12,-4972.443,308.4228,129.4455,0,0,0,100,0),
+(@PATH,13,-4989.571,277.2158,129.4455,0,0,0,100,0);
+
+SET @NPC := 78296;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5013.096,`position_y`=529.8334,`position_z`=147.466 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5034.7,530.1956,147.466,0,0,0,100,0),
+(@PATH,2,-5058.567,549.2531,147.466,0,0,0,100,0),
+(@PATH,3,-5077.942,585.5693,147.466,0,0,0,100,0),
+(@PATH,4,-5085.871,616.8538,147.466,0,0,0,100,0),
+(@PATH,5,-5073.225,640.2809,147.466,0,0,0,100,0),
+(@PATH,6,-5046.584,656.348,147.466,0,0,0,100,0),
+(@PATH,7,-5016.901,662.3196,147.466,0,0,0,100,0),
+(@PATH,8,-4990.232,642.3178,147.466,0,0,0,100,0),
+(@PATH,9,-4965.018,595.1047,147.466,0,0,0,100,0),
+(@PATH,10,-4970.888,561.2855,147.466,0,0,0,100,0),
+(@PATH,11,-4988.07,544.9948,147.466,0,0,0,100,0),
+(@PATH,12,-5013.096,529.8334,147.466,0,0,0,100,0);
+
+SET @NPC := 78297;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5115.668,`position_y`=15.1122,`position_z`=156.0377 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5081.034,3.025608,156.0377,0,0,0,100,0),
+(@PATH,2,-5054.209,-29.95432,156.0377,0,0,0,100,0),
+(@PATH,3,-5044.757,-53.49219,156.0377,0,0,0,100,0),
+(@PATH,4,-5063.791,-87.67003,156.0377,0,0,0,100,0),
+(@PATH,5,-5100.97,-101.5627,156.0377,0,0,0,100,0),
+(@PATH,6,-5139.875,-93.61002,156.0377,0,0,0,100,0),
+(@PATH,7,-5157.834,-72.95584,158.5654,0,0,0,100,0),
+(@PATH,8,-5150.443,-50.55273,150.9543,0,0,0,100,0),
+(@PATH,9,-5154.681,-12.24284,156.0377,0,0,0,100,0),
+(@PATH,10,-5139.686,8.807183,156.0377,0,0,0,100,0),
+(@PATH,11,-5115.668,15.1122,156.0377,0,0,0,100,0);
+
+SET @NPC := 78298;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5128.899,`position_y`=485.1413,`position_z`=149.4686 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5096.786,491.9447,149.4686,0,0,0,100,0),
+(@PATH,2,-5081.393,520.9803,149.5797,0,0,0,100,0),
+(@PATH,3,-5082.821,560.8444,149.4686,0,0,0,100,0),
+(@PATH,4,-5081.688,587.3782,149.4686,0,0,0,100,0),
+(@PATH,5,-5096.75,614.0341,149.4686,0,0,0,100,0),
+(@PATH,6,-5121.846,626.2573,149.4686,0,0,0,100,0),
+(@PATH,7,-5143.037,616.5057,149.4686,0,0,0,100,0),
+(@PATH,8,-5162.803,600.3235,149.4686,0,0,0,100,0),
+(@PATH,9,-5175.979,585.7052,149.4686,0,0,0,100,0),
+(@PATH,10,-5191.311,553.0349,149.4686,0,0,0,100,0),
+(@PATH,11,-5182.97,516.0972,149.4686,0,0,0,100,0),
+(@PATH,12,-5169.338,495.5091,149.4686,0,0,0,100,0),
+(@PATH,13,-5128.899,485.1413,149.4686,0,0,0,100,0);
+
+SET @NPC := 78299;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5203.09,`position_y`=230.2053,`position_z`=125.2333 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5200.994,194.2652,125.2333,0,0,0,100,0),
+(@PATH,2,-5209.843,162.355,125.2333,0,0,0,100,0),
+(@PATH,3,-5223.84,126.7766,125.2333,0,0,0,100,0),
+(@PATH,4,-5254.94,108.4594,125.2333,0,0,0,100,0),
+(@PATH,5,-5272.563,119.1082,125.2333,0,0,0,100,0),
+(@PATH,6,-5293.776,154.223,125.2333,0,0,0,100,0),
+(@PATH,7,-5298.729,171.8369,125.2333,0,0,0,100,0),
+(@PATH,8,-5300.312,208.0347,125.2333,0,0,0,100,0),
+(@PATH,9,-5283.916,251.8668,125.2333,0,0,0,100,0),
+(@PATH,10,-5241.004,262.8554,125.2333,0,0,0,100,0),
+(@PATH,11,-5203.09,230.2053,125.2333,0,0,0,100,0);
+
+SET @NPC := 78300;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5234.025,`position_y`=262.7202,`position_z`=131.392 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5255.758,267.988,131.392,0,0,0,100,0),
+(@PATH,2,-5280.832,303.0705,131.392,0,0,0,100,0),
+(@PATH,3,-5282.729,322.4258,131.392,0,0,0,100,0),
+(@PATH,4,-5269.899,354.7595,131.392,0,0,0,100,0),
+(@PATH,5,-5244.224,370.2118,131.392,0,0,0,100,0),
+(@PATH,6,-5201.63,377.0772,131.392,0,0,0,100,0),
+(@PATH,7,-5186.241,362.2412,131.392,0,0,0,100,0),
+(@PATH,8,-5178.872,334.1438,131.392,0,0,0,100,0),
+(@PATH,9,-5178.549,305.8703,131.392,0,0,0,100,0),
+(@PATH,10,-5190.308,282.2744,131.392,0,0,0,100,0),
+(@PATH,11,-5208.153,267.4322,131.392,0,0,0,100,0),
+(@PATH,12,-5234.025,262.7202,131.392,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2011_03_05_0_world_waypoint_data.sql b/sql/old/3.3.5a/2011_03_05_0_world_waypoint_data.sql
deleted file mode 100644
index f340c55304e..00000000000
--- a/sql/old/3.3.5a/2011_03_05_0_world_waypoint_data.sql
+++ /dev/null
@@ -1,208 +0,0 @@
--- Dragonmaw Skybreaker Pathing From sniff
-UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1.2125 WHERE `entry`=22274;
-DELETE FROM `creature` WHERE `guid`=132538;
-DELETE FROM `creature_addon` WHERE `guid`=132538;
-
-SET @NPC := 78291;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4919.375,`position_y`=764.9185,`position_z`=115.8213 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4899.598,731.2864,115.8213,0,0,0,100,0),
-(@PATH,2,-4897.536,699.804,115.8213,0,0,0,100,0),
-(@PATH,3,-4907.958,682.649,115.8213,0,0,0,100,0),
-(@PATH,4,-4928.547,677.3654,115.8213,0,0,0,100,0),
-(@PATH,5,-4957.558,679.2119,115.8213,0,0,0,100,0),
-(@PATH,6,-4979.058,694.0054,115.8213,0,0,0,100,0),
-(@PATH,7,-5001.202,695.435,115.8213,0,0,0,100,0),
-(@PATH,8,-5045.799,679.8455,115.8213,0,0,0,100,0),
-(@PATH,9,-5082.077,674.1318,115.8213,0,0,0,100,0),
-(@PATH,10,-5105.458,688.3859,126.0714,0,0,0,100,0),
-(@PATH,11,-5124.419,708.7602,115.8213,0,0,0,100,0),
-(@PATH,12,-5131.542,743.6093,115.8213,0,0,0,100,0),
-(@PATH,13,-5122.893,762.6793,115.8213,0,0,0,100,0),
-(@PATH,14,-5109.942,776.4905,127.7102,0,0,0,100,0),
-(@PATH,15,-5082.581,787.4044,140.2658,0,0,0,100,0),
-(@PATH,16,-5048.687,787.3963,129.2936,0,0,0,100,0),
-(@PATH,17,-5029.247,794.6903,105.6824,0,0,0,100,0),
-(@PATH,18,-5004.71,788.2552,111.238,0,0,0,100,0),
-(@PATH,19,-4974.424,775.7346,115.8213,0,0,0,100,0),
-(@PATH,20,-4944.215,765.6434,115.8213,0,0,0,100,0),
-(@PATH,21,-4919.375,764.9185,115.8213,0,0,0,100,0);
-
-SET @NPC := 78292;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4914.272,`position_y`=182.6655,`position_z`=105.3898 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4927.019,212.1301,105.3898,0,0,0,100,0),
-(@PATH,2,-4948.965,230.0244,105.3898,0,0,0,100,0),
-(@PATH,3,-4975.733,226.1698,105.3898,0,0,0,100,0),
-(@PATH,4,-4991.351,199.1344,103.001,0,0,0,100,0),
-(@PATH,5,-5005.696,153.1891,116.7409,0,0,0,100,0),
-(@PATH,6,-4998.949,135.7159,116.7409,0,0,0,100,0),
-(@PATH,7,-4970.921,115.2041,116.7409,0,0,0,100,0),
-(@PATH,8,-4920.846,153.8924,105.3898,0,0,0,100,0),
-(@PATH,9,-4914.272,182.6655,105.3898,0,0,0,100,0);
-
-SET @NPC := 78293;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5001.053,`position_y`=507.8676,`position_z`=125.1893 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4976.919,535.0216,125.1893,0,0,0,100,0),
-(@PATH,2,-4945.772,544.8293,125.1893,0,0,0,100,0),
-(@PATH,3,-4916.477,541.136,125.1893,0,0,0,100,0),
-(@PATH,4,-4894.755,534.1898,125.1893,0,0,0,100,0),
-(@PATH,5,-4878.672,517.9357,125.1893,0,0,0,100,0),
-(@PATH,6,-4867.688,472.2867,125.1893,0,0,0,100,0),
-(@PATH,7,-4866.018,440.9231,125.1893,0,0,0,100,0),
-(@PATH,8,-4884.331,411.0111,125.1893,0,0,0,100,0),
-(@PATH,9,-4909.612,389.5723,125.1893,0,0,0,100,0),
-(@PATH,10,-4945.339,386.204,125.1893,0,0,0,100,0),
-(@PATH,11,-4967.832,409.3968,125.1893,0,0,0,100,0),
-(@PATH,12,-4986.726,443.7907,125.1893,0,0,0,100,0),
-(@PATH,13,-4997.688,466.8292,125.1893,0,0,0,100,0),
-(@PATH,14,-5001.053,507.8676,125.1893,0,0,0,100,0);
-
-SET @NPC := 78294;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4957.768,`position_y`=-85.91428,`position_z`=117.7407 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4979.801,-54.69292,117.2962,0,0,0,100,0),
-(@PATH,2,-4973.231,-17.18837,111.824,0,0,0,100,0),
-(@PATH,3,-4911.041,4.472439,118.324,0,0,0,100,0),
-(@PATH,4,-4873.144,-22.93349,119.0185,0,0,0,100,0),
-(@PATH,5,-4870.32,-65.83746,122.9629,0,0,0,100,0),
-(@PATH,6,-4885.412,-99.36697,120.2129,0,0,0,100,0),
-(@PATH,7,-4918.261,-108.4286,117.824,0,0,0,100,0),
-(@PATH,8,-4957.768,-85.91428,117.7407,0,0,0,100,0);
-
-SET @NPC := 78295;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4989.571,`position_y`=277.2158,`position_z`=129.4455 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-4981.606,252.022,129.4455,0,0,0,100,0),
-(@PATH,2,-4961.62,234.8766,129.4455,0,0,0,100,0),
-(@PATH,3,-4923.01,242.2214,129.4455,0,0,0,100,0),
-(@PATH,4,-4900.703,257.2026,129.4455,0,0,0,100,0),
-(@PATH,5,-4879.407,279.7445,129.4455,0,0,0,100,0),
-(@PATH,6,-4865.226,310.3156,129.4455,0,0,0,100,0),
-(@PATH,7,-4859.635,335.26,129.4455,0,0,0,100,0),
-(@PATH,8,-4863.772,361.1568,129.4455,0,0,0,100,0),
-(@PATH,9,-4897.918,374.3784,129.4455,0,0,0,100,0),
-(@PATH,10,-4935.554,362.9577,129.4455,0,0,0,100,0),
-(@PATH,11,-4956.634,339.5631,129.4455,0,0,0,100,0),
-(@PATH,12,-4972.443,308.4228,129.4455,0,0,0,100,0),
-(@PATH,13,-4989.571,277.2158,129.4455,0,0,0,100,0);
-
-SET @NPC := 78296;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5013.096,`position_y`=529.8334,`position_z`=147.466 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-5034.7,530.1956,147.466,0,0,0,100,0),
-(@PATH,2,-5058.567,549.2531,147.466,0,0,0,100,0),
-(@PATH,3,-5077.942,585.5693,147.466,0,0,0,100,0),
-(@PATH,4,-5085.871,616.8538,147.466,0,0,0,100,0),
-(@PATH,5,-5073.225,640.2809,147.466,0,0,0,100,0),
-(@PATH,6,-5046.584,656.348,147.466,0,0,0,100,0),
-(@PATH,7,-5016.901,662.3196,147.466,0,0,0,100,0),
-(@PATH,8,-4990.232,642.3178,147.466,0,0,0,100,0),
-(@PATH,9,-4965.018,595.1047,147.466,0,0,0,100,0),
-(@PATH,10,-4970.888,561.2855,147.466,0,0,0,100,0),
-(@PATH,11,-4988.07,544.9948,147.466,0,0,0,100,0),
-(@PATH,12,-5013.096,529.8334,147.466,0,0,0,100,0);
-
-SET @NPC := 78297;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5115.668,`position_y`=15.1122,`position_z`=156.0377 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-5081.034,3.025608,156.0377,0,0,0,100,0),
-(@PATH,2,-5054.209,-29.95432,156.0377,0,0,0,100,0),
-(@PATH,3,-5044.757,-53.49219,156.0377,0,0,0,100,0),
-(@PATH,4,-5063.791,-87.67003,156.0377,0,0,0,100,0),
-(@PATH,5,-5100.97,-101.5627,156.0377,0,0,0,100,0),
-(@PATH,6,-5139.875,-93.61002,156.0377,0,0,0,100,0),
-(@PATH,7,-5157.834,-72.95584,158.5654,0,0,0,100,0),
-(@PATH,8,-5150.443,-50.55273,150.9543,0,0,0,100,0),
-(@PATH,9,-5154.681,-12.24284,156.0377,0,0,0,100,0),
-(@PATH,10,-5139.686,8.807183,156.0377,0,0,0,100,0),
-(@PATH,11,-5115.668,15.1122,156.0377,0,0,0,100,0);
-
-SET @NPC := 78298;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5128.899,`position_y`=485.1413,`position_z`=149.4686 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-5096.786,491.9447,149.4686,0,0,0,100,0),
-(@PATH,2,-5081.393,520.9803,149.5797,0,0,0,100,0),
-(@PATH,3,-5082.821,560.8444,149.4686,0,0,0,100,0),
-(@PATH,4,-5081.688,587.3782,149.4686,0,0,0,100,0),
-(@PATH,5,-5096.75,614.0341,149.4686,0,0,0,100,0),
-(@PATH,6,-5121.846,626.2573,149.4686,0,0,0,100,0),
-(@PATH,7,-5143.037,616.5057,149.4686,0,0,0,100,0),
-(@PATH,8,-5162.803,600.3235,149.4686,0,0,0,100,0),
-(@PATH,9,-5175.979,585.7052,149.4686,0,0,0,100,0),
-(@PATH,10,-5191.311,553.0349,149.4686,0,0,0,100,0),
-(@PATH,11,-5182.97,516.0972,149.4686,0,0,0,100,0),
-(@PATH,12,-5169.338,495.5091,149.4686,0,0,0,100,0),
-(@PATH,13,-5128.899,485.1413,149.4686,0,0,0,100,0);
-
-SET @NPC := 78299;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5203.09,`position_y`=230.2053,`position_z`=125.2333 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-5200.994,194.2652,125.2333,0,0,0,100,0),
-(@PATH,2,-5209.843,162.355,125.2333,0,0,0,100,0),
-(@PATH,3,-5223.84,126.7766,125.2333,0,0,0,100,0),
-(@PATH,4,-5254.94,108.4594,125.2333,0,0,0,100,0),
-(@PATH,5,-5272.563,119.1082,125.2333,0,0,0,100,0),
-(@PATH,6,-5293.776,154.223,125.2333,0,0,0,100,0),
-(@PATH,7,-5298.729,171.8369,125.2333,0,0,0,100,0),
-(@PATH,8,-5300.312,208.0347,125.2333,0,0,0,100,0),
-(@PATH,9,-5283.916,251.8668,125.2333,0,0,0,100,0),
-(@PATH,10,-5241.004,262.8554,125.2333,0,0,0,100,0),
-(@PATH,11,-5203.09,230.2053,125.2333,0,0,0,100,0);
-
-SET @NPC := 78300;
-SET @PATH := @NPC*10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5234.025,`position_y`=262.7202,`position_z`=131.392 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes2`) VALUES (@NPC,@PATH,20684,1);
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-5255.758,267.988,131.392,0,0,0,100,0),
-(@PATH,2,-5280.832,303.0705,131.392,0,0,0,100,0),
-(@PATH,3,-5282.729,322.4258,131.392,0,0,0,100,0),
-(@PATH,4,-5269.899,354.7595,131.392,0,0,0,100,0),
-(@PATH,5,-5244.224,370.2118,131.392,0,0,0,100,0),
-(@PATH,6,-5201.63,377.0772,131.392,0,0,0,100,0),
-(@PATH,7,-5186.241,362.2412,131.392,0,0,0,100,0),
-(@PATH,8,-5178.872,334.1438,131.392,0,0,0,100,0),
-(@PATH,9,-5178.549,305.8703,131.392,0,0,0,100,0),
-(@PATH,10,-5190.308,282.2744,131.392,0,0,0,100,0),
-(@PATH,11,-5208.153,267.4322,131.392,0,0,0,100,0),
-(@PATH,12,-5234.025,262.7202,131.392,0,0,0,100,0);
-- 
cgit v1.2.3